From 6ecc1aaeb17c1e2fa13ba2fdbd6d2b8312fa6b66 Mon Sep 17 00:00:00 2001
From: Tourswen <565033799@qq.com>
Date: Tue, 5 Aug 2025 17:22:33 +0800
Subject: [PATCH] 2025-8-5

---
 1.6/Defs/AbilityDefs/WULA_Abilities.xml       |  37 ----
 1.6/Defs/DamageDefs/Damages_Wula.xml          |   4 +-
 1.6/Defs/EventDefs/EventDef_Examples.xml      |  17 +-
 1.6/Defs/FactionDefs/Factions_Player_WULA.xml |  75 +++++++-
 1.6/Defs/PawnKinds/PawnKinds_Wula.xml         |   4 +-
 .../PawnKinds_Wula_FE_Spiritualist.xml        | 178 ++++++++++++++++--
 1.6/Defs/ThingDefs_Misc/WULA_Apparel.xml      |  10 +-
 .../WULA_FE_Spiritualist_Apparel.xml          |   8 +-
 .../Weapons/WULA_FE_Spiritualist_Weapon.xml   |   2 +-
 .../ThingDefs_Misc/Weapons/WULA_Weapon.xml    | 135 ++-----------
 .../ThingDefs_Races/Races_Wulaspecies.xml     |   1 +
 .../Races_Wulaspecies_FE_Spiritualist.xml     |   3 +-
 1.6/Defs/TraitDefs/Traits_WULA.xml            |   5 +-
 13 files changed, 285 insertions(+), 194 deletions(-)
 delete mode 100644 1.6/Defs/AbilityDefs/WULA_Abilities.xml

diff --git a/1.6/Defs/AbilityDefs/WULA_Abilities.xml b/1.6/Defs/AbilityDefs/WULA_Abilities.xml
deleted file mode 100644
index 81237a4e..00000000
--- a/1.6/Defs/AbilityDefs/WULA_Abilities.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-    <AbilityDef>
-        <defName>WULA_LightningBombardment</defName>
-        <label>LightningStorm</label>
-        <description>Summon a LightningStorm.</description>
-        <iconPath>UI/Abilities/Flashstorm</iconPath>
-        <cooldownTicksRange>60000</cooldownTicksRange>
-        <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-        <aiCanUse>true</aiCanUse>
-        <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
-        <verbProperties>
-            <verbClass>Verb_CastAbility</verbClass>
-            <label>Summon LightningStorm</label>
-            <drawAimPie>true</drawAimPie>
-            <warmupTime>1</warmupTime>
-            <range>29.9</range>
-            <targetParams>
-                <canTargetPawns>False</canTargetPawns>
-                <canTargetLocations>True</canTargetLocations>
-            </targetParams>
-
-        </verbProperties>
-        <comps>
-            <li Class="WulaFallenEmpire.CompProperties_AbilityDRM_LightningBombardment">
-                <impactAreaRadius>12</impactAreaRadius>
-                <explosionRadiusRange>3~4</explosionRadiusRange>
-                <bombIntervalTicks>30</bombIntervalTicks>
-                <explosionCount>20</explosionCount>
-
-                <damageDef>Wula_Psi_Damage</damageDef>
-                <damageAmount>45</damageAmount>
-                <armorPenetration>1.0</armorPenetration>
-            </li>
-        </comps>
-    </AbilityDef>
-</Defs>
\ No newline at end of file
diff --git a/1.6/Defs/DamageDefs/Damages_Wula.xml b/1.6/Defs/DamageDefs/Damages_Wula.xml
index 32c732bd..08ef07af 100644
--- a/1.6/Defs/DamageDefs/Damages_Wula.xml
+++ b/1.6/Defs/DamageDefs/Damages_Wula.xml
@@ -95,8 +95,8 @@
     <defaultArmorPenetration>1.5</defaultArmorPenetration>
     <hediff>Burn</hediff>
     <armorCategory>Heat</armorCategory>
-    <buildingDamageFactorImpassable>10</buildingDamageFactorImpassable>
-    <buildingDamageFactorPassable>10</buildingDamageFactorPassable>
+    <buildingDamageFactorImpassable>2</buildingDamageFactorImpassable>
+    <buildingDamageFactorPassable>2</buildingDamageFactorPassable>
     <soundExplosion>Pawn_Revenant_StartledScream</soundExplosion>
     <additionalHediffs>
       <li>
diff --git a/1.6/Defs/EventDefs/EventDef_Examples.xml b/1.6/Defs/EventDefs/EventDef_Examples.xml
index 07c12caa..d0a955c9 100644
--- a/1.6/Defs/EventDefs/EventDef_Examples.xml
+++ b/1.6/Defs/EventDefs/EventDef_Examples.xml
@@ -11,22 +11,23 @@
         </conditions>
         <effects>
           <li Class="WulaFallenEmpire.Effect_TriggerRaid">
-            <letterLabel>侦测到失控乌拉！</letterLabel>
-            <letterText>我们的传感器侦测到一伙来自 {FACTION_name} 的袭击者！他们看起来充满敌意，正朝着我们的殖民地前进。</letterText>
+            <letterLabel>来自乌拉帝国 大教堂的进攻</letterLabel>
+            <letterText>我们的传感器侦测到一伙来自乌拉帝国 大教堂的袭击者！他们看起来充满敌意，正朝着我们的殖民地前进。</letterText>
             <points>10000</points>
