Merge pull request #25 from Nogal/death

made death more interesting

assets/sfx/splash.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://cbul2saq2sblr"
+path="res://.godot/imported/splash.wav-6d25b0162043c137e6720c8dc1c3c58c.sample"
+
+[deps]
+
+source_file="res://assets/sfx/splash.wav"
+dest_files=["res://.godot/imported/splash.wav-6d25b0162043c137e6720c8dc1c3c58c.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

locale/locale.csv

@@ -3,3 +3,5 @@ KEY_TITLE,FISHY,フィッシ～
 KEY_START,Start,開始
 KEY_EXIT,Exit,終了
 KEY_LANGUAGE,日本語,English
+KEY_MENU,Menu,メニュー
+KEY_RETRY,Retry,リトライ

src/Levels/level1.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=5 format=3 uid="uid://b3p25spu1ftcv"]
+[gd_scene load_steps=6 format=3 uid="uid://b3p25spu1ftcv"]
 
 [ext_resource type="TileSet" uid="uid://chvosbfmhn68f" path="res://src/Levels/level_tileset.tres" id="1_sheck"]
 [ext_resource type="PackedScene" uid="uid://d2gfyw8jpq0xb" path="res://src/Game/bones_display.tscn" id="2_2uunh"]
 [ext_resource type="PackedScene" uid="uid://djkdm2yb64ss4" path="res://src/Player/steven.tscn" id="2_xfg7s"]
 [ext_resource type="PackedScene" uid="uid://d2fkm4okjmlmb" path="res://src/Enemies/spawner.tscn" id="5_2nq7k"]
+[ext_resource type="PackedScene" uid="uid://bd05037eytelx" path="res://src/menu/death_menu.tscn" id="5_eumyr"]
 
 [node name="Level1" type="Node2D"]
 
@@ -32,4 +33,7 @@ position = Vector2(-100, 305)
 [node name="Spawner2" parent="." instance=ExtResource("5_2nq7k")]
 position = Vector2(1249, 300)
 
+[node name="DeathMenu" parent="." instance=ExtResource("5_eumyr")]
+
 [connection signal="eat_counter_increased" from="Steven" to="BonesDisplay" method="_on_steven_eat_counter_increased"]
+[connection signal="steven_died" from="Steven" to="DeathMenu" method="_on_steven_died"]

src/Player/steven.gd

@@ -7,11 +7,15 @@ const FRICTION = 250
 var direction = "right"
 var input = Vector2.ZERO
 
+var dead = false
+
 @onready var screen_size = get_viewport_rect().size
 
 @onready var number_eaten = 0
 
 signal eat_counter_increased
+signal steven_died
+
 # Called when the node enters the scene tree for the first time.
 func _ready():
 	self.scale = self.scale * 0.5
@@ -38,7 +42,8 @@ func _physics_process(delta):
 	player_movement(delta)
 
 func player_movement(delta):
-	input = get_input()
+	if not dead:
+		input = get_input()
 
 	if input == Vector2.ZERO:
 		if velocity.length() > (FRICTION * delta):
@@ -54,6 +59,9 @@ func player_movement(delta):
 	if input.x < 0 and get_node("StevenSprite").is_flipped_h() == false:
 		get_node("StevenSprite").set_flip_h(true)
 
+	if dead:
+		velocity = Vector2.ZERO
+
 	move_and_slide()
 
 func get_input():
@@ -62,12 +70,18 @@ func get_input():
 	return input.normalized()
 
 func die():
+	dead = true
+	get_node("StevenSprite").set_flip_v(true)
 	MusicPlayer.queue_song(1)
+	get_node("DieSound").play()
+	get_tree().paused = true
+	steven_died.emit()
 	SceneManager.change_scene("res://src/menu/main_menu.tscn")
 
 func _on_body_area_entered(area):
-	if area.size() > self.scale:
-		die()
-	else:
-		grow_steven_grow()
+	if not dead:
+		if area.size() > self.scale:
+			die()
+		else:
+			grow_steven_grow()
 

src/Player/steven.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=6 format=3 uid="uid://djkdm2yb64ss4"]
+[gd_scene load_steps=7 format=3 uid="uid://djkdm2yb64ss4"]
 
 [ext_resource type="Script" path="res://src/Player/steven.gd" id="1_mfkg0"]
 [ext_resource type="Texture2D" uid="uid://bybqr876fm8l0" path="res://assets/art/fishPack_vector.svg" id="2_f8ojf"]
 [ext_resource type="AudioStream" uid="uid://pyuqtlc2pc0s" path="res://assets/sfx/eating-sound-effect-36186.mp3" id="3_todop"]
+[ext_resource type="AudioStream" uid="uid://cbul2saq2sblr" path="res://assets/sfx/splash.wav" id="4_kkwhg"]
 
 [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_fxg45"]
 radius = 8.0
@@ -39,4 +40,8 @@ shape = SubResource("CapsuleShape2D_ih3yo")
 [node name="Burp" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("3_todop")
 
+[node name="DieSound" type="AudioStreamPlayer2D" parent="."]
+process_mode = 3
+stream = ExtResource("4_kkwhg")
+
 [connection signal="area_entered" from="BodyArea" to="." method="_on_body_area_entered"]

src/menu/death_menu.gd

@@ -0,0 +1,31 @@
+extends CanvasLayer
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	self.visible = false
+	pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+func _process(delta):
+	pass
+
+
+func _on_steven_died():
+	self.visible = true
+	pass # Replace with function body.
+
+func unpause():
+	get_tree().paused = false
+	self.visible = false
+
+func _on_retry_pressed():
+	unpause()
+	SceneManager.change_scene("res://src/Levels/level1.tscn")
+
+
+
+func _on_menu_pressed():
+	unpause()
+	SceneManager.change_scene("res://src/menu/main_menu.tscn")

src/menu/death_menu.tscn

@@ -0,0 +1,24 @@
+[gd_scene load_steps=2 format=3 uid="uid://bd05037eytelx"]
+
+[ext_resource type="Script" path="res://src/menu/death_menu.gd" id="1_5cq1b"]
+
+[node name="DeathMenu" type="CanvasLayer"]
+process_mode = 3
+script = ExtResource("1_5cq1b")
+
+[node name="Retry" type="Button" parent="."]
+offset_left = 256.0
+offset_top = 448.0
+offset_right = 448.0
+offset_bottom = 512.0
+text = "KEY_RETRY"
+
+[node name="Menu" type="Button" parent="."]
+offset_left = 704.0
+offset_top = 448.0
+offset_right = 896.0
+offset_bottom = 512.0
+text = "KEY_MENU"
+
+[connection signal="pressed" from="Retry" to="." method="_on_retry_pressed"]
+[connection signal="pressed" from="Menu" to="." method="_on_menu_pressed"]

src/music/music_player.tscn

@@ -4,6 +4,7 @@
 [ext_resource type="Script" path="res://src/music/MusicPlayer.gd" id="2_tppjg"]
 
 [node name="MusicPlayer" type="AudioStreamPlayer2D"]
+process_mode = 3
 stream = ExtResource("1_8kvy4")
 autoplay = true
 script = ExtResource("2_tppjg")