Skip to content

Commit

Permalink
x
Browse files Browse the repository at this point in the history
?
  • Loading branch information
DeanLemans committed Feb 7, 2025
1 parent 831b62c commit 93138af
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 55 deletions.
59 changes: 22 additions & 37 deletions src/scenes/game_scene/game_ui.tscn
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
[gd_scene load_steps=12 format=3 uid="uid://blsij73lxlbrl"]
[gd_scene load_steps=11 format=3 uid="uid://blsij73lxlbrl"]

[ext_resource type="Script" uid="uid://f7avj50d32jl" path="res://addons/maaacks_game_template/extras/scripts/pause_menu_controller.gd" id="1_mgq6w"]
[ext_resource type="PackedScene" uid="uid://gkvinfkbye6d" path="res://scenes/overlaid_menus/pause_menu.tscn" id="2_10mfm"]
[ext_resource type="Script" uid="uid://c46v7ci318up" path="res://addons/maaacks_game_template/extras/scripts/level_list_loader.gd" id="3_b8jlh"]
[ext_resource type="PackedScene" uid="uid://bkcsjsk2ciff" path="res://addons/maaacks_game_template/base/scenes/music_players/background_music_player.tscn" id="4_elswi"]
[ext_resource type="PackedScene" uid="uid://bbnieb63lo0u7" path="res://scenes/loading_screen/level_loading_screen.tscn" id="5_dowkw"]
[ext_resource type="Script" uid="uid://cmo3nl7jiiayh" path="res://scenes/game_scene/configurable_sub_viewport.gd" id="6_efpn6"]
[ext_resource type="Script" uid="uid://cegpui2da7w6c" path="res://scenes/game_scene/input_display_label.gd" id="7_xo7fy"]
[ext_resource type="Script" uid="uid://dhohthajifgcb" path="res://scripts/level_list_state_manager.gd" id="8_pv8tc"]
[ext_resource type="PackedScene" uid="uid://2qu0aa7tw2t" path="res://scenes/overlaid_menus/game_won_menu.tscn" id="9_0pd2h"]
[ext_resource type="PackedScene" uid="uid://dd1sgi1jm1cwk" path="res://scenes/overlaid_menus/level_lost_menu.tscn" id="10_37hvn"]
[ext_resource type="PackedScene" uid="uid://dryqgda7fnsw" path="res://scenes/overlaid_menus/level_won_menu.tscn" id="11_h5xmp"]
[ext_resource type="Script" path="res://addons/maaacks_game_template/extras/scripts/pause_menu_controller.gd" id="1_onvsj"]
[ext_resource type="PackedScene" path="res://scenes/overlaid_menus/pause_menu.tscn" id="2_8qp3c"]
[ext_resource type="Script" path="res://addons/maaacks_game_template/extras/scripts/level_list_loader.gd" id="3_bmy5n"]
[ext_resource type="PackedScene" path="res://addons/maaacks_game_template/base/scenes/music_players/background_music_player.tscn" id="4_7aihr"]
[ext_resource type="PackedScene" path="res://scenes/loading_screen/level_loading_screen.tscn" id="5_3re04"]
[ext_resource type="Script" path="res://scenes/game_scene/configurable_sub_viewport.gd" id="6_ascoc"]
[ext_resource type="Script" path="res://scripts/level_list_state_manager.gd" id="7_wr4n6"]
[ext_resource type="PackedScene" path="res://scenes/overlaid_menus/game_won_menu.tscn" id="8_ukb12"]
[ext_resource type="PackedScene" path="res://scenes/overlaid_menus/level_lost_menu.tscn" id="9_i7m4m"]
[ext_resource type="PackedScene" path="res://scenes/overlaid_menus/level_won_menu.tscn" id="10_rkfhe"]

[node name="GameUI" type="Control"]
layout_mode = 3
Expand All @@ -21,19 +20,20 @@ grow_horizontal = 2
grow_vertical = 2

[node name="PauseMenuController" type="Node" parent="." node_paths=PackedStringArray("focused_viewport")]
script = ExtResource("1_mgq6w")
pause_menu_packed = ExtResource("2_10mfm")
script = ExtResource("1_onvsj")
pause_menu_packed = ExtResource("2_8qp3c")
focused_viewport = NodePath("../ViewportContainer/ConfigurableSubViewport")

[node name="LevelLoader" type="Node" parent="." node_paths=PackedStringArray("level_container")]
script = ExtResource("3_b8jlh")
script = ExtResource("3_bmy5n")
level_container = NodePath("../ViewportContainer/ConfigurableSubViewport")
files = Array[String](["res://scenes/game_scene/levels/levels_platformer/level_1_patformer.tscn", "res://scenes/game_scene/levels/levels_platformer/level_2_patformer.tscn", "res://scenes/game_scene/levels/levels_platformer/level_3_patformer.tscn"])
files = Array[String](["res://scenes/game_scene/levels/level_1.tscn", "res://scenes/game_scene/levels/level_2.tscn", "res://scenes/game_scene/levels/level_3.tscn"])
directory = "res://scenes/game_scene/levels"

[node name="BackgroundMusicPlayer" parent="." instance=ExtResource("4_elswi")]
[node name="BackgroundMusicPlayer" parent="." instance=ExtResource("4_7aihr")]

[node name="LevelLoadingScreen" parent="." instance=ExtResource("5_dowkw")]
[node name="LevelLoadingScreen" parent="." instance=ExtResource("5_3re04")]
visible = false

[node name="ViewportContainer" type="SubViewportContainer" parent="."]
Expand All @@ -51,32 +51,17 @@ audio_listener_enable_2d = true
audio_listener_enable_3d = true
size = Vector2i(1280, 720)
render_target_update_mode = 4
script = ExtResource("6_efpn6")

[node name="InputDisplayLabel" type="Label" parent="."]
layout_mode = 1
anchors_preset = 14
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
offset_top = -44.0
offset_bottom = 44.0
grow_horizontal = 2
grow_vertical = 2
theme_override_font_sizes/font_size = 64
horizontal_alignment = 1
autowrap_mode = 2
script = ExtResource("7_xo7fy")
script = ExtResource("6_ascoc")

[node name="LevelListManager" type="Node" parent="." node_paths=PackedStringArray("level_list_loader", "level_loading_screen")]
script = ExtResource("8_pv8tc")
script = ExtResource("7_wr4n6")
level_list_loader = NodePath("../LevelLoader")
main_menu_scene = "res://scenes/menus/main_menu/main_menu_with_animations.tscn"
ending_scene = "res://scenes/end_credits/end_credits.tscn"
level_loading_screen = NodePath("../LevelLoadingScreen")
game_won_scene = ExtResource("9_0pd2h")
level_lost_scene = ExtResource("10_37hvn")
level_won_scene = ExtResource("11_h5xmp")
game_won_scene = ExtResource("8_ukb12")
level_lost_scene = ExtResource("9_i7m4m")
level_won_scene = ExtResource("10_rkfhe")

[connection signal="level_load_started" from="LevelLoader" to="." method="_on_level_loader_level_load_started"]
[connection signal="level_loaded" from="LevelLoader" to="." method="_on_level_loader_level_loaded"]
Expand Down
17 changes: 12 additions & 5 deletions src/scenes/game_scene/levels/levels_template/level_1.tscn
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=3 uid="uid://c6vbyblk61cqp"]
[gd_scene load_steps=4 format=3 uid="uid://c6vbyblk61cqp"]

[ext_resource type="Script" uid="uid://cvbk4fe88kr8u" path="res://scenes/game_scene/levels/level.gd" id="1_0lcsd"]
[ext_resource type="Script" uid="uid://j8qoamee5iu7" path="res://addons/maaacks_game_template/base/scripts/capture_focus.gd" id="2_1jt74"]
[ext_resource type="Script" path="res://scenes/game_scene/levels/level.gd" id="1_y0mvw"]
[ext_resource type="Script" path="res://addons/maaacks_game_template/base/scripts/capture_focus.gd" id="2_w6i3l"]
[ext_resource type="Script" path="res://scenes/game_scene/input_display_label.gd" id="3_623lg"]

[node name="Level1" type="Control"]
layout_mode = 3
Expand All @@ -10,7 +11,7 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_0lcsd")
script = ExtResource("1_y0mvw")

[node name="BackgroundColor" type="ColorRect" parent="."]
unique_name_in_owner = true
Expand Down Expand Up @@ -42,7 +43,7 @@ theme_override_constants/separation = 16
layout_mode = 2
size_flags_vertical = 3
theme_override_constants/separation = 32
script = ExtResource("2_1jt74")
script = ExtResource("2_w6i3l")

[node name="LoseButton" type="Button" parent="MarginContainer/VBoxContainer/HBoxContainer"]
layout_mode = 2
Expand All @@ -66,6 +67,12 @@ unique_name_in_owner = true
layout_mode = 2
text = "Change Color"

[node name="InputDisplayLabel" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer2"]
layout_mode = 2
size_flags_horizontal = 3
horizontal_alignment = 1
script = ExtResource("3_623lg")

[connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/LoseButton" to="." method="_on_lose_button_pressed"]
[connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/WinButton" to="." method="_on_win_button_pressed"]
[connection signal="color_changed" from="MarginContainer/VBoxContainer/HBoxContainer2/ColorPickerButton" to="." method="_on_color_picker_button_color_changed"]
13 changes: 10 additions & 3 deletions src/scenes/game_scene/levels/levels_template/level_2.tscn
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=3 uid="uid://24opmu4llu8f"]
[gd_scene load_steps=4 format=3 uid="uid://24opmu4llu8f"]

[ext_resource type="Script" uid="uid://cvbk4fe88kr8u" path="res://scenes/game_scene/levels_template/level.gd" id="1_llrdl"]
[ext_resource type="Script" uid="uid://j8qoamee5iu7" path="res://addons/maaacks_game_template/base/scripts/capture_focus.gd" id="2_xs5lj"]
[ext_resource type="Script" path="res://scenes/game_scene/levels/level.gd" id="1_irplr"]
[ext_resource type="Script" path="res://addons/maaacks_game_template/base/scripts/capture_focus.gd" id="2_3p566"]
[ext_resource type="Script" path="res://scenes/game_scene/input_display_label.gd" id="3_rgywr"]

[node name="Level1" type="Control"]
layout_mode = 3
Expand Down Expand Up @@ -71,6 +72,12 @@ unique_name_in_owner = true
layout_mode = 2
text = "Change Color"

[node name="InputDisplayLabel" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer2"]
layout_mode = 2
size_flags_horizontal = 3
horizontal_alignment = 1
script = ExtResource("3_rgywr")

[connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/LoseButton" to="." method="_on_lose_button_pressed"]
[connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/WinButton" to="." method="_on_win_button_pressed"]
[connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/LoseButton2" to="." method="_on_lose_button_pressed"]
Expand Down
17 changes: 12 additions & 5 deletions src/scenes/game_scene/levels/levels_template/level_3.tscn
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=3 uid="uid://bvk8tgljn3mtb"]
[gd_scene load_steps=4 format=3 uid="uid://bvk8tgljn3mtb"]

[ext_resource type="Script" uid="uid://cvbk4fe88kr8u" path="res://scenes/game_scene/levels_template/level.gd" id="1_b4pnr"]
[ext_resource type="Script" uid="uid://j8qoamee5iu7" path="res://addons/maaacks_game_template/base/scripts/capture_focus.gd" id="2_5rc06"]
[ext_resource type="Script" path="res://scenes/game_scene/levels/level.gd" id="1_bm75r"]
[ext_resource type="Script" path="res://addons/maaacks_game_template/base/scripts/capture_focus.gd" id="2_ijhx3"]
[ext_resource type="Script" path="res://scenes/game_scene/input_display_label.gd" id="3_3s8h5"]

[node name="Level1" type="Control"]
layout_mode = 3
Expand All @@ -10,7 +11,7 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_b4pnr")
script = ExtResource("1_bm75r")

[node name="BackgroundColor" type="ColorRect" parent="."]
unique_name_in_owner = true
Expand Down Expand Up @@ -42,7 +43,7 @@ theme_override_constants/separation = 16
layout_mode = 2
size_flags_vertical = 3
theme_override_constants/separation = 32
script = ExtResource("2_5rc06")
script = ExtResource("2_ijhx3")

[node name="WinButton" type="Button" parent="MarginContainer/VBoxContainer/HBoxContainer"]
layout_mode = 2
Expand Down Expand Up @@ -76,6 +77,12 @@ unique_name_in_owner = true
layout_mode = 2
text = "Change Color"

[node name="InputDisplayLabel" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer2"]
layout_mode = 2
size_flags_horizontal = 3
horizontal_alignment = 1
script = ExtResource("3_3s8h5")

[connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/WinButton" to="." method="_on_win_button_pressed"]
[connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/LoseButton" to="." method="_on_lose_button_pressed"]
[connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/LoseButton2" to="." method="_on_lose_button_pressed"]
Expand Down
2 changes: 1 addition & 1 deletion src/scenes/menus/main_menu/main_menu_with_animations.gd
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func _setup_game_buttons():
super._setup_game_buttons()
if GameState.has_game_state():
%ContinueGameButton.show()
if GameState.get_max_level_reached() > 0:
if level_select_packed_scene != null and GameState.get_max_level_reached() > 0:
%LevelSelectButton.show()

func _on_continue_game_button_pressed():
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
[ext_resource type="PackedScene" uid="uid://b6bl3n5mp3m1e" path="res://addons/maaacks_game_template/base/scenes/menus/options_menu/option_control/list_option_control.tscn" id="3_h7trr"]

[node name="Video" instance=ExtResource("1_68kug")]
script = ExtResource("2_ynerd")

[node name="ResolutionControl" parent="VBoxContainer" index="1"]
property_type = 6
script = ExtResource("2_r8snp")

[node name="AntiAliasingControl" parent="VBoxContainer" index="2" instance=ExtResource("3_h7trr")]
layout_mode = 2
Expand Down

0 comments on commit 93138af

Please sign in to comment.