diff --git a/1.6/Defs/DamageDefs/Damages_Wula.xml b/1.6/Defs/DamageDefs/Damages_Wula.xml
index 08ef07af..d2f2e1e1 100644
--- a/1.6/Defs/DamageDefs/Damages_Wula.xml
+++ b/1.6/Defs/DamageDefs/Damages_Wula.xml
@@ -52,6 +52,7 @@
+ true
DamageWorker_AddInjury
true
{0} 被灵能灼烧而死。
@@ -89,6 +90,7 @@
Wula_Psi_Bomb
+ true
{0} 被灵能灼烧而死。
50
2.0
@@ -112,6 +114,7 @@
WULA_SP_Live_Shelter_Heal
+ true
DamageWorker_Stab
0
false
diff --git a/1.6/Defs/FactionDefs/Factions_Player_WULA.xml b/1.6/Defs/FactionDefs/Factions_Player_WULA.xml
index bce40d12..984c7490 100644
--- a/1.6/Defs/FactionDefs/Factions_Player_WULA.xml
+++ b/1.6/Defs/FactionDefs/Factions_Player_WULA.xml
@@ -161,6 +161,10 @@
900
ActiveDropPodMechanoid
DropPodIncomingMechanoidRapid
+
+ Wula_Backstory_Categories_For_Hostile_Faction
+ Wula_Old_Synth_Backstory_Categories
+
diff --git a/1.6/Defs/HediffDefs/Hediffs_WULA_Blessings.xml b/1.6/Defs/HediffDefs/Hediffs_WULA_Blessings.xml
index 4db9f791..f3d5b484 100644
--- a/1.6/Defs/HediffDefs/Hediffs_WULA_Blessings.xml
+++ b/1.6/Defs/HediffDefs/Hediffs_WULA_Blessings.xml
@@ -12,11 +12,11 @@
1.0
- 0.25
+ 0.25
- 0.8
- 0.8
+ 0.8
+ 0.8
diff --git a/1.6/Defs/MentalStateDefs/MentalStates_WULA_Broken.xml b/1.6/Defs/MentalStateDefs/MentalStates_WULA_Broken.xml
index 4671e24f..677b8560 100644
--- a/1.6/Defs/MentalStateDefs/MentalStates_WULA_Broken.xml
+++ b/1.6/Defs/MentalStateDefs/MentalStates_WULA_Broken.xml
@@ -27,5 +27,20 @@
NegativeEvent
精神状态:人格破碎
-
+
+
+ Wula_Fake_MechanoidBerserk
+ MentalState_BerserkWarcall
+
+ Aggro
+ true
+ (0.9,0.2,0.5)
+ {0} 受到冲击.
+ 精神状态:短暂失控
+ AnimalWarcallMentalState
+ 1
+ 1
+ true
+ true
+
diff --git a/1.6/Defs/PawnKinds/PawnKinds_Wula.xml b/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
index 54425a35..63ef791a 100644
--- a/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
+++ b/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
@@ -451,6 +451,14 @@
+
+
+
+ Wula_Backstory_Categories_For_Hostile_Faction
+ Wula_Old_Synth_Backstory_Categories
+
+
+
@@ -465,14 +473,6 @@
15~24
0
-
-
-
- Wula_Backstory_Categories_For_Hostile_Faction
- Wula_Old_Synth_Backstory_Categories
-
-
-
Wula_Broken_Personality_Pawn_2
@@ -486,14 +486,6 @@
Wula_Weapon_Init
15~24
-
-
-
- Wula_Backstory_Categories_For_Hostile_Faction
- Wula_Old_Synth_Backstory_Categories
-
-
-
@@ -510,14 +502,6 @@
Wula_Melee_Weapon_T2
15~24
-
-
-
- Wula_Backstory_Categories_For_Hostile_Faction
- Wula_Old_Synth_Backstory_Categories
-
-
-
Wula_Broken_Personality_Pawn_4
@@ -533,14 +517,6 @@
Wula_Ranged_Weapon_T2
15~24
-
-
-
- Wula_Backstory_Categories_For_Hostile_Faction
- Wula_Old_Synth_Backstory_Categories
-
-
-
@@ -559,14 +535,6 @@
15~24
true
-
-
-
- Wula_Backstory_Categories_For_Hostile_Faction
- Wula_Old_Synth_Backstory_Categories
-
-
-
@@ -585,14 +553,6 @@
Wula_Ranged_Weapon_T2
15~24
-
-
-
- Wula_Backstory_Categories_For_Hostile_Faction
- Wula_Old_Synth_Backstory_Categories
-
-
-
Wula_Broken_Personality_Pawn_7
@@ -610,13 +570,5 @@
15~24
true
-
-
-
- Wula_Backstory_Categories_For_Hostile_Faction
- Wula_Old_Synth_Backstory_Categories
-
-
-
\ No newline at end of file
diff --git a/1.6/Defs/PawnKinds/PawnKinds_Wula_FE_Spiritualist.xml b/1.6/Defs/PawnKinds/PawnKinds_Wula_FE_Spiritualist.xml
index b29c367c..715525c2 100644
--- a/1.6/Defs/PawnKinds/PawnKinds_Wula_FE_Spiritualist.xml
+++ b/1.6/Defs/PawnKinds/PawnKinds_Wula_FE_Spiritualist.xml
@@ -55,8 +55,8 @@
True
False
False
- false
-
+ true
+ true
12
@@ -124,18 +124,18 @@
Wula_Psi_Control
- 使用灵能能量强行支配范围内所有目标的心智,让其调转枪口攻击敌人。
+ 使用灵能能量强行支配范围内所有目标的心智,让其调转枪口攻击敌人。它会对自己和其他机械体造成瞬间的失控,无法真正地影响机械体。
Wula/UI/Abilities/WULA_MW_Scepter_Of_Lost_Ability
True
- False
+ True
36000
2
true
+ False
True
False
- False
- true
- true
+ false
+
15
900
@@ -144,12 +144,11 @@
Verb_CastAbility
Bullet_FleshmelterBolt
- 21
- 4
+ 15
true
- 0
+ 0.5
AgonyPulse_Cast
- ture
+ true
true
@@ -160,10 +159,14 @@
CompAbilityEffect_GiveMentalState
BerserkWarcall
- -20
+ Wula_Fake_MechanoidBerserk
+ True
+ PsychicSensitivity
+ -75
AnimalWarcall_Cast
AnimalWarcall_CastOnTarget
false
+ false
PsycastPsychicEffect
diff --git a/1.6/Defs/ThingDefs/WULA_Item.xml b/1.6/Defs/ThingDefs/WULA_Item.xml
index cff2806d..1df3c124 100644
--- a/1.6/Defs/ThingDefs/WULA_Item.xml
+++ b/1.6/Defs/ThingDefs/WULA_Item.xml
@@ -1,22 +1,43 @@
-
+
WULA_Charge_Cube
被高度压缩的能源核心,是机械乌拉的能源系统唯一可接受的外部输入性能量来源。
+ ThingWithComps
+ Item
+ MapMeshOnly
+ true
+ false
+ true
Wula/Item/WULA_Charge_Cube
Graphic_Single
30
+ 1
+ 50
+ 0
+ 0
0.01
24
0.3
450
- 1
+ Item
+ Rare
+ true
+
+ FoodMeals
+
+ true
+ 14
+ Liquor
+ 1
+ 1
+ 16
270
MealSimple
-1000
@@ -32,7 +53,11 @@
200
None
+ Last
+ true
+ 1
+
WULA_IngestWulaEnergy
从能量核心中摄取能量
diff --git a/1.6/Defs/ThingDefs_Buildings/WULA_FallenEmpire_Buildings_Ritual.xml b/1.6/Defs/ThingDefs_Buildings/WULA_FallenEmpire_Buildings_Ritual.xml
index 20110535..2c462908 100644
--- a/1.6/Defs/ThingDefs_Buildings/WULA_FallenEmpire_Buildings_Ritual.xml
+++ b/1.6/Defs/ThingDefs_Buildings/WULA_FallenEmpire_Buildings_Ritual.xml
@@ -25,9 +25,9 @@
(3, 3)
Light
-
+
ITab_Entity
diff --git a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml
index 85c33fce..46e2066f 100644
--- a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml
+++ b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml
@@ -29,6 +29,8 @@
6
+ 0
+ 0
40000
0
1
@@ -172,8 +174,8 @@
Wula/Mote/WULA_Bullet_Dark_Matter_Beam
(200, 40, 40, 255)
Graphic_MoteWithAgeSecs
- MoteBeam
- (3,1)
+ MoteGlow
+ (1.5,1)
<_ExtraTexA>/Things/Mote/BeamSecondaryNoise_A
<_ExtraTexB>/Things/Mote/BeamSecondaryNoise_B
@@ -220,6 +222,8 @@
4
+ 0
+ 0
40000
0
2
@@ -348,8 +352,8 @@
Wula/Mote/WULA_Bullet_Dark_Matter_Beam
(255, 255, 255, 255)
Graphic_MoteWithAgeSecs
- MoteBeam
- (2,1)
+ MoteGlow
+ (1.2,1)
<_ExtraTexA>/Things/Mote/BeamSecondaryNoise_A
<_ExtraTexB>/Things/Mote/BeamSecondaryNoise_B
@@ -396,6 +400,8 @@
6
+ 0
+ 0
40000
0
1
@@ -467,8 +473,8 @@
Wula/Mote/WULA_Bullet_Dark_Matter_Beam
(38, 204, 66, 255)
Graphic_MoteWithAgeSecs
- MoteBeam
- (1.5,1)
+ MoteGlow
+ (1,1)
<_ExtraTexA>/Things/Mote/BeamSecondaryNoise_A
<_ExtraTexB>/Things/Mote/BeamSecondaryNoise_B
@@ -561,6 +567,8 @@
8
+ 0
+ 0
40000
0
0.5
@@ -574,6 +582,7 @@
Verb_Shoot
true
Bullet_WULA_RW_Photon_Missile
+ 0.1
4.5
48
1
diff --git a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
index 7f512fcf..d2a530b3 100644
--- a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
+++ b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
@@ -1131,7 +1131,6 @@
true
50
6
- 4.9
true
false
diff --git a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml
index 401798ae..275b5463 100644
--- a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml
+++ b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml
@@ -690,6 +690,7 @@
5
+ Mechanoid
WULA_AI_Heavy_Panzer_Body
10.0
5
@@ -763,6 +764,7 @@
5
+ Mechanoid
Wula_AI_Engineer_Mother_Body
10.0
4
diff --git a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Spiritualist.xml b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Spiritualist.xml
index b11ba41e..00e39d60 100644
--- a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Spiritualist.xml
+++ b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Spiritualist.xml
@@ -26,6 +26,7 @@
0 -->
+ Mechanoid
WULA_AI_Heavy_Panzer_Body
15.0
3.5
diff --git a/Textures/Wula/Apparel/WULA_Skitarii_veil.png b/Textures/Wula/Apparel/WULA_Skitarii_veil.png
new file mode 100644
index 00000000..c326f288
Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Skitarii_veil.png differ
diff --git a/Textures/Wula/Mote/WULA_Bullet_Dark_Matter_Beam.png b/Textures/Wula/Mote/WULA_Bullet_Dark_Matter_Beam.png
index 85774ee5..ef0eeb9e 100644
Binary files a/Textures/Wula/Mote/WULA_Bullet_Dark_Matter_Beam.png and b/Textures/Wula/Mote/WULA_Bullet_Dark_Matter_Beam.png differ