-            <faction>Wula_Broken_Personality_Faction</faction>
+            <faction>Wula_FE_Spiritualist_Faction</faction>
             <raidStrategy>ImmediateAttack</raidStrategy>
-            <raidArrivalMode>EdgeWalkIn</raidArrivalMode>
+            <raidArrivalMode>EdgeDrop</raidArrivalMode>
             <groupKind>Combat</groupKind>
             <pawnGroupMakers>
               <li>
                 <kindDef>Combat</kindDef>
                 <commonality>100</commonality>
                 <options>
-                  <Mech_WULA_Cat_Constructor>20</Mech_WULA_Cat_Constructor>
-                  <Mech_WULA_Cat_Assault>20</Mech_WULA_Cat_Assault>
-                  <Wula_Broken_Personality_Pawn_7>2</Wula_Broken_Personality_Pawn_7>
-                  <Wula_Broken_Personality_Pawn_5>1</Wula_Broken_Personality_Pawn_5>
+                  <Wula_FE_Spiritualist_Pawn_1>10</Wula_FE_Spiritualist_Pawn_1>
+                  <Wula_FE_Spiritualist_Pawn_2>3</Wula_FE_Spiritualist_Pawn_2>
+                  <Wula_FE_Spiritualist_Pawn_3>3</Wula_FE_Spiritualist_Pawn_3>
+                  <Wula_FE_Spiritualist_Pawn_4>1</Wula_FE_Spiritualist_Pawn_4>
+                  <Wula_Psi_Titan_PawnKind>1000</Wula_Psi_Titan_PawnKind>
                 </options>
               </li>
             </pawnGroupMakers>
diff --git a/1.6/Defs/FactionDefs/Factions_Player_WULA.xml b/1.6/Defs/FactionDefs/Factions_Player_WULA.xml
index 0bdc3992..bce40d12 100644
--- a/1.6/Defs/FactionDefs/Factions_Player_WULA.xml
+++ b/1.6/Defs/FactionDefs/Factions_Player_WULA.xml
@@ -188,6 +188,9 @@
       <li>Surface</li>
       <!-- <li MayRequire="Ludeon.RimWorld.Odyssey">Orbit</li> -->
     </arrivalLayerWhitelist>
+    <backstoryCategories>
+      <li>Wula_Backstory_Categories_For_RealWula</li>
+    </backstoryCategories>
     <!-- 文化相关 -->
     <requiredMemes>
       <li MayRequire="Ludeon.RimWorld.Ideology">Supremacist</li>
@@ -225,15 +228,15 @@
     <colorSpectrum>
       <li>(0.85, 0.85, 0.75)</li>
     </colorSpectrum>
-    <!-- <fixedLeaderKinds>
+    <fixedLeaderKinds>
       <li>Wula_FE_Spiritualist_Leader</li>
-    </fixedLeaderKinds> -->
-    <!-- <baseTraderKinds>
+    </fixedLeaderKinds>
+    <baseTraderKinds>
       <li>Base_Empire_Standard</li>
-    </baseTraderKinds> -->
-    <!-- <caravanTraderKinds>
+    </baseTraderKinds>
+    <caravanTraderKinds>
       <li>Empire_Caravan_TraderGeneral</li>
-    </caravanTraderKinds> -->
+    </caravanTraderKinds>
     <raidCommonalityFromPointsCurve>
       <points>
         <li>(0, 1)</li> <!--Constant 1 at all points levels-->
@@ -253,10 +256,62 @@
         <!-- Base defense, mainly ranged with melee mix-ins -->
         <kindDef>Settlement</kindDef>
         <options>
-          <Empire_Fighter_Trooper>5</Empire_Fighter_Trooper>
-          <Empire_Fighter_Janissary>3.5</Empire_Fighter_Janissary>
-          <Empire_Fighter_Cataphract>2</Empire_Fighter_Cataphract>
-          <Empire_Fighter_Champion>4</Empire_Fighter_Champion>
+          <Wula_FE_Spiritualist_Pawn_1>10</Wula_FE_Spiritualist_Pawn_1>
+          <Wula_FE_Spiritualist_Pawn_2>3</Wula_FE_Spiritualist_Pawn_2>
+          <Wula_FE_Spiritualist_Pawn_3>3</Wula_FE_Spiritualist_Pawn_3>
+          <Wula_FE_Spiritualist_Pawn_4>1</Wula_FE_Spiritualist_Pawn_4>
+        </options>
+      </li>
+      <li>
+        <!-- Peaceful -->
+        <kindDef>Peaceful</kindDef>
+        <options>
+          <Wula_FE_Spiritualist_Pawn_1>10</Wula_FE_Spiritualist_Pawn_1>
+          <Wula_FE_Spiritualist_Pawn_2>3</Wula_FE_Spiritualist_Pawn_2>
+          <Wula_FE_Spiritualist_Pawn_3>3</Wula_FE_Spiritualist_Pawn_3>
+          <Wula_FE_Spiritualist_Pawn_4>1</Wula_FE_Spiritualist_Pawn_4>
+        </options>
+      </li>
+      <li>
+        <kindDef>Trader</kindDef>
+        <traders>
+          <Wula_FE_Spiritualist_Pawn_4>1</Wula_FE_Spiritualist_Pawn_4>
+        </traders>
+        <carriers>
+          <Mech_WULA_Cat>2</Mech_WULA_Cat>
+        </carriers>
+        <guards>
+          <Wula_FE_Spiritualist_Pawn_1>2</Wula_FE_Spiritualist_Pawn_1>
+          <Wula_FE_Spiritualist_Pawn_2>1</Wula_FE_Spiritualist_Pawn_2>
+          <Wula_FE_Spiritualist_Pawn_3>1</Wula_FE_Spiritualist_Pawn_3>
+        </guards>
+      </li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">
+        <kindDef>Miners</kindDef>
+        <commonality>1</commonality>
+        <options>
+          <Mech_WULA_Cat_Constructor>1</Mech_WULA_Cat_Constructor>
+        </options>
+      </li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">
+        <kindDef>Hunters</kindDef>
+        <commonality>1</commonality>
+        <options>
+          <Mech_WULA_Cat_Assault>1</Mech_WULA_Cat_Assault>
+        </options>
+      </li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">
+        <kindDef>Loggers</kindDef>
+        <commonality>1</commonality>
+        <options>
+          <Mech_WULA_Cat>1</Mech_WULA_Cat>
+        </options>
+      </li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">
+        <kindDef>Farmers</kindDef>
+        <commonality>1</commonality>
+        <options>
+          <Mech_WULA_Cat>1</Mech_WULA_Cat>
         </options>
       </li>
     </pawnGroupMakers>
