From bfe4f7d6a9c252d6c5393f4d76b16140d66513c7 Mon Sep 17 00:00:00 2001 From: cgandeg Date: Tue, 17 Mar 2026 13:45:35 -0600 Subject: [PATCH] beta-1.3/restructure-files (#2) Reviewed-on: https://gitea.39062.top/cgandeg/Archipelago-Game/pulls/2 --- .gitignore | 3 + .../under_construction_block.tscn | 0 .../Buildings/home_01.tscn | 0 .../Animals/Chicken/Scripts}/npc_chicken.gd | 0 .../Chicken/Scripts}/npc_chicken.gd.uid | 0 .../Animals}/Chicken/npc_chicken.tscn | 2 +- .../Characters/Animals}/Frog/npc_frog.tscn | 0 .../State Connectors/movement_connector.gd | 0 .../movement_connector.gd.uid | 0 .../Player/Scripts}/States/base_state.gd | 0 .../Player/Scripts}/States/base_state.gd.uid | 0 .../Player/Scripts}/States/cutscene_state.gd | 0 .../Scripts}/States/cutscene_state.gd.uid | 0 .../Scripts}/States/drawing_bow_state.gd | 0 .../Scripts}/States/drawing_bow_state.gd.uid | 0 .../Scripts}/States/firing_arrow_state.gd | 0 .../Scripts}/States/firing_arrow_state.gd.uid | 0 .../Player/Scripts}/States/idle_state.gd | 0 .../Player/Scripts}/States/idle_state.gd.uid | 0 .../Scripts}/States/play_animation_state.gd | 0 .../States/play_animation_state.gd.uid | 0 .../Player/Scripts}/States/sitting_state.gd | 0 .../Scripts}/States/sitting_state.gd.uid | 0 .../Scripts}/States/using_item_a_state.gd | 0 .../Scripts}/States/using_item_a_state.gd.uid | 0 .../Player/Scripts}/States/walking_state.gd | 0 .../Scripts}/States/walking_state.gd.uid | 0 .../Player/Scripts}/interact_scanner.gd | 0 .../Player/Scripts}/interact_scanner.gd.uid | 0 .../Player/Scripts}/movement_component.gd | 0 .../Player/Scripts}/movement_component.gd.uid | 0 .../Characters/Player/Scripts}/player.gd | 0 .../Characters/Player/Scripts}/player.gd.uid | 0 .../Characters/Player/Scripts}/sprite.gd | 0 .../Characters/Player/Scripts}/sprite.gd.uid | 0 .../Player/Scripts}/state_machine.gd | 0 .../Player/Scripts}/state_machine.gd.uid | 0 .../Characters/Player/player.tscn | 26 ++--- .../Characters/Player/player_bow_sprite.tscn | 0 .../Characters/Player/sprite.tscn | 2 +- .../Characters/Player/state_machine.tscn | 2 +- .../Occlusion/Scripts}/occlusion_culler.gd | 0 .../Occlusion/Scripts/occlusion_culler.gd.uid | 1 + .../Utility}/Occlusion/occlusion_culler.tscn | 2 +- .../Map Objects}/Chests/Bases/base_chest.tscn | 2 +- .../Chests/Bases/base_item_chest.tscn | 2 +- .../Item Chests/item_chest_01 (Wooden).tscn | 4 +- .../Item Chests/item_chest_02 (Metal).tscn | 4 +- .../Chests/Scripts}/Bases/chest_base.gd | 0 .../Chests/Scripts}/Bases/chest_base.gd.uid | 0 .../Chests/Scripts}/Bases/item_chest.gd | 0 .../Chests/Scripts}/Bases/item_chest.gd.uid | 0 .../Chests/Scripts}/item_chest_01.gd | 0 .../Chests/Scripts}/item_chest_01.gd.uid | 0 .../Chests/Sprites}/chest01_sprite.tscn | 0 .../Outdoor/Scripts}/wooden_bench.gd | 0 .../Outdoor/Scripts}/wooden_bench.gd.uid | 0 .../Decorative/Outdoor/wooden_bench.tscn | 2 +- .../Decorative/Signs/wooden_sign_01.tscn | 0 .../Decorative/Signs/wooden_sign_02.tscn | 0 .../Dialogue/Scripts}/dialogue_trigger.gd | 0 .../Dialogue/Scripts}/dialogue_trigger.gd.uid | 0 .../Dialogue/dialogue_trigger.tscn | 2 +- .../Entity Spawners/arrow_spawner.gd | 0 .../Entity Spawners/arrow_spawner.gd.uid | 0 .../Gates/Spike Gate/Scripts}/spike_gate.gd | 0 .../Spike Gate/Scripts}/spike_gate.gd.uid | 0 .../Gates/Spike Gate/spike_gate.tscn | 2 +- .../Scripts}/collision_loading_zone.gd | 0 .../Scripts/collision_loading_zone.gd.uid | 1 + .../Scripts}/interactive_loading_zone.gd | 0 .../Scripts/interactive_loading_zone.gd.uid | 1 + .../Scripts}/loading_zone_transporter.gd | 0 .../Scripts/loading_zone_transporter.gd.uid | 1 + .../Loading Zone/collision_loading_zone.tscn | 2 +- .../interactive_loading_zone.tscn | 2 +- .../loading_zone_transporter.tscn | 2 +- .../Mechanisms/Scripts}/arrow_target.gd | 0 .../Mechanisms/Scripts}/arrow_target.gd.uid | 0 .../Mechanisms/Scripts}/pressure_plate.gd | 0 .../Mechanisms/Scripts}/pressure_plate.gd.uid | 0 .../Mechanisms/Scripts}/shop_item.gd | 0 .../Mechanisms/Scripts}/shop_item.gd.uid | 0 .../Map Objects}/Mechanisms/arrow_target.tscn | 2 +- .../Mechanisms/pressure_plate.tscn | 2 +- .../Map Objects/Mechanisms}/shop_item.tscn | 2 +- .../Trees/Effects/Scripts}/leaf_spawner.gd | 10 +- .../Effects/Scripts}/leaf_spawner.gd.uid | 0 .../Trees/Effects/leaf_spawner.tscn | 7 ++ Entities/Map Objects/Trees/tree_01.tscn | 102 ++++++++++++++++++ .../Map Objects}/Trees/tree_02.tscn | 84 +++++++++++++-- .../Map Objects}/Trees/tree_03.tscn | 77 +++++++++++-- .../Projectiles/Scripts}/base_projectile.gd | 0 .../Scripts}/base_projectile.gd.uid | 0 .../Projectiles/Scripts}/wooden_arrow.gd | 0 .../Projectiles/Scripts}/wooden_arrow.gd.uid | 0 .../Weapons/Projectiles/base_projectile.tscn | 2 +- .../Weapons/Projectiles/wooden_arrow.tscn | 2 +- .../game_manager.gd | 0 .../game_manager.gd.uid | 0 .../group_utils.gd | 0 .../group_utils.gd.uid | 0 .../input_manager.gd | 0 .../input_manager.gd.uid | 0 .../map_loader.gd | 0 .../map_loader.gd.uid | 0 {Scripts => Main/Scripts}/gui.gd | 0 {Scripts => Main/Scripts}/gui.gd.uid | 0 {Scripts => Main/Scripts}/main.gd | 0 {Scripts => Main/Scripts}/main.gd.uid | 0 {Scripts => Main/Scripts}/map_transitioner.gd | 0 .../Scripts}/map_transitioner.gd.uid | 0 {Scripts => Main/Scripts}/world.gd | 0 {Scripts => Main/Scripts}/world.gd.uid | 0 {Scenes => Main}/main.tscn | 10 +- {Scripts/Maps => Maps/Common/Scripts}/shop.gd | 0 .../Maps => Maps/Common/Scripts}/shop.gd.uid | 0 {Scenes/Maps => Maps/Common}/shop.tscn | 14 +-- .../Scripts}/bench_interaction_connector.gd | 0 .../bench_interaction_connector.gd.uid | 0 .../Scripts}/camera_limit_connector.gd | 0 .../Scripts}/camera_limit_connector.gd.uid | 0 .../Scripts}/chest_interaction_connector.gd | 0 .../chest_interaction_connector.gd.uid | 0 .../collision_loading_zone_connector.gd | 0 .../collision_loading_zone_connector.gd.uid | 0 .../interactive_loading_zone_connector.gd | 0 .../interactive_loading_zone_connector.gd.uid | 0 .../Scripts}/shop_item_label_connector.gd | 0 .../Scripts}/shop_item_label_connector.gd.uid | 0 .../Scripts}/spawn_marker_connector.gd | 0 .../Scripts}/spawn_marker_connector.gd.uid | 0 .../Connectors/arrow_spawner.tscn | 2 +- .../bench_interaction_connector.tscn | 2 +- .../chest_interaction_connector.tscn | 2 +- .../interactive_loading_zone_connector.tscn | 2 +- .../Connectors/spawn_marker_connector.tscn | 2 +- .../Interiors/Home_01_Overlay_01.png | Bin .../Interiors/Home_01_Overlay_01.png.import | 6 +- .../Interiors/home_01.tscn | 18 ++-- .../path_to_dungeon_01.tscn | 48 ++++----- Resources/Materials/tree_sway.tres | 2 +- .../{tree_01_code.gdshader => tree.gdshader} | 0 ...01_code.gdshader.uid => tree.gdshader.uid} | 0 Scenes/Maps/base_map.tscn | 8 -- Scenes/Objects/Trees/tree_01.tscn | 36 ------- Scripts/Maps/base_map.gd | 2 - Scripts/Maps/base_map.gd.uid | 1 - .../collision_loading_zone.gd.uid | 1 - .../interactive_loading_zone.gd.uid | 1 - .../loading_zone_transporter.gd.uid | 1 - .../Objects/Occlusion/occlusion_culler.gd.uid | 1 - {Scripts/UI => UI/Scripts}/dialogue_box.gd | 0 .../UI => UI/Scripts}/dialogue_box.gd.uid | 0 {Scenes/UI => UI}/dialogue_box.tscn | 2 +- project.godot | 16 ++- 156 files changed, 369 insertions(+), 163 deletions(-) rename {Scenes/Debug => Debug}/under_construction_block.tscn (100%) rename {Scenes/Objects => Entities}/Buildings/home_01.tscn (100%) rename {Scripts/Characters/Chicken => Entities/Characters/Animals/Chicken/Scripts}/npc_chicken.gd (100%) rename {Scripts/Characters/Chicken => Entities/Characters/Animals/Chicken/Scripts}/npc_chicken.gd.uid (100%) rename {Scenes/Characters => Entities/Characters/Animals}/Chicken/npc_chicken.tscn (97%) rename {Scenes/Characters => Entities/Characters/Animals}/Frog/npc_frog.tscn (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/State Connectors/movement_connector.gd (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/State Connectors/movement_connector.gd.uid (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/base_state.gd (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/base_state.gd.uid (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/cutscene_state.gd (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/cutscene_state.gd.uid (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/drawing_bow_state.gd (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/drawing_bow_state.gd.uid (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/firing_arrow_state.gd (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/firing_arrow_state.gd.uid (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/idle_state.gd (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/idle_state.gd.uid (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/play_animation_state.gd (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/play_animation_state.gd.uid (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/sitting_state.gd (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/sitting_state.gd.uid (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/using_item_a_state.gd (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/using_item_a_state.gd.uid (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/walking_state.gd (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/States/walking_state.gd.uid (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/interact_scanner.gd (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/interact_scanner.gd.uid (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/movement_component.gd (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/movement_component.gd.uid (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/player.gd (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/player.gd.uid (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/sprite.gd (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/sprite.gd.uid (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/state_machine.gd (100%) rename {Scripts/Characters/Player => Entities/Characters/Player/Scripts}/state_machine.gd.uid (100%) rename {Scenes => Entities}/Characters/Player/player.tscn (89%) rename {Scenes => Entities}/Characters/Player/player_bow_sprite.tscn (100%) rename {Scenes => Entities}/Characters/Player/sprite.tscn (99%) rename {Scenes => Entities}/Characters/Player/state_machine.tscn (74%) rename {Scripts/Objects/Occlusion => Entities/Characters/Utility/Occlusion/Scripts}/occlusion_culler.gd (100%) create mode 100644 Entities/Characters/Utility/Occlusion/Scripts/occlusion_culler.gd.uid rename {Scenes/Objects => Entities/Characters/Utility}/Occlusion/occlusion_culler.tscn (69%) rename {Scenes/Objects => Entities/Map Objects}/Chests/Bases/base_chest.tscn (80%) rename {Scenes/Objects => Entities/Map Objects}/Chests/Bases/base_item_chest.tscn (78%) rename {Scenes/Objects => Entities/Map Objects}/Chests/Item Chests/item_chest_01 (Wooden).tscn (95%) rename {Scenes/Objects => Entities/Map Objects}/Chests/Item Chests/item_chest_02 (Metal).tscn (95%) rename {Scripts/Objects/Chests => Entities/Map Objects/Chests/Scripts}/Bases/chest_base.gd (100%) rename {Scripts/Objects/Chests => Entities/Map Objects/Chests/Scripts}/Bases/chest_base.gd.uid (100%) rename {Scripts/Objects/Chests => Entities/Map Objects/Chests/Scripts}/Bases/item_chest.gd (100%) rename {Scripts/Objects/Chests => Entities/Map Objects/Chests/Scripts}/Bases/item_chest.gd.uid (100%) rename {Scripts/Objects/Chests => Entities/Map Objects/Chests/Scripts}/item_chest_01.gd (100%) rename {Scripts/Objects/Chests => Entities/Map Objects/Chests/Scripts}/item_chest_01.gd.uid (100%) rename {Scenes/Animated Sprites => Entities/Map Objects/Chests/Sprites}/chest01_sprite.tscn (100%) rename {Scripts/Objects/Decorative/Outdoor => Entities/Map Objects/Decorative/Outdoor/Scripts}/wooden_bench.gd (100%) rename {Scripts/Objects/Decorative/Outdoor => Entities/Map Objects/Decorative/Outdoor/Scripts}/wooden_bench.gd.uid (100%) rename {Scenes/Objects => Entities/Map Objects}/Decorative/Outdoor/wooden_bench.tscn (95%) rename {Scenes/Objects => Entities/Map Objects}/Decorative/Signs/wooden_sign_01.tscn (100%) rename {Scenes/Objects => Entities/Map Objects}/Decorative/Signs/wooden_sign_02.tscn (100%) rename {Scripts/Objects/Dialogue => Entities/Map Objects/Dialogue/Scripts}/dialogue_trigger.gd (100%) rename {Scripts/Objects/Dialogue => Entities/Map Objects/Dialogue/Scripts}/dialogue_trigger.gd.uid (100%) rename {Scenes/Objects => Entities/Map Objects}/Dialogue/dialogue_trigger.tscn (78%) rename {Scripts => Entities/Map Objects}/Entity Spawners/arrow_spawner.gd (100%) rename {Scripts => Entities/Map Objects}/Entity Spawners/arrow_spawner.gd.uid (100%) rename {Scripts/Objects/Gates/Spike Gate => Entities/Map Objects/Gates/Spike Gate/Scripts}/spike_gate.gd (100%) rename {Scripts/Objects/Gates/Spike Gate => Entities/Map Objects/Gates/Spike Gate/Scripts}/spike_gate.gd.uid (100%) rename {Scenes/Objects => Entities/Map Objects}/Gates/Spike Gate/spike_gate.tscn (99%) rename {Scripts/Objects/Loading Zone => Entities/Map Objects/Loading Zone/Scripts}/collision_loading_zone.gd (100%) create mode 100644 Entities/Map Objects/Loading Zone/Scripts/collision_loading_zone.gd.uid rename {Scripts/Objects/Loading Zone => Entities/Map Objects/Loading Zone/Scripts}/interactive_loading_zone.gd (100%) create mode 100644 Entities/Map Objects/Loading Zone/Scripts/interactive_loading_zone.gd.uid rename {Scripts/Objects/Loading Zone => Entities/Map Objects/Loading Zone/Scripts}/loading_zone_transporter.gd (100%) create mode 100644 Entities/Map Objects/Loading Zone/Scripts/loading_zone_transporter.gd.uid rename {Scenes/Objects => Entities/Map Objects}/Loading Zone/collision_loading_zone.tscn (66%) rename {Scenes/Objects => Entities/Map Objects}/Loading Zone/interactive_loading_zone.tscn (60%) rename {Scenes/Objects => Entities/Map Objects}/Loading Zone/loading_zone_transporter.tscn (56%) rename {Scripts/Objects => Entities/Map Objects/Mechanisms/Scripts}/arrow_target.gd (100%) rename {Scripts/Objects => Entities/Map Objects/Mechanisms/Scripts}/arrow_target.gd.uid (100%) rename {Scripts/Objects/Mechanisms => Entities/Map Objects/Mechanisms/Scripts}/pressure_plate.gd (100%) rename {Scripts/Objects/Mechanisms => Entities/Map Objects/Mechanisms/Scripts}/pressure_plate.gd.uid (100%) rename {Scripts/Objects => Entities/Map Objects/Mechanisms/Scripts}/shop_item.gd (100%) rename {Scripts/Objects => Entities/Map Objects/Mechanisms/Scripts}/shop_item.gd.uid (100%) rename {Scenes/Objects => Entities/Map Objects}/Mechanisms/arrow_target.tscn (95%) rename {Scenes/Objects => Entities/Map Objects}/Mechanisms/pressure_plate.tscn (95%) rename {Scenes/Objects => Entities/Map Objects/Mechanisms}/shop_item.tscn (77%) rename {Scripts/Objects/Trees => Entities/Map Objects/Trees/Effects/Scripts}/leaf_spawner.gd (89%) rename {Scripts/Objects/Trees => Entities/Map Objects/Trees/Effects/Scripts}/leaf_spawner.gd.uid (100%) create mode 100644 Entities/Map Objects/Trees/Effects/leaf_spawner.tscn create mode 100644 Entities/Map Objects/Trees/tree_01.tscn rename {Scenes/Objects => Entities/Map Objects}/Trees/tree_02.tscn (56%) rename {Scenes/Objects => Entities/Map Objects}/Trees/tree_03.tscn (68%) rename {Scripts/Objects/Weapons/Projectiles => Entities/Weapons/Projectiles/Scripts}/base_projectile.gd (100%) rename {Scripts/Objects/Weapons/Projectiles => Entities/Weapons/Projectiles/Scripts}/base_projectile.gd.uid (100%) rename {Scripts/Objects/Weapons/Projectiles => Entities/Weapons/Projectiles/Scripts}/wooden_arrow.gd (100%) rename {Scripts/Objects/Weapons/Projectiles => Entities/Weapons/Projectiles/Scripts}/wooden_arrow.gd.uid (100%) rename {Scenes/Objects => Entities}/Weapons/Projectiles/base_projectile.tscn (77%) rename {Scenes/Objects => Entities}/Weapons/Projectiles/wooden_arrow.tscn (98%) rename {Scripts/Managers => Global Managers}/game_manager.gd (100%) rename {Scripts/Managers => Global Managers}/game_manager.gd.uid (100%) rename {Scripts/Managers => Global Managers}/group_utils.gd (100%) rename {Scripts/Managers => Global Managers}/group_utils.gd.uid (100%) rename {Scripts/Managers => Global Managers}/input_manager.gd (100%) rename {Scripts/Managers => Global Managers}/input_manager.gd.uid (100%) rename {Scripts/Managers => Global Managers}/map_loader.gd (100%) rename {Scripts/Managers => Global Managers}/map_loader.gd.uid (100%) rename {Scripts => Main/Scripts}/gui.gd (100%) rename {Scripts => Main/Scripts}/gui.gd.uid (100%) rename {Scripts => Main/Scripts}/main.gd (100%) rename {Scripts => Main/Scripts}/main.gd.uid (100%) rename {Scripts => Main/Scripts}/map_transitioner.gd (100%) rename {Scripts => Main/Scripts}/map_transitioner.gd.uid (100%) rename {Scripts => Main/Scripts}/world.gd (100%) rename {Scripts => Main/Scripts}/world.gd.uid (100%) rename {Scenes => Main}/main.tscn (87%) rename {Scripts/Maps => Maps/Common/Scripts}/shop.gd (100%) rename {Scripts/Maps => Maps/Common/Scripts}/shop.gd.uid (100%) rename {Scenes/Maps => Maps/Common}/shop.tscn (95%) rename {Scripts/Maps/Connectors => Maps/Connectors/Scripts}/bench_interaction_connector.gd (100%) rename {Scripts/Maps/Connectors => Maps/Connectors/Scripts}/bench_interaction_connector.gd.uid (100%) rename {Scripts/Maps/Connectors => Maps/Connectors/Scripts}/camera_limit_connector.gd (100%) rename {Scripts/Maps/Connectors => Maps/Connectors/Scripts}/camera_limit_connector.gd.uid (100%) rename {Scripts/Maps/Connectors => Maps/Connectors/Scripts}/chest_interaction_connector.gd (100%) rename {Scripts/Maps/Connectors => Maps/Connectors/Scripts}/chest_interaction_connector.gd.uid (100%) rename {Scripts/Maps/Connectors => Maps/Connectors/Scripts}/collision_loading_zone_connector.gd (100%) rename {Scripts/Maps/Connectors => Maps/Connectors/Scripts}/collision_loading_zone_connector.gd.uid (100%) rename {Scripts/Maps/Connectors => Maps/Connectors/Scripts}/interactive_loading_zone_connector.gd (100%) rename {Scripts/Maps/Connectors => Maps/Connectors/Scripts}/interactive_loading_zone_connector.gd.uid (100%) rename {Scripts/Maps/Connectors => Maps/Connectors/Scripts}/shop_item_label_connector.gd (100%) rename {Scripts/Maps/Connectors => Maps/Connectors/Scripts}/shop_item_label_connector.gd.uid (100%) rename {Scripts/Maps/Connectors => Maps/Connectors/Scripts}/spawn_marker_connector.gd (100%) rename {Scripts/Maps/Connectors => Maps/Connectors/Scripts}/spawn_marker_connector.gd.uid (100%) rename {Scenes/Maps => Maps}/Connectors/arrow_spawner.tscn (79%) rename {Scenes/Maps => Maps}/Connectors/bench_interaction_connector.tscn (77%) rename {Scenes/Maps => Maps}/Connectors/chest_interaction_connector.tscn (77%) rename {Scenes/Maps => Maps}/Connectors/interactive_loading_zone_connector.tscn (78%) rename {Scenes/Maps => Maps}/Connectors/spawn_marker_connector.tscn (82%) rename {Scenes/Maps => Maps}/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png (100%) rename {Scenes/Maps => Maps}/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png.import (72%) rename {Scenes/Maps => Maps}/Forest Dungeon Entrance/Interiors/home_01.tscn (93%) rename {Scenes/Maps => Maps}/Forest Dungeon Entrance/path_to_dungeon_01.tscn (96%) rename Resources/Shaders/Objects/Trees/{tree_01_code.gdshader => tree.gdshader} (100%) rename Resources/Shaders/Objects/Trees/{tree_01_code.gdshader.uid => tree.gdshader.uid} (100%) delete mode 100644 Scenes/Maps/base_map.tscn delete mode 100644 Scenes/Objects/Trees/tree_01.tscn delete mode 100644 Scripts/Maps/base_map.gd delete mode 100644 Scripts/Maps/base_map.gd.uid delete mode 100644 Scripts/Objects/Loading Zone/collision_loading_zone.gd.uid delete mode 100644 Scripts/Objects/Loading Zone/interactive_loading_zone.gd.uid delete mode 100644 Scripts/Objects/Loading Zone/loading_zone_transporter.gd.uid delete mode 100644 Scripts/Objects/Occlusion/occlusion_culler.gd.uid rename {Scripts/UI => UI/Scripts}/dialogue_box.gd (100%) rename {Scripts/UI => UI/Scripts}/dialogue_box.gd.uid (100%) rename {Scenes/UI => UI}/dialogue_box.tscn (96%) diff --git a/.gitignore b/.gitignore index d86f49a..67539e7 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ mono_crash.*.json # Android build files /android/ + +# Rider files +.idea \ No newline at end of file diff --git a/Scenes/Debug/under_construction_block.tscn b/Debug/under_construction_block.tscn similarity index 100% rename from Scenes/Debug/under_construction_block.tscn rename to Debug/under_construction_block.tscn diff --git a/Scenes/Objects/Buildings/home_01.tscn b/Entities/Buildings/home_01.tscn similarity index 100% rename from Scenes/Objects/Buildings/home_01.tscn rename to Entities/Buildings/home_01.tscn diff --git a/Scripts/Characters/Chicken/npc_chicken.gd b/Entities/Characters/Animals/Chicken/Scripts/npc_chicken.gd similarity index 100% rename from Scripts/Characters/Chicken/npc_chicken.gd rename to Entities/Characters/Animals/Chicken/Scripts/npc_chicken.gd diff --git a/Scripts/Characters/Chicken/npc_chicken.gd.uid b/Entities/Characters/Animals/Chicken/Scripts/npc_chicken.gd.uid similarity index 100% rename from Scripts/Characters/Chicken/npc_chicken.gd.uid rename to Entities/Characters/Animals/Chicken/Scripts/npc_chicken.gd.uid diff --git a/Scenes/Characters/Chicken/npc_chicken.tscn b/Entities/Characters/Animals/Chicken/npc_chicken.tscn similarity index 97% rename from Scenes/Characters/Chicken/npc_chicken.tscn rename to Entities/Characters/Animals/Chicken/npc_chicken.tscn index 966a48a..365f0fc 100644 --- a/Scenes/Characters/Chicken/npc_chicken.tscn +++ b/Entities/Characters/Animals/Chicken/npc_chicken.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://clqfyxjtn67m"] -[ext_resource type="Script" uid="uid://c5pt6iroi01si" path="res://Scripts/Characters/Chicken/npc_chicken.gd" id="1_etrql"] +[ext_resource type="Script" uid="uid://c5pt6iroi01si" path="res://Entities/Characters/Animals/Chicken/Scripts/npc_chicken.gd" id="1_etrql"] [ext_resource type="Texture2D" uid="uid://d4lf74neoqf4p" path="res://Assets/Spritesheets/Animals/Chickens/Chicken_01.png" id="1_hjr72"] [sub_resource type="AtlasTexture" id="AtlasTexture_etrql"] diff --git a/Scenes/Characters/Frog/npc_frog.tscn b/Entities/Characters/Animals/Frog/npc_frog.tscn similarity index 100% rename from Scenes/Characters/Frog/npc_frog.tscn rename to Entities/Characters/Animals/Frog/npc_frog.tscn diff --git a/Scripts/Characters/Player/State Connectors/movement_connector.gd b/Entities/Characters/Player/Scripts/State Connectors/movement_connector.gd similarity index 100% rename from Scripts/Characters/Player/State Connectors/movement_connector.gd rename to Entities/Characters/Player/Scripts/State Connectors/movement_connector.gd diff --git a/Scripts/Characters/Player/State Connectors/movement_connector.gd.uid b/Entities/Characters/Player/Scripts/State Connectors/movement_connector.gd.uid similarity index 100% rename from Scripts/Characters/Player/State Connectors/movement_connector.gd.uid rename to Entities/Characters/Player/Scripts/State Connectors/movement_connector.gd.uid diff --git a/Scripts/Characters/Player/States/base_state.gd b/Entities/Characters/Player/Scripts/States/base_state.gd similarity index 100% rename from Scripts/Characters/Player/States/base_state.gd rename to Entities/Characters/Player/Scripts/States/base_state.gd diff --git a/Scripts/Characters/Player/States/base_state.gd.uid b/Entities/Characters/Player/Scripts/States/base_state.gd.uid similarity index 100% rename from Scripts/Characters/Player/States/base_state.gd.uid rename to Entities/Characters/Player/Scripts/States/base_state.gd.uid diff --git a/Scripts/Characters/Player/States/cutscene_state.gd b/Entities/Characters/Player/Scripts/States/cutscene_state.gd similarity index 100% rename from Scripts/Characters/Player/States/cutscene_state.gd rename to Entities/Characters/Player/Scripts/States/cutscene_state.gd diff --git a/Scripts/Characters/Player/States/cutscene_state.gd.uid b/Entities/Characters/Player/Scripts/States/cutscene_state.gd.uid similarity index 100% rename from Scripts/Characters/Player/States/cutscene_state.gd.uid rename to Entities/Characters/Player/Scripts/States/cutscene_state.gd.uid diff --git a/Scripts/Characters/Player/States/drawing_bow_state.gd b/Entities/Characters/Player/Scripts/States/drawing_bow_state.gd similarity index 100% rename from Scripts/Characters/Player/States/drawing_bow_state.gd rename to Entities/Characters/Player/Scripts/States/drawing_bow_state.gd diff --git a/Scripts/Characters/Player/States/drawing_bow_state.gd.uid b/Entities/Characters/Player/Scripts/States/drawing_bow_state.gd.uid similarity index 100% rename from Scripts/Characters/Player/States/drawing_bow_state.gd.uid rename to Entities/Characters/Player/Scripts/States/drawing_bow_state.gd.uid diff --git a/Scripts/Characters/Player/States/firing_arrow_state.gd b/Entities/Characters/Player/Scripts/States/firing_arrow_state.gd similarity index 100% rename from Scripts/Characters/Player/States/firing_arrow_state.gd rename to Entities/Characters/Player/Scripts/States/firing_arrow_state.gd diff --git a/Scripts/Characters/Player/States/firing_arrow_state.gd.uid b/Entities/Characters/Player/Scripts/States/firing_arrow_state.gd.uid similarity index 100% rename from Scripts/Characters/Player/States/firing_arrow_state.gd.uid rename to Entities/Characters/Player/Scripts/States/firing_arrow_state.gd.uid diff --git a/Scripts/Characters/Player/States/idle_state.gd b/Entities/Characters/Player/Scripts/States/idle_state.gd similarity index 100% rename from Scripts/Characters/Player/States/idle_state.gd rename to Entities/Characters/Player/Scripts/States/idle_state.gd diff --git a/Scripts/Characters/Player/States/idle_state.gd.uid b/Entities/Characters/Player/Scripts/States/idle_state.gd.uid similarity index 100% rename from Scripts/Characters/Player/States/idle_state.gd.uid rename to Entities/Characters/Player/Scripts/States/idle_state.gd.uid diff --git a/Scripts/Characters/Player/States/play_animation_state.gd b/Entities/Characters/Player/Scripts/States/play_animation_state.gd similarity index 100% rename from Scripts/Characters/Player/States/play_animation_state.gd rename to Entities/Characters/Player/Scripts/States/play_animation_state.gd diff --git a/Scripts/Characters/Player/States/play_animation_state.gd.uid b/Entities/Characters/Player/Scripts/States/play_animation_state.gd.uid similarity index 100% rename from Scripts/Characters/Player/States/play_animation_state.gd.uid rename to Entities/Characters/Player/Scripts/States/play_animation_state.gd.uid diff --git a/Scripts/Characters/Player/States/sitting_state.gd b/Entities/Characters/Player/Scripts/States/sitting_state.gd similarity index 100% rename from Scripts/Characters/Player/States/sitting_state.gd rename to Entities/Characters/Player/Scripts/States/sitting_state.gd diff --git a/Scripts/Characters/Player/States/sitting_state.gd.uid b/Entities/Characters/Player/Scripts/States/sitting_state.gd.uid similarity index 100% rename from Scripts/Characters/Player/States/sitting_state.gd.uid rename to Entities/Characters/Player/Scripts/States/sitting_state.gd.uid diff --git a/Scripts/Characters/Player/States/using_item_a_state.gd b/Entities/Characters/Player/Scripts/States/using_item_a_state.gd similarity index 100% rename from Scripts/Characters/Player/States/using_item_a_state.gd rename to Entities/Characters/Player/Scripts/States/using_item_a_state.gd diff --git a/Scripts/Characters/Player/States/using_item_a_state.gd.uid b/Entities/Characters/Player/Scripts/States/using_item_a_state.gd.uid similarity index 100% rename from Scripts/Characters/Player/States/using_item_a_state.gd.uid rename to Entities/Characters/Player/Scripts/States/using_item_a_state.gd.uid diff --git a/Scripts/Characters/Player/States/walking_state.gd b/Entities/Characters/Player/Scripts/States/walking_state.gd similarity index 100% rename from Scripts/Characters/Player/States/walking_state.gd rename to Entities/Characters/Player/Scripts/States/walking_state.gd diff --git a/Scripts/Characters/Player/States/walking_state.gd.uid b/Entities/Characters/Player/Scripts/States/walking_state.gd.uid similarity index 100% rename from Scripts/Characters/Player/States/walking_state.gd.uid rename to Entities/Characters/Player/Scripts/States/walking_state.gd.uid diff --git a/Scripts/Characters/Player/interact_scanner.gd b/Entities/Characters/Player/Scripts/interact_scanner.gd similarity index 100% rename from Scripts/Characters/Player/interact_scanner.gd rename to Entities/Characters/Player/Scripts/interact_scanner.gd diff --git a/Scripts/Characters/Player/interact_scanner.gd.uid b/Entities/Characters/Player/Scripts/interact_scanner.gd.uid similarity index 100% rename from Scripts/Characters/Player/interact_scanner.gd.uid rename to Entities/Characters/Player/Scripts/interact_scanner.gd.uid diff --git a/Scripts/Characters/Player/movement_component.gd b/Entities/Characters/Player/Scripts/movement_component.gd similarity index 100% rename from Scripts/Characters/Player/movement_component.gd rename to Entities/Characters/Player/Scripts/movement_component.gd diff --git a/Scripts/Characters/Player/movement_component.gd.uid b/Entities/Characters/Player/Scripts/movement_component.gd.uid similarity index 100% rename from Scripts/Characters/Player/movement_component.gd.uid rename to Entities/Characters/Player/Scripts/movement_component.gd.uid diff --git a/Scripts/Characters/Player/player.gd b/Entities/Characters/Player/Scripts/player.gd similarity index 100% rename from Scripts/Characters/Player/player.gd rename to Entities/Characters/Player/Scripts/player.gd diff --git a/Scripts/Characters/Player/player.gd.uid b/Entities/Characters/Player/Scripts/player.gd.uid similarity index 100% rename from Scripts/Characters/Player/player.gd.uid rename to Entities/Characters/Player/Scripts/player.gd.uid diff --git a/Scripts/Characters/Player/sprite.gd b/Entities/Characters/Player/Scripts/sprite.gd similarity index 100% rename from Scripts/Characters/Player/sprite.gd rename to Entities/Characters/Player/Scripts/sprite.gd diff --git a/Scripts/Characters/Player/sprite.gd.uid b/Entities/Characters/Player/Scripts/sprite.gd.uid similarity index 100% rename from Scripts/Characters/Player/sprite.gd.uid rename to Entities/Characters/Player/Scripts/sprite.gd.uid diff --git a/Scripts/Characters/Player/state_machine.gd b/Entities/Characters/Player/Scripts/state_machine.gd similarity index 100% rename from Scripts/Characters/Player/state_machine.gd rename to Entities/Characters/Player/Scripts/state_machine.gd diff --git a/Scripts/Characters/Player/state_machine.gd.uid b/Entities/Characters/Player/Scripts/state_machine.gd.uid similarity index 100% rename from Scripts/Characters/Player/state_machine.gd.uid rename to Entities/Characters/Player/Scripts/state_machine.gd.uid diff --git a/Scenes/Characters/Player/player.tscn b/Entities/Characters/Player/player.tscn similarity index 89% rename from Scenes/Characters/Player/player.tscn rename to Entities/Characters/Player/player.tscn index 2ebbd39..68bf2cf 100644 --- a/Scenes/Characters/Player/player.tscn +++ b/Entities/Characters/Player/player.tscn @@ -1,19 +1,19 @@ [gd_scene format=3 uid="uid://6athlweutl2g"] -[ext_resource type="PackedScene" uid="uid://uyl0s1e67x6s" path="res://Scenes/Characters/Player/sprite.tscn" id="1_27cb7"] -[ext_resource type="PackedScene" uid="uid://c2ydbmmvnfca6" path="res://Scenes/Characters/Player/state_machine.tscn" id="1_lyjr2"] -[ext_resource type="Script" uid="uid://dacvayqstkvws" path="res://Scripts/Characters/Player/player.gd" id="1_qqvsf"] +[ext_resource type="PackedScene" uid="uid://uyl0s1e67x6s" path="res://Entities/Characters/Player/sprite.tscn" id="1_27cb7"] +[ext_resource type="PackedScene" uid="uid://c2ydbmmvnfca6" path="res://Entities/Characters/Player/state_machine.tscn" id="1_lyjr2"] +[ext_resource type="Script" uid="uid://dacvayqstkvws" path="res://Entities/Characters/Player/Scripts/player.gd" id="1_qqvsf"] [ext_resource type="Script" uid="uid://b0l02v61if6k8" path="res://Scripts/Components/facing_direction_component.gd" id="1_siygm"] -[ext_resource type="Script" uid="uid://dwclkwbig1uii" path="res://Scripts/Characters/Player/movement_component.gd" id="4_apx8m"] -[ext_resource type="Script" uid="uid://dkmc1t43gomdb" path="res://Scripts/Characters/Player/States/idle_state.gd" id="4_dxcao"] -[ext_resource type="Script" uid="uid://ckn7gmtc23b8l" path="res://Scripts/Characters/Player/States/using_item_a_state.gd" id="5_1mdwi"] -[ext_resource type="Script" uid="uid://bwmmah30t3m0u" path="res://Scripts/Characters/Player/States/walking_state.gd" id="5_cscr0"] -[ext_resource type="Script" uid="uid://brlisuoocwehh" path="res://Scripts/Characters/Player/interact_scanner.gd" id="6_fu1fx"] -[ext_resource type="Script" uid="uid://bnp1vowmu15lg" path="res://Scripts/Characters/Player/States/drawing_bow_state.gd" id="7_cscr0"] -[ext_resource type="Script" uid="uid://cd2ewadcm8oi5" path="res://Scripts/Characters/Player/States/firing_arrow_state.gd" id="8_plevq"] -[ext_resource type="Script" uid="uid://bx1a35al4yiej" path="res://Scripts/Characters/Player/States/sitting_state.gd" id="9_sdxbo"] -[ext_resource type="Script" uid="uid://bnontuqj3cnom" path="res://Scripts/Characters/Player/States/cutscene_state.gd" id="10_p06rw"] -[ext_resource type="Script" uid="uid://wfdtd3xlgrvm" path="res://Scripts/Characters/Player/States/play_animation_state.gd" id="12_aencf"] +[ext_resource type="Script" uid="uid://dwclkwbig1uii" path="res://Entities/Characters/Player/Scripts/movement_component.gd" id="4_apx8m"] +[ext_resource type="Script" uid="uid://dkmc1t43gomdb" path="res://Entities/Characters/Player/Scripts/States/idle_state.gd" id="4_dxcao"] +[ext_resource type="Script" uid="uid://ckn7gmtc23b8l" path="res://Entities/Characters/Player/Scripts/States/using_item_a_state.gd" id="5_1mdwi"] +[ext_resource type="Script" uid="uid://bwmmah30t3m0u" path="res://Entities/Characters/Player/Scripts/States/walking_state.gd" id="5_cscr0"] +[ext_resource type="Script" uid="uid://brlisuoocwehh" path="res://Entities/Characters/Player/Scripts/interact_scanner.gd" id="6_fu1fx"] +[ext_resource type="Script" uid="uid://bnp1vowmu15lg" path="res://Entities/Characters/Player/Scripts/States/drawing_bow_state.gd" id="7_cscr0"] +[ext_resource type="Script" uid="uid://cd2ewadcm8oi5" path="res://Entities/Characters/Player/Scripts/States/firing_arrow_state.gd" id="8_plevq"] +[ext_resource type="Script" uid="uid://bx1a35al4yiej" path="res://Entities/Characters/Player/Scripts/States/sitting_state.gd" id="9_sdxbo"] +[ext_resource type="Script" uid="uid://bnontuqj3cnom" path="res://Entities/Characters/Player/Scripts/States/cutscene_state.gd" id="10_p06rw"] +[ext_resource type="Script" uid="uid://wfdtd3xlgrvm" path="res://Entities/Characters/Player/Scripts/States/play_animation_state.gd" id="12_aencf"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_apx8m"] size = Vector2(10, 5) diff --git a/Scenes/Characters/Player/player_bow_sprite.tscn b/Entities/Characters/Player/player_bow_sprite.tscn similarity index 100% rename from Scenes/Characters/Player/player_bow_sprite.tscn rename to Entities/Characters/Player/player_bow_sprite.tscn diff --git a/Scenes/Characters/Player/sprite.tscn b/Entities/Characters/Player/sprite.tscn similarity index 99% rename from Scenes/Characters/Player/sprite.tscn rename to Entities/Characters/Player/sprite.tscn index d303a7a..1ae07e9 100644 --- a/Scenes/Characters/Player/sprite.tscn +++ b/Entities/Characters/Player/sprite.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://uyl0s1e67x6s"] [ext_resource type="Texture2D" uid="uid://de0ihg453ruyi" path="res://Assets/Spritesheets/Player/Player_Base_animations.png" id="1_45g06"] -[ext_resource type="Script" uid="uid://cuar23q48cbja" path="res://Scripts/Characters/Player/sprite.gd" id="1_jqxwg"] +[ext_resource type="Script" uid="uid://cuar23q48cbja" path="res://Entities/Characters/Player/Scripts/sprite.gd" id="1_jqxwg"] [ext_resource type="Texture2D" uid="uid://1g5dx0dbupwk" path="res://Assets/Spritesheets/Player/Hair_1_Blonde.png" id="2_jqxwg"] [ext_resource type="Texture2D" uid="uid://d1mourl3rq437" path="res://Assets/Spritesheets/Player/player-full-01.png" id="2_ndjja"] [ext_resource type="Texture2D" uid="uid://4mpha6wuvyfy" path="res://Assets/Spritesheets/Player/Farmer_Shirt_1_Black.png" id="3_ndjja"] diff --git a/Scenes/Characters/Player/state_machine.tscn b/Entities/Characters/Player/state_machine.tscn similarity index 74% rename from Scenes/Characters/Player/state_machine.tscn rename to Entities/Characters/Player/state_machine.tscn index 39fa686..2c8752b 100644 --- a/Scenes/Characters/Player/state_machine.tscn +++ b/Entities/Characters/Player/state_machine.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://c2ydbmmvnfca6"] -[ext_resource type="Script" uid="uid://c74mhfemxuuco" path="res://Scripts/Characters/Player/state_machine.gd" id="1_clu2m"] +[ext_resource type="Script" uid="uid://c74mhfemxuuco" path="res://Entities/Characters/Player/Scripts/state_machine.gd" id="1_clu2m"] [node name="StateMachine" type="Node" unique_id=732559774] script = ExtResource("1_clu2m") diff --git a/Scripts/Objects/Occlusion/occlusion_culler.gd b/Entities/Characters/Utility/Occlusion/Scripts/occlusion_culler.gd similarity index 100% rename from Scripts/Objects/Occlusion/occlusion_culler.gd rename to Entities/Characters/Utility/Occlusion/Scripts/occlusion_culler.gd diff --git a/Entities/Characters/Utility/Occlusion/Scripts/occlusion_culler.gd.uid b/Entities/Characters/Utility/Occlusion/Scripts/occlusion_culler.gd.uid new file mode 100644 index 0000000..1bb4cfb --- /dev/null +++ b/Entities/Characters/Utility/Occlusion/Scripts/occlusion_culler.gd.uid @@ -0,0 +1 @@ +uid://ba0nsd76er3xa diff --git a/Scenes/Objects/Occlusion/occlusion_culler.tscn b/Entities/Characters/Utility/Occlusion/occlusion_culler.tscn similarity index 69% rename from Scenes/Objects/Occlusion/occlusion_culler.tscn rename to Entities/Characters/Utility/Occlusion/occlusion_culler.tscn index 7b76c00..3972042 100644 --- a/Scenes/Objects/Occlusion/occlusion_culler.tscn +++ b/Entities/Characters/Utility/Occlusion/occlusion_culler.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://d24gcv3umq60k"] -[ext_resource type="Script" uid="uid://d4g6s63d0bh4o" path="res://Scripts/Objects/Occlusion/occlusion_culler.gd" id="1_4550i"] +[ext_resource type="Script" uid="uid://ba0nsd76er3xa" path="res://Entities/Characters/Utility/Occlusion/Scripts/occlusion_culler.gd" id="1_4550i"] [node name="Occlusion Culler" type="Area2D" unique_id=1362480066] collision_layer = 0 diff --git a/Scenes/Objects/Chests/Bases/base_chest.tscn b/Entities/Map Objects/Chests/Bases/base_chest.tscn similarity index 80% rename from Scenes/Objects/Chests/Bases/base_chest.tscn rename to Entities/Map Objects/Chests/Bases/base_chest.tscn index db4ada6..186983a 100644 --- a/Scenes/Objects/Chests/Bases/base_chest.tscn +++ b/Entities/Map Objects/Chests/Bases/base_chest.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://cd3iyspcdg8m"] -[ext_resource type="Script" uid="uid://0fsmtp1umvmp" path="res://Scripts/Objects/Chests/Bases/chest_base.gd" id="1_6u2sl"] +[ext_resource type="Script" uid="uid://0fsmtp1umvmp" path="res://Entities/Map Objects/Chests/Scripts/Bases/chest_base.gd" id="1_6u2sl"] [node name="Base Chest" type="StaticBody2D" unique_id=975880832 groups=["Treasure Chest Group"]] y_sort_enabled = true diff --git a/Scenes/Objects/Chests/Bases/base_item_chest.tscn b/Entities/Map Objects/Chests/Bases/base_item_chest.tscn similarity index 78% rename from Scenes/Objects/Chests/Bases/base_item_chest.tscn rename to Entities/Map Objects/Chests/Bases/base_item_chest.tscn index bc679e2..5134355 100644 --- a/Scenes/Objects/Chests/Bases/base_item_chest.tscn +++ b/Entities/Map Objects/Chests/Bases/base_item_chest.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://cncm0c4dmosgs"] -[ext_resource type="Script" uid="uid://dbuc0f87m24xf" path="res://Scripts/Objects/Chests/Bases/item_chest.gd" id="1_mkt0u"] +[ext_resource type="Script" uid="uid://dbuc0f87m24xf" path="res://Entities/Map Objects/Chests/Scripts/Bases/item_chest.gd" id="1_mkt0u"] [node name="Base Item Chest" type="StaticBody2D" unique_id=991903258] script = ExtResource("1_mkt0u") diff --git a/Scenes/Objects/Chests/Item Chests/item_chest_01 (Wooden).tscn b/Entities/Map Objects/Chests/Item Chests/item_chest_01 (Wooden).tscn similarity index 95% rename from Scenes/Objects/Chests/Item Chests/item_chest_01 (Wooden).tscn rename to Entities/Map Objects/Chests/Item Chests/item_chest_01 (Wooden).tscn index 73b25f7..065877b 100644 --- a/Scenes/Objects/Chests/Item Chests/item_chest_01 (Wooden).tscn +++ b/Entities/Map Objects/Chests/Item Chests/item_chest_01 (Wooden).tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://byp273amg5ji8"] -[ext_resource type="Script" uid="uid://bvq13h8uyx572" path="res://Scripts/Objects/Chests/item_chest_01.gd" id="1_lp0kr"] -[ext_resource type="PackedScene" uid="uid://d3rqn611axsfk" path="res://Scenes/Animated Sprites/chest01_sprite.tscn" id="2_iwcc8"] +[ext_resource type="Script" uid="uid://bvq13h8uyx572" path="res://Entities/Map Objects/Chests/Scripts/item_chest_01.gd" id="1_lp0kr"] +[ext_resource type="PackedScene" uid="uid://d3rqn611axsfk" path="res://Entities/Map Objects/Chests/Sprites/chest01_sprite.tscn" id="2_iwcc8"] [ext_resource type="Texture2D" uid="uid://crf23tc55dxu" path="res://Assets/Spritesheets/Treasure Chests/Chest_Anim.png" id="3_iwcc8"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_y3ooa"] diff --git a/Scenes/Objects/Chests/Item Chests/item_chest_02 (Metal).tscn b/Entities/Map Objects/Chests/Item Chests/item_chest_02 (Metal).tscn similarity index 95% rename from Scenes/Objects/Chests/Item Chests/item_chest_02 (Metal).tscn rename to Entities/Map Objects/Chests/Item Chests/item_chest_02 (Metal).tscn index d962eb5..bea82b6 100644 --- a/Scenes/Objects/Chests/Item Chests/item_chest_02 (Metal).tscn +++ b/Entities/Map Objects/Chests/Item Chests/item_chest_02 (Metal).tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://b7u4hlvuqiefn"] -[ext_resource type="Script" uid="uid://bvq13h8uyx572" path="res://Scripts/Objects/Chests/item_chest_01.gd" id="1_77oue"] -[ext_resource type="PackedScene" uid="uid://d3rqn611axsfk" path="res://Scenes/Animated Sprites/chest01_sprite.tscn" id="2_jpeii"] +[ext_resource type="Script" uid="uid://bvq13h8uyx572" path="res://Entities/Map Objects/Chests/Scripts/item_chest_01.gd" id="1_77oue"] +[ext_resource type="PackedScene" uid="uid://d3rqn611axsfk" path="res://Entities/Map Objects/Chests/Sprites/chest01_sprite.tscn" id="2_jpeii"] [ext_resource type="Texture2D" uid="uid://dcbk854sc3uud" path="res://Assets/Spritesheets/Home Decor/Metal_Chest_Anim.png" id="3_jpeii"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_y3ooa"] diff --git a/Scripts/Objects/Chests/Bases/chest_base.gd b/Entities/Map Objects/Chests/Scripts/Bases/chest_base.gd similarity index 100% rename from Scripts/Objects/Chests/Bases/chest_base.gd rename to Entities/Map Objects/Chests/Scripts/Bases/chest_base.gd diff --git a/Scripts/Objects/Chests/Bases/chest_base.gd.uid b/Entities/Map Objects/Chests/Scripts/Bases/chest_base.gd.uid similarity index 100% rename from Scripts/Objects/Chests/Bases/chest_base.gd.uid rename to Entities/Map Objects/Chests/Scripts/Bases/chest_base.gd.uid diff --git a/Scripts/Objects/Chests/Bases/item_chest.gd b/Entities/Map Objects/Chests/Scripts/Bases/item_chest.gd similarity index 100% rename from Scripts/Objects/Chests/Bases/item_chest.gd rename to Entities/Map Objects/Chests/Scripts/Bases/item_chest.gd diff --git a/Scripts/Objects/Chests/Bases/item_chest.gd.uid b/Entities/Map Objects/Chests/Scripts/Bases/item_chest.gd.uid similarity index 100% rename from Scripts/Objects/Chests/Bases/item_chest.gd.uid rename to Entities/Map Objects/Chests/Scripts/Bases/item_chest.gd.uid diff --git a/Scripts/Objects/Chests/item_chest_01.gd b/Entities/Map Objects/Chests/Scripts/item_chest_01.gd similarity index 100% rename from Scripts/Objects/Chests/item_chest_01.gd rename to Entities/Map Objects/Chests/Scripts/item_chest_01.gd diff --git a/Scripts/Objects/Chests/item_chest_01.gd.uid b/Entities/Map Objects/Chests/Scripts/item_chest_01.gd.uid similarity index 100% rename from Scripts/Objects/Chests/item_chest_01.gd.uid rename to Entities/Map Objects/Chests/Scripts/item_chest_01.gd.uid diff --git a/Scenes/Animated Sprites/chest01_sprite.tscn b/Entities/Map Objects/Chests/Sprites/chest01_sprite.tscn similarity index 100% rename from Scenes/Animated Sprites/chest01_sprite.tscn rename to Entities/Map Objects/Chests/Sprites/chest01_sprite.tscn diff --git a/Scripts/Objects/Decorative/Outdoor/wooden_bench.gd b/Entities/Map Objects/Decorative/Outdoor/Scripts/wooden_bench.gd similarity index 100% rename from Scripts/Objects/Decorative/Outdoor/wooden_bench.gd rename to Entities/Map Objects/Decorative/Outdoor/Scripts/wooden_bench.gd diff --git a/Scripts/Objects/Decorative/Outdoor/wooden_bench.gd.uid b/Entities/Map Objects/Decorative/Outdoor/Scripts/wooden_bench.gd.uid similarity index 100% rename from Scripts/Objects/Decorative/Outdoor/wooden_bench.gd.uid rename to Entities/Map Objects/Decorative/Outdoor/Scripts/wooden_bench.gd.uid diff --git a/Scenes/Objects/Decorative/Outdoor/wooden_bench.tscn b/Entities/Map Objects/Decorative/Outdoor/wooden_bench.tscn similarity index 95% rename from Scenes/Objects/Decorative/Outdoor/wooden_bench.tscn rename to Entities/Map Objects/Decorative/Outdoor/wooden_bench.tscn index e977c08..db5a4b3 100644 --- a/Scenes/Objects/Decorative/Outdoor/wooden_bench.tscn +++ b/Entities/Map Objects/Decorative/Outdoor/wooden_bench.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://23tpba4r6ucg"] [ext_resource type="Texture2D" uid="uid://nocnsf1xr3ap" path="res://Assets/Spritesheets/Outdoor Decor/Benches.png" id="1_jlu4v"] -[ext_resource type="Script" uid="uid://c6n652dy18xbm" path="res://Scripts/Objects/Decorative/Outdoor/wooden_bench.gd" id="1_nv27i"] +[ext_resource type="Script" uid="uid://c6n652dy18xbm" path="res://Entities/Map Objects/Decorative/Outdoor/Scripts/wooden_bench.gd" id="1_nv27i"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_nv27i"] size = Vector2(30, 11) diff --git a/Scenes/Objects/Decorative/Signs/wooden_sign_01.tscn b/Entities/Map Objects/Decorative/Signs/wooden_sign_01.tscn similarity index 100% rename from Scenes/Objects/Decorative/Signs/wooden_sign_01.tscn rename to Entities/Map Objects/Decorative/Signs/wooden_sign_01.tscn diff --git a/Scenes/Objects/Decorative/Signs/wooden_sign_02.tscn b/Entities/Map Objects/Decorative/Signs/wooden_sign_02.tscn similarity index 100% rename from Scenes/Objects/Decorative/Signs/wooden_sign_02.tscn rename to Entities/Map Objects/Decorative/Signs/wooden_sign_02.tscn diff --git a/Scripts/Objects/Dialogue/dialogue_trigger.gd b/Entities/Map Objects/Dialogue/Scripts/dialogue_trigger.gd similarity index 100% rename from Scripts/Objects/Dialogue/dialogue_trigger.gd rename to Entities/Map Objects/Dialogue/Scripts/dialogue_trigger.gd diff --git a/Scripts/Objects/Dialogue/dialogue_trigger.gd.uid b/Entities/Map Objects/Dialogue/Scripts/dialogue_trigger.gd.uid similarity index 100% rename from Scripts/Objects/Dialogue/dialogue_trigger.gd.uid rename to Entities/Map Objects/Dialogue/Scripts/dialogue_trigger.gd.uid diff --git a/Scenes/Objects/Dialogue/dialogue_trigger.tscn b/Entities/Map Objects/Dialogue/dialogue_trigger.tscn similarity index 78% rename from Scenes/Objects/Dialogue/dialogue_trigger.tscn rename to Entities/Map Objects/Dialogue/dialogue_trigger.tscn index feb8b62..ffdd49b 100644 --- a/Scenes/Objects/Dialogue/dialogue_trigger.tscn +++ b/Entities/Map Objects/Dialogue/dialogue_trigger.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://b60nr4wfvijpf"] -[ext_resource type="Script" uid="uid://cfsfx0sahh5t7" path="res://Scripts/Objects/Dialogue/dialogue_trigger.gd" id="1_dyjvr"] +[ext_resource type="Script" uid="uid://cfsfx0sahh5t7" path="res://Entities/Map Objects/Dialogue/Scripts/dialogue_trigger.gd" id="1_dyjvr"] [node name="Dialogue Trigger" type="Area2D" unique_id=189867444 groups=["Dialog Trigger Group"]] collision_layer = 2 diff --git a/Scripts/Entity Spawners/arrow_spawner.gd b/Entities/Map Objects/Entity Spawners/arrow_spawner.gd similarity index 100% rename from Scripts/Entity Spawners/arrow_spawner.gd rename to Entities/Map Objects/Entity Spawners/arrow_spawner.gd diff --git a/Scripts/Entity Spawners/arrow_spawner.gd.uid b/Entities/Map Objects/Entity Spawners/arrow_spawner.gd.uid similarity index 100% rename from Scripts/Entity Spawners/arrow_spawner.gd.uid rename to Entities/Map Objects/Entity Spawners/arrow_spawner.gd.uid diff --git a/Scripts/Objects/Gates/Spike Gate/spike_gate.gd b/Entities/Map Objects/Gates/Spike Gate/Scripts/spike_gate.gd similarity index 100% rename from Scripts/Objects/Gates/Spike Gate/spike_gate.gd rename to Entities/Map Objects/Gates/Spike Gate/Scripts/spike_gate.gd diff --git a/Scripts/Objects/Gates/Spike Gate/spike_gate.gd.uid b/Entities/Map Objects/Gates/Spike Gate/Scripts/spike_gate.gd.uid similarity index 100% rename from Scripts/Objects/Gates/Spike Gate/spike_gate.gd.uid rename to Entities/Map Objects/Gates/Spike Gate/Scripts/spike_gate.gd.uid diff --git a/Scenes/Objects/Gates/Spike Gate/spike_gate.tscn b/Entities/Map Objects/Gates/Spike Gate/spike_gate.tscn similarity index 99% rename from Scenes/Objects/Gates/Spike Gate/spike_gate.tscn rename to Entities/Map Objects/Gates/Spike Gate/spike_gate.tscn index 06fdb12..a069542 100644 --- a/Scenes/Objects/Gates/Spike Gate/spike_gate.tscn +++ b/Entities/Map Objects/Gates/Spike Gate/spike_gate.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://da4qqruhldc6b"] [ext_resource type="Texture2D" uid="uid://1kmd0qww3368" path="res://Assets/Spritesheets/Outdoor Objects/Spike_Gate_anim.png" id="1_5ttkm"] -[ext_resource type="Script" uid="uid://8erg53skow38" path="res://Scripts/Objects/Gates/Spike Gate/spike_gate.gd" id="1_kye8r"] +[ext_resource type="Script" uid="uid://8erg53skow38" path="res://Entities/Map Objects/Gates/Spike Gate/Scripts/spike_gate.gd" id="1_kye8r"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_5ttkm"] size = Vector2(29, 4) diff --git a/Scripts/Objects/Loading Zone/collision_loading_zone.gd b/Entities/Map Objects/Loading Zone/Scripts/collision_loading_zone.gd similarity index 100% rename from Scripts/Objects/Loading Zone/collision_loading_zone.gd rename to Entities/Map Objects/Loading Zone/Scripts/collision_loading_zone.gd diff --git a/Entities/Map Objects/Loading Zone/Scripts/collision_loading_zone.gd.uid b/Entities/Map Objects/Loading Zone/Scripts/collision_loading_zone.gd.uid new file mode 100644 index 0000000..7d48f03 --- /dev/null +++ b/Entities/Map Objects/Loading Zone/Scripts/collision_loading_zone.gd.uid @@ -0,0 +1 @@ +uid://ckfuj0lm6jv3i diff --git a/Scripts/Objects/Loading Zone/interactive_loading_zone.gd b/Entities/Map Objects/Loading Zone/Scripts/interactive_loading_zone.gd similarity index 100% rename from Scripts/Objects/Loading Zone/interactive_loading_zone.gd rename to Entities/Map Objects/Loading Zone/Scripts/interactive_loading_zone.gd diff --git a/Entities/Map Objects/Loading Zone/Scripts/interactive_loading_zone.gd.uid b/Entities/Map Objects/Loading Zone/Scripts/interactive_loading_zone.gd.uid new file mode 100644 index 0000000..5525a58 --- /dev/null +++ b/Entities/Map Objects/Loading Zone/Scripts/interactive_loading_zone.gd.uid @@ -0,0 +1 @@ +uid://csspyy43sohfl diff --git a/Scripts/Objects/Loading Zone/loading_zone_transporter.gd b/Entities/Map Objects/Loading Zone/Scripts/loading_zone_transporter.gd similarity index 100% rename from Scripts/Objects/Loading Zone/loading_zone_transporter.gd rename to Entities/Map Objects/Loading Zone/Scripts/loading_zone_transporter.gd diff --git a/Entities/Map Objects/Loading Zone/Scripts/loading_zone_transporter.gd.uid b/Entities/Map Objects/Loading Zone/Scripts/loading_zone_transporter.gd.uid new file mode 100644 index 0000000..e25e156 --- /dev/null +++ b/Entities/Map Objects/Loading Zone/Scripts/loading_zone_transporter.gd.uid @@ -0,0 +1 @@ +uid://bvl1vdqd5cjkc diff --git a/Scenes/Objects/Loading Zone/collision_loading_zone.tscn b/Entities/Map Objects/Loading Zone/collision_loading_zone.tscn similarity index 66% rename from Scenes/Objects/Loading Zone/collision_loading_zone.tscn rename to Entities/Map Objects/Loading Zone/collision_loading_zone.tscn index eb32d85..8ecf766 100644 --- a/Scenes/Objects/Loading Zone/collision_loading_zone.tscn +++ b/Entities/Map Objects/Loading Zone/collision_loading_zone.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://ca75b65eh7vv8"] -[ext_resource type="Script" uid="uid://g0r5waf50gp5" path="res://Scripts/Objects/Loading Zone/collision_loading_zone.gd" id="1_pb5hg"] +[ext_resource type="Script" uid="uid://ckfuj0lm6jv3i" path="res://Entities/Map Objects/Loading Zone/Scripts/collision_loading_zone.gd" id="1_pb5hg"] [node name="Collision Loading Zone" type="Area2D" unique_id=1043800735 groups=["Collision Loading Zone Group"]] collision_layer = 0 diff --git a/Scenes/Objects/Loading Zone/interactive_loading_zone.tscn b/Entities/Map Objects/Loading Zone/interactive_loading_zone.tscn similarity index 60% rename from Scenes/Objects/Loading Zone/interactive_loading_zone.tscn rename to Entities/Map Objects/Loading Zone/interactive_loading_zone.tscn index 4972dfc..f4c6951 100644 --- a/Scenes/Objects/Loading Zone/interactive_loading_zone.tscn +++ b/Entities/Map Objects/Loading Zone/interactive_loading_zone.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://cla2d3gii8qda"] -[ext_resource type="Script" uid="uid://dla7fe0nsbdvv" path="res://Scripts/Objects/Loading Zone/interactive_loading_zone.gd" id="1_7bdbd"] +[ext_resource type="Script" uid="uid://csspyy43sohfl" path="res://Entities/Map Objects/Loading Zone/Scripts/interactive_loading_zone.gd" id="1_7bdbd"] [node name="Interactive Loading Zone" type="Area2D" unique_id=1427014981 groups=["Interactive Loading Zone Group"]] collision_layer = 2 diff --git a/Scenes/Objects/Loading Zone/loading_zone_transporter.tscn b/Entities/Map Objects/Loading Zone/loading_zone_transporter.tscn similarity index 56% rename from Scenes/Objects/Loading Zone/loading_zone_transporter.tscn rename to Entities/Map Objects/Loading Zone/loading_zone_transporter.tscn index 1149d8e..e3311e1 100644 --- a/Scenes/Objects/Loading Zone/loading_zone_transporter.tscn +++ b/Entities/Map Objects/Loading Zone/loading_zone_transporter.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://bbules4o3xayc"] -[ext_resource type="Script" uid="uid://cshtpe5n2iubh" path="res://Scripts/Objects/Loading Zone/loading_zone_transporter.gd" id="1_p8o2m"] +[ext_resource type="Script" uid="uid://bvl1vdqd5cjkc" path="res://Entities/Map Objects/Loading Zone/Scripts/loading_zone_transporter.gd" id="1_p8o2m"] [node name="Loading Zone Transporter" type="Node" unique_id=1690817663 groups=["Loading Zone Transporter Group"]] script = ExtResource("1_p8o2m") diff --git a/Scripts/Objects/arrow_target.gd b/Entities/Map Objects/Mechanisms/Scripts/arrow_target.gd similarity index 100% rename from Scripts/Objects/arrow_target.gd rename to Entities/Map Objects/Mechanisms/Scripts/arrow_target.gd diff --git a/Scripts/Objects/arrow_target.gd.uid b/Entities/Map Objects/Mechanisms/Scripts/arrow_target.gd.uid similarity index 100% rename from Scripts/Objects/arrow_target.gd.uid rename to Entities/Map Objects/Mechanisms/Scripts/arrow_target.gd.uid diff --git a/Scripts/Objects/Mechanisms/pressure_plate.gd b/Entities/Map Objects/Mechanisms/Scripts/pressure_plate.gd similarity index 100% rename from Scripts/Objects/Mechanisms/pressure_plate.gd rename to Entities/Map Objects/Mechanisms/Scripts/pressure_plate.gd diff --git a/Scripts/Objects/Mechanisms/pressure_plate.gd.uid b/Entities/Map Objects/Mechanisms/Scripts/pressure_plate.gd.uid similarity index 100% rename from Scripts/Objects/Mechanisms/pressure_plate.gd.uid rename to Entities/Map Objects/Mechanisms/Scripts/pressure_plate.gd.uid diff --git a/Scripts/Objects/shop_item.gd b/Entities/Map Objects/Mechanisms/Scripts/shop_item.gd similarity index 100% rename from Scripts/Objects/shop_item.gd rename to Entities/Map Objects/Mechanisms/Scripts/shop_item.gd diff --git a/Scripts/Objects/shop_item.gd.uid b/Entities/Map Objects/Mechanisms/Scripts/shop_item.gd.uid similarity index 100% rename from Scripts/Objects/shop_item.gd.uid rename to Entities/Map Objects/Mechanisms/Scripts/shop_item.gd.uid diff --git a/Scenes/Objects/Mechanisms/arrow_target.tscn b/Entities/Map Objects/Mechanisms/arrow_target.tscn similarity index 95% rename from Scenes/Objects/Mechanisms/arrow_target.tscn rename to Entities/Map Objects/Mechanisms/arrow_target.tscn index 765ac17..cc3ae01 100644 --- a/Scenes/Objects/Mechanisms/arrow_target.tscn +++ b/Entities/Map Objects/Mechanisms/arrow_target.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://b8m08wroe1qu2"] [ext_resource type="Texture2D" uid="uid://k2htcxstdj5v" path="res://Assets/Spritesheets/Outdoor Objects/Arrow Target-Sheet.png" id="1_b0s8y"] -[ext_resource type="Script" uid="uid://6jls1eokv2to" path="res://Scripts/Objects/arrow_target.gd" id="1_uhut5"] +[ext_resource type="Script" uid="uid://6jls1eokv2to" path="res://Entities/Map Objects/Mechanisms/Scripts/arrow_target.gd" id="1_uhut5"] [sub_resource type="CircleShape2D" id="CircleShape2D_uhut5"] radius = 8.0 diff --git a/Scenes/Objects/Mechanisms/pressure_plate.tscn b/Entities/Map Objects/Mechanisms/pressure_plate.tscn similarity index 95% rename from Scenes/Objects/Mechanisms/pressure_plate.tscn rename to Entities/Map Objects/Mechanisms/pressure_plate.tscn index cadd9de..acc0980 100644 --- a/Scenes/Objects/Mechanisms/pressure_plate.tscn +++ b/Entities/Map Objects/Mechanisms/pressure_plate.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://b5t4h63xhuods"] -[ext_resource type="Script" uid="uid://cxt7ht66jiac8" path="res://Scripts/Objects/Mechanisms/pressure_plate.gd" id="1_po2h8"] +[ext_resource type="Script" uid="uid://cxt7ht66jiac8" path="res://Entities/Map Objects/Mechanisms/Scripts/pressure_plate.gd" id="1_po2h8"] [ext_resource type="Texture2D" uid="uid://dhtolttw5h33" path="res://Assets/Spritesheets/Mechanisms/Pressure Plate.png" id="1_ulio5"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_ulio5"] diff --git a/Scenes/Objects/shop_item.tscn b/Entities/Map Objects/Mechanisms/shop_item.tscn similarity index 77% rename from Scenes/Objects/shop_item.tscn rename to Entities/Map Objects/Mechanisms/shop_item.tscn index f9be66f..45c100b 100644 --- a/Scenes/Objects/shop_item.tscn +++ b/Entities/Map Objects/Mechanisms/shop_item.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://ddgeo3vwebqeg"] -[ext_resource type="Script" uid="uid://cggyjxrk4qqfm" path="res://Scripts/Objects/shop_item.gd" id="1_0luup"] +[ext_resource type="Script" uid="uid://cggyjxrk4qqfm" path="res://Entities/Map Objects/Mechanisms/Scripts/shop_item.gd" id="1_0luup"] [node name="ShopItem" type="Area2D" unique_id=1768344009] collision_layer = 2 diff --git a/Scripts/Objects/Trees/leaf_spawner.gd b/Entities/Map Objects/Trees/Effects/Scripts/leaf_spawner.gd similarity index 89% rename from Scripts/Objects/Trees/leaf_spawner.gd rename to Entities/Map Objects/Trees/Effects/Scripts/leaf_spawner.gd index e5e2425..64da718 100644 --- a/Scripts/Objects/Trees/leaf_spawner.gd +++ b/Entities/Map Objects/Trees/Effects/Scripts/leaf_spawner.gd @@ -4,6 +4,9 @@ extends Node2D @export var spawn_markers: Node2D @export var destination_markers: Node2D +@export_range(0.0, 60.0) var minimum_schedule_gap := 20.0 +@export_range(1.0, 61.0) var maximum_schedule_gap := 60.0 + var _spawn_markers: Array[Marker2D] = [] var _destination_markers: Array[Marker2D] = [] var _spawn_schedule := 0.0 @@ -20,12 +23,9 @@ func _ready() -> void: _set_random_spawn_schedule() # At spawn, we might want to spawn some leaves sooner... - _spawn_schedule -= randf_range(0.0, 15.0) + _spawn_schedule -= randf_range(0.0, _spawn_schedule) _spawn_schedule = max(0, _spawn_schedule) print("%s - Leaf Spawn Schedule: %f" % [get_parent().name, _spawn_schedule]) - - # Debug - _spawn_schedule = randf_range(1.0, 3.0) func _process(delta: float) -> void: @@ -61,7 +61,7 @@ func _process(delta: float) -> void: func _set_random_spawn_schedule() -> void: - _spawn_schedule = randf_range(20.0, 60.0) + _spawn_schedule = randf_range(minimum_schedule_gap, maximum_schedule_gap) func _get_random_spawn_point() -> Vector2: diff --git a/Scripts/Objects/Trees/leaf_spawner.gd.uid b/Entities/Map Objects/Trees/Effects/Scripts/leaf_spawner.gd.uid similarity index 100% rename from Scripts/Objects/Trees/leaf_spawner.gd.uid rename to Entities/Map Objects/Trees/Effects/Scripts/leaf_spawner.gd.uid diff --git a/Entities/Map Objects/Trees/Effects/leaf_spawner.tscn b/Entities/Map Objects/Trees/Effects/leaf_spawner.tscn new file mode 100644 index 0000000..4c876b4 --- /dev/null +++ b/Entities/Map Objects/Trees/Effects/leaf_spawner.tscn @@ -0,0 +1,7 @@ +[gd_scene format=3 uid="uid://dpwm1tn0mbr3l"] + +[ext_resource type="Script" uid="uid://vmyfl4obus88" path="res://Entities/Map Objects/Trees/Effects/Scripts/leaf_spawner.gd" id="1_l7yxv"] + +[node name="Leaf Spawner" type="Node2D" unique_id=986945632] +y_sort_enabled = true +script = ExtResource("1_l7yxv") diff --git a/Entities/Map Objects/Trees/tree_01.tscn b/Entities/Map Objects/Trees/tree_01.tscn new file mode 100644 index 0000000..6a1bdcd --- /dev/null +++ b/Entities/Map Objects/Trees/tree_01.tscn @@ -0,0 +1,102 @@ +[gd_scene format=3 uid="uid://cc3qat6un2323"] + +[ext_resource type="Texture2D" uid="uid://xygpf7c886pj" path="res://Assets/Spritesheets/Trees/Medium_Oak_Tree.png" id="1_i2ia5"] +[ext_resource type="PackedScene" uid="uid://d24gcv3umq60k" path="res://Entities/Characters/Utility/Occlusion/occlusion_culler.tscn" id="1_jbed0"] + +[sub_resource type="CircleShape2D" id="CircleShape2D_jbed0"] +radius = 12.0 + +[sub_resource type="Shader" id="Shader_jbed0"] +code = "shader_type canvas_item; + +uniform bool render_noise = false; +uniform sampler2D noise_texture : repeat_enable; // set in inspector +uniform float amplitude : hint_range(0.0, 0.5, 0.01) = 0.2; +uniform float time_scale : hint_range(0.0, 5.0, 0.01) = 0.04; +uniform float noise_scale : hint_range(0.0, 2.0, 0.0001) = 0.001; +uniform float rotation_strength : hint_range(0.0, 5.0, 0.1) = 1; +uniform vec2 rotation_pivot = vec2(0.5, 1); +varying vec2 world_position; + +void vertex(){ + world_position = (MODEL_MATRIX * vec4(VERTEX, 0.0, 1.0)).xy; +} + +vec2 get_sample_pos(vec2 pos, float scale, float offset) { + pos *= scale; + pos += offset; + return pos; +} + +vec2 rotate_vec(vec2 vec, vec2 pivot, float rotation) { + float cosa = cos(rotation); + float sina = sin(rotation); + vec -= pivot; + return vec2( + cosa * vec.x - sina * vec.y, + cosa * vec.y + sina * vec.x + ) + pivot; +} + +void fragment() { + // get noise from texture + vec2 noise_sample_pos = get_sample_pos(world_position, noise_scale, TIME * time_scale); + float noise_amount = texture(noise_texture, noise_sample_pos).r - 0.5f; + + // get rotation position around a pivot + float rotation = amplitude * noise_amount; + vec2 rotated_uvs = rotate_vec(UV, rotation_pivot, rotation); + + // blend original uvs and rotated uvs based on distance to pivot + float dist = distance(UV, rotation_pivot) * rotation_strength; + vec2 result_uvs = mix(UV, rotated_uvs, dist); + + // output color + COLOR = texture(TEXTURE, result_uvs); + + // optional, preview noise texture for debugging + if (render_noise) { + vec4 noise_color = texture(noise_texture, noise_sample_pos); + COLOR = noise_color; + } +}" + +[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_o0u4i"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_b23hf"] +shader = SubResource("Shader_jbed0") +shader_parameter/render_noise = false +shader_parameter/noise_texture = SubResource("NoiseTexture2D_o0u4i") +shader_parameter/amplitude = 0.05999999865888 +shader_parameter/time_scale = 0.04 +shader_parameter/noise_scale = 0.001 +shader_parameter/rotation_strength = 1.0 +shader_parameter/rotation_pivot = Vector2(0.5, 1) + +[sub_resource type="AtlasTexture" id="AtlasTexture_5otsd"] +atlas = ExtResource("1_i2ia5") +region = Rect2(32, 0, 32, 48) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_0srx6"] +size = Vector2(6, 3) + +[node name="Tree 01" type="StaticBody2D" unique_id=2046930104] +y_sort_enabled = true + +[node name="Occlusion Culler" parent="." unique_id=1362480066 node_paths=PackedStringArray("nodes_to_occlude") instance=ExtResource("1_jbed0")] +nodes_to_occlude = [NodePath("../Sprite2D")] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Occlusion Culler" unique_id=731605527] +position = Vector2(0, -10) +shape = SubResource("CircleShape2D_jbed0") + +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1420512565] +y_sort_enabled = true +material = SubResource("ShaderMaterial_b23hf") +position = Vector2(0, 8) +texture = SubResource("AtlasTexture_5otsd") +offset = Vector2(0, -8) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=870152657] +position = Vector2(0, 6.5) +shape = SubResource("RectangleShape2D_0srx6") diff --git a/Scenes/Objects/Trees/tree_02.tscn b/Entities/Map Objects/Trees/tree_02.tscn similarity index 56% rename from Scenes/Objects/Trees/tree_02.tscn rename to Entities/Map Objects/Trees/tree_02.tscn index 303c919..d8d58bc 100644 --- a/Scenes/Objects/Trees/tree_02.tscn +++ b/Entities/Map Objects/Trees/tree_02.tscn @@ -1,19 +1,83 @@ [gd_scene format=3 uid="uid://be6xfndyj4ckx"] -[ext_resource type="PackedScene" uid="uid://d24gcv3umq60k" path="res://Scenes/Objects/Occlusion/occlusion_culler.tscn" id="1_ijlg6"] +[ext_resource type="PackedScene" uid="uid://d24gcv3umq60k" path="res://Entities/Characters/Utility/Occlusion/occlusion_culler.tscn" id="1_ijlg6"] [ext_resource type="Texture2D" uid="uid://c6cddkuevr4hl" path="res://Assets/Spritesheets/Trees/Big_Oak_Tree-Isolated.png" id="2_mxye4"] -[ext_resource type="Material" uid="uid://1shsptwu7rdt" path="res://Resources/Materials/tree_sway.tres" id="2_pv2vp"] -[ext_resource type="Script" uid="uid://vmyfl4obus88" path="res://Scripts/Objects/Trees/leaf_spawner.gd" id="3_mxye4"] +[ext_resource type="PackedScene" uid="uid://dpwm1tn0mbr3l" path="res://Entities/Map Objects/Trees/Effects/leaf_spawner.tscn" id="3_n7ubj"] +[ext_resource type="Texture2D" uid="uid://dv2qcpyn2rk5s" path="res://Assets/Spritesheets/Trees/Oak_Leaf_Particle.png" id="4_xq3h5"] [sub_resource type="CircleShape2D" id="CircleShape2D_ijlg6"] radius = 23.021729 +[sub_resource type="Shader" id="Shader_mxye4"] +code = "shader_type canvas_item; + +uniform bool render_noise = false; +uniform sampler2D noise_texture : repeat_enable; // set in inspector +uniform float amplitude : hint_range(0.0, 0.5, 0.01) = 0.2; +uniform float time_scale : hint_range(0.0, 5.0, 0.01) = 0.04; +uniform float noise_scale : hint_range(0.0, 2.0, 0.0001) = 0.001; +uniform float rotation_strength : hint_range(0.0, 5.0, 0.1) = 1; +uniform vec2 rotation_pivot = vec2(0.5, 1); +varying vec2 world_position; + +void vertex(){ + world_position = (MODEL_MATRIX * vec4(VERTEX, 0.0, 1.0)).xy; +} + +vec2 get_sample_pos(vec2 pos, float scale, float offset) { + pos *= scale; + pos += offset; + return pos; +} + +vec2 rotate_vec(vec2 vec, vec2 pivot, float rotation) { + float cosa = cos(rotation); + float sina = sin(rotation); + vec -= pivot; + return vec2( + cosa * vec.x - sina * vec.y, + cosa * vec.y + sina * vec.x + ) + pivot; +} + +void fragment() { + // get noise from texture + vec2 noise_sample_pos = get_sample_pos(world_position, noise_scale, TIME * time_scale); + float noise_amount = texture(noise_texture, noise_sample_pos).r - 0.5f; + + // get rotation position around a pivot + float rotation = amplitude * noise_amount; + vec2 rotated_uvs = rotate_vec(UV, rotation_pivot, rotation); + + // blend original uvs and rotated uvs based on distance to pivot + float dist = distance(UV, rotation_pivot) * rotation_strength; + vec2 result_uvs = mix(UV, rotated_uvs, dist); + + // output color + COLOR = texture(TEXTURE, result_uvs); + + // optional, preview noise texture for debugging + if (render_noise) { + vec4 noise_color = texture(noise_texture, noise_sample_pos); + COLOR = noise_color; + } +}" + +[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_pv2vp"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_ocj51"] +shader = SubResource("Shader_mxye4") +shader_parameter/render_noise = false +shader_parameter/noise_texture = SubResource("NoiseTexture2D_pv2vp") +shader_parameter/amplitude = 0.1999999955296 +shader_parameter/time_scale = 0.04 +shader_parameter/noise_scale = 0.001 +shader_parameter/rotation_strength = 1.0 +shader_parameter/rotation_pivot = Vector2(0.5, 1) + [sub_resource type="RectangleShape2D" id="RectangleShape2D_0srx6"] size = Vector2(16, 10) -[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_mxye4"] -load_path = "res://.godot/imported/Oak_Leaf_Particle.png-90b4e62cf0b626a461440019d7b31cd8.ctex" - [node name="Tree 02" type="StaticBody2D" unique_id=2046930104] y_sort_enabled = true @@ -26,7 +90,7 @@ shape = SubResource("CircleShape2D_ijlg6") [node name="Sprite2D" type="Sprite2D" parent="." unique_id=1420512565] y_sort_enabled = true -material = ExtResource("2_pv2vp") +material = SubResource("ShaderMaterial_ocj51") position = Vector2(0, 24) texture = ExtResource("2_mxye4") offset = Vector2(0, -24) @@ -35,10 +99,8 @@ offset = Vector2(0, -24) position = Vector2(0, 19) shape = SubResource("RectangleShape2D_0srx6") -[node name="Leaf Spawner" type="Node2D" parent="." unique_id=1908114650 node_paths=PackedStringArray("spawn_markers", "destination_markers")] -y_sort_enabled = true -script = ExtResource("3_mxye4") -leaf_texture = SubResource("CompressedTexture2D_mxye4") +[node name="Leaf Spawner" parent="." unique_id=986945632 node_paths=PackedStringArray("spawn_markers", "destination_markers") instance=ExtResource("3_n7ubj")] +leaf_texture = ExtResource("4_xq3h5") spawn_markers = NodePath("Spawn Markers") destination_markers = NodePath("Destination Markers") diff --git a/Scenes/Objects/Trees/tree_03.tscn b/Entities/Map Objects/Trees/tree_03.tscn similarity index 68% rename from Scenes/Objects/Trees/tree_03.tscn rename to Entities/Map Objects/Trees/tree_03.tscn index 3ecadc1..d3001cc 100644 --- a/Scenes/Objects/Trees/tree_03.tscn +++ b/Entities/Map Objects/Trees/tree_03.tscn @@ -1,9 +1,8 @@ [gd_scene format=3 uid="uid://bcx1d8kvp7o0h"] [ext_resource type="Texture2D" uid="uid://bhdecga15imvk" path="res://Assets/Spritesheets/Trees/Big_Spruce_tree.png" id="1_xun88"] -[ext_resource type="PackedScene" uid="uid://d24gcv3umq60k" path="res://Scenes/Objects/Occlusion/occlusion_culler.tscn" id="2_45i4c"] -[ext_resource type="Material" uid="uid://1shsptwu7rdt" path="res://Resources/Materials/tree_sway.tres" id="2_bbkr4"] -[ext_resource type="Script" uid="uid://vmyfl4obus88" path="res://Scripts/Objects/Trees/leaf_spawner.gd" id="3_13veg"] +[ext_resource type="PackedScene" uid="uid://d24gcv3umq60k" path="res://Entities/Characters/Utility/Occlusion/occlusion_culler.tscn" id="2_45i4c"] +[ext_resource type="PackedScene" uid="uid://dpwm1tn0mbr3l" path="res://Entities/Map Objects/Trees/Effects/leaf_spawner.tscn" id="3_nua4y"] [ext_resource type="Texture2D" uid="uid://ckvfo6bl606hp" path="res://Assets/Spritesheets/Trees/Spruce_Needle_Particle.png" id="4_34ibr"] [sub_resource type="CircleShape2D" id="CircleShape2D_13veg"] @@ -15,6 +14,73 @@ radius = 8.0 [sub_resource type="CircleShape2D" id="CircleShape2D_bbkr4"] radius = 3.0 +[sub_resource type="Shader" id="Shader_34ibr"] +code = "shader_type canvas_item; + +uniform bool render_noise = false; +uniform sampler2D noise_texture : repeat_enable; // set in inspector +uniform float amplitude : hint_range(0.0, 0.5, 0.01) = 0.2; +uniform float time_scale : hint_range(0.0, 5.0, 0.01) = 0.04; +uniform float noise_scale : hint_range(0.0, 2.0, 0.0001) = 0.001; +uniform float rotation_strength : hint_range(0.0, 5.0, 0.1) = 1; +uniform vec2 rotation_pivot = vec2(0.5, 1); +varying vec2 world_position; + +void vertex(){ + world_position = (MODEL_MATRIX * vec4(VERTEX, 0.0, 1.0)).xy; +} + +vec2 get_sample_pos(vec2 pos, float scale, float offset) { + pos *= scale; + pos += offset; + return pos; +} + +vec2 rotate_vec(vec2 vec, vec2 pivot, float rotation) { + float cosa = cos(rotation); + float sina = sin(rotation); + vec -= pivot; + return vec2( + cosa * vec.x - sina * vec.y, + cosa * vec.y + sina * vec.x + ) + pivot; +} + +void fragment() { + // get noise from texture + vec2 noise_sample_pos = get_sample_pos(world_position, noise_scale, TIME * time_scale); + float noise_amount = texture(noise_texture, noise_sample_pos).r - 0.5f; + + // get rotation position around a pivot + float rotation = amplitude * noise_amount; + vec2 rotated_uvs = rotate_vec(UV, rotation_pivot, rotation); + + // blend original uvs and rotated uvs based on distance to pivot + float dist = distance(UV, rotation_pivot) * rotation_strength; + vec2 result_uvs = mix(UV, rotated_uvs, dist); + + // output color + COLOR = texture(TEXTURE, result_uvs); + + // optional, preview noise texture for debugging + if (render_noise) { + vec4 noise_color = texture(noise_texture, noise_sample_pos); + COLOR = noise_color; + } +}" + +[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_bbkr4"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_b4y2c"] +shader = SubResource("Shader_34ibr") +shader_parameter/render_noise = false +shader_parameter/noise_texture = SubResource("NoiseTexture2D_bbkr4") +shader_parameter/amplitude = 0.03999999910592 +shader_parameter/time_scale = 0.04 +shader_parameter/noise_scale = 0.001 +shader_parameter/rotation_strength = 1.0 +shader_parameter/rotation_pivot = Vector2(0.5, 1) + [sub_resource type="AtlasTexture" id="AtlasTexture_5otsd"] atlas = ExtResource("1_xun88") region = Rect2(64, 0, 64, 80) @@ -41,7 +107,7 @@ shape = SubResource("CircleShape2D_bbkr4") [node name="Sprite2D" type="Sprite2D" parent="." unique_id=1420512565] y_sort_enabled = true -material = ExtResource("2_bbkr4") +material = SubResource("ShaderMaterial_b4y2c") position = Vector2(0, 24) texture = SubResource("AtlasTexture_5otsd") offset = Vector2(0, -24) @@ -50,8 +116,7 @@ offset = Vector2(0, -24) position = Vector2(0, 19) shape = SubResource("RectangleShape2D_0srx6") -[node name="Leaf Spawner" type="Node2D" parent="." unique_id=1308634781 node_paths=PackedStringArray("spawn_markers", "destination_markers")] -script = ExtResource("3_13veg") +[node name="Leaf Spawner" parent="." unique_id=986945632 node_paths=PackedStringArray("spawn_markers", "destination_markers") instance=ExtResource("3_nua4y")] leaf_texture = ExtResource("4_34ibr") spawn_markers = NodePath("Spawn Markers") destination_markers = NodePath("Destination Markers") diff --git a/Scripts/Objects/Weapons/Projectiles/base_projectile.gd b/Entities/Weapons/Projectiles/Scripts/base_projectile.gd similarity index 100% rename from Scripts/Objects/Weapons/Projectiles/base_projectile.gd rename to Entities/Weapons/Projectiles/Scripts/base_projectile.gd diff --git a/Scripts/Objects/Weapons/Projectiles/base_projectile.gd.uid b/Entities/Weapons/Projectiles/Scripts/base_projectile.gd.uid similarity index 100% rename from Scripts/Objects/Weapons/Projectiles/base_projectile.gd.uid rename to Entities/Weapons/Projectiles/Scripts/base_projectile.gd.uid diff --git a/Scripts/Objects/Weapons/Projectiles/wooden_arrow.gd b/Entities/Weapons/Projectiles/Scripts/wooden_arrow.gd similarity index 100% rename from Scripts/Objects/Weapons/Projectiles/wooden_arrow.gd rename to Entities/Weapons/Projectiles/Scripts/wooden_arrow.gd diff --git a/Scripts/Objects/Weapons/Projectiles/wooden_arrow.gd.uid b/Entities/Weapons/Projectiles/Scripts/wooden_arrow.gd.uid similarity index 100% rename from Scripts/Objects/Weapons/Projectiles/wooden_arrow.gd.uid rename to Entities/Weapons/Projectiles/Scripts/wooden_arrow.gd.uid diff --git a/Scenes/Objects/Weapons/Projectiles/base_projectile.tscn b/Entities/Weapons/Projectiles/base_projectile.tscn similarity index 77% rename from Scenes/Objects/Weapons/Projectiles/base_projectile.tscn rename to Entities/Weapons/Projectiles/base_projectile.tscn index a1ad2cc..5ff0f52 100644 --- a/Scenes/Objects/Weapons/Projectiles/base_projectile.tscn +++ b/Entities/Weapons/Projectiles/base_projectile.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://bc8u3wlyag7c4"] -[ext_resource type="Script" uid="uid://8q26ldhfyijx" path="res://Scripts/Objects/Weapons/Projectiles/base_projectile.gd" id="1_0qxu7"] +[ext_resource type="Script" uid="uid://8q26ldhfyijx" path="res://Entities/Weapons/Projectiles/Scripts/base_projectile.gd" id="1_0qxu7"] [node name="BaseProjectile" type="CharacterBody2D" unique_id=647680377] collision_layer = 0 diff --git a/Scenes/Objects/Weapons/Projectiles/wooden_arrow.tscn b/Entities/Weapons/Projectiles/wooden_arrow.tscn similarity index 98% rename from Scenes/Objects/Weapons/Projectiles/wooden_arrow.tscn rename to Entities/Weapons/Projectiles/wooden_arrow.tscn index 3325ab5..3473d8f 100644 --- a/Scenes/Objects/Weapons/Projectiles/wooden_arrow.tscn +++ b/Entities/Weapons/Projectiles/wooden_arrow.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://b2wq5m01b68rx"] [ext_resource type="Texture2D" uid="uid://hop1gedjh8s4" path="res://Assets/Spritesheets/Player/icons_full_32.png" id="1_0h1c2"] -[ext_resource type="Script" uid="uid://j5yj4piyfql1" path="res://Scripts/Objects/Weapons/Projectiles/wooden_arrow.gd" id="1_44gti"] +[ext_resource type="Script" uid="uid://j5yj4piyfql1" path="res://Entities/Weapons/Projectiles/Scripts/wooden_arrow.gd" id="1_44gti"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_0h1c2"] size = Vector2(10, 2) diff --git a/Scripts/Managers/game_manager.gd b/Global Managers/game_manager.gd similarity index 100% rename from Scripts/Managers/game_manager.gd rename to Global Managers/game_manager.gd diff --git a/Scripts/Managers/game_manager.gd.uid b/Global Managers/game_manager.gd.uid similarity index 100% rename from Scripts/Managers/game_manager.gd.uid rename to Global Managers/game_manager.gd.uid diff --git a/Scripts/Managers/group_utils.gd b/Global Managers/group_utils.gd similarity index 100% rename from Scripts/Managers/group_utils.gd rename to Global Managers/group_utils.gd diff --git a/Scripts/Managers/group_utils.gd.uid b/Global Managers/group_utils.gd.uid similarity index 100% rename from Scripts/Managers/group_utils.gd.uid rename to Global Managers/group_utils.gd.uid diff --git a/Scripts/Managers/input_manager.gd b/Global Managers/input_manager.gd similarity index 100% rename from Scripts/Managers/input_manager.gd rename to Global Managers/input_manager.gd diff --git a/Scripts/Managers/input_manager.gd.uid b/Global Managers/input_manager.gd.uid similarity index 100% rename from Scripts/Managers/input_manager.gd.uid rename to Global Managers/input_manager.gd.uid diff --git a/Scripts/Managers/map_loader.gd b/Global Managers/map_loader.gd similarity index 100% rename from Scripts/Managers/map_loader.gd rename to Global Managers/map_loader.gd diff --git a/Scripts/Managers/map_loader.gd.uid b/Global Managers/map_loader.gd.uid similarity index 100% rename from Scripts/Managers/map_loader.gd.uid rename to Global Managers/map_loader.gd.uid diff --git a/Scripts/gui.gd b/Main/Scripts/gui.gd similarity index 100% rename from Scripts/gui.gd rename to Main/Scripts/gui.gd diff --git a/Scripts/gui.gd.uid b/Main/Scripts/gui.gd.uid similarity index 100% rename from Scripts/gui.gd.uid rename to Main/Scripts/gui.gd.uid diff --git a/Scripts/main.gd b/Main/Scripts/main.gd similarity index 100% rename from Scripts/main.gd rename to Main/Scripts/main.gd diff --git a/Scripts/main.gd.uid b/Main/Scripts/main.gd.uid similarity index 100% rename from Scripts/main.gd.uid rename to Main/Scripts/main.gd.uid diff --git a/Scripts/map_transitioner.gd b/Main/Scripts/map_transitioner.gd similarity index 100% rename from Scripts/map_transitioner.gd rename to Main/Scripts/map_transitioner.gd diff --git a/Scripts/map_transitioner.gd.uid b/Main/Scripts/map_transitioner.gd.uid similarity index 100% rename from Scripts/map_transitioner.gd.uid rename to Main/Scripts/map_transitioner.gd.uid diff --git a/Scripts/world.gd b/Main/Scripts/world.gd similarity index 100% rename from Scripts/world.gd rename to Main/Scripts/world.gd diff --git a/Scripts/world.gd.uid b/Main/Scripts/world.gd.uid similarity index 100% rename from Scripts/world.gd.uid rename to Main/Scripts/world.gd.uid diff --git a/Scenes/main.tscn b/Main/main.tscn similarity index 87% rename from Scenes/main.tscn rename to Main/main.tscn index b8af70e..a829d4a 100644 --- a/Scenes/main.tscn +++ b/Main/main.tscn @@ -1,11 +1,11 @@ [gd_scene format=3 uid="uid://dqgxg3i307lvr"] -[ext_resource type="Script" uid="uid://vv4pj8uhiad8" path="res://Scripts/main.gd" id="1_jjgbg"] -[ext_resource type="Script" uid="uid://ekp7au5wf06q" path="res://Scripts/world.gd" id="2_bo1nx"] -[ext_resource type="Script" uid="uid://c4w8hney4mesw" path="res://Scripts/gui.gd" id="3_8gbba"] -[ext_resource type="Script" uid="uid://dr7ljodtof1k5" path="res://Scripts/map_transitioner.gd" id="3_kry3j"] +[ext_resource type="Script" uid="uid://vv4pj8uhiad8" path="res://Main/Scripts/main.gd" id="1_jjgbg"] +[ext_resource type="Script" uid="uid://ekp7au5wf06q" path="res://Main/Scripts/world.gd" id="2_bo1nx"] +[ext_resource type="Script" uid="uid://c4w8hney4mesw" path="res://Main/Scripts/gui.gd" id="3_8gbba"] +[ext_resource type="Script" uid="uid://dr7ljodtof1k5" path="res://Main/Scripts/map_transitioner.gd" id="3_kry3j"] [ext_resource type="Script" uid="uid://cluyhxrc3pdb" path="res://Scripts/dialogue_trigger_connector.gd" id="4_6bp64"] -[ext_resource type="PackedScene" uid="uid://cxc4x4yp7l3hg" path="res://Scenes/UI/dialogue_box.tscn" id="6_21xkr"] +[ext_resource type="PackedScene" uid="uid://cxc4x4yp7l3hg" path="res://UI/dialogue_box.tscn" id="6_21xkr"] [node name="Main" type="Node2D" unique_id=1457826519] script = ExtResource("1_jjgbg") diff --git a/Scripts/Maps/shop.gd b/Maps/Common/Scripts/shop.gd similarity index 100% rename from Scripts/Maps/shop.gd rename to Maps/Common/Scripts/shop.gd diff --git a/Scripts/Maps/shop.gd.uid b/Maps/Common/Scripts/shop.gd.uid similarity index 100% rename from Scripts/Maps/shop.gd.uid rename to Maps/Common/Scripts/shop.gd.uid diff --git a/Scenes/Maps/shop.tscn b/Maps/Common/shop.tscn similarity index 95% rename from Scenes/Maps/shop.tscn rename to Maps/Common/shop.tscn index 77ff33e..221d132 100644 --- a/Scenes/Maps/shop.tscn +++ b/Maps/Common/shop.tscn @@ -1,16 +1,16 @@ [gd_scene format=4 uid="uid://bwt0ijoq4qmhn"] -[ext_resource type="Script" uid="uid://btg630l3xo16w" path="res://Scripts/Maps/shop.gd" id="1_83xsp"] +[ext_resource type="Script" uid="uid://btg630l3xo16w" path="res://Maps/Common/Scripts/shop.gd" id="1_83xsp"] [ext_resource type="TileSet" uid="uid://df0lg5vkqwbbt" path="res://Resources/Tilesets/home_interior.tres" id="2_kt7c3"] -[ext_resource type="Script" uid="uid://cpr710p4wdgx" path="res://Scripts/Maps/Connectors/shop_item_label_connector.gd" id="2_r8s0p"] -[ext_resource type="PackedScene" uid="uid://ddgeo3vwebqeg" path="res://Scenes/Objects/shop_item.tscn" id="3_7ftpj"] -[ext_resource type="Script" uid="uid://dkcsftcdqtmg" path="res://Scripts/Maps/Connectors/spawn_marker_connector.gd" id="3_t8w5b"] +[ext_resource type="Script" uid="uid://cpr710p4wdgx" path="res://Maps/Connectors/Scripts/shop_item_label_connector.gd" id="2_r8s0p"] +[ext_resource type="PackedScene" uid="uid://ddgeo3vwebqeg" path="res://Entities/Map Objects/Mechanisms/shop_item.tscn" id="3_7ftpj"] +[ext_resource type="Script" uid="uid://dkcsftcdqtmg" path="res://Maps/Connectors/Scripts/spawn_marker_connector.gd" id="3_t8w5b"] [ext_resource type="Texture2D" uid="uid://hop1gedjh8s4" path="res://Assets/Spritesheets/Player/icons_full_32.png" id="4_r8s0p"] -[ext_resource type="PackedScene" uid="uid://6athlweutl2g" path="res://Scenes/Characters/Player/player.tscn" id="5_6ky6i"] +[ext_resource type="PackedScene" uid="uid://6athlweutl2g" path="res://Entities/Characters/Player/player.tscn" id="5_6ky6i"] [ext_resource type="Texture2D" uid="uid://crebnygky3qv0" path="res://Assets/Sprites/Black Square.png" id="6_kt7c3"] -[ext_resource type="PackedScene" uid="uid://bbules4o3xayc" path="res://Scenes/Objects/Loading Zone/loading_zone_transporter.tscn" id="6_t8w5b"] +[ext_resource type="PackedScene" uid="uid://bbules4o3xayc" path="res://Entities/Map Objects/Loading Zone/loading_zone_transporter.tscn" id="6_t8w5b"] [ext_resource type="Texture2D" uid="uid://bf6llktwqhs8l" path="res://Assets/Sprites/Door Fade.png" id="7_7ftpj"] -[ext_resource type="PackedScene" uid="uid://ca75b65eh7vv8" path="res://Scenes/Objects/Loading Zone/collision_loading_zone.tscn" id="9_kp1fr"] +[ext_resource type="PackedScene" uid="uid://ca75b65eh7vv8" path="res://Entities/Map Objects/Loading Zone/collision_loading_zone.tscn" id="9_kp1fr"] [sub_resource type="AtlasTexture" id="AtlasTexture_fdj0q"] atlas = ExtResource("4_r8s0p") diff --git a/Scripts/Maps/Connectors/bench_interaction_connector.gd b/Maps/Connectors/Scripts/bench_interaction_connector.gd similarity index 100% rename from Scripts/Maps/Connectors/bench_interaction_connector.gd rename to Maps/Connectors/Scripts/bench_interaction_connector.gd diff --git a/Scripts/Maps/Connectors/bench_interaction_connector.gd.uid b/Maps/Connectors/Scripts/bench_interaction_connector.gd.uid similarity index 100% rename from Scripts/Maps/Connectors/bench_interaction_connector.gd.uid rename to Maps/Connectors/Scripts/bench_interaction_connector.gd.uid diff --git a/Scripts/Maps/Connectors/camera_limit_connector.gd b/Maps/Connectors/Scripts/camera_limit_connector.gd similarity index 100% rename from Scripts/Maps/Connectors/camera_limit_connector.gd rename to Maps/Connectors/Scripts/camera_limit_connector.gd diff --git a/Scripts/Maps/Connectors/camera_limit_connector.gd.uid b/Maps/Connectors/Scripts/camera_limit_connector.gd.uid similarity index 100% rename from Scripts/Maps/Connectors/camera_limit_connector.gd.uid rename to Maps/Connectors/Scripts/camera_limit_connector.gd.uid diff --git a/Scripts/Maps/Connectors/chest_interaction_connector.gd b/Maps/Connectors/Scripts/chest_interaction_connector.gd similarity index 100% rename from Scripts/Maps/Connectors/chest_interaction_connector.gd rename to Maps/Connectors/Scripts/chest_interaction_connector.gd diff --git a/Scripts/Maps/Connectors/chest_interaction_connector.gd.uid b/Maps/Connectors/Scripts/chest_interaction_connector.gd.uid similarity index 100% rename from Scripts/Maps/Connectors/chest_interaction_connector.gd.uid rename to Maps/Connectors/Scripts/chest_interaction_connector.gd.uid diff --git a/Scripts/Maps/Connectors/collision_loading_zone_connector.gd b/Maps/Connectors/Scripts/collision_loading_zone_connector.gd similarity index 100% rename from Scripts/Maps/Connectors/collision_loading_zone_connector.gd rename to Maps/Connectors/Scripts/collision_loading_zone_connector.gd diff --git a/Scripts/Maps/Connectors/collision_loading_zone_connector.gd.uid b/Maps/Connectors/Scripts/collision_loading_zone_connector.gd.uid similarity index 100% rename from Scripts/Maps/Connectors/collision_loading_zone_connector.gd.uid rename to Maps/Connectors/Scripts/collision_loading_zone_connector.gd.uid diff --git a/Scripts/Maps/Connectors/interactive_loading_zone_connector.gd b/Maps/Connectors/Scripts/interactive_loading_zone_connector.gd similarity index 100% rename from Scripts/Maps/Connectors/interactive_loading_zone_connector.gd rename to Maps/Connectors/Scripts/interactive_loading_zone_connector.gd diff --git a/Scripts/Maps/Connectors/interactive_loading_zone_connector.gd.uid b/Maps/Connectors/Scripts/interactive_loading_zone_connector.gd.uid similarity index 100% rename from Scripts/Maps/Connectors/interactive_loading_zone_connector.gd.uid rename to Maps/Connectors/Scripts/interactive_loading_zone_connector.gd.uid diff --git a/Scripts/Maps/Connectors/shop_item_label_connector.gd b/Maps/Connectors/Scripts/shop_item_label_connector.gd similarity index 100% rename from Scripts/Maps/Connectors/shop_item_label_connector.gd rename to Maps/Connectors/Scripts/shop_item_label_connector.gd diff --git a/Scripts/Maps/Connectors/shop_item_label_connector.gd.uid b/Maps/Connectors/Scripts/shop_item_label_connector.gd.uid similarity index 100% rename from Scripts/Maps/Connectors/shop_item_label_connector.gd.uid rename to Maps/Connectors/Scripts/shop_item_label_connector.gd.uid diff --git a/Scripts/Maps/Connectors/spawn_marker_connector.gd b/Maps/Connectors/Scripts/spawn_marker_connector.gd similarity index 100% rename from Scripts/Maps/Connectors/spawn_marker_connector.gd rename to Maps/Connectors/Scripts/spawn_marker_connector.gd diff --git a/Scripts/Maps/Connectors/spawn_marker_connector.gd.uid b/Maps/Connectors/Scripts/spawn_marker_connector.gd.uid similarity index 100% rename from Scripts/Maps/Connectors/spawn_marker_connector.gd.uid rename to Maps/Connectors/Scripts/spawn_marker_connector.gd.uid diff --git a/Scenes/Maps/Connectors/arrow_spawner.tscn b/Maps/Connectors/arrow_spawner.tscn similarity index 79% rename from Scenes/Maps/Connectors/arrow_spawner.tscn rename to Maps/Connectors/arrow_spawner.tscn index 0ba26aa..606773d 100644 --- a/Scenes/Maps/Connectors/arrow_spawner.tscn +++ b/Maps/Connectors/arrow_spawner.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://303hbhqetdhy"] -[ext_resource type="Script" uid="uid://dvgd5ejerauqm" path="res://Scripts/Entity Spawners/arrow_spawner.gd" id="1_dsltu"] +[ext_resource type="Script" uid="uid://dvgd5ejerauqm" path="res://Entities/Map Objects/Entity Spawners/arrow_spawner.gd" id="1_dsltu"] [node name="Arrow Spawner" type="Node" unique_id=627092886 node_paths=PackedStringArray("arrow_parent")] script = ExtResource("1_dsltu") diff --git a/Scenes/Maps/Connectors/bench_interaction_connector.tscn b/Maps/Connectors/bench_interaction_connector.tscn similarity index 77% rename from Scenes/Maps/Connectors/bench_interaction_connector.tscn rename to Maps/Connectors/bench_interaction_connector.tscn index a23ddb0..e01cf1f 100644 --- a/Scenes/Maps/Connectors/bench_interaction_connector.tscn +++ b/Maps/Connectors/bench_interaction_connector.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://divmfeqf10ri1"] -[ext_resource type="Script" uid="uid://c5yjcjk51l4bd" path="res://Scripts/Maps/Connectors/bench_interaction_connector.gd" id="1_34r4h"] +[ext_resource type="Script" uid="uid://c5yjcjk51l4bd" path="res://Maps/Connectors/Scripts/bench_interaction_connector.gd" id="1_34r4h"] [node name="Bench Interaction Connector" type="Node" unique_id=541204437] script = ExtResource("1_34r4h") diff --git a/Scenes/Maps/Connectors/chest_interaction_connector.tscn b/Maps/Connectors/chest_interaction_connector.tscn similarity index 77% rename from Scenes/Maps/Connectors/chest_interaction_connector.tscn rename to Maps/Connectors/chest_interaction_connector.tscn index 684befd..c4b6951 100644 --- a/Scenes/Maps/Connectors/chest_interaction_connector.tscn +++ b/Maps/Connectors/chest_interaction_connector.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://dl2jpjtbiju34"] -[ext_resource type="Script" uid="uid://dw76slp457s1v" path="res://Scripts/Maps/Connectors/chest_interaction_connector.gd" id="1_aitih"] +[ext_resource type="Script" uid="uid://dw76slp457s1v" path="res://Maps/Connectors/Scripts/chest_interaction_connector.gd" id="1_aitih"] [node name="Chest Interaction Connector" type="Node" unique_id=625804018] script = ExtResource("1_aitih") diff --git a/Scenes/Maps/Connectors/interactive_loading_zone_connector.tscn b/Maps/Connectors/interactive_loading_zone_connector.tscn similarity index 78% rename from Scenes/Maps/Connectors/interactive_loading_zone_connector.tscn rename to Maps/Connectors/interactive_loading_zone_connector.tscn index 8a311a3..8acd64d 100644 --- a/Scenes/Maps/Connectors/interactive_loading_zone_connector.tscn +++ b/Maps/Connectors/interactive_loading_zone_connector.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://b03s7fw8bxdxs"] -[ext_resource type="Script" uid="uid://d3hhbegfxdnqq" path="res://Scripts/Maps/Connectors/interactive_loading_zone_connector.gd" id="1_2sjeq"] +[ext_resource type="Script" uid="uid://d3hhbegfxdnqq" path="res://Maps/Connectors/Scripts/interactive_loading_zone_connector.gd" id="1_2sjeq"] [node name="Interactive Loading Zone Connector" type="Node" unique_id=833475826] script = ExtResource("1_2sjeq") diff --git a/Scenes/Maps/Connectors/spawn_marker_connector.tscn b/Maps/Connectors/spawn_marker_connector.tscn similarity index 82% rename from Scenes/Maps/Connectors/spawn_marker_connector.tscn rename to Maps/Connectors/spawn_marker_connector.tscn index 38e86e7..c143888 100644 --- a/Scenes/Maps/Connectors/spawn_marker_connector.tscn +++ b/Maps/Connectors/spawn_marker_connector.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://did853bh5xeic"] -[ext_resource type="Script" uid="uid://dkcsftcdqtmg" path="res://Scripts/Maps/Connectors/spawn_marker_connector.gd" id="1_kb3a7"] +[ext_resource type="Script" uid="uid://dkcsftcdqtmg" path="res://Maps/Connectors/Scripts/spawn_marker_connector.gd" id="1_kb3a7"] [node name="Spawn Marker Connector" type="Node" unique_id=807187299 node_paths=PackedStringArray("player", "markers")] script = ExtResource("1_kb3a7") diff --git a/Scenes/Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png b/Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png similarity index 100% rename from Scenes/Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png rename to Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png diff --git a/Scenes/Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png.import b/Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png.import similarity index 72% rename from Scenes/Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png.import rename to Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png.import index 2790034..3a19354 100644 --- a/Scenes/Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png.import +++ b/Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bqvnkdyhfa1yq" -path="res://.godot/imported/Home_01_Overlay_01.png-5522c04136136f6c0c2aaf9e86a5116f.ctex" +path="res://.godot/imported/Home_01_Overlay_01.png-26fde7ad2be3b256e0075725eafecc1c.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Scenes/Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png" -dest_files=["res://.godot/imported/Home_01_Overlay_01.png-5522c04136136f6c0c2aaf9e86a5116f.ctex"] +source_file="res://Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png" +dest_files=["res://.godot/imported/Home_01_Overlay_01.png-26fde7ad2be3b256e0075725eafecc1c.ctex"] [params] diff --git a/Scenes/Maps/Forest Dungeon Entrance/Interiors/home_01.tscn b/Maps/Forest Dungeon Entrance/Interiors/home_01.tscn similarity index 93% rename from Scenes/Maps/Forest Dungeon Entrance/Interiors/home_01.tscn rename to Maps/Forest Dungeon Entrance/Interiors/home_01.tscn index 1315cab..d03e369 100644 --- a/Scenes/Maps/Forest Dungeon Entrance/Interiors/home_01.tscn +++ b/Maps/Forest Dungeon Entrance/Interiors/home_01.tscn @@ -1,16 +1,16 @@ [gd_scene format=4 uid="uid://laxewy7irxno"] -[ext_resource type="Script" uid="uid://dbscr0b7k3rtp" path="res://Scripts/Maps/Connectors/collision_loading_zone_connector.gd" id="1_18bbf"] +[ext_resource type="Script" uid="uid://dbscr0b7k3rtp" path="res://Maps/Connectors/Scripts/collision_loading_zone_connector.gd" id="1_18bbf"] [ext_resource type="TileSet" uid="uid://df0lg5vkqwbbt" path="res://Resources/Tilesets/home_interior.tres" id="1_rf04x"] -[ext_resource type="Script" uid="uid://dkcsftcdqtmg" path="res://Scripts/Maps/Connectors/spawn_marker_connector.gd" id="2_16uj4"] -[ext_resource type="PackedScene" uid="uid://ca75b65eh7vv8" path="res://Scenes/Objects/Loading Zone/collision_loading_zone.tscn" id="2_fdso5"] -[ext_resource type="PackedScene" uid="uid://6athlweutl2g" path="res://Scenes/Characters/Player/player.tscn" id="2_lky26"] -[ext_resource type="PackedScene" uid="uid://bbules4o3xayc" path="res://Scenes/Objects/Loading Zone/loading_zone_transporter.tscn" id="3_7kg22"] -[ext_resource type="PackedScene" uid="uid://dl2jpjtbiju34" path="res://Scenes/Maps/Connectors/chest_interaction_connector.tscn" id="3_ec540"] -[ext_resource type="PackedScene" uid="uid://b7u4hlvuqiefn" path="res://Scenes/Objects/Chests/Item Chests/item_chest_02 (Metal).tscn" id="4_a58cd"] -[ext_resource type="PackedScene" uid="uid://b60nr4wfvijpf" path="res://Scenes/Objects/Dialogue/dialogue_trigger.tscn" id="5_msu6a"] +[ext_resource type="Script" uid="uid://dkcsftcdqtmg" path="res://Maps/Connectors/Scripts/spawn_marker_connector.gd" id="2_16uj4"] +[ext_resource type="PackedScene" uid="uid://ca75b65eh7vv8" path="res://Entities/Map Objects/Loading Zone/collision_loading_zone.tscn" id="2_fdso5"] +[ext_resource type="PackedScene" uid="uid://6athlweutl2g" path="res://Entities/Characters/Player/player.tscn" id="2_lky26"] +[ext_resource type="PackedScene" uid="uid://bbules4o3xayc" path="res://Entities/Map Objects/Loading Zone/loading_zone_transporter.tscn" id="3_7kg22"] +[ext_resource type="PackedScene" uid="uid://dl2jpjtbiju34" path="res://Maps/Connectors/chest_interaction_connector.tscn" id="3_ec540"] +[ext_resource type="PackedScene" uid="uid://b7u4hlvuqiefn" path="res://Entities/Map Objects/Chests/Item Chests/item_chest_02 (Metal).tscn" id="4_a58cd"] +[ext_resource type="PackedScene" uid="uid://b60nr4wfvijpf" path="res://Entities/Map Objects/Dialogue/dialogue_trigger.tscn" id="5_msu6a"] [ext_resource type="Texture2D" uid="uid://bm5ewxv51potl" path="res://Assets/Spritesheets/NPCs/Miner_Mike.png" id="6_x3y8m"] -[ext_resource type="Texture2D" uid="uid://bqvnkdyhfa1yq" path="res://Scenes/Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png" id="11_6xfm6"] +[ext_resource type="Texture2D" uid="uid://bqvnkdyhfa1yq" path="res://Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png" id="11_6xfm6"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_7kg22"] size = Vector2(32, 8) diff --git a/Scenes/Maps/Forest Dungeon Entrance/path_to_dungeon_01.tscn b/Maps/Forest Dungeon Entrance/path_to_dungeon_01.tscn similarity index 96% rename from Scenes/Maps/Forest Dungeon Entrance/path_to_dungeon_01.tscn rename to Maps/Forest Dungeon Entrance/path_to_dungeon_01.tscn index 02c515d..9fee71a 100644 --- a/Scenes/Maps/Forest Dungeon Entrance/path_to_dungeon_01.tscn +++ b/Maps/Forest Dungeon Entrance/path_to_dungeon_01.tscn @@ -1,31 +1,31 @@ [gd_scene format=4 uid="uid://b07m0k40dh042"] -[ext_resource type="PackedScene" uid="uid://dl2jpjtbiju34" path="res://Scenes/Maps/Connectors/chest_interaction_connector.tscn" id="1_jtncl"] +[ext_resource type="PackedScene" uid="uid://dl2jpjtbiju34" path="res://Maps/Connectors/chest_interaction_connector.tscn" id="1_jtncl"] [ext_resource type="TileSet" uid="uid://cds2lapr3niap" path="res://Resources/Tilesets/forest_exterior.tres" id="1_qup1q"] -[ext_resource type="PackedScene" uid="uid://b8m08wroe1qu2" path="res://Scenes/Objects/Mechanisms/arrow_target.tscn" id="2_8tx2j"] -[ext_resource type="PackedScene" uid="uid://303hbhqetdhy" path="res://Scenes/Maps/Connectors/arrow_spawner.tscn" id="2_jtncl"] -[ext_resource type="PackedScene" uid="uid://divmfeqf10ri1" path="res://Scenes/Maps/Connectors/bench_interaction_connector.tscn" id="3_x6da4"] -[ext_resource type="Script" uid="uid://kfupww4frb1r" path="res://Scripts/Maps/Connectors/camera_limit_connector.gd" id="3_ycf72"] -[ext_resource type="PackedScene" uid="uid://6athlweutl2g" path="res://Scenes/Characters/Player/player.tscn" id="4_4igim"] -[ext_resource type="PackedScene" uid="uid://b03s7fw8bxdxs" path="res://Scenes/Maps/Connectors/interactive_loading_zone_connector.tscn" id="4_4lnhp"] -[ext_resource type="PackedScene" uid="uid://byp273amg5ji8" path="res://Scenes/Objects/Chests/Item Chests/item_chest_01 (Wooden).tscn" id="5_bnsbe"] +[ext_resource type="PackedScene" uid="uid://b8m08wroe1qu2" path="res://Entities/Map Objects/Mechanisms/arrow_target.tscn" id="2_8tx2j"] +[ext_resource type="PackedScene" uid="uid://303hbhqetdhy" path="res://Maps/Connectors/arrow_spawner.tscn" id="2_jtncl"] +[ext_resource type="PackedScene" uid="uid://divmfeqf10ri1" path="res://Maps/Connectors/bench_interaction_connector.tscn" id="3_x6da4"] +[ext_resource type="Script" uid="uid://kfupww4frb1r" path="res://Maps/Connectors/Scripts/camera_limit_connector.gd" id="3_ycf72"] +[ext_resource type="PackedScene" uid="uid://6athlweutl2g" path="res://Entities/Characters/Player/player.tscn" id="4_4igim"] +[ext_resource type="PackedScene" uid="uid://b03s7fw8bxdxs" path="res://Maps/Connectors/interactive_loading_zone_connector.tscn" id="4_4lnhp"] +[ext_resource type="PackedScene" uid="uid://byp273amg5ji8" path="res://Entities/Map Objects/Chests/Item Chests/item_chest_01 (Wooden).tscn" id="5_bnsbe"] [ext_resource type="Texture2D" uid="uid://bf6llktwqhs8l" path="res://Assets/Sprites/Door Fade.png" id="5_jett5"] -[ext_resource type="PackedScene" uid="uid://did853bh5xeic" path="res://Scenes/Maps/Connectors/spawn_marker_connector.tscn" id="5_lphfo"] -[ext_resource type="PackedScene" uid="uid://be6xfndyj4ckx" path="res://Scenes/Objects/Trees/tree_02.tscn" id="7_ycf72"] -[ext_resource type="PackedScene" uid="uid://cc3qat6un2323" path="res://Scenes/Objects/Trees/tree_01.tscn" id="8_yab5j"] -[ext_resource type="PackedScene" uid="uid://bcx1d8kvp7o0h" path="res://Scenes/Objects/Trees/tree_03.tscn" id="9_lwurn"] -[ext_resource type="PackedScene" uid="uid://da4qqruhldc6b" path="res://Scenes/Objects/Gates/Spike Gate/spike_gate.tscn" id="11_bscbg"] -[ext_resource type="PackedScene" uid="uid://bjufxlsrlcuas" path="res://Scenes/Objects/Buildings/home_01.tscn" id="11_pbyx1"] -[ext_resource type="PackedScene" uid="uid://clqfyxjtn67m" path="res://Scenes/Characters/Chicken/npc_chicken.tscn" id="13_gtagr"] -[ext_resource type="PackedScene" uid="uid://b5t4h63xhuods" path="res://Scenes/Objects/Mechanisms/pressure_plate.tscn" id="13_j80dg"] -[ext_resource type="PackedScene" uid="uid://23tpba4r6ucg" path="res://Scenes/Objects/Decorative/Outdoor/wooden_bench.tscn" id="14_kgsic"] -[ext_resource type="PackedScene" uid="uid://dwbg6wca6yl5j" path="res://Scenes/Objects/Decorative/Signs/wooden_sign_01.tscn" id="16_dc5v0"] -[ext_resource type="PackedScene" uid="uid://c2p8fteeqyikf" path="res://Scenes/Characters/Frog/npc_frog.tscn" id="18_tfw55"] -[ext_resource type="PackedScene" uid="uid://bbules4o3xayc" path="res://Scenes/Objects/Loading Zone/loading_zone_transporter.tscn" id="19_c5vrl"] -[ext_resource type="PackedScene" uid="uid://coaf2ndwb6h61" path="res://Scenes/Objects/Decorative/Signs/wooden_sign_02.tscn" id="19_jtncl"] -[ext_resource type="PackedScene" uid="uid://cla2d3gii8qda" path="res://Scenes/Objects/Loading Zone/interactive_loading_zone.tscn" id="20_c5vrl"] -[ext_resource type="PackedScene" uid="uid://b60nr4wfvijpf" path="res://Scenes/Objects/Dialogue/dialogue_trigger.tscn" id="20_x6da4"] -[ext_resource type="PackedScene" uid="uid://c7rjjlamkqhnw" path="res://Scenes/Debug/under_construction_block.tscn" id="26_4lnhp"] +[ext_resource type="PackedScene" uid="uid://did853bh5xeic" path="res://Maps/Connectors/spawn_marker_connector.tscn" id="5_lphfo"] +[ext_resource type="PackedScene" uid="uid://be6xfndyj4ckx" path="res://Entities/Map Objects/Trees/tree_02.tscn" id="7_ycf72"] +[ext_resource type="PackedScene" uid="uid://cc3qat6un2323" path="res://Entities/Map Objects/Trees/tree_01.tscn" id="8_yab5j"] +[ext_resource type="PackedScene" uid="uid://bcx1d8kvp7o0h" path="res://Entities/Map Objects/Trees/tree_03.tscn" id="9_lwurn"] +[ext_resource type="PackedScene" uid="uid://da4qqruhldc6b" path="res://Entities/Map Objects/Gates/Spike Gate/spike_gate.tscn" id="11_bscbg"] +[ext_resource type="PackedScene" uid="uid://bjufxlsrlcuas" path="res://Entities/Buildings/home_01.tscn" id="11_pbyx1"] +[ext_resource type="PackedScene" uid="uid://clqfyxjtn67m" path="res://Entities/Characters/Animals/Chicken/npc_chicken.tscn" id="13_gtagr"] +[ext_resource type="PackedScene" uid="uid://b5t4h63xhuods" path="res://Entities/Map Objects/Mechanisms/pressure_plate.tscn" id="13_j80dg"] +[ext_resource type="PackedScene" uid="uid://23tpba4r6ucg" path="res://Entities/Map Objects/Decorative/Outdoor/wooden_bench.tscn" id="14_kgsic"] +[ext_resource type="PackedScene" uid="uid://dwbg6wca6yl5j" path="res://Entities/Map Objects/Decorative/Signs/wooden_sign_01.tscn" id="16_dc5v0"] +[ext_resource type="PackedScene" uid="uid://c2p8fteeqyikf" path="res://Entities/Characters/Animals/Frog/npc_frog.tscn" id="18_tfw55"] +[ext_resource type="PackedScene" uid="uid://bbules4o3xayc" path="res://Entities/Map Objects/Loading Zone/loading_zone_transporter.tscn" id="19_c5vrl"] +[ext_resource type="PackedScene" uid="uid://coaf2ndwb6h61" path="res://Entities/Map Objects/Decorative/Signs/wooden_sign_02.tscn" id="19_jtncl"] +[ext_resource type="PackedScene" uid="uid://cla2d3gii8qda" path="res://Entities/Map Objects/Loading Zone/interactive_loading_zone.tscn" id="20_c5vrl"] +[ext_resource type="PackedScene" uid="uid://b60nr4wfvijpf" path="res://Entities/Map Objects/Dialogue/dialogue_trigger.tscn" id="20_x6da4"] +[ext_resource type="PackedScene" uid="uid://c7rjjlamkqhnw" path="res://Debug/under_construction_block.tscn" id="26_4lnhp"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_lwurn"] size = Vector2(768, 494) diff --git a/Resources/Materials/tree_sway.tres b/Resources/Materials/tree_sway.tres index cd25823..64c1075 100644 --- a/Resources/Materials/tree_sway.tres +++ b/Resources/Materials/tree_sway.tres @@ -1,6 +1,6 @@ [gd_resource type="ShaderMaterial" format=3 uid="uid://1shsptwu7rdt"] -[ext_resource type="Shader" uid="uid://me4246fesuy5" path="res://Resources/Shaders/Objects/Trees/tree_01_code.gdshader" id="1_bv5u3"] +[ext_resource type="Shader" uid="uid://me4246fesuy5" path="res://Resources/Shaders/Objects/Trees/tree.gdshader" id="1_bv5u3"] [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_pv2vp"] diff --git a/Resources/Shaders/Objects/Trees/tree_01_code.gdshader b/Resources/Shaders/Objects/Trees/tree.gdshader similarity index 100% rename from Resources/Shaders/Objects/Trees/tree_01_code.gdshader rename to Resources/Shaders/Objects/Trees/tree.gdshader diff --git a/Resources/Shaders/Objects/Trees/tree_01_code.gdshader.uid b/Resources/Shaders/Objects/Trees/tree.gdshader.uid similarity index 100% rename from Resources/Shaders/Objects/Trees/tree_01_code.gdshader.uid rename to Resources/Shaders/Objects/Trees/tree.gdshader.uid diff --git a/Scenes/Maps/base_map.tscn b/Scenes/Maps/base_map.tscn deleted file mode 100644 index 7f00c5a..0000000 --- a/Scenes/Maps/base_map.tscn +++ /dev/null @@ -1,8 +0,0 @@ -[gd_scene format=3 uid="uid://cb7es4u3xy5hw"] - -[ext_resource type="Script" uid="uid://da5dg36wink7x" path="res://Scripts/Maps/base_map.gd" id="1_71ugn"] - -[node name="BaseMap" type="Node2D" unique_id=94057185] -script = ExtResource("1_71ugn") - -[node name="Connectors" type="Node" parent="." unique_id=226687733] diff --git a/Scenes/Objects/Trees/tree_01.tscn b/Scenes/Objects/Trees/tree_01.tscn deleted file mode 100644 index b04be89..0000000 --- a/Scenes/Objects/Trees/tree_01.tscn +++ /dev/null @@ -1,36 +0,0 @@ -[gd_scene format=3 uid="uid://cc3qat6un2323"] - -[ext_resource type="Texture2D" uid="uid://xygpf7c886pj" path="res://Assets/Spritesheets/Trees/Medium_Oak_Tree.png" id="1_i2ia5"] -[ext_resource type="PackedScene" uid="uid://d24gcv3umq60k" path="res://Scenes/Objects/Occlusion/occlusion_culler.tscn" id="1_jbed0"] -[ext_resource type="Material" uid="uid://1shsptwu7rdt" path="res://Resources/Materials/tree_sway.tres" id="2_o0u4i"] - -[sub_resource type="CircleShape2D" id="CircleShape2D_jbed0"] -radius = 12.0 - -[sub_resource type="AtlasTexture" id="AtlasTexture_5otsd"] -atlas = ExtResource("1_i2ia5") -region = Rect2(32, 0, 32, 48) - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_0srx6"] -size = Vector2(6, 3) - -[node name="Tree 01" type="StaticBody2D" unique_id=2046930104] -y_sort_enabled = true - -[node name="Occlusion Culler" parent="." unique_id=1362480066 node_paths=PackedStringArray("nodes_to_occlude") instance=ExtResource("1_jbed0")] -nodes_to_occlude = [NodePath("../Sprite2D")] - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Occlusion Culler" unique_id=731605527] -position = Vector2(0, -10) -shape = SubResource("CircleShape2D_jbed0") - -[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1420512565] -y_sort_enabled = true -material = ExtResource("2_o0u4i") -position = Vector2(0, 8) -texture = SubResource("AtlasTexture_5otsd") -offset = Vector2(0, -8) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=870152657] -position = Vector2(0, 6.5) -shape = SubResource("RectangleShape2D_0srx6") diff --git a/Scripts/Maps/base_map.gd b/Scripts/Maps/base_map.gd deleted file mode 100644 index ab001fd..0000000 --- a/Scripts/Maps/base_map.gd +++ /dev/null @@ -1,2 +0,0 @@ -extends Node2D -class_name BaseMap diff --git a/Scripts/Maps/base_map.gd.uid b/Scripts/Maps/base_map.gd.uid deleted file mode 100644 index 6622dee..0000000 --- a/Scripts/Maps/base_map.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://da5dg36wink7x diff --git a/Scripts/Objects/Loading Zone/collision_loading_zone.gd.uid b/Scripts/Objects/Loading Zone/collision_loading_zone.gd.uid deleted file mode 100644 index d85a1c0..0000000 --- a/Scripts/Objects/Loading Zone/collision_loading_zone.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://g0r5waf50gp5 diff --git a/Scripts/Objects/Loading Zone/interactive_loading_zone.gd.uid b/Scripts/Objects/Loading Zone/interactive_loading_zone.gd.uid deleted file mode 100644 index 1a8f318..0000000 --- a/Scripts/Objects/Loading Zone/interactive_loading_zone.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://dla7fe0nsbdvv diff --git a/Scripts/Objects/Loading Zone/loading_zone_transporter.gd.uid b/Scripts/Objects/Loading Zone/loading_zone_transporter.gd.uid deleted file mode 100644 index aa6292a..0000000 --- a/Scripts/Objects/Loading Zone/loading_zone_transporter.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://cshtpe5n2iubh diff --git a/Scripts/Objects/Occlusion/occlusion_culler.gd.uid b/Scripts/Objects/Occlusion/occlusion_culler.gd.uid deleted file mode 100644 index 0cae7f1..0000000 --- a/Scripts/Objects/Occlusion/occlusion_culler.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://d4g6s63d0bh4o diff --git a/Scripts/UI/dialogue_box.gd b/UI/Scripts/dialogue_box.gd similarity index 100% rename from Scripts/UI/dialogue_box.gd rename to UI/Scripts/dialogue_box.gd diff --git a/Scripts/UI/dialogue_box.gd.uid b/UI/Scripts/dialogue_box.gd.uid similarity index 100% rename from Scripts/UI/dialogue_box.gd.uid rename to UI/Scripts/dialogue_box.gd.uid diff --git a/Scenes/UI/dialogue_box.tscn b/UI/dialogue_box.tscn similarity index 96% rename from Scenes/UI/dialogue_box.tscn rename to UI/dialogue_box.tscn index e43d66a..50af8e7 100644 --- a/Scenes/UI/dialogue_box.tscn +++ b/UI/dialogue_box.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://cxc4x4yp7l3hg"] -[ext_resource type="Script" uid="uid://d0mlugcfvyksn" path="res://Scripts/UI/dialogue_box.gd" id="1_tpmx7"] +[ext_resource type="Script" uid="uid://d0mlugcfvyksn" path="res://UI/Scripts/dialogue_box.gd" id="1_tpmx7"] [node name="Dialogue Box" type="Control" unique_id=586562815] layout_mode = 3 diff --git a/project.godot b/project.godot index 9fcbd78..9b4c1a9 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="Archipelago Game" -config/version="beta-1.2" +config/version="beta-1.3" run/main_scene="uid://dqgxg3i307lvr" config/features=PackedStringArray("4.6", "Forward Plus") config/icon="res://icon.svg" @@ -28,6 +28,20 @@ InputManager="*uid://dnbg1dpjcq6vk" project/assembly_name="Archipelago Game" +[file_customization] + +folder_colors={ +"res://Assets/": "orange", +"res://Debug/": "gray", +"res://Entities/": "purple", +"res://Global Managers/": "red", +"res://Main/": "gray", +"res://Maps/": "green", +"res://Resources/": "orange", +"res://Scripts/": "red", +"res://UI/": "yellow" +} + [global_group] "Player Group"=""