diff --git a/characters/cassette_tool/scr_cassette_tool.gd b/characters/cassette_tool/scr_cassette_tool.gd index e919b4e..3bf3056 100644 --- a/characters/cassette_tool/scr_cassette_tool.gd +++ b/characters/cassette_tool/scr_cassette_tool.gd @@ -56,7 +56,6 @@ func place_cassette(tower_base: TowerBase) -> void: hero.hud.hot_wheel.update_cassettes(hero.get_wheel_cassettes()) tower_base.networked_spawn_tower.rpc(Data.cassettes.find(cassette), multiplayer.get_unique_id()) hero.placed_tower.emit(tower_base.tower) - hero.place_cassette_audio.play() if hero.game_manager.cassette_gameplay: hero.discassette_pile.add(cassette) hero.energy -= energy_cost diff --git a/characters/fsm/building_state.gd b/characters/fsm/building_state.gd index e2b1a4b..f9d9e7b 100644 --- a/characters/fsm/building_state.gd +++ b/characters/fsm/building_state.gd @@ -7,7 +7,7 @@ extends HeroState func enter_state() -> void: if hero.game_manager: hero.game_manager.level.enable_non_path_tower_frames() - hero.edit_tool.enabled = true + hero.path_tool.enabled = true hero.left_hand_model.visible = true hero.gauntlet_model.visible = true hero.cassette.visible = false @@ -28,8 +28,8 @@ func anim2(x: float) -> void: func exit_state() -> void: - hero.edit_tool.interact_key_held = false - hero.edit_tool.enabled = false + hero.path_tool.interact_key_held = false + hero.path_tool.enabled = false hero.cassette.visible = true if hero.game_manager: hero.game_manager.level.disable_all_tower_frames() @@ -38,9 +38,9 @@ func exit_state() -> void: func process_state(_delta: float) -> void: hero.check_world_button() if Input.is_action_just_pressed("Primary Fire"): - hero.edit_tool.interact_key_held = true + hero.path_tool.interact_key_held = true if Input.is_action_just_released("Primary Fire"): - hero.edit_tool.interact_key_held = false + hero.path_tool.interact_key_held = false if Input.is_action_just_pressed("Swap Weapons"): state_changed.emit(swap_state) if Input.is_action_just_pressed("Ready"): diff --git a/characters/fsm/carding_state.gd b/characters/fsm/carding_state.gd index 523b59d..9a27d69 100644 --- a/characters/fsm/carding_state.gd +++ b/characters/fsm/carding_state.gd @@ -10,7 +10,7 @@ func enter_state() -> void: hero.left_hand_model.visible = true hero.gauntlet_model.visible = true hero.set_cassette_elements_visibility(true) - hero.cassetteing_tool.enabled = true + hero.cassette_tool.enabled = true var tween: Tween = create_tween() tween.set_ease(Tween.EASE_OUT) tween.set_trans(Tween.TRANS_CUBIC) @@ -30,23 +30,21 @@ func anim2(x: float) -> void: func exit_state() -> void: hero.set_cassette_elements_visibility(false) hero.left_hand.visible = false - hero.cassetteing_tool.enabled = false + hero.cassette_tool.enabled = false func process_state(_delta: float) -> void: hero.check_world_button() if Input.is_action_just_pressed("Interact"): - hero.cassetteing_tool.interact() + hero.cassette_tool.interact() if Input.is_action_just_pressed("Primary Fire"): hero.equip_weapon(0) if Input.is_action_just_pressed("Secondary Fire"): hero.equip_weapon(1) if Input.is_action_just_pressed("Select Next Cassette") and hero.hand.size > 1: hero.increment_selected() - hero.swap_cassette_audio.play() if Input.is_action_just_pressed("Select Previous Cassette") and hero.hand.size > 1: hero.decrement_selected() - hero.swap_cassette_audio.play() if Input.is_action_just_pressed("Equip 1"): swap_to_slot(1) if Input.is_action_just_pressed("Equip 2"): @@ -81,5 +79,4 @@ func process_state(_delta: float) -> void: func swap_to_slot(num: int) -> void: if hero.hand.size >= num: hero.hand_selected_index = num - 1 - hero.swap_cassette_audio.play() hero.hud.hot_wheel.update_cassettes(hero.get_wheel_cassettes()) diff --git a/characters/scn_hero.tscn b/characters/scn_hero.tscn index 67912ea..01715ff 100644 --- a/characters/scn_hero.tscn +++ b/characters/scn_hero.tscn @@ -1,9 +1,9 @@ [gd_scene format=3 uid="uid://dxgxbtf68lcv5"] -[ext_resource type="Script" uid="uid://1fqpoegbdm6n" path="res://characters/hero.gd" id="1_nuplp"] -[ext_resource type="PackedScene" uid="uid://ct6gic4shy5qw" path="res://ui/menus/WaveViewer/wave_viewer.tscn" id="2_tpmxp"] +[ext_resource type="Script" uid="uid://1fqpoegbdm6n" path="res://characters/scr_hero.gd" id="1_nuplp"] +[ext_resource type="PackedScene" uid="uid://ct6gic4shy5qw" path="res://ui/menus/wave_viewer/wave_viewer.tscn" id="2_tpmxp"] [ext_resource type="Resource" uid="uid://b5pc3frhx467q" path="res://classes/engineer/class.tres" id="3_f02kk"] -[ext_resource type="PackedScene" uid="uid://buvgdem68wtev" path="res://ui/menus/PauseMenu/pause_menu.tscn" id="4_i1orp"] +[ext_resource type="PackedScene" uid="uid://buvgdem68wtev" path="res://ui/menus/pause_menu/pause_menu.tscn" id="4_i1orp"] [ext_resource type="Environment" uid="uid://cpn2no3e8s361" path="res://cam_environment.tres" id="5_ac7s0"] [ext_resource type="Script" uid="uid://hy51bq7x0fy8" path="res://scripts/on_top_camera.gd" id="6_8h8ff"] [ext_resource type="Script" uid="uid://cij76at0nbs1v" path="res://characters/view_movement.gd" id="7_qhusx"] @@ -222,20 +222,25 @@ nodes/Animation/node = SubResource("AnimationNodeAnimation_dx4x6") nodes/Animation/position = Vector2(-154.88535, 110.967896) node_connections = [&"output", 0, &"Add2", &"Blend2", 0, &"Animation 2", &"Blend2", 1, &"Animation 3", &"Add2", 0, &"Animation", &"Add2", 1, &"Blend2"] -[node name="Hero" type="CharacterBody3D" unique_id=1918171232 node_paths=PackedStringArray("subviewport1", "camera", "gun_camera", "left_hand", "right_hand", "interaction_raycast", "draw_pile", "hand", "hud", "movement", "player_name_tag", "weapon_swap_timer", "editing_states", "fighting_state", "default_state", "ears", "ready_audio", "unready_audio", "fullpower_audio", "zeropower_audio", "swap_off_audio", "swap_on_audio", "anim_tree", "anim_tree2", "cassette", "left_hand_model")] +[node name="Hero" type="CharacterBody3D" unique_id=1918171232 node_paths=PackedStringArray("subviewport1", "subviewport2", "camera", "gun_camera", "left_hand", "right_hand", "path_tool", "cassette_tool", "model", "interaction_raycast", "draw_pile", "hand", "discard_pile", "hud", "movement", "player_name_tag", "weapon_swap_timer", "editing_states", "fighting_state", "default_state", "ears", "ready_audio", "unready_audio", "fullpower_audio", "zeropower_audio", "swap_off_audio", "swap_on_audio", "anim_tree", "anim_tree2", "weapon_pivot", "cassette", "left_hand_model", "gauntlet_model")] collision_layer = 2 collision_mask = 37 script = ExtResource("1_nuplp") subviewport1 = NodePath("FirstPersonViewport") +subviewport2 = NodePath("SubViewport") wave_preview_scene = ExtResource("2_tpmxp") hero_class = ExtResource("3_f02kk") camera = NodePath("SubViewport/Head") gun_camera = NodePath("FirstPersonViewport/Head2") left_hand = NodePath("FirstPersonViewport/Head2/ViewMovement/RightHand/card_hand") right_hand = NodePath("FirstPersonViewport/Head2/ViewMovement/RightHand") +path_tool = NodePath("SubViewport/Head/EditTool") +cassette_tool = NodePath("SubViewport/Head/CardPlacingTool") +model = NodePath("Model") interaction_raycast = NodePath("SubViewport/Head/RayCast3D") draw_pile = NodePath("DrawPile") hand = NodePath("Hand") +discard_pile = NodePath("DiscardPile") pause_menu_scene = ExtResource("4_i1orp") hud = NodePath("HUD") movement = NodePath("PlayerMovement") @@ -253,8 +258,10 @@ swap_off_audio = NodePath("SwapOffAudio") swap_on_audio = NodePath("SwapOnAudio") anim_tree = NodePath("FirstPersonViewport/Head2/ViewMovement/RightHand/AnimationTree") anim_tree2 = NodePath("FirstPersonViewport/Head2/ViewMovement/RightHand/AnimationTree2") +weapon_pivot = NodePath("FirstPersonViewport/Head2/ViewMovement/RightHand/gauntlet/Gauntlet/Skeleton3D/BoneAttachment3D") cassette = NodePath("FirstPersonViewport/Head2/ViewMovement/RightHand/card_hand/Empty_001") left_hand_model = NodePath("FirstPersonViewport/Head2/ViewMovement/RightHand/card_hand") +gauntlet_model = NodePath("FirstPersonViewport/Head2/ViewMovement/RightHand/gauntlet") distance_between_steps = 1.9 [node name="FirstPersonViewport" type="SubViewport" parent="." unique_id=785328163] @@ -316,6 +323,11 @@ layers = 2 [node name="door_001" parent="FirstPersonViewport/Head2/ViewMovement/RightHand/gauntlet/Gauntlet/Skeleton3D" index="2" unique_id=2054355560] layers = 2 +[node name="BoneAttachment3D" type="BoneAttachment3D" parent="FirstPersonViewport/Head2/ViewMovement/RightHand/gauntlet/Gauntlet/Skeleton3D" index="3" unique_id=2018736019] +transform = Transform3D(0.9996732, 0.002340883, 0.02545051, -0.0023422316, 0.999997, 2.1509419e-05, -0.025450272, -8.0959755e-05, 0.99967617, 0.22945356, -0.23003688, -0.4849847) +bone_name = "Plane" +bone_idx = 23 + [node name="card_hand" parent="FirstPersonViewport/Head2/ViewMovement/RightHand" unique_id=663365666 instance=ExtResource("10_tub3r")] [node name="Skeleton3D" parent="FirstPersonViewport/Head2/ViewMovement/RightHand/card_hand/Armature" parent_id_path=PackedInt32Array(663365666, 468229108) index="0" unique_id=1477506815] @@ -406,12 +418,12 @@ bones/15/rotation = Quaternion(-0.2017903, 0.015379741, -0.03813146, 0.97856534) bones/16/rotation = Quaternion(-0.0048455074, 0.003865697, 0.59440565, 0.8041415) bones/18/rotation = Quaternion(-0.2272016, 0.019839177, 0.4623247, 0.856879) bones/23/rotation = Quaternion(-0.045133274, -0.11772486, 0.9614004, -0.24456768) -bones/24/rotation = Quaternion(-0.29928604, 0.071159266, -0.21448779, 0.92701626) -bones/25/rotation = Quaternion(0.5011624, -0.03449026, 0.018117527, 0.8644758) +bones/24/rotation = Quaternion(-0.14077878, 0.025133038, -0.22060952, 0.9648219) +bones/25/rotation = Quaternion(0.046889335, 0.00033850866, 0.019059429, 0.99871814) bones/26/rotation = Quaternion(-0.69202226, 0.0027399438, -0.003180337, 0.721864) -bones/28/rotation = Quaternion(0.07465002, 0.036727358, 0.21896225, 0.97218) -bones/29/rotation = Quaternion(0.038714517, -0.0009573331, -0.019037228, 0.9990685) -bones/30/rotation = Quaternion(-0.6722561, -0.00084173144, 0.0047289226, 0.7403031) +bones/28/rotation = Quaternion(0.028963877, 0.023673387, 0.22024181, 0.97472787) +bones/29/rotation = Quaternion(0.24297562, 0.0145827625, -0.019200597, 0.96973276) +bones/30/rotation = Quaternion(-0.49584424, 0.014387974, 0.017007401, 0.8681257) [node name="AnimationPlayer" parent="Model/doe_girl" parent_id_path=PackedInt32Array(1269374108, 1532649165) index="1" unique_id=1645157291] autoplay = &"HoldGun" @@ -1057,7 +1069,7 @@ size = Vector2i(32, 32) [node name="Coin" parent="CoinViewport" unique_id=1538763687 instance=ExtResource("41_h3mx5")] -[node name="Cylinder" parent="CoinViewport/Coin" index="0" unique_id=1512828616] +[node name="Cylinder" parent="CoinViewport/Coin" index="0" unique_id=879645011] layers = 8 [node name="Node3D" type="Node3D" parent="CoinViewport" unique_id=1150784365] @@ -1078,7 +1090,7 @@ size = Vector2i(32, 32) [node name="cassette" parent="CassetteViewport" unique_id=507681547 instance=ExtResource("43_5787t")] transform = Transform3D(20.878672, -1.0596485, 0.9020732, 1.3043611, 19.62867, -7.132282, -0.48500767, 7.172724, 19.651266, 0, 0, 0) -[node name="Cassette" parent="CassetteViewport/cassette" index="0" unique_id=233904052] +[node name="Cassette" parent="CassetteViewport/cassette" index="0" unique_id=1885768208] transform = Transform3D(0.9999, 0.007972874, 0.01168015, -0.010257761, 0.977448, 0.21092665, -0.009735057, -0.21102542, 0.9774322, 0, 0, 0) layers = 512 diff --git a/characters/hero.gd b/characters/scr_hero.gd similarity index 98% rename from characters/hero.gd rename to characters/scr_hero.gd index 76aab67..d553623 100644 --- a/characters/hero.gd +++ b/characters/scr_hero.gd @@ -13,11 +13,12 @@ signal placed_tower(tower: Tower) @export var left_hand: Node3D @export var right_hand: Node3D @export var path_tool: PathTool +@export var cassette_tool: CassetteTool @export var model: Node3D @export var interaction_raycast: RayCast3D @export var draw_pile: Inventory @export var hand: Inventory -@export var discassette_pile: Inventory +@export var discard_pile: Inventory @export var pause_menu_scene: PackedScene @export var hud: HUD @export var movement: PlayerMovement @@ -346,14 +347,14 @@ func iterate_duration() -> void: func draw_to_hand_size() -> void: var hand_size: int = 5 while hand.size < hand_size: - if draw_pile.size == 0 and discassette_pile.size == 0: + if draw_pile.size == 0 and discard_pile.size == 0: return if draw_pile.size > 0: var cassette: Cassette = draw_pile.remove_at(0) hand.add(cassette) else: - for x: int in discassette_pile.size: - draw_pile.add(discassette_pile.remove_at(0)) + for x: int in discard_pile.size: + draw_pile.add(discard_pile.remove_at(0)) draw_pile.shuffle() hand_selected_index = 0 @@ -377,7 +378,7 @@ func equip_weapon(slot: int = 0) -> void: #cassette_sprites[hand_selected_index].queue_free() #cassette_sprites.remove_at(hand_selected_index) if game_manager and game_manager.cassette_gameplay: - discassette_pile.add(cassettes[slot]) + discard_pile.add(cassettes[slot]) #TODO: Alternate thing to do with the hand i guess #if !inventory.contents.has(cassettes[slot]): #decrement_selected() diff --git a/characters/hero.gd.uid b/characters/scr_hero.gd.uid similarity index 100% rename from characters/hero.gd.uid rename to characters/scr_hero.gd.uid diff --git a/classes/engineer/podium.tscn b/classes/engineer/podium.tscn index 650e43d..af7ba24 100644 --- a/classes/engineer/podium.tscn +++ b/classes/engineer/podium.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://ciagj1hfn4gou"] -[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://ui/menus/CharacterSelect/character_podium.gd" id="1_fo804"] +[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://ui/menus/character_select/character_podium.gd" id="1_fo804"] [ext_resource type="Texture2D" uid="uid://d4jd718brpsed" path="res://classes/engineer/doe.png" id="2_4b5pd"] [ext_resource type="PackedScene" uid="uid://ddbbwx0yy16lh" path="res://scenes/tower_base/tower_base.tscn" id="3_pmyku"] [ext_resource type="ArrayMesh" uid="uid://oxjhqfwlcx5l" path="res://towers/bolt_gun_tower/assaultmod.res" id="4_1jafm"] diff --git a/classes/hero_class_3/podium.tscn b/classes/hero_class_3/podium.tscn index 19d7ce1..4e732dd 100644 --- a/classes/hero_class_3/podium.tscn +++ b/classes/hero_class_3/podium.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://busdu5na4rf4e"] -[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://ui/menus/CharacterSelect/character_podium.gd" id="1_nxj67"] +[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://ui/menus/character_select/character_podium.gd" id="1_nxj67"] [ext_resource type="Texture2D" uid="uid://d4jd718brpsed" path="res://classes/engineer/doe.png" id="2_05uii"] [ext_resource type="PackedScene" uid="uid://ddbbwx0yy16lh" path="res://scenes/tower_base/tower_base.tscn" id="3_il1ej"] [ext_resource type="ArrayMesh" uid="uid://oxjhqfwlcx5l" path="res://towers/bolt_gun_tower/assaultmod.res" id="4_mrig3"] diff --git a/classes/hero_class_4/podium.tscn b/classes/hero_class_4/podium.tscn index 72ef094..981562c 100644 --- a/classes/hero_class_4/podium.tscn +++ b/classes/hero_class_4/podium.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://6givglesbjef"] -[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://ui/menus/CharacterSelect/character_podium.gd" id="1_h2nqs"] +[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://ui/menus/character_select/character_podium.gd" id="1_h2nqs"] [ext_resource type="Texture2D" uid="uid://bvybr3fwnw46p" path="res://classes/mage/yeen.png" id="2_e7ajb"] [ext_resource type="PackedScene" uid="uid://ddbbwx0yy16lh" path="res://scenes/tower_base/tower_base.tscn" id="3_brui3"] [ext_resource type="ArrayMesh" uid="uid://oxjhqfwlcx5l" path="res://towers/bolt_gun_tower/assaultmod.res" id="4_6igfd"] diff --git a/classes/mage/podium.tscn b/classes/mage/podium.tscn index 4de6f80..ad02635 100644 --- a/classes/mage/podium.tscn +++ b/classes/mage/podium.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://bd4k48bdgiddy"] -[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://ui/menus/CharacterSelect/character_podium.gd" id="1_0wn84"] +[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://ui/menus/character_select/character_podium.gd" id="1_0wn84"] [ext_resource type="Texture2D" uid="uid://bvybr3fwnw46p" path="res://classes/mage/yeen.png" id="2_skplt"] [ext_resource type="PackedScene" uid="uid://ddbbwx0yy16lh" path="res://scenes/tower_base/tower_base.tscn" id="3_m1210"] [ext_resource type="ArrayMesh" uid="uid://oxjhqfwlcx5l" path="res://towers/bolt_gun_tower/assaultmod.res" id="4_5wuy8"] diff --git a/levels/level_1/specs.tres b/levels/level_1/specs.tres index 5825343..6f16569 100644 --- a/levels/level_1/specs.tres +++ b/levels/level_1/specs.tres @@ -2,7 +2,6 @@ [ext_resource type="Script" uid="uid://d40isem6w5d8" path="res://scripts/resources/cassette.gd" id="1_yuhm2"] [ext_resource type="Script" uid="uid://dalgif6huggwg" path="res://scripts/resources/level_config.gd" id="2_52rgn"] -[ext_resource type="Resource" uid="uid://deer0awg4d18o" path="res://cassettes/assault.tres" id="2_vvycy"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://scripts/wave_config.gd" id="3_5cjqa"] [ext_resource type="Resource" uid="uid://b5pc3frhx467q" path="res://classes/engineer/class.tres" id="3_ksxj8"] [ext_resource type="Resource" uid="uid://cygfdfqhk2vhw" path="res://levels/level_1/wave1.tres" id="6_xm2iu"] @@ -20,7 +19,6 @@ script = ExtResource("2_52rgn") author = "PuppyFruitGames" display_title = "Moat" hero_class = ExtResource("3_ksxj8") -allowed_cards = Array[ExtResource("1_yuhm2")]([ExtResource("2_vvycy")]) waves = Array[ExtResource("3_5cjqa")]([ExtResource("6_xm2iu"), ExtResource("7_mqq1f"), ExtResource("8_4p7s7"), ExtResource("9_vtpjo"), ExtResource("10_2qu5l"), ExtResource("11_varur"), ExtResource("12_r8d1f"), ExtResource("13_jadtx")]) zone = ExtResource("12_qh4uj") metadata/_custom_type_script = "uid://dalgif6huggwg" diff --git a/levels/level_2/specs.tres b/levels/level_2/specs.tres index 1926cef..ae33c25 100644 --- a/levels/level_2/specs.tres +++ b/levels/level_2/specs.tres @@ -1,10 +1,8 @@ [gd_resource type="Resource" script_class="LevelConfig" format=3 uid="uid://dffoufw4bnfn7"] [ext_resource type="Script" uid="uid://d40isem6w5d8" path="res://scripts/resources/cassette.gd" id="1_rchhl"] -[ext_resource type="Resource" uid="uid://deer0awg4d18o" path="res://cassettes/assault.tres" id="2_geygk"] [ext_resource type="Script" uid="uid://dalgif6huggwg" path="res://scripts/resources/level_config.gd" id="2_y3kr2"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://scripts/wave_config.gd" id="3_05rhi"] -[ext_resource type="Resource" uid="uid://b37r54q84vqoi" path="res://cassettes/rocket_launcher.tres" id="3_xdjpy"] [ext_resource type="Resource" uid="uid://b5pc3frhx467q" path="res://classes/engineer/class.tres" id="4_ldc6i"] [ext_resource type="Resource" uid="uid://7dqtd1owl7g3" path="res://levels/level_2/wave1.tres" id="7_siv73"] [ext_resource type="Resource" uid="uid://bkujvdsbyiinu" path="res://levels/level_2/wave2.tres" id="8_movdo"] @@ -21,7 +19,6 @@ script = ExtResource("2_y3kr2") author = "PuppyFruitGames" display_title = "Air Supply" hero_class = ExtResource("4_ldc6i") -allowed_cards = Array[ExtResource("1_rchhl")]([ExtResource("2_geygk"), ExtResource("3_xdjpy")]) waves = Array[ExtResource("3_05rhi")]([ExtResource("7_siv73"), ExtResource("8_movdo"), ExtResource("9_w257w"), ExtResource("10_pdy4r"), ExtResource("11_526a4"), ExtResource("12_ebu2p"), ExtResource("13_o6362"), ExtResource("14_41aj4")]) points_blocked = Array[int]([34, 33, 41, 40, 39, 47, 79, 86, 85, 78, 91, 84]) zone = ExtResource("15_movdo") diff --git a/levels/level_3/specs.tres b/levels/level_3/specs.tres index a310130..9e10f93 100644 --- a/levels/level_3/specs.tres +++ b/levels/level_3/specs.tres @@ -1,8 +1,6 @@ [gd_resource type="Resource" script_class="LevelConfig" format=3 uid="uid://dgrcneuv4fut"] [ext_resource type="Script" uid="uid://d40isem6w5d8" path="res://scripts/resources/cassette.gd" id="1_ldkvi"] -[ext_resource type="Resource" uid="uid://deer0awg4d18o" path="res://cassettes/assault.tres" id="2_0atj5"] -[ext_resource type="Resource" uid="uid://cvto66tp7rrst" path="res://cassettes/gatling.tres" id="3_sbxeq"] [ext_resource type="Resource" uid="uid://b5pc3frhx467q" path="res://classes/engineer/class.tres" id="4_5rrxx"] [ext_resource type="Script" uid="uid://dalgif6huggwg" path="res://scripts/resources/level_config.gd" id="5_kje1i"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://scripts/wave_config.gd" id="6_gmv8c"] @@ -21,7 +19,6 @@ script = ExtResource("5_kje1i") author = "PuppyFruitGames" display_title = "Cave" hero_class = ExtResource("4_5rrxx") -allowed_cards = Array[ExtResource("1_ldkvi")]([ExtResource("2_0atj5"), ExtResource("3_sbxeq")]) waves = Array[ExtResource("6_gmv8c")]([ExtResource("7_43tyk"), ExtResource("8_2vql2"), ExtResource("9_e67hj"), ExtResource("10_vhtpf"), ExtResource("11_j5x11"), ExtResource("12_eb1oa"), ExtResource("13_j6jup"), ExtResource("14_xhn8o")]) zone = ExtResource("9_sbxeq") metadata/_custom_type_script = "uid://dalgif6huggwg" diff --git a/main.gd b/main.gd index 82082e6..061652d 100644 --- a/main.gd +++ b/main.gd @@ -9,9 +9,9 @@ signal loaded_scene var game_manager: GameManager var loaded: bool = false var UILayer: CanvasLayer -var main_menu_scene_path: String = "res://UI/Menus/MainMenu/main_menu.tscn" -var multiplayer_lobby_scene_path: String = "res://Scenes/Menus/multiplayer_lobby.tscn" -var singleplayer_lobby_scene_path: String = "res://Scenes/Menus/singleplayer_lobby.tscn" +var main_menu_scene_path: String = "res://ui/menus/main_menu/main_menu.tscn" +var multiplayer_lobby_scene_path: String = "res://scenes/menus/multiplayer_lobby.tscn" +var singleplayer_lobby_scene_path: String = "res://scenes/menus/singleplayer_lobby.tscn" func _ready() -> void: @@ -30,8 +30,8 @@ func _ready() -> void: #version_label.add_theme_color_override("font_color", Color(0.85, 0.85, 0.85, 0.7)) version_label.set_anchors_preset(Control.PRESET_TOP_WIDE) UILayer.add_child(version_label) - Input.set_custom_mouse_cursor(load("res://Assets/Textures/cursor_none.png"), Input.CURSOR_ARROW, Vector2(9, 6)) - Input.set_custom_mouse_cursor(load("res://Assets/Textures/bracket_b_vertical.png"), Input.CURSOR_IBEAM, Vector2(16, 16)) + Input.set_custom_mouse_cursor(load("res://assets/textures/cursor_none.png"), Input.CURSOR_ARROW, Vector2(9, 6)) + Input.set_custom_mouse_cursor(load("res://assets/textures/bracket_b_vertical.png"), Input.CURSOR_IBEAM, Vector2(16, 16)) func load_main_menu() -> void: diff --git a/network_puppeteer.gd b/network_puppeteer.gd index 38ccc53..a3fb4c8 100644 --- a/network_puppeteer.gd +++ b/network_puppeteer.gd @@ -11,7 +11,7 @@ func _ready() -> void: player.ready_state_changed.connect(func x(state: bool) -> void: set_ready_state.rpc(state)) -func _process(delta: float) -> void: +func _process(_delta: float) -> void: if is_multiplayer_authority(): set_position.rpc(player.global_position) set_rotation.rpc(player_movement.head_angle, player.rotation.y) @@ -31,7 +31,6 @@ func set_rotation(x: float, y: float) -> void: player_movement.head_angle = x player.rotation.y = y var bone: int = skeleton.find_bone("Head") - var pos: Quaternion = skeleton.get_bone_pose_rotation(bone) skeleton.set_bone_pose_rotation(bone, Quaternion.from_euler(Vector3(x, 0, 0))) diff --git a/player_gym.tscn b/player_gym.tscn index 53912de..2b3fda2 100644 --- a/player_gym.tscn +++ b/player_gym.tscn @@ -6,8 +6,8 @@ [ext_resource type="Texture2D" uid="uid://b2prrul2qc8j2" path="res://materials/cobblestone_1/cobblestone1.png" id="4_ygwa6"] [ext_resource type="Texture2D" uid="uid://cnvndwp3q7rke" path="res://materials/dirt_1/dirt1.png" id="5_h6d8o"] [ext_resource type="Script" uid="uid://1cqp2ke7peqt" path="res://hit_detector.gd" id="6_h6d8o"] -[ext_resource type="Resource" uid="uid://bdkcwve6d35gl" path="res://worlds/testing_range/Enemies/dummy.tres" id="7_1t6mq"] [ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://scripts/hitbox.gd" id="7_10hvj"] +[ext_resource type="Script" uid="uid://cbwxa2a4hfcy4" path="res://scripts/resources/enemy.gd" id="7_fxx58"] [ext_resource type="Material" uid="uid://bxmmwv17kc3uw" path="res://materials/wood_2/wood2.tres" id="8_fxx58"] [ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://ui/enemy_health_bar/health_bar.tscn" id="9_1t6mq"] [ext_resource type="Script" uid="uid://cojjgevmbhwal" path="res://scripts/status_effector.gd" id="10_74ojh"] @@ -51,6 +51,11 @@ albedo_texture = ExtResource("5_h6d8o") uv1_scale = Vector3(10, 10, 10) texture_filter = 2 +[sub_resource type="Resource" id="Resource_e27gn"] +script = ExtResource("7_fxx58") +target_type = 1 +metadata/_custom_type_script = "uid://cbwxa2a4hfcy4" + [sub_resource type="BoxShape3D" id="BoxShape3D_1t6mq"] size = Vector3(3, 3, 3) @@ -109,7 +114,7 @@ shape = SubResource("BoxShape3D_6o6pr") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.146767, 2.0000002, 1.4915252) collision_layer = 4 script = ExtResource("6_h6d8o") -stats = ExtResource("7_1t6mq") +stats = SubResource("Resource_e27gn") status_manager = NodePath("StatusEffector") health_bar = NodePath("HealthBar") metadata/_custom_type_script = "uid://1cqp2ke7peqt" diff --git a/project.godot b/project.godot index 2dbe8f3..e8b8d96 100644 --- a/project.godot +++ b/project.godot @@ -236,7 +236,7 @@ Pause={ [internationalization] -locale/translations=PackedStringArray("res://Locales/en.mo") +locale/translations=PackedStringArray("res://locales/en.mo") locale/translations_pot_files=PackedStringArray("res://Scenes/Menus/MainMenu/main_menu.tscn", "res://Scenes/Menus/PauseMenu/pause_menu.tscn", "res://Scenes/Menus/GameEndScreen/game_end_screen.tscn", "res://Scenes/Menus/CharacterSelect/character_select.tscn", "res://Scenes/Menus/audio_options.tscn", "res://Scenes/Menus/gameplay_options.tscn", "res://Scenes/Menus/graphics_options.tscn", "res://Scenes/Menus/keybind_options.tscn", "res://Scenes/UI/keybind_popup.tscn", "res://choose_card_screen.tscn") pseudolocalization/double_vowels=true diff --git a/scenes/8_direction_sprite.tscn b/scenes/8_direction_sprite.tscn index 504fb2f..79578db 100644 --- a/scenes/8_direction_sprite.tscn +++ b/scenes/8_direction_sprite.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://ri8r03wqy80t"] [ext_resource type="Script" uid="uid://by8jxwui7chwl" path="res://scripts/eight_direction_sprite.gd" id="1_ipfb5"] -[ext_resource type="Texture2D" uid="uid://bf3gkg7f2oyg7" path="res://assets/textureatlases/player.tres" id="2_kkoy2"] +[ext_resource type="Texture2D" uid="uid://6frn8lcwwehv" path="res://assets/textureatlases/puppyfruit.png" id="2_kkoy2"] [node name="EightDirectionSprite" type="Sprite3D" unique_id=836308967] billboard = 2 diff --git a/scenes/boom_box/scn_boom_box.tscn b/scenes/boom_box/scn_boom_box.tscn index 533536a..f36d40c 100644 --- a/scenes/boom_box/scn_boom_box.tscn +++ b/scenes/boom_box/scn_boom_box.tscn @@ -1,6 +1,7 @@ [gd_scene format=3 uid="uid://1b2ikdanl66b"] [ext_resource type="Script" uid="uid://bivtfdl3p1brv" path="res://scenes/boom_box/scr_boom_box.gd" id="1_qft15"] +[ext_resource type="PackedScene" uid="uid://bcvjgl0s1wp8y" path="res://ui/menus/radio_menu/choose_cassette_screen.tscn" id="2_li6cs"] [ext_resource type="Script" uid="uid://dkfswql8ui0bt" path="res://scripts/interact_button.gd" id="4_eavi1"] [ext_resource type="PackedScene" uid="uid://ca1y03riauk7v" path="res://scenes/boom_box/mdl_boom_box.glb" id="5_8jpsw"] [ext_resource type="AudioStream" uid="uid://dknygn5eyuhxt" path="res://audio/aud_shot.wav" id="5_m033a"] @@ -23,6 +24,7 @@ size = Vector3(3.1602442, 1.6259993, 1.007927) script = ExtResource("1_qft15") button = NodePath("StaticBody3D") button_collider = NodePath("StaticBody3D/CollisionShape3D2") +cassette_selection_menu = ExtResource("2_li6cs") [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=30960146] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0007226467, 0.47737724, 0.562555) diff --git a/scenes/flow_field/flow_node.gd b/scenes/flow_field/flow_node.gd index 1a9a1bf..a082564 100644 --- a/scenes/flow_field/flow_node.gd +++ b/scenes/flow_field/flow_node.gd @@ -4,7 +4,7 @@ extends StaticBody3D var data: FlowNodeData var connections: Array[FlowNodeVisualiser] var visualisers: Array[Node3D] -var visual_scene: PackedScene = preload("res://Scenes/FlowField/cube2.tscn") +var visual_scene: PackedScene = preload("res://scenes/flow_field/cube2.tscn") var best_path: FlowNodeVisualiser : get(): return best_path diff --git a/scenes/menus/multiplayer_lobby.tscn b/scenes/menus/multiplayer_lobby.tscn index d3dfbe6..5928d47 100644 --- a/scenes/menus/multiplayer_lobby.tscn +++ b/scenes/menus/multiplayer_lobby.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://bvfit0sy2tnw4" path="res://scenes/menus/server_form.tscn" id="5_bqbwv"] [ext_resource type="PackedScene" uid="uid://ddmg342ff2qaq" path="res://ui/chatbox.tscn" id="6_wtqwd"] [ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://ui/drop_003.ogg" id="7_6mhre"] -[ext_resource type="PackedScene" uid="uid://bc6m3cluulpis" path="res://ui/menus/CharacterSelect/character_select.tscn" id="7_kawp7"] +[ext_resource type="PackedScene" uid="uid://bc6m3cluulpis" path="res://ui/menus/character_select/character_select.tscn" id="7_kawp7"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_cwnde"] random_pitch = 1.1 diff --git a/scenes/menus/singleplayer_lobby.tscn b/scenes/menus/singleplayer_lobby.tscn index 2b526a6..4bedb03 100644 --- a/scenes/menus/singleplayer_lobby.tscn +++ b/scenes/menus/singleplayer_lobby.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://e5gf7hd5jsw3" path="res://scripts/singleplayer_lobby.gd" id="1_nd17k"] [ext_resource type="PackedScene" uid="uid://ddmg342ff2qaq" path="res://ui/chatbox.tscn" id="3_l8xy3"] [ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://ui/drop_003.ogg" id="6_6nu57"] -[ext_resource type="PackedScene" uid="uid://bc6m3cluulpis" path="res://ui/menus/CharacterSelect/character_select.tscn" id="6_ltm04"] +[ext_resource type="PackedScene" uid="uid://bc6m3cluulpis" path="res://ui/menus/character_select/character_select.tscn" id="6_ltm04"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_g5har"] random_pitch = 1.1 diff --git a/scenes/mixer/scn_mixer.tscn b/scenes/mixer/scn_mixer.tscn index d25bd26..c5af0ef 100644 --- a/scenes/mixer/scn_mixer.tscn +++ b/scenes/mixer/scn_mixer.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://c6isprnkaliqr"] [ext_resource type="Script" uid="uid://bpvmvx10q4ayd" path="res://scenes/mixer/scr_mixer.gd" id="1_q8doq"] -[ext_resource type="PackedScene" uid="uid://bajli4d3nqwll" path="res://ui/menus/MixingMenu/track_editor.tscn" id="2_ibyhf"] +[ext_resource type="PackedScene" uid="uid://bajli4d3nqwll" path="res://ui/menus/mixer_menu/track_editor.tscn" id="2_ibyhf"] [ext_resource type="Script" uid="uid://dkfswql8ui0bt" path="res://scripts/interact_button.gd" id="2_mjah6"] [sub_resource type="BoxShape3D" id="BoxShape3D_ibyhf"] diff --git a/scenes/tower_base/tower_base.gd b/scenes/tower_base/tower_base.gd index 0612ba2..c2e86c8 100644 --- a/scenes/tower_base/tower_base.gd +++ b/scenes/tower_base/tower_base.gd @@ -34,7 +34,7 @@ func set_float(value: float) -> void: @rpc("reliable", "call_local", "any_peer") func networked_spawn_tower(cassette_index: int, caller_id: int) -> void: - var cassette: Cassette = Data.cassattes[cassette_index] + var cassette: Cassette = Data.cassettes[cassette_index] inventory.add(cassette) tower = inventory.item_at(0).turret_scene.instantiate() as Tower tower.stats = inventory.item_at(0).tower_stats diff --git a/scripts/data.gd b/scripts/data.gd index b3cb19f..7a8687f 100644 --- a/scripts/data.gd +++ b/scripts/data.gd @@ -74,19 +74,19 @@ func load_cassettes(path: String) -> void: func load_classes() -> void: characters = [] - var dir: DirAccess = DirAccess.open("res://Classes") + var dir: DirAccess = DirAccess.open("res://classes") if dir: dir.list_dir_begin() var folder_name: String = dir.get_next() while folder_name != "": if dir.current_is_dir(): - var dir2: DirAccess = DirAccess.open("res://Classes/" + folder_name) + var dir2: DirAccess = DirAccess.open("res://classes/" + folder_name) if dir2: dir2.list_dir_begin() var folder_name2: String = dir2.get_next() while folder_name2 != "": if folder_name2 == "class.tres": - var hero_class: HeroClass = load("res://Classes/" + folder_name + "/" + folder_name2) + var hero_class: HeroClass = load("res://classes/" + folder_name + "/" + folder_name2) characters.append(hero_class) folder_name2 = dir2.get_next() else: @@ -107,25 +107,25 @@ func load_mods(mod_list: Dictionary[String, bool]) -> void: func _ready() -> void: - var mod_dir: DirAccess = DirAccess.open("res://Mods") + var mod_dir: DirAccess = DirAccess.open("res://mods") if mod_dir: mod_dir.list_dir_begin() var file_name: String = mod_dir.get_next() while file_name != "": if mod_dir.current_is_dir(): - var data_dir: DirAccess = DirAccess.open("res://Mods/" + file_name) + var data_dir: DirAccess = DirAccess.open("res://mods/" + file_name) if data_dir: data_dir.list_dir_begin() var data_name: String = data_dir.get_next() while data_name != "": if data_name.ends_with(".json"): - var file: FileAccess = FileAccess.open("res://Mods/" + file_name + "/" + data_name, FileAccess.READ) + var file: FileAccess = FileAccess.open("res://mods/" + file_name + "/" + data_name, FileAccess.READ) var json_string: String = file.get_line() var json: JSON = JSON.new() var parse_result: Error = json.parse(json_string) if parse_result == OK: var dict: Dictionary = json.data - mods[dict["display_name"]] = "res://Mods/" + file_name + "/" + dict["pck_path"] + mods[dict["display_name"]] = "res://mods/" + file_name + "/" + dict["pck_path"] data_name = data_dir.get_next() file_name = mod_dir.get_next() diff --git a/scripts/game.gd b/scripts/game.gd index 423e58f..c10b304 100644 --- a/scripts/game.gd +++ b/scripts/game.gd @@ -14,8 +14,8 @@ signal switch_to_multi_player signal switch_to_main_menu var root_scene: Node -var player_scene: PackedScene = load("res://PCs/hero.tscn") -var game_end_scene: PackedScene = load("res://UI/Menus/GameEndScreen/game_end_screen.tscn") +var player_scene: PackedScene = load("res://characters/scn_hero.tscn") +var game_end_scene: PackedScene = load("res://ui/menus/game_end_screen/game_end_screen.tscn") var connected_players_nodes: Dictionary = {} var game_active: bool = false var gamemode: GameMode = null @@ -144,7 +144,7 @@ func spawn_players() -> void: level.enemy_goals[0].goal_cleared.connect(player.hud.shield_ui.fade_ui) level.enemy_goals[0].goal_occupied.connect(player.hud.shield_ui.show_ui) player.game_manager = self - player.edit_tool.level = level + player.path_tool.level = level player.hud.map_anchor = level player.blank_cassettes += Data.starting_blanks player.player_name_tag.text = connected_player_profiles[peer_id].display_name diff --git a/scripts/level.gd b/scripts/level.gd index b7bc686..1817015 100644 --- a/scripts/level.gd +++ b/scripts/level.gd @@ -13,8 +13,8 @@ extends Node3D var walls: Dictionary[FlowNodeData, TowerBase] = {} var wall_id: int = 0 -var tower_base_scene: PackedScene = load("res://Scenes/TowerBase/tower_base.tscn") -var tower_frame_scene: PackedScene = load("res://Scenes/tower_frame.tscn") +var tower_base_scene: PackedScene = load("res://scenes/tower_base/tower_base.tscn") +var tower_frame_scene: PackedScene = load("res://scenes/tower_frame.tscn") var tower_frames: Dictionary[FlowNodeData, Node3D] = {} var game_manager: GameManager var flow_field: FlowField diff --git a/scripts/multiplayer_lobby.gd b/scripts/multiplayer_lobby.gd index 93ff5d1..8916462 100644 --- a/scripts/multiplayer_lobby.gd +++ b/scripts/multiplayer_lobby.gd @@ -10,7 +10,7 @@ signal disconnected_from_server var player_ready_boxes: Dictionary[PlayerProfile, CheckBox] var player_character_selected_states: Dictionary[PlayerProfile, bool] -var alert_popup_scene: PackedScene = preload("res://Scenes/Menus/alert_popup.tscn") +var alert_popup_scene: PackedScene = preload("res://scenes/menus/alert_popup.tscn") func _ready() -> void: diff --git a/scripts/status_effector.gd b/scripts/status_effector.gd index 0416d90..6af6122 100644 --- a/scripts/status_effector.gd +++ b/scripts/status_effector.gd @@ -4,7 +4,7 @@ extends Node @export var sprite_container: Container ## Container that effect icons should be instantiated under var enemy: EnemyController ## Enemy Controller that this node should affect -var icon_scene: PackedScene = preload("res://UI/status_icon.tscn") +var icon_scene: PackedScene = preload("res://ui/status_icon.tscn") var immunities: Array[StatusEffect] = [] ## The set of status effects that this effector shouldn't apply var effects: Dictionary[StatusEffect, int] = {} var icons: Dictionary[StatusEffect, TextureRect] = {} diff --git a/ui/action_prompts/key_icon_map.gd b/ui/action_prompts/key_icon_map.gd index 82e9116..172d40b 100644 --- a/ui/action_prompts/key_icon_map.gd +++ b/ui/action_prompts/key_icon_map.gd @@ -3,156 +3,156 @@ extends Object static var playstation_keys: Dictionary = { - "0" = "res://UI/action_prompts/kenny_prompts/playstation/playstation_button_color_cross.png", - "1" = "res://UI/action_prompts/kenny_prompts/playstation/playstation_button_color_circle.png", - "2" = "res://UI/action_prompts/kenny_prompts/playstation/playstation_button_color_square.png", - "3" = "res://UI/action_prompts/kenny_prompts/playstation/playstation_button_color_triangle.png", - "4" = "res://UI/action_prompts/kenny_prompts/playstation/playstation5_button_create.png", - "6" = "res://UI/action_prompts/kenny_prompts/playstation/playstation5_button_options.png", - "7" = "res://UI/action_prompts/kenny_prompts/playstation/playstation_stick_side_l.png", - "8" = "res://UI/action_prompts/kenny_prompts/playstation/playstation_stick_side_r.png", - "9" = "res://UI/action_prompts/kenny_prompts/playstation/playstation_trigger_l1_alternative.png", - "10" = "res://UI/action_prompts/kenny_prompts/playstation/playstation_trigger_r1_alternative.png", - "11" = "res://UI/action_prompts/kenny_prompts/playstation/playstation_dpad_up.png", - "12" = "res://UI/action_prompts/kenny_prompts/playstation/playstation_dpad_down.png", - "13" = "res://UI/action_prompts/kenny_prompts/playstation/playstation_dpad_left.png", - "14" = "res://UI/action_prompts/kenny_prompts/playstation/playstation_dpad_right.png", - "15" = "res://UI/action_prompts/kenny_prompts/playstation/playstation5_button_mute.png", + "0" = "res://ui/action_prompts/kenny_prompts/playstation/playstation_button_color_cross.png", + "1" = "res://ui/action_prompts/kenny_prompts/playstation/playstation_button_color_circle.png", + "2" = "res://ui/action_prompts/kenny_prompts/playstation/playstation_button_color_square.png", + "3" = "res://ui/action_prompts/kenny_prompts/playstation/playstation_button_color_triangle.png", + "4" = "res://ui/action_prompts/kenny_prompts/playstation/playstation5_button_create.png", + "6" = "res://ui/action_prompts/kenny_prompts/playstation/playstation5_button_options.png", + "7" = "res://ui/action_prompts/kenny_prompts/playstation/playstation_stick_side_l.png", + "8" = "res://ui/action_prompts/kenny_prompts/playstation/playstation_stick_side_r.png", + "9" = "res://ui/action_prompts/kenny_prompts/playstation/playstation_trigger_l1_alternative.png", + "10" = "res://ui/action_prompts/kenny_prompts/playstation/playstation_trigger_r1_alternative.png", + "11" = "res://ui/action_prompts/kenny_prompts/playstation/playstation_dpad_up.png", + "12" = "res://ui/action_prompts/kenny_prompts/playstation/playstation_dpad_down.png", + "13" = "res://ui/action_prompts/kenny_prompts/playstation/playstation_dpad_left.png", + "14" = "res://ui/action_prompts/kenny_prompts/playstation/playstation_dpad_right.png", + "15" = "res://ui/action_prompts/kenny_prompts/playstation/playstation5_button_mute.png", } static var xbox_series_keys: Dictionary = { - "0" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_button_a_outline.png", - "1" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_button_b_outline.png", - "2" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_button_x_outline.png", - "3" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_button_y_outline.png", - "4" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_button_view_outline.png", - "5" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_guide.png", - "6" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_button_menu_outline.png", - "7" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_stick_side_l.png", - "8" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_stick_side_r.png", - "9" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_lb_outline.png", - "10" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_rb_outline.png", - "11" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_dpad_up_outline.png", - "12" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_dpad_down_outline.png", - "13" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_dpad_left_outline.png", - "14" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_dpad_right_outline.png", - "15" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_button_share_outline.png", + "0" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_button_a_outline.png", + "1" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_button_b_outline.png", + "2" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_button_x_outline.png", + "3" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_button_y_outline.png", + "4" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_button_view_outline.png", + "5" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_guide.png", + "6" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_button_menu_outline.png", + "7" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_stick_side_l.png", + "8" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_stick_side_r.png", + "9" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_lb_outline.png", + "10" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_rb_outline.png", + "11" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_dpad_up_outline.png", + "12" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_dpad_down_outline.png", + "13" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_dpad_left_outline.png", + "14" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_dpad_right_outline.png", + "15" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_button_share_outline.png", } static var xbox_360_keys: Dictionary = { - "0" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_button_color_a.png", - "1" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_button_color_b.png", - "2" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_button_color_x.png", - "3" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_button_color_y.png", - "4" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_button_back.png", - "5" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_guide_outline.png", - "6" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_button_start.png", - "7" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_stick_side_l.png", - "8" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_stick_side_r.png", - "9" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_lb.png", - "10" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_rb.png", - "11" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_dpad_round_up.png", - "12" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_dpad_round_down.png", - "13" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_dpad_round_left.png", - "14" = "res://UI/action_prompts/kenny_prompts/xbox/xbox_dpad_round_right.png", + "0" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_button_color_a.png", + "1" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_button_color_b.png", + "2" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_button_color_x.png", + "3" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_button_color_y.png", + "4" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_button_back.png", + "5" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_guide_outline.png", + "6" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_button_start.png", + "7" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_stick_side_l.png", + "8" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_stick_side_r.png", + "9" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_lb.png", + "10" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_rb.png", + "11" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_dpad_round_up.png", + "12" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_dpad_round_down.png", + "13" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_dpad_round_left.png", + "14" = "res://ui/action_prompts/kenny_prompts/xbox/xbox_dpad_round_right.png", } static var keys: Dictionary = { - "48" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/0_Key_Light.png", - "49" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/1_Key_Light.png", - "50" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/2_Key_Light.png", - "51" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/3_Key_Light.png", - "52" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/4_Key_Light.png", - "53" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/5_Key_Light.png", - "54" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/6_Key_Light.png", - "55" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/7_Key_Light.png", - "56" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/8_Key_Light.png", - "57" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/9_Key_Light.png", - "65" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/A_Key_Light.png", - "66" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/B_Key_Light.png", - "67" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/C_Key_Light.png", - "68" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/D_Key_Light.png", - "69" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/E_Key_Light.png", - "70" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/F_Key_Light.png", - "71" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/G_Key_Light.png", - "72" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/H_Key_Light.png", - "73" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/I_Key_Light.png", - "74" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/J_Key_Light.png", - "75" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/K_Key_Light.png", - "76" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/L_Key_Light.png", - "77" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/M_Key_Light.png", - "78" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/N_Key_Light.png", - "79" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/O_Key_Light.png", - "80" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/P_Key_Light.png", - "81" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Q_Key_Light.png", - "82" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/R_Key_Light.png", - "83" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/S_Key_Light.png", - "84" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/T_Key_Light.png", - "85" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/U_Key_Light.png", - "86" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/V_Key_Light.png", - "87" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/W_Key_Light.png", - "88" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/X_Key_Light.png", - "89" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Y_Key_Light.png", - "90" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Z_Key_Light.png", - "4194328" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Alt_Key_Light.png", - "4194322" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Arrow_Down_Key_Light.png", - "4194319" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Arrow_Left_Key_Light.png", - "4194321" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Arrow_Right_Key_Light.png", - "4194320" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Arrow_Up_Key_Light.png", - "42" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Asterisk_Key_Light.png", - "4194433" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Asterisk_Key_Light.png", - "4194308" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Backspace_Alt_Key_Light.png", - "91" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Bracket_Left_Key_Light.png", - "93" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Bracket_Right_Key_Light.png", - "4194329" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Caps_Lock_Key_Light.png", - "4194327" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Command_Key_Light.png", - "4194326" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Ctrl_Key_Light.png", - "4194312" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Del_Key_Light.png", - "4194318" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/End_Key_Light.png", - "4194309" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Enter_Alt_Key_Light.png", - "4194305" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Esc_Key_Light.png", - "4194332" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/F1_Key_Light.png", - "4194333" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/F2_Key_Light.png", - "4194334" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/F3_Key_Light.png", - "4194335" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/F4_Key_Light.png", - "4194336" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/F5_Key_Light.png", - "4194337" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/F6_Key_Light.png", - "4194338" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/F7_Key_Light.png", - "4194339" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/F8_Key_Light.png", - "4194340" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/F9_Key_Light.png", - "4194341" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/F10_Key_Light.png", - "4194342" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/F11_Key_Light.png", - "4194343" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/F12_Key_Light.png", - "4194317" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Home_Key_Light.png", - "4194311" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Insert_Key_Light.png", - "60" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Mark_Left_Key_Light.png", - "62" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Mark_Right_Key_Light.png", - "45" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Minus_Key_Light.png", - "4194435" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Minus_Key_Light.png", - "4194330" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Num_Lock_Key_Light.png", - "4194324" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Page_Down_Key_Light.png", - "4194323" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Page_Up_Key_Light.png", - "43" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Plus_Key_Light.png", - "4194437" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Plus_Key_Light.png", - "4194314" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Print_Screen_Key_Light.png", - "63" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Question_Key_Light.png", - "34" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Quote_Key_Light.png", - "59" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Semicolon_Key_Light.png", - "4194325" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Shift_Key_Light.png", - "47" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Slash_Key_Light.png", - "4194434" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Slash_Key_Light.png", - "32" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Space_Key_Light.png", - "4194306" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Tab_Key_Light.png", - "126" = "res://UI/action_prompts/xelu_prompts/keyboard_and_mouse/Light/Tilda_Key_Light.png", + "48" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/0_Key_Light.png", + "49" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/1_Key_Light.png", + "50" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/2_Key_Light.png", + "51" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/3_Key_Light.png", + "52" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/4_Key_Light.png", + "53" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/5_Key_Light.png", + "54" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/6_Key_Light.png", + "55" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/7_Key_Light.png", + "56" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/8_Key_Light.png", + "57" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/9_Key_Light.png", + "65" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/A_Key_Light.png", + "66" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/B_Key_Light.png", + "67" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/C_Key_Light.png", + "68" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/D_Key_Light.png", + "69" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/E_Key_Light.png", + "70" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/F_Key_Light.png", + "71" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/G_Key_Light.png", + "72" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/H_Key_Light.png", + "73" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/I_Key_Light.png", + "74" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/J_Key_Light.png", + "75" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/K_Key_Light.png", + "76" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/L_Key_Light.png", + "77" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/M_Key_Light.png", + "78" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/N_Key_Light.png", + "79" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/O_Key_Light.png", + "80" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/P_Key_Light.png", + "81" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Q_Key_Light.png", + "82" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/R_Key_Light.png", + "83" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/S_Key_Light.png", + "84" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/T_Key_Light.png", + "85" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/U_Key_Light.png", + "86" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/V_Key_Light.png", + "87" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/W_Key_Light.png", + "88" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/X_Key_Light.png", + "89" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Y_Key_Light.png", + "90" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Z_Key_Light.png", + "4194328" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Alt_Key_Light.png", + "4194322" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Arrow_Down_Key_Light.png", + "4194319" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Arrow_Left_Key_Light.png", + "4194321" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Arrow_Right_Key_Light.png", + "4194320" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Arrow_Up_Key_Light.png", + "42" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Asterisk_Key_Light.png", + "4194433" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Asterisk_Key_Light.png", + "4194308" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Backspace_Alt_Key_Light.png", + "91" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Bracket_Left_Key_Light.png", + "93" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Bracket_Right_Key_Light.png", + "4194329" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Caps_Lock_Key_Light.png", + "4194327" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Command_Key_Light.png", + "4194326" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Ctrl_Key_Light.png", + "4194312" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Del_Key_Light.png", + "4194318" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/End_Key_Light.png", + "4194309" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Enter_Alt_Key_Light.png", + "4194305" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Esc_Key_Light.png", + "4194332" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/F1_Key_Light.png", + "4194333" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/F2_Key_Light.png", + "4194334" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/F3_Key_Light.png", + "4194335" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/F4_Key_Light.png", + "4194336" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/F5_Key_Light.png", + "4194337" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/F6_Key_Light.png", + "4194338" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/F7_Key_Light.png", + "4194339" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/F8_Key_Light.png", + "4194340" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/F9_Key_Light.png", + "4194341" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/F10_Key_Light.png", + "4194342" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/F11_Key_Light.png", + "4194343" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/F12_Key_Light.png", + "4194317" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Home_Key_Light.png", + "4194311" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Insert_Key_Light.png", + "60" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Mark_Left_Key_Light.png", + "62" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Mark_Right_Key_Light.png", + "45" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Minus_Key_Light.png", + "4194435" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Minus_Key_Light.png", + "4194330" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Num_Lock_Key_Light.png", + "4194324" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Page_Down_Key_Light.png", + "4194323" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Page_Up_Key_Light.png", + "43" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Plus_Key_Light.png", + "4194437" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Plus_Key_Light.png", + "4194314" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Print_Screen_Key_Light.png", + "63" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Question_Key_Light.png", + "34" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Quote_Key_Light.png", + "59" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Semicolon_Key_Light.png", + "4194325" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Shift_Key_Light.png", + "47" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Slash_Key_Light.png", + "4194434" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Slash_Key_Light.png", + "32" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Space_Key_Light.png", + "4194306" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Tab_Key_Light.png", + "126" = "res://ui/action_prompts/xelu_prompts/keyboard_and_mouse/light/Tilda_Key_Light.png", } static var mouse_buttons: Dictionary = { - "1" = "res://UI/action_prompts/kenny_prompts/mouse/mouse_left.png", - "3" = "res://UI/action_prompts/kenny_prompts/mouse/mouse_scroll.png", - "2" = "res://UI/action_prompts/kenny_prompts/mouse/mouse_right.png", - "4" = "res://UI/action_prompts/kenny_prompts/mouse/mouse_scroll_up.png", - "5" = "res://UI/action_prompts/kenny_prompts/mouse/mouse_scroll_down.png", + "1" = "res://ui/action_prompts/kenny_prompts/mouse/mouse_left.png", + "3" = "res://ui/action_prompts/kenny_prompts/mouse/mouse_scroll.png", + "2" = "res://ui/action_prompts/kenny_prompts/mouse/mouse_right.png", + "4" = "res://ui/action_prompts/kenny_prompts/mouse/mouse_scroll_up.png", + "5" = "res://ui/action_prompts/kenny_prompts/mouse/mouse_scroll_down.png", } diff --git a/ui/cassette_description_ui.gd b/ui/cassette_description_ui.gd index 088cbed..92b1628 100644 --- a/ui/cassette_description_ui.gd +++ b/ui/cassette_description_ui.gd @@ -1,4 +1,4 @@ -class_name cassetteDescriptionUI +class_name CassetteDescriptionUI extends VBoxContainer @export var cassette_name_label: Label diff --git a/ui/cassette_description_ui.tscn b/ui/cassette_description_ui.tscn index d889ae5..6ef58f5 100644 --- a/ui/cassette_description_ui.tscn +++ b/ui/cassette_description_ui.tscn @@ -3,11 +3,11 @@ [ext_resource type="Script" uid="uid://dipne6u86gxth" path="res://ui/cassette_description_ui.gd" id="1_bxjpl"] [ext_resource type="PackedScene" uid="uid://c8xdsg6gtwvh3" path="res://ui/feature_ui/feature_ui.tscn" id="2_hr2hd"] -[node name="DescriptionVBox" type="VBoxContainer" unique_id=1070794448 node_paths=PackedStringArray("card_name_label", "card_description_label", "feature_list", "target_list")] +[node name="DescriptionVBox" type="VBoxContainer" unique_id=1070794448 node_paths=PackedStringArray("cassette_name_label", "cassette_description_label", "feature_list", "target_list")] size_flags_horizontal = 3 script = ExtResource("1_bxjpl") -card_name_label = NodePath("NameLabel") -card_description_label = NodePath("DescriptionText") +cassette_name_label = NodePath("NameLabel") +cassette_description_label = NodePath("DescriptionText") feature_list = NodePath("FeaturesVBox") feature_scene = ExtResource("2_hr2hd") target_list = NodePath("TargetVBox") diff --git a/ui/cassette_hand.tscn b/ui/cassette_hand.tscn index 2bd1b32..75c2a8a 100644 --- a/ui/cassette_hand.tscn +++ b/ui/cassette_hand.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://d6ejaumcenmg" path="res://scripts/cassette_hand.gd" id="1_2cfmh"] [ext_resource type="Texture2D" uid="uid://dlqnhs8or4ik2" path="res://assets/textures/cardhand.png" id="1_d5oo3"] -[ext_resource type="Texture2D" path="res://Assets/TextureAtlases/rarityborders.tres" id="3_pclfx"] +[ext_resource type="Texture2D" uid="uid://6frn8lcwwehv" path="res://assets/textureatlases/puppyfruit.png" id="3_pclfx"] [node name="Node2D" type="Node2D" unique_id=1718662313 node_paths=PackedStringArray("rarity_sprite", "title_text", "description", "target_label", "energy_cost")] script = ExtResource("1_2cfmh") diff --git a/ui/menus/CharacterSelect/character_podium.gd b/ui/menus/character_select/character_podium.gd similarity index 100% rename from ui/menus/CharacterSelect/character_podium.gd rename to ui/menus/character_select/character_podium.gd diff --git a/ui/menus/CharacterSelect/character_podium.gd.uid b/ui/menus/character_select/character_podium.gd.uid similarity index 100% rename from ui/menus/CharacterSelect/character_podium.gd.uid rename to ui/menus/character_select/character_podium.gd.uid diff --git a/ui/menus/CharacterSelect/character_preview.gd b/ui/menus/character_select/character_preview.gd similarity index 100% rename from ui/menus/CharacterSelect/character_preview.gd rename to ui/menus/character_select/character_preview.gd diff --git a/ui/menus/CharacterSelect/character_preview.gd.uid b/ui/menus/character_select/character_preview.gd.uid similarity index 100% rename from ui/menus/CharacterSelect/character_preview.gd.uid rename to ui/menus/character_select/character_preview.gd.uid diff --git a/ui/menus/CharacterSelect/character_select.gd b/ui/menus/character_select/character_select.gd similarity index 100% rename from ui/menus/CharacterSelect/character_select.gd rename to ui/menus/character_select/character_select.gd diff --git a/ui/menus/CharacterSelect/character_select.gd.uid b/ui/menus/character_select/character_select.gd.uid similarity index 100% rename from ui/menus/CharacterSelect/character_select.gd.uid rename to ui/menus/character_select/character_select.gd.uid diff --git a/ui/menus/CharacterSelect/character_select.tscn b/ui/menus/character_select/character_select.tscn similarity index 96% rename from ui/menus/CharacterSelect/character_select.tscn rename to ui/menus/character_select/character_select.tscn index e87b235..e60cc38 100644 --- a/ui/menus/CharacterSelect/character_select.tscn +++ b/ui/menus/character_select/character_select.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://bc6m3cluulpis"] -[ext_resource type="Script" uid="uid://plrd0ckxrabh" path="res://ui/menus/CharacterSelect/character_select.gd" id="1_lqqhx"] -[ext_resource type="Script" uid="uid://b1ucgfqilvr67" path="res://ui/menus/CharacterSelect/character_preview.gd" id="9_8d0rx"] +[ext_resource type="Script" uid="uid://plrd0ckxrabh" path="res://ui/menus/character_select/character_select.gd" id="1_lqqhx"] +[ext_resource type="Script" uid="uid://b1ucgfqilvr67" path="res://ui/menus/character_select/character_preview.gd" id="9_8d0rx"] [ext_resource type="PackedScene" uid="uid://clabkhnbn75rf" path="res://ui/tower_label.tscn" id="10_jdigy"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_tlgw2"] diff --git a/ui/menus/GameEndScreen/enemy_row.gd b/ui/menus/game_end_screen/enemy_row.gd similarity index 100% rename from ui/menus/GameEndScreen/enemy_row.gd rename to ui/menus/game_end_screen/enemy_row.gd diff --git a/ui/menus/GameEndScreen/enemy_row.gd.uid b/ui/menus/game_end_screen/enemy_row.gd.uid similarity index 100% rename from ui/menus/GameEndScreen/enemy_row.gd.uid rename to ui/menus/game_end_screen/enemy_row.gd.uid diff --git a/ui/menus/GameEndScreen/enemy_row.tscn b/ui/menus/game_end_screen/enemy_row.tscn similarity index 91% rename from ui/menus/GameEndScreen/enemy_row.tscn rename to ui/menus/game_end_screen/enemy_row.tscn index 361ddaf..b2a57ae 100644 --- a/ui/menus/GameEndScreen/enemy_row.tscn +++ b/ui/menus/game_end_screen/enemy_row.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://b5hp43bm07b8a"] -[ext_resource type="Script" uid="uid://b0h5oewxd48lv" path="res://ui/menus/GameEndScreen/enemy_row.gd" id="1_th4b3"] +[ext_resource type="Script" uid="uid://b0h5oewxd48lv" path="res://ui/menus/game_end_screen/enemy_row.gd" id="1_th4b3"] [node name="EnemyRow" type="VBoxContainer" unique_id=1785212437 node_paths=PackedStringArray("wave_label", "enemy_hbox")] anchors_preset = 15 diff --git a/ui/menus/GameEndScreen/game_end_screen.gd b/ui/menus/game_end_screen/game_end_screen.gd similarity index 100% rename from ui/menus/GameEndScreen/game_end_screen.gd rename to ui/menus/game_end_screen/game_end_screen.gd diff --git a/ui/menus/GameEndScreen/game_end_screen.gd.uid b/ui/menus/game_end_screen/game_end_screen.gd.uid similarity index 100% rename from ui/menus/GameEndScreen/game_end_screen.gd.uid rename to ui/menus/game_end_screen/game_end_screen.gd.uid diff --git a/ui/menus/GameEndScreen/game_end_screen.tscn b/ui/menus/game_end_screen/game_end_screen.tscn similarity index 97% rename from ui/menus/GameEndScreen/game_end_screen.tscn rename to ui/menus/game_end_screen/game_end_screen.tscn index d71fd65..cef770c 100644 --- a/ui/menus/GameEndScreen/game_end_screen.tscn +++ b/ui/menus/game_end_screen/game_end_screen.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://ce0m8vbjbng6o"] -[ext_resource type="Script" uid="uid://bdknvktw033g3" path="res://ui/menus/GameEndScreen/game_end_screen.gd" id="1_oa7nq"] -[ext_resource type="PackedScene" uid="uid://b5hp43bm07b8a" path="res://ui/menus/GameEndScreen/enemy_row.tscn" id="2_xm8em"] +[ext_resource type="Script" uid="uid://bdknvktw033g3" path="res://ui/menus/game_end_screen/game_end_screen.gd" id="1_oa7nq"] +[ext_resource type="PackedScene" uid="uid://b5hp43bm07b8a" path="res://ui/menus/game_end_screen/enemy_row.tscn" id="2_xm8em"] [ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://ui/drop_003.ogg" id="3_ro1yg"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_dram5"] diff --git a/ui/menus/MainMenu/achievements_menu.gd b/ui/menus/main_menu/achievements_menu.gd similarity index 100% rename from ui/menus/MainMenu/achievements_menu.gd rename to ui/menus/main_menu/achievements_menu.gd diff --git a/ui/menus/MainMenu/achievements_menu.gd.uid b/ui/menus/main_menu/achievements_menu.gd.uid similarity index 100% rename from ui/menus/MainMenu/achievements_menu.gd.uid rename to ui/menus/main_menu/achievements_menu.gd.uid diff --git a/ui/menus/MainMenu/level_selecter_main_menu.gd b/ui/menus/main_menu/level_selecter_main_menu.gd similarity index 100% rename from ui/menus/MainMenu/level_selecter_main_menu.gd rename to ui/menus/main_menu/level_selecter_main_menu.gd diff --git a/ui/menus/MainMenu/level_selecter_main_menu.gd.uid b/ui/menus/main_menu/level_selecter_main_menu.gd.uid similarity index 100% rename from ui/menus/MainMenu/level_selecter_main_menu.gd.uid rename to ui/menus/main_menu/level_selecter_main_menu.gd.uid diff --git a/ui/menus/MainMenu/main_menu.gd b/ui/menus/main_menu/main_menu.gd similarity index 93% rename from ui/menus/MainMenu/main_menu.gd rename to ui/menus/main_menu/main_menu.gd index b961c0b..344100f 100644 --- a/ui/menus/MainMenu/main_menu.gd +++ b/ui/menus/main_menu/main_menu.gd @@ -13,10 +13,10 @@ signal multiplayer_game_requested var game: GameManager var gamemode: GameMode = GameMode.new() -var confirmation_popup_scene: PackedScene = preload("res://Scenes/Menus/confirmation_popup.tscn") -var text_input_popup_scene: PackedScene = preload("res://Scenes/Menus/text_input_popup.tscn") -var multiplayer_lobby_scene_path: String = "res://Scenes/multiplayer_lobby.tscn" -var options_menu_scene: PackedScene = preload("res://UI/Menus/OptionsMenu/options_menu.tscn") +var confirmation_popup_scene: PackedScene = preload("res://scenes/menus/confirmation_popup.tscn") +var text_input_popup_scene: PackedScene = preload("res://scenes/menus/text_input_popup.tscn") +var multiplayer_lobby_scene_path: String = "res://scenes/multiplayer_lobby.tscn" +var options_menu_scene: PackedScene = preload("res://ui/menus/options_menu/options_menu.tscn") var temp_data: SaveData var hovered_level_config: LevelConfig @@ -196,8 +196,8 @@ func load_stats(stats: SaveData) -> void: $ProfileManager/VBoxContainer/Stats/Wins/Label2.text = str(Data.save_data.wins) $ProfileManager/VBoxContainer/Stats/Losses/Label2.text = str(Data.save_data.losses) $ProfileManager/VBoxContainer/Stats/Winrate/Label2.text = str(Data.save_data.winrate) + "%" - $ProfileManager/VBoxContainer/Stats/EngineercassettesBought/Label2.text = str(stats.engineer_cassettes_bought) - $ProfileManager/VBoxContainer/Stats/MagecassettesBought/Label2.text = str(stats.mage_cassettes_bought) + $ProfileManager/VBoxContainer/Stats/EngineerCassettesBought/Label2.text = str(stats.engineer_cassettes_bought) + $ProfileManager/VBoxContainer/Stats/MageCassettesBought/Label2.text = str(stats.mage_cassettes_bought) func _on_achievements_back_button_pressed() -> void: diff --git a/ui/menus/MainMenu/main_menu.gd.uid b/ui/menus/main_menu/main_menu.gd.uid similarity index 100% rename from ui/menus/MainMenu/main_menu.gd.uid rename to ui/menus/main_menu/main_menu.gd.uid diff --git a/ui/menus/MainMenu/main_menu.tscn b/ui/menus/main_menu/main_menu.tscn similarity index 96% rename from ui/menus/MainMenu/main_menu.tscn rename to ui/menus/main_menu/main_menu.tscn index 8685b77..f5a3aad 100644 --- a/ui/menus/MainMenu/main_menu.tscn +++ b/ui/menus/main_menu/main_menu.tscn @@ -1,15 +1,15 @@ [gd_scene format=3 uid="uid://8yv7excojcg0"] [ext_resource type="Texture2D" uid="uid://mt6liu1hi15j" path="res://ingame_logo.png" id="2_14tm0"] -[ext_resource type="Script" uid="uid://ci8vq73u23viy" path="res://ui/menus/MainMenu/main_menu.gd" id="2_ivytu"] +[ext_resource type="Script" uid="uid://ci8vq73u23viy" path="res://ui/menus/main_menu/main_menu.gd" id="2_ivytu"] [ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://ui/drop_003.ogg" id="5_cwn2i"] -[ext_resource type="Script" uid="uid://bwsw4oq150v3p" path="res://ui/menus/MainMenu/level_selecter_main_menu.gd" id="8_qshe4"] +[ext_resource type="Script" uid="uid://bwsw4oq150v3p" path="res://ui/menus/main_menu/level_selecter_main_menu.gd" id="8_qshe4"] [ext_resource type="Script" uid="uid://dalgif6huggwg" path="res://scripts/resources/level_config.gd" id="9_nt3t4"] [ext_resource type="Resource" uid="uid://b67b70x1uf2el" path="res://levels/level_1/specs.tres" id="10_kjkav"] [ext_resource type="Resource" uid="uid://dffoufw4bnfn7" path="res://levels/level_2/specs.tres" id="11_kjkav"] [ext_resource type="Resource" uid="uid://dgrcneuv4fut" path="res://levels/level_3/specs.tres" id="12_eonxx"] [ext_resource type="Texture2D" uid="uid://cr1ucbuw3iotp" path="res://assets/textures/first_win_achievements.png" id="15_74epv"] -[ext_resource type="Script" uid="uid://cjr0pbqisd51v" path="res://ui/menus/MainMenu/achievements_menu.gd" id="15_sv1gy"] +[ext_resource type="Script" uid="uid://cjr0pbqisd51v" path="res://ui/menus/main_menu/achievements_menu.gd" id="15_sv1gy"] [ext_resource type="Texture2D" uid="uid://cpa1hl36xfplg" path="res://assets/textures/first_scroll_seen.png" id="16_sv1gy"] [ext_resource type="Texture2D" uid="uid://ctbi3gm1me1t5" path="res://assets/textures/unlock_mage_achievement.png" id="17_6t4jd"] [ext_resource type="Script" uid="uid://cxrm2naq75jo1" path="res://scripts/mod_menu.gd" id="19_6t4jd"] @@ -274,16 +274,16 @@ text = "0" horizontal_alignment = 2 vertical_alignment = 1 -[node name="EngineerCardsBought" type="HBoxContainer" parent="ProfileManager/VBoxContainer/Stats" unique_id=1776121901] +[node name="EngineerCassettesBought" type="HBoxContainer" parent="ProfileManager/VBoxContainer/Stats" unique_id=1776121901] layout_mode = 2 -[node name="Label" type="Label" parent="ProfileManager/VBoxContainer/Stats/EngineerCardsBought" unique_id=1170236283] +[node name="Label" type="Label" parent="ProfileManager/VBoxContainer/Stats/EngineerCassettesBought" unique_id=1170236283] layout_mode = 2 size_flags_horizontal = 3 text = "LABEL_ENGINEER_CARDS_BOUGHT" vertical_alignment = 1 -[node name="Label2" type="Label" parent="ProfileManager/VBoxContainer/Stats/EngineerCardsBought" unique_id=1887374490] +[node name="Label2" type="Label" parent="ProfileManager/VBoxContainer/Stats/EngineerCassettesBought" unique_id=1887374490] auto_translate_mode = 2 layout_mode = 2 size_flags_horizontal = 3 @@ -291,16 +291,16 @@ text = "0" horizontal_alignment = 2 vertical_alignment = 1 -[node name="MageCardsBought" type="HBoxContainer" parent="ProfileManager/VBoxContainer/Stats" unique_id=920990804] +[node name="MageCassettesBought" type="HBoxContainer" parent="ProfileManager/VBoxContainer/Stats" unique_id=920990804] layout_mode = 2 -[node name="Label" type="Label" parent="ProfileManager/VBoxContainer/Stats/MageCardsBought" unique_id=826470841] +[node name="Label" type="Label" parent="ProfileManager/VBoxContainer/Stats/MageCassettesBought" unique_id=826470841] layout_mode = 2 size_flags_horizontal = 3 text = "LABEL_MAGE_CARDS_BOUGHT" vertical_alignment = 1 -[node name="Label2" type="Label" parent="ProfileManager/VBoxContainer/Stats/MageCardsBought" unique_id=340339771] +[node name="Label2" type="Label" parent="ProfileManager/VBoxContainer/Stats/MageCassettesBought" unique_id=340339771] auto_translate_mode = 2 layout_mode = 2 size_flags_horizontal = 3 diff --git a/ui/menus/MixingMenu/price_panel.gd b/ui/menus/mixer_menu/price_panel.gd similarity index 100% rename from ui/menus/MixingMenu/price_panel.gd rename to ui/menus/mixer_menu/price_panel.gd diff --git a/ui/menus/MixingMenu/price_panel.gd.uid b/ui/menus/mixer_menu/price_panel.gd.uid similarity index 100% rename from ui/menus/MixingMenu/price_panel.gd.uid rename to ui/menus/mixer_menu/price_panel.gd.uid diff --git a/ui/menus/MixingMenu/price_panel.tscn b/ui/menus/mixer_menu/price_panel.tscn similarity index 93% rename from ui/menus/MixingMenu/price_panel.tscn rename to ui/menus/mixer_menu/price_panel.tscn index 8d3f05c..6a79f1e 100644 --- a/ui/menus/MixingMenu/price_panel.tscn +++ b/ui/menus/mixer_menu/price_panel.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://dekexkjl37dvh"] -[ext_resource type="Script" uid="uid://bs73eocafngiu" path="res://ui/menus/MixingMenu/price_panel.gd" id="1_sn84y"] +[ext_resource type="Script" uid="uid://bs73eocafngiu" path="res://ui/menus/mixer_menu/price_panel.gd" id="1_sn84y"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_517dt"] bg_color = Color(0.2702219, 0.27022195, 0.27022177, 0.09019608) diff --git a/ui/menus/MixingMenu/track_editor.gd b/ui/menus/mixer_menu/track_editor.gd similarity index 99% rename from ui/menus/MixingMenu/track_editor.gd rename to ui/menus/mixer_menu/track_editor.gd index bbcaf02..63c5383 100644 --- a/ui/menus/MixingMenu/track_editor.gd +++ b/ui/menus/mixer_menu/track_editor.gd @@ -9,7 +9,7 @@ signal cassettes_remixed(cassettes_consumed: Array[Cassette], cassettes_created: @export var tower_parts: HBoxContainer @export var weapon_parts: HBoxContainer @export var drop_down: OptionButton -@export var cassette_desc: cassetteDescriptionUI +@export var cassette_desc: CassetteDescriptionUI @export var price_panel_scene: PackedScene @export var price_label: Label @export var money_label: Label diff --git a/ui/menus/MixingMenu/track_editor.gd.uid b/ui/menus/mixer_menu/track_editor.gd.uid similarity index 100% rename from ui/menus/MixingMenu/track_editor.gd.uid rename to ui/menus/mixer_menu/track_editor.gd.uid diff --git a/ui/menus/MixingMenu/track_editor.tscn b/ui/menus/mixer_menu/track_editor.tscn similarity index 96% rename from ui/menus/MixingMenu/track_editor.tscn rename to ui/menus/mixer_menu/track_editor.tscn index e9838e9..d55fed1 100644 --- a/ui/menus/MixingMenu/track_editor.tscn +++ b/ui/menus/mixer_menu/track_editor.tscn @@ -1,13 +1,13 @@ [gd_scene format=3 uid="uid://bajli4d3nqwll"] [ext_resource type="PackedScene" uid="uid://c8xdsg6gtwvh3" path="res://ui/feature_ui/feature_ui.tscn" id="1_y6tpq"] -[ext_resource type="Script" uid="uid://mrv5vrlxfc13" path="res://ui/menus/MixingMenu/track_editor.gd" id="1_yrnbk"] -[ext_resource type="PackedScene" uid="uid://dekexkjl37dvh" path="res://ui/menus/MixingMenu/price_panel.tscn" id="3_48m6c"] +[ext_resource type="Script" uid="uid://mrv5vrlxfc13" path="res://ui/menus/mixer_menu/track_editor.gd" id="1_yrnbk"] +[ext_resource type="PackedScene" uid="uid://dekexkjl37dvh" path="res://ui/menus/mixer_menu/price_panel.tscn" id="3_48m6c"] [ext_resource type="PackedScene" uid="uid://cmlpmr78tmo6p" path="res://ui/cassette_description_ui.tscn" id="3_q6wwl"] [ext_resource type="Texture2D" uid="uid://cll2vlvf1h454" path="res://ui/themes/scale_1/track_one_patch.png" id="4_dya4i"] [ext_resource type="Texture2D" uid="uid://cvhkk22pxxuqj" path="res://ui/themes/scale_1/track_two_patch.png" id="5_4gmyw"] -[node name="TrackEditor" type="Control" unique_id=1189474502 node_paths=PackedStringArray("drag_feature", "sample_library", "tower_parts", "weapon_parts", "drop_down", "card_desc", "price_label", "money_label", "confirm_button", "switch_button")] +[node name="TrackEditor" type="Control" unique_id=1189474502 node_paths=PackedStringArray("drag_feature", "sample_library", "tower_parts", "weapon_parts", "drop_down", "cassette_desc", "price_label", "money_label", "confirm_button", "switch_button")] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -21,7 +21,7 @@ feature_scene = ExtResource("1_y6tpq") tower_parts = NodePath("PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Tower/MarginContainer/TowerParts") weapon_parts = NodePath("PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Weapon/MarginContainer/WeaponParts") drop_down = NodePath("PanelContainer/VBoxContainer/Tracks/SourceCartridge/CassetteSelector/OptionButton") -card_desc = NodePath("PanelContainer/VBoxContainer/InfoPanel/VBoxContainer/DescriptionVBox") +cassette_desc = NodePath("PanelContainer/VBoxContainer/InfoPanel/VBoxContainer/DescriptionVBox") price_panel_scene = ExtResource("3_48m6c") price_label = NodePath("PanelContainer/VBoxContainer/Tracks/SourceCartridge/MarginContainer/VBoxContainer/PriceLabel") money_label = NodePath("PanelContainer/VBoxContainer/Tracks/SourceCartridge/MarginContainer/VBoxContainer/MoneyLabel") diff --git a/ui/menus/OptionsMenu/audio_options.gd b/ui/menus/options_menu/audio_options.gd similarity index 100% rename from ui/menus/OptionsMenu/audio_options.gd rename to ui/menus/options_menu/audio_options.gd diff --git a/ui/menus/OptionsMenu/audio_options.gd.uid b/ui/menus/options_menu/audio_options.gd.uid similarity index 100% rename from ui/menus/OptionsMenu/audio_options.gd.uid rename to ui/menus/options_menu/audio_options.gd.uid diff --git a/ui/menus/OptionsMenu/audio_options.tscn b/ui/menus/options_menu/audio_options.tscn similarity index 98% rename from ui/menus/OptionsMenu/audio_options.tscn rename to ui/menus/options_menu/audio_options.tscn index 27a2fc7..9208b6a 100644 --- a/ui/menus/OptionsMenu/audio_options.tscn +++ b/ui/menus/options_menu/audio_options.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://bwc45ogto8thn"] -[ext_resource type="Script" uid="uid://c4ljvgrb81du6" path="res://ui/menus/OptionsMenu/audio_options.gd" id="1_avc0j"] +[ext_resource type="Script" uid="uid://c4ljvgrb81du6" path="res://ui/menus/options_menu/audio_options.gd" id="1_avc0j"] [sub_resource type="ImageTexture" id="ImageTexture_hvvdd"] diff --git a/ui/menus/OptionsMenu/gameplay_options.gd b/ui/menus/options_menu/gameplay_options.gd similarity index 100% rename from ui/menus/OptionsMenu/gameplay_options.gd rename to ui/menus/options_menu/gameplay_options.gd diff --git a/ui/menus/OptionsMenu/gameplay_options.gd.uid b/ui/menus/options_menu/gameplay_options.gd.uid similarity index 100% rename from ui/menus/OptionsMenu/gameplay_options.gd.uid rename to ui/menus/options_menu/gameplay_options.gd.uid diff --git a/ui/menus/OptionsMenu/gameplay_options.tscn b/ui/menus/options_menu/gameplay_options.tscn similarity index 99% rename from ui/menus/OptionsMenu/gameplay_options.tscn rename to ui/menus/options_menu/gameplay_options.tscn index bd0d3da..8ad3a36 100644 --- a/ui/menus/OptionsMenu/gameplay_options.tscn +++ b/ui/menus/options_menu/gameplay_options.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://bjk7jf0bau5lv"] -[ext_resource type="Script" uid="uid://dtrjph756oq1f" path="res://ui/menus/OptionsMenu/gameplay_options.gd" id="1_sy26f"] +[ext_resource type="Script" uid="uid://dtrjph756oq1f" path="res://ui/menus/options_menu/gameplay_options.gd" id="1_sy26f"] [sub_resource type="ImageTexture" id="ImageTexture_03x6q"] diff --git a/ui/menus/OptionsMenu/graphics_options.gd b/ui/menus/options_menu/graphics_options.gd similarity index 100% rename from ui/menus/OptionsMenu/graphics_options.gd rename to ui/menus/options_menu/graphics_options.gd diff --git a/ui/menus/OptionsMenu/graphics_options.gd.uid b/ui/menus/options_menu/graphics_options.gd.uid similarity index 100% rename from ui/menus/OptionsMenu/graphics_options.gd.uid rename to ui/menus/options_menu/graphics_options.gd.uid diff --git a/ui/menus/OptionsMenu/graphics_options.tscn b/ui/menus/options_menu/graphics_options.tscn similarity index 99% rename from ui/menus/OptionsMenu/graphics_options.tscn rename to ui/menus/options_menu/graphics_options.tscn index 140a1d2..7625c25 100644 --- a/ui/menus/OptionsMenu/graphics_options.tscn +++ b/ui/menus/options_menu/graphics_options.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://bmd4mawasoc11"] -[ext_resource type="Script" uid="uid://bpb5c5r1yi8um" path="res://ui/menus/OptionsMenu/graphics_options.gd" id="1_85rh6"] +[ext_resource type="Script" uid="uid://bpb5c5r1yi8um" path="res://ui/menus/options_menu/graphics_options.gd" id="1_85rh6"] [sub_resource type="ImageTexture" id="ImageTexture_03x6q"] diff --git a/ui/menus/OptionsMenu/keybind_entry.gd b/ui/menus/options_menu/keybind_entry.gd similarity index 98% rename from ui/menus/OptionsMenu/keybind_entry.gd rename to ui/menus/options_menu/keybind_entry.gd index 9e75678..2392f51 100644 --- a/ui/menus/OptionsMenu/keybind_entry.gd +++ b/ui/menus/options_menu/keybind_entry.gd @@ -92,7 +92,7 @@ func add_bind_button(event: InputEvent) -> BindButton: #Create delete button var cross_button: Button = Button.new() - cross_button.icon = load("res://Assets/Textures/flair_disabled_cross.png") + cross_button.icon = load("res://assets/textures/flair_disabled_cross.png") cross_button.visible = false cross_button.mouse_filter = Control.MOUSE_FILTER_PASS cross_button.size_flags_vertical = Control.SIZE_EXPAND_FILL diff --git a/ui/menus/OptionsMenu/keybind_entry.gd.uid b/ui/menus/options_menu/keybind_entry.gd.uid similarity index 100% rename from ui/menus/OptionsMenu/keybind_entry.gd.uid rename to ui/menus/options_menu/keybind_entry.gd.uid diff --git a/ui/menus/OptionsMenu/keybind_entry.tscn b/ui/menus/options_menu/keybind_entry.tscn similarity index 94% rename from ui/menus/OptionsMenu/keybind_entry.tscn rename to ui/menus/options_menu/keybind_entry.tscn index afdeff7..49d123e 100644 --- a/ui/menus/OptionsMenu/keybind_entry.tscn +++ b/ui/menus/options_menu/keybind_entry.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://cb8irvp2y2p6g"] -[ext_resource type="Script" uid="uid://y2pxkfjn0wa2" path="res://ui/menus/OptionsMenu/keybind_entry.gd" id="1_it8q2"] +[ext_resource type="Script" uid="uid://y2pxkfjn0wa2" path="res://ui/menus/options_menu/keybind_entry.gd" id="1_it8q2"] [node name="KeybindEntry" type="HBoxContainer" unique_id=2041313667] anchors_preset = 15 diff --git a/ui/menus/OptionsMenu/keybind_options.gd b/ui/menus/options_menu/keybind_options.gd similarity index 100% rename from ui/menus/OptionsMenu/keybind_options.gd rename to ui/menus/options_menu/keybind_options.gd diff --git a/ui/menus/OptionsMenu/keybind_options.gd.uid b/ui/menus/options_menu/keybind_options.gd.uid similarity index 100% rename from ui/menus/OptionsMenu/keybind_options.gd.uid rename to ui/menus/options_menu/keybind_options.gd.uid diff --git a/ui/menus/OptionsMenu/keybind_options.tscn b/ui/menus/options_menu/keybind_options.tscn similarity index 82% rename from ui/menus/OptionsMenu/keybind_options.tscn rename to ui/menus/options_menu/keybind_options.tscn index ac2a8cb..43a246e 100644 --- a/ui/menus/OptionsMenu/keybind_options.tscn +++ b/ui/menus/options_menu/keybind_options.tscn @@ -1,8 +1,8 @@ [gd_scene format=3 uid="uid://bf2nosqt5f82e"] -[ext_resource type="Script" uid="uid://cxm67e833baex" path="res://ui/menus/OptionsMenu/keybind_options.gd" id="1_oxg0p"] -[ext_resource type="PackedScene" uid="uid://cb8irvp2y2p6g" path="res://ui/menus/OptionsMenu/keybind_entry.tscn" id="2_ayiik"] -[ext_resource type="PackedScene" uid="uid://clsdko6ttudu8" path="res://ui/menus/OptionsMenu/keybind_popup.tscn" id="3_h1scm"] +[ext_resource type="Script" uid="uid://cxm67e833baex" path="res://ui/menus/options_menu/keybind_options.gd" id="1_oxg0p"] +[ext_resource type="PackedScene" uid="uid://cb8irvp2y2p6g" path="res://ui/menus/options_menu/keybind_entry.tscn" id="2_ayiik"] +[ext_resource type="PackedScene" uid="uid://clsdko6ttudu8" path="res://ui/menus/options_menu/keybind_popup.tscn" id="3_h1scm"] [node name="Keybinds" type="VBoxContainer" unique_id=52837668] anchors_preset = 15 diff --git a/ui/menus/OptionsMenu/keybind_popup.gd b/ui/menus/options_menu/keybind_popup.gd similarity index 100% rename from ui/menus/OptionsMenu/keybind_popup.gd rename to ui/menus/options_menu/keybind_popup.gd diff --git a/ui/menus/OptionsMenu/keybind_popup.gd.uid b/ui/menus/options_menu/keybind_popup.gd.uid similarity index 100% rename from ui/menus/OptionsMenu/keybind_popup.gd.uid rename to ui/menus/options_menu/keybind_popup.gd.uid diff --git a/ui/menus/OptionsMenu/keybind_popup.tscn b/ui/menus/options_menu/keybind_popup.tscn similarity index 94% rename from ui/menus/OptionsMenu/keybind_popup.tscn rename to ui/menus/options_menu/keybind_popup.tscn index f20c4e1..00c24f5 100644 --- a/ui/menus/OptionsMenu/keybind_popup.tscn +++ b/ui/menus/options_menu/keybind_popup.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://clsdko6ttudu8"] -[ext_resource type="Script" uid="uid://d25hjwjdwv35i" path="res://ui/menus/OptionsMenu/keybind_popup.gd" id="1_m5i0b"] +[ext_resource type="Script" uid="uid://d25hjwjdwv35i" path="res://ui/menus/options_menu/keybind_popup.gd" id="1_m5i0b"] [node name="KeybindPopup" type="Control" unique_id=439413596] layout_mode = 3 diff --git a/ui/menus/OptionsMenu/keymap_data.gd b/ui/menus/options_menu/keymap_data.gd similarity index 100% rename from ui/menus/OptionsMenu/keymap_data.gd rename to ui/menus/options_menu/keymap_data.gd diff --git a/ui/menus/OptionsMenu/keymap_data.gd.uid b/ui/menus/options_menu/keymap_data.gd.uid similarity index 100% rename from ui/menus/OptionsMenu/keymap_data.gd.uid rename to ui/menus/options_menu/keymap_data.gd.uid diff --git a/ui/menus/OptionsMenu/options_menu.gd b/ui/menus/options_menu/options_menu.gd similarity index 100% rename from ui/menus/OptionsMenu/options_menu.gd rename to ui/menus/options_menu/options_menu.gd diff --git a/ui/menus/OptionsMenu/options_menu.gd.uid b/ui/menus/options_menu/options_menu.gd.uid similarity index 100% rename from ui/menus/OptionsMenu/options_menu.gd.uid rename to ui/menus/options_menu/options_menu.gd.uid diff --git a/ui/menus/OptionsMenu/options_menu.tscn b/ui/menus/options_menu/options_menu.tscn similarity index 90% rename from ui/menus/OptionsMenu/options_menu.tscn rename to ui/menus/options_menu/options_menu.tscn index 71ae485..35793ee 100644 --- a/ui/menus/OptionsMenu/options_menu.tscn +++ b/ui/menus/options_menu/options_menu.tscn @@ -1,10 +1,10 @@ [gd_scene format=3 uid="uid://clulh7v8c7h85"] -[ext_resource type="Script" uid="uid://48rvmybi18wj" path="res://ui/menus/OptionsMenu/options_menu.gd" id="1_bievw"] -[ext_resource type="PackedScene" uid="uid://bjk7jf0bau5lv" path="res://ui/menus/OptionsMenu/gameplay_options.tscn" id="3_25wuw"] -[ext_resource type="PackedScene" uid="uid://bmd4mawasoc11" path="res://ui/menus/OptionsMenu/graphics_options.tscn" id="4_ckcvq"] -[ext_resource type="PackedScene" uid="uid://bf2nosqt5f82e" path="res://ui/menus/OptionsMenu/keybind_options.tscn" id="5_4k33c"] -[ext_resource type="PackedScene" uid="uid://bwc45ogto8thn" path="res://ui/menus/OptionsMenu/audio_options.tscn" id="6_4vs8p"] +[ext_resource type="Script" uid="uid://48rvmybi18wj" path="res://ui/menus/options_menu/options_menu.gd" id="1_bievw"] +[ext_resource type="PackedScene" uid="uid://bjk7jf0bau5lv" path="res://ui/menus/options_menu/gameplay_options.tscn" id="3_25wuw"] +[ext_resource type="PackedScene" uid="uid://bmd4mawasoc11" path="res://ui/menus/options_menu/graphics_options.tscn" id="4_ckcvq"] +[ext_resource type="PackedScene" uid="uid://bf2nosqt5f82e" path="res://ui/menus/options_menu/keybind_options.tscn" id="5_4k33c"] +[ext_resource type="PackedScene" uid="uid://bwc45ogto8thn" path="res://ui/menus/options_menu/audio_options.tscn" id="6_4vs8p"] [ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://ui/drop_003.ogg" id="6_hhyef"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_5otwj"] diff --git a/ui/menus/PauseMenu/pause_menu.gd b/ui/menus/pause_menu/pause_menu.gd similarity index 87% rename from ui/menus/PauseMenu/pause_menu.gd rename to ui/menus/pause_menu/pause_menu.gd index 9b8d964..dddb345 100644 --- a/ui/menus/PauseMenu/pause_menu.gd +++ b/ui/menus/pause_menu/pause_menu.gd @@ -4,8 +4,8 @@ signal closed signal quit_to_main_menu_pressed signal quit_to_desktop_pressed -var options_menu_scene: PackedScene = preload("res://UI/Menus/OptionsMenu/options_menu.tscn") -var confirmation_popup_scene: PackedScene = preload("res://Scenes/Menus/confirmation_popup.tscn") +var options_menu_scene: PackedScene = preload("res://ui/menus/options_menu/options_menu.tscn") +var confirmation_popup_scene: PackedScene = preload("res://scenes/menus/confirmation_popup.tscn") var game_manager: GameManager diff --git a/ui/menus/PauseMenu/pause_menu.gd.uid b/ui/menus/pause_menu/pause_menu.gd.uid similarity index 100% rename from ui/menus/PauseMenu/pause_menu.gd.uid rename to ui/menus/pause_menu/pause_menu.gd.uid diff --git a/ui/menus/PauseMenu/pause_menu.tscn b/ui/menus/pause_menu/pause_menu.tscn similarity index 98% rename from ui/menus/PauseMenu/pause_menu.tscn rename to ui/menus/pause_menu/pause_menu.tscn index 20da57a..36aa47e 100644 --- a/ui/menus/PauseMenu/pause_menu.tscn +++ b/ui/menus/pause_menu/pause_menu.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://buvgdem68wtev"] -[ext_resource type="Script" uid="uid://cjyyepxaf4xl8" path="res://ui/menus/PauseMenu/pause_menu.gd" id="2_4pn2l"] +[ext_resource type="Script" uid="uid://cjyyepxaf4xl8" path="res://ui/menus/pause_menu/pause_menu.gd" id="2_4pn2l"] [ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://ui/drop_003.ogg" id="3_0bid7"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_n6ixr"] diff --git a/ui/menus/RadioMenu/choose_cassette_screen.gd b/ui/menus/radio_menu/choose_cassette_screen.gd similarity index 95% rename from ui/menus/RadioMenu/choose_cassette_screen.gd rename to ui/menus/radio_menu/choose_cassette_screen.gd index fe07c67..48a9a4b 100644 --- a/ui/menus/RadioMenu/choose_cassette_screen.gd +++ b/ui/menus/radio_menu/choose_cassette_screen.gd @@ -3,7 +3,7 @@ class_name ChooseCassetteScreen extends Control signal cassette_chosen(cassette: Cassette) @export var choice_buttons: VBoxContainer -@export var cassette_desc: cassetteDescriptionUI +@export var cassette_desc: CassetteDescriptionUI @export var cassette_name_label: Label var choices: Array[Cassette] = [] diff --git a/ui/menus/RadioMenu/choose_cassette_screen.gd.uid b/ui/menus/radio_menu/choose_cassette_screen.gd.uid similarity index 100% rename from ui/menus/RadioMenu/choose_cassette_screen.gd.uid rename to ui/menus/radio_menu/choose_cassette_screen.gd.uid diff --git a/ui/menus/RadioMenu/choose_cassette_screen.tscn b/ui/menus/radio_menu/choose_cassette_screen.tscn similarity index 90% rename from ui/menus/RadioMenu/choose_cassette_screen.tscn rename to ui/menus/radio_menu/choose_cassette_screen.tscn index 29c1ade..3f3a825 100644 --- a/ui/menus/RadioMenu/choose_cassette_screen.tscn +++ b/ui/menus/radio_menu/choose_cassette_screen.tscn @@ -1,9 +1,9 @@ [gd_scene format=3 uid="uid://bcvjgl0s1wp8y"] -[ext_resource type="Script" uid="uid://nc0df5y8tll7" path="res://ui/menus/RadioMenu/choose_cassette_screen.gd" id="1_y4oar"] +[ext_resource type="Script" uid="uid://nc0df5y8tll7" path="res://ui/menus/radio_menu/choose_cassette_screen.gd" id="1_y4oar"] [ext_resource type="PackedScene" uid="uid://cmlpmr78tmo6p" path="res://ui/cassette_description_ui.tscn" id="2_3npvv"] -[node name="ChooseCardScreen" type="Control" unique_id=1927453152 node_paths=PackedStringArray("choice_buttons")] +[node name="ChooseCardScreen" type="Control" unique_id=1927453152 node_paths=PackedStringArray("choice_buttons", "cassette_desc", "cassette_name_label")] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -12,6 +12,8 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_y4oar") choice_buttons = NodePath("PanelContainer/Content/HBoxContainer/ChoicesVBox") +cassette_desc = NodePath("PanelContainer/Content/HBoxContainer/DescriptionVBox") +cassette_name_label = NodePath("PanelContainer/Content/HBoxContainer/VBoxContainer/NameLabel") [node name="PanelContainer" type="PanelContainer" parent="." unique_id=1752212475] layout_mode = 1 diff --git a/ui/menus/WaveViewer/wave_viewer.gd b/ui/menus/wave_viewer/wave_viewer.gd similarity index 100% rename from ui/menus/WaveViewer/wave_viewer.gd rename to ui/menus/wave_viewer/wave_viewer.gd diff --git a/ui/menus/WaveViewer/wave_viewer.gd.uid b/ui/menus/wave_viewer/wave_viewer.gd.uid similarity index 100% rename from ui/menus/WaveViewer/wave_viewer.gd.uid rename to ui/menus/wave_viewer/wave_viewer.gd.uid diff --git a/ui/menus/WaveViewer/wave_viewer.tscn b/ui/menus/wave_viewer/wave_viewer.tscn similarity index 97% rename from ui/menus/WaveViewer/wave_viewer.tscn rename to ui/menus/wave_viewer/wave_viewer.tscn index 47e7f43..e328485 100644 --- a/ui/menus/WaveViewer/wave_viewer.tscn +++ b/ui/menus/wave_viewer/wave_viewer.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://ct6gic4shy5qw"] -[ext_resource type="Script" uid="uid://ps6sgjd0b5qr" path="res://ui/menus/WaveViewer/wave_viewer.gd" id="1_0v4fq"] -[ext_resource type="PackedScene" uid="uid://b5hp43bm07b8a" path="res://ui/menus/GameEndScreen/enemy_row.tscn" id="2_lbx3o"] +[ext_resource type="Script" uid="uid://ps6sgjd0b5qr" path="res://ui/menus/wave_viewer/wave_viewer.gd" id="1_0v4fq"] +[ext_resource type="PackedScene" uid="uid://b5hp43bm07b8a" path="res://ui/menus/game_end_screen/enemy_row.tscn" id="2_lbx3o"] [ext_resource type="Texture2D" uid="uid://3ywtwfpuuknr" path="res://assets/textures/leapfrog.png" id="2_tptaq"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_0v4fq"] diff --git a/worlds/green_planet/Enemies/enemy_controller.gd b/worlds/green_planet/Enemies/enemy_controller.gd index f7fbcf0..149d9ea 100644 --- a/worlds/green_planet/Enemies/enemy_controller.gd +++ b/worlds/green_planet/Enemies/enemy_controller.gd @@ -14,7 +14,7 @@ signal health_changed(health: int) @export var health_bar: HealthBar @export var model: Node3D -var damage_particle_scene: PackedScene = preload("res://UI/DamageParticle/damage_particle.tscn") +var damage_particle_scene: PackedScene = preload("res://ui/damage_particle/damage_particle.tscn") var current_health: int var corpse_root: Node var movement_speed: float diff --git a/zones/cave/zc_cave.tres b/zones/cave/zc_cave.tres index 51edadc..0ad59d3 100644 --- a/zones/cave/zc_cave.tres +++ b/zones/cave/zc_cave.tres @@ -7,5 +7,5 @@ script = ExtResource("2_65j5w") zone_name = "Cave" scene = ExtResource("1_h1vei") -flow_field_data_path = "res://Zones/Cave/ffd_cave.json" +flow_field_data_path = "res://zones/cave/ffd_cave.json" metadata/_custom_type_script = "uid://q0vwwqs066g8" diff --git a/zones/moat/scn_moat.tscn b/zones/moat/scn_moat.tscn index 189ca77..8b12add 100644 --- a/zones/moat/scn_moat.tscn +++ b/zones/moat/scn_moat.tscn @@ -154,15 +154,15 @@ shape = SubResource("BoxShape3D_134um") [node name="bridge" parent="." unique_id=1124569676 instance=ExtResource("30_ttr7n")] transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.5, 0) -[node name="@StaticBody3D@39749" parent="bridge" index="0" unique_id=868426142 groups=["stone"]] +[node name="@StaticBody3D@24041" parent="bridge" index="0" unique_id=270140330 groups=["stone"]] -[node name="@StaticBody3D@39750" parent="bridge" index="1" unique_id=2048495713 groups=["grass"]] +[node name="@StaticBody3D@24042" parent="bridge" index="1" unique_id=1118909154 groups=["grass"]] -[node name="@StaticBody3D@39751" parent="bridge" index="6" unique_id=1319466307 groups=["brick"]] +[node name="@StaticBody3D@24043" parent="bridge" index="6" unique_id=497475103 groups=["brick"]] -[node name="@StaticBody3D@39752" parent="bridge" index="7" unique_id=162462465 groups=["brick"]] +[node name="@StaticBody3D@24044" parent="bridge" index="7" unique_id=2140312904 groups=["brick"]] -[node name="fence" parent="bridge" index="9" unique_id=19694220 groups=["brick"]] +[node name="fence" parent="bridge" index="9" unique_id=91560793 groups=["stone"]] [node name="Sprite3D" type="Sprite3D" parent="." unique_id=1926664882] transform = Transform3D(-3.62805e-07, -8.3, -3.62805e-07, 0, -3.62805e-07, 8.3, -8.3, 3.62805e-07, 1.58587e-14, 2.93077, -74.4698, -10.0351) diff --git a/zones/moat/zc_moat.tres b/zones/moat/zc_moat.tres index 470771c..e95d7f9 100644 --- a/zones/moat/zc_moat.tres +++ b/zones/moat/zc_moat.tres @@ -7,5 +7,5 @@ script = ExtResource("2_5ugqa") zone_name = "Moat" scene = ExtResource("1_i6w1j") -flow_field_data_path = "res://Zones/Moat/ffd_moat.json" +flow_field_data_path = "res://zones/moat/ffd_moat.json" metadata/_custom_type_script = "uid://q0vwwqs066g8"