diff --git a/addons/maaacks_game_template/base/scenes/autoloads/project_ui_sound_controller.tscn b/addons/maaacks_game_template/base/scenes/autoloads/project_ui_sound_controller.tscn index c1ec9f6d..0dc89e69 100644 --- a/addons/maaacks_game_template/base/scenes/autoloads/project_ui_sound_controller.tscn +++ b/addons/maaacks_game_template/base/scenes/autoloads/project_ui_sound_controller.tscn @@ -1,6 +1,20 @@ -[gd_scene load_steps=2 format=3 uid="uid://cc37235kj4384"] +[gd_scene load_steps=6 format=3 uid="uid://cc37235kj4384"] [ext_resource type="Script" uid="uid://b5oej1q4h7jvh" path="res://addons/maaacks_game_template/base/scripts/ui_sound_controller.gd" id="1_dmagn"] +[ext_resource type="AudioStream" uid="uid://d0iuat23cm2yd" path="res://assets/audio/kenney_ui-audio/mouseclick1.ogg" id="2_7f8wo"] +[ext_resource type="AudioStream" uid="uid://skgtkftvx1gn" path="res://assets/audio/kenney_ui-audio/switch20.ogg" id="3_nvwb3"] +[ext_resource type="AudioStream" uid="uid://dybdbi28p8a7o" path="res://assets/audio/kenney_ui-audio/switch3.ogg" id="4_e13bv"] +[ext_resource type="AudioStream" uid="uid://o3wvigf0nhg" path="res://assets/audio/kenney_ui-audio/switch4.ogg" id="5_42wer"] [node name="ProjectUISoundController" type="Node"] script = ExtResource("1_dmagn") +button_hovered = ExtResource("2_7f8wo") +button_focused = ExtResource("2_7f8wo") +button_pressed = ExtResource("3_nvwb3") +tab_hovered = ExtResource("2_7f8wo") +tab_selected = ExtResource("3_nvwb3") +slider_hovered = ExtResource("2_7f8wo") +slider_focused = ExtResource("2_7f8wo") +slider_drag_started = ExtResource("4_e13bv") +slider_drag_ended = ExtResource("5_42wer") +line_hovered = ExtResource("2_7f8wo") diff --git a/addons/maaacks_game_template/base/scripts/pause_menu_controller.gd b/addons/maaacks_game_template/base/scripts/pause_menu_controller.gd index cd61315c..4c1f524d 100644 --- a/addons/maaacks_game_template/base/scripts/pause_menu_controller.gd +++ b/addons/maaacks_game_template/base/scripts/pause_menu_controller.gd @@ -2,17 +2,28 @@ class_name PauseMenuController extends Node ## Node for opening a pause menu when detecting a 'ui_cancel' event. - @export var pause_menu_packed : PackedScene @export var focused_viewport : Viewport +@export_group("Inputs") +@export var base_mode:GUIDEMappingContext +@export var pause:GUIDEAction + +func _ready() -> void: + GUIDE.enable_mapping_context(base_mode) + + pause.triggered.connect(on_input_pause) + +func on_input_pause(): + if not focused_viewport: + focused_viewport = get_viewport() + var _initial_focus_control = focused_viewport.gui_get_focus_owner() + var current_menu = pause_menu_packed.instantiate() + get_tree().current_scene.call_deferred("add_child", current_menu) + await current_menu.tree_exited + if is_inside_tree() and _initial_focus_control: + _initial_focus_control.grab_focus() + func _unhandled_input(event : InputEvent) -> void: if event.is_action_pressed("ui_cancel"): - if not focused_viewport: - focused_viewport = get_viewport() - var _initial_focus_control = focused_viewport.gui_get_focus_owner() - var current_menu = pause_menu_packed.instantiate() - get_tree().current_scene.call_deferred("add_child", current_menu) - await current_menu.tree_exited - if is_inside_tree() and _initial_focus_control: - _initial_focus_control.grab_focus() + pass diff --git a/assets/audio/ambiance/637083__nox_sound__ambiance_nature_night_cricket_calm_loop_stereo.wav b/assets/audio/ambiance/637083__nox_sound__ambiance_nature_night_cricket_calm_loop_stereo.wav new file mode 100644 index 00000000..c0167a1d --- /dev/null +++ b/assets/audio/ambiance/637083__nox_sound__ambiance_nature_night_cricket_calm_loop_stereo.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4b4542a7036744acdeaf6e2c46e4f972f260fcd1624d1c1efa3cedcc9f71752 +size 17220466 diff --git a/assets/audio/ambiance/637083__nox_sound__ambiance_nature_night_cricket_calm_loop_stereo.wav.import b/assets/audio/ambiance/637083__nox_sound__ambiance_nature_night_cricket_calm_loop_stereo.wav.import new file mode 100644 index 00000000..2407bc19 --- /dev/null +++ b/assets/audio/ambiance/637083__nox_sound__ambiance_nature_night_cricket_calm_loop_stereo.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://f8cvr5s041ej" +path="res://.godot/imported/637083__nox_sound__ambiance_nature_night_cricket_calm_loop_stereo.wav-2e700b8c124a9677672d20eb38b6b815.sample" + +[deps] + +source_file="res://assets/audio/ambiance/637083__nox_sound__ambiance_nature_night_cricket_calm_loop_stereo.wav" +dest_files=["res://.godot/imported/637083__nox_sound__ambiance_nature_night_cricket_calm_loop_stereo.wav-2e700b8c124a9677672d20eb38b6b815.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=2 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/assets/audio/kenney_ui-audio.zip b/assets/audio/kenney_ui-audio.zip new file mode 100644 index 00000000..7bb0971c Binary files /dev/null and b/assets/audio/kenney_ui-audio.zip differ diff --git a/assets/audio/kenney_ui-audio/click1.ogg b/assets/audio/kenney_ui-audio/click1.ogg new file mode 100644 index 00000000..502a7297 Binary files /dev/null and b/assets/audio/kenney_ui-audio/click1.ogg differ diff --git a/assets/audio/kenney_ui-audio/click1.ogg.import b/assets/audio/kenney_ui-audio/click1.ogg.import new file mode 100644 index 00000000..efdff028 --- /dev/null +++ b/assets/audio/kenney_ui-audio/click1.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cl6h0mjha1nx6" +path="res://.godot/imported/click1.ogg-e43207507bdf9996dc6eee9d8de2d6ae.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/click1.ogg" +dest_files=["res://.godot/imported/click1.ogg-e43207507bdf9996dc6eee9d8de2d6ae.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0.0 +bpm=0.0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/click2.ogg b/assets/audio/kenney_ui-audio/click2.ogg new file mode 100644 index 00000000..fb04bd95 Binary files /dev/null and b/assets/audio/kenney_ui-audio/click2.ogg differ diff --git a/assets/audio/kenney_ui-audio/click2.ogg.import b/assets/audio/kenney_ui-audio/click2.ogg.import new file mode 100644 index 00000000..6fc1a601 --- /dev/null +++ b/assets/audio/kenney_ui-audio/click2.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dwlx1fle7occu" +path="res://.godot/imported/click2.ogg-cc6f77c66c2a5c5fb2b99a8dcacf5dbb.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/click2.ogg" +dest_files=["res://.godot/imported/click2.ogg-cc6f77c66c2a5c5fb2b99a8dcacf5dbb.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/click3.ogg b/assets/audio/kenney_ui-audio/click3.ogg new file mode 100644 index 00000000..5d223f37 Binary files /dev/null and b/assets/audio/kenney_ui-audio/click3.ogg differ diff --git a/assets/audio/kenney_ui-audio/click3.ogg.import b/assets/audio/kenney_ui-audio/click3.ogg.import new file mode 100644 index 00000000..3920863f --- /dev/null +++ b/assets/audio/kenney_ui-audio/click3.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://d1lxvmeu7xqhc" +path="res://.godot/imported/click3.ogg-53ec2ad3446a1599306ba5fb69f83ef6.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/click3.ogg" +dest_files=["res://.godot/imported/click3.ogg-53ec2ad3446a1599306ba5fb69f83ef6.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/click4.ogg b/assets/audio/kenney_ui-audio/click4.ogg new file mode 100644 index 00000000..5f036e79 Binary files /dev/null and b/assets/audio/kenney_ui-audio/click4.ogg differ diff --git a/assets/audio/kenney_ui-audio/click4.ogg.import b/assets/audio/kenney_ui-audio/click4.ogg.import new file mode 100644 index 00000000..28ffbee7 --- /dev/null +++ b/assets/audio/kenney_ui-audio/click4.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://v4b7r86gw4jv" +path="res://.godot/imported/click4.ogg-578b6508ba2c2082ae1380997e4a7d4b.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/click4.ogg" +dest_files=["res://.godot/imported/click4.ogg-578b6508ba2c2082ae1380997e4a7d4b.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/click5.ogg b/assets/audio/kenney_ui-audio/click5.ogg new file mode 100644 index 00000000..28555de3 Binary files /dev/null and b/assets/audio/kenney_ui-audio/click5.ogg differ diff --git a/assets/audio/kenney_ui-audio/click5.ogg.import b/assets/audio/kenney_ui-audio/click5.ogg.import new file mode 100644 index 00000000..eff80949 --- /dev/null +++ b/assets/audio/kenney_ui-audio/click5.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bi8dejhv7sow8" +path="res://.godot/imported/click5.ogg-c58aa7f0d158cbf4264b42d0b73f63a0.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/click5.ogg" +dest_files=["res://.godot/imported/click5.ogg-c58aa7f0d158cbf4264b42d0b73f63a0.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/mouseclick1.ogg b/assets/audio/kenney_ui-audio/mouseclick1.ogg new file mode 100644 index 00000000..46d5f62d Binary files /dev/null and b/assets/audio/kenney_ui-audio/mouseclick1.ogg differ diff --git a/assets/audio/kenney_ui-audio/mouseclick1.ogg.import b/assets/audio/kenney_ui-audio/mouseclick1.ogg.import new file mode 100644 index 00000000..d0e19bde --- /dev/null +++ b/assets/audio/kenney_ui-audio/mouseclick1.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://d0iuat23cm2yd" +path="res://.godot/imported/mouseclick1.ogg-4cb23de28f1184f8690200698d0db0a0.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/mouseclick1.ogg" +dest_files=["res://.godot/imported/mouseclick1.ogg-4cb23de28f1184f8690200698d0db0a0.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/mouserelease1.ogg b/assets/audio/kenney_ui-audio/mouserelease1.ogg new file mode 100644 index 00000000..f87a9e81 Binary files /dev/null and b/assets/audio/kenney_ui-audio/mouserelease1.ogg differ diff --git a/assets/audio/kenney_ui-audio/mouserelease1.ogg.import b/assets/audio/kenney_ui-audio/mouserelease1.ogg.import new file mode 100644 index 00000000..21121432 --- /dev/null +++ b/assets/audio/kenney_ui-audio/mouserelease1.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://c3m0rgi6i5m64" +path="res://.godot/imported/mouserelease1.ogg-aa3af07b09ea13ea295da153698ca257.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/mouserelease1.ogg" +dest_files=["res://.godot/imported/mouserelease1.ogg-aa3af07b09ea13ea295da153698ca257.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/rollover1.ogg b/assets/audio/kenney_ui-audio/rollover1.ogg new file mode 100644 index 00000000..4ddd4f77 Binary files /dev/null and b/assets/audio/kenney_ui-audio/rollover1.ogg differ diff --git a/assets/audio/kenney_ui-audio/rollover1.ogg.import b/assets/audio/kenney_ui-audio/rollover1.ogg.import new file mode 100644 index 00000000..ea6c8ee2 --- /dev/null +++ b/assets/audio/kenney_ui-audio/rollover1.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://ccwsi7fn6iuyi" +path="res://.godot/imported/rollover1.ogg-573772d4df2f7b01e70366ab1ff70f0a.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/rollover1.ogg" +dest_files=["res://.godot/imported/rollover1.ogg-573772d4df2f7b01e70366ab1ff70f0a.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/rollover2.ogg b/assets/audio/kenney_ui-audio/rollover2.ogg new file mode 100644 index 00000000..d1964d06 Binary files /dev/null and b/assets/audio/kenney_ui-audio/rollover2.ogg differ diff --git a/assets/audio/kenney_ui-audio/rollover2.ogg.import b/assets/audio/kenney_ui-audio/rollover2.ogg.import new file mode 100644 index 00000000..23c3e9fa --- /dev/null +++ b/assets/audio/kenney_ui-audio/rollover2.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://duwbtggblpjr7" +path="res://.godot/imported/rollover2.ogg-10e5be71249d57bb88d3e8f876eafa29.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/rollover2.ogg" +dest_files=["res://.godot/imported/rollover2.ogg-10e5be71249d57bb88d3e8f876eafa29.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/rollover3.ogg b/assets/audio/kenney_ui-audio/rollover3.ogg new file mode 100644 index 00000000..671c10d2 Binary files /dev/null and b/assets/audio/kenney_ui-audio/rollover3.ogg differ diff --git a/assets/audio/kenney_ui-audio/rollover3.ogg.import b/assets/audio/kenney_ui-audio/rollover3.ogg.import new file mode 100644 index 00000000..8832537c --- /dev/null +++ b/assets/audio/kenney_ui-audio/rollover3.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://chaebu4sj7tyu" +path="res://.godot/imported/rollover3.ogg-fd33b122537c769a7bf3909c83d3c93d.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/rollover3.ogg" +dest_files=["res://.godot/imported/rollover3.ogg-fd33b122537c769a7bf3909c83d3c93d.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/rollover4.ogg b/assets/audio/kenney_ui-audio/rollover4.ogg new file mode 100644 index 00000000..0b9501bf Binary files /dev/null and b/assets/audio/kenney_ui-audio/rollover4.ogg differ diff --git a/assets/audio/kenney_ui-audio/rollover4.ogg.import b/assets/audio/kenney_ui-audio/rollover4.ogg.import new file mode 100644 index 00000000..d67335ce --- /dev/null +++ b/assets/audio/kenney_ui-audio/rollover4.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://b2vep0mcavvxe" +path="res://.godot/imported/rollover4.ogg-145aadee75ad5532dc3cac53b84ebc25.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/rollover4.ogg" +dest_files=["res://.godot/imported/rollover4.ogg-145aadee75ad5532dc3cac53b84ebc25.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/rollover5.ogg b/assets/audio/kenney_ui-audio/rollover5.ogg new file mode 100644 index 00000000..1cc1dc55 Binary files /dev/null and b/assets/audio/kenney_ui-audio/rollover5.ogg differ diff --git a/assets/audio/kenney_ui-audio/rollover5.ogg.import b/assets/audio/kenney_ui-audio/rollover5.ogg.import new file mode 100644 index 00000000..b75d302a --- /dev/null +++ b/assets/audio/kenney_ui-audio/rollover5.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://d0uwts21x0jag" +path="res://.godot/imported/rollover5.ogg-2dd3bd022e4f8e41b87f62179f4793c4.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/rollover5.ogg" +dest_files=["res://.godot/imported/rollover5.ogg-2dd3bd022e4f8e41b87f62179f4793c4.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/rollover6.ogg b/assets/audio/kenney_ui-audio/rollover6.ogg new file mode 100644 index 00000000..dc58c30f Binary files /dev/null and b/assets/audio/kenney_ui-audio/rollover6.ogg differ diff --git a/assets/audio/kenney_ui-audio/rollover6.ogg.import b/assets/audio/kenney_ui-audio/rollover6.ogg.import new file mode 100644 index 00000000..bc2147ac --- /dev/null +++ b/assets/audio/kenney_ui-audio/rollover6.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://b48d8rxg8wlt5" +path="res://.godot/imported/rollover6.ogg-373eb402fd4162819ce38aa92f28bc1a.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/rollover6.ogg" +dest_files=["res://.godot/imported/rollover6.ogg-373eb402fd4162819ce38aa92f28bc1a.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch1.ogg b/assets/audio/kenney_ui-audio/switch1.ogg new file mode 100644 index 00000000..f72d399c Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch1.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch1.ogg.import b/assets/audio/kenney_ui-audio/switch1.ogg.import new file mode 100644 index 00000000..93adb7b6 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch1.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://ccmrm6u1yuw85" +path="res://.godot/imported/switch1.ogg-75dc9faf898d639de0a49ae458eb46ca.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch1.ogg" +dest_files=["res://.godot/imported/switch1.ogg-75dc9faf898d639de0a49ae458eb46ca.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch10.ogg b/assets/audio/kenney_ui-audio/switch10.ogg new file mode 100644 index 00000000..8dcc04ef Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch10.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch10.ogg.import b/assets/audio/kenney_ui-audio/switch10.ogg.import new file mode 100644 index 00000000..263cf76b --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch10.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bpw83da80rqba" +path="res://.godot/imported/switch10.ogg-e0700eb727673f65ad2a154a0b179f7e.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch10.ogg" +dest_files=["res://.godot/imported/switch10.ogg-e0700eb727673f65ad2a154a0b179f7e.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch11.ogg b/assets/audio/kenney_ui-audio/switch11.ogg new file mode 100644 index 00000000..a40eab84 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch11.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch11.ogg.import b/assets/audio/kenney_ui-audio/switch11.ogg.import new file mode 100644 index 00000000..ff7385ed --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch11.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bnmoxyho0k1xw" +path="res://.godot/imported/switch11.ogg-171e5ab339b098e2cd6f2b86251650aa.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch11.ogg" +dest_files=["res://.godot/imported/switch11.ogg-171e5ab339b098e2cd6f2b86251650aa.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch12.ogg b/assets/audio/kenney_ui-audio/switch12.ogg new file mode 100644 index 00000000..26a3fc2e Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch12.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch12.ogg.import b/assets/audio/kenney_ui-audio/switch12.ogg.import new file mode 100644 index 00000000..7f1026cb --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch12.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://d3a70bxs4d73m" +path="res://.godot/imported/switch12.ogg-19b8fd47adeb2fdba03c0f85b92680c5.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch12.ogg" +dest_files=["res://.godot/imported/switch12.ogg-19b8fd47adeb2fdba03c0f85b92680c5.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch13.ogg b/assets/audio/kenney_ui-audio/switch13.ogg new file mode 100644 index 00000000..ef00cb2e Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch13.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch13.ogg.import b/assets/audio/kenney_ui-audio/switch13.ogg.import new file mode 100644 index 00000000..a2aa99f8 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch13.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://edx7v3d1ghqr" +path="res://.godot/imported/switch13.ogg-280233c5aed9d2e2a0da13be705ea723.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch13.ogg" +dest_files=["res://.godot/imported/switch13.ogg-280233c5aed9d2e2a0da13be705ea723.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch14.ogg b/assets/audio/kenney_ui-audio/switch14.ogg new file mode 100644 index 00000000..f140e527 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch14.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch14.ogg.import b/assets/audio/kenney_ui-audio/switch14.ogg.import new file mode 100644 index 00000000..1e221a7f --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch14.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://sj1hwfpmunyh" +path="res://.godot/imported/switch14.ogg-066e5a73769d89d43c987be5f89217dc.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch14.ogg" +dest_files=["res://.godot/imported/switch14.ogg-066e5a73769d89d43c987be5f89217dc.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch15.ogg b/assets/audio/kenney_ui-audio/switch15.ogg new file mode 100644 index 00000000..781956d3 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch15.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch15.ogg.import b/assets/audio/kenney_ui-audio/switch15.ogg.import new file mode 100644 index 00000000..05a9cd18 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch15.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dev37gtb8t4w" +path="res://.godot/imported/switch15.ogg-fe81387c978a8360fa2e91609b967b85.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch15.ogg" +dest_files=["res://.godot/imported/switch15.ogg-fe81387c978a8360fa2e91609b967b85.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch16.ogg b/assets/audio/kenney_ui-audio/switch16.ogg new file mode 100644 index 00000000..99c662d0 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch16.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch16.ogg.import b/assets/audio/kenney_ui-audio/switch16.ogg.import new file mode 100644 index 00000000..e040dd86 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch16.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://b7hb0obkwicb5" +path="res://.godot/imported/switch16.ogg-9d5085e26599492512d54326451d8859.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch16.ogg" +dest_files=["res://.godot/imported/switch16.ogg-9d5085e26599492512d54326451d8859.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0.0 +bpm=0.0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch17.ogg b/assets/audio/kenney_ui-audio/switch17.ogg new file mode 100644 index 00000000..0788c784 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch17.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch17.ogg.import b/assets/audio/kenney_ui-audio/switch17.ogg.import new file mode 100644 index 00000000..7e1d0773 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch17.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://d3p0rv5i32n22" +path="res://.godot/imported/switch17.ogg-dcaa770d48d58ecec9c7372cc890a174.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch17.ogg" +dest_files=["res://.godot/imported/switch17.ogg-dcaa770d48d58ecec9c7372cc890a174.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch18.ogg b/assets/audio/kenney_ui-audio/switch18.ogg new file mode 100644 index 00000000..1f182899 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch18.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch18.ogg.import b/assets/audio/kenney_ui-audio/switch18.ogg.import new file mode 100644 index 00000000..c13dafc6 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch18.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dfwh2tidppb4k" +path="res://.godot/imported/switch18.ogg-d51344c7c796b8d70997cad6d2bea5b8.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch18.ogg" +dest_files=["res://.godot/imported/switch18.ogg-d51344c7c796b8d70997cad6d2bea5b8.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch19.ogg b/assets/audio/kenney_ui-audio/switch19.ogg new file mode 100644 index 00000000..9a56d08b Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch19.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch19.ogg.import b/assets/audio/kenney_ui-audio/switch19.ogg.import new file mode 100644 index 00000000..abd1af81 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch19.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://c0nmmligmxgpi" +path="res://.godot/imported/switch19.ogg-a223608b7d6d38bffdd500f18977d519.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch19.ogg" +dest_files=["res://.godot/imported/switch19.ogg-a223608b7d6d38bffdd500f18977d519.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch2.ogg b/assets/audio/kenney_ui-audio/switch2.ogg new file mode 100644 index 00000000..a38d7756 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch2.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch2.ogg.import b/assets/audio/kenney_ui-audio/switch2.ogg.import new file mode 100644 index 00000000..e611aabc --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch2.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cditcf50xd4gg" +path="res://.godot/imported/switch2.ogg-4fd694310e8288830d31b03f1b0d11ba.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch2.ogg" +dest_files=["res://.godot/imported/switch2.ogg-4fd694310e8288830d31b03f1b0d11ba.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch20.ogg b/assets/audio/kenney_ui-audio/switch20.ogg new file mode 100644 index 00000000..68e1eb4f Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch20.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch20.ogg.import b/assets/audio/kenney_ui-audio/switch20.ogg.import new file mode 100644 index 00000000..2b2adbfe --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch20.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://skgtkftvx1gn" +path="res://.godot/imported/switch20.ogg-47315ee94a76214ca4683c19918734ec.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch20.ogg" +dest_files=["res://.godot/imported/switch20.ogg-47315ee94a76214ca4683c19918734ec.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch21.ogg b/assets/audio/kenney_ui-audio/switch21.ogg new file mode 100644 index 00000000..d5a1e645 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch21.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch21.ogg.import b/assets/audio/kenney_ui-audio/switch21.ogg.import new file mode 100644 index 00000000..fe68741c --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch21.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://5rdt8u6yq0v1" +path="res://.godot/imported/switch21.ogg-e9fe6b5d36ab829ebf253640c695aa9b.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch21.ogg" +dest_files=["res://.godot/imported/switch21.ogg-e9fe6b5d36ab829ebf253640c695aa9b.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch22.ogg b/assets/audio/kenney_ui-audio/switch22.ogg new file mode 100644 index 00000000..43f7ceac Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch22.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch22.ogg.import b/assets/audio/kenney_ui-audio/switch22.ogg.import new file mode 100644 index 00000000..14ae452f --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch22.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cgk3ifnqeytaa" +path="res://.godot/imported/switch22.ogg-ed3d9f36c51ed4c5780e2ca4b386a3b9.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch22.ogg" +dest_files=["res://.godot/imported/switch22.ogg-ed3d9f36c51ed4c5780e2ca4b386a3b9.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch23.ogg b/assets/audio/kenney_ui-audio/switch23.ogg new file mode 100644 index 00000000..f995ddd2 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch23.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch23.ogg.import b/assets/audio/kenney_ui-audio/switch23.ogg.import new file mode 100644 index 00000000..d89ecf8a --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch23.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://ba5ubcnk2yhq5" +path="res://.godot/imported/switch23.ogg-94c91e4abdf950ab9e048f954fc900ef.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch23.ogg" +dest_files=["res://.godot/imported/switch23.ogg-94c91e4abdf950ab9e048f954fc900ef.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch24.ogg b/assets/audio/kenney_ui-audio/switch24.ogg new file mode 100644 index 00000000..62a6ec2d Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch24.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch24.ogg.import b/assets/audio/kenney_ui-audio/switch24.ogg.import new file mode 100644 index 00000000..3e91fb47 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch24.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dgfshgucfe1m1" +path="res://.godot/imported/switch24.ogg-ad495a9cfeed3613e34b109133b92e4d.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch24.ogg" +dest_files=["res://.godot/imported/switch24.ogg-ad495a9cfeed3613e34b109133b92e4d.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch25.ogg b/assets/audio/kenney_ui-audio/switch25.ogg new file mode 100644 index 00000000..a87cacfb Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch25.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch25.ogg.import b/assets/audio/kenney_ui-audio/switch25.ogg.import new file mode 100644 index 00000000..7f86b722 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch25.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cg3y0kih0tfey" +path="res://.godot/imported/switch25.ogg-64c51c35f9024953e0952eeea23d2b9c.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch25.ogg" +dest_files=["res://.godot/imported/switch25.ogg-64c51c35f9024953e0952eeea23d2b9c.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch26.ogg b/assets/audio/kenney_ui-audio/switch26.ogg new file mode 100644 index 00000000..3e1fb453 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch26.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch26.ogg.import b/assets/audio/kenney_ui-audio/switch26.ogg.import new file mode 100644 index 00000000..06d15302 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch26.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cfqsx460nfu8k" +path="res://.godot/imported/switch26.ogg-29b41241ffe4984b23b605990f8b0727.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch26.ogg" +dest_files=["res://.godot/imported/switch26.ogg-29b41241ffe4984b23b605990f8b0727.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch27.ogg b/assets/audio/kenney_ui-audio/switch27.ogg new file mode 100644 index 00000000..ef81fd40 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch27.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch27.ogg.import b/assets/audio/kenney_ui-audio/switch27.ogg.import new file mode 100644 index 00000000..1b638c3f --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch27.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dbbqcwxety62q" +path="res://.godot/imported/switch27.ogg-30e386c677da42fd31af914863efe755.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch27.ogg" +dest_files=["res://.godot/imported/switch27.ogg-30e386c677da42fd31af914863efe755.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch28.ogg b/assets/audio/kenney_ui-audio/switch28.ogg new file mode 100644 index 00000000..45d22e8a Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch28.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch28.ogg.import b/assets/audio/kenney_ui-audio/switch28.ogg.import new file mode 100644 index 00000000..b4d5337f --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch28.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://denenycp6mv64" +path="res://.godot/imported/switch28.ogg-84c179ff833510072b3b24e27467b090.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch28.ogg" +dest_files=["res://.godot/imported/switch28.ogg-84c179ff833510072b3b24e27467b090.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch29.ogg b/assets/audio/kenney_ui-audio/switch29.ogg new file mode 100644 index 00000000..bb8ad3a6 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch29.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch29.ogg.import b/assets/audio/kenney_ui-audio/switch29.ogg.import new file mode 100644 index 00000000..a2bd6846 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch29.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://b2062jp3dkcw5" +path="res://.godot/imported/switch29.ogg-417404c3b10f26d0ce501e94c2327797.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch29.ogg" +dest_files=["res://.godot/imported/switch29.ogg-417404c3b10f26d0ce501e94c2327797.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch3.ogg b/assets/audio/kenney_ui-audio/switch3.ogg new file mode 100644 index 00000000..673f0488 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch3.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch3.ogg.import b/assets/audio/kenney_ui-audio/switch3.ogg.import new file mode 100644 index 00000000..f9e7eff4 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch3.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dybdbi28p8a7o" +path="res://.godot/imported/switch3.ogg-5f016c805cd42acd9104e13edc372e2e.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch3.ogg" +dest_files=["res://.godot/imported/switch3.ogg-5f016c805cd42acd9104e13edc372e2e.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch30.ogg b/assets/audio/kenney_ui-audio/switch30.ogg new file mode 100644 index 00000000..d7439949 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch30.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch30.ogg.import b/assets/audio/kenney_ui-audio/switch30.ogg.import new file mode 100644 index 00000000..6aec5cd7 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch30.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cpnsss5vn540j" +path="res://.godot/imported/switch30.ogg-7f2d2d494cd800e224a37bda1f0bb782.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch30.ogg" +dest_files=["res://.godot/imported/switch30.ogg-7f2d2d494cd800e224a37bda1f0bb782.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch31.ogg b/assets/audio/kenney_ui-audio/switch31.ogg new file mode 100644 index 00000000..0c3b0b1e Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch31.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch31.ogg.import b/assets/audio/kenney_ui-audio/switch31.ogg.import new file mode 100644 index 00000000..d62d14df --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch31.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://urkvduoelh14" +path="res://.godot/imported/switch31.ogg-b7bbbc3b1b9da5a16d97260cc4c8885b.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch31.ogg" +dest_files=["res://.godot/imported/switch31.ogg-b7bbbc3b1b9da5a16d97260cc4c8885b.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch32.ogg b/assets/audio/kenney_ui-audio/switch32.ogg new file mode 100644 index 00000000..b037cefb Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch32.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch32.ogg.import b/assets/audio/kenney_ui-audio/switch32.ogg.import new file mode 100644 index 00000000..d12305c7 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch32.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://ceygrd2i00746" +path="res://.godot/imported/switch32.ogg-5c6488feb02359df92bfb7243519a05f.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch32.ogg" +dest_files=["res://.godot/imported/switch32.ogg-5c6488feb02359df92bfb7243519a05f.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch33.ogg b/assets/audio/kenney_ui-audio/switch33.ogg new file mode 100644 index 00000000..6cb0a094 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch33.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch33.ogg.import b/assets/audio/kenney_ui-audio/switch33.ogg.import new file mode 100644 index 00000000..2e21b670 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch33.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bq3xgtn4nw1hm" +path="res://.godot/imported/switch33.ogg-eef53e29449d23422d601e1a873a80b4.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch33.ogg" +dest_files=["res://.godot/imported/switch33.ogg-eef53e29449d23422d601e1a873a80b4.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch34.ogg b/assets/audio/kenney_ui-audio/switch34.ogg new file mode 100644 index 00000000..31de16a2 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch34.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch34.ogg.import b/assets/audio/kenney_ui-audio/switch34.ogg.import new file mode 100644 index 00000000..76e98869 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch34.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://do8n0ftcri3xd" +path="res://.godot/imported/switch34.ogg-39d3fc8f252cc51ff77a099dbcd88b37.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch34.ogg" +dest_files=["res://.godot/imported/switch34.ogg-39d3fc8f252cc51ff77a099dbcd88b37.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch35.ogg b/assets/audio/kenney_ui-audio/switch35.ogg new file mode 100644 index 00000000..99b2c842 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch35.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch35.ogg.import b/assets/audio/kenney_ui-audio/switch35.ogg.import new file mode 100644 index 00000000..0e755a8b --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch35.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://c45dcxenvu6sx" +path="res://.godot/imported/switch35.ogg-15dd654f4422881550b3f3deed2bfb6a.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch35.ogg" +dest_files=["res://.godot/imported/switch35.ogg-15dd654f4422881550b3f3deed2bfb6a.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch36.ogg b/assets/audio/kenney_ui-audio/switch36.ogg new file mode 100644 index 00000000..101cd687 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch36.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch36.ogg.import b/assets/audio/kenney_ui-audio/switch36.ogg.import new file mode 100644 index 00000000..961646f5 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch36.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://s5xf2ixxndll" +path="res://.godot/imported/switch36.ogg-e5684c7c329beae9328b654e199781ca.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch36.ogg" +dest_files=["res://.godot/imported/switch36.ogg-e5684c7c329beae9328b654e199781ca.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch37.ogg b/assets/audio/kenney_ui-audio/switch37.ogg new file mode 100644 index 00000000..957bcdee Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch37.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch37.ogg.import b/assets/audio/kenney_ui-audio/switch37.ogg.import new file mode 100644 index 00000000..a9bdda3c --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch37.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://b5ls74fcv5gf1" +path="res://.godot/imported/switch37.ogg-4f931d2870bee498dcee0c212ebfaa65.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch37.ogg" +dest_files=["res://.godot/imported/switch37.ogg-4f931d2870bee498dcee0c212ebfaa65.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch38.ogg b/assets/audio/kenney_ui-audio/switch38.ogg new file mode 100644 index 00000000..dabb1c04 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch38.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch38.ogg.import b/assets/audio/kenney_ui-audio/switch38.ogg.import new file mode 100644 index 00000000..9144972c --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch38.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://ccfy8lifr607x" +path="res://.godot/imported/switch38.ogg-07a45c0583de2ec78a2eb32a69bf756f.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch38.ogg" +dest_files=["res://.godot/imported/switch38.ogg-07a45c0583de2ec78a2eb32a69bf756f.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch4.ogg b/assets/audio/kenney_ui-audio/switch4.ogg new file mode 100644 index 00000000..8e11491e Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch4.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch4.ogg.import b/assets/audio/kenney_ui-audio/switch4.ogg.import new file mode 100644 index 00000000..51bd8ef5 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch4.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://o3wvigf0nhg" +path="res://.godot/imported/switch4.ogg-19535b483d8ef45adfedd0795181f83f.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch4.ogg" +dest_files=["res://.godot/imported/switch4.ogg-19535b483d8ef45adfedd0795181f83f.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch5.ogg b/assets/audio/kenney_ui-audio/switch5.ogg new file mode 100644 index 00000000..754facf2 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch5.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch5.ogg.import b/assets/audio/kenney_ui-audio/switch5.ogg.import new file mode 100644 index 00000000..1bb073b7 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch5.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://c6glkhw20cr88" +path="res://.godot/imported/switch5.ogg-a5f1e2e5a762bab32f89fff7bba583e7.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch5.ogg" +dest_files=["res://.godot/imported/switch5.ogg-a5f1e2e5a762bab32f89fff7bba583e7.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch6.ogg b/assets/audio/kenney_ui-audio/switch6.ogg new file mode 100644 index 00000000..6dabf0b7 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch6.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch6.ogg.import b/assets/audio/kenney_ui-audio/switch6.ogg.import new file mode 100644 index 00000000..509eb8ed --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch6.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cvqv6thupgkrw" +path="res://.godot/imported/switch6.ogg-2e7c200e8a531d46552a6775e02984e6.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch6.ogg" +dest_files=["res://.godot/imported/switch6.ogg-2e7c200e8a531d46552a6775e02984e6.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch7.ogg b/assets/audio/kenney_ui-audio/switch7.ogg new file mode 100644 index 00000000..b70b49df Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch7.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch7.ogg.import b/assets/audio/kenney_ui-audio/switch7.ogg.import new file mode 100644 index 00000000..90307567 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch7.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://b30y11656ujue" +path="res://.godot/imported/switch7.ogg-f623bf722b13c888b55aa8fdfae6f01e.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch7.ogg" +dest_files=["res://.godot/imported/switch7.ogg-f623bf722b13c888b55aa8fdfae6f01e.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch8.ogg b/assets/audio/kenney_ui-audio/switch8.ogg new file mode 100644 index 00000000..55b0159e Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch8.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch8.ogg.import b/assets/audio/kenney_ui-audio/switch8.ogg.import new file mode 100644 index 00000000..91acec89 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch8.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://c3grly1hjfojx" +path="res://.godot/imported/switch8.ogg-a1613db7ca5f6406d6ab8c49cca986f2.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch8.ogg" +dest_files=["res://.godot/imported/switch8.ogg-a1613db7ca5f6406d6ab8c49cca986f2.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/kenney_ui-audio/switch9.ogg b/assets/audio/kenney_ui-audio/switch9.ogg new file mode 100644 index 00000000..d4263798 Binary files /dev/null and b/assets/audio/kenney_ui-audio/switch9.ogg differ diff --git a/assets/audio/kenney_ui-audio/switch9.ogg.import b/assets/audio/kenney_ui-audio/switch9.ogg.import new file mode 100644 index 00000000..7951ea07 --- /dev/null +++ b/assets/audio/kenney_ui-audio/switch9.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bu7cmkafvyslx" +path="res://.godot/imported/switch9.ogg-ea7fa4c6c3f77f69c7254c1af853c635.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/kenney_ui-audio/switch9.ogg" +dest_files=["res://.godot/imported/switch9.ogg-ea7fa4c6c3f77f69c7254c1af853c635.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/default_bus_layout.tres b/default_bus_layout.tres new file mode 100644 index 00000000..41db0b98 --- /dev/null +++ b/default_bus_layout.tres @@ -0,0 +1,15 @@ +[gd_resource type="AudioBusLayout" format=3 uid="uid://b32luari4le8j"] + +[resource] +bus/1/name = &"Music" +bus/1/solo = false +bus/1/mute = false +bus/1/bypass_fx = false +bus/1/volume_db = -6.5788474 +bus/1/send = &"Master" +bus/2/name = &"SFX" +bus/2/solo = false +bus/2/mute = false +bus/2/bypass_fx = false +bus/2/volume_db = -10.074136 +bus/2/send = &"Master" diff --git a/maps/city.tscn b/maps/city.tscn index b175cd44..902649a2 100644 --- a/maps/city.tscn +++ b/maps/city.tscn @@ -1,9 +1,15 @@ -[gd_scene load_steps=10 format=3 uid="uid://dmkw8cmalm5k"] +[gd_scene load_steps=16 format=3 uid="uid://dmkw8cmalm5k"] [ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_2vsi6"] [ext_resource type="Texture2D" uid="uid://ca4kkq3w8cd4n" path="res://assets/sky/sky_15_2k.png" id="2_ruo5i"] [ext_resource type="PackedScene" uid="uid://dkr80d2pi0d41" path="res://addons/guide/debugger/guide_debugger.tscn" id="2_uet8a"] [ext_resource type="Texture2D" uid="uid://7kcmi16gedd0" path="res://assets/LD-0001.png" id="3_ruo5i"] +[ext_resource type="Script" uid="uid://cyh0d64pfygbl" path="res://addons/maaacks_game_template/base/scripts/pause_menu_controller.gd" id="7_ukfuy"] +[ext_resource type="PackedScene" uid="uid://ccqajqchiw4xu" path="res://menus/scenes/overlaid_menus/pause_menu.tscn" id="8_wctvs"] +[ext_resource type="Resource" uid="uid://bl5crtu1gkrtr" path="res://systems/inputs/base_mode/base_mode.tres" id="9_eca4n"] +[ext_resource type="PackedScene" uid="uid://bkcsjsk2ciff" path="res://addons/maaacks_game_template/base/scenes/music_players/background_music_player.tscn" id="9_i2xii"] +[ext_resource type="Resource" uid="uid://dgluj0ql5vth7" path="res://systems/inputs/base_mode/pause.tres" id="10_0ari0"] +[ext_resource type="AudioStream" uid="uid://f8cvr5s041ej" path="res://assets/audio/ambiance/637083__nox_sound__ambiance_nature_night_cricket_calm_loop_stereo.wav" id="10_eca4n"] [ext_resource type="PackedScene" uid="uid://dip6cce5gtwi8" path="res://assets/greyboxing/guard_tower.tscn" id="11_wctvs"] [ext_resource type="PackedScene" uid="uid://c066hc7yu36wx" path="res://assets/water/water.tscn" id="12_i2xii"] @@ -62,3 +68,12 @@ transform = Transform3D(0.09033705, 0, 0.99591124, 0, 1, 0, -0.99591124, 0, 0.09 [node name="Water" parent="." instance=ExtResource("12_i2xii")] transform = Transform3D(10000, 0, 0, 0, 1, 0, 0, 0, 10000, 0, 4.03932, -186.25941) + +[node name="PauseMenuController" type="Node" parent="."] +script = ExtResource("7_ukfuy") +pause_menu_packed = ExtResource("8_wctvs") +base_mode = ExtResource("9_eca4n") +pause = ExtResource("10_0ari0") + +[node name="BackgroundMusicPlayer" parent="." instance=ExtResource("9_i2xii")] +stream = ExtResource("10_eca4n") diff --git a/menus/scenes/game_scene/game_ui.tscn b/menus/scenes/game_scene/game_ui.tscn index bc3098c4..9287157f 100644 --- a/menus/scenes/game_scene/game_ui.tscn +++ b/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") diff --git a/menus/scenes/menus/main_menu/main_menu_with_animations.tscn b/menus/scenes/menus/main_menu/main_menu_with_animations.tscn index 139ab4f6..0c031e1b 100644 --- a/menus/scenes/menus/main_menu/main_menu_with_animations.tscn +++ b/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 diff --git a/menus/scenes/menus/options_menu/input/input_extras_menu.tscn b/menus/scenes/menus/options_menu/input/input_extras_menu.tscn index 7857b4fb..1a70e9a7 100644 --- a/menus/scenes/menus/options_menu/input/input_extras_menu.tscn +++ b/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"] diff --git a/menus/scenes/menus/options_menu/master_options_menu_with_tabs.tscn b/menus/scenes/menus/options_menu/master_options_menu_with_tabs.tscn index e848fba9..45ac8c91 100644 --- a/menus/scenes/menus/options_menu/master_options_menu_with_tabs.tscn +++ b/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 diff --git a/menus/scripts/game_state.gd b/menus/scripts/game_state.gd index abfd8d7c..382c283b 100644 --- a/menus/scripts/game_state.gd +++ b/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: diff --git a/player_controller/PlayerController.tscn b/player_controller/PlayerController.tscn index dc2d29f9..0aba4dc9 100644 --- a/player_controller/PlayerController.tscn +++ b/player_controller/PlayerController.tscn @@ -138,7 +138,6 @@ MantleHeightCastStart = 1.5 [node name="Bobbing" type="Node3D" parent="."] script = ExtResource("10_7wk1w") -BobbingAmplitude = 0.0 [node name="FieldOfView" type="Node3D" parent="."] script = ExtResource("12_m2mxi") @@ -217,6 +216,7 @@ offset_left = 1524.0 offset_top = 1.0 offset_right = -8.0 offset_bottom = 1.0 +enabled = false initial_node_to_watch = NodePath("../StateChart") [node name="UI" type="CanvasLayer" parent="."] diff --git a/player_controller/Scripts/Bobbing.cs b/player_controller/Scripts/Bobbing.cs index ad4bcca2..a25ded87 100644 --- a/player_controller/Scripts/Bobbing.cs +++ b/player_controller/Scripts/Bobbing.cs @@ -21,6 +21,7 @@ public partial class Bobbing: Node3D public float Delta; public bool IsOnFloorCustom; public Vector3 Velocity; + public float SettingsMultiplier; } private float _bobbingAccumulator; // Constantly increases when player moves in X or/and Z axis @@ -38,8 +39,8 @@ public partial class Bobbing: Node3D // Because both of them are just waves, we will be slide up with y and then slide down with y // creating bobbing effect. The same works for cos. As the _bobbingAccumulator increases the cos decreases and then increases - newPositionForCamera.Y = Mathf.Sin(_bobbingAccumulator * BobbingFrequency) * BobbingAmplitude; - newPositionForCamera.X = Mathf.Cos(_bobbingAccumulator * BobbingFrequency / 2.0f) * BobbingAmplitude; + newPositionForCamera.Y = Mathf.Sin(_bobbingAccumulator * BobbingFrequency) * BobbingAmplitude * parameters.SettingsMultiplier; + newPositionForCamera.X = Mathf.Cos(_bobbingAccumulator * BobbingFrequency / 2.0f) * BobbingAmplitude * parameters.SettingsMultiplier; _camera.Position = newPositionForCamera; } diff --git a/player_controller/Scripts/FieldOfView.cs b/player_controller/Scripts/FieldOfView.cs index 9222941d..8fccb419 100644 --- a/player_controller/Scripts/FieldOfView.cs +++ b/player_controller/Scripts/FieldOfView.cs @@ -24,6 +24,7 @@ public partial class FieldOfView: Node3D public float Delta; public float SprintSpeed; public Vector3 Velocity; + public float FOVMultiplier; } public void PerformFovAdjustment(FovParameters parameters) @@ -33,10 +34,10 @@ public partial class FieldOfView: Node3D 0.5f, parameters.SprintSpeed * 2.0f); - float targetFov = BaseFov + FovChangeFactor * velocityClamped; + float targetFov = BaseFov + FovChangeFactor * velocityClamped * parameters.FOVMultiplier; if (parameters.IsCrouchingHeight){ - targetFov = BaseFov - FovChangeFactor * velocityClamped; + targetFov = BaseFov - FovChangeFactor * velocityClamped * parameters.FOVMultiplier; } _camera.Fov = Mathf.Lerp(_camera.Fov, targetFov, parameters.Delta * FovChangeSpeed); diff --git a/player_controller/Scripts/PlayerController.cs b/player_controller/Scripts/PlayerController.cs index 8fff6bc7..2bc43933 100644 --- a/player_controller/Scripts/PlayerController.cs +++ b/player_controller/Scripts/PlayerController.cs @@ -197,9 +197,27 @@ public partial class PlayerController : CharacterBody3D private float _playerHeight; private float _playerRadius; + + private float _lookSensitivityMultiplier = 1.0f; + private float _headBobbingMultiplier = 1.0f; + private float _fovChangeMultiplier = 1.0f; public override void _Ready() { + var config = new ConfigFile(); + + // Load data from a file. + Error err = config.Load("user://config.cfg"); + + // If the file didn't load, ignore it. + if (err != Error.Ok) + { + throw new Exception("Couldn't load config.cfg"); + } + + _lookSensitivityMultiplier = (float) config.GetValue("InputSettings", "LookSensitivity", 1.0f); + _headBobbingMultiplier = (float) config.GetValue("InputSettings", "HeadBobbingWhileWalking", 1.0f); + _fovChangeMultiplier = (float) config.GetValue("InputSettings", "FovChangeWithSpeed", 1.0f); /////////////////////////// // Getting components ///// /////////////////////////// @@ -944,7 +962,7 @@ public partial class PlayerController : CharacterBody3D private void LookAround() { Vector2 inputLookDir = new Vector2(_inputRotateY, _inputRotateFloorplane); - HeadSystem.LookAround(inputLookDir); + HeadSystem.LookAround(inputLookDir, _lookSensitivityMultiplier); } public void MoveOnGround(double delta) @@ -1023,7 +1041,8 @@ public partial class PlayerController : CharacterBody3D { Delta = delta, IsOnFloorCustom = isOnFloorCustom(), - Velocity = Velocity + Velocity = Velocity, + SettingsMultiplier = _headBobbingMultiplier }; Bobbing.PerformCameraBobbing(cameraBobbingParams); @@ -1032,7 +1051,8 @@ public partial class PlayerController : CharacterBody3D IsCrouchingHeight = CapsuleCollider.IsCrouchingHeight(), Delta = delta, SprintSpeed = WalkSpeed, - Velocity = Velocity + Velocity = Velocity, + FOVMultiplier = _fovChangeMultiplier }; FieldOfView.PerformFovAdjustment(fovParams); } diff --git a/project.godot b/project.godot index 8a5f1f51..815ffa4c 100644 --- a/project.godot +++ b/project.godot @@ -15,7 +15,7 @@ warnings/check_invalid_track_paths=false [application] config/name="Movement tests" -run/main_scene="uid://dmkw8cmalm5k" +run/main_scene="uid://vm22i5sv3p3s" config/features=PackedStringArray("4.5", "C#", "Forward Plus") config/icon="res://icon.svg" diff --git a/systems/head/HeadSystem.cs b/systems/head/HeadSystem.cs index e81e3afc..fa2030cb 100644 --- a/systems/head/HeadSystem.cs +++ b/systems/head/HeadSystem.cs @@ -16,15 +16,15 @@ public partial class HeadSystem : Node3D _camera = GetNode("CameraSmooth/Camera3D"); } - public void LookAround(Vector2 lookDir) + public void LookAround(Vector2 lookDir, float sensitivitMultiplier = 1f) { // Horizontal movement of head - float angleForHorizontalRotation = lookDir.X * LookSensitivity; + float angleForHorizontalRotation = lookDir.X * LookSensitivity * sensitivitMultiplier; RotateY(angleForHorizontalRotation); // Vertical movement of head Vector3 currentCameraRotation = _camera.Rotation; - currentCameraRotation.X += Convert.ToSingle(lookDir.Y * LookSensitivity); + currentCameraRotation.X += Convert.ToSingle(lookDir.Y * LookSensitivity * sensitivitMultiplier); currentCameraRotation.X = Mathf.Clamp(currentCameraRotation.X, Mathf.DegToRad(-90f), Mathf.DegToRad(90f)); _camera.Rotation = currentCameraRotation; diff --git a/systems/inputs/base_mode/base_mode.tres b/systems/inputs/base_mode/base_mode.tres index 164b0eb1..83cc485b 100644 --- a/systems/inputs/base_mode/base_mode.tres +++ b/systems/inputs/base_mode/base_mode.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="GUIDEMappingContext" load_steps=90 format=3 uid="uid://bl5crtu1gkrtr"] +[gd_resource type="Resource" script_class="GUIDEMappingContext" load_steps=102 format=3 uid="uid://bl5crtu1gkrtr"] [ext_resource type="Script" uid="uid://cpplm41b5bt6m" path="res://addons/guide/guide_action_mapping.gd" id="1_qmhk6"] [ext_resource type="Resource" uid="uid://htqvokm8mufq" path="res://systems/inputs/base_mode/move.tres" id="2_g6bbx"] @@ -29,6 +29,8 @@ [ext_resource type="Script" uid="uid://dsa1dnifd6w32" path="res://addons/guide/guide_mapping_context.gd" id="23_llfhp"] [ext_resource type="Resource" uid="uid://bw5k2gsv3jqcv" path="res://systems/inputs/base_mode/throw.tres" id="24_yp12v"] [ext_resource type="Resource" uid="uid://55b0dsvioj08" path="res://systems/inputs/base_mode/jump_pressed.tres" id="25_si4d4"] +[ext_resource type="Resource" uid="uid://dgluj0ql5vth7" path="res://systems/inputs/base_mode/pause.tres" id="29_q86qg"] +[ext_resource type="Script" uid="uid://cw71o87tvdx3q" path="res://addons/guide/inputs/guide_input_key.gd" id="30_cvxqo"] [sub_resource type="Resource" id="Resource_vkvga"] script = ExtResource("4_1rw8g") @@ -50,7 +52,7 @@ modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_kb1id"), SubRes script = ExtResource("1_qmhk6") action = ExtResource("2_g6bbx") input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_1igva")]) -metadata/_guide_input_mappings_collapsed = true +metadata/_guide_input_mappings_collapsed = false [sub_resource type="Resource" id="Resource_05q5j"] script = ExtResource("10_cvxqo") @@ -75,7 +77,7 @@ modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_tn8ci"), SubRes script = ExtResource("1_qmhk6") action = ExtResource("9_q86qg") input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_dew8i")]) -metadata/_guide_input_mappings_collapsed = true +metadata/_guide_input_mappings_collapsed = false [sub_resource type="Resource" id="Resource_pf0ii"] script = ExtResource("10_cvxqo") @@ -100,7 +102,7 @@ modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_nh7x4"), SubRes script = ExtResource("1_qmhk6") action = ExtResource("13_v2ywt") input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_qu2wi")]) -metadata/_guide_input_mappings_collapsed = true +metadata/_guide_input_mappings_collapsed = false [sub_resource type="Resource" id="Resource_si4d4"] script = ExtResource("10_cvxqo") @@ -289,7 +291,49 @@ script = ExtResource("1_qmhk6") action = ExtResource("24_yp12v") input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_v2ywt")]) +[sub_resource type="Resource" id="Resource_s4bc4"] +script = ExtResource("30_cvxqo") +key = 4194305 + +[sub_resource type="Resource" id="Resource_3exnu"] +script = ExtResource("15_fykw6") + +[sub_resource type="Resource" id="Resource_ai85f"] +script = ExtResource("3_yp12v") +input = SubResource("Resource_s4bc4") +triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_3exnu")]) + +[sub_resource type="Resource" id="Resource_jjamb"] +script = ExtResource("19_qkgmj") +button = 6 + +[sub_resource type="Resource" id="Resource_4kb6s"] +script = ExtResource("15_fykw6") + +[sub_resource type="Resource" id="Resource_1ycft"] +script = ExtResource("3_yp12v") +input = SubResource("Resource_jjamb") +triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_4kb6s")]) + +[sub_resource type="Resource" id="Resource_8e1uk"] +script = ExtResource("19_qkgmj") +button = 4 + +[sub_resource type="Resource" id="Resource_ilhhf"] +script = ExtResource("15_fykw6") + +[sub_resource type="Resource" id="Resource_k8i2y"] +script = ExtResource("3_yp12v") +input = SubResource("Resource_8e1uk") +triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_ilhhf")]) + +[sub_resource type="Resource" id="Resource_weyro"] +script = ExtResource("1_qmhk6") +action = ExtResource("29_q86qg") +input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_ai85f"), SubResource("Resource_1ycft"), SubResource("Resource_k8i2y")]) +metadata/_guide_input_mappings_collapsed = false + [resource] script = ExtResource("23_llfhp") -mappings = Array[ExtResource("1_qmhk6")]([SubResource("Resource_88x08"), SubResource("Resource_tgr2g"), SubResource("Resource_iarn8"), SubResource("Resource_cvxqo"), SubResource("Resource_tb8ii"), SubResource("Resource_iihs4"), SubResource("Resource_vibkn"), SubResource("Resource_2hs2y"), SubResource("Resource_0s4kt"), SubResource("Resource_d2r0d"), SubResource("Resource_xt1x5"), SubResource("Resource_ew1hw"), SubResource("Resource_0qat1"), SubResource("Resource_vtk18")]) +mappings = Array[ExtResource("1_qmhk6")]([SubResource("Resource_88x08"), SubResource("Resource_tgr2g"), SubResource("Resource_iarn8"), SubResource("Resource_cvxqo"), SubResource("Resource_tb8ii"), SubResource("Resource_iihs4"), SubResource("Resource_vibkn"), SubResource("Resource_2hs2y"), SubResource("Resource_0s4kt"), SubResource("Resource_d2r0d"), SubResource("Resource_xt1x5"), SubResource("Resource_ew1hw"), SubResource("Resource_0qat1"), SubResource("Resource_vtk18"), SubResource("Resource_weyro")]) metadata/_custom_type_script = "uid://dsa1dnifd6w32" diff --git a/systems/inputs/base_mode/pause.tres b/systems/inputs/base_mode/pause.tres new file mode 100644 index 00000000..1f4b0f40 --- /dev/null +++ b/systems/inputs/base_mode/pause.tres @@ -0,0 +1,7 @@ +[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://dgluj0ql5vth7"] + +[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_76xvu"] + +[resource] +script = ExtResource("1_76xvu") +metadata/_custom_type_script = "uid://cluhc11vixkf1"