From d4b420052e7e78346a8a6b092ec35d139c875641 Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Tue, 4 Mar 2025 21:07:25 +0100 Subject: [PATCH] Final menu music --- Music/NoReason.ogg | 3 +++ Music/NoReason.ogg.import | 19 +++++++++++++++++++ Resources/Items/IceShotgun.tres | 1 + Resources/Music/No_Reason.tres | 4 ++-- Resources/Music/No_Restraint.tres | 2 +- Scenes/MainMenu.tscn | 4 ++-- Scenes/Maps/PlayerFSMTest.tscn | 4 ++-- Scenes/test.tscn | 4 ++-- Scripts/Components/FSM/IModule.cs.uid | 1 + Scripts/Components/FSM/IState.cs.uid | 1 + Scripts/Components/FSM/IStateMachine.cs.uid | 1 + 11 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 Music/NoReason.ogg create mode 100644 Music/NoReason.ogg.import create mode 100644 Scripts/Components/FSM/IModule.cs.uid create mode 100644 Scripts/Components/FSM/IState.cs.uid create mode 100644 Scripts/Components/FSM/IStateMachine.cs.uid diff --git a/Music/NoReason.ogg b/Music/NoReason.ogg new file mode 100644 index 00000000..e48fe2b1 --- /dev/null +++ b/Music/NoReason.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fb7edadec73c17f28759d0f90fb6199477ebf25cc6e92d55141c5676e09f87e +size 18121725 diff --git a/Music/NoReason.ogg.import b/Music/NoReason.ogg.import new file mode 100644 index 00000000..3ac235a5 --- /dev/null +++ b/Music/NoReason.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dvpdqg45cp4y1" +path="res://.godot/imported/NoReason.ogg-17ba64bbe58360ad64b7c196a0bcea7e.oggvorbisstr" + +[deps] + +source_file="res://Music/NoReason.ogg" +dest_files=["res://.godot/imported/NoReason.ogg-17ba64bbe58360ad64b7c196a0bcea7e.oggvorbisstr"] + +[params] + +loop=true +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Resources/Items/IceShotgun.tres b/Resources/Items/IceShotgun.tres index 09b47f82..6d046143 100644 --- a/Resources/Items/IceShotgun.tres +++ b/Resources/Items/IceShotgun.tres @@ -20,3 +20,4 @@ UiType = 1 Selectable = true InventorySprite = ExtResource("2_4ibag") HudItemScene = ExtResource("1_13ven") +DropScenePath = null diff --git a/Resources/Music/No_Reason.tres b/Resources/Music/No_Reason.tres index 51b808af..3dcda3fc 100644 --- a/Resources/Music/No_Reason.tres +++ b/Resources/Music/No_Reason.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="MusicResource" load_steps=3 format=3 uid="uid://byo74ews118nl"] -[ext_resource type="AudioStream" uid="uid://di416g5wgx6j0" path="res://Music/Title.mp3" id="1_u5qon"] +[ext_resource type="AudioStream" uid="uid://dvpdqg45cp4y1" path="res://Music/NoReason.ogg" id="1_u5qon"] [ext_resource type="Script" uid="uid://cx63lvsuj1787" path="res://Scripts/Resources/MusicResource.cs" id="1_xdwi3"] [resource] @@ -8,6 +8,6 @@ script = ExtResource("1_xdwi3") TrackName = "No Reason" AuthorName = "Fenekhu" Description = "This is a song, it's meant to mean things" -ShowAuthor = false +ShowAuthor = true Track = ExtResource("1_u5qon") metadata/_custom_type_script = "uid://cx63lvsuj1787" diff --git a/Resources/Music/No_Restraint.tres b/Resources/Music/No_Restraint.tres index fb247fc6..1ee832f6 100644 --- a/Resources/Music/No_Restraint.tres +++ b/Resources/Music/No_Restraint.tres @@ -7,7 +7,7 @@ script = ExtResource("2_f2m3a") TrackName = "No Restraint" AuthorName = "Fenekhu" -Description = "The intro is unfinished" +Description = "The intro is unfinished, this is just a mockup" ShowAuthor = false Track = ExtResource("1_d4uiy") metadata/_custom_type_script = "uid://cx63lvsuj1787" diff --git a/Scenes/MainMenu.tscn b/Scenes/MainMenu.tscn index 65695da7..f59e3463 100644 --- a/Scenes/MainMenu.tscn +++ b/Scenes/MainMenu.tscn @@ -48,9 +48,9 @@ texture = ExtResource("2_qdx0s") [node name="TextureRect" type="TextureRect" parent="."] layout_mode = 0 -offset_left = 113.0 +offset_left = 122.315 offset_top = 16.0 -offset_right = 161.0 +offset_right = 170.315 offset_bottom = 56.0 texture = ExtResource("2_j4e6a") diff --git a/Scenes/Maps/PlayerFSMTest.tscn b/Scenes/Maps/PlayerFSMTest.tscn index e82b949b..1e9bbb27 100644 --- a/Scenes/Maps/PlayerFSMTest.tscn +++ b/Scenes/Maps/PlayerFSMTest.tscn @@ -39,7 +39,7 @@ [sub_resource type="Resource" id="Resource_6wo78"] script = ExtResource("4_u1i8n") EggIndex = 0 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("5_u1i8n")]([]) [sub_resource type="RectangleShape2D" id="RectangleShape2D_rff8l"] size = Vector2(30, 52.5) @@ -62,7 +62,7 @@ PlayerTemplate = ExtResource("8_c3v4x") SpawnMarkers = Dictionary[int, NodePath]({ 0: NodePath("PlayerStartPosition") }) -StartingEquipment = [ExtResource("3_6314l"), ExtResource("4_yyg8m")] +StartingEquipment = Array[ExtResource("5_u1i8n")]([ExtResource("3_6314l"), ExtResource("4_yyg8m")]) MapStartData = SubResource("Resource_6wo78") [node name="Tilemaps" type="Node2D" parent="."] diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 2a750487..23cb05aa 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -214,7 +214,7 @@ SpawnMarkers = Dictionary[int, NodePath]({ 2: NodePath("Factory Tilemaps/LevelProps/BossDebugTeleporterDestination"), 255: NodePath("Factory Tilemaps/Debug Room/DebugRoomStartPosition") }) -StartingEquipment = [ExtResource("4_swym2"), ExtResource("5_nqier")] +StartingEquipment = Array[ExtResource("6_8tdlb")]([ExtResource("4_swym2"), ExtResource("5_nqier")]) MapStartData = SubResource("Resource_6sau4") metadata/_edit_lock_ = true @@ -972,7 +972,7 @@ position = Vector2(-2000, -736) [node name="ControlPad8" parent="Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("12_hfkf1")] position = Vector2(-2027, -735) Targets = [NodePath("../HorizontalForceField")] -Requirements = [ExtResource("84_ma1ta")] +Requirements = Array[ExtResource("6_8tdlb")]([ExtResource("84_ma1ta")]) [node name="IcicleRepeater2" parent="Factory Tilemaps/LevelProps" instance=ExtResource("32_xof4a")] position = Vector2(-923, 69) diff --git a/Scripts/Components/FSM/IModule.cs.uid b/Scripts/Components/FSM/IModule.cs.uid new file mode 100644 index 00000000..87ee4630 --- /dev/null +++ b/Scripts/Components/FSM/IModule.cs.uid @@ -0,0 +1 @@ +uid://bao141wwjwaoc diff --git a/Scripts/Components/FSM/IState.cs.uid b/Scripts/Components/FSM/IState.cs.uid new file mode 100644 index 00000000..bf586935 --- /dev/null +++ b/Scripts/Components/FSM/IState.cs.uid @@ -0,0 +1 @@ +uid://cpyofpdfky3ff diff --git a/Scripts/Components/FSM/IStateMachine.cs.uid b/Scripts/Components/FSM/IStateMachine.cs.uid new file mode 100644 index 00000000..204f34c2 --- /dev/null +++ b/Scripts/Components/FSM/IStateMachine.cs.uid @@ -0,0 +1 @@ +uid://dhg8ggd1raajf