menus and settings

menus/scenes/game_scene/game_ui.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=11 format=3 uid="uid://cn7ialakmhaeq"]
+[gd_scene load_steps=12 format=3 uid="uid://cn7ialakmhaeq"]
 
 [ext_resource type="Script" uid="uid://cyh0d64pfygbl" path="res://addons/maaacks_game_template/base/scripts/pause_menu_controller.gd" id="1_wm2gk"]
 [ext_resource type="PackedScene" uid="uid://ccqajqchiw4xu" path="res://menus/scenes/overlaid_menus/pause_menu.tscn" id="2_0bqsg"]
 [ext_resource type="PackedScene" uid="uid://bkcsjsk2ciff" path="res://addons/maaacks_game_template/base/scenes/music_players/background_music_player.tscn" id="3_aryyu"]
 [ext_resource type="Script" uid="uid://crbo2e4ndbyvk" path="res://addons/maaacks_game_template/extras/scripts/level_list_loader.gd" id="4_q70eh"]
+[ext_resource type="AudioStream" uid="uid://f8cvr5s041ej" path="res://assets/audio/ambiance/637083__nox_sound__ambiance_nature_night_cricket_calm_loop_stereo.wav" id="4_xinp6"]
 [ext_resource type="Script" uid="uid://3yfyhcjuxm0t" path="res://menus/scripts/level_list_and_state_manager.gd" id="5_cm6at"]
 [ext_resource type="PackedScene" uid="uid://dmq0tpdodtomh" path="res://menus/scenes/overlaid_menus/game_won_menu.tscn" id="6_72q1f"]
 [ext_resource type="PackedScene" uid="uid://ciyq8eiv1mtie" path="res://menus/scenes/overlaid_menus/level_lost_menu.tscn" id="7_mkrcq"]
@@ -25,6 +26,7 @@ pause_menu_packed = ExtResource("2_0bqsg")
 focused_viewport = NodePath("../ViewportContainer/ConfigurableSubViewport")
 
 [node name="BackgroundMusicPlayer" parent="." instance=ExtResource("3_aryyu")]
+stream = ExtResource("4_xinp6")
 
 [node name="LevelListLoader" type="Node" parent="." node_paths=PackedStringArray("level_container")]
 script = ExtResource("4_q70eh")
@@ -58,6 +60,6 @@ stretch = true
 handle_input_locally = false
 audio_listener_enable_2d = true
 audio_listener_enable_3d = true
-size = Vector2i(1280, 720)
+size = Vector2i(1920, 1080)
 render_target_update_mode = 4
 script = ExtResource("10_kh6hf")

menus/scenes/menus/main_menu/main_menu_with_animations.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=16 format=3 uid="uid://vm22i5sv3p3s"]
+[gd_scene load_steps=17 format=3 uid="uid://vm22i5sv3p3s"]
 
 [ext_resource type="PackedScene" uid="uid://c6k5nnpbypshi" path="res://addons/maaacks_game_template/base/scenes/menus/main_menu/main_menu.tscn" id="1_my8ii"]
 [ext_resource type="Script" uid="uid://c0ntfmiuw4ttg" path="res://menus/scenes/menus/main_menu/main_menu_with_animations.gd" id="2_nyjay"]
+[ext_resource type="AudioStream" uid="uid://f8cvr5s041ej" path="res://assets/audio/ambiance/637083__nox_sound__ambiance_nature_night_cricket_calm_loop_stereo.wav" id="3_tvvjd"]
 
 [sub_resource type="Animation" id="1"]
 resource_name = "Intro"
@@ -362,12 +363,19 @@ tree_root = SubResource("AnimationNodeStateMachine_vikuh")
 anim_player = NodePath("../MenuAnimationPlayer")
 parameters/conditions/intro_done = false
 
+[node name="BackgroundMusicPlayer" parent="." index="3"]
+stream = ExtResource("3_tvvjd")
+
 [node name="VersionContainer" parent="VersionMargin" index="0"]
 modulate = Color(1, 1, 1, 0)
 
 [node name="TitleContainer" parent="MenuContainer/TitleMargin" index="0"]
 modulate = Color(1, 1, 1, 0)
 
