diff --git a/src/projects/Command Post/assets/cp/controllers/CommandPostController.gd b/src/projects/Command Post/scripts/controllers/cp/CommandPostController.gd similarity index 100% rename from src/projects/Command Post/assets/cp/controllers/CommandPostController.gd rename to src/projects/Command Post/scripts/controllers/cp/CommandPostController.gd diff --git a/src/projects/Command Post/assets/cp/controllers/attacker/CommandPostAttackers.gd b/src/projects/Command Post/scripts/controllers/cp/attacker/CommandPostAttackers.gd similarity index 100% rename from src/projects/Command Post/assets/cp/controllers/attacker/CommandPostAttackers.gd rename to src/projects/Command Post/scripts/controllers/cp/attacker/CommandPostAttackers.gd diff --git a/src/projects/Command Post/assets/cp/controllers/attacker/command_post_attackers.tscn b/src/projects/Command Post/scripts/controllers/cp/attacker/command_post_attackers.tscn similarity index 84% rename from src/projects/Command Post/assets/cp/controllers/attacker/command_post_attackers.tscn rename to src/projects/Command Post/scripts/controllers/cp/attacker/command_post_attackers.tscn index c32b859..5e29e10 100644 --- a/src/projects/Command Post/assets/cp/controllers/attacker/command_post_attackers.tscn +++ b/src/projects/Command Post/scripts/controllers/cp/attacker/command_post_attackers.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://viqdvqrnn5c7"] -[ext_resource type="Script" path="res://assets/cp/controllers/attacker/CommandPostAttackers.gd" id="1_71i6h"] +[ext_resource type="Script" path="res://scripts/controllers/cp/attacker/CommandPostAttackers.gd" id="1_71i6h"] [ext_resource type="PackedScene" uid="uid://cc3xcu8ipc6mu" path="res://assets/character/attacker/attacker_character.tscn" id="2_itmdl"] [node name="CommandPostAttackers" type="Node3D"] diff --git a/src/projects/Command Post/assets/cp/controllers/command_post_controller.tscn b/src/projects/Command Post/scripts/controllers/cp/command_post_controller.tscn similarity index 65% rename from src/projects/Command Post/assets/cp/controllers/command_post_controller.tscn rename to src/projects/Command Post/scripts/controllers/cp/command_post_controller.tscn index 960fd4a..effa343 100644 --- a/src/projects/Command Post/assets/cp/controllers/command_post_controller.tscn +++ b/src/projects/Command Post/scripts/controllers/cp/command_post_controller.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://fjmd7edm67ps"] -[ext_resource type="Script" path="res://assets/cp/controllers/CommandPostController.gd" id="1_ljrld"] +[ext_resource type="Script" path="res://scripts/controllers/cp/CommandPostController.gd" id="1_ljrld"] [node name="CommandPostController" type="Node3D"] script = ExtResource("1_ljrld") diff --git a/src/projects/Command Post/assets/cp/controllers/defender/CommandPostDefenders.gd b/src/projects/Command Post/scripts/controllers/cp/defender/CommandPostDefenders.gd similarity index 100% rename from src/projects/Command Post/assets/cp/controllers/defender/CommandPostDefenders.gd rename to src/projects/Command Post/scripts/controllers/cp/defender/CommandPostDefenders.gd diff --git a/src/projects/Command Post/assets/cp/controllers/defender/command_post_defenders.tscn b/src/projects/Command Post/scripts/controllers/cp/defender/command_post_defenders.tscn similarity index 84% rename from src/projects/Command Post/assets/cp/controllers/defender/command_post_defenders.tscn rename to src/projects/Command Post/scripts/controllers/cp/defender/command_post_defenders.tscn index 496a9ce..92a6acf 100644 --- a/src/projects/Command Post/assets/cp/controllers/defender/command_post_defenders.tscn +++ b/src/projects/Command Post/scripts/controllers/cp/defender/command_post_defenders.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://d3wabfyfccfs8"] -[ext_resource type="Script" path="res://assets/cp/controllers/defender/CommandPostDefenders.gd" id="1_t3jlv"] +[ext_resource type="Script" path="res://scripts/controllers/cp/defender/CommandPostDefenders.gd" id="1_t3jlv"] [ext_resource type="PackedScene" uid="uid://bijsg61uyql4t" path="res://assets/character/defender/defender_character.tscn" id="2_7efxs"] [node name="CommandPostDefenders" type="Node3D"] diff --git a/src/projects/Command Post/assets/cp/controllers/neutral/CommandPostNeutral.gd b/src/projects/Command Post/scripts/controllers/cp/neutral/CommandPostNeutral.gd similarity index 100% rename from src/projects/Command Post/assets/cp/controllers/neutral/CommandPostNeutral.gd rename to src/projects/Command Post/scripts/controllers/cp/neutral/CommandPostNeutral.gd diff --git a/src/projects/Command Post/assets/cp/controllers/neutral/command_post_neutral.tscn b/src/projects/Command Post/scripts/controllers/cp/neutral/command_post_neutral.tscn similarity index 79% rename from src/projects/Command Post/assets/cp/controllers/neutral/command_post_neutral.tscn rename to src/projects/Command Post/scripts/controllers/cp/neutral/command_post_neutral.tscn index 3f849bf..9767e7e 100644 --- a/src/projects/Command Post/assets/cp/controllers/neutral/command_post_neutral.tscn +++ b/src/projects/Command Post/scripts/controllers/cp/neutral/command_post_neutral.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://dqx5s14sb162x"] -[ext_resource type="Script" path="res://assets/cp/controllers/neutral/CommandPostNeutral.gd" id="1_tfbyg"] +[ext_resource type="Script" path="res://scripts/controllers/cp/neutral/CommandPostNeutral.gd" id="1_tfbyg"] [node name="CommandPostNeutral" type="Node3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0) diff --git a/src/projects/Command Post/assets/cp/controllers/nonaligned/command_post_non_aligned.gd b/src/projects/Command Post/scripts/controllers/cp/nonaligned/command_post_non_aligned.gd similarity index 100% rename from src/projects/Command Post/assets/cp/controllers/nonaligned/command_post_non_aligned.gd rename to src/projects/Command Post/scripts/controllers/cp/nonaligned/command_post_non_aligned.gd diff --git a/src/projects/Command Post/assets/cp/controllers/nonaligned/command_post_non_aligned.tscn b/src/projects/Command Post/scripts/controllers/cp/nonaligned/command_post_non_aligned.tscn similarity index 83% rename from src/projects/Command Post/assets/cp/controllers/nonaligned/command_post_non_aligned.tscn rename to src/projects/Command Post/scripts/controllers/cp/nonaligned/command_post_non_aligned.tscn index 1ef3e4b..ce39af7 100644 --- a/src/projects/Command Post/assets/cp/controllers/nonaligned/command_post_non_aligned.tscn +++ b/src/projects/Command Post/scripts/controllers/cp/nonaligned/command_post_non_aligned.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://c8sqb7smoc253"] -[ext_resource type="Script" path="res://assets/cp/controllers/nonaligned/command_post_non_aligned.gd" id="1_dqg0t"] +[ext_resource type="Script" path="res://scripts/controllers/cp/nonaligned/command_post_non_aligned.gd" id="1_dqg0t"] [ext_resource type="PackedScene" uid="uid://6ngrwq73dgcn" path="res://assets/character/non_aligned/non_aligned_character.tscn" id="2_txjnm"] [node name="CommandPostNonAligned" type="Node3D"] diff --git a/src/projects/Command Post/scripts/controllers/game/game_manager.gd b/src/projects/Command Post/scripts/controllers/game/GameController.gd similarity index 97% rename from src/projects/Command Post/scripts/controllers/game/game_manager.gd rename to src/projects/Command Post/scripts/controllers/game/GameController.gd index 0b8dbf9..c78575a 100644 --- a/src/projects/Command Post/scripts/controllers/game/game_manager.gd +++ b/src/projects/Command Post/scripts/controllers/game/GameController.gd @@ -1,4 +1,4 @@ -class_name GameManager extends Node3D +class_name GameController extends Node3D @export var attacker_spawn_pool: int = 100 diff --git a/src/projects/Command Post/scripts/controllers/game/assault/GameManagerAssault.gd b/src/projects/Command Post/scripts/controllers/game/assault/GameControllerAssault.gd similarity index 54% rename from src/projects/Command Post/scripts/controllers/game/assault/GameManagerAssault.gd rename to src/projects/Command Post/scripts/controllers/game/assault/GameControllerAssault.gd index fc0c1b8..3987968 100644 --- a/src/projects/Command Post/scripts/controllers/game/assault/GameManagerAssault.gd +++ b/src/projects/Command Post/scripts/controllers/game/assault/GameControllerAssault.gd @@ -1,4 +1,4 @@ -class_name GameManagerAssault extends GameManager +class_name GameControllerAssault extends GameController diff --git a/src/projects/Command Post/scripts/controllers/game/assault/game_manager_assault.tscn b/src/projects/Command Post/scripts/controllers/game/assault/game_controller_assault.tscn similarity index 74% rename from src/projects/Command Post/scripts/controllers/game/assault/game_manager_assault.tscn rename to src/projects/Command Post/scripts/controllers/game/assault/game_controller_assault.tscn index 69ae53a..613e941 100644 --- a/src/projects/Command Post/scripts/controllers/game/assault/game_manager_assault.tscn +++ b/src/projects/Command Post/scripts/controllers/game/assault/game_controller_assault.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=2 format=3 uid="uid://0l5bb77bjxh1"] -[ext_resource type="Script" path="res://scripts/controllers/game/assault/GameManagerAssault.gd" id="1_3de00"] +[ext_resource type="Script" path="res://scripts/controllers/game/assault/GameControllerAssault.gd" id="1_3de00"] -[node name="GameManagerAssault" type="Node3D"] +[node name="GameControllerAssault" type="Node3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0) script = ExtResource("1_3de00") attacker_spawn_pool = 32 diff --git a/src/projects/Command Post/scripts/controllers/game/ctf/GameManagerCTF.gd b/src/projects/Command Post/scripts/controllers/game/ctf/GameControllerCTF.gd similarity index 55% rename from src/projects/Command Post/scripts/controllers/game/ctf/GameManagerCTF.gd rename to src/projects/Command Post/scripts/controllers/game/ctf/GameControllerCTF.gd index 8d38032..9053e24 100644 --- a/src/projects/Command Post/scripts/controllers/game/ctf/GameManagerCTF.gd +++ b/src/projects/Command Post/scripts/controllers/game/ctf/GameControllerCTF.gd @@ -1,4 +1,4 @@ -class_name GameManagerCTF extends GameManager +class_name GameControllerCTF extends GameController diff --git a/src/projects/Command Post/scripts/controllers/game/ctf/game_manager_ctf.tscn b/src/projects/Command Post/scripts/controllers/game/ctf/game_controller_ctf.tscn similarity index 71% rename from src/projects/Command Post/scripts/controllers/game/ctf/game_manager_ctf.tscn rename to src/projects/Command Post/scripts/controllers/game/ctf/game_controller_ctf.tscn index 53857d8..612ae53 100644 --- a/src/projects/Command Post/scripts/controllers/game/ctf/game_manager_ctf.tscn +++ b/src/projects/Command Post/scripts/controllers/game/ctf/game_controller_ctf.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=2 format=3 uid="uid://yc16c57cvxed"] -[ext_resource type="Script" path="res://scripts/controllers/game/ctf/GameManagerCTF.gd" id="1_8hqtg"] +[ext_resource type="Script" path="res://scripts/controllers/game/ctf/GameControllerCTF.gd" id="1_8hqtg"] -[node name="GameManagerCTF" type="Node3D"] +[node name="GameControllerCTF" type="Node3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0) script = ExtResource("1_8hqtg") diff --git a/src/projects/Command Post/scripts/controllers/game/game_manager.tscn b/src/projects/Command Post/scripts/controllers/game/game_controller.tscn similarity index 71% rename from src/projects/Command Post/scripts/controllers/game/game_manager.tscn rename to src/projects/Command Post/scripts/controllers/game/game_controller.tscn index 12bc1d9..510a32a 100644 --- a/src/projects/Command Post/scripts/controllers/game/game_manager.tscn +++ b/src/projects/Command Post/scripts/controllers/game/game_controller.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://fttl5l83hgkx"] -[ext_resource type="Script" path="res://scripts/controllers/game/game_manager.gd" id="1_ok0hn"] +[ext_resource type="Script" path="res://scripts/controllers/game/GameController.gd" id="1_fd8es"] [node name="game_manager" type="Node3D"] -script = ExtResource("1_ok0hn") +script = ExtResource("1_fd8es") diff --git a/src/projects/Command Post/scripts/controllers/game/heros/GameManagerHeros.gd b/src/projects/Command Post/scripts/controllers/game/heros/GameControllerHeros.gd similarity index 55% rename from src/projects/Command Post/scripts/controllers/game/heros/GameManagerHeros.gd rename to src/projects/Command Post/scripts/controllers/game/heros/GameControllerHeros.gd index 00a031d..4a3371f 100644 --- a/src/projects/Command Post/scripts/controllers/game/heros/GameManagerHeros.gd +++ b/src/projects/Command Post/scripts/controllers/game/heros/GameControllerHeros.gd @@ -1,4 +1,4 @@ -class_name GameManagerHeros extends GameManager +class_name GameControllerHeros extends GameController diff --git a/src/projects/Command Post/scripts/controllers/game/heros/game_manager_heros.tscn b/src/projects/Command Post/scripts/controllers/game/heros/game_controller_heros.tscn similarity index 70% rename from src/projects/Command Post/scripts/controllers/game/heros/game_manager_heros.tscn rename to src/projects/Command Post/scripts/controllers/game/heros/game_controller_heros.tscn index 39ca92b..3e68005 100644 --- a/src/projects/Command Post/scripts/controllers/game/heros/game_manager_heros.tscn +++ b/src/projects/Command Post/scripts/controllers/game/heros/game_controller_heros.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=2 format=3 uid="uid://c68qnbgmxxjgy"] -[ext_resource type="Script" path="res://scripts/controllers/game/heros/GameManagerHeros.gd" id="1_hdicy"] +[ext_resource type="Script" path="res://scripts/controllers/game/heros/GameControllerHeros.gd" id="1_hdicy"] -[node name="GameManagerHeros" type="Node3D"] +[node name="GameControllerHeros" type="Node3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0) script = ExtResource("1_hdicy") diff --git a/src/projects/Command Post/world.tscn b/src/projects/Command Post/world.tscn index f7d92ff..5e230b6 100644 --- a/src/projects/Command Post/world.tscn +++ b/src/projects/Command Post/world.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=13 format=3 uid="uid://oi1rlj4a58gr"] -[ext_resource type="PackedScene" uid="uid://0l5bb77bjxh1" path="res://scripts/controllers/game/assault/game_manager_assault.tscn" id="1_170qh"] +[ext_resource type="PackedScene" uid="uid://0l5bb77bjxh1" path="res://scripts/controllers/game/assault/game_controller_assault.tscn" id="1_170qh"] [ext_resource type="PackedScene" uid="uid://ctbug001xo01q" path="res://assets/cp/command_post.tscn" id="1_i3oxs"] -[ext_resource type="PackedScene" uid="uid://dqx5s14sb162x" path="res://assets/cp/controllers/neutral/command_post_neutral.tscn" id="3_460gl"] -[ext_resource type="PackedScene" uid="uid://viqdvqrnn5c7" path="res://assets/cp/controllers/attacker/command_post_attackers.tscn" id="4_v0ljc"] -[ext_resource type="PackedScene" uid="uid://d3wabfyfccfs8" path="res://assets/cp/controllers/defender/command_post_defenders.tscn" id="5_djntp"] -[ext_resource type="PackedScene" uid="uid://c8sqb7smoc253" path="res://assets/cp/controllers/nonaligned/command_post_non_aligned.tscn" id="6_o56jr"] +[ext_resource type="PackedScene" uid="uid://dqx5s14sb162x" path="res://scripts/controllers/cp/neutral/command_post_neutral.tscn" id="3_460gl"] +[ext_resource type="PackedScene" uid="uid://viqdvqrnn5c7" path="res://scripts/controllers/cp/attacker/command_post_attackers.tscn" id="4_v0ljc"] +[ext_resource type="PackedScene" uid="uid://d3wabfyfccfs8" path="res://scripts/controllers/cp/defender/command_post_defenders.tscn" id="5_djntp"] +[ext_resource type="PackedScene" uid="uid://c8sqb7smoc253" path="res://scripts/controllers/cp/nonaligned/command_post_non_aligned.tscn" id="6_o56jr"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_diy8s"] sky_top_color = Color(0.219608, 0.486275, 0.580392, 1) @@ -56,10 +56,8 @@ skeleton = NodePath("../..") transform = Transform3D(0.384326, -0.718956, 0.579134, 0, 0.627313, 0.778767, -0.923197, -0.2993, 0.241093, 11.7269, 15.7692, 4.88189) current = true -[node name="GameManagerAssault" parent="." instance=ExtResource("1_170qh")] -attacker_max_active = 3 -defender_max_active = 3 -non_aligned_max_active = 3 +[node name="GameControllerAssault" parent="." instance=ExtResource("1_170qh")] +metadata/_edit_lock_ = true [node name="CommandPostNeutral" parent="." instance=ExtResource("3_460gl")] metadata/_edit_lock_ = true