Slight UI tweaks; Some Fish Cascade Fixes

This commit is contained in:
GitCosm0s
2026-02-14 18:01:27 -05:00
parent 8845c34c42
commit eef6033023
33 changed files with 20508 additions and 81 deletions

View File

@@ -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)

View File

@@ -1,8 +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
@@ -35,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
@@ -58,6 +61,11 @@ 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
@@ -69,7 +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"]

View File

@@ -28,6 +28,10 @@ func check_text_files(path):
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
$BackgroundMusic.play()
$BackgroundMusicAlt.play()
$BackgroundMusic.volume_db = -10
$BackgroundMusicAlt.volume_db = -80
game_mode = null
header = self.get_node("Header")
fade = self.get_node("Fade")
@@ -54,6 +58,9 @@ func _on_comet_pressed() -> void:
main_buttons.visible = false
word_select.visible = true
$BackgroundMusic.volume_db = -80
$BackgroundMusicAlt.volume_db = -10
func _on_cascade_pressed() -> void:
header.text = "Select Word Set"
stage = 1
@@ -62,6 +69,14 @@ func _on_cascade_pressed() -> void:
main_buttons.visible = false
word_select.visible = true
$BackgroundMusic.volume_db = -80
$BackgroundMusicAlt.volume_db = -10
func _on_lessons_pressed() -> void:
$Error.play()
func _on_options_pressed() -> void:
$Error.play()
func _on_quit_pressed() -> void:
$BackgroundMusic.stop()
@@ -81,4 +96,6 @@ func _input(event):
game_mode = null
main_buttons.visible = true
word_select.visible = false
$BackgroundMusic.volume_db = -10
$BackgroundMusicAlt.volume_db = -80

View File

@@ -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"]