+[node name="TitleLabel" parent="MenuContainer/TitleMargin/TitleContainer" index="0"]
+text = "Swoosh"
+lock = true
+
 [node name="SubTitleContainer" parent="MenuContainer/SubTitleMargin" index="0"]
 modulate = Color(1, 1, 1, 0)
 
@@ -380,6 +388,9 @@ modulate = Color(1, 1, 1, 0)
 [node name="MenuButtonsBoxContainer" parent="MenuContainer/MenuButtonsMargin/MenuButtonsContainer" index="0"]
 lock = true
 
+[node name="NewGameButton" parent="MenuContainer/MenuButtonsMargin/MenuButtonsContainer/MenuButtonsBoxContainer" index="0"]
+text = "Start"
+
 [node name="ContinueGameButton" type="Button" parent="MenuContainer/MenuButtonsMargin/MenuButtonsContainer/MenuButtonsBoxContainer" index="1"]
 unique_name_in_owner = true
 visible = false
@@ -392,6 +403,9 @@ visible = false
 layout_mode = 2
 text = "Level Select"
 
+[node name="CreditsButton" parent="MenuContainer/MenuButtonsMargin/MenuButtonsContainer/MenuButtonsBoxContainer" index="4"]
+visible = false
+
 [node name="LevelSelectContainer" type="MarginContainer" parent="." index="9"]
 unique_name_in_owner = true
 layout_mode = 0

menus/scenes/menus/options_menu/input/input_extras_menu.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://ceehkbh6emrdm"]
 
-[ext_resource type="Script" path="res://addons/maaacks_game_template/base/scripts/capture_focus.gd" id="1_goga1"]
-[ext_resource type="PackedScene" path="res://addons/maaacks_game_template/base/scenes/menus/options_menu/option_control/slider_option_control.tscn" id="2_iyvrj"]
+[ext_resource type="Script" uid="uid://1nf36h0gms3q" path="res://addons/maaacks_game_template/base/scripts/capture_focus.gd" id="1_goga1"]
+[ext_resource type="PackedScene" uid="uid://cl416gdb1fgwr" path="res://addons/maaacks_game_template/base/scenes/menus/options_menu/option_control/slider_option_control.tscn" id="2_iyvrj"]
 
 [node name="Inputs" type="MarginContainer"]
 anchors_preset = 15
@@ -31,35 +31,50 @@ size_flags_vertical = 3
 theme_override_constants/separation = 8
 alignment = 1
 
-[node name="MouseSensitivityControl" parent="VBoxContainer/MarginContainer/VBoxContainer" instance=ExtResource("2_iyvrj")]
+[node name="LookSensitivityControl" parent="VBoxContainer/MarginContainer/VBoxContainer" instance=ExtResource("2_iyvrj")]
 layout_mode = 2
-option_name = "Mouse Sensitivity"
+option_name = "Look Sensitivity"
 option_section = 1
-key = "MouseSensitivity"
+key = "LookSensitivity"
 section = "InputSettings"
 
-[node name="OptionLabel" parent="VBoxContainer/MarginContainer/VBoxContainer/MouseSensitivityControl" index="0"]
-text = "Mouse Sensitivity :"
+[node name="OptionLabel" parent="VBoxContainer/MarginContainer/VBoxContainer/LookSensitivityControl" index="0"]
+text = "Look Sensitivity :"
 
-[node name="HSlider" parent="VBoxContainer/MarginContainer/VBoxContainer/MouseSensitivityControl" index="1"]
-min_value = 0.25
+[node name="HSlider" parent="VBoxContainer/MarginContainer/VBoxContainer/LookSensitivityControl" index="1"]
+min_value = 0.2
 max_value = 2.0
-tick_count = 8
+step = 0.2
+tick_count = 10
 
-[node name="JoypadSensitivityControl" parent="VBoxContainer/MarginContainer/VBoxContainer" instance=ExtResource("2_iyvrj")]
+[node name="HeadBobbingControl" parent="VBoxContainer/MarginContainer/VBoxContainer" instance=ExtResource("2_iyvrj")]
 layout_mode = 2
-option_name = "Joypad Sensitivity"
+option_name = "Head Bobbing while walking"
 option_section = 1
-key = "JoypadSensitivity"
+key = "HeadBobbingWhileWalking"
 section = "InputSettings"
 