diff --git a/1.6/Defs/PawnKinds/PawnKinds_Wula.xml b/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
index 418d7d77..54425a35 100644
--- a/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
+++ b/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
@@ -437,9 +437,9 @@
     <apparelTags>
       <li>Wula_Inner</li>
     </apparelTags>
-    <apparelMoney>400~700</apparelMoney>
+    <apparelMoney>9999~9999</apparelMoney>
     <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
-    <weaponMoney>500~500</weaponMoney>
+    <weaponMoney>9999~9999</weaponMoney>
     <techHediffsChance>0</techHediffsChance>
     <techHediffsMoney>0</techHediffsMoney>
     <inventoryOptions>
diff --git a/1.6/Defs/PawnKinds/PawnKinds_Wula_FE_Spiritualist.xml b/1.6/Defs/PawnKinds/PawnKinds_Wula_FE_Spiritualist.xml
index d67bb6b6..b29c367c 100644
--- a/1.6/Defs/PawnKinds/PawnKinds_Wula_FE_Spiritualist.xml
+++ b/1.6/Defs/PawnKinds/PawnKinds_Wula_FE_Spiritualist.xml
@@ -39,6 +39,7 @@
     <abilities>
       <li>Wula_Psi_Control</li>
       <li>Wula_Psi_Explosive_Shock</li>
+      <li>Wula_Psi_LightningBombardment</li>
     </abilities>
   </PawnKindDef>
   <AbilityDef>
@@ -48,23 +49,28 @@
     <iconPath>Wula/UI/Abilities/WULA_MW_Scepter_Of_Flash_Ability</iconPath>
     <writeCombatLog>True</writeCombatLog>
     <showPsycastEffects>True</showPsycastEffects>
-    <cooldownTicksRange>36000</cooldownTicksRange> <!-- 15 seconds -->
+    <cooldownTicksRange>24000</cooldownTicksRange> <!-- 15 seconds -->
     <charges>3</charges>
     <cooldownPerCharge>true</cooldownPerCharge>
+    <displayGizmoWhileUndrafted>True</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>False</disableGizmoWhileUndrafted>
+    <targetRequired>False</targetRequired>
+    <aiCanUse>false</aiCanUse>
+    <!-- <ai_SearchAOEForTargets>true</ai_SearchAOEForTargets> -->
     <statBases>
-      <Ability_EffectRadius>5</Ability_EffectRadius>
+      <Ability_EffectRadius>12</Ability_EffectRadius>
     </statBases>
     <warmupEffecter>HoraxianSpellLight_Warmup</warmupEffecter>
     <verbProperties>
       <verbClass>Verb_CastAbility</verbClass>
       <defaultProjectile>Bullet_FleshmelterBolt</defaultProjectile>
-      <range>5</range>
+      <range>12</range>
       <drawAimPie>true</drawAimPie>
-      <warmupTime>0.5</warmupTime>
+      <warmupTime>1</warmupTime>
       <soundCast>Pawn_Revenant_Death</soundCast>
       <ai_IsWeapon>true</ai_IsWeapon>
       <ai_ProjectileLaunchingIgnoresMeleeThreats>true</ai_ProjectileLaunchingIgnoresMeleeThreats>
-      <targetable>false</targetable>
+      <!-- <targetable>false</targetable> -->
       <targetParams>
         <canTargetSelf>true</canTargetSelf>
       </targetParams>
@@ -123,25 +129,31 @@
     <writeCombatLog>True</writeCombatLog>
     <showPsycastEffects>False</showPsycastEffects>
     <cooldownTicksRange>36000</cooldownTicksRange> <!-- 15 seconds -->
+    <charges>2</charges>
+    <cooldownPerCharge>true</cooldownPerCharge>
+    <displayGizmoWhileUndrafted>True</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>False</disableGizmoWhileUndrafted>
+    <targetRequired>False</targetRequired>
+    <aiCanUse>true</aiCanUse>
+    <ai_SearchAOEForTargets>true</ai_SearchAOEForTargets>
     <statBases>
