diff --git a/enemies/boss/slime-impact-352473.mp3 b/enemies/boss/slime-impact-352473.mp3 new file mode 100644 index 0000000..02868a8 Binary files /dev/null and b/enemies/boss/slime-impact-352473.mp3 differ diff --git a/enemies/boss/slime-impact-352473.mp3.import b/enemies/boss/slime-impact-352473.mp3.import new file mode 100644 index 0000000..d3221ca --- /dev/null +++ b/enemies/boss/slime-impact-352473.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://ngkksuy3438s" +path="res://.godot/imported/slime-impact-352473.mp3-fb4475c7240b9b9964b3f9549708ada2.mp3str" + +[deps] + +source_file="res://enemies/boss/slime-impact-352473.mp3" +dest_files=["res://.godot/imported/slime-impact-352473.mp3-fb4475c7240b9b9964b3f9549708ada2.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/enemies/leech/giant_leech.tscn b/enemies/leech/giant_leech.tscn index 74de772..8e67243 100644 --- a/enemies/leech/giant_leech.tscn +++ b/enemies/leech/giant_leech.tscn @@ -12,7 +12,7 @@ size = Vector2(2, 24) scale = Vector2(1, 1.2) script = ExtResource("1_wfsrb") broadth = 400 -hp = 500 +hp = 300 [node name="Segments" type="Node2D" parent="."] diff --git a/enemies/leech/leech.tscn b/enemies/leech/leech.tscn index dd6f008..76c0c69 100644 --- a/enemies/leech/leech.tscn +++ b/enemies/leech/leech.tscn @@ -12,7 +12,7 @@ size = Vector2(2, 12) scale = Vector2(1, 1.2) script = ExtResource("1_6u582") broadth = 200 -hp = 250 +hp = 80 [node name="Segments" type="Node2D" parent="."] diff --git a/enemies/leech/segment.tscn b/enemies/leech/segment.tscn index 85a8274..36d90e9 100644 --- a/enemies/leech/segment.tscn +++ b/enemies/leech/segment.tscn @@ -21,6 +21,7 @@ scale = Vector2(2, 1) shape = SubResource("RectangleShape2D_fgt1l") [node name="EnemyHurtbox" parent="." node_paths=PackedStringArray("canvasItem") instance=ExtResource("3_sa5vt")] +collision_layer = 16 canvasItem = NodePath("..") flashColor = Color(2.00392, 2.00392, 2.00392, 1) diff --git a/traps/bear_trap.gd b/traps/bear_trap.gd index 8a074aa..50973e8 100644 --- a/traps/bear_trap.gd +++ b/traps/bear_trap.gd @@ -3,7 +3,7 @@ extends Trap @export var player_damage : int; @export var enemy_damage : int; - +var closed = false func damage_target(target: CollisionObject2D): if(target.get_collision_layer_value(3)): @@ -13,10 +13,20 @@ func damage_target(target: CollisionObject2D): func _on_area_2d_area_entered(area: Area2D) -> void: - damage_target(area) - queue_free() + if not closed: + damage_target(area) + closed = true + $AnimatedSprite2D.play("close") + await $AnimatedSprite2D.animation_finished + await get_tree().create_timer(0.1).timeout + queue_free() func _on_area_2d_body_entered(body: Node2D) -> void: - damage_target(body) - queue_free() + if not closed: + damage_target(body) + closed = true + $AnimatedSprite2D.play("close") + await $AnimatedSprite2D.animation_finished + await get_tree().create_timer(0.1).timeout + queue_free() diff --git a/traps/bear_trap.png b/traps/bear_trap.png new file mode 100644 index 0000000..15c87d8 Binary files /dev/null and b/traps/bear_trap.png differ diff --git a/traps/bear_trap.png.import b/traps/bear_trap.png.import new file mode 100644 index 0000000..162050c --- /dev/null +++ b/traps/bear_trap.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://iujiyx36vf62" +path="res://.godot/imported/bear_trap.png-96e0dc5d5000c7c52e451c81b6ba1b9a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://traps/bear_trap.png" +dest_files=["res://.godot/imported/bear_trap.png-96e0dc5d5000c7c52e451c81b6ba1b9a.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/traps/bear_trap.tscn b/traps/bear_trap.tscn index c48e204..ab249e2 100644 --- a/traps/bear_trap.tscn +++ b/traps/bear_trap.tscn @@ -1,12 +1,31 @@ -[gd_scene load_steps=5 format=3 uid="uid://h3caql0b6vft"] +[gd_scene load_steps=8 format=3 uid="uid://h3caql0b6vft"] [ext_resource type="Script" uid="uid://dttgoqksqnsm0" path="res://traps/bear_trap.gd" id="1_u48ys"] -[ext_resource type="Texture2D" uid="uid://cy70quh6k3s1j" path="res://icon.svg" id="2_mnxjq"] +[ext_resource type="Texture2D" uid="uid://72rbgxwnb0u4" path="res://traps/bear_trap_open.png" id="2_u17g6"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="3_mnxjq"] +[ext_resource type="Texture2D" uid="uid://ejor11sqt878" path="res://traps/bear_trap_closing.png" id="3_xgq7l"] +[ext_resource type="Texture2D" uid="uid://ci3qx0v5ksvjv" path="res://traps/bear_trap_closed.png" id="4_phfkt"] [sub_resource type="CircleShape2D" id="CircleShape2D_yh007"] radius = 30.0 +[sub_resource type="SpriteFrames" id="SpriteFrames_3n4a6"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("2_u17g6") +}, { +"duration": 1.0, +"texture": ExtResource("3_xgq7l") +}, { +"duration": 1.0, +"texture": ExtResource("4_phfkt") +}], +"loop": false, +"name": &"close", +"speed": 10.0 +}] + [node name="BearTrap" type="Node2D"] script = ExtResource("1_u48ys") player_damage = 2 @@ -21,10 +40,12 @@ position = Vector2(0, -15) scale = Vector2(1, 0.5) shape = SubResource("CircleShape2D_yh007") -[node name="Sprite2D" type="Sprite2D" parent="."] -self_modulate = Color(1, 0, 0, 1) -scale = Vector2(0.75, 0.1) -texture = ExtResource("2_mnxjq") +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +modulate = Color(2.1168277, 2.1168277, 2.1168277, 1) +position = Vector2(5.9604645e-08, -37.000004) +scale = Vector2(0.7, 0.7) +sprite_frames = SubResource("SpriteFrames_3n4a6") +animation = &"close" [node name="EarthAligner" parent="." instance=ExtResource("3_mnxjq")] diff --git a/traps/bear_trap_closed.png b/traps/bear_trap_closed.png new file mode 100644 index 0000000..d872623 Binary files /dev/null and b/traps/bear_trap_closed.png differ diff --git a/traps/bear_trap_closed.png.import b/traps/bear_trap_closed.png.import new file mode 100644 index 0000000..f241e10 --- /dev/null +++ b/traps/bear_trap_closed.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ci3qx0v5ksvjv" +path="res://.godot/imported/bear_trap_closed.png-ec30fe5f2fc4e7e6b04349aa4565872f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://traps/bear_trap_closed.png" +dest_files=["res://.godot/imported/bear_trap_closed.png-ec30fe5f2fc4e7e6b04349aa4565872f.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/traps/bear_trap_closing.png b/traps/bear_trap_closing.png new file mode 100644 index 0000000..5a9b1cb Binary files /dev/null and b/traps/bear_trap_closing.png differ diff --git a/traps/bear_trap_closing.png.import b/traps/bear_trap_closing.png.import new file mode 100644 index 0000000..0153e6f --- /dev/null +++ b/traps/bear_trap_closing.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ejor11sqt878" +path="res://.godot/imported/bear_trap_closing.png-27c745ad7fa916989609834e4cc93f5c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://traps/bear_trap_closing.png" +dest_files=["res://.godot/imported/bear_trap_closing.png-27c745ad7fa916989609834e4cc93f5c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/traps/bear_trap_open.png b/traps/bear_trap_open.png new file mode 100644 index 0000000..1a53cf8 Binary files /dev/null and b/traps/bear_trap_open.png differ diff --git a/traps/bear_trap_open.png.import b/traps/bear_trap_open.png.import new file mode 100644 index 0000000..9766313 --- /dev/null +++ b/traps/bear_trap_open.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://72rbgxwnb0u4" +path="res://.godot/imported/bear_trap_open.png-30413991e9433940c05325ed0600af25.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://traps/bear_trap_open.png" +dest_files=["res://.godot/imported/bear_trap_open.png-30413991e9433940c05325ed0600af25.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/ui/initial_text/initial_text.tscn b/ui/initial_text/initial_text.tscn index f7c0428..8a3b35e 100644 --- a/ui/initial_text/initial_text.tscn +++ b/ui/initial_text/initial_text.tscn @@ -101,7 +101,7 @@ theme_override_styles/panel = SubResource("StyleBoxFlat_ay53y") layout_mode = 2 theme = ExtResource("1_st7ea") bbcode_enabled = true -text = "They are hiding on the other side of the word — building towers to escape the rising [color=green] morass [/color]." +text = "They are hiding on the other side of the world — building towers to escape the rising [color=green] morass [/color]." horizontal_alignment = 1 vertical_alignment = 1