-[node name="OptionLabel" parent="VBoxContainer/MarginContainer/VBoxContainer/JoypadSensitivityControl" index="0"]
-text = "Joypad Sensitivity :"
+[node name="OptionLabel" parent="VBoxContainer/MarginContainer/VBoxContainer/HeadBobbingControl" index="0"]
+text = "Head Bobbing while walking :"
 
-[node name="HSlider" parent="VBoxContainer/MarginContainer/VBoxContainer/JoypadSensitivityControl" index="1"]
-min_value = 0.25
-max_value = 2.0
-tick_count = 8
+[node name="HSlider" parent="VBoxContainer/MarginContainer/VBoxContainer/HeadBobbingControl" index="1"]
+step = 0.1
+tick_count = 10
 
-[editable path="VBoxContainer/MarginContainer/VBoxContainer/MouseSensitivityControl"]
-[editable path="VBoxContainer/MarginContainer/VBoxContainer/JoypadSensitivityControl"]
+[node name="FOVChangeControl" parent="VBoxContainer/MarginContainer/VBoxContainer" instance=ExtResource("2_iyvrj")]
+layout_mode = 2
+option_name = "FOV change with speed"
+option_section = 1
+key = "FovChangeWithSpeed"
+section = "InputSettings"
+
+[node name="OptionLabel" parent="VBoxContainer/MarginContainer/VBoxContainer/FOVChangeControl" index="0"]
+text = "FOV change with speed :"
+
+[node name="HSlider" parent="VBoxContainer/MarginContainer/VBoxContainer/FOVChangeControl" index="1"]
+step = 0.1
+tick_count = 10
+
+[editable path="VBoxContainer/MarginContainer/VBoxContainer/LookSensitivityControl"]
+[editable path="VBoxContainer/MarginContainer/VBoxContainer/HeadBobbingControl"]
+[editable path="VBoxContainer/MarginContainer/VBoxContainer/FOVChangeControl"]

menus/scenes/menus/options_menu/master_options_menu_with_tabs.tscn

@@ -11,29 +11,35 @@
 [node name="MasterOptionsMenu" instance=ExtResource("1_iwcoa")]
 script = ExtResource("2_36oo7")
 
-[node name="TabContainer" parent="." index="0"]
+[node name="Controls" parent="." index="0" instance=ExtResource("3_l1ye5")]
+visible = false
+layout_mode = 0
+anchors_preset = 0
+offset_top = 31.0
+offset_right = -2.0
+offset_bottom = -2.0
+
+[node name="Game" parent="." index="1" instance=ExtResource("7_q1wy3")]
+visible = false
+layout_mode = 0
+anchors_preset = 0
+offset_top = 31.0
+offset_right = -2.0
+offset_bottom = -2.0
+
+[node name="TabContainer" parent="." index="2"]
 current_tab = 0
 
-[node name="Controls" parent="TabContainer" index="1" instance=ExtResource("3_l1ye5")]
+[node name="Game" parent="TabContainer" index="1" instance=ExtResource("4_w27xj")]
 layout_mode = 2
 metadata/_tab_index = 0
 
-[node name="Inputs" parent="TabContainer" index="2" instance=ExtResource("4_w27xj")]
+[node name="Audio" parent="TabContainer" index="2" instance=ExtResource("5_f0yn1")]
 visible = false
 layout_mode = 2
 metadata/_tab_index = 1
 
-[node name="Audio" parent="TabContainer" index="3" instance=ExtResource("5_f0yn1")]
+[node name="Video" parent="TabContainer" index="3" instance=ExtResource("6_7ovpx")]
 visible = false
 layout_mode = 2
 metadata/_tab_index = 2
-
-[node name="Video" parent="TabContainer" index="4" instance=ExtResource("6_7ovpx")]
-visible = false
-layout_mode = 2
-metadata/_tab_index = 3
-
-[node name="Game" parent="TabContainer" index="5" instance=ExtResource("7_q1wy3")]
-visible = false
-layout_mode = 2
-metadata/_tab_index = 4

menus/scripts/game_state.gd

@@ -20,6 +20,7 @@ static func get_level_state(level_state_key : String) -> LevelState:
 		return new_level_state
 
 static func has_game_state() -> bool:
+	return false
 	return GlobalState.has_state(STATE_NAME)
 
 static func get_game_state() -> GameState: