diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll
index 48d5048d..c6967967 100644
Binary files a/1.6/1.6/Assemblies/WulaFallenEmpire.dll and b/1.6/1.6/Assemblies/WulaFallenEmpire.dll differ
diff --git a/1.6/1.6/Defs/CQFPartDefs/Map/Wula_PIA_Legion_Escort_Traitor_Map.xml b/1.6/1.6/Defs/CQFPartDefs/Map/Wula_PIA_Legion_Escort_Traitor_Map.xml
index 0b1c449f..927b62c0 100644
--- a/1.6/1.6/Defs/CQFPartDefs/Map/Wula_PIA_Legion_Escort_Traitor_Map.xml
+++ b/1.6/1.6/Defs/CQFPartDefs/Map/Wula_PIA_Legion_Escort_Traitor_Map.xml
@@ -3,12 +3,36 @@
Wula_PIA_Legion_Escort_Traitor_Map
- (64, 1, 64)
+ (50, 1, 46)
true
0
- (32, 0, 31)
+ (18, 0, 17)
+
+
+ AttackerC
+ Wula_PIA_Light_Unit
+ 1
+ AncientsHostile
+ MapGeneration
+
+
+
+
+ (25, 0, 17)
+
+
+ AttackerB
+ Wula_PIA_Light_Unit
+ 1
+ AncientsHostile
+ MapGeneration
+
+
+
+
+ (21, 0, 21)
Traitor
@@ -22,253 +46,272 @@
+
+ (27, 0, 23)
+
+
+ AttackerA
+ Wula_PIA_Light_Unit
+ 1
+ AncientsHostile
+ MapGeneration
+
+
+
WulaFloor
- (23,25,50,35)
- (28,23,42,24)
- (32,20,34,22)
- (31,22,31,22)
- (35,21,37,22)
- (39,18,41,22)
- (38,22,38,22)
- (43,24,45,24)
- (34,36,48,36)
- (34,37,47,37)
- (34,38,46,38)
- (35,39,46,40)
- (37,41,46,43)
- (37,44,44,46)
+ (12,15,39,25)
+ (17,13,31,14)
+ (21,10,23,12)
+ (20,12,20,12)
+ (24,11,26,12)
+ (28,8,30,12)
+ (27,12,27,12)
+ (23,26,37,26)
+ (32,14,34,14)
+ (23,27,36,27)
+ (23,28,35,28)
+ (24,29,35,30)
+ (26,31,35,33)
+ (26,34,33,36)
- WULA_GlobalStorageSenderPod
- Wula_PIA_Legion_Faction
+ Sandbags
+ Cloth
+ WULA_Awakened_Synth
- (40,42,40,42)
- (42,42,42,42)
-
-
-
- WULA_OrbitalTradeBeacon
- Wula_PIA_Legion_Faction
-
- (40,27,40,27)
- (41,43,41,43)
-
-
-
- WulaWall
- Wula_PIA_Legion_Faction
-
- (22,23,24,24)
- (22,25,22,25)
- (27,20,32,20)
- (19,28,22,28)
- (26,22,27,23)
- (27,21,28,21)
- (25,24,26,24)
- (19,29,19,32)
- (22,27,22,27)
- (34,16,39,17)
- (21,33,22,35)
- (37,18,38,21)
- (22,36,23,37)
- (29,31,29,36)
- (37,22,37,25)
- (24,37,24,38)
- (30,33,30,36)
- (25,38,27,38)
- (41,20,42,21)
- (42,22,48,22)
- (31,36,33,36)
- (43,23,48,23)
- (33,37,33,38)
- (48,24,48,28)
- (46,28,47,28)
- (35,41,36,47)
- (51,26,52,31)
- (37,47,45,47)
- (51,33,52,37)
- (47,41,48,43)
- (45,44,47,44)
- (45,45,46,46)
-
-
-
- Filth_RubbleBuilding
-
- (20,26,22,26)
- (29,18,29,18)
- (32,19,32,19)
- (33,18,33,18)
- (20,32,20,33)
- (39,18,40,18)
- (40,19,40,19)
- (29,37,31,37)
- (28,38,28,38)
- (42,28,42,28)
- (36,36,36,36)
- (35,38,35,38)
- (34,40,34,40)
- (38,37,38,37)
- (50,24,50,24)
- (33,45,33,45)
- (41,38,41,38)
- (51,25,51,25)
- (52,24,52,24)
- (50,35,50,35)
- (49,40,50,40)
- (50,39,52,39)
-
-
-
- Filth_Trash
-
- (29,25,29,25)
- (25,29,25,29)
- (35,23,36,23)
- (42,29,42,29)
- (45,32,45,32)
+ (5,9,8,9)
+ (5,10,5,12)
+ (16,4,17,4)
+ (16,5,16,6)
+ (17,3,19,3)
+ (3,18,4,18)
+ (3,19,3,21)
+ (4,21,4,21)
+ (23,1,26,1)
+ (6,29,6,30)
+ (7,30,7,31)
+ (8,31,9,31)
+ (34,2,36,2)
+ (36,3,36,3)
+ (6,36,6,39)
+ (38,6,41,6)
+ (7,39,9,39)
+ (41,7,41,9)
+ (17,39,17,41)
+ (21,39,21,41)
+ (18,41,20,41)
+ (44,19,46,19)
+ (27,42,31,42)
+ (45,22,46,22)
+ (46,20,46,21)
+ (45,27,46,27)
+ (46,28,46,29)
+ (32,44,34,44)
+ (41,38,41,41)
+ (38,41,40,41)
+ (48,32,48,34)
Filth_Slime
- (18,15,18,15)
- (21,24,21,24)
- (31,12,31,12)
- (28,26,28,26)
- (15,36,15,36)
- (32,24,32,24)
- (41,13,41,13)
- (40,24,40,24)
- (22,42,22,42)
- (31,41,31,41)
- (45,27,45,27)
- (54,13,54,13)
- (30,47,30,47)
- (47,32,47,32)
- (44,38,44,38)
- (52,41,52,41)
- (45,50,45,50)
-
-
-
- Corpse_WulaSpecies
- 2
-
- (18,15,18,15)
- (21,24,21,24)
- (31,12,31,12)
- (28,26,28,26)
- (15,36,15,36)
- (32,24,32,24)
- (41,13,41,13)
- (40,24,40,24)
- (22,42,22,42)
- (31,41,31,41)
- (45,27,45,27)
- (54,13,54,13)
- (30,47,30,47)
- (47,32,47,32)
- (44,38,44,38)
- (52,41,52,41)
- (45,50,45,50)
+ (7,5,7,5)
+ (10,14,10,14)
+ (20,2,20,2)
+ (17,16,17,16)
+ (21,14,21,14)
+ (4,26,4,26)
+ (30,3,30,3)
+ (29,14,29,14)
+ (11,32,11,32)
+ (20,31,20,31)
+ (34,17,34,17)
+ (19,37,19,37)
+ (36,22,36,22)
+ (43,3,43,3)
+ (33,28,33,28)
+ (41,31,41,31)
+ (34,40,34,40)
WULA_Wall_Flag_Building
Wula_PIA_Legion_Faction
- (34,15,34,15)
- (39,15,39,15)
+ (23,5,23,5)
+ (28,5,28,5)
+
+
+
+ WulaWall
+ Wula_PIA_Legion_Faction
+
+ (11,13,13,14)
+ (11,15,11,15)
+ (16,10,21,10)
+ (15,12,16,13)
+ (16,11,17,11)
+ (8,18,11,18)
+ (14,14,15,14)
+ (11,17,11,17)
+ (8,19,8,22)
+ (23,6,28,7)
+ (10,23,11,25)
+ (26,8,27,11)
+ (18,21,18,26)
+ (11,26,12,27)
+ (26,12,26,15)
+ (19,23,19,26)
+ (13,27,13,28)
+ (14,28,16,28)
+ (30,10,31,11)
+ (20,26,22,26)
+ (31,12,37,12)
+ (32,13,37,13)
+ (22,27,22,28)
+ (24,31,25,37)
+ (35,18,37,18)
+ (37,14,37,17)
+ (40,16,41,21)
+ (26,37,34,37)
+ (40,23,41,27)
+ (36,31,37,33)
+ (34,34,36,34)
+ (34,35,35,36)
+
+
+
+ WULA_Holographic_Flag_Building
+ Wula_PIA_Legion_Faction
+
+ (13,7,13,7)
+ (34,7,34,7)
+ (14,33,14,33)
+ (41,35,41,35)
Wula_Base_Laser_Turret
Wula_PIA_Legion_Faction
- (18,21,18,21)
- (19,47,19,47)
- (50,18,50,18)
- (50,49,50,49)
+ (7,11,7,11)
+ (8,37,8,37)
+ (39,8,39,8)
+ (39,39,39,39)
- Corpse_Wula_AI_Heavy_Panzer
- 2
- (42,0,30)
-
-
- WULA_Holographic_Flag_Building
- Wula_PIA_Legion_Faction
+ Filth_RubbleBuilding
- (24,17,24,17)
- (45,17,45,17)
- (25,43,25,43)
- (52,45,52,45)
+ (9,16,11,16)
+ (18,8,18,8)
+ (21,9,21,9)
+ (22,8,22,8)
+ (9,22,9,23)
+ (28,8,29,8)
+ (29,9,29,9)
+ (18,27,20,27)
+ (17,28,17,28)
+ (31,18,31,18)
+ (25,26,25,26)
+ (24,28,24,28)
+ (23,30,23,30)
+ (27,27,27,27)
+ (30,28,30,28)
+ (22,35,22,35)
+ (39,14,39,14)
+ (40,15,40,15)
+ (41,14,41,14)
+ (39,25,39,25)
+ (38,30,39,30)
+ (39,29,41,29)
WulaDoor
Wula_PIA_Legion_Faction
- (40,0,20)
+ (29,0,10)
- Stool
- WULA_Alloy
- Wula_PIA_Legion_Faction
- (31,0,34)
+ AncientTank
+ (45,0,12)
- WULA_Cube_Productor
- Wula_PIA_Legion_Faction
- (31,0,35)
+ Filth_Trash
+
+ (18,15,18,15)
+ (14,19,14,19)
+ (24,13,25,13)
+ (31,19,31,19)
+ (34,22,34,22)
+
WULA_Charging_Station_Synth
Wula_PIA_Legion_Faction
- (43,24,43,24)
- (45,24,45,24)
- (47,24,47,24)
+ (32,14,32,14)
+ (34,14,34,14)
+ (36,14,36,14)
WULA_Machine_Recharger
Wula_PIA_Legion_Faction
- (25,27,25,27)
- (25,32,25,32)
+ (14,17,14,17)
+ (14,22,14,22)
- AncientTank
- PlayerColony
- (56,0,22)
+ WULA_OrbitalTradeBeacon
+ Wula_PIA_Legion_Faction
+
+ (29,17,29,17)
+ (30,33,30,33)
+
+
+
+ ChessTable
+ WoodLog
+ WULA_Awakened_Synth
+ (35,0,17)
+
+
+ Stool
+ WULA_Alloy
+ Wula_PIA_Legion_Faction
+ (20,0,24)
+
+
+ WULA_Cube_Productor
+ Wula_PIA_Legion_Faction
+ (20,0,25)
AncientPipes
- PlayerColony
- (10,38,13,38)
- (10,39,11,41)
- (13,39,13,39)
- (18,37,18,37)
+ (7,27,7,27)
+ (0,28,2,28)
+ (0,29,0,31)
+ (2,29,2,29)
+
+
+
+ WULA_GlobalStorageSenderPod
+ Wula_PIA_Legion_Faction
+
+ (29,32,29,32)
+ (31,32,31,32)
-
-
- default
-
-
-
-
\ No newline at end of file
diff --git a/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml b/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml
index f3ae02a8..c43de112 100644
--- a/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml
+++ b/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml
@@ -282,6 +282,25 @@
+
+ WULA_Mech_Drop
+
+ true
+ {0} has been EMPed to death.
+ false
+ Electric
+ 50
+ 0
+
+
+ Explosion_Vaporize
+ Damage_EMP
+ true
+ EMPResistance
+ 2200
+ GiantExplosion
+
WULA_Mech_EMP_Drop
diff --git a/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml b/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
index 9cbfceaf..9f9ecd9e 100644
--- a/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
+++ b/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
@@ -196,6 +196,31 @@
Wula_AI_Heavy_Panzer_Weapon
+
+ Wula_Mech_Mobile_Shield
+
+ Wula_Mech_Mobile_Shield
+ 500
+ false
+ PlayerColony
+ false
+
+
+
+
+ Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin
+ Wula/Things/WULA_Cat/AllegianceOverlays/None
+ CutoutWithOverlay
+ Graphic_Multi
+ 5
+
+ (1.4, 1.8, 1.4)
+
+
+
+
+ 0.7
+
WULA_Mobile_Bunker
diff --git a/1.6/1.6/Defs/PrefabDefs/WULA_Prefabs.xml b/1.6/1.6/Defs/PrefabDefs/WULA_Prefabs.xml
index 1091c80b..e1e4b596 100644
--- a/1.6/1.6/Defs/PrefabDefs/WULA_Prefabs.xml
+++ b/1.6/1.6/Defs/PrefabDefs/WULA_Prefabs.xml
@@ -1,8 +1,8 @@
-
- NewPrefab
- (13,14)
-
+
+ NewPrefab
+ (13,14)
+
WULA_NewColonyBase
diff --git a/1.6/1.6/Defs/QuestScriptDefs/WULA_Kill_PIA_Legion_Escort_Traitor.xml b/1.6/1.6/Defs/QuestScriptDefs/WULA_Kill_PIA_Legion_Escort_Traitor.xml
index 26df724f..3c76c92e 100644
--- a/1.6/1.6/Defs/QuestScriptDefs/WULA_Kill_PIA_Legion_Escort_Traitor.xml
+++ b/1.6/1.6/Defs/QuestScriptDefs/WULA_Kill_PIA_Legion_Escort_Traitor.xml
@@ -17,9 +17,9 @@
0
true
false
- 4
- true
- false
+ 4
+ true
+ false
@@ -59,7 +59,7 @@
- Traitor.0.TookDamageFromPlayer
+ Traitor.0.TookDamage
AncientsHostile
@@ -67,6 +67,9 @@
Traitor.0.Killed
+
+
+ Traitor.0.FinallyHostile
Success
true
diff --git a/1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml b/1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml
index 8096f35f..eb0f5ff3 100644
--- a/1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml
+++ b/1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml
@@ -334,10 +334,21 @@
WULA_Colony_License_LV1_Technology
+
+ Wula_Fusion_Generators_Technology
+ 1.00
+ 3.80
+
+ 允许殖民地申请空投聚变发电机，一种输出功率不高但是维护极其容易的发电机。
+ 600
+
+ WULA_Colony_License_LV1_Technology
+
+
WULA_DarkEnergy_Generators_Technology
- 10.00
- 2.70
+ 9.00
+ 3.80
允许殖民地申请空投暗物质发电机，一种输出功率极为恐怖却非常消耗资源的发电机。
600
@@ -388,7 +399,21 @@
5.00
5.60
- 允许殖民地申请空投HAp-6"战车"，乌拉帝国的中型战争机械，以悬浮的方式穿梭于战场之上，使用穿透力强大的战车炮和导弹打击敌方。
+ 允许殖民地申请空投HAp-6"战车"，乌拉帝国的中型战争机械，以悬浮的方式穿梭于战场之上，使用穿透力强大的战车炮、火箭弹和臼炮打击敌方。
+ 800
+
+ WULA_Synth_Productor_Technology
+
+
+ WULA_Colony_License_LV2_Technology
+
+
+
+ Wula_Mech_Mobile_Shield_Technology
+ 6.00
+ 5.60
+
+ 允许殖民地申请空投MSm-8"放射盾"，乌拉帝国的中型战争机械，一种多足机械体，拥有密不透风的反射盾的同时，还可以灼烧那些企图进入护盾区域内的宵小之辈。
800
WULA_Synth_Productor_Technology
diff --git a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml
index 1efa9094..097f9994 100644
--- a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml
+++ b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml
@@ -43,7 +43,7 @@
(1,1)
0
- 1
+ 0
WULA_Structure_Technology
@@ -57,6 +57,7 @@
BuildingDestroyed_Metal_Small
false
false
+ false
WULA_Buildings
@@ -446,7 +447,7 @@
(3,3)
0
- 1
+ 0
WULA_Synth_Maintain_Technology
@@ -645,7 +646,7 @@
0
0
- 1
+ 0
40
2
@@ -876,7 +877,7 @@
(3,3)
0
- 1
+ 0
20
1
@@ -1044,7 +1045,7 @@
(1,2)
0
- 1
+ 0
30
1
@@ -1204,7 +1205,7 @@
(1,1)
0
- 1
+ 0
50
1
@@ -1380,7 +1381,7 @@
(5,5)
0
- 1
+ 0
50
2
@@ -1569,7 +1570,7 @@
false
Light
- WULA_DarkEnergy_Generators_Technology
+ Wula_Fusion_Generators_Technology
1
@@ -1579,7 +1580,7 @@
(3,3)
0
- 1
+ 0
40
2
@@ -1736,4 +1737,4 @@
-
\ No newline at end of file
+
diff --git a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Mech_Buildings.xml b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Mech_Buildings.xml
index aaf0fd47..79627ca5 100644
--- a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Mech_Buildings.xml
+++ b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Mech_Buildings.xml
@@ -49,7 +49,7 @@
(3,3)
0
- 1
+ 0
BuildingDestroyed_Metal_Small
@@ -96,7 +96,7 @@
6
- WULA_Mech_EMP_Drop
+ WULA_Mech_Drop
0
@@ -161,7 +161,7 @@
(3,3)
0
- 1
+ 0
BuildingDestroyed_Metal_Small
@@ -208,7 +208,7 @@
6
- WULA_Mech_EMP_Drop
+ WULA_Mech_Drop
0
@@ -223,6 +223,118 @@
+
+
+
+ WULA_Mobile_Shield_Cleanzone
+
+ 清理出一块场地并准备好资源，使得乌拉帝国母舰可以向此处投放大型战争机械。建造好的信标可以收起或移至他处。\n\n放射盾是乌拉帝国的中型战争机械，常被用于镇压异族聚居地的暴动。它形状非常奇怪，根本分不出头在哪，但是不要因此小瞧这个机械体——它能释放强大的立场盾，在很大一片区域内反射大量炮火，并且机体放射出来的辐射会严重地杀伤进入反射盾范围内的敌人。在相关许可开放后，它甚至可以支持机械乌拉使用其内置的相位场进行区域传送。
+ Wula/Things/WULA_Mobile_Shield/WULA_Mobile_Shield_Incoming
+ 1.33
+ (0, -0.1)
+ MinifiedThing
+ Normal
+
+ Wula_AI_Heavy_Panzer
+
+
+ BuildingsMisc
+
+
+ Wula/Building/WULA_Dropping_Building_Cleanzone
+ Graphic_Multi
+ (3,3)
+
+ false
+
+
+
+ 300
+ 18
+ 2
+ 50
+
+ Building
+ PassThroughOnly
+ false
+ 0.5
+ false
+ 0
+ false
+ false
+
+ Wula_AI_Heavy_Panzer_Technology
+
+
+ 1
+ 1
+ 1
+ 0
+
+ (3,3)
+ 0
+ 0
+
+ BuildingDestroyed_Metal_Small
+
+
+ WulaFallenEmpire.PlaceWorker_CustomRadius
+
+ WULA_Buildings
+
+
+ WULA_Mobile_Shield_Incoming
+ true
+ 1
+ true
+ false
+
+
+
+
+ WULA_Mobile_Shield_Incoming
+
+ (1,1)
+ WulaFallenEmpire.Skyfaller_PawnSpawner
+
+ Wula/Things/WULA_Mobile_Shield/WULA_Mobile_Shield_Incoming
+ Graphic_Single
+ CutoutFlying
+ (5,5)
+
+
+ Accelerate
+ Things/Skyfaller/SkyfallerShadowDropPod
+ (5, 5)
+ DropPod_Fall
+ 100
+ Explosion_Vaporize
+ 0.05
+ 1
+ 1
+
+
+ (0,0)
+ (1, 1)
+
+
+
+ 6
+ WULA_Mech_Drop
+ 0
+
+
+
+ Smoke_Joint
+
+
+ Wula_Mech_Mobile_Shield
+ PlayerColony
+ true
+ false
+
+
+
@@ -272,7 +384,7 @@
(3,3)
0
- 1
+ 0
BuildingDestroyed_Metal_Small
diff --git a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Prefab_Beacons.xml b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Prefab_Beacons.xml
index e7c9fc21..5d0993f0 100644
--- a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Prefab_Beacons.xml
+++ b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Prefab_Beacons.xml
@@ -96,6 +96,9 @@
Smoke_Joint
+
+
+
\ No newline at end of file
diff --git a/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml
index 9cd28d05..2915ac59 100644
--- a/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml
+++ b/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml
@@ -1374,6 +1374,107 @@
+
+ Wula_Mech_Mobile_Shield
+
+ 乌拉帝国的中型战争机械，常被用于镇压异族聚居地的暴动。它形状非常奇怪，根本分不出头在哪，但是不要因此小瞧这个机械体——它能释放强大的立场盾，在很大一片区域内反射大量炮火，并且机体放射出来的辐射会严重地杀伤进入反射盾范围内的敌人。在相关许可开放后，它甚至可以支持机械乌拉使用其内置的相位场进行区域传送。
+
+
+ true
+ true
+
+
+ false
+
+
+
+ 1
+ 3
+
+
+ Mech_Warqueen
+ 50
+
+
+ MechanoidFullyFormed
+ 0
+ Pawn_Wula_Mech_Mobile_Factory_Call
+
+
+ 5
+
+
+
+
+
+ Blunt
+
+ 360
+ 8
+ Torso
+ true
+
+
+
+
+
+ 15
+ 300
+ 2400
+ 30
+
+
+ Interceptor_BlockedProjectile
+ Interceptor_BlockedProjectile
+ Shield_Break
+ BulletShieldGenerator_Reactivate
+
+ (0.9, 0.2, 0.2, 0.5)
+
+
+ true
+ false
+ true
+
+
+ true
+ 0.85
+ 30
+ 0
+ Interceptor_BlockedProjectile
+
+
+ 15
+ 30
+ Wula_Dark_Matter_Beam
+ 15
+ false
+ false
+ false
+ true
+ false
+ false
+ false
+ 热辐射
+ MSm-8"放射盾"可以打开外壳，蒸发胆敢靠近其的敌军——这同时会使得它伤害附近所有的散落物品。
+ Wula/UI/Commands/Wula_Psi_Titan_AreaDamage
+
+
+
+ 20
+ 60
+
+
+ WulaSpecies
+
+ true
+
+ Skip_Entry
+ Skip_Exit
+ Psycast_Skip_Entry
+
+
+
Wula_Mech_Mobile_Factory
@@ -1695,21 +1796,6 @@
MFm-2"陆行舰"可以将舰身稍微下沉一些并创造低压区，以碾压靠近的敌军——这同时会使得它伤害附近所有的散落物品。
Wula/UI/Commands/Wula_Mech_Mobile_Factory_AreaDamage
-
-
-
- 20
- 60
-
-
- WulaSpecies
-
- true
-
- Skip_Entry
- Skip_Exit
- Psycast_Skip_Entry
-
diff --git a/Content/Textures/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_east.png b/Content/Textures/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_east.png
new file mode 100644
index 00000000..5b5d3a2e
Binary files /dev/null and b/Content/Textures/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_east.png differ
diff --git a/Content/Textures/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_north.png b/Content/Textures/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_north.png
new file mode 100644
index 00000000..5b5d3a2e
Binary files /dev/null and b/Content/Textures/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_north.png differ
diff --git a/Content/Textures/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_south.png b/Content/Textures/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_south.png
new file mode 100644
index 00000000..5b5d3a2e
Binary files /dev/null and b/Content/Textures/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_south.png differ
diff --git a/Content/Textures/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_west.png b/Content/Textures/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_west.png
new file mode 100644
index 00000000..5b5d3a2e
Binary files /dev/null and b/Content/Textures/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_west.png differ
diff --git a/Content/Textures/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_east.png b/Content/Textures/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_east.png
new file mode 100644
index 00000000..c5dbe5aa
Binary files /dev/null and b/Content/Textures/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_east.png differ
diff --git a/Content/Textures/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_north.png b/Content/Textures/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_north.png
new file mode 100644
index 00000000..c5dbe5aa
Binary files /dev/null and b/Content/Textures/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_north.png differ
diff --git a/Content/Textures/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_south.png b/Content/Textures/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_south.png
new file mode 100644
index 00000000..c5dbe5aa
Binary files /dev/null and b/Content/Textures/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_south.png differ
diff --git a/Content/Textures/Wula/Things/WULA_Mobile_Shield/WULA_Mobile_Shield_Icon.png b/Content/Textures/Wula/Things/WULA_Mobile_Shield/WULA_Mobile_Shield_Icon.png
new file mode 100644
index 00000000..5b5d3a2e
Binary files /dev/null and b/Content/Textures/Wula/Things/WULA_Mobile_Shield/WULA_Mobile_Shield_Icon.png differ
diff --git a/Content/Textures/Wula/Things/WULA_Mobile_Shield/WULA_Mobile_Shield_Incoming.png b/Content/Textures/Wula/Things/WULA_Mobile_Shield/WULA_Mobile_Shield_Incoming.png
new file mode 100644
index 00000000..41c8e8cd
Binary files /dev/null and b/Content/Textures/Wula/Things/WULA_Mobile_Shield/WULA_Mobile_Shield_Incoming.png differ
diff --git a/Source/WulaFallenEmpire/BuildingComp/WULA_MechanoidRecycler/Building_MechanoidRecycler.cs b/Source/WulaFallenEmpire/BuildingComp/WULA_MechanoidRecycler/Building_MechanoidRecycler.cs
index 31a5aeef..d84b9bf8 100644
--- a/Source/WulaFallenEmpire/BuildingComp/WULA_MechanoidRecycler/Building_MechanoidRecycler.cs
+++ b/Source/WulaFallenEmpire/BuildingComp/WULA_MechanoidRecycler/Building_MechanoidRecycler.cs
@@ -4,6 +4,7 @@ using System.Text;
using UnityEngine;
using Verse;
using Verse.AI;
+using LudeonTK;
namespace WulaFallenEmpire
{
@@ -222,6 +223,23 @@ namespace WulaFallenEmpire
}
yield return spawnCommand;
+
+ // 开发模式按钮：立即结束冷却
+ if (Prefs.DevMode && IsCooldownActive)
+ {
+ Command_Action devCommand = new Command_Action
+ {
+ defaultLabel = "Dev: 立即结束冷却",
+ defaultDesc = "立即结束转换冷却时间",
+ action = () =>
+ {
+ // 将生成时间设置为足够早，使冷却立即结束
+ spawnTick = Find.TickManager.TicksGame - (24 * 2500 + 1);
+ Messages.Message("转换冷却已立即结束", MessageTypeDefOf.SilentInput);
+ }
+ };
+ yield return devCommand;
+ }
}
// 回收附近机械族
@@ -334,6 +352,22 @@ namespace WulaFallenEmpire
return Mathf.Max(0, remainingTicks / 2500f);
}
+ // 开发模式方法：立即结束冷却
+ [DebugAction("机械族回收器", "立即结束冷却", actionType = DebugActionType.Action, allowedGameStates = AllowedGameStates.Playing)]
+ public static void DevEndCooldown()
+ {
+ Building_MechanoidRecycler selectedRecycler = Find.Selector.SingleSelectedThing as Building_MechanoidRecycler;
+ if (selectedRecycler != null)
+ {
+ selectedRecycler.spawnTick = Find.TickManager.TicksGame - (24 * 2500 + 1);
+ Messages.Message("转换冷却已立即结束", MessageTypeDefOf.SilentInput);
+ }
+ else
+ {
+ Messages.Message("请先选择一个机械族回收器", MessageTypeDefOf.RejectInput);
+ }
+ }
+
public override void ExposeData()
{
base.ExposeData();
diff --git a/Source/WulaFallenEmpire/BuildingComp/WULA_SkyfallerCaller/Skyfaller_PrefabSpawner.cs b/Source/WulaFallenEmpire/BuildingComp/WULA_SkyfallerCaller/Skyfaller_PrefabSpawner.cs
index 6a6a7109..778c79b2 100644
--- a/Source/WulaFallenEmpire/BuildingComp/WULA_SkyfallerCaller/Skyfaller_PrefabSpawner.cs
+++ b/Source/WulaFallenEmpire/BuildingComp/WULA_SkyfallerCaller/Skyfaller_PrefabSpawner.cs
@@ -6,6 +6,7 @@ namespace WulaFallenEmpire
public class Skyfaller_PrefabSpawner : Skyfaller
{
public string prefabDefName;
+ private Faction prefabFaction; // 缓存派系信息
protected override void SpawnThings()
{
@@ -23,8 +24,30 @@ namespace WulaFallenEmpire
return;
}
+ // 获取派系信息
+ Faction faction = GetPrefabFaction();
+
// Correct parameter order based on compiler error: prefabDef, map, position, rotation
- PrefabUtility.SpawnPrefab(prefabDef, base.Map, base.Position, base.Rotation);
+ PrefabUtility.SpawnPrefab(prefabDef, base.Map, base.Position, base.Rotation, faction);
+ }
+
+ private Faction GetPrefabFaction()
+ {
+ // 如果已经缓存了派系信息，直接返回
+ if (prefabFaction != null)
+ return prefabFaction;
+
+ // 检查是否有 CompSkyfallerFaction 组件
+ var factionComp = this.TryGetComp();
+ if (factionComp != null)
+ {
+ prefabFaction = factionComp.GetFactionForPrefab();
+ return prefabFaction;
+ }
+
+ // 如果没有组件，默认使用玩家派系
+ prefabFaction = Faction.OfPlayer;
+ return prefabFaction;
}
public override void ExposeData()
@@ -33,4 +56,4 @@ namespace WulaFallenEmpire
Scribe_Values.Look(ref prefabDefName, "prefabDefName");
}
}
-}
\ No newline at end of file
+}
diff --git a/Source/WulaFallenEmpire/BuildingComp/WULA_SkyfallerCaller/WULA_SkyfallerFactioncs/CompProperties_SkyfallerFaction.cs b/Source/WulaFallenEmpire/BuildingComp/WULA_SkyfallerCaller/WULA_SkyfallerFactioncs/CompProperties_SkyfallerFaction.cs
new file mode 100644
index 00000000..edc022dc
--- /dev/null
+++ b/Source/WulaFallenEmpire/BuildingComp/WULA_SkyfallerCaller/WULA_SkyfallerFactioncs/CompProperties_SkyfallerFaction.cs
@@ -0,0 +1,16 @@
+using RimWorld;
+using Verse;
+
+namespace WulaFallenEmpire
+{
+ public class CompProperties_SkyfallerFaction : CompProperties
+ {
+ public FactionDef factionDef;
+ public bool usePlayerFactionIfNull = true; // 如果 factionDef 为 null 时使用玩家派系
+
+ public CompProperties_SkyfallerFaction()
+ {
+ compClass = typeof(CompSkyfallerFaction);
+ }
+ }
+}
diff --git a/Source/WulaFallenEmpire/BuildingComp/WULA_SkyfallerCaller/WULA_SkyfallerFactioncs/CompSkyfallerFaction.cs b/Source/WulaFallenEmpire/BuildingComp/WULA_SkyfallerCaller/WULA_SkyfallerFactioncs/CompSkyfallerFaction.cs
new file mode 100644
index 00000000..949fd790
--- /dev/null
+++ b/Source/WulaFallenEmpire/BuildingComp/WULA_SkyfallerCaller/WULA_SkyfallerFactioncs/CompSkyfallerFaction.cs
@@ -0,0 +1,30 @@
+using RimWorld;
+using Verse;
+
+namespace WulaFallenEmpire
+{
+ public class CompSkyfallerFaction : ThingComp
+ {
+ public CompProperties_SkyfallerFaction Props => (CompProperties_SkyfallerFaction)props;
+
+ public Faction GetFactionForPrefab()
+ {
+ // 如果指定了派系定义，使用该派系
+ if (Props.factionDef != null)
+ {
+ Faction faction = Find.FactionManager.FirstFactionOfDef(Props.factionDef);
+ if (faction != null)
+ return faction;
+ }
+
+ // 如果没有指定派系定义，根据设置决定
+ if (Props.usePlayerFactionIfNull)
+ {
+ return Faction.OfPlayer;
+ }
+
+ // 如果都不满足，返回 null（使用默认行为）
+ return null;
+ }
+ }
+}
diff --git a/Source/WulaFallenEmpire/BuildingComp/WULA_TransformAtFullCapacity/CompTransformAtFullCapacity.cs b/Source/WulaFallenEmpire/BuildingComp/WULA_TransformAtFullCapacity/CompTransformAtFullCapacity.cs
index 05f359b5..44d550ad 100644
--- a/Source/WulaFallenEmpire/BuildingComp/WULA_TransformAtFullCapacity/CompTransformAtFullCapacity.cs
+++ b/Source/WulaFallenEmpire/BuildingComp/WULA_TransformAtFullCapacity/CompTransformAtFullCapacity.cs
@@ -114,12 +114,12 @@ namespace WulaFallenEmpire
Pawn newPawn = PawnGenerator.GeneratePawn(request);
- // 添加转换组件，只传递建筑定义，不传递数量
+ // 关键修改：传递当前的机械族数量（6个）
var transformComp = newPawn.GetComp();
if (transformComp != null)
{
- // 只设置建筑定义，不设置恢复数量
- transformComp.SetRestoreData(parent.def);
+ // 传递建筑定义和机械族数量
+ transformComp.SetRestoreData(parent.def, Props.requiredCapacity);
}
else
{
@@ -133,8 +133,8 @@ namespace WulaFallenEmpire
transformComp.props = compProps;
newPawn.AllComps.Add(transformComp);
transformComp.Initialize(compProps);
- // 只设置建筑定义，不设置恢复数量
- transformComp.SetRestoreData(parent.def);
+ // 传递建筑定义和机械族数量
+ transformComp.SetRestoreData(parent.def, Props.requiredCapacity);
}
// 移除建筑
@@ -149,7 +149,8 @@ namespace WulaFallenEmpire
Find.Selector.Select(newPawn);
}
- Messages.Message("WULA_BuildingTransformedToPawn".Translate(parent.Label, newPawn.LabelCap), MessageTypeDefOf.PositiveEvent);
+ Messages.Message("WULA_BuildingTransformedToPawn".Translate(parent.Label, newPawn.LabelCap, Props.requiredCapacity),
+ MessageTypeDefOf.PositiveEvent);
// 播放转换效果
PlayTransformEffects(position, map);
diff --git a/Source/WulaFallenEmpire/BuildingComp/WULA_TransformAtFullCapacity/CompTransformIntoBuilding.cs b/Source/WulaFallenEmpire/BuildingComp/WULA_TransformAtFullCapacity/CompTransformIntoBuilding.cs
index aa084b14..7f4dae02 100644
--- a/Source/WulaFallenEmpire/BuildingComp/WULA_TransformAtFullCapacity/CompTransformIntoBuilding.cs
+++ b/Source/WulaFallenEmpire/BuildingComp/WULA_TransformAtFullCapacity/CompTransformIntoBuilding.cs
@@ -11,8 +11,9 @@ namespace WulaFallenEmpire
private CompProperties_TransformIntoBuilding Props => (CompProperties_TransformIntoBuilding)props;
private Pawn Pawn => (Pawn)parent;
- // 恢复数据 - 只存储建筑定义，不存储数量
+ // 恢复数据 - 存储建筑定义和机械族数量
private ThingDef restoreBuildingDef;
+ private int restoreMechCount = 6; // 默认6个，符合你的需求
// 缓存校验结果
private bool? lastValidationResult = null;
@@ -28,13 +29,14 @@ namespace WulaFallenEmpire
{
base.PostExposeData();
Scribe_Defs.Look(ref restoreBuildingDef, "restoreBuildingDef");
- // 移除存储数量的保存
+ Scribe_Values.Look(ref restoreMechCount, "restoreMechCount", 6); // 默认6个
}
- // 设置恢复数据 - 只设置建筑定义
- public void SetRestoreData(ThingDef buildingDef)
+ // 设置恢复数据 - 设置建筑定义和机械族数量
+ public void SetRestoreData(ThingDef buildingDef, int mechCount = 6)
{
restoreBuildingDef = buildingDef;
+ restoreMechCount = mechCount;
}
public override IEnumerable CompGetGizmosExtra()
@@ -73,6 +75,10 @@ namespace WulaFallenEmpire
sb.AppendLine();
sb.Append("WULA_WillRestoreTo".Translate(restoreBuildingDef.LabelCap));
+ // 显示恢复的机械族数量
+ sb.AppendLine();
+ sb.Append("WULA_RestoreMechCount".Translate(restoreMechCount));
+
// 显示目标建筑的最大存储容量
var recyclerProps = restoreBuildingDef.GetCompProperties();
if (recyclerProps != null)
@@ -231,8 +237,12 @@ namespace WulaFallenEmpire
Building newBuilding = (Building)GenSpawn.Spawn(buildingDef, desiredPosition, map, WipeMode.Vanish);
newBuilding.SetFaction(faction);
- // 不再恢复机械族计数，新建筑为空状态
- // 如果需要，可以在这里设置初始状态，但不再传递之前的数量
+ // 关键修改：恢复机械族数量
+ var recycler = newBuilding as Building_MechanoidRecycler;
+ if (recycler != null)
+ {
+ recycler.SetMechanoidCount(restoreMechCount);
+ }
// 添加建筑转换组件
var transformComp = newBuilding.TryGetComp();
@@ -256,7 +266,8 @@ namespace WulaFallenEmpire
Find.Selector.Select(newBuilding);
}
- Messages.Message("WULA_PawnDeployedAsBuilding".Translate(Pawn.LabelCap, newBuilding.Label), MessageTypeDefOf.PositiveEvent);
+ Messages.Message("WULA_PawnDeployedAsBuilding".Translate(Pawn.LabelCap, newBuilding.Label, restoreMechCount),
+ MessageTypeDefOf.PositiveEvent);
// 播放转换效果
PlayTransformEffects(desiredPosition, map);
diff --git a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj
index 0c1dfd35..d7a47803 100644
--- a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj
+++ b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj
@@ -124,6 +124,8 @@
+
+
diff --git a/美术与文本源文件/Wula/Storyteller/军团/test.png b/美术与文本源文件/Wula/Storyteller/军团/test.png
new file mode 100644
index 00000000..6187eb86
Binary files /dev/null and b/美术与文本源文件/Wula/Storyteller/军团/test.png differ
diff --git a/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_east.png b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_east.png
new file mode 100644
index 00000000..5b5d3a2e
Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_east.png differ
diff --git a/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_east.sai2 b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_east.sai2
new file mode 100644
index 00000000..7660c9a9
Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_east.sai2 differ
diff --git a/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_north.png b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_north.png
new file mode 100644
index 00000000..5b5d3a2e
Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_north.png differ
diff --git a/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_south.png b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_south.png
new file mode 100644
index 00000000..5b5d3a2e
Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_south.png differ
diff --git a/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_west.png b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_west.png
new file mode 100644
index 00000000..5b5d3a2e
Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Bodies/Naked_Thin_west.png differ
diff --git a/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_east.png b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_east.png
new file mode 100644
index 00000000..c5dbe5aa
Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_east.png differ
diff --git a/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_north.png b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_north.png
new file mode 100644
index 00000000..c5dbe5aa
Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_north.png differ
diff --git a/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_south.png b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_south.png
new file mode 100644
index 00000000..c5dbe5aa
Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/Heads/Average_Normal_south.png differ
diff --git a/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/WULA_Mobile_Shield_Icon.png b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/WULA_Mobile_Shield_Icon.png
new file mode 100644
index 00000000..bf2f3c33
Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_Mobile_Shield/WULA_Mobile_Shield_Icon.png differ