From aac16855e682472fa84d3aaf8b2932fe7205d018 Mon Sep 17 00:00:00 2001 From: Jane Cho Date: Wed, 8 Dec 2021 18:44:42 -0600 Subject: [PATCH 1/3] Animation Star animation & map boundary --- Enemies/Hellhound.tscn | 83 +++++++----------- Levels/Interactables/Star.tscn | 28 +++++- Levels/Level 1.tscn | 9 ++ Sprites/Assets/blue_star_225.png | Bin 0 -> 389 bytes Sprites/Assets/blue_star_225.png.import | 34 +++++++ Sprites/Assets/blue_star_45.png | Bin 0 -> 339 bytes Sprites/Assets/blue_star_45.png.import | 34 +++++++ Sprites/Assets/bule_star_sprite_spread.png | Bin 0 -> 746 bytes .../Assets/bule_star_sprite_spread.png.import | 34 +++++++ 9 files changed, 171 insertions(+), 51 deletions(-) create mode 100644 Sprites/Assets/blue_star_225.png create mode 100644 Sprites/Assets/blue_star_225.png.import create mode 100644 Sprites/Assets/blue_star_45.png create mode 100644 Sprites/Assets/blue_star_45.png.import create mode 100644 Sprites/Assets/bule_star_sprite_spread.png create mode 100644 Sprites/Assets/bule_star_sprite_spread.png.import diff --git a/Enemies/Hellhound.tscn b/Enemies/Hellhound.tscn index b3eb972..4c83eb3 100644 --- a/Enemies/Hellhound.tscn +++ b/Enemies/Hellhound.tscn @@ -7,124 +7,109 @@ [ext_resource path="res://Sprites/Enemies/Hell_Hound_Jump.png" type="Texture" id=5] [ext_resource path="res://Sprites/Enemies/Hell_Hound_Run.png" type="Texture" id=6] -[sub_resource type="AtlasTexture" id=9] -flags = 4 +[sub_resource type="AtlasTexture" id=1] atlas = ExtResource( 3 ) region = Rect2( 0, 0, 64, 32 ) -[sub_resource type="AtlasTexture" id=10] -flags = 4 +[sub_resource type="AtlasTexture" id=2] atlas = ExtResource( 3 ) region = Rect2( 64, 0, 64, 32 ) -[sub_resource type="AtlasTexture" id=11] -flags = 4 +[sub_resource type="AtlasTexture" id=3] atlas = ExtResource( 3 ) region = Rect2( 128, 0, 64, 32 ) -[sub_resource type="AtlasTexture" id=12] -flags = 4 +[sub_resource type="AtlasTexture" id=4] atlas = ExtResource( 3 ) region = Rect2( 192, 0, 64, 32 ) -[sub_resource type="AtlasTexture" id=13] -flags = 4 +[sub_resource type="AtlasTexture" id=5] atlas = ExtResource( 3 ) region = Rect2( 256, 0, 64, 32 ) -[sub_resource type="AtlasTexture" id=14] -flags = 4 +[sub_resource type="AtlasTexture" id=6] atlas = ExtResource( 3 ) region = Rect2( 320, 0, 64, 32 ) -[sub_resource type="AtlasTexture" id=3] -flags = 4 +[sub_resource type="AtlasTexture" id=7] atlas = ExtResource( 5 ) region = Rect2( 0, 0, 65, 48 ) -[sub_resource type="AtlasTexture" id=4] -flags = 4 +[sub_resource type="AtlasTexture" id=8] atlas = ExtResource( 5 ) region = Rect2( 65, 0, 65, 48 ) -[sub_resource type="AtlasTexture" id=5] -flags = 4 +[sub_resource type="AtlasTexture" id=9] atlas = ExtResource( 5 ) region = Rect2( 130, 0, 65, 48 ) -[sub_resource type="AtlasTexture" id=6] -flags = 4 +[sub_resource type="AtlasTexture" id=10] atlas = ExtResource( 5 ) region = Rect2( 195, 0, 65, 48 ) -[sub_resource type="AtlasTexture" id=7] -flags = 4 +[sub_resource type="AtlasTexture" id=11] atlas = ExtResource( 5 ) region = Rect2( 260, 0, 65, 48 ) -[sub_resource type="AtlasTexture" id=8] -flags = 4 +[sub_resource type="AtlasTexture" id=12] atlas = ExtResource( 5 ) region = Rect2( 325, 0, 65, 48 ) -[sub_resource type="AtlasTexture" id=15] -flags = 4 +[sub_resource type="AtlasTexture" id=13] atlas = ExtResource( 6 ) region = Rect2( 0, 0, 67, 32 ) -[sub_resource type="AtlasTexture" id=16] -flags = 4 +[sub_resource type="AtlasTexture" id=14] atlas = ExtResource( 6 ) region = Rect2( 67, 0, 67, 32 ) -[sub_resource type="AtlasTexture" id=17] -flags = 4 +[sub_resource type="AtlasTexture" id=15] atlas = ExtResource( 6 ) region = Rect2( 134, 0, 67, 32 ) -[sub_resource type="AtlasTexture" id=18] -flags = 4 +[sub_resource type="AtlasTexture" id=16] atlas = ExtResource( 6 ) region = Rect2( 201, 0, 67, 32 ) -[sub_resource type="AtlasTexture" id=19] -flags = 4 +[sub_resource type="AtlasTexture" id=17] atlas = ExtResource( 6 ) region = Rect2( 268, 0, 67, 32 ) -[sub_resource type="SpriteFrames" id=20] +[sub_resource type="SpriteFrames" id=18] animations = [ { -"frames": [ SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ), SubResource( 13 ), SubResource( 14 ) ], +"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ) ], "loop": true, "name": "Idle", "speed": 3.0 }, { -"frames": [ SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ], +"frames": [ SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ) ], "loop": true, "name": "Jump", "speed": 8.0 }, { -"frames": [ SubResource( 15 ), SubResource( 16 ), SubResource( 17 ), SubResource( 18 ), SubResource( 19 ) ], +"frames": [ SubResource( 13 ), SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 17 ) ], "loop": true, "name": "Running", "speed": 5.0 } ] -[sub_resource type="CapsuleShape2D" id=1] +[sub_resource type="CapsuleShape2D" id=19] radius = 3.0 height = 2.0 -[sub_resource type="CircleShape2D" id=2] +[sub_resource type="CircleShape2D" id=20] radius = 50.0 -[node name="Hellhound" type="KinematicBody2D" groups=["enemies"]] +[node name="Hellhound" type="KinematicBody2D" groups=[ +"enemies", +]] collision_layer = 2 script = ExtResource( 4 ) [node name="AnimatedSprite1" type="AnimatedSprite" parent="."] position = Vector2( 1, -3 ) scale = Vector2( 0.5625, 0.5625 ) -frames = SubResource( 20 ) +frames = SubResource( 18 ) animation = "Idle" frame = 5 playing = true @@ -132,30 +117,30 @@ playing = true [node name="Hitbox" type="CollisionShape2D" parent="."] visible = false position = Vector2( 0, -3 ) -shape = SubResource( 1 ) +shape = SubResource( 19 ) [node name="Player Detector" type="Area2D" parent="."] -collision_layer = 0 -collision_mask = 2 input_pickable = false monitorable = false +collision_layer = 0 +collision_mask = 2 [node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector"] visible = false scale = Vector2( 1.5, 1.5 ) -shape = SubResource( 2 ) +shape = SubResource( 20 ) [node name="Player Attack" type="Area2D" parent="."] visible = false -collision_layer = 0 -collision_mask = 2 input_pickable = false monitorable = false +collision_layer = 0 +collision_mask = 2 [node name="Attack" type="CollisionShape2D" parent="Player Attack"] visible = false scale = Vector2( 0.5, 0.5 ) -shape = SubResource( 2 ) +shape = SubResource( 20 ) [node name="Light2D" type="Light2D" parent="."] visible = false diff --git a/Levels/Interactables/Star.tscn b/Levels/Interactables/Star.tscn index d69d569..26340a8 100644 --- a/Levels/Interactables/Star.tscn +++ b/Levels/Interactables/Star.tscn @@ -1,10 +1,27 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] -[ext_resource path="res://Sprites/Assets/blue_star.png" type="Texture" id=1] +[ext_resource path="res://Sprites/Assets/bule_star_sprite_spread.png" type="Texture" id=1] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 7.95021, 8.07351 ) +[sub_resource type="Animation" id=2] +resource_name = "Sparkle" +length = 2.0 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.5, 1, 1.5 ), +"transitions": PoolRealArray( 1, 1, 1, 1 ), +"update": 1, +"values": [ 0, 1, 2, 3 ] +} + [node name="Star" type="RigidBody2D"] collision_layer = 4 collision_mask = 0 @@ -15,3 +32,10 @@ shape = SubResource( 1 ) [node name="Sprite" type="Sprite" parent="."] texture = ExtResource( 1 ) +hframes = 4 +frame = 2 + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +autoplay = "Sparkle" +method_call_mode = 1 +anims/Sparkle = SubResource( 2 ) diff --git a/Levels/Level 1.tscn b/Levels/Level 1.tscn index bcb87be..4294265 100644 --- a/Levels/Level 1.tscn +++ b/Levels/Level 1.tscn @@ -64,3 +64,12 @@ position = Vector2( 323.666, 161.038 ) [node name="HUD" parent="." instance=ExtResource( 2 )] [node name="Pause Screen" parent="." instance=ExtResource( 3 )] + +[node name="Map_boundary" type="RigidBody2D" parent="."] +collision_layer = 7 +collision_mask = 7 +mode = 1 + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Map_boundary"] +build_mode = 1 +polygon = PoolVector2Array( 0.762451, -22.0982, 427.859, -18.7308, 425.053, 245.609, -22.248, 248.976, -21.1256, -22.6594, -0.589813, -21.9661, -0.589806, 225.272, 400.359, 224.843, 399.969, -0.312477, 0.455406, -0.154987 ) diff --git a/Sprites/Assets/blue_star_225.png b/Sprites/Assets/blue_star_225.png new file mode 100644 index 0000000000000000000000000000000000000000..3f4bc92303dcd292890efb9f734253a8279da48a GIT binary patch literal 389 zcmV;00eb$4P)YAX9X8WNB|8RBvx=!KdMT0003H zNkl2(Po8I z9sY2}+`~o+`WKB>h;nMu^Q+0#nVSNM?2~^#!jY&W+-!wV*2?4wSZ=V1F`xbw^i~;@Y zG&vI6`!a=SP&5qiSsl#WrXihZ^yC}>yBH(jd&x1%`52=Yn-!)=ki$77ak_@H<7Ix3 jM625X{b-c`?Ki#yG>EI=A8i{H00000NkvXXu0mjfOT3x% literal 0 HcmV?d00001 diff --git a/Sprites/Assets/blue_star_225.png.import b/Sprites/Assets/blue_star_225.png.import new file mode 100644 index 0000000..a4d7706 --- /dev/null +++ b/Sprites/Assets/blue_star_225.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/blue_star_225.png-5b00146bb430703346fdaaa520f40253.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Assets/blue_star_225.png" +dest_files=[ "res://.import/blue_star_225.png-5b00146bb430703346fdaaa520f40253.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Sprites/Assets/blue_star_45.png b/Sprites/Assets/blue_star_45.png new file mode 100644 index 0000000000000000000000000000000000000000..652b5d5ea2ef912c22c3721374086ef119d70431 GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGLLkg|>2BR0prCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{LzR?s>X6hFF|_dU<2kp#X`a zAODNWsyMa?ae12Gcc|t3XzMh+$+@s|LUyK^qYHcIg9qLo*UNfk@5nMwYUog#e4_Nl zH8G)r%lS5k^DWx_HJ0vpcBGdnu7mqT{KgWUUo#uTA6bcg`t0%Z^#Oq!*G%K0Lre7k zbpK&rvCHk!szuU_AuRuvHQIJxSS;L`tZ2mOaBlmI*=%MFf)2-1x*l1IZ?OKnuj9qh zv-8(%JCtv~p-#u}Bx{LpoL5s}ZfkwOjY8oj5xZ{_*b8L2cix#?vz(_ay({1UNK|9s iI-&LRKJwK+Wa59>`0&2hv<9G089ZJ6T-G@yGywpCHHh*6 literal 0 HcmV?d00001 diff --git a/Sprites/Assets/blue_star_45.png.import b/Sprites/Assets/blue_star_45.png.import new file mode 100644 index 0000000..a9e3cf4 --- /dev/null +++ b/Sprites/Assets/blue_star_45.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/blue_star_45.png-3d076c408f8cdbf88a33f4a91f0e7375.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Assets/blue_star_45.png" +dest_files=[ "res://.import/blue_star_45.png-3d076c408f8cdbf88a33f4a91f0e7375.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Sprites/Assets/bule_star_sprite_spread.png b/Sprites/Assets/bule_star_sprite_spread.png new file mode 100644 index 0000000000000000000000000000000000000000..5e040884f5ca40002453fd4055b34a9a54efee3b GIT binary patch literal 746 zcmVYAX9X8WNB|8RBvx=!KdMT0007Y zNklst|xqiv%Xkbm{=_FM#B^)mKKD< z!sur(ws!^1VSY#Nv&+q`yK}b}F2tK=?`CJ`&HKGKZ~o(Ht%*0O zr~(8&LMlYmANagt$eI@i5IQeHhmoq|wHP)C9RMQd13!6i2*U|MDm-8$@VT%u=|-U0 z_N8JJ_!Ic(L;$w)QPkrZVEz9Gf>d~ckCuw+?3l@*2cza)y#=K_)S83OAgQR9@`zd! ziaFEwI4t#%%nA>jGfO4S&P!fcz?PIqX$gU7l=E?M3!uCy^ z$6NcU6P@2VL+B;&HqF3CcTB$vLcN8qHO+4uqP>vWF?dqIb2$+fUx0OBe}01J%Tr8B z<%aO_5WRQa2|fy7xnQ29JQQc&i7JCqsSF=hTch(b)Q^h$?{9-Px%icM c7_Y;B0k(+l@H1e+EdT%j07*qoM6N<$g8oiSpa1{> literal 0 HcmV?d00001 diff --git a/Sprites/Assets/bule_star_sprite_spread.png.import b/Sprites/Assets/bule_star_sprite_spread.png.import new file mode 100644 index 0000000..1918ba9 --- /dev/null +++ b/Sprites/Assets/bule_star_sprite_spread.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/bule_star_sprite_spread.png-38c7879008f2591d865215d456421085.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Assets/bule_star_sprite_spread.png" +dest_files=[ "res://.import/bule_star_sprite_spread.png-38c7879008f2591d865215d456421085.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 From e438b7bbebfdf28f893ae501d0b87b9384707cad Mon Sep 17 00:00:00 2001 From: Jane Cho Date: Wed, 8 Dec 2021 21:18:44 -0600 Subject: [PATCH 2/3] debugger warning gone null -> pass --- Enemies/Dark Matter.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Enemies/Dark Matter.gd b/Enemies/Dark Matter.gd index 1566f74..3ddba5e 100644 --- a/Enemies/Dark Matter.gd +++ b/Enemies/Dark Matter.gd @@ -59,7 +59,7 @@ func _on_Star_detect_body_exited(_body): #print("obstacle exited") #if _body.name == 'Obstacle': #obstacle = null - null + pass func _on_Timer_timeout(): #print("time out") From 1f2cc08791fbd18099a76e33af4ff8f6c0838b6a Mon Sep 17 00:00:00 2001 From: Jane Cho Date: Wed, 8 Dec 2021 22:09:40 -0600 Subject: [PATCH 3/3] enemy update player now take damage from enemy; barrier time 10-> 5sec; enemy 1 mask change --- Enemies/Dark Matter.gd | 2 +- Enemies/Dark Matter.tscn | 12 ++++++++---- Levels/Level 1.tscn | 1 - 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Enemies/Dark Matter.gd b/Enemies/Dark Matter.gd index 3ddba5e..dfbe877 100644 --- a/Enemies/Dark Matter.gd +++ b/Enemies/Dark Matter.gd @@ -9,7 +9,7 @@ var speed : = 0.5 var position_tracker = 0.0 var player = null var obstacle = null -var DisplayValue = 10 +var DisplayValue = 5 var health: int = 2 # Called when the node enters the scene tree for the first time. func _ready() -> void: diff --git a/Enemies/Dark Matter.tscn b/Enemies/Dark Matter.tscn index b97f4ef..1f55be0 100644 --- a/Enemies/Dark Matter.tscn +++ b/Enemies/Dark Matter.tscn @@ -15,7 +15,9 @@ extents = Vector2( 5.48996, 5.06427 ) [sub_resource type="RectangleShape2D" id=4] extents = Vector2( 5.50204, 4.89798 ) -[node name="Dark Matter" type="KinematicBody2D"] +[node name="Dark Matter" type="KinematicBody2D" groups=[ +"enemy", +]] collision_layer = 2 collision_mask = 6 script = ExtResource( 2 ) @@ -42,11 +44,13 @@ shape = SubResource( 3 ) [node name="Timer" type="Timer" parent="."] -[node name="Hitbox" type="Area2D" parent="."] +[node name="Dark_hitbox" type="Area2D" parent="." groups=[ +"enemy_hitbox_1", +]] collision_layer = 4 collision_mask = 2 -[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="Dark_hitbox"] shape = SubResource( 4 ) [connection signal="body_entered" from="Player_detect" to="." method="_on_Player_detect_body_entered"] @@ -54,4 +58,4 @@ shape = SubResource( 4 ) [connection signal="body_entered" from="Star_detect" to="." method="_on_Star_detect_body_entered"] [connection signal="body_exited" from="Star_detect" to="." method="_on_Star_detect_body_exited"] [connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"] -[connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"] +[connection signal="area_entered" from="Dark_hitbox" to="." method="_on_Hitbox_area_entered"] diff --git a/Levels/Level 1.tscn b/Levels/Level 1.tscn index 4294265..ada78df 100644 --- a/Levels/Level 1.tscn +++ b/Levels/Level 1.tscn @@ -36,7 +36,6 @@ limit_bottom = 225 [node name="Dark Matter" parent="YSort/Enemies" instance=ExtResource( 6 )] position = Vector2( 97.0154, 82.0323 ) -collision_mask = 0 [node name="Dark Matter2" parent="YSort/Enemies" instance=ExtResource( 6 )] position = Vector2( 205.006, 50.8542 )