diff --git a/godot/maps/default_map/map0.tscn b/godot/maps/default_map/map0.tscn index 0dbc175..fb01d27 100644 --- a/godot/maps/default_map/map0.tscn +++ b/godot/maps/default_map/map0.tscn @@ -1,8 +1,8 @@ [gd_scene format=3 uid="uid://7iooamjot1tg"] -[ext_resource type="PackedScene" uid="uid://dov2eh5u4ypnx" path="res://scenes/misc/health_pickup.tscn" id="2_yffox"] +[ext_resource type="PackedScene" uid="uid://dov2eh5u4ypnx" path="res://scenes/map/health_pickup.tscn" id="2_yffox"] [ext_resource type="Script" uid="uid://cijpblptlwvs" path="res://maps/scripts/test.gd" id="3_e0nj3"] -[ext_resource type="PackedScene" uid="uid://c1r8nk58cci3a" path="res://scenes/misc/goal.tscn" id="4_w7til"] +[ext_resource type="PackedScene" uid="uid://c1r8nk58cci3a" path="res://scenes/map/goal.tscn" id="4_w7til"] [sub_resource type="ImageTexture" id="ImageTexture_3vyb7"] diff --git a/godot/maps/diner/diner_static.scn.depren b/godot/maps/diner/diner_static.scn.depren new file mode 100644 index 0000000..2c39d56 Binary files /dev/null and b/godot/maps/diner/diner_static.scn.depren differ diff --git a/godot/maps/entities/info_goal.tres b/godot/maps/entities/info_goal.tres index 933da78..083ba78 100644 --- a/godot/maps/entities/info_goal.tres +++ b/godot/maps/entities/info_goal.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="FuncGodotFGDModelPointClass" format=3 uid="uid://bm5nw7wckpjqp"] [ext_resource type="Script" uid="uid://d1nwwgcrner8b" path="res://addons/func_godot/src/fgd/func_godot_fgd_point_class_display_descriptor.gd" id="1_lf0mh"] -[ext_resource type="PackedScene" uid="uid://c1r8nk58cci3a" path="res://scenes/misc/goal.tscn" id="2_mvbym"] +[ext_resource type="PackedScene" uid="uid://c1r8nk58cci3a" path="res://scenes/map/goal.tscn" id="2_mvbym"] [ext_resource type="Script" uid="uid://ldfqjtq0br35" path="res://addons/func_godot/src/fgd/func_godot_fgd_model_point_class.gd" id="3_0ofrk"] [resource] diff --git a/godot/maps/entities/item_health.tres b/godot/maps/entities/item_health.tres index 6370e24..86af36c 100644 --- a/godot/maps/entities/item_health.tres +++ b/godot/maps/entities/item_health.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="FuncGodotFGDModelPointClass" format=3 uid="uid://dps4b2wkpjfgo"] [ext_resource type="Script" uid="uid://d1nwwgcrner8b" path="res://addons/func_godot/src/fgd/func_godot_fgd_point_class_display_descriptor.gd" id="1_0csf6"] -[ext_resource type="PackedScene" uid="uid://dov2eh5u4ypnx" path="res://scenes/misc/health_pickup.tscn" id="2_st24o"] +[ext_resource type="PackedScene" uid="uid://dov2eh5u4ypnx" path="res://scenes/map/health_pickup.tscn" id="2_st24o"] [ext_resource type="Script" uid="uid://ldfqjtq0br35" path="res://addons/func_godot/src/fgd/func_godot_fgd_model_point_class.gd" id="3_1yge4"] [resource] diff --git a/godot/maps/forgotten_desert/forgotten_desert_static.scn.depren b/godot/maps/forgotten_desert/forgotten_desert_static.scn.depren new file mode 100644 index 0000000..4042d06 Binary files /dev/null and b/godot/maps/forgotten_desert/forgotten_desert_static.scn.depren differ diff --git a/godot/maps/grand_forge/grand_forge_static.scn.depren b/godot/maps/grand_forge/grand_forge_static.scn.depren new file mode 100644 index 0000000..2cf4053 Binary files /dev/null and b/godot/maps/grand_forge/grand_forge_static.scn.depren differ diff --git a/godot/maps/precipice/precipice_static.scn.depren b/godot/maps/precipice/precipice_static.scn.depren new file mode 100644 index 0000000..046fc21 Binary files /dev/null and b/godot/maps/precipice/precipice_static.scn.depren differ diff --git a/godot/maps/two_towers/two_towers_static.scn.depren b/godot/maps/two_towers/two_towers_static.scn.depren new file mode 100644 index 0000000..ffc774c Binary files /dev/null and b/godot/maps/two_towers/two_towers_static.scn.depren differ diff --git a/godot/maps/vessel/vessel_static.scn.depren b/godot/maps/vessel/vessel_static.scn.depren new file mode 100644 index 0000000..c8632dd Binary files /dev/null and b/godot/maps/vessel/vessel_static.scn.depren differ diff --git a/godot/scenes/misc/announcer.tscn b/godot/scenes/globals/announcer.tscn similarity index 100% rename from godot/scenes/misc/announcer.tscn rename to godot/scenes/globals/announcer.tscn diff --git a/godot/scenes/misc/game_manager.tscn b/godot/scenes/globals/game_manager.tscn similarity index 93% rename from godot/scenes/misc/game_manager.tscn rename to godot/scenes/globals/game_manager.tscn index 092ef1d..7a65ac6 100644 --- a/godot/scenes/misc/game_manager.tscn +++ b/godot/scenes/globals/game_manager.tscn @@ -9,11 +9,11 @@ [ext_resource type="PackedScene" uid="uid://kfxc0migw80o" path="res://scenes/player/remote_player.tscn" id="5_nxoss"] [ext_resource type="MapResource" uid="uid://bsjoandgu476y" path="res://maps/two_towers.tres" id="5_rotn8"] [ext_resource type="PackedScene" uid="uid://hmh2lrrlo2wy" path="res://scenes/player/replay_player.tscn" id="6_5fjlq"] -[ext_resource type="PackedScene" uid="uid://dfnbc8sbufa4j" path="res://scenes/misc/ball.tscn" id="7_cv0ql"] +[ext_resource type="PackedScene" uid="uid://dfnbc8sbufa4j" path="res://scenes/map/ball.tscn" id="7_cv0ql"] [ext_resource type="MapResource" uid="uid://c1jeep2rxx8ko" path="res://maps/vessel.tres" id="8_cv0ql"] -[ext_resource type="PackedScene" uid="uid://dc17w5n6y1an" path="res://scenes/misc/replay_ball.tscn" id="8_m1inn"] +[ext_resource type="PackedScene" uid="uid://dc17w5n6y1an" path="res://scenes/map/replay_ball.tscn" id="8_m1inn"] [ext_resource type="MapResource" uid="uid://thctv276gw8d" path="res://maps/grand_forge.tres" id="9_m1inn"] -[ext_resource type="PackedScene" uid="uid://cuh8bvyx7yy8e" path="res://scenes/misc/teleport_grenade.tscn" id="9_nxoss"] +[ext_resource type="PackedScene" uid="uid://cuh8bvyx7yy8e" path="res://scenes/map/teleport_grenade.tscn" id="9_nxoss"] [ext_resource type="MapResource" uid="uid://cx24es6d4pm7f" path="res://maps/forgotten_desert.tres" id="10_aonfx"] [ext_resource type="MapResource" uid="uid://cirr262b2yb8e" path="res://maps/precipice.tres" id="13_5fjlq"] diff --git a/godot/scenes/misc/game_settings.tscn b/godot/scenes/globals/game_settings.tscn similarity index 100% rename from godot/scenes/misc/game_settings.tscn rename to godot/scenes/globals/game_settings.tscn diff --git a/godot/scenes/misc/music_manager_global.tscn b/godot/scenes/globals/music_manager_global.tscn similarity index 100% rename from godot/scenes/misc/music_manager_global.tscn rename to godot/scenes/globals/music_manager_global.tscn diff --git a/godot/scenes/globals/network_manager.tscn b/godot/scenes/globals/network_manager.tscn new file mode 100644 index 0000000..e9dc72a --- /dev/null +++ b/godot/scenes/globals/network_manager.tscn @@ -0,0 +1,3 @@ +[gd_scene format=3 uid="uid://cxuy526twid8s"] + +[node name="network_manager" type="NetworkManager" unique_id=1177599919] diff --git a/godot/scenes/misc/standalone_replay_global.tscn b/godot/scenes/globals/standalone_replay_global.tscn similarity index 100% rename from godot/scenes/misc/standalone_replay_global.tscn rename to godot/scenes/globals/standalone_replay_global.tscn diff --git a/godot/scenes/misc/arrow.tscn b/godot/scenes/map/arrow.tscn similarity index 100% rename from godot/scenes/misc/arrow.tscn rename to godot/scenes/map/arrow.tscn diff --git a/godot/scenes/misc/ball.tscn b/godot/scenes/map/ball.tscn similarity index 98% rename from godot/scenes/misc/ball.tscn rename to godot/scenes/map/ball.tscn index f78d610..15705e8 100644 --- a/godot/scenes/misc/ball.tscn +++ b/godot/scenes/map/ball.tscn @@ -11,7 +11,7 @@ [ext_resource type="AudioStream" uid="uid://ca2x04htf0mpi" path="res://raw_assets/sfx/ball/7.ogg" id="8_xuvta"] [ext_resource type="AudioStream" uid="uid://ba5rkh12mwy7o" path="res://raw_assets/sfx/ball/8.ogg" id="9_yu13l"] [ext_resource type="AudioStream" uid="uid://0vmjtq6uxsqe" path="res://raw_assets/sfx/ball/9.ogg" id="10_p4exv"] -[ext_resource type="PackedScene" uid="uid://bnha3gon4700q" path="res://scenes/misc/arrow.tscn" id="12_of30w"] +[ext_resource type="PackedScene" uid="uid://bnha3gon4700q" path="res://scenes/map/arrow.tscn" id="12_of30w"] [sub_resource type="SphereShape3D" id="SphereShape3D_1cgct"] diff --git a/godot/scenes/misc/goal.tscn b/godot/scenes/map/goal.tscn similarity index 100% rename from godot/scenes/misc/goal.tscn rename to godot/scenes/map/goal.tscn diff --git a/godot/scenes/misc/health_pickup.tscn b/godot/scenes/map/health_pickup.tscn similarity index 100% rename from godot/scenes/misc/health_pickup.tscn rename to godot/scenes/map/health_pickup.tscn diff --git a/godot/scenes/misc/replay_ball.tscn b/godot/scenes/map/replay_ball.tscn similarity index 100% rename from godot/scenes/misc/replay_ball.tscn rename to godot/scenes/map/replay_ball.tscn diff --git a/godot/scenes/misc/replay_teleport_grenade.tscn b/godot/scenes/map/replay_teleport_grenade.tscn similarity index 100% rename from godot/scenes/misc/replay_teleport_grenade.tscn rename to godot/scenes/map/replay_teleport_grenade.tscn diff --git a/godot/scenes/misc/teleport_grenade.tscn b/godot/scenes/map/teleport_grenade.tscn similarity index 100% rename from godot/scenes/misc/teleport_grenade.tscn rename to godot/scenes/map/teleport_grenade.tscn diff --git a/godot/scenes/misc/network_manager.tscn b/godot/scenes/misc/network_manager.tscn deleted file mode 100644 index a985f4c..0000000 --- a/godot/scenes/misc/network_manager.tscn +++ /dev/null @@ -1,6 +0,0 @@ -[gd_scene format=3 uid="uid://cxuy526twid8s"] - -[ext_resource type="PackedScene" uid="uid://bwd6bj21x310s" path="res://scenes/lobby.tscn" id="1_cemok"] - -[node name="network_manager" type="NetworkManager" unique_id=1177599919] -lobby_scene = ExtResource("1_cemok") diff --git a/godot/scenes/player/remote_player.tscn b/godot/scenes/player/remote_player.tscn index d59e326..c9e2e0b 100644 --- a/godot/scenes/player/remote_player.tscn +++ b/godot/scenes/player/remote_player.tscn @@ -6,7 +6,7 @@ [ext_resource type="AudioStream" uid="uid://cl416orgv11vj" path="res://raw_assets/sfx/ball/little_robot_sound_factory_fantasy_Inventory_Open_00.mp3" id="3_840kl"] [ext_resource type="FontFile" uid="uid://hptdnjg4ec58" path="res://font/static/SpaceGrotesk-Medium.ttf" id="4_7rax4"] [ext_resource type="AudioStream" uid="uid://uq0o8gkpqhfa" path="res://raw_assets/sfx/ball/zapsplat_foley_stick_swing_air_whoosh_very_fast_hard_003_110413.mp3" id="4_qn18y"] -[ext_resource type="PackedScene" uid="uid://bnha3gon4700q" path="res://scenes/misc/arrow.tscn" id="5_qn18y"] +[ext_resource type="PackedScene" uid="uid://bnha3gon4700q" path="res://scenes/map/arrow.tscn" id="5_qn18y"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_1cgct"] diff --git a/godot/scenes/player/replay_player.tscn b/godot/scenes/player/replay_player.tscn index 7a85f33..d1edb08 100644 --- a/godot/scenes/player/replay_player.tscn +++ b/godot/scenes/player/replay_player.tscn @@ -5,7 +5,7 @@ [ext_resource type="FontFile" uid="uid://hptdnjg4ec58" path="res://font/static/SpaceGrotesk-Medium.ttf" id="3_0brji"] [ext_resource type="AudioStream" uid="uid://cl416orgv11vj" path="res://raw_assets/sfx/ball/little_robot_sound_factory_fantasy_Inventory_Open_00.mp3" id="3_o85ek"] [ext_resource type="AudioStream" uid="uid://uq0o8gkpqhfa" path="res://raw_assets/sfx/ball/zapsplat_foley_stick_swing_air_whoosh_very_fast_hard_003_110413.mp3" id="4_fwayu"] -[ext_resource type="PackedScene" uid="uid://bnha3gon4700q" path="res://scenes/misc/arrow.tscn" id="5_fwayu"] +[ext_resource type="PackedScene" uid="uid://bnha3gon4700q" path="res://scenes/map/arrow.tscn" id="5_fwayu"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_1cgct"]