-      <Ability_EffectRadius>3</Ability_EffectRadius>
-      <Ability_Duration>300</Ability_Duration>
+      <Ability_EffectRadius>15</Ability_EffectRadius>
+      <Ability_Duration>900</Ability_Duration>
     </statBases>
     <warmupEffecter>HoraxianSpellLight_Warmup</warmupEffecter>
     <verbProperties>
       <verbClass>Verb_CastAbility</verbClass>
       <defaultProjectile>Bullet_FleshmelterBolt</defaultProjectile>
-      <range>15</range>
+      <range>21</range>
+      <minRange>4</minRange>
       <drawAimPie>true</drawAimPie>
       <warmupTime>0</warmupTime>
       <soundCast>AgonyPulse_Cast</soundCast>
-      <ai_IsWeapon>false</ai_IsWeapon>
+      <ai_IsWeapon>ture</ai_IsWeapon>
       <ai_ProjectileLaunchingIgnoresMeleeThreats>true</ai_ProjectileLaunchingIgnoresMeleeThreats>
       
       <targetParams>
-        <canTargetLocations>true</canTargetLocations>
         <canTargetSelf>true</canTargetSelf>
-        <canTargetPawns>true</canTargetPawns>
       </targetParams>
     </verbProperties>
     <comps>
@@ -161,4 +173,148 @@
       </li>
     </comps>
   </AbilityDef>
+  <AbilityDef>
+    <defName>Wula_Psi_LightningBombardment</defName>
+    <label>乌拉帝国术式：化三风暴</label>
+    <description>以庞大的灵能能量形成一场非自然风暴，持续轰击目标区域，风暴的轰击会产生范围性灵能爆燃，对建筑物有额外的伤害。</description>
+    <iconPath>Wula/UI/Abilities/WULA_MW_Scepter_Of_Explosive_Ability</iconPath>
+    <cooldownTicksRange>900</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <charges>3</charges>
+    <cooldownPerCharge>true</cooldownPerCharge>
+    <aiCanUse>true</aiCanUse>
+    <ai_SearchAOEForTargets>true</ai_SearchAOEForTargets>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <label>释放化三风暴</label>
+      <drawAimPie>true</drawAimPie>
+      <warmupTime>0.25</warmupTime>
+      <range>35.9</range>
+      <minRange>4</minRange>
+      <targetParams>
+        <canTargetPawns>True</canTargetPawns>
+        <canTargetLocations>True</canTargetLocations>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="WulaFallenEmpire.CompProperties_AbilityDRM_LightningBombardment">
+        <impactAreaRadius>9</impactAreaRadius>
+        <explosionRadiusRange>3~4</explosionRadiusRange>
+        <bombIntervalTicks>25</bombIntervalTicks>
+        <explosionCount>20</explosionCount>
+
+        <damageDef>Wula_Psi_Bomb</damageDef>
+        <damageAmount>30</damageAmount>
+        <armorPenetration>3</armorPenetration>
+      </li>
+    </comps>
+  </AbilityDef>
+
+  <!-- 乌拉大教堂 -->
+  <PawnKindDef Name="Wula_FE_Spiritualist_Pawn_Base" Abstract="True">
+    <race>WulaSpeciesReal</race>
+    <defaultFactionDef>Wula_FE_Spiritualist_Faction</defaultFactionDef>
+    <chemicalAddictionChance>0</chemicalAddictionChance>
+    <invNutrition>1</invNutrition>
+    <techHediffsTags>
+      <li>Advanced</li>
+    </techHediffsTags>
+    <techHediffsMoney>1250~1800</techHediffsMoney>
+    <gearHealthRange>1~1</gearHealthRange>
+    <itemQuality>Good</itemQuality>
+    <backstoryCryptosleepCommonality>0.08</backstoryCryptosleepCommonality>
+    <maxGenerationAge>50</maxGenerationAge>
+    <combatEnhancingDrugsChance>0</combatEnhancingDrugsChance>
+    <combatEnhancingDrugsCount>0</combatEnhancingDrugsCount>
+    <biocodeWeaponChance>1</biocodeWeaponChance>
+    <gearHealthRange>1~2.3</gearHealthRange>
+    <initialWillRange>5~10</initialWillRange>
+    <apparelTags>
+      <li>Wula_Inner</li>
+    </apparelTags>
+    <apparelMoney>9999~9999</apparelMoney>
+    <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
+    <weaponMoney>9999~9999</weaponMoney>
+    <techHediffsChance>1</techHediffsChance>
+    <inventoryOptions>
+      <skipChance>0</skipChance>
+      <subOptionsChooseOne>
+        <li>
+          <thingDef>MedicineUltratech</thingDef>
+          <countRange>3</countRange>
+        </li>
+        <li>
+          <thingDef>WULA_Soul_Wedge</thingDef>
+          <countRange>100</countRange>
+        </li>
+      </subOptionsChooseOne>
+    </inventoryOptions>
+  </PawnKindDef>
+  <PawnKindDef ParentName="Wula_FE_Spiritualist_Pawn_Base">
+    <defName>Wula_FE_Spiritualist_Pawn_1</defName>
+    <label>帝国修女</label>
+    <combatPower>350</combatPower>
+    <apparelTags>
+      <li>Wula_FE_Spiritualist_T1</li>
+    </apparelTags>
+    <weaponTags>
+      <li>Wula_Melee_Weapon_FE_Spiritualist</li>
+    </weaponTags>
+    <initialResistanceRange>15~24</initialResistanceRange>
+    <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
+  </PawnKindDef>
+  <PawnKindDef ParentName="Wula_FE_Spiritualist_Pawn_Base">
+    <defName>Wula_FE_Spiritualist_Pawn_2</defName>
+    <label>帝国护教军</label>
+    <combatPower>600</combatPower>
+    <apparelTags>
+      <li>Wula_FE_Spiritualist_T2</li>
+    </apparelTags>
+    <weaponTags>
+      <li>Wula_Ranged_Weapon_T4</li>
+    </weaponTags>
+    <initialResistanceRange>15~24</initialResistanceRange>
+    <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
+  </PawnKindDef>
+  <PawnKindDef ParentName="Wula_FE_Spiritualist_Pawn_Base">
+    <defName>Wula_FE_Spiritualist_Pawn_3</defName>
+    <label>帝国术士</label>
+    <combatPower>600</combatPower>
+    <apparelTags>
+      <li>Wula_FE_Spiritualist_T2</li>
+    </apparelTags>
+    <weaponTags>
+      <li>WULA_SP_Cotton_Counter_For_Enermy</li>
+    </weaponTags>
+    <initialResistanceRange>15~24</initialResistanceRange>
+    <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
+  </PawnKindDef>
+  <PawnKindDef ParentName="Wula_FE_Spiritualist_Pawn_Base">
+    <defName>Wula_FE_Spiritualist_Pawn_4</defName>
+    <label>帝国神官</label>
+    <combatPower>1000</combatPower>
+    <apparelTags>
+      <li>Wula_FE_Spiritualist_T3</li>
+    </apparelTags>
+    <weaponTags>
+      <li>WULA_SP_Spear_Impale_For_Enermy</li>
+      <li>WULA_SP_Cotton_Counter_For_Enermy</li>
+    </weaponTags>
+    <initialResistanceRange>15~24</initialResistanceRange>
+    <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
+  </PawnKindDef>
+  <PawnKindDef ParentName="Wula_FE_Spiritualist_Pawn_Base">
+    <defName>Wula_FE_Spiritualist_Leader</defName>
+    <label>星域主教</label>
+    <combatPower>1000</combatPower>
+    <apparelTags>
+      <li>Wula_FE_Spiritualist_T3</li>
+    </apparelTags>
+    <weaponTags>
+      <li>WULA_SP_Spear_Impale_For_Enermy</li>
+    </weaponTags>
+    <initialResistanceRange>99~99</initialResistanceRange>
+    <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
+  </PawnKindDef>
 </Defs>
\ No newline at end of file
diff --git a/1.6/Defs/ThingDefs_Misc/WULA_Apparel.xml b/1.6/Defs/ThingDefs_Misc/WULA_Apparel.xml
index e8312893..f9ef0883 100644
--- a/1.6/Defs/ThingDefs_Misc/WULA_Apparel.xml
+++ b/1.6/Defs/ThingDefs_Misc/WULA_Apparel.xml
@@ -492,6 +492,9 @@
       <texPath>Wula/Apparel/WULA_Nun_Uniform</texPath>
     </graphicData>
     <apparel>
+      <tags>
+        <li>Wula_FE_Spiritualist_T1</li>
+      </tags>
       <bodyPartGroups>
 				<li>Torso</li>
 				<li>Shoulders</li>
@@ -516,7 +519,7 @@
       <EnergyShieldEnergyMax>1.5</EnergyShieldEnergyMax>
     </statBases>
     <equippedStatOffsets>
-			<MeleeDodgeChance>5</MeleeDodgeChance>	
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>	
       <MentalBreakThreshold>-0.1</MentalBreakThreshold>
     </equippedStatOffsets>
     <costStuffCount>200</costStuffCount>
@@ -593,6 +596,9 @@
       <li>Leathery</li>
     </stuffCategories>
     <apparel>
+      <tags>
+        <li>Wula_FE_Spiritualist_T1</li>
+      </tags>
       <countsAsClothingForNudity>false</countsAsClothingForNudity>
       <bodyPartGroups>
         <li>FullHead</li>
@@ -1410,7 +1416,7 @@
     </statBases>
     <equippedStatOffsets>
 			<MoveSpeed>-0.2</MoveSpeed>
-			<MeleeDodgeChance>5</MeleeDodgeChance>	
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>	
 			<!-- <MoveSpeed>-0.5</MoveSpeed> -->
       <!-- <IncomingDamageFactor>-0.2</IncomingDamageFactor> -->
       <!-- <StaggerDurationFactor>-2</StaggerDurationFactor> -->
diff --git a/1.6/Defs/ThingDefs_Misc/WULA_FE_Spiritualist_Apparel.xml b/1.6/Defs/ThingDefs_Misc/WULA_FE_Spiritualist_Apparel.xml
index 29db149a..48d0a7f5 100644
--- a/1.6/Defs/ThingDefs_Misc/WULA_FE_Spiritualist_Apparel.xml
+++ b/1.6/Defs/ThingDefs_Misc/WULA_FE_Spiritualist_Apparel.xml
@@ -11,6 +11,7 @@
     <apparel>
       <tags>
         <li>RoyalTier6</li>
+        <li>Wula_FE_Spiritualist_T3</li>
       </tags>
       <bodyPartGroups>
 				<li>Torso</li>
@@ -40,7 +41,7 @@
     </statBases>
     <equippedStatOffsets>
       <PsychicSensitivity>1</PsychicSensitivity>
-			<MeleeDodgeChance>50</MeleeDodgeChance>	
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>	
       <MentalBreakThreshold>-0.25</MentalBreakThreshold>
     </equippedStatOffsets>
     <tradeability>None</tradeability>
@@ -118,6 +119,7 @@
     <apparel>
       <tags>
         <li>RoyalTier6</li>
+        <li>Wula_FE_Spiritualist_T3</li>
       </tags>
       <countsAsClothingForNudity>false</countsAsClothingForNudity>
       <bodyPartGroups>
@@ -197,7 +199,7 @@
     </costList>
     <apparel>
       <tags>
-        <li>Wula_Armor_Medium</li>
+        <li>Wula_FE_Spiritualist_T2</li>
       </tags>
       <wornGraphicPath>Wula/Apparel/WULA_Skitarii_Uniform</wornGraphicPath>
     </apparel>
@@ -258,7 +260,7 @@
     </equippedStatOffsets>
     <apparel>
       <tags>
-        <li>Wula_Armor_Medium</li>
+        <li>Wula_FE_Spiritualist_T2</li>
       </tags>
       <wornGraphicPath>Wula/Apparel/WULA_Skitarii_veil</wornGraphicPath>
     </apparel>
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 ab4fc711..85c33fce 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
@@ -3,7 +3,7 @@
   <ThingDef Name="WULA_SP_Spear_Impale" ParentName="BaseHumanMakeableGun">
     <defName>WULA_SP_Spear_Impale</defName>
     <label>圣枪穿刺术式</label>
-    <description>这是乌拉星人所创造的最强大的进攻术式，来源于乌拉星人的泰坦和旗舰。这种术式发射的纯净灵能能量能绕过几乎所有防御，在敌人的集群中连续弹跳，瞬间烧穿无信之徒的可悲躯体。\n\n然而，这种术式的能量和战舰唱诗班的相去甚远，因此它发射的能量无法攻击建筑。\n\n为了弥补缺陷，法杖还附带了一个需要魂楔充能的进攻型法术，可以从很远的地方发射灵能射弹轰炸目标区域。</description>
+    <description>这是乌拉星人所创造的最强大的进攻术式，来源于乌拉星人的泰坦和旗舰。这种术式发射的纯净灵能能量能绕过几乎所有防御，在敌人的集群中连续弹跳，瞬间烧穿无信之徒的可悲躯体。\n\n为法杖同时携带了一个需要魂楔充能的进攻型技，可以从很远的地方发射灵能射弹轰炸目标区域。</description>
     <techLevel>Archotech</techLevel>
     <!-- <techLevel>Spacer</techLevel> -->
     <graphicData>
diff --git a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
index e3ccbf69..7f512fcf 100644
--- a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
+++ b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
@@ -326,7 +326,7 @@
       <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
     </recipeMaker>
   </ThingDef>
-  <!-- 长枪 -->
+  <!-- 铳枪 -->
   <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
     <defName>WULA_MW_Lance</defName>
     <label>CMl-28"铳枪"</label>
@@ -510,6 +510,7 @@
     <label>CMl-99"剑冢"</label>
     <description>乌拉帝国修女惯用的大型双头刀，装备了悬浮轴承、能量刃、惯性控制场和精密的传感器系统，让使用者能像舞蹈般挥舞两端的致命锋刃。</description>
     <weaponTags>
+      <li>Wula_Melee_Weapon_FE_Spiritualist</li>
       <li>Spear</li>
     </weaponTags>
     <graphicData>
@@ -996,8 +997,8 @@
         <hasStandardCommand>true</hasStandardCommand>
         <defaultProjectile>WULA_Bullet_StarDrift_Shotgun_Spear</defaultProjectile>
         <warmupTime>0.2</warmupTime>
-        <range>15</range>
-        <burstShotCount>1</burstShotCount>
+        <range>18</range>
+        <burstShotCount>3</burstShotCount>
         <ticksBetweenBurstShots>3</ticksBetweenBurstShots>
         <soundCast>ChargeLance_Fire</soundCast>
         <soundCastTail>GunTail_Heavy</soundCastTail>
@@ -1021,7 +1022,7 @@
     </projectile>
     <modExtensions>
 			<li Class="WulaFallenEmpire.ShotgunExtension">
-				<pelletCount>6</pelletCount>
+				<pelletCount>3</pelletCount>
 			</li>
 		</modExtensions>
   </ThingDef>
@@ -1068,7 +1069,7 @@
         <hasStandardCommand>true</hasStandardCommand>
         <defaultProjectile>Bullet_ChargeRifle</defaultProjectile>
         <warmupTime>0.5</warmupTime>
-        <range>36.9</range>
+        <range>33.9</range>
         <burstShotCount>32</burstShotCount>
         <ticksBetweenBurstShots>2</ticksBetweenBurstShots>
         <soundCast>Shot_ChargeRifle</soundCast>
@@ -1107,7 +1108,7 @@
       <AccuracyShort>0.03</AccuracyShort>
       <AccuracyMedium>0.03</AccuracyMedium>
       <AccuracyLong>0.02</AccuracyLong>
-      <RangedWeapon_Cooldown>4.0</RangedWeapon_Cooldown>
+      <RangedWeapon_Cooldown>3.0</RangedWeapon_Cooldown>
     </statBases>
     <costList Inherit="False">
       <Steel>500</Steel>
