tweaked input latency?

.gitignore

@@ -4,3 +4,5 @@
 
 .DS_Store
 Thumbs.db
+
+.vscode/

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "godotTools.editorPath.godot4": "/Applications/Godot.app"
+}

assets/audio/music/game/comet_zap/04 Ranma's Home.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://dr0f3y1aux6nd"
+path="res://.godot/imported/04 Ranma's Home.mp3-ed796bdd417c6193706a950ff007255b.mp3str"
+
+[deps]
+
+source_file="res://assets/audio/music/game/comet_zap/04 Ranma's Home.mp3"
+dest_files=["res://.godot/imported/04 Ranma's Home.mp3-ed796bdd417c6193706a950ff007255b.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/music/game/comet_zap/game_over/Better Luck Next Time! - Mario Kart Wii (Soundtrack) [sI61TCby6Z4].mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://n0c01kuajxx5"
+path="res://.godot/imported/Better Luck Next Time! - Mario Kart Wii (Soundtrack) [sI61TCby6Z4].mp3-141d7e12733916776928a7373aa7f177.mp3str"
+
+[deps]
+
+source_file="res://assets/audio/music/game/comet_zap/game_over/Better Luck Next Time! - Mario Kart Wii (Soundtrack) [sI61TCby6Z4].mp3"
+dest_files=["res://.godot/imported/Better Luck Next Time! - Mario Kart Wii (Soundtrack) [sI61TCby6Z4].mp3-141d7e12733916776928a7373aa7f177.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/music/game/comet_zap/game_over/Finish Line (Lose) - Mario Kart Wii (Soundtrack) [Znjt4LvF4js].mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://cboj3eff78kep"
+path="res://.godot/imported/Finish Line (Lose) - Mario Kart Wii (Soundtrack) [Znjt4LvF4js].mp3-312f9d0d44463cbb684385f49abdfbc6.mp3str"
+
+[deps]
+
+source_file="res://assets/audio/music/game/comet_zap/game_over/Finish Line (Lose) - Mario Kart Wii (Soundtrack) [Znjt4LvF4js].mp3"
+dest_files=["res://.godot/imported/Finish Line (Lose) - Mario Kart Wii (Soundtrack) [Znjt4LvF4js].mp3-312f9d0d44463cbb684385f49abdfbc6.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/music/game/comet_zap/game_over/Losing Results (Race) - Mario Kart Wii (Soundtrack) [hmJPzte8nEI].mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://pfu68h7hatxm"
+path="res://.godot/imported/Losing Results (Race) - Mario Kart Wii (Soundtrack) [hmJPzte8nEI].mp3-86b11b6b9dd614e3d39664c381217f98.mp3str"
+
+[deps]
+
+source_file="res://assets/audio/music/game/comet_zap/game_over/Losing Results (Race) - Mario Kart Wii (Soundtrack) [hmJPzte8nEI].mp3"
+dest_files=["res://.godot/imported/Losing Results (Race) - Mario Kart Wii (Soundtrack) [hmJPzte8nEI].mp3-86b11b6b9dd614e3d39664c381217f98.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/music/game/comet_zap/game_over/Romeo Santos Eres Mía Audio [vY_3YrKtUUE].mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://c4drvuieit6x5"
+path="res://.godot/imported/Romeo Santos   Eres Mía Audio [vY_3YrKtUUE].mp3-658c1247871f6a4d74bd0695dc21c9d4.mp3str"
+
+[deps]
+
+source_file="res://assets/audio/music/game/comet_zap/game_over/Romeo Santos   Eres Mía Audio [vY_3YrKtUUE].mp3"
+dest_files=["res://.godot/imported/Romeo Santos   Eres Mía Audio [vY_3YrKtUUE].mp3-658c1247871f6a4d74bd0695dc21c9d4.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/music/menus/Mario Kart Wii Music - Menu (Medley) [fN2dJP0WLDQ].mp3.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://df31l8x4fxwf0"
-path="res://.godot/imported/Mario Kart Wii Music - Menu (Medley) [fN2dJP0WLDQ].mp3-441924e82909326119fa9f1a0e693115.mp3str"
-
-[deps]
-
-source_file="res://assets/audio/music/menus/Mario Kart Wii Music - Menu (Medley) [fN2dJP0WLDQ].mp3"
-dest_files=["res://.godot/imported/Mario Kart Wii Music - Menu (Medley) [fN2dJP0WLDQ].mp3-441924e82909326119fa9f1a0e693115.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

assets/audio/music/menus/MkWiiSelect.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://dqawqnbyqmgl5"
+path="res://.godot/imported/MkWiiSelect.mp3-ee42e424ae4b860c959c73fcf7f14df4.mp3str"
+
+[deps]
+
+source_file="res://assets/audio/music/menus/MkWiiSelect.mp3"
+dest_files=["res://.godot/imported/MkWiiSelect.mp3-ee42e424ae4b860c959c73fcf7f14df4.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/music/menus/MkWiiSetup.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://bgmdmkwn8cd8e"
+path="res://.godot/imported/MkWiiSetup.mp3-385cfc8bc3c7ffa42d6fbb90590b4899.mp3str"
+
+[deps]
+
+source_file="res://assets/audio/music/menus/MkWiiSetup.mp3"
+dest_files=["res://.godot/imported/MkWiiSetup.mp3-385cfc8bc3c7ffa42d6fbb90590b4899.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/sfx/break.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://b2xxkgi6bcfh2"
+path="res://.godot/imported/break.mp3-9e0a82c915fab2700f19164e60cad8e9.mp3str"
+
+[deps]
+
+source_file="res://assets/audio/sfx/break.mp3"
+dest_files=["res://.godot/imported/break.mp3-9e0a82c915fab2700f19164e60cad8e9.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/sfx/error.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://d4gn18sevuo2x"
+path="res://.godot/imported/error.mp3-9dd0dd0797fa1c3624344e5daaf7caec.mp3str"
+
+[deps]
+
+source_file="res://assets/audio/sfx/error.mp3"
+dest_files=["res://.godot/imported/error.mp3-9dd0dd0797fa1c3624344e5daaf7caec.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/visual/sprites/Hornet_Idle.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cif65rts2oljo"
+path="res://.godot/imported/Hornet_Idle.png-c4a98933d1285cde74a1aee36aaaa223.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/visual/sprites/Hornet_Idle.png"
+dest_files=["res://.godot/imported/Hornet_Idle.png-c4a98933d1285cde74a1aee36aaaa223.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

gameplay/word_sets/kiru.txt

@@ -1,4 +1,4 @@
-Kirubel'sPositivelyPreposterousPartyofParticularPwords Except there's extra space at the end and I don't know why
+Kirubel'sPositivelyPreposterousPartyofParticularPwords
 DAMON GANT
 NAGITO KOMAEDA
 KAZUMA KIRYU

gameplay/word_sets/lol - Copy.txt

@@ -1,10 +0,0 @@
-lol
-SIEMBRA
-JARED BERESFORD
-MAX IS GARDEN
-HELLO
-COMOS PARKS
-COSMOS SPARK
-SONIC
-DANGANRONPA
-RANMA

original data/images/sprites/cascaded2.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cywnqyuv5e46g"
+path="res://.godot/imported/cascaded2.png-c9c2ed91fa29fd638a6364717122b155.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://original data/images/sprites/cascaded2.png"
+dest_files=["res://.godot/imported/cascaded2.png-c9c2ed91fa29fd638a6364717122b155.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

scenes/game/comet_zap.gd

@@ -11,7 +11,6 @@ var word_set_array
 var alphabet = ["A","B","C","D","E","F","G","H","I","J","K","L","M","N",
 "O","P","Q","R","S","T","U","V","W","X","Y","Z"]
 var comets = []
-var comet_speed = 150
 var active
 
 # display
@@ -19,21 +18,29 @@ var viewport_size
 var scale_factor_x
 var scale_factor_y
 
-# numbers
+# difficulty
 var max_delay = 2
+var min_delay = .5
 var delay = max_delay
+var comet_speed = 250
+
+# numbers
 var spawn_timer = 0
 var max_character_count = 0
 
 # stats
 var health = 100
+var hit_count = 0.0
 var miss_count = 0.0
+var comets_processed = 0.0
 var total_comets = 0.0
 
 # ui init
+var on_top
 var hp_label
 var acc_label
 var miss_label
+var damage_overlay
 
 # objects
 var comet_source = preload("res://scenes/objects/game/comet.tscn")
@@ -44,14 +51,17 @@ var pause_menu
 func _ready() -> void:
 	# ready ui
 	viewport_size = get_viewport_rect().size
-	hp_label = self.get_node("OnTop").get_node("HUD").get_node("Stack").get_node("Health")
-	acc_label = self.get_node("OnTop").get_node("HUD").get_node("Stack").get_node("Accuracy")
-	miss_label = self.get_node("OnTop").get_node("HUD").get_node("Stack").get_node("MissCount")
+	on_top = self.get_node("OnTop")
+
+	hp_label = on_top.get_node("HUD").get_node("Stack").get_node("Health")
+	acc_label = on_top.get_node("HUD").get_node("Stack").get_node("Accuracy")
+	miss_label = on_top.get_node("HUD").get_node("Stack").get_node("MissCount")
+	damage_overlay = on_top.get_node("Damage")
 	
 	active = true
 	
-	pause_menu = self.get_node("OnTop").get_node("Pause")
-	fade = self.get_node("OnTop").get_node("Fade")
+	pause_menu = on_top.get_node("Pause")
+	fade = on_top.get_node("Fade")
 	fade.visible = true
 	var tween := create_tween()
 	tween.parallel().tween_property(fade, "modulate:a", 0, 1).set_trans(Tween.TRANS_SINE).set_ease(Tween.EASE_OUT)
@@ -80,18 +90,23 @@ func _ready() -> void:
 # Runs every frame
 func _process(delta: float) -> void:
 	if active:
+
+		if health <= 0:
+			game_over()
+
 		spawn_timer += delta
 		
 		hp_label.text = "HP: " + str(health)
 		miss_label.text = "X: " + str(miss_count)
-		if total_comets > 0:
-			var accper = (total_comets - miss_count)/(total_comets)*100
-			acc_label.text = "ACC: " + str(snapped(accper, .02)) + "%"
 		
 		if spawn_timer >= delay:
 			spawn_timer = 0
 			spawn_word()
 
+func calculate_accuracy():
+	var accper = (hit_count)/(comets_processed)*100
+	acc_label.text = "ACC: " + str(snapped(accper, .02)) + "%"
+
 func spawn_word():
 	var scan_commet = comet_source.instantiate()
 	var comet_width = scan_commet.get_node("Sprite").sprite_frames.get_frame_texture("comet",0).get_width()
@@ -100,24 +115,43 @@ func spawn_word():
 	var offset = comet_width
 	scan_commet.queue_free()
 	
-	for char in new_word:
-		if char != " ":
+	for chara in new_word:
+		if chara != " ":
 			var new_commet = comet_source.instantiate()
 			total_comets += 1
 			new_commet.position = Vector2(offset,-128)
-			new_commet.get_node("Sprite").get_node("Label").text = char
+			new_commet.get_node("Sprite").get_node("Label").text = chara
 			new_commet.speed = comet_speed
 			add_child(new_commet)
 			comets.append(new_commet)
 		offset += dist
 		
-	delay = randf_range(0.75,max_delay)
+	delay = randf_range(min_delay,max_delay)
 	
-func take_damage():
-	pass
+func miss(comet):
+	$Miss.play()
+	health -= comet.damage
+	comets_processed += 1
+	miss_count += 1.0
+	calculate_accuracy()
+	comets.erase(comet)
+	comet.queue_free()
+
+	var tween1 := create_tween()
+	tween1.parallel().tween_property(damage_overlay, "modulate:a", .5, .125).set_trans(Tween.TRANS_SINE).set_ease(Tween.EASE_OUT)
+
+	await tween1.finished
+
+	var tween2 := create_tween()
+	tween2.parallel().tween_property(damage_overlay, "modulate:a", 0, .125).set_trans(Tween.TRANS_SINE).set_ease(Tween.EASE_OUT)
 	
 func game_over():
-	pass
+	active = false
+	$BackgroundMusic.stop()
+	on_top.get_node("GameOver").visible = true
+	$Lose.play()
+	await $Lose.finished
+	$Sad.play()
 
 func _input(event):
 	if event is InputEventKey and event.pressed:
@@ -126,12 +160,15 @@ func _input(event):
 				if len(comets) > 0:
 					var comet = comets[0]
 					if event.as_text() == comet.get_node("Sprite").get_node("Label").text:
+						comets.erase(comet)
+						comets_processed += 1
+						hit_count += 1
+						calculate_accuracy()
 						comet.self_active = false
 						var laser = Line2D.new()
 						laser.default_color = Color.RED
 						laser.points = PackedVector2Array([$Tux.position,comet.position])
 						add_child(laser)
-						comets.erase(comet)
 						comet.get_node("Sprite").play("cometbreak")
 						$CometBreakSound.play()
 						await comet.get_node("Sprite").animation_finished

scenes/game/comet_zap.tscn

@@ -2,15 +2,26 @@
 
 [ext_resource type="Script" uid="uid://c7vntfq6dyb2k" path="res://scenes/game/comet_zap.gd" id="1_eyb20"]
 [ext_resource type="Texture2D" uid="uid://b0jndopqfkddu" path="res://assets/visual/backgrounds/omori/Battle Backgrounds/battleback_ow_outskirts.png" id="2_2j0xl"]
-[ext_resource type="AudioStream" uid="uid://b2l55uknctgo6" path="res://assets/audio/music/game/comet_zap/Ranma Nibun-no-ichi Bakuretsu Rantouhen - King's Casino [Qk0v_NIqVPg].mp3" id="2_ije4o"]
+[ext_resource type="AudioStream" uid="uid://dr0f3y1aux6nd" path="res://assets/audio/music/game/comet_zap/04 Ranma's Home.mp3" id="3_6eapk"]
 [ext_resource type="AudioStream" uid="uid://ckr4pf3etle0p" path="res://assets/audio/sfx/SYS_cancel.ogg" id="4_2j0xl"]
 [ext_resource type="Texture2D" uid="uid://jd2rnhvq6gl6" path="res://original data/images/tux/tux-yes2.png" id="4_yib6v"]
 [ext_resource type="AudioStream" uid="uid://t6tbvilcrwy8" path="res://assets/audio/sfx/SE_Push.ogg" id="5_62k7v"]
+[ext_resource type="AudioStream" uid="uid://b2xxkgi6bcfh2" path="res://assets/audio/sfx/break.mp3" id="6_6eapk"]
 [ext_resource type="PackedScene" uid="uid://dm6jp4gjboooc" path="res://scenes/menus/pause/pause.tscn" id="6_cjaft"]
+[ext_resource type="AudioStream" uid="uid://podscahsf0d4" path="res://assets/audio/sfx/MenuAccept.wav" id="7_4elh0"]
+[ext_resource type="AudioStream" uid="uid://cboj3eff78kep" path="res://assets/audio/music/game/comet_zap/game_over/Finish Line (Lose) - Mario Kart Wii (Soundtrack) [Znjt4LvF4js].mp3" id="8_jnvlf"]
+[ext_resource type="AudioStream" uid="uid://c4drvuieit6x5" path="res://assets/audio/music/game/comet_zap/game_over/Romeo Santos   Eres Mía Audio [vY_3YrKtUUE].mp3" id="9_rlh21"]
+[ext_resource type="Script" uid="uid://or8mcd735o0r" path="res://scenes/game/restart.gd" id="10_apana"]
+[ext_resource type="Script" uid="uid://crxm56favhwos" path="res://scenes/game/exit.gd" id="11_jnvlf"]
+[ext_resource type="Texture2D" uid="uid://cif65rts2oljo" path="res://assets/visual/sprites/Hornet_Idle.png" id="12_rlh21"]
+[ext_resource type="Theme" uid="uid://b34g4whlitecf" path="res://assets/visual/sprites/tuxtheme.tres" id="12_xsyba"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_2j0xl"]
 font_size = 50
 
+[sub_resource type="LabelSettings" id="LabelSettings_xsyba"]
+font_size = 128
+
 [node name="CometZap" type="Node2D" unique_id=1227404695]
 script = ExtResource("1_eyb20")
 
@@ -38,7 +49,8 @@ expand_mode = 1
 metadata/_edit_use_anchors_ = true
 
 [node name="BackgroundMusic" type="AudioStreamPlayer2D" parent="." unique_id=1814622732]
-stream = ExtResource("2_ije4o")
+stream = ExtResource("3_6eapk")
+volume_db = 5.0
 autoplay = true
 parameters/looping = true
 
@@ -48,6 +60,19 @@ stream = ExtResource("4_2j0xl")
 [node name="CometBreakSound" type="AudioStreamPlayer2D" parent="." unique_id=169663936]
 stream = ExtResource("5_62k7v")
 
+[node name="Miss" type="AudioStreamPlayer2D" parent="." unique_id=1721176045]
+stream = ExtResource("6_6eapk")
+
+[node name="ButtonPress" type="AudioStreamPlayer2D" parent="." unique_id=1890596377]
+stream = ExtResource("7_4elh0")
+volume_db = -10.0
+
+[node name="Lose" type="AudioStreamPlayer2D" parent="." unique_id=1672401064]
+stream = ExtResource("8_jnvlf")
+
+[node name="Sad" type="AudioStreamPlayer2D" parent="." unique_id=228584401]
+stream = ExtResource("9_rlh21")
+
 [node name="Tux" type="Sprite2D" parent="." unique_id=1799546830]
 position = Vector2(960, 990)
 scale = Vector2(3.583, 3)
@@ -97,6 +122,92 @@ label_settings = SubResource("LabelSettings_2j0xl")
 [node name="Pause" parent="OnTop" unique_id=1227462733 instance=ExtResource("6_cjaft")]
 visible = false
 
+[node name="GameOver" type="Control" parent="OnTop" unique_id=2084475928]
+visible = false
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme = ExtResource("12_xsyba")
+
+[node name="Dim" type="ColorRect" parent="OnTop/GameOver" unique_id=651690269]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+color = Color(0, 0, 0, 0.29411766)
+
+[node name="Label" type="Label" parent="OnTop/GameOver" unique_id=1830840075]
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -277.0
+offset_top = -290.0
+offset_right = 277.0
+offset_bottom = -114.99994
+grow_horizontal = 2
+grow_vertical = 2
+text = "GIT GUD!"
+label_settings = SubResource("LabelSettings_xsyba")
+
+[node name="Buttons" type="BoxContainer" parent="OnTop/GameOver" unique_id=812956524]
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -267.0
+offset_top = -118.75
+offset_right = 267.0
+offset_bottom = 118.75
+grow_horizontal = 2
+grow_vertical = 2
+alignment = 1
+vertical = true
+
+[node name="Restart" type="Button" parent="OnTop/GameOver/Buttons" unique_id=702028007]
+layout_mode = 2
+size_flags_vertical = 3
+theme_override_font_sizes/font_size = 32
+text = "Restart
+"
+script = ExtResource("10_apana")
+
+[node name="Exit" type="Button" parent="OnTop/GameOver/Buttons" unique_id=1929956127]
+layout_mode = 2
+size_flags_vertical = 3
+theme_override_font_sizes/font_size = 32
+text = "Back To Title
+"
+script = ExtResource("11_jnvlf")
+
+[node name="silson" type="TextureRect" parent="OnTop/GameOver" unique_id=761029797]
+layout_mode = 0
+offset_left = 1270.0
+offset_top = 394.0
+offset_right = 1863.0
+offset_bottom = 1185.0
+texture = ExtResource("12_rlh21")
+stretch_mode = 4
+
+[node name="Damage" type="ColorRect" parent="OnTop" unique_id=1042791592]
+modulate = Color(1, 1, 1, 0)
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+color = Color(0.7764706, 0, 0, 1)
+
 [node name="Fade" type="ColorRect" parent="OnTop" unique_id=1872046404]
 visible = false
 anchors_preset = 15
@@ -106,3 +217,6 @@ grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
 color = Color(0, 0, 0, 1)
+
+[connection signal="pressed" from="OnTop/GameOver/Buttons/Restart" to="OnTop/GameOver/Buttons/Restart" method="_on_pressed"]
+[connection signal="pressed" from="OnTop/GameOver/Buttons/Exit" to="OnTop/GameOver/Buttons/Exit" method="_on_pressed"]

scenes/game/exit.gd

@@ -0,0 +1,15 @@
+extends Button
+
+var button_sound
+var fade
+
+func _ready() -> void:
+    button_sound = get_tree().current_scene.get_node("ButtonPress")
+    fade = get_tree().current_scene.get_node("OnTop").get_node("Fade")
+
+func _on_pressed() -> void:
+    var tween := create_tween()
+    tween.parallel().tween_property(fade, "modulate:a", 1, 1).set_trans(Tween.TRANS_SINE).set_ease(Tween.EASE_OUT)
+    button_sound.play()
+    await button_sound.finished
+    get_tree().change_scene_to_file("res://scenes/menus/start_menu/title.tscn")

scenes/game/exit.gd.uid

@@ -0,0 +1 @@
+uid://crxm56favhwos

scenes/game/fish_cascade.gd

@@ -6,23 +6,43 @@ var word_set_file_path
 var word_set_file
 var word_set_content
 var word_set_array
+var active_words = []
 
 # init random
 var alphabet = ["A","B","C","D","E","F","G","H","I","J","K","L","M","N",
 "O","P","Q","R","S","T","U","V","W","X","Y","Z"]
 var fishs = []
 var fish_speed = 75
+var active
+
+# display
+var viewport_size
+var scale_factor_x
+var scale_factor_y
+
 
 # numbers
-var delay = 2
+var delay = 1.5
 var spawn_timer = 0
+var max_character_count = 0
 
 # objects
 var fish_source = preload("res://scenes/objects/game/fish.tscn")
+var fade
+var pause_menu
+
 
 # Runs on start
 func _ready() -> void:
 	
+	active = true
+	
+	pause_menu = self.get_node("OnTop").get_node("Pause")
+	fade = self.get_node("OnTop").get_node("Fade")
+	fade.visible = true
+	var tween := create_tween()
+	tween.parallel().tween_property(fade, "modulate:a", 0, 1).set_trans(Tween.TRANS_SINE).set_ease(Tween.EASE_OUT)
+	
 	# Load Corresponding Text File
 	word_set_file_path = "res://gameplay/word_sets/" + word_set + ".txt"
 	word_set_file = FileAccess.open(word_set_file_path, FileAccess.READ)
@@ -41,6 +61,7 @@ func _ready() -> void:
 
 # Runs every frame
 func _process(delta: float) -> void:
+	if active:
 		spawn_timer += delta
 		
 		if spawn_timer >= delay:
@@ -50,28 +71,42 @@ func _process(delta: float) -> void:
 func spawn_word():
 	var new_word = word_set_array[randi_range(0,len(word_set_array)-1)]
 	var viewport_size = get_viewport_rect().size
-	var offset = randf_range(0,800)
+	var offset = randf_range(0,viewport_size.x-500)
+	active_words.append(new_word)
 	
 	for char in new_word:
 		if char != " ":
-			var new_commet = fish_source.instantiate()
-			new_commet.position = Vector2(128+offset,-128)
-			new_commet.get_node("Sprite").get_node("Label").text = char
-			new_commet.speed = fish_speed
-			add_child(new_commet)
-			$FishTux.position = Vector2(offset,660)
-			fishs.append(new_commet)
+			var new_fish = fish_source.instantiate()
+			new_fish.position = Vector2(128+offset,-128)
+			new_fish.get_node("Sprite").get_node("Label").text = char
+			new_fish.speed = fish_speed
+			add_child(new_fish)
+			fishs.append(new_fish)
 		offset += 30
 
 func _input(event):
 	if event is InputEventKey and event.pressed:
 		if event.as_text() in alphabet:
+			if active:
 				print(event.as_text())
-			
 				if len(fishs) > 0:
 					var fish = fishs[0]
 					if event.as_text() == fish.get_node("Sprite").get_node("Label").text:
 						fishs.erase(fish)
 						fish.get_node("Sprite").get_node("Label").add_theme_color_override("font_color", Color.RED)
-					await fish.get_node("Sprite").animation_finished
-					fish.queue_free()
+						#$FishTux.position = Vector2(len(fishs),get_viewport_rect().size.y-60)
+						#for word in active_words:
+							#if word[0] == fish.get_node("Sprite").get_node("Label").text:
+								#await event.as_text() == word[word.length() - 1]
+								#print('eh mazing')
+								#fish.get_node("Sprite").get_node("Label").set_text('')
+								#active_words.erase(word)
+		elif event.keycode == KEY_ESCAPE:
+			if pause_menu.visible:
+				pause_menu.resume()
+				$BackgroundMusic.volume_db = -15
+			else:
+				$Back.play()
+				active = false
+				pause_menu.visible = true
+				$BackgroundMusic.volume_db = -30

scenes/game/fish_cascade.tscn

@@ -10,12 +10,15 @@
 [ext_resource type="Texture2D" uid="uid://cuprnmxy5a7u2" path="res://original data/images/tux/run1.png" id="7_tj4tg"]
 [ext_resource type="Texture2D" uid="uid://bsh0r0ldjgt51" path="res://original data/images/tux/stand0.png" id="8_wevax"]
 [ext_resource type="Texture2D" uid="uid://cebh8ecpj0274" path="res://original data/images/tux/stand1.png" id="9_8sqkf"]
-[ext_resource type="Texture2D" uid="uid://bwimfoayd83p2" path="res://original data/images/tux/stand-.png" id="10_me7rb"]
 [ext_resource type="Texture2D" uid="uid://dyjdddytxqybg" path="res://original data/images/tux/walk0.png" id="11_lg4hc"]
 [ext_resource type="Texture2D" uid="uid://bequiqfu54xe7" path="res://original data/images/tux/walk1.png" id="12_tj4tg"]
 [ext_resource type="Texture2D" uid="uid://f6sy7wboy6td" path="res://original data/images/tux/walk2.png" id="13_wevax"]
 [ext_resource type="Texture2D" uid="uid://nduj5djmkad7" path="res://original data/images/tux/walk3.png" id="14_8sqkf"]
+[ext_resource type="Script" uid="uid://cqo3yt8ao4laj" path="res://scenes/game/fish_tux.gd" id="16_5wky4"]
 [ext_resource type="AudioStream" uid="uid://c8017fjw3ntl0" path="res://assets/audio/music/game/fish_cascade/2-27. Pursuit - A Great Turnabout.mp3" id="16_wevax"]
+[ext_resource type="AudioStream" uid="uid://ckr4pf3etle0p" path="res://assets/audio/sfx/SYS_cancel.ogg" id="17_me7rb"]
+[ext_resource type="PackedScene" uid="uid://dm6jp4gjboooc" path="res://scenes/menus/pause/pause.tscn" id="18_5wky4"]
+[ext_resource type="AudioStream" uid="uid://podscahsf0d4" path="res://assets/audio/sfx/MenuAccept.wav" id="19_5wky4"]
 
 [sub_resource type="SpriteFrames" id="SpriteFrames_5wky4"]
 animations = [{
@@ -53,9 +56,6 @@ animations = [{
 }, {
 "duration": 1.0,
 "texture": ExtResource("9_8sqkf")
-}, {
-"duration": 1.0,
-"texture": ExtResource("10_me7rb")
 }],
 "loop": true,
 "name": &"stand",
@@ -79,6 +79,9 @@ animations = [{
 "speed": 5.0
 }]
 
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_5wky4"]
+size = Vector2(75, 115)
+
 [node name="FishCascade" type="Node2D" unique_id=82120739]
 script = ExtResource("1_tj4tg")
 
@@ -105,13 +108,41 @@ texture = ExtResource("1_lx3ow")
 expand_mode = 1
 metadata/_edit_use_anchors_ = true
 
-[node name="FishTux" type="AnimatedSprite2D" parent="." unique_id=1877342570]
-position = Vector2(650, 660)
-sprite_frames = SubResource("SpriteFrames_5wky4")
-animation = &"stand"
-frame_progress = 0.36790088
-
 [node name="BackgroundMusic" type="AudioStreamPlayer2D" parent="." unique_id=414011462]
 stream = ExtResource("16_wevax")
 volume_db = -15.0
 autoplay = true
+
+[node name="Back" type="AudioStreamPlayer2D" parent="." unique_id=720872467]
+stream = ExtResource("17_me7rb")
+
+[node name="OnTop" type="CanvasLayer" parent="." unique_id=793935371]
+
+[node name="Pause" parent="OnTop" unique_id=1227462733 instance=ExtResource("18_5wky4")]
+visible = false
+
+[node name="Fade" type="ColorRect" parent="OnTop" unique_id=1781533862]
+visible = false
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+color = Color(0, 0, 0, 1)
+
+[node name="Tux" type="CharacterBody2D" parent="." unique_id=398386293]
+position = Vector2(960, 1019)
+script = ExtResource("16_5wky4")
+
+[node name="FishTux" type="AnimatedSprite2D" parent="Tux" unique_id=1877342570]
+sprite_frames = SubResource("SpriteFrames_5wky4")
+animation = &"gulp"
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Tux" unique_id=442093053]
+position = Vector2(-2.5, 1.5)
+shape = SubResource("RectangleShape2D_5wky4")
+
+[node name="ButtonPress" type="AudioStreamPlayer2D" parent="." unique_id=1808956587]
+stream = ExtResource("19_5wky4")
+volume_db = -10.0

scenes/game/fish_tux.gd

@@ -1,16 +1,37 @@
-extends AnimatedSprite2D
+extends CharacterBody2D
 
-var speed = 10
 
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
-	play('stand')
+	$FishTux.play('stand')
 
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta: float) -> void:
-	pass
+func _process(delta: float):
+	var velocity = Vector2.ZERO
+	var speed = 301
+	velocity.x += 0
+	
+	if velocity.x > 0:
+		velocity = velocity.normalized() * speed
+		if speed > 300:
+			$FishTux.play('run')
+			$FishTux.scale.x = 1
+		else:
+			$FishTux.play('walk')
+			$FishTux.scale.x = 1
+	elif velocity.x < 0:
+		velocity = velocity.normalized() * speed
+		if speed > 300:
+			$FishTux.play('run')
+			$FishTux.scale.x = -1
+		else:
+			$FishTux.play('walk')
+			$FishTux.scale.x = -1
+	else:
+		$FishTux.play('stand')
 		
 		
-func movetofish(loc):
-	Vector2(loc, 660)
+	position += velocity * delta
+	position = position.clamp(Vector2.ZERO, get_viewport_rect().size)
+	

scenes/game/restart.gd

@@ -0,0 +1,26 @@
+extends Button
+
+var button_sound
+var fade
+
+func _ready() -> void:
+	button_sound = get_tree().current_scene.get_node("ButtonPress")
+	fade = get_tree().current_scene.get_node("OnTop").get_node("Fade")
+
+func _on_pressed() -> void:
+	var tween := create_tween()
+	tween.parallel().tween_property(fade, "modulate:a", 1, 1).set_trans(Tween.TRANS_SINE).set_ease(Tween.EASE_OUT)
+	button_sound.play()
+	await button_sound.finished
+
+	if get_tree().current_scene.name == "CometZap":
+		var next_scene = load("res://scenes/game/comet_zap.tscn").instantiate()
+		next_scene.word_set = get_tree().current_scene.word_set
+		get_tree().change_scene_to_node(next_scene)
+	elif get_tree().current_scene.name == "FishCascade":
+		var next_scene = load("res://scenes/game/fish_cascade.tscn").instantiate()
+		next_scene.word_set = get_tree().current_scene.word_set
+		get_tree().change_scene_to_node(next_scene)
+	else:
+		var next_scene = load("res://scenes/menus/select_mode/select_mode.tscn").instantiate()
+		get_tree().change_scene_to_node(next_scene)

scenes/game/restart.gd.uid

@@ -0,0 +1 @@
+uid://or8mcd735o0r

scenes/menus/pause/pause.gd

@@ -27,6 +27,13 @@ func _on_back_pressed() -> void:
 func _on_options_pressed() -> void:
 	pass
 
+func _on_select_exit_pressed() -> void:
+	var tween := create_tween()
+	tween.parallel().tween_property(fade, "modulate:a", 1, 1).set_trans(Tween.TRANS_SINE).set_ease(Tween.EASE_OUT)
+	button_sound.play()
+	await button_sound.finished
+	get_tree().change_scene_to_file("res://scenes/menus/select_mode/select_mode.tscn")
+	
 func _on_exit_pressed() -> void:
 	var tween := create_tween()
 	tween.parallel().tween_property(fade, "modulate:a", 1, 1).set_trans(Tween.TRANS_SINE).set_ease(Tween.EASE_OUT)

scenes/menus/pause/pause.tscn

@@ -1,7 +1,10 @@
 [gd_scene format=3 uid="uid://dm6jp4gjboooc"]
 
 [ext_resource type="Script" uid="uid://15e0tr7en3iq" path="res://scenes/menus/pause/pause.gd" id="1_8lsyj"]
+[ext_resource type="Theme" uid="uid://b34g4whlitecf" path="res://assets/visual/sprites/tuxtheme.tres" id="2_0d44p"]
+[ext_resource type="Script" uid="uid://or8mcd735o0r" path="res://scenes/game/restart.gd" id="2_miayh"]
 [ext_resource type="AudioStream" uid="uid://podscahsf0d4" path="res://assets/audio/sfx/MenuAccept.wav" id="2_y88h8"]
+[ext_resource type="Texture2D" uid="uid://dew71sa7dwdnc" path="res://textures/tux typing +.png" id="4_cy42q"]
 
 [node name="Pause" type="Control" unique_id=1227462733]
 layout_mode = 3
@@ -34,6 +37,7 @@ offset_right = 267.0
 offset_bottom = 162.5
 grow_horizontal = 2
 grow_vertical = 2
+theme = ExtResource("2_0d44p")
 alignment = 1
 vertical = true
 
@@ -43,12 +47,25 @@ size_flags_vertical = 3
 theme_override_font_sizes/font_size = 32
 text = "Resume"
 
+[node name="Restart" type="Button" parent="BoxContainer" unique_id=1217720724]
+layout_mode = 2
+size_flags_vertical = 3
+theme_override_font_sizes/font_size = 32
+text = "Restart
+"
+script = ExtResource("2_miayh")
+
 [node name="Options" type="Button" parent="BoxContainer" unique_id=1573468039]
 layout_mode = 2
 size_flags_vertical = 3
 theme_override_font_sizes/font_size = 32
 text = "Options"
 
+[node name="SelectExit" type="Button" parent="BoxContainer" unique_id=1817893995]
+layout_mode = 2
+theme_override_font_sizes/font_size = 32
+text = "Select Mode"
+
 [node name="Exit" type="Button" parent="BoxContainer" unique_id=870296717]
 layout_mode = 2
 size_flags_vertical = 3
@@ -60,6 +77,22 @@ text = "Back To Title
 stream = ExtResource("2_y88h8")
 volume_db = -10.0
 
+[node name="TextureRect" type="TextureRect" parent="." unique_id=855388024]
+layout_mode = 1
+anchors_preset = 2
+anchor_top = 1.0
+anchor_bottom = 1.0
+offset_left = -140.0
+offset_top = -332.0
+offset_right = 514.0
+offset_bottom = 200.0
+grow_vertical = 0
+texture = ExtResource("4_cy42q")
+expand_mode = 1
+stretch_mode = 4
+
 [connection signal="pressed" from="BoxContainer/Back" to="." method="_on_back_pressed"]
+[connection signal="pressed" from="BoxContainer/Restart" to="BoxContainer/Restart" method="_on_pressed"]
 [connection signal="pressed" from="BoxContainer/Options" to="." method="_on_options_pressed"]
+[connection signal="pressed" from="BoxContainer/SelectExit" to="." method="_on_select_exit_pressed"]
 [connection signal="pressed" from="BoxContainer/Exit" to="." method="_on_exit_pressed"]

scenes/menus/select_mode/select_mode.gd

@@ -7,6 +7,7 @@ var main_buttons
 var fade
 var header
 var word_select_button = preload("res://scenes/objects/ui/word_select_button.tscn")
+var audio_phase = false
 
 func check_text_files(path):
 	var dir = DirAccess.open(path)
@@ -28,6 +29,8 @@ func check_text_files(path):
 
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
+	$BackgroundMusic.play()
+	$BackgroundMusicAlt.play()
 	game_mode = null
 	header = self.get_node("Header")
 	fade = self.get_node("Fade")
@@ -41,7 +44,12 @@ func _ready() -> void:
 	
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta: float) -> void:
-	pass
+	if audio_phase == true:
+		$BackgroundMusic.volume_db = -80
+		$BackgroundMusicAlt.volume_db = -10
+	else:
+		$BackgroundMusic.volume_db = -10
+		$BackgroundMusicAlt.volume_db = -80
 
 func open_word_menu():
 	pass
@@ -53,6 +61,7 @@ func _on_comet_pressed() -> void:
 	self.get_node("ButtonPress").play()
 	main_buttons.visible = false
 	word_select.visible = true
+	audio_phase = true
 
 func _on_cascade_pressed() -> void:
 	header.text = "Select Word Set"
@@ -61,7 +70,13 @@ func _on_cascade_pressed() -> void:
 	self.get_node("ButtonPress").play()
 	main_buttons.visible = false
 	word_select.visible = true
+	audio_phase = true
 
+func _on_lessons_pressed() -> void:
+	$Error.play()
+
+func _on_options_pressed() -> void:
+	$Error.play()
 
 func _on_quit_pressed() -> void:
 	$BackgroundMusic.stop()
@@ -81,4 +96,4 @@ func _input(event):
 				game_mode = null
 				main_buttons.visible = true
 				word_select.visible = false
-				
+				audio_phase = false

scenes/menus/select_mode/select_mode.tscn

@@ -1,12 +1,21 @@
 [gd_scene format=3 uid="uid://cb2i4ei3lihbh"]
 
-[ext_resource type="Shader" uid="uid://b4yhwgv8l8djq" path="res://scroll.gdshader" id="1_3oan1"]
+[ext_resource type="Shader" path="res://scroll.gdshader" id="1_3oan1"]
 [ext_resource type="Script" uid="uid://buqy4h8s5nhg7" path="res://scenes/menus/select_mode/select_mode.gd" id="1_avhy0"]
 [ext_resource type="Texture2D" uid="uid://dew71sa7dwdnc" path="res://textures/tux typing +.png" id="2_3oan1"]
-[ext_resource type="AudioStream" uid="uid://df31l8x4fxwf0" path="res://assets/audio/music/menus/Mario Kart Wii Music - Menu (Medley) [fN2dJP0WLDQ].mp3" id="3_xhbdh"]
+[ext_resource type="FontFile" uid="uid://ccfep6awodtxc" path="res://original data/fonts/Loma.ttf" id="4_1ct8e"]
+[ext_resource type="Theme" uid="uid://b34g4whlitecf" path="res://assets/visual/sprites/tuxtheme.tres" id="4_m1gal"]
+[ext_resource type="AudioStream" uid="uid://bgmdmkwn8cd8e" path="res://assets/audio/music/menus/MkWiiSetup.mp3" id="4_qgvwr"]
+[ext_resource type="AudioStream" uid="uid://dqawqnbyqmgl5" path="res://assets/audio/music/menus/MkWiiSelect.mp3" id="5_1ct8e"]
 [ext_resource type="AudioStream" uid="uid://podscahsf0d4" path="res://assets/audio/sfx/MenuAccept.wav" id="5_32ulc"]
+[ext_resource type="Texture2D" uid="uid://cywnqyuv5e46g" path="res://original data/images/sprites/cascaded2.png" id="5_wwqku"]
 [ext_resource type="AudioStream" uid="uid://cv5et4r5063yq" path="res://assets/audio/sfx/OuttaHere.wav" id="6_0p6fv"]
+[ext_resource type="Texture2D" uid="uid://bj7vnbmyefb8l" path="res://original data/images/sprites/cometd.png" id="6_44cyq"]
+[ext_resource type="Texture2D" uid="uid://bpagom3b6wj1k" path="res://original data/images/sprites/help0.png" id="7_li5ve"]
 [ext_resource type="AudioStream" uid="uid://ckr4pf3etle0p" path="res://assets/audio/sfx/SYS_cancel.ogg" id="7_maffk"]
+[ext_resource type="Texture2D" uid="uid://irf23qm74ik" path="res://original data/images/sprites/tux_config0.png" id="8_r0vow"]
+[ext_resource type="Texture2D" uid="uid://bq1aas8t1ybbt" path="res://original data/images/sprites/quit0.png" id="9_x5i81"]
+[ext_resource type="AudioStream" uid="uid://d4gn18sevuo2x" path="res://assets/audio/sfx/error.mp3" id="16_44cyq"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_aeitr"]
 shader = ExtResource("1_3oan1")
@@ -16,7 +25,10 @@ shader_parameter/speed = 0.1
 load_path = "res://.godot/imported/wp2812464.jpg-16426a98baf4dc04320bc61fb53f8deb.ctex"
 
 [sub_resource type="LabelSettings" id="LabelSettings_maffk"]
+font = ExtResource("4_1ct8e")
 font_size = 120
+outline_size = 10
+outline_color = Color(0, 0, 0, 1)
 
 [node name="Control" type="Control" unique_id=550682840]
 layout_mode = 3
@@ -65,6 +77,9 @@ offset_right = 288.5
 offset_bottom = 461.0
 grow_horizontal = 2
 grow_vertical = 2
+theme = ExtResource("4_m1gal")
+horizontal_scroll_mode = 0
+scroll_hint_mode = 1
 
 [node name="WordSelect" type="BoxContainer" parent="WordSelectScroll" unique_id=549402027]
 visible = false
@@ -87,6 +102,7 @@ offset_right = 288.5
 offset_bottom = 222.5
 grow_horizontal = 2
 grow_vertical = 2
+theme = ExtResource("4_m1gal")
 vertical = true
 
 [node name="Cascade" type="Button" parent="MainButtons" unique_id=1019308409]
@@ -95,6 +111,7 @@ size_flags_vertical = 3
 theme_override_font_sizes/font_size = 50
 text = "Fish Cascade
 "
+icon = ExtResource("5_wwqku")
 expand_icon = true
 
 [node name="Comet" type="Button" parent="MainButtons" unique_id=1352982543]
@@ -103,6 +120,7 @@ size_flags_vertical = 3
 theme_override_font_sizes/font_size = 50
 text = "Comet Zap
 "
+icon = ExtResource("6_44cyq")
 expand_icon = true
 
 [node name="Lessons" type="Button" parent="MainButtons" unique_id=1616574107]
@@ -111,6 +129,7 @@ size_flags_vertical = 3
 theme_override_font_sizes/font_size = 50
 text = "Lessons
 "
+icon = ExtResource("7_li5ve")
 expand_icon = true
 
 [node name="Options" type="Button" parent="MainButtons" unique_id=249277019]
@@ -118,6 +137,7 @@ layout_mode = 2
 size_flags_vertical = 3
 theme_override_font_sizes/font_size = 50
 text = "Options"
+icon = ExtResource("8_r0vow")
 expand_icon = true
 
 [node name="Quit" type="Button" parent="MainButtons" unique_id=1080429911]
@@ -126,6 +146,7 @@ size_flags_vertical = 3
 theme_override_font_sizes/font_size = 50
 text = "Quit
 "
+icon = ExtResource("9_x5i81")
 expand_icon = true
 
 [node name="Header" type="Label" parent="." unique_id=1583137254]
@@ -145,9 +166,13 @@ text = "Select Mode"
 label_settings = SubResource("LabelSettings_maffk")
 
 [node name="BackgroundMusic" type="AudioStreamPlayer2D" parent="." unique_id=1780401057]
-stream = ExtResource("3_xhbdh")
+stream = ExtResource("4_qgvwr")
+volume_db = -10.0
+parameters/looping = true
+
+[node name="BackgroundMusicAlt" type="AudioStreamPlayer2D" parent="." unique_id=2020130944]
+stream = ExtResource("5_1ct8e")
 volume_db = -10.0
-autoplay = true
 parameters/looping = true
 
 [node name="ButtonPress" type="AudioStreamPlayer2D" parent="." unique_id=1605257004]
@@ -160,6 +185,10 @@ stream = ExtResource("6_0p6fv")
 [node name="Back" type="AudioStreamPlayer2D" parent="." unique_id=732973693]
 stream = ExtResource("7_maffk")
 
+[node name="Error" type="AudioStreamPlayer2D" parent="." unique_id=1125555694]
+stream = ExtResource("16_44cyq")
+volume_db = -5.0
+
 [node name="Fade" type="ColorRect" parent="." unique_id=1920157134]
 visible = false
 layout_mode = 1
@@ -173,4 +202,6 @@ color = Color(0, 0, 0, 1)
 
 [connection signal="pressed" from="MainButtons/Cascade" to="." method="_on_cascade_pressed"]
 [connection signal="pressed" from="MainButtons/Comet" to="." method="_on_comet_pressed"]
+[connection signal="pressed" from="MainButtons/Lessons" to="." method="_on_lessons_pressed"]
+[connection signal="pressed" from="MainButtons/Options" to="." method="_on_options_pressed"]
 [connection signal="pressed" from="MainButtons/Quit" to="." method="_on_quit_pressed"]

scenes/objects/game/comet.gd

@@ -16,7 +16,4 @@ func _process(delta: float) -> void:
 		self.position.y += speed*delta
 		
 		if self.position.y >= get_viewport_rect().size.y:
-			scene.health -= damage
-			scene.miss_count += 1.0
-			scene.comets.erase(self)
-			self.queue_free()
+			scene.miss(self)

scenes/objects/game/comet.tscn

@@ -21,7 +21,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"comet",
-"speed": 5.0
+"speed": 10.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -32,7 +32,7 @@ animations = [{
 }],
 "loop": false,
 "name": &"cometbreak",
-"speed": 10.0
+"speed": 20.0
 }]
 
 [sub_resource type="LabelSettings" id="LabelSettings_3d2ho"]
@@ -44,10 +44,10 @@ outline_color = Color(0.9529412, 0.16078432, 1, 1)
 script = ExtResource("1_0gpin")
 
 [node name="Sprite" type="AnimatedSprite2D" parent="." unique_id=1849187873]
-self_modulate = Color(1, 1, 1, 0)
 position = Vector2(0, -1)
 sprite_frames = SubResource("SpriteFrames_ggplc")
 animation = &"comet"
+autoplay = "comet"
 
 [node name="Label" type="Label" parent="Sprite" unique_id=494320078]
 anchors_preset = 15

scenes/objects/game/fish.gd

@@ -2,13 +2,18 @@ extends Node2D
 
 var speed = 100
 var scene
+var active = true
+var self_active = true
 
 func _ready() -> void:
 	scene = self.get_parent()
 	
 func _process(delta: float) -> void:
+	active = scene.active
+	
+	if active and self_active:
 		self.position.y += speed*delta
 		
-	if self.position.y >= 720:
+		if self.position.y >= get_viewport_rect().size.y:
 			scene.fishs.erase(self)
 			self.queue_free()

scenes/objects/game/fish.tscn

@@ -45,6 +45,7 @@ script = ExtResource("1_dy21x")
 [node name="Sprite" type="AnimatedSprite2D" parent="." unique_id=71448930]
 sprite_frames = SubResource("SpriteFrames_10y2t")
 animation = &"fish"
+autoplay = "fish"
 
 [node name="Label" type="Label" parent="Sprite" unique_id=1746822548]
 anchors_preset = 15

scenes/objects/game/fish.tscn224251346.tmp

@@ -0,0 +1,60 @@
+[gd_scene format=3 uid="uid://b6xc0bu0slgue"]
+
+[ext_resource type="Script" uid="uid://c0mf5vliqjiou" path="res://scenes/objects/game/fish.gd" id="1_dy21x"]
+[ext_resource type="Texture2D" uid="uid://bpmmklm87rhys" path="res://original data/images/fishy0.png" id="1_foolk"]
+[ext_resource type="Texture2D" uid="uid://bgjxv801vvsw2" path="res://original data/images/fishy1.png" id="2_dy21x"]
+[ext_resource type="Texture2D" uid="uid://b4wc4ngjdq0es" path="res://original data/images/fishy2.png" id="3_qijva"]
+[ext_resource type="Texture2D" uid="uid://ba8uy4eamf0qc" path="res://original data/images/fishy3.png" id="4_2qncy"]
+[ext_resource type="Texture2D" uid="uid://n6yqudl5bdtc" path="res://original data/images/fishy-.png" id="5_u8vaa"]
+[ext_resource type="Texture2D" uid="uid://dn63xjbx8yqac" path="res://original data/images/splat0.png" id="7_qijva"]
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_10y2t"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("1_foolk")
+}, {
+"duration": 1.0,
+"texture": ExtResource("2_dy21x")
+}, {
+"duration": 1.0,
+"texture": ExtResource("3_qijva")
+}, {
+"duration": 1.0,
+"texture": ExtResource("4_2qncy")
+}, {
+"duration": 1.0,
+"texture": ExtResource("5_u8vaa")
+}],
+"loop": true,
+"name": &"fish",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("7_qijva")
+}],
+"loop": true,
+"name": &"splat",
+"speed": 5.0
+}]
+
+[node name="Fish" type="Node2D" unique_id=1446966186]
+script = ExtResource("1_dy21x")
+
+[node name="Sprite" type="AnimatedSprite2D" parent="." unique_id=71448930]
+sprite_frames = SubResource("SpriteFrames_10y2t")
+animation = &"fish"
+autoplay = "fish"
+
+[node name="Label" type="Label" parent="Sprite" unique_id=1746822548]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = -12.0
+offset_top = -46.0
+offset_right = -22.0
+grow_horizontal = 2
+grow_vertical = 2
+horizontal_alignment = 1
+vertical_alignment = 1