final week 6 working death, damage, punch, enemy death

This commit is contained in:
OddlyTimbot committed 2024-10-07 20:36:58 -04:00
1 parent a6fc6acc12
commit e50ead9360
13 files changed
+334 -23

No files matched your search

+39 -3
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=15 format=4 uid="uid://diss5ty7548p3"]
[gd_scene load_steps=17 format=4 uid="uid://diss5ty7548p3"]
[ext_resource type="Texture2D" uid="uid://cjdayl6k7xt2s" path="res://assets/graphics/environment/background/forestbackground.png" id="1_7cw2b"]
[ext_resource type="PackedScene" uid="uid://0j0320rcnxo7" path="res://scenes/crate.tscn" id="1_8ekmb"]
@@ -10,6 +10,8 @@
[ext_resource type="PackedScene" uid="uid://csewven6s5npw" path="res://scenes/trigger.tscn" id="3_t3xge"]
[ext_resource type="PackedScene" uid="uid://dkqrujmfd1dt4" path="res://scenes/coin.tscn" id="3_xdwxn"]
[ext_resource type="PackedScene" uid="uid://chg3b7bwi8e5v" path="res://scenes/badguy.tscn" id="10_wtwdm"]
[ext_resource type="PackedScene" uid="uid://dw0mifscsrgaw" path="res://scenes/ui.tscn" id="11_41b0s"]
[ext_resource type="Texture2D" uid="uid://dqa6ro66e3j1d" path="res://assets/graphics/environment/foreground.png" id="12_1m160"]
[sub_resource type="TileMapPattern" id="TileMapPattern_pcobp"]
tile_data = PackedInt32Array(0, 0, 4, 1, 65536, 4, 2, 65536, 4, 3, 131072, 4)
@@ -419,11 +421,11 @@ script = ExtResource("1_mpwqj")
[node name="Timer" type="Timer" parent="SceneManager"]
[node name="TileMapLayer" type="TileMapLayer" parent="."]
tile_map_data = PackedByteArray("AAACAAUAAAAPAAQAAAADAAUAAAABAAQAAAAEAAUAAAABAAQAAAAFAAUAAAABAAQAAAAHAAQAAAAAAAIAAAAIAAQAAAABAAIAAAAJAAQAAAACAAIAAAAJAAMAAAACAAAAAAAIAAMAAAABAAAAAAAHAAMAAAAAAAAAAAAIAAAAAAAEAAQAAAALAAIAAAAAAAQAAAAMAAIAAAAQAAQAAAAMAAEAAAAPAAMAAAANAAEAAAACAAQAAAAMAAUAAAAAAAQAAAANAAUAAAABAAQAAAAOAAUAAAABAAQAAAAPAAUAAAACAAQAAAAGAAUAAAACAAQAAAAQAAMAAAAAAAQAAAARAAMAAAABAAQAAAASAAMAAAACAAQAAAAUAAMAAAAEAAIAAAAUAAIAAAAPAAMAAAAVAAIAAAAMAAQAAAAWAAIAAAACAAIAAAAWAAEAAAACAAAAAAAVAAEAAAAPAAMAAAAUAAYAAAAAAAQAAAAVAAYAAAABAAQAAAAWAAYAAAACAAQAAAACAAQAAAAEAAAAAAA=")
tile_map_data = PackedByteArray("AAACAAUAAAAPAAQAAAADAAUAAAABAAQAAAAEAAUAAAABAAQAAAAFAAUAAAABAAQAAAAHAAQAAAAAAAIAAAAIAAQAAAABAAIAAAAJAAQAAAACAAIAAAAJAAMAAAACAAAAAAAIAAMAAAABAAAAAAAHAAMAAAAAAAAAAAAIAAAAAAAEAAQAAAALAAIAAAAAAAQAAAAMAAIAAAAQAAQAAAAMAAEAAAAPAAMAAAANAAEAAAACAAQAAAAMAAUAAAAAAAQAAAANAAUAAAABAAQAAAAOAAUAAAABAAQAAAAPAAUAAAACAAQAAAAGAAUAAAACAAQAAAAQAAMAAAAAAAQAAAARAAMAAAABAAQAAAASAAMAAAACAAQAAAAUAAMAAAAEAAIAAAAUAAIAAAAPAAMAAAAVAAIAAAAMAAQAAAAWAAIAAAACAAIAAAAWAAEAAAACAAAAAAAVAAEAAAAPAAMAAAAUAAYAAAAAAAQAAAAVAAYAAAABAAQAAAAWAAYAAAACAAQAAAACAAQAAAAEAAAAAAAQAAAAAAAAAAQAAAARAAAAAAACAAQAAAAJAAcAAAAAAAQAAAAKAAcAAAABAAQAAAALAAcAAAABAAQAAAAMAAcAAAABAAQAAAANAAcAAAACAAQAAAAZAAQAAAAPAAQAAAAaAAQAAAABAAQAAAAbAAQAAAAQAAQAAAAbAAMAAAAEAAEAAAAbAAIAAAAQAAMAAAAaAAIAAAABAAQAAAAZAAIAAAAPAAMAAAAZAAMAAAAEAAEAAAAfAAEAAAAAAAQAAAAgAAEAAAABAAQAAAAhAAEAAAABAAQAAAAiAAEAAAABAAQAAAAjAAEAAAACAAQAAAAcAAYAAAAAAAQAAAAdAAYAAAABAAQAAAAeAAYAAAABAAQAAAAfAAYAAAAQAAQAAAAfAAUAAAAEAAEAAAAfAAQAAAAPAAMAAAAgAAQAAAABAAQAAAAhAAQAAAABAAQAAAAiAAQAAAACAAQAAAA=")
tile_set = SubResource("TileSet_cs2mx")
[node name="Floor" type="StaticBody2D" parent="."]
position = Vector2(94, 183)
position = Vector2(94, 160)
metadata/_edit_group_ = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="Floor"]
@@ -456,6 +458,15 @@ metadata/_edit_group_ = true
[node name="Coin" parent="coins" instance=ExtResource("3_xdwxn")]
position = Vector2(206, 151)
[node name="Coin4" parent="coins" instance=ExtResource("3_xdwxn")]
position = Vector2(396, 155)
[node name="Coin5" parent="coins" instance=ExtResource("3_xdwxn")]
position = Vector2(588, 91)
[node name="Coin6" parent="coins" instance=ExtResource("3_xdwxn")]
position = Vector2(556, -5)
[node name="Coin2" parent="coins" instance=ExtResource("3_xdwxn")]
position = Vector2(263, 89)
@@ -467,7 +478,32 @@ position = Vector2(368, 57)
[node name="slime" parent="enemies" instance=ExtResource("10_wtwdm")]
position = Vector2(282, 84)
[node name="slime3" parent="enemies" instance=ExtResource("10_wtwdm")]
position = Vector2(414, 20)
[node name="slime4" parent="enemies" instance=ExtResource("10_wtwdm")]
position = Vector2(455, 148)
[node name="slime5" parent="enemies" instance=ExtResource("10_wtwdm")]
position = Vector2(357, 212)
[node name="slime2" parent="enemies" instance=ExtResource("10_wtwdm")]
position = Vector2(106, 149)
[node name="CanvasLayer" type="CanvasLayer" parent="."]
[node name="Control" parent="CanvasLayer" instance=ExtResource("11_41b0s")]
offset_left = 10.0
offset_top = 8.0
offset_right = -6.0
metadata/_edit_lock_ = true
[node name="Parallax2D" type="Parallax2D" parent="."]
scroll_scale = Vector2(2, 2)
repeat_size = Vector2(320, 0)
[node name="Sprite2D" type="Sprite2D" parent="Parallax2D"]
position = Vector2(160, 130)
texture = ExtResource("12_1m160")
[connection signal="timeout" from="SceneManager/Timer" to="SceneManager" method="resetWorld"]
+76 -4
View File
@@ -1,10 +1,12 @@
[gd_scene load_steps=39 format=3 uid="uid://dbgc24hrbtvxm"]
[gd_scene load_steps=49 format=3 uid="uid://dbgc24hrbtvxm"]
[ext_resource type="Script" path="res://scripts/player.gd" id="1_5qpif"]
[ext_resource type="Texture2D" uid="uid://d6d3re6epsh4" path="res://assets/graphics/player/death/Player Death 64x64.png" id="2_t1yra"]
[ext_resource type="Texture2D" uid="uid://pdvgf3y1lquv" path="res://assets/graphics/player/idle/Player Idle 48x48.png" id="2_vcmr0"]
[ext_resource type="Texture2D" uid="uid://cvh48exhs1ir1" path="res://assets/graphics/player/run/player run 48x48.png" id="3_a03rx"]
[ext_resource type="Texture2D" uid="uid://d0kfe5ms2vjbr" path="res://assets/graphics/player/jump/player jump 48x48.png" id="3_mvdmt"]
[ext_resource type="Texture2D" uid="uid://chroktky8p0g1" path="res://assets/graphics/player/hurt/Player Hurt 48x48.png" id="3_td76e"]
[ext_resource type="Texture2D" uid="uid://c0oo6kno61i0b" path="res://assets/graphics/player/punch/Player Punch 64x64.png" id="6_cp1mx"]
[sub_resource type="AtlasTexture" id="AtlasTexture_uru55"]
atlas = ExtResource("2_t1yra")
@@ -46,6 +48,22 @@ region = Rect2(384, 0, 48, 48)
atlas = ExtResource("2_t1yra")
region = Rect2(432, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_tm0rm"]
atlas = ExtResource("3_td76e")
region = Rect2(0, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_yv45b"]
atlas = ExtResource("3_td76e")
region = Rect2(48, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_qcxh5"]
atlas = ExtResource("3_td76e")
region = Rect2(96, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_32phs"]
atlas = ExtResource("3_td76e")
region = Rect2(144, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_etdvv"]
atlas = ExtResource("2_vcmr0")
region = Rect2(0, 0, 48, 48)
@@ -98,6 +116,22 @@ region = Rect2(48, 0, 48, 48)
atlas = ExtResource("3_mvdmt")
region = Rect2(96, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_m3mm6"]
atlas = ExtResource("6_cp1mx")
region = Rect2(128, 0, 64, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_651rh"]
atlas = ExtResource("6_cp1mx")
region = Rect2(192, 0, 64, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_pwqvs"]
atlas = ExtResource("6_cp1mx")
region = Rect2(256, 0, 64, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_1vc4x"]
atlas = ExtResource("6_cp1mx")
region = Rect2(320, 0, 64, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_qxesk"]
atlas = ExtResource("3_a03rx")
region = Rect2(0, 0, 48, 48)
@@ -169,6 +203,23 @@ animations = [{
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_tm0rm")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_yv45b")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_qcxh5")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_32phs")
}],
"loop": false,
"name": &"hurt",
"speed": 12.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_etdvv")
}, {
"duration": 1.0,
@@ -218,6 +269,23 @@ animations = [{
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_m3mm6")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_651rh")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_pwqvs")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_1vc4x")
}],
"loop": false,
"name": &"punch",
"speed": 12.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_qxesk")
}, {
"duration": 1.0,
@@ -256,7 +324,7 @@ metadata/_edit_group_ = true
texture_filter = 1
position = Vector2(0, -7)
sprite_frames = SubResource("SpriteFrames_wlxdo")
animation = &"death"
animation = &"idle"
autoplay = "idle"
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
@@ -264,13 +332,17 @@ shape = SubResource("CircleShape2D_mcosy")
debug_color = Color(0.826895, 0.282133, 0.703752, 0.42)
[node name="RightRay" type="RayCast2D" parent="."]
target_position = Vector2(16, 0)
target_position = Vector2(19, 0)
collide_with_areas = true
[node name="LeftRay" type="RayCast2D" parent="."]
target_position = Vector2(-17, 0)
target_position = Vector2(-19, 0)
collide_with_areas = true
[node name="MarkerRight" type="Node2D" parent="."]
position = Vector2(12, -5)
[node name="MarkerLeft" type="Node2D" parent="."]
position = Vector2(-15, -5)
[connection signal="animation_finished" from="AnimatedSprite2D" to="." method="_on_animation_finished"]
+38
View File
@@ -0,0 +1,38 @@
[gd_scene load_steps=2 format=3 uid="uid://dw0mifscsrgaw"]
[ext_resource type="Script" path="res://scripts/ui.gd" id="1_ndnyg"]
[node name="Control" type="Control"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_ndnyg")
[node name="VBoxContainer" type="VBoxContainer" parent="."]
layout_mode = 1
anchors_preset = 10
anchor_right = 1.0
grow_horizontal = 2
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
layout_mode = 2
[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/HBoxContainer"]
layout_mode = 2
size_flags_horizontal = 3
[node name="Health" type="Label" parent="VBoxContainer/HBoxContainer/MarginContainer"]
layout_mode = 2
text = "Health : 100"
[node name="MarginContainer2" type="MarginContainer" parent="VBoxContainer/HBoxContainer"]
layout_mode = 2
size_flags_horizontal = 3
[node name="Coins" type="Label" parent="VBoxContainer/HBoxContainer/MarginContainer2"]
layout_mode = 2
text = "Coins : 0"
horizontal_alignment = 2