@@ -1119,8 +1120,8 @@
         <verbClass>WulaFallenEmpire.Verb_ShootShotgun</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
         <defaultProjectile>Bullet_WULA_RW_Handle_Cannon</defaultProjectile>
-        <warmupTime>1.5</warmupTime>
-        <range>22</range>
+        <warmupTime>3</warmupTime>
+        <range>20</range>
         <soundCast>Shot_HellsphereCannonGun</soundCast>
         <soundCastTail>GunTail_Heavy</soundCastTail>
         <muzzleFlashScale>9</muzzleFlashScale>
@@ -1174,8 +1175,8 @@
     <projectile Class="WulaFallenEmpire.ProjectileProperties_ConfigurableHellsphereCannon">
       <damageDef>Vaporize</damageDef>
       <speed>75</speed>
-      <damageAmountBase>45</damageAmountBase>
-      <explosionRadius>1.5</explosionRadius>
+      <damageAmountBase>30</damageAmountBase>
+      <explosionRadius>2</explosionRadius>
       <screenShakeFactor>0.75</screenShakeFactor>
     </projectile>
     <modExtensions>
@@ -1311,8 +1312,8 @@
         <hasStandardCommand>true</hasStandardCommand>
         <defaultProjectile>Bullet_WULA_RW_Auto_GL</defaultProjectile>
         <warmupTime>0.2</warmupTime>
-        <forcedMissRadius>1</forcedMissRadius>
-        <forcedMissRadiusClassicMortars>1</forcedMissRadiusClassicMortars>
+        <forcedMissRadius>4</forcedMissRadius>
+        <forcedMissRadiusClassicMortars>4</forcedMissRadiusClassicMortars>
         <isMortar>true</isMortar>
         <requireLineOfSight>false</requireLineOfSight>
         <minRange>4</minRange>
@@ -1349,104 +1350,6 @@
       <soundAmbient>MortarRound_Ambient</soundAmbient>
     </projectile>
   </ThingDef>
-  <!-- 测试导弹发射器 -->
-  <ThingDef ParentName="BaseHumanMakeableGun">
-    <defName>WULA_RW_Test_Missile</defName>
-    <label>测试导弹武器</label>
-    <description></description>
-    <techLevel>Ultra</techLevel>
-    <tradeability>None</tradeability>
-    <!-- <techLevel>Spacer</techLevel> -->
-    <graphicData>
-      <texPath>Wula/Weapon/WULA_RW_Auto_GL</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>1.65</drawSize>
-    </graphicData>
-    <weaponTags>
-      <li>Wula_Ranged_Weapon_T3</li>
-    </weaponTags>
-    <uiIconScale>0.75</uiIconScale>
-    <recipeMaker>
-      <!-- <recipeUsers Inherit="False">
-        <li>WULA_Cube_Productor_Energy</li>
-      </recipeUsers> -->
-      <!-- <researchPrerequisite>WULA_Synth_Weapon_3_Bomb_Technology</researchPrerequisite> -->
-      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-    </recipeMaker>
-    <costList Inherit="False">
-      <Steel>380</Steel>
-      <Plasteel>60</Plasteel>
-      <ComponentSpacer>8</ComponentSpacer>
-    </costList>
-    <statBases>
-      <WorkToMake>40000</WorkToMake>
-      <Mass>20</Mass>
-      <AccuracyTouch>0.5</AccuracyTouch>
-      <AccuracyShort>0.5</AccuracyShort>
-      <AccuracyMedium>0.4</AccuracyMedium>
-      <AccuracyLong>0.3</AccuracyLong>
-      <RangedWeapon_Cooldown>6</RangedWeapon_Cooldown>
-    </statBases>
-    <verbs>
-      <li>
-        <verbClass>Verb_Shoot</verbClass>
-        <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>Bullet_WULA_RW_Test_Missile</defaultProjectile>
-        <warmupTime>0.2</warmupTime>
-        <burstShotCount>32</burstShotCount>
-        <ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-        <isMortar>true</isMortar>
-        <requireLineOfSight>false</requireLineOfSight>
-        <minRange>4</minRange>
-        <range>48</range>
-        <soundCast>Mortar_LaunchA</soundCast>
-        <muzzleFlashScale>12</muzzleFlashScale>
-        <targetParams>
-          <canTargetLocations>true</canTargetLocations>
-        </targetParams>
-      </li>
-    </verbs>
-  </ThingDef>
-  <ThingDef ParentName="BaseBullet">
-    <defName>Bullet_WULA_RW_Test_Missile</defName>
-    <label>测试导弹</label>
-    <graphicData>
-      <texPath>Wula/Projectile/WULA_Shrapnel</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <shaderType>TransparentPostLight</shaderType>
-    </graphicData>
-    <thingClass>WulaFallenEmpire.Projectile_CruiseMissile</thingClass>
-		<modExtensions>
-			<li Class="WulaFallenEmpire.CruiseMissileProperties">
-				<!-- 主爆炸参数 -->
-				<customDamageDef>Bomb</customDamageDef>
-				<customDamageAmount>25</customDamageAmount>
-				<customExplosionRadius>3.5</customExplosionRadius>
-				<customSoundExplode>MortarBomb_Explode</customSoundExplode>
-
-				<!-- 子爆炸系统 -->
-				<useSubExplosions>true</useSubExplosions>
-				<subExplosionCount>4</subExplosionCount>
-				<subExplosionRadius>1.5</subExplosionRadius>
-				<subExplosionDamage>10</subExplosionDamage>
-				<subExplosionSpread>6</subExplosionSpread>
-				<subDamageDef>Bomb</subDamageDef>
-				<subSoundExplode>MortarBomb_Explode</subSoundExplode>
-			</li>
-		</modExtensions>
-    <projectile>
-      <damageDef>Bomb</damageDef>
-      <damageAmountBase>25</damageAmountBase>
-      <speed>35</speed>
-      <explosionRadius>3.5</explosionRadius>
-      <armorPenetrationBase>0.1</armorPenetrationBase>
-      <flyOverhead>true</flyOverhead>
-      <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-      <soundExplode>MortarBomb_Explode</soundExplode>
-      <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-      <soundAmbient>MortarRound_Ambient</soundAmbient>
-    </projectile>
-  </ThingDef>
 
   <!-- 暗物质步枪 -->
   <ThingDef ParentName="BaseHumanMakeableGun">
