diff --git a/src/.import/Cave Rain.ogg-7562433396bd739ee2c857f7174ded16.md5 b/src/.import/Cave Rain.ogg-7562433396bd739ee2c857f7174ded16.md5 new file mode 100644 index 0000000..abe8811 --- /dev/null +++ b/src/.import/Cave Rain.ogg-7562433396bd739ee2c857f7174ded16.md5 @@ -0,0 +1,3 @@ +source_md5="09903b0fee40af67c96f207cf4da7531" +dest_md5="067cfe7442d65c1c2ea57c908ad4cf77" + diff --git a/src/.import/Cave Rain.ogg-a243dd603ec7c901e0dfb712a1ab4fa8.md5 b/src/.import/Cave Rain.ogg-a243dd603ec7c901e0dfb712a1ab4fa8.md5 new file mode 100644 index 0000000..abe8811 --- /dev/null +++ b/src/.import/Cave Rain.ogg-a243dd603ec7c901e0dfb712a1ab4fa8.md5 @@ -0,0 +1,3 @@ +source_md5="09903b0fee40af67c96f207cf4da7531" +dest_md5="067cfe7442d65c1c2ea57c908ad4cf77" + diff --git a/src/.import/Cave Rain.ogg-a243dd603ec7c901e0dfb712a1ab4fa8.oggstr b/src/.import/Cave Rain.ogg-a243dd603ec7c901e0dfb712a1ab4fa8.oggstr new file mode 100644 index 0000000..29179ab Binary files /dev/null and b/src/.import/Cave Rain.ogg-a243dd603ec7c901e0dfb712a1ab4fa8.oggstr differ diff --git a/src/.import/Cave Rain.ogg-c608263bdc0cc68180dc6aae68e61e4d.md5 b/src/.import/Cave Rain.ogg-c608263bdc0cc68180dc6aae68e61e4d.md5 new file mode 100644 index 0000000..abe8811 --- /dev/null +++ b/src/.import/Cave Rain.ogg-c608263bdc0cc68180dc6aae68e61e4d.md5 @@ -0,0 +1,3 @@ +source_md5="09903b0fee40af67c96f207cf4da7531" +dest_md5="067cfe7442d65c1c2ea57c908ad4cf77" + diff --git a/src/.import/Cave Rain.ogg-c608263bdc0cc68180dc6aae68e61e4d.oggstr b/src/.import/Cave Rain.ogg-c608263bdc0cc68180dc6aae68e61e4d.oggstr new file mode 100644 index 0000000..29179ab Binary files /dev/null and b/src/.import/Cave Rain.ogg-c608263bdc0cc68180dc6aae68e61e4d.oggstr differ diff --git a/src/.import/River Loop.ogg-0a07eaca586df424e5d77e44f8bfe023.md5 b/src/.import/River Loop.ogg-0a07eaca586df424e5d77e44f8bfe023.md5 new file mode 100644 index 0000000..5cc2cc2 --- /dev/null +++ b/src/.import/River Loop.ogg-0a07eaca586df424e5d77e44f8bfe023.md5 @@ -0,0 +1,3 @@ +source_md5="da20687cef0efec626429d20b06c2db0" +dest_md5="bd0be44ecba37de8a332fadf938cb7d1" + diff --git a/src/.import/River Loop.ogg-0a07eaca586df424e5d77e44f8bfe023.oggstr b/src/.import/River Loop.ogg-0a07eaca586df424e5d77e44f8bfe023.oggstr new file mode 100644 index 0000000..71b5e83 Binary files /dev/null and b/src/.import/River Loop.ogg-0a07eaca586df424e5d77e44f8bfe023.oggstr differ diff --git a/src/.import/River Loop.ogg-295559b5ba019bef92488bd50298027d.md5 b/src/.import/River Loop.ogg-295559b5ba019bef92488bd50298027d.md5 new file mode 100644 index 0000000..5cc2cc2 --- /dev/null +++ b/src/.import/River Loop.ogg-295559b5ba019bef92488bd50298027d.md5 @@ -0,0 +1,3 @@ +source_md5="da20687cef0efec626429d20b06c2db0" +dest_md5="bd0be44ecba37de8a332fadf938cb7d1" + diff --git a/src/.import/River Loop.ogg-7cb473175ecc5a745f15cf05960839cc.md5 b/src/.import/River Loop.ogg-7cb473175ecc5a745f15cf05960839cc.md5 new file mode 100644 index 0000000..5cc2cc2 --- /dev/null +++ b/src/.import/River Loop.ogg-7cb473175ecc5a745f15cf05960839cc.md5 @@ -0,0 +1,3 @@ +source_md5="da20687cef0efec626429d20b06c2db0" +dest_md5="bd0be44ecba37de8a332fadf938cb7d1" + diff --git a/src/.import/River Loop.ogg-7cb473175ecc5a745f15cf05960839cc.oggstr b/src/.import/River Loop.ogg-7cb473175ecc5a745f15cf05960839cc.oggstr new file mode 100644 index 0000000..71b5e83 Binary files /dev/null and b/src/.import/River Loop.ogg-7cb473175ecc5a745f15cf05960839cc.oggstr differ diff --git a/src/.import/cave.ogg-198a76189e6b36331adeab63e1ef7e36.md5 b/src/.import/cave.ogg-198a76189e6b36331adeab63e1ef7e36.md5 new file mode 100644 index 0000000..abe8811 --- /dev/null +++ b/src/.import/cave.ogg-198a76189e6b36331adeab63e1ef7e36.md5 @@ -0,0 +1,3 @@ +source_md5="09903b0fee40af67c96f207cf4da7531" +dest_md5="067cfe7442d65c1c2ea57c908ad4cf77" + diff --git a/src/.import/cave.ogg-198a76189e6b36331adeab63e1ef7e36.oggstr b/src/.import/cave.ogg-198a76189e6b36331adeab63e1ef7e36.oggstr new file mode 100644 index 0000000..29179ab Binary files /dev/null and b/src/.import/cave.ogg-198a76189e6b36331adeab63e1ef7e36.oggstr differ diff --git a/src/.import/goblinattack.ogg-d8dfb5cd7cc15c592475e2aa456e4fed.md5 b/src/.import/goblinattack.ogg-d8dfb5cd7cc15c592475e2aa456e4fed.md5 new file mode 100644 index 0000000..ecc2812 --- /dev/null +++ b/src/.import/goblinattack.ogg-d8dfb5cd7cc15c592475e2aa456e4fed.md5 @@ -0,0 +1,3 @@ +source_md5="f1dc44227f96ab85d06a5d70ff5333c9" +dest_md5="4c1f41be1aa1f58be27a6e325066cdf9" + diff --git a/src/.import/goblinattack.ogg-d8dfb5cd7cc15c592475e2aa456e4fed.oggstr b/src/.import/goblinattack.ogg-d8dfb5cd7cc15c592475e2aa456e4fed.oggstr new file mode 100644 index 0000000..467a4ca Binary files /dev/null and b/src/.import/goblinattack.ogg-d8dfb5cd7cc15c592475e2aa456e4fed.oggstr differ diff --git a/src/.import/goblininjured.ogg-4f045964f09c14a047b85e5d55f52c0e.md5 b/src/.import/goblininjured.ogg-4f045964f09c14a047b85e5d55f52c0e.md5 new file mode 100644 index 0000000..67a3c82 --- /dev/null +++ b/src/.import/goblininjured.ogg-4f045964f09c14a047b85e5d55f52c0e.md5 @@ -0,0 +1,3 @@ +source_md5="116ff4ad0cff1e0a91b3674c1570a960" +dest_md5="7cb1e9540e11ac670c622f32f15ff9f5" + diff --git a/src/.import/goblininjured.ogg-4f045964f09c14a047b85e5d55f52c0e.oggstr b/src/.import/goblininjured.ogg-4f045964f09c14a047b85e5d55f52c0e.oggstr new file mode 100644 index 0000000..3e9e06d Binary files /dev/null and b/src/.import/goblininjured.ogg-4f045964f09c14a047b85e5d55f52c0e.oggstr differ diff --git a/src/.import/river.ogg-c864b7214f7dbc2ad2876d500185ab51.md5 b/src/.import/river.ogg-c864b7214f7dbc2ad2876d500185ab51.md5 new file mode 100644 index 0000000..5cc2cc2 --- /dev/null +++ b/src/.import/river.ogg-c864b7214f7dbc2ad2876d500185ab51.md5 @@ -0,0 +1,3 @@ +source_md5="da20687cef0efec626429d20b06c2db0" +dest_md5="bd0be44ecba37de8a332fadf938cb7d1" + diff --git a/src/.import/river.ogg-c864b7214f7dbc2ad2876d500185ab51.oggstr b/src/.import/river.ogg-c864b7214f7dbc2ad2876d500185ab51.oggstr new file mode 100644 index 0000000..71b5e83 Binary files /dev/null and b/src/.import/river.ogg-c864b7214f7dbc2ad2876d500185ab51.oggstr differ diff --git a/src/.import/slimeattack.ogg-3600a8db8274ad1226c3726447d2094f.md5 b/src/.import/slimeattack.ogg-3600a8db8274ad1226c3726447d2094f.md5 new file mode 100644 index 0000000..a3be9b6 --- /dev/null +++ b/src/.import/slimeattack.ogg-3600a8db8274ad1226c3726447d2094f.md5 @@ -0,0 +1,3 @@ +source_md5="571f3f4f8105da79aa8445c0d20e4d25" +dest_md5="d4dff24520433055e9da7f21ae29352a" + diff --git a/src/.import/slimeattack.ogg-3600a8db8274ad1226c3726447d2094f.oggstr b/src/.import/slimeattack.ogg-3600a8db8274ad1226c3726447d2094f.oggstr new file mode 100644 index 0000000..a3c0701 Binary files /dev/null and b/src/.import/slimeattack.ogg-3600a8db8274ad1226c3726447d2094f.oggstr differ diff --git a/src/Audio/Background/cave.ogg b/src/Audio/Background/cave.ogg new file mode 100644 index 0000000..c373f45 Binary files /dev/null and b/src/Audio/Background/cave.ogg differ diff --git a/src/Audio/Background/cave.ogg.import b/src/Audio/Background/cave.ogg.import new file mode 100644 index 0000000..47ab1a6 --- /dev/null +++ b/src/Audio/Background/cave.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/cave.ogg-198a76189e6b36331adeab63e1ef7e36.oggstr" + +[deps] + +source_file="res://Audio/Background/cave.ogg" +dest_files=[ "res://.import/cave.ogg-198a76189e6b36331adeab63e1ef7e36.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/src/Audio/Background/river.ogg b/src/Audio/Background/river.ogg new file mode 100644 index 0000000..0874b34 Binary files /dev/null and b/src/Audio/Background/river.ogg differ diff --git a/src/Audio/Background/river.ogg.import b/src/Audio/Background/river.ogg.import new file mode 100644 index 0000000..70c74a3 --- /dev/null +++ b/src/Audio/Background/river.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/river.ogg-c864b7214f7dbc2ad2876d500185ab51.oggstr" + +[deps] + +source_file="res://Audio/Background/river.ogg" +dest_files=[ "res://.import/river.ogg-c864b7214f7dbc2ad2876d500185ab51.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/src/Audio/Hits/goblinattack.ogg b/src/Audio/Hits/goblinattack.ogg new file mode 100644 index 0000000..3b8b58d Binary files /dev/null and b/src/Audio/Hits/goblinattack.ogg differ diff --git a/src/Audio/Hits/goblinattack.ogg.import b/src/Audio/Hits/goblinattack.ogg.import new file mode 100644 index 0000000..ca6a80c --- /dev/null +++ b/src/Audio/Hits/goblinattack.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/goblinattack.ogg-d8dfb5cd7cc15c592475e2aa456e4fed.oggstr" + +[deps] + +source_file="res://Audio/Hits/goblinattack.ogg" +dest_files=[ "res://.import/goblinattack.ogg-d8dfb5cd7cc15c592475e2aa456e4fed.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/src/Audio/Hits/goblininjured.ogg b/src/Audio/Hits/goblininjured.ogg new file mode 100644 index 0000000..b6af092 Binary files /dev/null and b/src/Audio/Hits/goblininjured.ogg differ diff --git a/src/Audio/Hits/goblininjured.ogg.import b/src/Audio/Hits/goblininjured.ogg.import new file mode 100644 index 0000000..05b83db --- /dev/null +++ b/src/Audio/Hits/goblininjured.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/goblininjured.ogg-4f045964f09c14a047b85e5d55f52c0e.oggstr" + +[deps] + +source_file="res://Audio/Hits/goblininjured.ogg" +dest_files=[ "res://.import/goblininjured.ogg-4f045964f09c14a047b85e5d55f52c0e.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/src/Audio/Hits/slimeattack.ogg b/src/Audio/Hits/slimeattack.ogg new file mode 100644 index 0000000..b480af0 Binary files /dev/null and b/src/Audio/Hits/slimeattack.ogg differ diff --git a/src/Audio/Hits/slimeattack.ogg.import b/src/Audio/Hits/slimeattack.ogg.import new file mode 100644 index 0000000..d555c5a --- /dev/null +++ b/src/Audio/Hits/slimeattack.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/slimeattack.ogg-3600a8db8274ad1226c3726447d2094f.oggstr" + +[deps] + +source_file="res://Audio/Hits/slimeattack.ogg" +dest_files=[ "res://.import/slimeattack.ogg-3600a8db8274ad1226c3726447d2094f.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/src/NPCs/goblin.gd b/src/NPCs/goblin.gd index 9b25dac..ec41925 100644 --- a/src/NPCs/goblin.gd +++ b/src/NPCs/goblin.gd @@ -30,5 +30,10 @@ func _on_Hitbox_area_entered(area): func _on_Hurtbox_area_entered(area): + $Hurtbox/death.play() + pass # Replace with function body. + + +func _on_death_finished(): queue_free() pass # Replace with function body. diff --git a/src/NPCs/goblin.tscn b/src/NPCs/goblin.tscn index 758eb98..6d0d67b 100644 --- a/src/NPCs/goblin.tscn +++ b/src/NPCs/goblin.tscn @@ -1,12 +1,13 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://NPCs/goblin.png" type="Texture" id=1] [ext_resource path="res://NPCs/goblin.gd" type="Script" id=2] - -[sub_resource type="RectangleShape2D" id=2] -extents = Vector2( 3.90875, 3.7602 ) +[ext_resource path="res://Audio/Hits/goblininjured.ogg" type="AudioStream" id=3] [sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 3.90875, 3.7602 ) + +[sub_resource type="RectangleShape2D" id=2] extents = Vector2( 4.13172, 3.98318 ) [sub_resource type="RectangleShape2D" id=3] @@ -20,20 +21,24 @@ position = Vector2( 0.380203, -0.127379 ) texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource( 2 ) +shape = SubResource( 1 ) [node name="Hitbox" type="Area2D" parent="."] collision_layer = 32 collision_mask = 16 [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"] -shape = SubResource( 1 ) +shape = SubResource( 2 ) [node name="Hurtbox" type="Area2D" parent="."] collision_layer = 64 collision_mask = 2 +[node name="death" type="AudioStreamPlayer2D" parent="Hurtbox"] +stream = ExtResource( 3 ) + [node name="CollisionShape2D" type="CollisionShape2D" parent="Hurtbox"] shape = SubResource( 3 ) [connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"] [connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"] +[connection signal="finished" from="Hurtbox/death" to="." method="_on_death_finished"] diff --git a/src/NPCs/moss.gd b/src/NPCs/moss.gd index 3b1607a..17b7f3c 100644 --- a/src/NPCs/moss.gd +++ b/src/NPCs/moss.gd @@ -22,5 +22,11 @@ func _on_Hitbox_area_entered(area): func _on_Hurtbox_area_entered(area): + $Hurtbox/death.play() + pass # Replace with function body. + + +func _on_death_finished(): queue_free() pass # Replace with function body. + diff --git a/src/NPCs/moss.tscn b/src/NPCs/moss.tscn index b13c569..1ce8858 100644 --- a/src/NPCs/moss.tscn +++ b/src/NPCs/moss.tscn @@ -1,12 +1,13 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://NPCs/moss.png" type="Texture" id=1] [ext_resource path="res://NPCs/moss.gd" type="Script" id=2] - -[sub_resource type="RectangleShape2D" id=2] -extents = Vector2( 3.73001, 3.41657 ) +[ext_resource path="res://Audio/Hits/slimeattack.ogg" type="AudioStream" id=3] [sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 3.73001, 3.41657 ) + +[sub_resource type="RectangleShape2D" id=2] extents = Vector2( 3.96625, 3.8103 ) [sub_resource type="RectangleShape2D" id=3] @@ -21,21 +22,24 @@ scale = Vector2( 1.02953, 0.990157 ) texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource( 2 ) +shape = SubResource( 1 ) [node name="Hitbox" type="Area2D" parent="."] collision_layer = 2147483650 collision_mask = 64 [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"] -shape = SubResource( 1 ) +shape = SubResource( 2 ) [node name="Hurtbox" type="Area2D" parent="."] collision_layer = 4 collision_mask = 8 +[node name="death" type="AudioStreamPlayer" parent="Hurtbox"] +stream = ExtResource( 3 ) + [node name="CollisionShape2D" type="CollisionShape2D" parent="Hurtbox"] shape = SubResource( 3 ) [connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"] -[connection signal="area_shape_entered" from="Hitbox" to="." method="_on_Hitbox_area_shape_entered"] [connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"] +[connection signal="finished" from="Hurtbox/death" to="." method="_on_death_finished"] diff --git a/src/NPCs/ooze.gd b/src/NPCs/ooze.gd index a52b762..2c74805 100644 --- a/src/NPCs/ooze.gd +++ b/src/NPCs/ooze.gd @@ -29,5 +29,10 @@ func _on_Hitbox_area_entered(area): func _on_Hurtbox_area_entered(area): + $Hurtbox/death.play() + pass # Replace with function body. + + +func _on_death_finished(): queue_free() pass # Replace with function body. diff --git a/src/NPCs/ooze.tscn b/src/NPCs/ooze.tscn index 24209ea..6248e2a 100644 --- a/src/NPCs/ooze.tscn +++ b/src/NPCs/ooze.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://NPCs/ooze.png" type="Texture" id=1] [ext_resource path="res://NPCs/ooze.gd" type="Script" id=2] +[ext_resource path="res://Audio/Hits/goblinattack.ogg" type="AudioStream" id=3] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 4.57893, 3.98952 ) @@ -33,7 +34,11 @@ shape = SubResource( 2 ) collision_layer = 16 collision_mask = 32 +[node name="death" type="AudioStreamPlayer2D" parent="Hurtbox"] +stream = ExtResource( 3 ) + [node name="CollisionShape2D" type="CollisionShape2D" parent="Hurtbox"] shape = SubResource( 3 ) [connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"] [connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"] +[connection signal="finished" from="Hurtbox/death" to="." method="_on_death_finished"] diff --git a/src/World.tscn b/src/World.tscn index 831bb00..86635a6 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=15 format=2] [ext_resource path="res://Tilesets/stone.png" type="Texture" id=1] [ext_resource path="res://Tilesets/dirt.png" type="Texture" id=2] @@ -6,6 +6,7 @@ [ext_resource path="res://NPCs/goblin.tscn" type="PackedScene" id=4] [ext_resource path="res://NPCs/ooze.tscn" type="PackedScene" id=5] [ext_resource path="res://NPCs/moss.tscn" type="PackedScene" id=6] +[ext_resource path="res://Audio/Background/cave.ogg" type="AudioStream" id=7] [sub_resource type="ConvexPolygonShape2D" id=1] points = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 ) @@ -156,10 +157,14 @@ position = Vector2( 36, 20 ) position = Vector2( 44, 52 ) [node name="Goblin" parent="." instance=ExtResource( 4 )] -position = Vector2( 12, 20 ) +position = Vector2( 28, 52 ) [node name="Goblin2" parent="." instance=ExtResource( 4 )] position = Vector2( 28, 28 ) [node name="Ooze2" parent="." instance=ExtResource( 5 )] position = Vector2( 36, 52 ) + +[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource( 7 ) +autoplay = true diff --git a/src/project.godot b/src/project.godot index eb96b34..a880779 100644 --- a/src/project.godot +++ b/src/project.godot @@ -33,6 +33,10 @@ window/size/test_width=1280 window/size/test_height=720 window/stretch/mode="2d" +[gdnative] + +singletons=[ ] + [physics] common/physics_fps=5