Rename '/model/' directories to '/data-model/' ones

lampe-games · Aug 10, 2023 · ce7375d · ce7375d
1 parent 92b3914
commit ce7375d
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 23 deletions.
diff --git a/source/Globals.gd b/source/Globals.gd
@@ -1,6 +1,6 @@
 extends Node
 
-const Options = preload("res://source/model/Options.gd")
+const Options = preload("res://source/data-model/Options.gd")
 
 var options = (
 	load(Constants.OPTIONS_FILE_PATH)

diff --git a/source/model/MatchSettings.gd → source/data-model/MatchSettings.gd b/source/model/MatchSettings.gd → source/data-model/MatchSettings.gd
diff --git a/source/model/Options.gd → source/data-model/Options.gd b/source/model/Options.gd → source/data-model/Options.gd
diff --git a/source/model/PlayerSettings.gd → source/data-model/PlayerSettings.gd b/source/model/PlayerSettings.gd → source/data-model/PlayerSettings.gd
diff --git a/source/main-menu/Play.gd b/source/main-menu/Play.gd
@@ -1,7 +1,7 @@
 extends Control
 
-const MatchSettings = preload("res://source/model/MatchSettings.gd")
-const PlayerSettings = preload("res://source/model/PlayerSettings.gd")
+const MatchSettings = preload("res://source/data-model/MatchSettings.gd")
+const PlayerSettings = preload("res://source/data-model/PlayerSettings.gd")
 const LoadingScene = preload("res://source/main-menu/Loading.tscn")
 
 var _map_paths = []

diff --git a/source/match/Match.gd b/source/match/Match.gd
@@ -1,7 +1,7 @@
 extends Node3D
 
 const Structure = preload("res://source/match/units/Structure.gd")
-const Player = preload("res://source/match/model/Player.gd")
+const Player = preload("res://source/match/data-model/Player.gd")
 
 const HumanController = preload("res://source/match/players/human/Human.tscn")
 const SimpleClairvoyantAIController = preload(

diff --git a/source/match/Match.tscn b/source/match/Match.tscn
@@ -2,8 +2,8 @@
 
 [ext_resource type="Script" path="res://source/match/Match.gd" id="1_1555u"]
 [ext_resource type="Script" path="res://source/match/IsometricCamera3D.gd" id="1_qb2ry"]
-[ext_resource type="Script" path="res://source/model/PlayerSettings.gd" id="2_issh2"]
-[ext_resource type="Script" path="res://source/model/MatchSettings.gd" id="3_k87ed"]
+[ext_resource type="Script" path="res://source/data-model/PlayerSettings.gd" id="2_4dhvm"]
+[ext_resource type="Script" path="res://source/data-model/MatchSettings.gd" id="3_wftgs"]
 [ext_resource type="Script" path="res://source/match/FogOfWar.gd" id="5_eb52t"]
 [ext_resource type="PackedScene" uid="uid://co800e4shs7bh" path="res://source/generic-scenes-and-nodes/3d/RectangularSelection3D.tscn" id="5_yi0pu"]
 [ext_resource type="PackedScene" uid="uid://cbe63rdjw7y4p" path="res://source/match/maps/PlainAndSimple.tscn" id="6_au6gf"]
@@ -33,31 +33,31 @@
 [ext_resource type="PackedScene" uid="uid://q5w474dvts3f" path="res://source/match/handlers/StructurePlacementHandler.tscn" id="26_7heso"]
 
 [sub_resource type="Resource" id="Resource_hfc6q"]
-script = ExtResource("2_issh2")
+script = ExtResource("2_4dhvm")
 color = Color(0.4, 0.694118, 1, 1)
 controller = 1
 spawn_index = -1
 
 [sub_resource type="Resource" id="Resource_6k4u7"]
-script = ExtResource("2_issh2")
+script = ExtResource("2_4dhvm")
 color = Color(1, 0.360784, 0.45098, 1)
 controller = 2
 spawn_index = -1
 
 [sub_resource type="Resource" id="Resource_8ui6d"]
-script = ExtResource("2_issh2")
+script = ExtResource("2_4dhvm")
 color = Color(0.647059, 1, 0.6, 1)
 controller = 2
 spawn_index = -1
 
 [sub_resource type="Resource" id="Resource_qphv2"]
-script = ExtResource("2_issh2")
+script = ExtResource("2_4dhvm")
 color = Color(0.929412, 0.521569, 1, 1)
 controller = 2
 spawn_index = -1
 
 [sub_resource type="Resource" id="Resource_frabv"]
-script = ExtResource("3_k87ed")
+script = ExtResource("3_wftgs")
 players = Array[Resource]([SubResource("Resource_hfc6q"), SubResource("Resource_6k4u7"), SubResource("Resource_8ui6d"), SubResource("Resource_qphv2")])
 visibility = 1
 visible_player = 0

diff --git a/source/match/model/Player.gd → source/match/data-model/Player.gd b/source/match/model/Player.gd → source/match/data-model/Player.gd
diff --git a/tests/manual/TestAllUnits.tscn b/tests/manual/TestAllUnits.tscn
@@ -4,11 +4,11 @@
 [ext_resource type="Script" path="res://tests/manual/Match.gd" id="2_ghr3h"]
 [ext_resource type="PackedScene" uid="uid://ct0ejt0trkhrf" path="res://source/match/units/CommandCenter.tscn" id="2_rm00b"]
 [ext_resource type="PackedScene" uid="uid://e7tko4kpeiau" path="res://source/match/units/Helicopter.tscn" id="3_0s0q8"]
-[ext_resource type="Script" path="res://source/model/PlayerSettings.gd" id="3_ml8xc"]
+[ext_resource type="Script" path="res://source/data-model/PlayerSettings.gd" id="3_dh4qg"]
 [ext_resource type="PackedScene" uid="uid://cxilu6668nda6" path="res://source/match/units/AircraftFactory.tscn" id="3_rq1vh"]
 [ext_resource type="PackedScene" uid="uid://0gow0ughqu8u" path="res://source/match/units/Drone.tscn" id="4_3o35x"]
+[ext_resource type="Script" path="res://source/data-model/MatchSettings.gd" id="4_bf0h3"]
 [ext_resource type="PackedScene" uid="uid://h5lqor1xl2sf" path="res://source/match/units/VehicleFactory.tscn" id="4_m1xri"]
-[ext_resource type="Script" path="res://source/model/MatchSettings.gd" id="4_qiwvm"]
 [ext_resource type="Shader" path="res://source/shaders/3d/simple_fog_of_war.gdshader" id="5_f2ny6"]
 [ext_resource type="PackedScene" uid="uid://b8pckq1xn44ss" path="res://source/match/units/AntiGroundTurret.tscn" id="5_g67iu"]
 [ext_resource type="Material" uid="uid://co8vfcoqqs5i8" path="res://source/match/resources/materials/terrain.material.tres" id="5_ki5yw"]
@@ -18,13 +18,13 @@
 [ext_resource type="Shader" path="res://source/shaders/2d/white_transparent.gdshader" id="16_mqpbu"]
 
 [sub_resource type="Resource" id="Resource_e1xtl"]
-script = ExtResource("3_ml8xc")
+script = ExtResource("3_dh4qg")
 color = Color(0.4, 0.694118, 1, 1)
 controller = 1
 spawn_index = -1
 
 [sub_resource type="Resource" id="Resource_rpdec"]
-script = ExtResource("4_qiwvm")
+script = ExtResource("4_bf0h3")
 players = Array[Resource]([SubResource("Resource_e1xtl")])
 visibility = 1
 visible_player = 0

diff --git a/tests/manual/TestNonQuadraticMap.tscn b/tests/manual/TestNonQuadraticMap.tscn
@@ -2,9 +2,9 @@
 
 [ext_resource type="PackedScene" uid="uid://camns8fqod8d4" path="res://source/match/Match.tscn" id="1_e8lxh"]
 [ext_resource type="Script" path="res://tests/manual/Match.gd" id="2_2ib5j"]
-[ext_resource type="Script" path="res://source/model/MatchSettings.gd" id="3_52248"]
+[ext_resource type="Script" path="res://source/data-model/MatchSettings.gd" id="3_52248"]
 [ext_resource type="PackedScene" uid="uid://d8wcem3ievht" path="res://tests/manual/maps/NonQuadratic.tscn" id="3_dldkj"]
-[ext_resource type="Script" path="res://source/model/PlayerSettings.gd" id="3_eliam"]
+[ext_resource type="Script" path="res://source/data-model/PlayerSettings.gd" id="3_eliam"]
 [ext_resource type="Material" uid="uid://co8vfcoqqs5i8" path="res://source/match/resources/materials/terrain.material.tres" id="4_d4g7r"]
 [ext_resource type="Shader" path="res://source/shaders/3d/simple_fog_of_war.gdshader" id="5_arsbx"]
 [ext_resource type="Shader" path="res://source/shaders/2d/white_transparent.gdshader" id="6_2nbfa"]

diff --git a/tests/manual/TestOneUnit.tscn b/tests/manual/TestOneUnit.tscn
@@ -2,8 +2,8 @@
 
 [ext_resource type="PackedScene" uid="uid://camns8fqod8d4" path="res://source/match/Match.tscn" id="1_fe2sx"]
 [ext_resource type="Script" path="res://tests/manual/Match.gd" id="2_sflin"]
-[ext_resource type="Script" path="res://source/model/PlayerSettings.gd" id="3_3drrn"]
-[ext_resource type="Script" path="res://source/model/MatchSettings.gd" id="4_go41p"]
+[ext_resource type="Script" path="res://source/data-model/PlayerSettings.gd" id="3_3drrn"]
+[ext_resource type="Script" path="res://source/data-model/MatchSettings.gd" id="4_go41p"]
 [ext_resource type="Material" uid="uid://co8vfcoqqs5i8" path="res://source/match/resources/materials/terrain.material.tres" id="5_x8bni"]
 [ext_resource type="Shader" path="res://source/shaders/2d/white_transparent.gdshader" id="8_fifyq"]
 [ext_resource type="PackedScene" uid="uid://i58ffvwxbbwm" path="res://source/match/units/Tank.tscn" id="10_tqe5i"]

diff --git a/tests/manual/TestPlayerVsAI.tscn b/tests/manual/TestPlayerVsAI.tscn
@@ -2,10 +2,10 @@
 
 [ext_resource type="PackedScene" uid="uid://camns8fqod8d4" path="res://source/match/Match.tscn" id="1_cpaaw"]
 [ext_resource type="Script" path="res://tests/manual/Match.gd" id="2_mi5ae"]
-[ext_resource type="Script" path="res://source/model/PlayerSettings.gd" id="3_8b007"]
+[ext_resource type="Script" path="res://source/data-model/PlayerSettings.gd" id="3_8b007"]
 [ext_resource type="PackedScene" uid="uid://ct0ejt0trkhrf" path="res://source/match/units/CommandCenter.tscn" id="3_oqrnv"]
 [ext_resource type="PackedScene" uid="uid://cxilu6668nda6" path="res://source/match/units/AircraftFactory.tscn" id="4_a0u57"]
-[ext_resource type="Script" path="res://source/model/MatchSettings.gd" id="4_kwjav"]
+[ext_resource type="Script" path="res://source/data-model/MatchSettings.gd" id="4_kwjav"]
 [ext_resource type="Material" uid="uid://co8vfcoqqs5i8" path="res://source/match/resources/materials/terrain.material.tres" id="5_al0mb"]
 [ext_resource type="PackedScene" uid="uid://h5lqor1xl2sf" path="res://source/match/units/VehicleFactory.tscn" id="5_imqfl"]
 [ext_resource type="PackedScene" uid="uid://b8pckq1xn44ss" path="res://source/match/units/AntiGroundTurret.tscn" id="6_i5onm"]

diff --git a/tests/manual/TestUnitsFightingEachOther.tscn b/tests/manual/TestUnitsFightingEachOther.tscn
@@ -4,10 +4,10 @@
 [ext_resource type="Script" path="res://tests/manual/Match.gd" id="2_iedaw"]
 [ext_resource type="Shader" path="res://source/shaders/3d/simple_fog_of_war.gdshader" id="2_ojmlq"]
 [ext_resource type="PackedScene" uid="uid://cfa8cpnpk5pcb" path="res://source/match/units/AntiAirTurret.tscn" id="2_xec1u"]
-[ext_resource type="Script" path="res://source/model/PlayerSettings.gd" id="3_mmh0x"]
+[ext_resource type="Script" path="res://source/data-model/PlayerSettings.gd" id="3_mmh0x"]
 [ext_resource type="PackedScene" uid="uid://e7tko4kpeiau" path="res://source/match/units/Helicopter.tscn" id="3_vdlcv"]
 [ext_resource type="PackedScene" uid="uid://0gow0ughqu8u" path="res://source/match/units/Drone.tscn" id="4_g2xty"]
-[ext_resource type="Script" path="res://source/model/MatchSettings.gd" id="4_xj1co"]
+[ext_resource type="Script" path="res://source/data-model/MatchSettings.gd" id="4_xj1co"]
 [ext_resource type="Material" uid="uid://co8vfcoqqs5i8" path="res://source/match/resources/materials/terrain.material.tres" id="5_djfah"]
 
 [sub_resource type="Resource" id="Resource_ipatj"]