@@ -1484,7 +1387,7 @@
       <AccuracyShort>1</AccuracyShort>
       <AccuracyMedium>1</AccuracyMedium>
       <AccuracyLong>1</AccuracyLong>
-      <RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+      <RangedWeapon_Cooldown>1.25</RangedWeapon_Cooldown>
     </statBases>
     <verbs>
       <li Class="WulaFallenEmpire.VerbPropertiesExplosiveBeam">
@@ -1492,7 +1395,7 @@
 
         <!-- 基础射线参数 -->
         <hasStandardCommand>true</hasStandardCommand>
-        <warmupTime>0.3</warmupTime>
+        <warmupTime>1</warmupTime>
         <range>30</range>
         <burstShotCount>3</burstShotCount>
         <ticksBetweenBurstShots>8</ticksBetweenBurstShots>
@@ -1583,7 +1486,7 @@
       <AccuracyShort>0.6</AccuracyShort>
       <AccuracyMedium>0.6</AccuracyMedium>
       <AccuracyLong>0.6</AccuracyLong>
-      <RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+      <RangedWeapon_Cooldown>3</RangedWeapon_Cooldown>
     </statBases>
     <verbs>
       <li Class="WulaFallenEmpire.VerbPropertiesExplosiveBeam">
@@ -1591,8 +1494,8 @@
 
         <!-- 基础射线参数 -->
         <hasStandardCommand>true</hasStandardCommand>
-        <warmupTime>0.3</warmupTime>
-        <range>24</range>
+        <warmupTime>1</warmupTime>
+        <range>22</range>
         <burstShotCount>12</burstShotCount>
         <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
         <beamDamageDef>Wula_Darm_Matter_Beam</beamDamageDef>
@@ -1742,7 +1645,7 @@
       <AccuracyShort>0.5</AccuracyShort>
       <AccuracyMedium>0.4</AccuracyMedium>
       <AccuracyLong>0.35</AccuracyLong>
-      <RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+      <RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
     </statBases>
     <weaponTags>
       <li>WULA_AI_Heavy_Panzer_Gunner_Weapon</li>
diff --git a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml
index dcc77dfb..401798ae 100644
--- a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml
+++ b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml
@@ -335,6 +335,7 @@
           <li>WULA_Trait_Knight</li>
           <li>WULA_Trait_Legal_Officer</li>
           <li>WULA_Trait_Sculptor</li>
+          <li>WULA_Trait_Diplomat</li>
           <li>WULA_Trait_Nun</li>
           <li>WULA_Trait_Researcher</li>
           <li>WULA_Trait_Connector</li>
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 c59d7566..b11ba41e 100644
--- a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Spiritualist.xml
+++ b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Spiritualist.xml
@@ -61,7 +61,7 @@
       <!--加上这个组件的机械体会直接跳过原版指挥范围判定-->
       <li Class="WulaFallenEmpire.CompProperties_GlobalMechCommand" />
       <li Class="CompProperties_ProjectileInterceptor">
-        <radius>7</radius>
+        <radius>4</radius>
         <interceptGroundProjectiles>true</interceptGroundProjectiles>
         <color>(0.5, 0.3, 0.9)</color>
         <reactivateEffect>BulletShieldGenerator_Reactivate</reactivateEffect>
@@ -83,6 +83,7 @@
         <maxDistanceToBlink>40</maxDistanceToBlink>
         <minDistanceToBlink>4</minDistanceToBlink>
         <postBlinkStanceTicks>0</postBlinkStanceTicks>
+        <playerFactionOnly>false</playerFactionOnly>
         <excludedJobDefs>
           <li>GotoWander</li>
           <li>Carried</li>
diff --git a/1.6/Defs/TraitDefs/Traits_WULA.xml b/1.6/Defs/TraitDefs/Traits_WULA.xml
index a3e86461..42c2ce48 100644
--- a/1.6/Defs/TraitDefs/Traits_WULA.xml
+++ b/1.6/Defs/TraitDefs/Traits_WULA.xml
@@ -101,8 +101,11 @@
         <label>外交官</label>
         <description>乌拉帝国的外交官被称为传谕使，她们彬彬有礼的礼节中也无法掩盖属于堕落帝国的傲慢与目中无人。</description>
         <statFactors>
-          <SocialImpact>1</SocialImpact>
+          <SocialImpact>2</SocialImpact>
         </statFactors>
+        <statOffsets>
+          <PawnBeauty>2</PawnBeauty>
+        </statOffsets>
       </li>
     </degreeDatas>
   </TraitDef>