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 1522801..e382778 100644 Binary files a/Assets/GWConquest/Textures/Icons/DistrictCivil.PNG and b/Assets/GWConquest/Textures/Icons/DistrictCivil.PNG differ diff --git a/Assets/GWConquest/Textures/Icons/DistrictCivil.PNG.meta b/Assets/GWConquest/Textures/Icons/DistrictCivil.PNG.meta index bf606c9..02ad907 100644 --- a/Assets/GWConquest/Textures/Icons/DistrictCivil.PNG.meta +++ b/Assets/GWConquest/Textures/Icons/DistrictCivil.PNG.meta @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +34,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +49,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 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: 1 platformSettings: - serializedVersion: 3 diff --git a/Assets/GWConquest/Textures/Icons/DistrictCivil1.png b/Assets/GWConquest/Textures/Icons/DistrictCivil1.png new file mode 100644 index 0000000..e9dd0b5 Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/DistrictCivil1.png differ 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 0000000..9c058ae Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/DistrictCivil2.png differ 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: