diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll
index c33f2b7b..86e72bfd 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/BackstoryDefs/Solid/Solid_Adult_WULA.xml b/1.6/1.6/Defs/BackstoryDefs/Solid/Solid_Adult_WULA.xml
index 9f646347..89bf9c97 100644
--- a/1.6/1.6/Defs/BackstoryDefs/Solid/Solid_Adult_WULA.xml
+++ b/1.6/1.6/Defs/BackstoryDefs/Solid/Solid_Adult_WULA.xml
@@ -15,7 +15,7 @@
Thin
- WULA_Trait_Knight
+ WULA_Trait_WhitePaper
100
diff --git a/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml b/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml
index ccd9726a..4362962e 100644
--- a/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml
+++ b/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml
@@ -161,6 +161,48 @@
+
+
+
+ WULA_WM_Disturber_Turret_Damage
+ 等离子干扰
+ WulaFallenEmpire.DamageWorker_ExtraDamage
+ true
+ {0} 被等离子干扰而亡。
+ true
+ Electric
+ 50
+ 0
+
+
+ Explosion_Vaporize
+ Damage_EMP
+ true
+ EMPResistance
+ 2200
+ WULA_Mech_EMP_Drop_Shockwave
+
+
+
+
+
+
Wula_Psi_Damage
@@ -338,6 +380,87 @@
0
+
+ WULA_Disturber_Turret_Bomb
+ 等离子爆炸
+ WulaFallenEmpire.DamageWorker_ExtraDamage
+ 250
+ 2.0
+ 2
+ BlastEMP
+ (0.8, 0.8, 0.8, 0.8)
+ WULA_Disturber_Turret_Bomb_Shockwave
+
+
+
+
+
+
+ WULA_Disturber_Turret_Bomb_Shockwave
+
+
+ SubEffecter_SprayerTriggered
+ Fleck_WULA_Disturber_Turret_Bomb_Shockwave
+ 1
+ OnSource
+ true
+ 0~0
+
+
+ SubEffecter_SprayerTriggered
+ FlashMechBand
+ 1
+ OnSource
+ true
+ 0~0
+
+
+ SubEffecter_SprayerTriggered
+ Mote_RedFlashStrong
+ 1
+ OnSource
+ 24
+
+
+
+
+ Fleck_WULA_Disturber_Turret_Bomb_Shockwave
+ MoteOverheadLow
+ 0.04
+ 0.1
+ 0.8
+ 1.5
+ true
+
+ Graphic_FleckPulse
+ Things/Mote/Black
+ MoteLargeDistortionWave
+ (218,255,200,255)
+
+ <_DistortionTex>/Things/Mote/PsychicDistortionCurrents
+ <_NoiseTex>/Things/Mote/PsycastNoise
+ <_distortionIntensity>0.066
+ <_brightnessMultiplier>1.15
+
+ 15
+
+
+
WULA_DarkMatterBomb
暗物质湮灭爆炸
diff --git a/1.6/1.6/Defs/Effects/WulaFleckDefs.xml b/1.6/1.6/Defs/Effects/WulaFleckDefs.xml
index 638d8176..f34c924f 100644
--- a/1.6/1.6/Defs/Effects/WulaFleckDefs.xml
+++ b/1.6/1.6/Defs/Effects/WulaFleckDefs.xml
@@ -3,12 +3,14 @@
WULA_GunTail_Plasma
Projectile
- 0.05
- 0.1
+ 0.50
+ 1
+ 1.2
+ 0.005
Wula/Mote/WULA_GunTail_Plasma
MoteGlow
- 1.25
+ 3.25
(218,255,200,155)
@@ -68,19 +70,6 @@
0.2
-
- ElectricalSpark_WULA_Plasma_Explosive
-
- Wula/Mote/ElectricalSpark_WULA_Plasma_Explosive
- MoteGlow
-
-
- MoteOverhead
- 0.04
- 0.08
- 0.13
-
-
WULA_Smoke_Tail
diff --git a/1.6/1.6/Defs/QuestScriptDefs/WULA_Boss_Super_Fortress.xml b/1.6/1.6/Defs/QuestScriptDefs/WULA_Boss_Super_Fortress.xml
new file mode 100644
index 00000000..09d4720f
--- /dev/null
+++ b/1.6/1.6/Defs/QuestScriptDefs/WULA_Boss_Super_Fortress.xml
@@ -0,0 +1,664 @@
+
+
+
+ WULA_Boss_Super_Fortress
+ 0
+ true
+ false
+ 4
+ true
+
+
+
+ questName->WULA_Boss_Sky_Lock_questName
+
+
+
+
+ questDescription->WULA_Boss_Sky_Lock_questDescription
+
+
+
+
+
+
+ Wula_Psi_Titan
+ Wula_AI_Rocket_Panzer
+ Wula_AI_Heavy_Panzer
+ WULA_Sky_Lock
+
+
+ Wula_PIA_Legion_Faction
+
+
+
+
+
+
+ WULA_Super_Fortress_Map
+ 1
+
+
+ 5
+ 10
+ Things/Building/Natural/Hive/HiveC
+ Things/Building/Natural/Hive/HiveC
+ site
+ AncientsHostile
+ true
+
+ 5
+ 10
+
+
+
+
+ 灵能泰坦抵达
+ NegativeEvent
+ 在一艘巡洋舰向失控运输舰狠狠撞击后，碎裂的运输舰如流星般坠入边缘世界地表。不过灵能泰坦随后便在地表上被目击——地点已经标记出来了。
+
+
+
+
+ PsiTitan.0.Destroyed
+
+
+
+ 灵能泰坦已停机
+ PositiveEvent
+ 灵能泰坦在殖民者的攻击下已经停止运转，其灵能回路核心已经暴露并掉落。\n\n记得回收灵能回路核心，这是建造新的灵能泰坦所需的材料。
+
+
+ Wula_PIA_Legion_Faction
+ 25
+ WULA_Killed_Psititan
+
+
+ PsiTitan.0.Destroyed
+ WULA_Boss_Sky_Lock_UI_2
+
+
+ Success
+ true
+
+
+
+
+
+
+
+
+ WULA_Killed_Psititan
+ 协助处理失控灵能泰坦
+
+
+ WULA_Super_Fortress_Map
+ 巨型乌拉帝国要塞
+ true
+ (80, 1, 80)
+ true
+ 0
+
+
+ RoofRockThick
+
+ (19,26,60,28)
+ (26,19,53,25)
+ (19,29,28,53)
+ (34,17,45,18)
+ (17,34,18,45)
+ (29,36,62,43)
+ (36,29,43,35)
+ (36,44,43,62)
+ (51,29,60,35)
+ (29,51,35,60)
+ (26,54,28,60)
+ (51,44,62,45)
+ (44,51,60,53)
+ (51,46,60,50)
+ (44,54,53,60)
+ (61,34,62,35)
+ (34,61,35,62)
+ (44,61,45,62)
+
+
+
+
+
+ WulaFloor
+
+ (17,17,26,26)
+ (19,27,60,60)
+ (27,19,62,26)
+ (17,34,18,45)
+ (34,17,45,18)
+ (17,53,18,62)
+ (53,17,62,18)
+ (19,61,26,62)
+ (61,34,62,45)
+ (34,61,45,62)
+ (53,61,62,62)
+ (61,53,62,60)
+
+
+
+
+
+ WulaShelter
+ AncientsHostile
+
+ (10,10,14,10)
+ (10,11,10,14)
+ (11,14,12,14)
+ (14,11,14,12)
+ (12,15,12,22)
+ (15,12,22,12)
+ (16,13,16,14)
+ (13,16,14,16)
+ (20,13,20,14)
+ (13,20,14,20)
+ (10,22,11,22)
+ (22,10,26,10)
+ (22,11,22,11)
+ (10,23,10,26)
+ (26,11,26,12)
+ (11,26,12,26)
+ (15,26,16,26)
+ (26,15,29,15)
+ (26,16,26,16)
+ (15,27,15,29)
+ (11,30,13,30)
+ (30,11,34,11)
+ (30,12,30,13)
+ (11,31,11,34)
+ (31,15,34,15)
+ (15,31,15,34)
+ (12,34,12,38)
+ (34,12,38,12)
+ (16,34,16,34)
+ (34,16,34,16)
+ (38,13,38,15)
+ (13,38,15,38)
+ (12,41,15,41)
+ (41,12,45,12)
+ (41,13,41,15)
+ (36,24,38,24)
+ (24,36,24,38)
+ (12,42,12,45)
+ (45,11,49,11)
+ (11,45,11,49)
+ (45,15,48,15)
+ (15,45,16,45)
+ (41,24,43,24)
+ (24,41,24,43)
+ (45,16,45,16)
+ (15,46,15,48)
+ (49,12,49,13)
+ (12,49,13,49)
+ (50,15,53,15)
+ (15,50,15,53)
+ (53,10,57,10)
+ (10,53,12,53)
+ (53,11,53,12)
+ (10,54,10,57)
+ (53,16,53,16)
+ (16,53,16,53)
+ (11,57,12,57)
+ (57,11,57,12)
+ (12,58,12,65)
+ (58,12,65,12)
+ (13,59,14,59)
+ (59,13,59,14)
+ (13,63,14,63)
+ (63,13,63,14)
+ (36,55,38,55)
+ (55,36,55,38)
+ (10,65,11,65)
+ (65,10,69,10)
+ (65,11,65,11)
+ (10,66,10,69)
+ (16,65,16,67)
+ (65,16,67,16)
+ (65,20,67,20)
+ (20,65,20,67)
+ (63,26,64,26)
+ (26,63,26,64)
+ (14,67,15,67)
+ (67,14,69,14)
+ (41,55,43,55)
+ (55,41,55,43)
+ (67,15,67,15)
+ (67,17,67,19)
+ (17,67,19,67)
+ (14,68,14,69)
+ (64,27,64,29)
+ (27,64,29,64)
+ (69,11,69,13)
+ (11,69,13,69)
+ (21,67,22,67)
+ (67,21,67,22)
+ (31,64,34,64)
+ (64,31,64,34)
+ (22,68,22,69)
+ (68,22,69,22)
+ (63,34,63,34)
+ (34,63,34,63)
+ (26,67,26,69)
+ (67,26,69,26)
+ (30,66,30,68)
+ (66,30,68,30)
+ (23,69,25,69)
+ (69,23,69,25)
+ (64,38,67,38)
+ (38,64,38,67)
+ (68,31,68,34)
+ (31,68,34,68)
+ (67,34,67,37)
+ (34,67,37,67)
+ (64,41,67,41)
+ (41,64,41,67)
+ (45,63,45,64)
+ (63,45,64,45)
+ (64,46,64,48)
+ (46,64,48,64)
+ (42,67,45,67)
+ (67,42,67,45)
+ (50,64,53,64)
+ (64,50,64,53)
+ (45,68,49,68)
+ (68,45,68,49)
+ (66,49,67,49)
+ (49,66,49,67)
+ (63,53,63,53)
+ (53,63,53,63)
+ (67,53,69,53)
+ (53,67,53,69)
+ (69,54,69,57)
+ (54,69,57,69)
+ (59,65,59,67)
+ (65,59,67,59)
+ (67,57,68,57)
+ (57,67,58,67)
+ (67,58,67,58)
+ (57,68,57,68)
+ (60,67,65,67)
+ (67,60,67,65)
+ (63,65,63,66)
+ (65,63,66,63)
+ (65,68,65,69)
+ (68,65,69,65)
+ (66,69,69,69)
+ (69,66,69,68)
+
+
+
+ WulaWall
+ AncientsHostile
+
+ (17,17,26,17)
+ (17,18,17,26)
+ (18,26,20,26)
+ (26,18,26,20)
+ (19,27,19,34)
+ (27,19,34,19)
+ (26,22,26,26)
+ (22,26,25,26)
+ (29,22,36,22)
+ (22,29,28,29)
+ (29,23,29,28)
+ (22,30,22,36)
+ (17,34,18,34)
+ (34,17,38,17)
+ (34,18,34,18)
+ (28,27,28,28)
+ (27,28,27,28)
+ (17,35,17,38)
+ (36,19,38,19)
+ (19,36,21,36)
+ (28,30,28,36)
+ (30,28,36,28)
+ (36,20,36,21)
+ (19,37,19,38)
+ (35,23,35,27)
+ (23,35,27,35)
+ (41,17,45,17)
+ (17,41,17,45)
+ (41,19,43,19)
+ (19,41,19,43)
+ (36,29,36,36)
+ (29,36,35,36)
+ (20,43,22,43)
+ (43,20,43,22)
+ (18,45,19,45)
+ (45,18,45,19)
+ (22,44,28,44)
+ (44,22,50,22)
+ (44,23,44,28)
+ (32,38,32,41)
+ (38,32,41,32)
+ (19,46,19,53)
+ (46,19,53,19)
+ (22,45,22,50)
+ (28,43,36,43)
+ (43,28,43,36)
+ (28,45,28,52)
+ (45,28,52,28)
+ (23,50,27,50)
+ (50,23,50,27)
+ (53,17,62,17)
+ (17,53,18,53)
+ (53,18,53,18)
+ (17,54,17,62)
+ (53,20,53,20)
+ (20,53,20,53)
+ (36,44,36,51)
+ (44,36,51,36)
+ (22,53,26,53)
+ (53,22,53,26)
+ (51,27,51,27)
+ (27,51,27,51)
+ (29,51,35,51)
+ (51,29,57,29)
+ (51,30,51,35)
+ (29,52,29,57)
+ (54,26,57,26)
+ (26,54,26,57)
+ (47,38,47,41)
+ (38,47,41,47)
+ (43,43,51,43)
+ (43,44,43,51)
+ (35,52,35,57)
+ (52,35,57,35)
+ (57,30,57,34)
+ (30,57,34,57)
+ (59,26,62,26)
+ (26,59,26,62)
+ (62,18,62,25)
+ (18,62,25,62)
+ (60,27,60,34)
+ (27,60,34,60)
+ (51,44,57,44)
+ (44,51,52,51)
+ (36,57,36,60)
+ (57,36,60,36)
+ (51,45,51,50)
+ (44,52,44,57)
+ (34,61,34,62)
+ (61,34,62,34)
+ (37,60,38,60)
+ (60,37,60,38)
+ (35,62,38,62)
+ (62,35,62,38)
+ (57,43,60,43)
+ (43,57,43,60)
+ (50,52,51,52)
+ (52,50,57,50)
+ (57,45,57,49)
+ (45,57,50,57)
+ (60,41,60,42)
+ (41,60,42,60)
+ (50,53,50,56)
+ (62,41,62,45)
+ (41,62,45,62)
+ (53,53,57,53)
+ (45,60,53,60)
+ (60,45,61,45)
+ (60,46,60,53)
+ (53,54,53,57)
+ (45,61,45,61)
+ (53,59,53,59)
+ (59,53,59,53)
+ (61,53,62,53)
+ (53,61,53,62)
+ (62,54,62,62)
+ (54,62,61,62)
+
+
+
+ WulaDoor
+ AncientsHostile
+
+ (21,26,21,26)
+ (35,19,35,19)
+ (39,17,40,17)
+ (39,19,40,19)
+ (44,19,44,19)
+ (37,32,37,32)
+ (42,32,42,32)
+ (21,53,21,53)
+ (37,47,37,47)
+ (42,47,42,47)
+ (58,26,58,26)
+ (35,60,35,60)
+ (39,60,40,60)
+ (39,62,40,62)
+ (44,60,44,60)
+ (58,53,58,53)
+
+
+
+ WulaDoor
+ 1
+ AncientsHostile
+
+ (26,21,26,21)
+ (19,35,19,35)
+ (17,39,17,40)
+ (19,39,19,40)
+ (19,44,19,44)
+ (32,37,32,37)
+ (32,42,32,42)
+ (53,21,53,21)
+ (47,37,47,37)
+ (47,42,47,42)
+ (26,58,26,58)
+ (60,35,60,35)
+ (60,39,60,40)
+ (62,39,62,40)
+ (60,44,60,44)
+ (53,58,53,58)
+
+
+
+ FloodLight
+ AncientsHostile
+
+ (14,14,14,14)
+ (16,35,16,35)
+ (35,16,35,16)
+ (16,44,16,44)
+ (44,16,44,16)
+ (65,14,65,14)
+ (14,65,14,65)
+ (35,63,35,63)
+ (63,35,63,35)
+ (44,63,44,63)
+ (63,44,63,44)
+ (65,65,65,65)
+
+
+
+ WULA_Cat_Bunker
+ AncientsHostile
+
+ (12,12,12,12)
+ (12,24,12,24)
+ (24,12,24,12)
+ (36,14,36,14)
+ (14,36,14,36)
+ (14,43,14,43)
+ (43,14,43,14)
+ (12,55,12,55)
+ (55,12,55,12)
+ (12,67,12,67)
+ (67,12,67,12)
+ (67,24,67,24)
+ (24,67,24,67)
+ (36,65,36,65)
+ (65,36,65,36)
+ (65,43,65,43)
+ (43,65,43,65)
+ (67,55,67,55)
+ (55,67,55,67)
+ (67,67,67,67)
+
+
+
+ Wula_Base_Laser_Turret
+ AncientsHostile
+
+ (18,14,18,14)
+ (14,18,14,18)
+ (28,17,28,17)
+ (17,28,17,28)
+ (17,32,17,32)
+ (32,17,32,17)
+ (26,37,26,37)
+ (37,26,37,26)
+ (26,42,26,42)
+ (42,26,42,26)
+ (17,47,17,47)
+ (47,17,47,17)
+ (17,51,17,51)
+ (51,17,51,17)
+ (61,14,61,14)
+ (14,61,14,61)
+ (53,37,53,37)
+ (37,53,37,53)
+ (18,65,18,65)
+ (65,18,65,18)
+ (42,53,42,53)
+ (53,42,53,42)
+ (62,28,62,28)
+ (28,62,28,62)
+ (62,32,62,32)
+ (32,62,32,62)
+ (62,47,62,47)
+ (47,62,47,62)
+ (62,51,62,51)
+ (51,62,51,62)
+ (65,61,65,61)
+ (61,65,61,65)
+
+
+
+ Wula_Base_ATGun_Turret
+ AncientsHostile
+
+ (32,13,32,13)
+ (13,32,13,32)
+ (47,13,47,13)
+ (13,47,13,47)
+ (32,66,32,66)
+ (66,32,66,32)
+ (47,66,47,66)
+ (66,47,66,47)
+
+
+
+ Wula_Base_Mortar_Turret
+ AncientsHostile
+
+ (20,20,20,20)
+ (20,23,20,23)
+ (23,20,23,20)
+ (23,23,23,23)
+ (56,20,56,20)
+ (20,56,20,56)
+ (56,23,56,23)
+ (23,56,23,56)
+ (59,20,59,20)
+ (20,59,20,59)
+ (59,23,59,23)
+ (23,59,23,59)
+ (56,56,56,56)
+ (59,56,59,56)
+ (56,59,56,59)
+ (59,59,59,59)
+
+
+
+ WULA_MechAssembler
+ AncientsHostile
+
+ (38,38,38,38)
+ (41,38,41,38)
+ (38,41,38,41)
+ (41,41,41,41)
+
+
+
+ WULA_MechAssembler_Huge
+ AncientsHostile
+
+ (39,34,39,34)
+ (34,39,34,39)
+ (44,39,44,39)
+ (39,44,39,44)
+
+
+
+ Wula_DarkEnergy_Generators
+ AncientsHostile
+ 1.98768
+ (54,0,32)
+
+
+ Wula_DarkEnergy_Generators
+ AncientsHostile
+ 1.98768663
+ (32,0,25)
+
+
+ Wula_Disturber_Turret
+ AncientsHostile
+
+ (32,32,32,32)
+ (32,47,32,47)
+ (47,32,47,32)
+ (47,47,47,47)
+
+
+
+ Wula_DarkEnergy_Generators
+ AncientsHostile
+ 1.98771334
+ (32,0,54)
+
+
+ Wula_DarkEnergy_Generators
+ AncientsHostile
+ 1.98772669
+ (25,0,47)
+
+
+ Wula_DarkEnergy_Generators
+ AncientsHostile
+ 1.98775172
+ (47,0,25)
+
+
+ Wula_DarkEnergy_Generators
+ AncientsHostile
+ 1.98775339
+ (47,0,54)
+
+
+ Wula_DarkEnergy_Generators
+ AncientsHostile
+ 1.98776674
+ (25,0,32)
+
+
+ Wula_DarkEnergy_Generators
+ AncientsHostile
+ 1.98778009
+ (54,0,47)
+
+
+
+
\ No newline at end of file
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 477b3cf5..1dd996a5 100644
--- a/1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml
+++ b/1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml
@@ -518,6 +518,17 @@
WULA_Synth_Armor_2_Technology
+
+ Wula_Disturber_Turret_Technology
+ 11.00
+ 0.90
+ 中型舰炮许可
+ 允许殖民地申请空投四联装舰炮，以毁灭性的等离子风暴连射毁灭一切帝国之敌。
+ 4500
+
+ WULA_Turret_Base_Mortar_Technology
+
+
diff --git a/1.6/1.6/Defs/SoundDefs/Wula_Sound_Weapons.xml b/1.6/1.6/Defs/SoundDefs/Wula_Sound_Weapons.xml
index 91392ce9..f18e81e6 100644
--- a/1.6/1.6/Defs/SoundDefs/Wula_Sound_Weapons.xml
+++ b/1.6/1.6/Defs/SoundDefs/Wula_Sound_Weapons.xml
@@ -128,6 +128,22 @@
+
+ Wula_Disturber_Turret_Weapon_Explosive
+ MapOnly
+ 99
+
+
+
+
+ Wula/Wula_Disturber_Turret_Weapon_Explosive
+
+
+ 95
+ 0.9~1.1
+
+
+
WULA_RW_Beam_Shootingsound
true
@@ -149,6 +165,22 @@
+
+ Wula_Disturber_Turret_Weapon_Shootingsound
+ MapOnly
+ 1
+
+
+
+
+ Wula/Wula_Disturber_Turret_Weapon_Shootingsound
+
+
+ 65
+ 0.9~1.1
+
+
+
WULA_PsiCrusher_Sound
MapOnly
diff --git a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Turret_Buildings.xml b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Turret_Buildings.xml
index 81ad320e..fadca402 100644
--- a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Turret_Buildings.xml
+++ b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Turret_Buildings.xml
@@ -662,7 +662,7 @@
Wula/Building/WULA_Turret_Component
Graphic_Single
- (3,3)
+ (7,7)
(0.3,0.3,1.4,1.4)
@@ -751,7 +751,7 @@
EMP
- 50
+ 25
2
true
@@ -963,7 +963,7 @@
Wula/Building/WULA_Turret_Component
Graphic_Single
- (3,3)
+ (7,7)
(0.3,0.3,1.4,1.4)
@@ -1052,7 +1052,7 @@
EMP
- 50
+ 25
2
true
@@ -1266,7 +1266,7 @@
Wula/Building/WULA_Turret_Component
Graphic_Single
- (3,3)
+ (7,7)
(0.3,0.3,1.4,1.4)
@@ -1348,7 +1348,7 @@
EMP
- 500
+ 300
2
true
@@ -1443,6 +1443,312 @@
+
+
+ Wula_Disturber_Turret_Cleanzone
+ HBt-1"磁石"舰炮
+ 清理出一块场地并准备好资源，使得乌拉帝国可以向此处投放建筑。\n\nHBt-1"磁石"是一种需要通电才能运转的重型防御炮塔，以联装的方式装载了四门威力巨大的离子风暴炮，其射弹携带了强大的EMP效果和杀伤效果，可以在远距离上撕碎一切冲击阵地的敌军。
+ Wula/Building/Wula_Disturber_Turret
+ MinifiedThing
+ Normal
+ None
+
+ Wula_Disturber_Turret
+ Wula_Disturber_Turret_Weapon
+
+
+ BuildingsMisc
+
+
+ Wula/Building/WULA_Dropping_Building_Cleanzone_Plus
+ Graphic_Multi
+ (5,5)
+
+ false
+
+
+ Building
+ PassThroughOnly
+ 40
+ false
+ 0.5
+ false
+ false
+ false
+
+ Wula_Disturber_Turret_Technology
+
+
+ 0
+ 1
+ 0
+ 1
+ 0
+
+ (5,5)
+ 0
+ 0
+
+ 400
+ 20
+ 50
+ 3
+
+
+ BuildingDestroyed_Metal_Small
+
+
+ WulaFallenEmpire.PlaceWorker_CustomRadius
+
+ WULA_Buildings
+
+
+ Wula_Disturber_Turret_Incoming
+ true
+ 1
+ true
+ false
+
+
+ Wula_Disturber_Turret
+ false
+ WULA_Psi_Skip_Entry
+ VoidStructure_Emerge
+ true
+ WULA_Building_Teleporter_Technology
+
+
+
+
+ Wula_Disturber_Turret_Incoming
+ RTt-8"深渊"迫击炮塔（空投中）
+ (5,5)
+
+ Wula/Building/Wula_Disturber_Turret_Incoming
+ Graphic_Single
+ CutoutFlying
+ (9,9)
+
+
+ Accelerate
+ Things/Skyfaller/SkyfallerShadowDropPod
+ (7, 7)
+ DropPod_Fall
+ 100
+ Explosion_Vaporize
+ 0.05
+ 1
+ 1
+
+
+ (0,0)
+ (1, 1)
+
+
+ Wula_Disturber_Turret
+
+
+
+ Smoke_Joint
+
+
+
+
+ Wula_Disturber_Turret
+ HBt-1"磁石"舰炮
+ HBt-1"磁石"是一种需要通电才能运转的重型防御炮塔，以联装的方式装载了四门威力巨大的离子风暴炮，其射弹携带了强大的EMP效果和杀伤效果，可以在远距离上撕碎一切冲击阵地的敌军。
+ WulaFallenEmpire.Building_TurretGunHasSpeed
+ MapMeshAndRealTime
+
+
+ 0.05
+
+
+
+ Wula/Building/WULA_Turret_Component
+ Graphic_Single
+ (12,12)
+
+
+ (0.3,0.3,1.4,1.4)
+
+
+ (0.5,0.35,0.75)
+ (0,0,-0.05)
+
+
+ true
+ Wula/Building/Wula_Disturber_Turret
+ 1.0
+ Building
+ false
+ false
+ (5,5)
+
+ 3000
+ 0
+ 3200
+ 250
+ 0
+ 0.80
+
+
+ 400
+ 20
+ 50
+ 3
+
+ Normal
+ Impassable
+ true
+ 1
+ false
+ true
+
+ 1000
+ Wula_Disturber_Turret_Weapon
+ 12
+ (0, 0)
+ 10.0
+ false
+
+
+ PlaceWorker_TurretTop
+ PlaceWorker_ShowTurretRadius
+
+
+
+ MechanoidsWakeUp
+
+
+
+ Stun
+ EMP
+
+
+ EMP
+
+
+
+ MechTurretBig_Call
+
+
+
+ true
+ false
+
+
+ CompPowerTrader
+ 300
+
+
+ 6
+ (252,240,120,0)
+
+
+ EMP
+ 600
+ 2
+ true
+
+
+ true
+
+
+
+
+ Wula_Disturber_Turret_Weapon
+ HBt-1"磁石"
+ 中型舰炮，毁灭能力超群。
+ None
+ true
+ Ultra
+
+ Wula/Building/Wula_Disturber_Turret_Weapon
+ Graphic_Single
+ 5
+
+ 0.33
+
+ 150
+ 0.3
+ 0.5
+ 0.4
+ 0.3
+
+
+
+ Verb_Shoot
+ false
+ Bullet_WULA_WM_Disturber_Turret
+ 5
+ 18
+ 300
+ false
+ 4
+ true
+ 5
+ 4
+ 12
+ 13
+ Wula_Disturber_Turret_Weapon_Shootingsound
+ GunTail_Heavy
+ 18
+
+ true
+
+
+
+
+
+ Bullet_WULA_WM_Disturber_Turret
+ 磁石等离子炮弹
+ WulaFallenEmpire.Projectile_NorthArcTrail
+ Normal
+ True
+
+ Wula/Projectile/WULA_Energy_2_Shell
+ Graphic_Single
+ MoteGlow
+ (2.5,3)
+ (218,255,200,255)
+
+
+ WULA_Disturber_Turret_Bomb
+ 250
+ 40
+ 2
+ 8.0
+ Artillery_HitThickRoof
+ Wula_Disturber_Turret_Weapon_Explosive
+ MortarRound_PreImpact
+ MortarRound_Ambient
+ 5
+ true
+ Filth_BlastMark
+
+
+
+ 4
+ 1.0
+ true
+
+
+ WULA_GunTail_Plasma
+ 3
+ 1
+ 1~2
+ 0.5~1.0
+ 0.1~0.3
+ -30~30
+
+
+
+
WULA_Wall_Flag_Building
diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Machine_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Machine_Weapon.xml
index 707e5f9b..dce1c05f 100644
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Machine_Weapon.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Machine_Weapon.xml
@@ -173,7 +173,7 @@
Bullet_Wula_MR_Mobile_Factory_Turret
陨磷钢针弹
- Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red
+ Wula/Projectile/WULA_Bullet_Needle_AT
Graphic_Single
MoteGlow
2.5
@@ -406,7 +406,7 @@
Bullet_Wula_AI_Heavy_Panzer_Turret_Weapon
青金石钢针弹
- Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red
+ Wula/Projectile/WULA_Bullet_Needle_AT
Graphic_Single
MoteGlow
2.5
diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml
index f3529010..8a3d2e49 100644
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml
@@ -871,7 +871,7 @@
- Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red
+ Wula/Projectile/WULA_Bullet_Needle_AT
Graphic_Single
TransparentPostLight
1.4
@@ -1127,7 +1127,7 @@
- Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red
+ Wula/Projectile/WULA_Bullet_Needle_AT
Graphic_Single
TransparentPostLight
1
diff --git a/Content/Sounds/Wula/Wula_Disturber_Turret_Weapon_Explosive.wav b/Content/Sounds/Wula/Wula_Disturber_Turret_Weapon_Explosive.wav
new file mode 100644
index 00000000..90e2e319
Binary files /dev/null and b/Content/Sounds/Wula/Wula_Disturber_Turret_Weapon_Explosive.wav differ
diff --git a/Content/Sounds/Wula/Wula_Disturber_Turret_Weapon_Shootingsound.wav b/Content/Sounds/Wula/Wula_Disturber_Turret_Weapon_Shootingsound.wav
new file mode 100644
index 00000000..ac1a5f51
Binary files /dev/null and b/Content/Sounds/Wula/Wula_Disturber_Turret_Weapon_Shootingsound.wav differ
diff --git a/Content/Textures/Wula/Building/WULA_Turret_Component.png b/Content/Textures/Wula/Building/WULA_Turret_Component.png
index 50235d2c..76ebf638 100644
Binary files a/Content/Textures/Wula/Building/WULA_Turret_Component.png and b/Content/Textures/Wula/Building/WULA_Turret_Component.png differ
diff --git a/Content/Textures/Wula/Building/Wula_Disturber_Turret.png b/Content/Textures/Wula/Building/Wula_Disturber_Turret.png
new file mode 100644
index 00000000..1bff8469
Binary files /dev/null and b/Content/Textures/Wula/Building/Wula_Disturber_Turret.png differ
diff --git a/Content/Textures/Wula/Building/Wula_Disturber_Turret_Incoming.png b/Content/Textures/Wula/Building/Wula_Disturber_Turret_Incoming.png
new file mode 100644
index 00000000..d9131bc8
Binary files /dev/null and b/Content/Textures/Wula/Building/Wula_Disturber_Turret_Incoming.png differ
diff --git a/Content/Textures/Wula/Building/Wula_Disturber_Turret_Weapon.png b/Content/Textures/Wula/Building/Wula_Disturber_Turret_Weapon.png
new file mode 100644
index 00000000..b1eefe2d
Binary files /dev/null and b/Content/Textures/Wula/Building/Wula_Disturber_Turret_Weapon.png differ
diff --git a/Content/Textures/Wula/Projectile/WULA_Bullet_Needle_AT.png b/Content/Textures/Wula/Projectile/WULA_Bullet_Needle_AT.png
new file mode 100644
index 00000000..15b31356
Binary files /dev/null and b/Content/Textures/Wula/Projectile/WULA_Bullet_Needle_AT.png differ
diff --git a/Content/Textures/Wula/Projectile/WULA_Energy_2_Shell.png b/Content/Textures/Wula/Projectile/WULA_Energy_2_Shell.png
new file mode 100644
index 00000000..867563b0
Binary files /dev/null and b/Content/Textures/Wula/Projectile/WULA_Energy_2_Shell.png differ
diff --git a/Source/WulaFallenEmpire/BuildingComp/WULA_StorageTurret/CompStorageTurret.cs b/Source/WulaFallenEmpire/BuildingComp/WULA_StorageTurret/CompStorageTurret.cs
index 51cfffb5..94e87dbd 100644
--- a/Source/WulaFallenEmpire/BuildingComp/WULA_StorageTurret/CompStorageTurret.cs
+++ b/Source/WulaFallenEmpire/BuildingComp/WULA_StorageTurret/CompStorageTurret.cs
@@ -16,6 +16,9 @@ namespace WulaFallenEmpire
// 存储的炮塔列表
private List turrets = new List();
+ // 标记是否已加载数据
+ private bool dataLoaded = false;
+
// 获取当前机械族存储数量
private int StoredMechanoidCount
{
@@ -34,13 +37,26 @@ namespace WulaFallenEmpire
public override void Initialize(CompProperties props)
{
base.Initialize(props);
- UpdateTurrets();
+
+ // 只有在没有加载过数据时才初始化新炮塔
+ if (!dataLoaded)
+ {
+ UpdateTurrets();
+ }
}
public override void CompTick()
{
base.CompTick();
+ // 确保数据已加载
+ if (!dataLoaded)
+ {
+ dataLoaded = true;
+ InitializeTurretsAfterLoad();
+ return;
+ }
+
// 更新炮塔数量
if (Find.TickManager.TicksGame % 60 == 0)
{
@@ -57,6 +73,29 @@ namespace WulaFallenEmpire
}
}
+ // 加载后初始化炮塔
+ private void InitializeTurretsAfterLoad()
+ {
+ if (turrets == null)
+ {
+ turrets = new List();
+ }
+
+ // 重新建立 parent 引用
+ for (int i = 0; i < turrets.Count; i++)
+ {
+ if (turrets[i] != null)
+ {
+ turrets[i].SetParent(this);
+ turrets[i].SetIndex(i);
+ turrets[i].PostLoadInit();
+ }
+ }
+
+ // 根据当前机械族数量调整炮塔数量
+ UpdateTurrets();
+ }
+
private void UpdateTurrets()
{
int currentCount = Mathf.Min(StoredMechanoidCount, Props.maxTurrets);
@@ -70,7 +109,16 @@ namespace WulaFallenEmpire
// 移除多余的炮塔
while (turrets.Count > currentCount)
{
- turrets.RemoveAt(turrets.Count - 1);
+ // 注意：只移除未激活的炮塔
+ int lastIndex = turrets.Count - 1;
+ if (lastIndex >= StoredMechanoidCount)
+ {
+ turrets.RemoveAt(lastIndex);
+ }
+ else
+ {
+ break;
+ }
}
}
@@ -92,35 +140,13 @@ namespace WulaFallenEmpire
{
base.PostExposeData();
- // 在保存和加载时重新建立 parent 引用
- if (Scribe.mode == LoadSaveMode.Saving)
- {
- Scribe_Collections.Look(ref turrets, "turrets", LookMode.Deep);
- }
- else if (Scribe.mode == LoadSaveMode.LoadingVars)
- {
- Scribe_Collections.Look(ref turrets, "turrets", LookMode.Deep);
- }
+ Scribe_Values.Look(ref dataLoaded, "dataLoaded", false);
+ Scribe_Collections.Look(ref turrets, "turrets", LookMode.Deep);
if (Scribe.mode == LoadSaveMode.PostLoadInit)
{
- if (turrets == null)
- {
- turrets = new List();
- }
- else
- {
- // 重新建立 parent 引用
- for (int i = 0; i < turrets.Count; i++)
- {
- if (turrets[i] != null)
- {
- turrets[i].SetParent(this);
- turrets[i].SetIndex(i);
- }
- }
- }
- UpdateTurrets();
+ // 标记需要重新初始化
+ dataLoaded = false;
}
}
@@ -138,6 +164,9 @@ namespace WulaFallenEmpire
public float curRotation;
public Material turretMat;
+ // 标记是否已初始化
+ private bool initialized = false;
+
// 安全访问器
public CompStorageTurret Parent => _parent;
public int Index => _index;
@@ -172,28 +201,19 @@ namespace WulaFallenEmpire
return false;
if (AttackVerb == null)
+ {
+ // 尝试重新初始化
+ if (!initialized)
+ {
+ PostLoadInit();
+ }
return false;
-
- if (TurretDestroyed)
- return false;
+ }
return true;
}
}
- public bool TurretDestroyed
- {
- get
- {
- var verbProps = AttackVerb?.verbProps;
- if (verbProps == null)
- return false;
-
- // 这里可以添加建筑炮塔的破坏检查逻辑
- return false;
- }
- }
-
// 无参构造函数用于序列化
public TurretInstance() { }
@@ -201,7 +221,7 @@ namespace WulaFallenEmpire
{
SetParent(parent);
SetIndex(index);
- MakeGun();
+ Initialize();
}
public void SetParent(CompStorageTurret parent)
@@ -214,13 +234,35 @@ namespace WulaFallenEmpire
_index = index;
}
+ private void Initialize()
+ {
+ if (initialized) return;
+
+ MakeGun();
+ UpdateGunVerbs();
+ initialized = true;
+ }
+
+ // 加载后初始化
+ public void PostLoadInit()
+ {
+ if (initialized) return;
+
+ if (gun == null)
+ {
+ MakeGun();
+ }
+
+ UpdateGunVerbs();
+ initialized = true;
+ }
+
private void MakeGun()
{
if (_parent == null || _parent.Props == null || _parent.Props.turretDef == null)
return;
gun = ThingMaker.MakeThing(_parent.Props.turretDef, null);
- UpdateGunVerbs();
}
private void UpdateGunVerbs()
@@ -230,9 +272,17 @@ namespace WulaFallenEmpire
var compEq = gun.TryGetComp();
if (compEq == null) return;
+ // 确保 parent 不为 null
+ if (_parent == null || _parent.parent == null)
+ {
+ Log.Warning("[StorageTurret] Parent is null when updating gun verbs");
+ return;
+ }
+
foreach (var verb in compEq.AllVerbs)
{
- verb.caster = _parent?.parent;
+ // 关键修复：设置正确的 caster
+ verb.caster = _parent.parent;
verb.castCompleteCallback = () =>
{
burstCooldownTicksLeft = AttackVerb?.verbProps?.defaultCooldownTime.SecondsToTicks() ?? 0;
@@ -242,7 +292,14 @@ namespace WulaFallenEmpire
public void TurretTick()
{
- if (!CanShoot) return;
+ if (!CanShoot || AttackVerb == null) return;
+
+ // 确保动词已正确初始化
+ if (AttackVerb.caster == null)
+ {
+ UpdateGunVerbs();
+ return;
+ }
// 更新炮塔旋转
if (currentTarget.IsValid)
@@ -342,18 +399,9 @@ namespace WulaFallenEmpire
Scribe_TargetInfo.Look(ref currentTarget, "currentTarget");
Scribe_Deep.Look(ref gun, "gun");
Scribe_Values.Look(ref curRotation, "curRotation", 0f);
+ Scribe_Values.Look(ref initialized, "initialized", false);
- if (Scribe.mode == LoadSaveMode.PostLoadInit)
- {
- if (gun == null)
- {
- MakeGun();
- }
- else
- {
- UpdateGunVerbs();
- }
- }
+ // 注意：不序列化 _parent 和 _index，它们在加载后重新设置
}
}
}
diff --git a/美术与文本源文件/Wula/Apparel/WULA_Shield_Base_Thin_south.sai2 b/美术与文本源文件/Wula/Apparel/WULA_Shield_Base_Thin_south.sai2
index 28c3a732..83b595a6 100644
Binary files a/美术与文本源文件/Wula/Apparel/WULA_Shield_Base_Thin_south.sai2 and b/美术与文本源文件/Wula/Apparel/WULA_Shield_Base_Thin_south.sai2 differ
diff --git a/美术与文本源文件/Wula/Building/WULA_ArmedShuttle.sai2 b/美术与文本源文件/Wula/Building/WULA_ArmedShuttle.sai2
index f6cae37d..a6c2423e 100644
Binary files a/美术与文本源文件/Wula/Building/WULA_ArmedShuttle.sai2 and b/美术与文本源文件/Wula/Building/WULA_ArmedShuttle.sai2 differ
diff --git a/美术与文本源文件/Wula/Building/WULA_ArmedShuttle_New.sai2 b/美术与文本源文件/Wula/Building/WULA_ArmedShuttle_New.sai2
deleted file mode 100644
index a6c2423e..00000000
Binary files a/美术与文本源文件/Wula/Building/WULA_ArmedShuttle_New.sai2 and /dev/null differ
diff --git a/美术与文本源文件/Wula/Building/WULA_Huge_Turret.sai2 b/美术与文本源文件/Wula/Building/WULA_Huge_Turret.sai2
new file mode 100644
index 00000000..3f0c8821
Binary files /dev/null and b/美术与文本源文件/Wula/Building/WULA_Huge_Turret.sai2 differ
diff --git a/美术与文本源文件/Wula/Projectile/WULA_Bullet_Needle_AT.sai2 b/美术与文本源文件/Wula/Projectile/WULA_Bullet_Needle_AT.sai2
new file mode 100644
index 00000000..b61e92a6
Binary files /dev/null and b/美术与文本源文件/Wula/Projectile/WULA_Bullet_Needle_AT.sai2 differ