From f88160d76e6318497c224a45536cc5bb5a910f73 Mon Sep 17 00:00:00 2001 From: laurids Date: Sat, 27 Nov 2021 16:09:49 +0100 Subject: [PATCH] Refactor Factory Type, Factory Levels --- Assets/GWConquest/Prefabs/District.prefab | 1 - Assets/GWConquest/Prefabs/Factory.prefab | 2 - Assets/GWConquest/Prefabs/Planet.prefab | 1 - Assets/GWConquest/Scenes/GalaxyMap.unity | 412 ++++++++---------- Assets/GWConquest/Scripts/District.cs | 94 +--- Assets/GWConquest/Scripts/DistrictFactory.cs | 20 +- Assets/GWConquest/Scripts/DistrictRegistry.cs | 44 ++ .../Scripts/DistrictRegistry.cs.meta | 11 + Assets/GWConquest/Scripts/Planet.cs | 35 +- Assets/GWConquest/Scripts/PlanetPlacement.cs | 17 +- Assets/GWConquest/Scripts/PlanetRegistry.cs | 74 ++-- .../Scripts/UI/PlanetIndicatorUI.cs | 17 +- Assets/GWConquest/Scripts/UnitClass.cs | 10 +- .../Textures/Icons/DistrictCivil.PNG | Bin 40658 -> 11253 bytes .../Textures/Icons/DistrictCivil.PNG.meta | 10 +- .../Textures/Icons/DistrictCivil1.png | Bin 0 -> 2794 bytes .../Textures/Icons/DistrictCivil1.png.meta | 132 ++++++ .../Textures/Icons/DistrictCivil2.png | Bin 0 -> 10316 bytes .../Textures/Icons/DistrictCivil2.png.meta | 132 ++++++ 19 files changed, 615 insertions(+), 397 deletions(-) create mode 100644 Assets/GWConquest/Scripts/DistrictRegistry.cs create mode 100644 Assets/GWConquest/Scripts/DistrictRegistry.cs.meta create mode 100644 Assets/GWConquest/Textures/Icons/DistrictCivil1.png create mode 100644 Assets/GWConquest/Textures/Icons/DistrictCivil1.png.meta create mode 100644 Assets/GWConquest/Textures/Icons/DistrictCivil2.png create mode 100644 Assets/GWConquest/Textures/Icons/DistrictCivil2.png.meta diff --git a/Assets/GWConquest/Prefabs/District.prefab b/Assets/GWConquest/Prefabs/District.prefab index f6713d5..444522b 100644 --- a/Assets/GWConquest/Prefabs/District.prefab +++ b/Assets/GWConquest/Prefabs/District.prefab @@ -78,7 +78,6 @@ MonoBehaviour: DefaultSprite: {fileID: 21300000, guid: 3b81d9ff9816c8240b02293797c69234, type: 3} DistrictName: Primus Description: - IsCityDistrict: 0 DistrictType: 0 --- !u!114 &2620233160227347941 MonoBehaviour: diff --git a/Assets/GWConquest/Prefabs/Factory.prefab b/Assets/GWConquest/Prefabs/Factory.prefab index 5ab6402..e81cad5 100644 --- a/Assets/GWConquest/Prefabs/Factory.prefab +++ b/Assets/GWConquest/Prefabs/Factory.prefab @@ -63,7 +63,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Tier: 1 - FactoryType: 0 StartsBroken: 0 SpecialUnits: [] --- !u!114 &7954319019618919355 @@ -81,7 +80,6 @@ MonoBehaviour: DefaultSprite: {fileID: 21300000, guid: 3b81d9ff9816c8240b02293797c69234, type: 3} DistrictName: Primus Description: - IsCityDistrict: 0 DistrictType: 0 --- !u!114 &3732992427129260454 MonoBehaviour: diff --git a/Assets/GWConquest/Prefabs/Planet.prefab b/Assets/GWConquest/Prefabs/Planet.prefab index 38af771..339f951 100644 --- a/Assets/GWConquest/Prefabs/Planet.prefab +++ b/Assets/GWConquest/Prefabs/Planet.prefab @@ -322,7 +322,6 @@ MonoBehaviour: FleetRestingRadius: 0.7 InTransitFormations: [] VisibilityStatus: 0 - OriginalDesaturation: 0 connections: [] --- !u!114 &8925700613145171218 MonoBehaviour: diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index 4524611..1c5353c 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -1824,7 +1824,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -2559,6 +2559,7 @@ MonoBehaviour: DistrictName: Agri-District Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &40190439 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3955,7 +3956,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -4314,7 +4315,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -4573,7 +4574,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -5092,6 +5093,7 @@ MonoBehaviour: DistrictName: Agri-District II Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &86848884 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7683,7 +7685,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -7757,6 +7759,7 @@ MonoBehaviour: DistrictName: Agri-District II Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &113413690 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7915,7 +7918,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -8059,7 +8062,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -9243,6 +9246,7 @@ MonoBehaviour: DistrictName: Agri-District I Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &131868900 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9680,7 +9684,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -10929,7 +10933,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -12338,6 +12342,11 @@ PrefabInstance: propertyPath: DistrictName value: Factory Complex objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictType + value: 3 + objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DefaultSprite @@ -13068,6 +13077,7 @@ MonoBehaviour: DistrictName: Agri-District Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &214596037 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13385,7 +13395,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -13529,7 +13539,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -14311,7 +14321,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -17665,6 +17675,7 @@ MonoBehaviour: DistrictName: Special District Description: DistrictType: 3 + DistrictLevel: 0 --- !u!114 &302288826 MonoBehaviour: m_ObjectHideFlags: 0 @@ -18772,7 +18783,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -18982,6 +18993,7 @@ MonoBehaviour: DistrictName: Special District Description: DistrictType: 3 + DistrictLevel: 0 --- !u!114 &322489094 MonoBehaviour: m_ObjectHideFlags: 0 @@ -20077,6 +20089,7 @@ MonoBehaviour: DistrictName: Agri-District Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &353074288 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21779,7 +21792,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -24959,11 +24972,9 @@ MonoBehaviour: StartPopulation: 3 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Aeculus Prime Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex Rating: 0 HasShipyard: 0 @@ -24977,19 +24988,15 @@ MonoBehaviour: StartPopulation: 10 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Arca Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Arca Secundi Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex I Rating: 0 - DistrictType: 1 - FactoryType: 1 Name: Factory Complex II Rating: 0 HasShipyard: 1 @@ -25000,11 +25007,9 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Arnough Prime Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex Rating: 0 HasShipyard: 0 @@ -25017,11 +25022,9 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Caine's World Prime Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District Rating: 0 HasShipyard: 0 @@ -25034,15 +25037,12 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 1 - FactoryType: 2 Name: Factory Complex I Rating: 0 - DistrictType: 1 - FactoryType: 2 Name: Factory Complex II Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex III Rating: 0 HasShipyard: 1 @@ -25053,19 +25053,15 @@ MonoBehaviour: StartPopulation: 4 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Datonie Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Datonie Secundi Rating: 0 - DistrictType: 1 - FactoryType: 2 Name: Factory Complex I Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex II Rating: 0 HasShipyard: 0 @@ -25076,7 +25072,6 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 2 - FactoryType: 0 Name: Agri-District Rating: 0 HasShipyard: 0 @@ -25091,15 +25086,12 @@ MonoBehaviour: StartPopulation: 4 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Elysia Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Elysia Secundi Rating: 0 - DistrictType: 1 - FactoryType: 1 Name: Factory Complex Rating: 0 HasShipyard: 1 @@ -25112,19 +25104,15 @@ MonoBehaviour: StartPopulation: 8 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Exan Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Exan Secundi Rating: 0 - DistrictType: 1 - FactoryType: 1 Name: Factory Complex Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District Rating: 0 HasShipyard: 0 @@ -25136,11 +25124,9 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Fankether Prime Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District Rating: 0 HasShipyard: 0 @@ -25153,19 +25139,15 @@ MonoBehaviour: StartPopulation: 9 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Fethaphor Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Fethaphor Secundi Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Fethaphor Tri Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Fethaphor For Rating: 0 HasShipyard: 1 @@ -25176,19 +25158,15 @@ MonoBehaviour: StartPopulation: 3 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Garesen Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Garesen Secundi Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Garesen Tri Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District Rating: 0 HasShipyard: 0 @@ -25202,19 +25180,15 @@ MonoBehaviour: StartPopulation: 10 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Gargamont Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Gargamont Secundi Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Gargamont Tri Rating: 0 - DistrictType: 1 - FactoryType: 1 Name: Factory Complex Rating: 0 HasShipyard: 0 @@ -25226,15 +25200,12 @@ MonoBehaviour: StartPopulation: 6 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Gargamont Kees Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Gargamont Kees Secundi Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District Rating: 0 HasShipyard: 0 @@ -25246,15 +25217,12 @@ MonoBehaviour: StartPopulation: 5 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Gargamont Rest Prime Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District I Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District II Rating: 0 HasShipyard: 0 @@ -25267,11 +25235,9 @@ MonoBehaviour: StartPopulation: 5 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Gargamont Tri Prime Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex Rating: 0 HasShipyard: 0 @@ -25284,11 +25250,9 @@ MonoBehaviour: StartPopulation: 4 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Gargamont For Prime Rating: 0 - DistrictType: 1 - FactoryType: 3 Name: Factory Complex Rating: 0 HasShipyard: 0 @@ -25300,7 +25264,6 @@ MonoBehaviour: StartPopulation: 3 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Gargamont Fiftan Prime Rating: 0 HasShipyard: 0 @@ -25313,7 +25276,6 @@ MonoBehaviour: StartPopulation: 2 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Gargamont Six Prime Rating: 0 HasShipyard: 0 @@ -25326,7 +25288,6 @@ MonoBehaviour: StartPopulation: 1 DistrictData: - DistrictType: 1 - FactoryType: 4 Name: Factory Complex Rating: 0 HasShipyard: 0 @@ -25337,11 +25298,9 @@ MonoBehaviour: StartPopulation: 1 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Honigiah Prime Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District Rating: 0 HasShipyard: 0 @@ -25353,7 +25312,6 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 1 - FactoryType: 3 Name: Factory Complex Rating: 0 HasShipyard: 1 @@ -25364,15 +25322,12 @@ MonoBehaviour: StartPopulation: 4 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Hotheseer Kees Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Hotheseer Kees Secundi Rating: 0 - DistrictType: 1 - FactoryType: 1 Name: Factory Complex Rating: 0 HasShipyard: 0 @@ -25383,15 +25338,12 @@ MonoBehaviour: StartPopulation: 4 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Kies Prime Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District Rating: 0 HasShipyard: 1 @@ -25401,7 +25353,6 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 3 - FactoryType: 0 Name: Special District Rating: 0 HasShipyard: 0 @@ -25424,19 +25375,15 @@ MonoBehaviour: StartPopulation: 5 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Krigena Prime Rating: 0 - DistrictType: 1 - FactoryType: 1 Name: Factory Complex I Rating: 0 - DistrictType: 1 - FactoryType: 2 Name: Factory Complex II Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex III Rating: 0 HasShipyard: 0 @@ -25448,7 +25395,6 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 1 - FactoryType: 3 Name: Factory Complex Rating: 0 HasShipyard: 0 @@ -25459,19 +25405,15 @@ MonoBehaviour: StartPopulation: 6 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Leb Prime Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District I Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District II Rating: 0 - DistrictType: 3 - FactoryType: 0 Name: Special District Rating: 0 HasShipyard: 0 @@ -25482,11 +25424,9 @@ MonoBehaviour: StartPopulation: 5 DistrictData: - DistrictType: 2 - FactoryType: 0 Name: Agri-District I Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District II Rating: 0 HasShipyard: 0 @@ -25498,15 +25438,12 @@ MonoBehaviour: StartPopulation: 7 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Methaphor Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Methaphor Secundi Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Methaphor Tri Rating: 0 HasShipyard: 0 @@ -25520,15 +25457,12 @@ MonoBehaviour: StartPopulation: 3 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Montana Prime Rating: 0 - DistrictType: 1 - FactoryType: 3 Name: Factory Complex I Rating: 0 - DistrictType: 1 - FactoryType: 2 Name: Factory Complex II Rating: 0 HasShipyard: 0 @@ -25539,11 +25473,9 @@ MonoBehaviour: StartPopulation: 1 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Nemawith Prime Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex Rating: 0 HasShipyard: 0 @@ -25559,15 +25491,12 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 1 - FactoryType: 2 Name: Factory Complex I Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex II Rating: 0 - DistrictType: 1 - FactoryType: 1 Name: Factory Complex III Rating: 0 HasShipyard: 1 @@ -25579,19 +25508,15 @@ MonoBehaviour: StartPopulation: 7 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Noser Prime Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District I Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District II Rating: 0 - DistrictType: 1 - FactoryType: 1 Name: Factory Complex Rating: 0 HasShipyard: 0 @@ -25602,7 +25527,6 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 3 - FactoryType: 0 Name: Special District Rating: 0 HasShipyard: 0 @@ -25615,11 +25539,9 @@ MonoBehaviour: StartPopulation: 3 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Caer-Bannoq Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Caer-Bannoq Secundi Rating: 0 HasShipyard: 0 @@ -25631,19 +25553,15 @@ MonoBehaviour: StartPopulation: 9 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Rokurant Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Rokurant Secundi Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Rokurant Tri Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Rokurant For Rating: 0 HasShipyard: 0 @@ -25657,19 +25575,15 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 1 - FactoryType: 2 Name: Factory Complex I Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex II Rating: 0 - DistrictType: 1 - FactoryType: 1 Name: Factory Complex III Rating: 0 - DistrictType: 1 - FactoryType: 3 Name: Factory Complex IV Rating: 0 HasShipyard: 1 @@ -25689,11 +25603,9 @@ MonoBehaviour: StartPopulation: 6 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Sartorius Rax Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Sartorius Rax Secundi Rating: 0 HasShipyard: 0 @@ -25705,15 +25617,12 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 1 - FactoryType: 1 Name: Factory Complex I Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex II Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex III Rating: 0 HasShipyard: 0 @@ -25725,7 +25634,6 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 2 - FactoryType: 0 Name: Agri-District Rating: 0 HasShipyard: 0 @@ -25739,19 +25647,15 @@ MonoBehaviour: StartPopulation: 5 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Siggi Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Siggi Secundi Rating: 0 - DistrictType: 1 - FactoryType: 3 Name: Factory Complex I Rating: 0 - DistrictType: 1 - FactoryType: 2 Name: Factory Complex II Rating: 0 HasShipyard: 0 @@ -25765,19 +25669,15 @@ MonoBehaviour: StartPopulation: 4 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Spice Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Spice Secundi Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Spice Tri Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Spice For Rating: 0 HasShipyard: 0 @@ -25789,15 +25689,12 @@ MonoBehaviour: StartPopulation: 5 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Stunteen Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Stunteen Secundi Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District Rating: 0 HasShipyard: 0 @@ -25809,11 +25706,9 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 1 - FactoryType: 3 Name: Factory Complex Rating: 0 - DistrictType: 3 - FactoryType: 0 Name: Special District Rating: 0 HasShipyard: 0 @@ -25824,7 +25719,6 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 3 - FactoryType: 0 Name: Special District Rating: 0 HasShipyard: 0 @@ -25837,11 +25731,9 @@ MonoBehaviour: StartPopulation: 2 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Skaeld Prime Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex Rating: 0 HasShipyard: 0 @@ -25853,7 +25745,6 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 1 - FactoryType: 2 Name: Factory Complex Rating: 0 HasShipyard: 0 @@ -25866,15 +25757,12 @@ MonoBehaviour: StartPopulation: 3 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Troikn Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Troikn Secundi Rating: 0 - DistrictType: 1 - FactoryType: 1 Name: Factory Complex Rating: 0 HasShipyard: 0 @@ -25885,15 +25773,12 @@ MonoBehaviour: StartPopulation: 1 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Ulfsun Prime Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District I Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District II Rating: 0 HasShipyard: 0 @@ -25906,19 +25791,15 @@ MonoBehaviour: StartPopulation: 6 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Voteine Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Voteine Secundi Rating: 0 - DistrictType: 1 - FactoryType: 2 Name: Factory Complex I Rating: 0 - DistrictType: 1 - FactoryType: 1 Name: Factory Complex II Rating: 0 HasShipyard: 0 @@ -25928,11 +25809,9 @@ MonoBehaviour: StartPopulation: 1 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Vrotan Prime Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District Rating: 0 HasShipyard: 0 @@ -25945,19 +25824,15 @@ MonoBehaviour: StartPopulation: 5 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Wyth Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Wyth Secundi Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Wyth Tri Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District Rating: 0 HasShipyard: 0 @@ -25968,15 +25843,12 @@ MonoBehaviour: StartPopulation: 1 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Xonorasis Prime Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex I Rating: 0 - DistrictType: 1 - FactoryType: 3 Name: Factory Complex II Rating: 0 HasShipyard: 0 @@ -25995,7 +25867,6 @@ MonoBehaviour: StartPopulation: 0 DistrictData: - DistrictType: 1 - FactoryType: 1 Name: Factory Complex Rating: 0 HasShipyard: 0 @@ -26007,11 +25878,9 @@ MonoBehaviour: StartPopulation: 2 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Yeesveer Rest Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Yeesveer Rest Prime Rating: 0 HasShipyard: 0 @@ -26032,15 +25901,12 @@ MonoBehaviour: StartPopulation: 4 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Zami Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Zami Secundi Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District Rating: 0 HasShipyard: 0 @@ -26051,19 +25917,15 @@ MonoBehaviour: StartPopulation: 3 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Zami II Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Zami II Secundi Rating: 0 - DistrictType: 1 - FactoryType: 1 Name: Factory Complex Rating: 0 - DistrictType: 3 - FactoryType: 0 Name: Special District Rating: 0 HasShipyard: 0 @@ -26074,15 +25936,12 @@ MonoBehaviour: StartPopulation: 6 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Yar'kassy Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Yar'kassy Secundi Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Yar'kassy Tri Rating: 0 HasShipyard: 0 @@ -26094,11 +25953,9 @@ MonoBehaviour: StartPopulation: 5 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Yarva Primus Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Yarva Primus Secundi Rating: 0 HasShipyard: 0 @@ -26109,11 +25966,9 @@ MonoBehaviour: StartPopulation: 3 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Yarva Minoris Prime Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex Rating: 0 HasShipyard: 0 @@ -26135,15 +25990,12 @@ MonoBehaviour: StartPopulation: 3 DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Flynn's World Prime Rating: 0 - DistrictType: 0 - FactoryType: 0 Name: Flynn's World Secundi Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District Rating: 0 HasShipyard: 0 @@ -26173,7 +26025,6 @@ MonoBehaviour: StartPopulation: 1 DistrictData: - DistrictType: 3 - FactoryType: 0 Name: Special District Rating: 0 HasShipyard: 0 @@ -26186,19 +26037,15 @@ MonoBehaviour: StartPopulation: DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Vesparus Prime Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District I Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District II Rating: 0 - DistrictType: 2 - FactoryType: 0 Name: Agri-District III Rating: 0 HasShipyard: 0 @@ -26288,15 +26135,12 @@ MonoBehaviour: StartPopulation: DistrictData: - DistrictType: 0 - FactoryType: 0 Name: Ingrim Prime Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex I Rating: 0 - DistrictType: 1 - FactoryType: 4 Name: Factory Complex II Rating: 0 HasShipyard: 0 @@ -31122,7 +30966,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -40561,7 +40405,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -41215,7 +41059,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -42020,6 +41864,7 @@ MonoBehaviour: DistrictName: Agri-District Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &755114448 MonoBehaviour: m_ObjectHideFlags: 0 @@ -43218,6 +43063,7 @@ MonoBehaviour: DistrictName: Agri-District Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &769496622 MonoBehaviour: m_ObjectHideFlags: 0 @@ -43741,6 +43587,7 @@ MonoBehaviour: DistrictName: Agri-District II Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &776571280 MonoBehaviour: m_ObjectHideFlags: 0 @@ -44596,7 +44443,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -46333,6 +46180,7 @@ MonoBehaviour: DistrictName: Agri-District III Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &829595064 MonoBehaviour: m_ObjectHideFlags: 0 @@ -46491,7 +46339,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -47599,6 +47447,7 @@ MonoBehaviour: DistrictName: Special District Description: DistrictType: 3 + DistrictLevel: 0 --- !u!114 &853110023 MonoBehaviour: m_ObjectHideFlags: 0 @@ -48688,6 +48537,7 @@ MonoBehaviour: DistrictName: Agri-District Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &884239768 MonoBehaviour: m_ObjectHideFlags: 0 @@ -52298,7 +52148,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -53401,7 +53251,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -53663,7 +53513,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -54691,6 +54541,106 @@ MonoBehaviour: m_EditorClassIdentifier: district1: {fileID: 755950720} district2: {fileID: 1035984751} +--- !u!1 &975913104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 975913106} + - component: {fileID: 975913105} + m_Layer: 0 + m_Name: DistrictRegistry + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &975913105 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 975913104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36a1a4c8508f51b44a44f5f4ba7d7f3b, type: 3} + m_Name: + m_EditorClassIdentifier: + Entries: + - type: 0 + LargeIcons: + - {fileID: 21300000, guid: 08be6493f337d874fa8d62ec0922ed93, type: 3} + - {fileID: 21300000, guid: bd69db5c0d9fa824db9b1dad98b0dc39, type: 3} + - {fileID: 21300000, guid: 3b81d9ff9816c8240b02293797c69234, type: 3} + - {fileID: 21300000, guid: 20b330887e66df649a836337f051c7ad, type: 3} + SmallIcon: {fileID: 21300000, guid: e08b397bc0cb6f642bfe7743721d644f, type: 3} + - type: 1 + LargeIcons: + - {fileID: 21300000, guid: 2b49b5f73d21b5248ba74e112c438393, type: 3} + - {fileID: 21300000, guid: 37cef7217b3b5b0489b9f3c509958358, type: 3} + - {fileID: 21300000, guid: 5ec387f42985a0049832f04df2952e89, type: 3} + - {fileID: 21300000, guid: 0fec0e0155355a849ba5abd43ea89d53, type: 3} + SmallIcon: {fileID: 21300000, guid: d6a99e4127bc1b64d9063cd2d1555439, type: 3} + - type: 2 + LargeIcons: + - {fileID: 21300000, guid: 9c20ef1357d81504bae97a9f1bf498ec, type: 3} + - {fileID: 21300000, guid: eb3a2255f8cd7dd46806e4f5783de836, type: 3} + - {fileID: 21300000, guid: f6c96f38a0a80524fbe3aa978b9b74b3, type: 3} + - {fileID: 21300000, guid: 30bd5622f21392c4f9944fa6cc12e68a, type: 3} + SmallIcon: {fileID: 21300000, guid: eb2e846cc08c4064d8c4955a8ea81cf5, type: 3} + - type: 3 + LargeIcons: + - {fileID: 21300000, guid: 4dbbec478e998674f8cb8b3ca2794dba, type: 3} + - {fileID: 21300000, guid: bfccb253ad1f6494bb37ad50a5cae1a4, type: 3} + - {fileID: 21300000, guid: 6fca7c7db82f4214e8818f4603ccfea0, type: 3} + - {fileID: 21300000, guid: 3270a02f5b4ea55469f99f5d34ad7d32, type: 3} + SmallIcon: {fileID: 21300000, guid: b724aa86e8fd31f4f9258e385e3a6757, type: 3} + - type: 4 + LargeIcons: + - {fileID: 21300000, guid: 4e15cf7d786b1994c96dd63a5aac0d19, type: 3} + - {fileID: 21300000, guid: 8c037d5668dacbd47b012846956948f1, type: 3} + - {fileID: 21300000, guid: ed68a8d9c80eefd48809689f76d1bc99, type: 3} + - {fileID: 21300000, guid: b14e17f620817f1448507cb69f34d16c, type: 3} + SmallIcon: {fileID: 21300000, guid: 4fb8dc43dcaf1a240b82465fc3e9ae63, type: 3} + - type: 5 + LargeIcons: + - {fileID: 21300000, guid: ef8c98a7151df7c418252630d9fd55fa, type: 3} + - {fileID: 21300000, guid: 75141d54a8055ae4488f3916f6b8130e, type: 3} + - {fileID: 21300000, guid: bd93e35d8eadb9844adef76ee7beacee, type: 3} + - {fileID: 21300000, guid: 61352dac7fde23646b7ea6438c96343d, type: 3} + SmallIcon: {fileID: 21300000, guid: db5bbf45ac428c240a974c5887ce8dce, type: 3} + - type: 6 + LargeIcons: + - {fileID: 21300000, guid: 84ab639475a53d14fb7cc01f622b3b22, type: 3} + - {fileID: 21300000, guid: 84ab639475a53d14fb7cc01f622b3b22, type: 3} + - {fileID: 21300000, guid: 84ab639475a53d14fb7cc01f622b3b22, type: 3} + - {fileID: 21300000, guid: 84ab639475a53d14fb7cc01f622b3b22, type: 3} + SmallIcon: {fileID: 21300000, guid: a8b2bb0f05ad6834c934a24e73d0d532, type: 3} + - type: 7 + LargeIcons: + - {fileID: 21300000, guid: 00317cdacf041a940861401fd4e0fe53, type: 3} + - {fileID: 21300000, guid: 86df34d8ecb70844a95e62424aeec6f3, type: 3} + - {fileID: 21300000, guid: 8d5ce267321304f4aa619de53dda637e, type: 3} + - {fileID: 21300000, guid: 79460fd07532d094cbe4aa5e84b30807, type: 3} + SmallIcon: {fileID: 21300000, guid: 451f948452dceda4cac8ed980695cf82, type: 3} +--- !u!4 &975913106 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 975913104} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &976457761 GameObject: m_ObjectHideFlags: 0 @@ -58933,7 +58883,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -61234,6 +61184,7 @@ MonoBehaviour: DistrictName: Agri-District I Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &1091417642 MonoBehaviour: m_ObjectHideFlags: 0 @@ -61469,7 +61420,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -61608,7 +61559,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -64061,7 +64012,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -64509,7 +64460,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -65181,6 +65132,7 @@ MonoBehaviour: DistrictName: Agri-District Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &1147370008 MonoBehaviour: m_ObjectHideFlags: 0 @@ -65529,7 +65481,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -66097,6 +66049,7 @@ MonoBehaviour: DistrictName: Special District Description: DistrictType: 3 + DistrictLevel: 0 --- !u!114 &1166148167 MonoBehaviour: m_ObjectHideFlags: 0 @@ -67923,7 +67876,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -68467,6 +68420,7 @@ MonoBehaviour: DistrictName: Agri-District Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &1213153681 MonoBehaviour: m_ObjectHideFlags: 0 @@ -68625,7 +68579,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -69099,6 +69053,7 @@ MonoBehaviour: DistrictName: Agri-District Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &1229600187 MonoBehaviour: m_ObjectHideFlags: 0 @@ -70851,7 +70806,7 @@ PrefabInstance: - target: {fileID: 4201273303516524904, guid: 09118807f6ce1b540986745109980a4b, type: 3} propertyPath: m_RootOrder - value: 17 + value: 18 objectReference: {fileID: 0} - target: {fileID: 4201273303516524904, guid: 09118807f6ce1b540986745109980a4b, type: 3} @@ -71155,6 +71110,7 @@ MonoBehaviour: DistrictName: Special District Description: DistrictType: 3 + DistrictLevel: 0 --- !u!114 &1267657457 MonoBehaviour: m_ObjectHideFlags: 0 @@ -80410,7 +80366,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -81375,6 +81331,7 @@ MonoBehaviour: DistrictName: Agri-District II Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &1409165553 MonoBehaviour: m_ObjectHideFlags: 0 @@ -81591,6 +81548,7 @@ MonoBehaviour: DistrictName: Agri-District II Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &1412114075 MonoBehaviour: m_ObjectHideFlags: 0 @@ -82000,7 +81958,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1422402913 BoxCollider: @@ -82190,7 +82148,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -82636,7 +82594,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -84960,7 +84918,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -85758,7 +85716,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -86393,7 +86351,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -86467,6 +86425,7 @@ MonoBehaviour: DistrictName: Special District Description: DistrictType: 3 + DistrictLevel: 0 --- !u!114 &1497715127 MonoBehaviour: m_ObjectHideFlags: 0 @@ -92967,6 +92926,7 @@ MonoBehaviour: DistrictName: Agri-District II Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &1658452144 MonoBehaviour: m_ObjectHideFlags: 0 @@ -96024,6 +95984,7 @@ MonoBehaviour: DistrictName: Agri-District Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &1724478289 MonoBehaviour: m_ObjectHideFlags: 0 @@ -97625,7 +97586,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -97813,6 +97774,7 @@ MonoBehaviour: DistrictName: Agri-District I Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &1758196033 MonoBehaviour: m_ObjectHideFlags: 0 @@ -105183,7 +105145,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -105401,7 +105363,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -105554,6 +105516,7 @@ MonoBehaviour: DistrictName: Agri-District Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &1798405256 MonoBehaviour: m_ObjectHideFlags: 0 @@ -107346,7 +107309,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1834518974 PrefabInstance: @@ -107690,6 +107653,7 @@ MonoBehaviour: DistrictName: Special District Description: DistrictType: 3 + DistrictLevel: 0 --- !u!114 &1846341752 MonoBehaviour: m_ObjectHideFlags: 0 @@ -107930,7 +107894,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -110236,7 +110200,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -111390,7 +111354,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -111716,6 +111680,7 @@ MonoBehaviour: DistrictName: Agri-District Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &1924742659 MonoBehaviour: m_ObjectHideFlags: 0 @@ -112213,7 +112178,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -112545,6 +112510,7 @@ MonoBehaviour: DistrictName: Agri-District Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &1947037425 MonoBehaviour: m_ObjectHideFlags: 0 @@ -112798,6 +112764,7 @@ MonoBehaviour: DistrictName: Agri-District I Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &1952294460 MonoBehaviour: m_ObjectHideFlags: 0 @@ -113202,7 +113169,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -115083,7 +115050,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -115253,6 +115220,7 @@ MonoBehaviour: DistrictName: Agri-District I Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &1976539134 MonoBehaviour: m_ObjectHideFlags: 0 @@ -115411,7 +115379,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -118564,6 +118532,7 @@ MonoBehaviour: DistrictName: Agri-District I Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &2042552056 MonoBehaviour: m_ObjectHideFlags: 0 @@ -119175,7 +119144,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -122321,7 +122290,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -122556,7 +122525,7 @@ PrefabInstance: - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: DistrictType - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -122855,6 +122824,7 @@ MonoBehaviour: DistrictName: Agri-District Description: DistrictType: 2 + DistrictLevel: 0 --- !u!114 &2141017712 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Scripts/District.cs b/Assets/GWConquest/Scripts/District.cs index e45f513..8dbb28c 100644 --- a/Assets/GWConquest/Scripts/District.cs +++ b/Assets/GWConquest/Scripts/District.cs @@ -16,9 +16,15 @@ namespace GWConquest public string Description; public DistrictType DistrictType = DistrictType.Civil; + public int DistrictLevel; public Zone Zone { get; private set; } + public static bool IsTypeFactory(DistrictType type) + { + return type == DistrictType.Civil || type == DistrictType.SpaceStation || type == DistrictType.FactoryArmor || type == DistrictType.FactoryInfantry || type == DistrictType.FactorySupplies || type == DistrictType.FactoryFuel; + } + public Player ControllingPlayer { get { var id = State.ControllingPlayerId; @@ -82,7 +88,13 @@ namespace GWConquest public virtual Sprite GetCurrentSprite() { - return DefaultSprite; + if(DefaultSprite != null) + { + return DefaultSprite; + } + else { + return DistrictRegistry.Instance.Get(DistrictType).LargeIcons[DistrictLevel]; + } } public virtual string GetDistrictName() @@ -103,17 +115,13 @@ namespace GWConquest { producingItem = "Food"; } - else if (DistrictType == DistrictType.Factory && GetComponent() != null) + else if (DistrictType == DistrictType.FactorySupplies) { - FactoryType ftype = GetComponent().FactoryType; - if (ftype == FactoryType.Supplies) - { - producingItem = "Supplies"; - } - else if (ftype == FactoryType.Fuel) - { - producingItem = "Fuel"; - } + producingItem = "Supplies"; + } + else if (DistrictType == DistrictType.FactoryFuel) + { + producingItem = "Fuel"; } else if (DistrictType == DistrictType.Civil) { @@ -168,73 +176,9 @@ namespace GWConquest } } - public DistrictTypeFull GetFullType() - { - switch(DistrictType) - { - case DistrictType.Factory: - DistrictFactory f = GetComponent(); - switch(f.FactoryType) - { - case FactoryType.City: - return DistrictTypeFull.Civil; - case FactoryType.Supplies: - return DistrictTypeFull.FactorySupplies; - case FactoryType.Fuel: - return DistrictTypeFull.FactoryFuel; - case FactoryType.Infantry: - return DistrictTypeFull.FactoryInfantry; - case FactoryType.Armour: - return DistrictTypeFull.FactoryArmor; - case FactoryType.Space: - return DistrictTypeFull.SpaceStation; - default: - return DistrictTypeFull.Special; - } - case DistrictType.Civil: - return DistrictTypeFull.Civil; - case DistrictType.Food: - return DistrictTypeFull.Food; - case DistrictType.SpaceStation: - return DistrictTypeFull.SpaceStation; - case DistrictType.Special: - return DistrictTypeFull.Special; - default: - return DistrictTypeFull.Special; - - } - } - - -#if UNITY_EDITOR - public void SetDefaultSprite() - { - string dname; - if(DistrictType == DistrictType.Factory) - { - DistrictFactory f = GetComponent(); - dname = "Factory" + System.Enum.GetName(typeof(FactoryType), f.FactoryType); - } - else { - dname = System.Enum.GetName(typeof(DistrictType), DistrictType); - } - string spritePath = "Assets/GWConquest/Textures/Icons/District" + dname + ".png"; - DefaultSprite = UnityEditor.AssetDatabase.LoadAssetAtPath(spritePath); - } -#endif - } public enum DistrictType - { - Civil, - Factory, - Food, - Special, - SpaceStation - } - - public enum DistrictTypeFull { Civil, FactorySupplies, diff --git a/Assets/GWConquest/Scripts/DistrictFactory.cs b/Assets/GWConquest/Scripts/DistrictFactory.cs index 0a50a3f..84652d4 100644 --- a/Assets/GWConquest/Scripts/DistrictFactory.cs +++ b/Assets/GWConquest/Scripts/DistrictFactory.cs @@ -8,14 +8,28 @@ namespace GWConquest { public class DistrictFactory : GWBoltBehaviour { - public int Tier = 1; - public FactoryType FactoryType; public bool StartsBroken = false; public string[] SpecialUnits; + private District _district; + public District District + { + get { + if(_district == null) + { + _district = GetComponent(); + } + return _district; + } + } + + public DistrictType FactoryType { + get => District.DistrictType; + } + public IEnumerable GetAvailableUnitClasses() { - var classes = UnitClass.AllUnitClasses.Where(uc => uc.FactoryType == FactoryType && uc.MinFactoryTier <= Tier); + var classes = UnitClass.AllUnitClasses.Where(uc => uc.FactoryType == FactoryType && uc.MinFactoryTier <= District.DistrictLevel); var special = SpecialUnits.ToList().ConvertAll(name => UnitClass.FromName(name)); return classes.Union(special); } diff --git a/Assets/GWConquest/Scripts/DistrictRegistry.cs b/Assets/GWConquest/Scripts/DistrictRegistry.cs new file mode 100644 index 0000000..acf93f0 --- /dev/null +++ b/Assets/GWConquest/Scripts/DistrictRegistry.cs @@ -0,0 +1,44 @@ +using UnityEngine; +using System.Collections.Generic; + +namespace GWConquest +{ + public class DistrictRegistry : MonoBehaviour + { + private static DistrictRegistry _instance; + public static DistrictRegistry Instance { + get { + if(_instance == null) + { + _instance = FindObjectOfType(); + } + return _instance; + } + } + + [System.Serializable] + public class DistrictRegistryEntry + { + public DistrictType type; + public Sprite[] LargeIcons; + public Sprite SmallIcon; + } + + public DistrictRegistryEntry[] Entries; + private Dictionary EntryMap = new Dictionary(); + + void Awake() + { + foreach(var entry in Entries) + { + EntryMap.Add(entry.type, entry); + } + } + + public DistrictRegistryEntry Get(DistrictType type) + { + return EntryMap[type]; + } + + } +} \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/DistrictRegistry.cs.meta b/Assets/GWConquest/Scripts/DistrictRegistry.cs.meta new file mode 100644 index 0000000..2cd333d --- /dev/null +++ b/Assets/GWConquest/Scripts/DistrictRegistry.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 36a1a4c8508f51b44a44f5f4ba7d7f3b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/Planet.cs b/Assets/GWConquest/Scripts/Planet.cs index d2e0fd1..bca8e20 100644 --- a/Assets/GWConquest/Scripts/Planet.cs +++ b/Assets/GWConquest/Scripts/Planet.cs @@ -608,7 +608,7 @@ namespace GWConquest for (int i = 0; i < data.DistrictData.Length; i++) { var districtData = data.DistrictData[i]; - bool dataHasFactory = districtData.DistrictType == DistrictType.Civil || districtData.DistrictType == DistrictType.Factory; + bool dataHasFactory = District.IsTypeFactory(districtData.DistrictType); Zone zone; bool isNewZone = false; if(i < zoneList.Count) @@ -658,27 +658,6 @@ namespace GWConquest d.DistrictType = districtData.DistrictType; d.DistrictName = districtData.Name; - if(dataHasFactory) - { - DistrictFactory f = zone.GetComponent(); - - if(f != null) - { - UnityEditor.Undo.RecordObject(f, "Setting up zones"); - if(districtData.DistrictType == DistrictType.Civil) - { - f.FactoryType = FactoryType.City; - } - else { - f.FactoryType = districtData.FactoryType; - } - UnityEditor.PrefabUtility.RecordPrefabInstancePropertyModifications(f); - - } - } - - d.SetDefaultSprite(); - UnityEditor.PrefabUtility.RecordPrefabInstancePropertyModifications(d); @@ -742,19 +721,7 @@ namespace GWConquest d.DistrictType = DistrictType.SpaceStation; d.DistrictName = planetName + " Station"; - - DistrictFactory f = spaceZone.GetComponent(); - - if(f != null) - { - UnityEditor.Undo.RecordObject(f, "Setting up zones"); - f.FactoryType = FactoryType.Space; - UnityEditor.PrefabUtility.RecordPrefabInstancePropertyModifications(f); - - } - d.SetDefaultSprite(); - UnityEditor.PrefabUtility.RecordPrefabInstancePropertyModifications(d); } diff --git a/Assets/GWConquest/Scripts/PlanetPlacement.cs b/Assets/GWConquest/Scripts/PlanetPlacement.cs index 6f02f77..e297e80 100644 --- a/Assets/GWConquest/Scripts/PlanetPlacement.cs +++ b/Assets/GWConquest/Scripts/PlanetPlacement.cs @@ -171,7 +171,22 @@ namespace GWConquest if(Random.value <= districtSettings.FactoryChance) { prefabID = BoltPrefabs.Factory; - type = DistrictType.Factory; + int factoryType = Random.Range(0, 3); + switch(factoryType) + { + case 0: + type = DistrictType.FactorySupplies; + break; + case 1: + type = DistrictType.FactoryArmor; + break; + case 2: + type = DistrictType.FactoryFuel; + break; + default: + type = DistrictType.FactoryInfantry; + break; + } } else if(Random.value <= districtSettings.FoodChance / (1f - districtSettings.FactoryChance)) { diff --git a/Assets/GWConquest/Scripts/PlanetRegistry.cs b/Assets/GWConquest/Scripts/PlanetRegistry.cs index 3abfe18..c002b2d 100644 --- a/Assets/GWConquest/Scripts/PlanetRegistry.cs +++ b/Assets/GWConquest/Scripts/PlanetRegistry.cs @@ -23,7 +23,6 @@ namespace GWConquest public class PlanetDistrictData { public DistrictType DistrictType; - public FactoryType FactoryType; public string Name; public int Rating; } @@ -99,7 +98,7 @@ namespace GWConquest { string factoryStr = factoryTypes.Replace(" ", null); string[] factoryArr = factoryStr.Split(','); - List factoryList = new List(); + List factoryList = new List(); if(factoryArr.Length > 0) { foreach(string s in factoryArr) @@ -114,17 +113,17 @@ namespace GWConquest } } - FactoryType type = FactoryType.Supplies; + DistrictType type = DistrictType.FactorySupplies; switch(cutStr) { case "Weapons": - type = FactoryType.Infantry; + type = DistrictType.FactoryInfantry; break; case "Armour": - type = FactoryType.Armour; + type = DistrictType.FactoryArmor; break; case "Fuel": - type = FactoryType.Fuel; + type = DistrictType.FactoryFuel; break; } @@ -155,40 +154,40 @@ namespace GWConquest if(count >= 1 && count <= 4) { string dtypeStr = s.Substring(1); - DistrictType districtType; - FactoryType factoryType = FactoryType.City; - string districtName; - switch(dtypeStr) - { - case "Civil": - districtType = DistrictType.Civil; - districtName = planetName; - break; - case "Factory": - districtType = DistrictType.Factory; - districtName = "Factory Complex"; - break; - case "Food": - districtType = DistrictType.Food; - districtName = "Agri-District"; - break; - case "Special": - districtType = DistrictType.Special; - districtName = "Special District"; - break; - default: - continue; - } + for(int i = 0; i < count; i++) { - if(districtType == DistrictType.Factory) + DistrictType districtType; + string districtName; + switch(dtypeStr) { - if(factoryIndex < factoryList.Count) - { - factoryType = factoryList[factoryIndex]; - } - factoryIndex++; + case "Civil": + districtType = DistrictType.Civil; + districtName = planetName; + break; + case "Factory": + if(factoryIndex < factoryList.Count) + { + districtType = factoryList[factoryIndex]; + } + else { + Debug.LogWarning("Not enough factory types!"); + districtType = DistrictType.FactorySupplies; + } + factoryIndex++; + districtName = "Factory Complex"; + break; + case "Food": + districtType = DistrictType.Food; + districtName = "Agri-District"; + break; + case "Special": + districtType = DistrictType.Special; + districtName = "Special District"; + break; + default: + continue; } string name; @@ -208,8 +207,7 @@ namespace GWConquest list.Add(new PlanetDistrictData() { DistrictType = districtType, - Name = name, - FactoryType = factoryType + Name = name }); } } diff --git a/Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs b/Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs index a99894b..26aa01c 100644 --- a/Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs +++ b/Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs @@ -30,16 +30,7 @@ namespace GWConquest public RectTransform DistrictSymbols; public GameObject DistrictSymbolPrefab; - [System.Serializable] - public class DistrictSymbolType - { - public DistrictTypeFull DistrictType; - public Sprite Icon; - } - - public DistrictSymbolType[] DistrictSymbolTypes; - - private Dictionary DistrictSymbolDict = new Dictionary(); + private Dictionary DistrictSymbolDict = new Dictionary(); [System.NonSerialized] private Planet Planet; @@ -54,13 +45,13 @@ namespace GWConquest foreach(var d in planet.GetComponentsInChildren()) { - var type = d.GetFullType(); + var type = d.DistrictType; if(!DistrictSymbolDict.ContainsKey(type)) { var go = Instantiate(DistrictSymbolPrefab); GWLayout.InitRectTransform(go.GetComponent(), DistrictSymbols); var comp = go.GetComponent(); - comp.sprite = DistrictSymbolTypes.Where(e => e.DistrictType == type).FirstOrDefault().Icon; + comp.sprite = DistrictRegistry.Instance.Get(type).SmallIcon; DistrictSymbolDict.Add(type, comp); } } @@ -168,7 +159,7 @@ namespace GWConquest var districts = Planet.GetComponentsInChildren(); foreach (var type in DistrictSymbolDict.Keys) { - var typeDistricts = districts.Where(d => d.GetFullType() == type); + var typeDistricts = districts.Where(d => d.DistrictType == type); Color color = NeutralColor; diff --git a/Assets/GWConquest/Scripts/UnitClass.cs b/Assets/GWConquest/Scripts/UnitClass.cs index eb90e7a..a4cc803 100644 --- a/Assets/GWConquest/Scripts/UnitClass.cs +++ b/Assets/GWConquest/Scripts/UnitClass.cs @@ -108,7 +108,7 @@ namespace GWConquest if(zoneType == ZoneType.Space) { - unitClass.FactoryType = FactoryType.Space; + unitClass.FactoryType = DistrictType.SpaceStation; unitClass.AttackRange = data.GetInt("Attack Range"); } else @@ -116,13 +116,13 @@ namespace GWConquest switch(data.GetString("Factory Type")) { case "City": - unitClass.FactoryType = FactoryType.City; + unitClass.FactoryType = DistrictType.Civil; break; case "Infantry": - unitClass.FactoryType = FactoryType.Infantry; + unitClass.FactoryType = DistrictType.FactoryInfantry; break; case "Armour": - unitClass.FactoryType = FactoryType.Armour; + unitClass.FactoryType = DistrictType.FactoryArmor; break; } } @@ -332,7 +332,7 @@ namespace GWConquest public int MinFactoryTier = 1; - public FactoryType FactoryType; + public DistrictType FactoryType; public bool CanBeBuilt = true; diff --git a/Assets/GWConquest/Textures/Icons/DistrictCivil.PNG b/Assets/GWConquest/Textures/Icons/DistrictCivil.PNG index 15228017898af4b3e19e1a8c26d9d8246217de9c..e382778235ed20d34af2607dc45471e6a58ca49f 100644 GIT binary patch literal 11253 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 W=JpW%;89(a?jgf(vbDbZ@qYk+uyIlV literal 40658 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�|}UYd4~Pms^xh_iO+J^KrA1!dELMElK&Fehj4w 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 literal 0 HcmV?d00001 diff --git a/Assets/GWConquest/Textures/Icons/DistrictCivil1.png.meta b/Assets/GWConquest/Textures/Icons/DistrictCivil1.png.meta new file mode 100644 index 0000000..70f61b8 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/DistrictCivil1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 08be6493f337d874fa8d62ec0922ed93 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/DistrictCivil2.png b/Assets/GWConquest/Textures/Icons/DistrictCivil2.png new file mode 100644 index 0000000000000000000000000000000000000000..9c058aed3c995e89da8bb9b65b50d149c1756836 GIT binary patch literal 10316 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 zun LJCc3q+?D?aJgt$j literal 0 HcmV?d00001 diff --git a/Assets/GWConquest/Textures/Icons/DistrictCivil2.png.meta b/Assets/GWConquest/Textures/Icons/DistrictCivil2.png.meta new file mode 100644 index 0000000..9fffe42 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/DistrictCivil2.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: bd69db5c0d9fa824db9b1dad98b0dc39 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: