2025-8-5

1.6/Defs/DamageDefs/Damages_Wula.xml

@@ -52,6 +52,7 @@
       </points>
     </igniteChanceByTargetFlammability>
     <label>灵能灼烧</label>
+    <ignoreShields>true</ignoreShields>
     <workerClass>DamageWorker_AddInjury</workerClass>
     <externalViolence>true</externalViolence>
     <deathMessage>{0} 被灵能灼烧而死。</deathMessage>
@@ -89,6 +90,7 @@
   <DamageDef ParentName="Bomb">
     <defName>Wula_Psi_Bomb</defName>
     <label>灵能爆燃</label>
+    <ignoreShields>true</ignoreShields>
     <deathMessage>{0} 被灵能灼烧而死。</deathMessage>
     <defaultDamage>50</defaultDamage>
     <defaultStoppingPower>2.0</defaultStoppingPower>
@@ -112,6 +114,7 @@
   <DamageDef>
     <defName>WULA_SP_Live_Shelter_Heal</defName>
     <label>灵能疗愈</label>
+    <ignoreShields>true</ignoreShields>
     <workerClass>DamageWorker_Stab</workerClass>
     <stabChanceOfForcedInternal>0</stabChanceOfForcedInternal>
     <externalViolence>false</externalViolence>

1.6/Defs/FactionDefs/Factions_Player_WULA.xml

@@ -161,6 +161,10 @@
     <configurationListOrderPriority>900</configurationListOrderPriority>
     <dropPodActive>ActiveDropPodMechanoid</dropPodActive>
     <dropPodIncoming>DropPodIncomingMechanoidRapid</dropPodIncoming>
+    <backstoryCategories>
+      <li>Wula_Backstory_Categories_For_Hostile_Faction</li>
+      <li>Wula_Old_Synth_Backstory_Categories</li>
+    </backstoryCategories>
   </FactionDef>
 
   <!-- 大教堂 -->

1.6/Defs/HediffDefs/Hediffs_WULA_Blessings.xml

@@ -12,11 +12,11 @@
       <li>
         <statOffsets>
           <MoveSpeed>1.0</MoveSpeed>
-          <GlobalWorkSpeed>0.25</GlobalWorkSpeed>
+          <WorkSpeedGlobal>0.25</WorkSpeedGlobal>
         </statOffsets>
         <statFactors>
-            <AimingTime>0.8</AimingTime>
+          <AimingDelayFactor>0.8</AimingDelayFactor>
-            <MeleeWeapon_CooldownMultiplier>0.8</MeleeWeapon_CooldownMultiplier>
+          <MeleeWeapon_CooldownMultiplier>0.8</MeleeWeapon_CooldownMultiplier>
         </statFactors>
       </li>
     </stages>

1.6/Defs/MentalStateDefs/MentalStates_WULA_Broken.xml

@@ -27,5 +27,20 @@
     <beginLetterDef>NegativeEvent</beginLetterDef>
     <baseInspectLine>精神状态：人格破碎</baseInspectLine>
   </MentalStateDef>
-
+    
+  <MentalStateDef ParentName="BaseMentalState">
+    <defName>Wula_Fake_MechanoidBerserk</defName>
+    <stateClass>MentalState_BerserkWarcall</stateClass>
+    <label>短暂失控</label>
+    <category>Aggro</category>
+    <blockRandomInteraction>true</blockRandomInteraction>
+    <nameColor>(0.9,0.2,0.5)</nameColor>
+    <beginLetter>{0} 受到冲击.</beginLetter>
+    <baseInspectLine>精神状态：短暂失控</baseInspectLine>
+    <stateEffecter>AnimalWarcallMentalState</stateEffecter>
+    <minTicksBeforeRecovery>1</minTicksBeforeRecovery>
+    <maxTicksBeforeRecovery>1</maxTicksBeforeRecovery>
+    <inCaravanCanDo>true</inCaravanCanDo>
+    <blocksDefendAndExpandHive>true</blocksDefendAndExpandHive>
+  </MentalStateDef>
 </Defs>

1.6/Defs/PawnKinds/PawnKinds_Wula.xml

@@ -451,6 +451,14 @@
         </li>
       </subOptionsChooseOne>
     </inventoryOptions>
+    <backstoryFiltersOverride>
+      <li>
+        <categories>
+          <li>Wula_Backstory_Categories_For_Hostile_Faction</li>
+          <li>Wula_Old_Synth_Backstory_Categories</li>
+        </categories>
+      </li>
+    </backstoryFiltersOverride>
   </PawnKindDef>
   <!-- 低级子个体 -->
   <PawnKindDef ParentName="Wula_Broken_Personality_Pawn_Base">
@@ -465,14 +473,6 @@
     </weaponTags>
     <initialResistanceRange>15~24</initialResistanceRange>
     <apparelAllowHeadgearChance>0</apparelAllowHeadgearChance>
-    <backstoryFiltersOverride>
-      <li>
-        <categories>
-          <li>Wula_Backstory_Categories_For_Hostile_Faction</li>
-          <li>Wula_Old_Synth_Backstory_Categories</li>
-        </categories>
-      </li>
-    </backstoryFiltersOverride>
   </PawnKindDef>
   <PawnKindDef ParentName="Wula_Broken_Personality_Pawn_Base">
     <defName>Wula_Broken_Personality_Pawn_2</defName>
@@ -486,14 +486,6 @@
       <li>Wula_Weapon_Init</li>
     </weaponTags>
     <initialResistanceRange>15~24</initialResistanceRange>
-    <backstoryFiltersOverride>
-      <li>
-        <categories>
-          <li>Wula_Backstory_Categories_For_Hostile_Faction</li>
-          <li>Wula_Old_Synth_Backstory_Categories</li>
-        </categories>
-      </li>
-    </backstoryFiltersOverride>
   </PawnKindDef>
   <!-- 中级子个体 -->
   <PawnKindDef ParentName="Wula_Broken_Personality_Pawn_Base">
@@ -510,14 +502,6 @@
       <li>Wula_Melee_Weapon_T2</li>
     </weaponTags>
     <initialResistanceRange>15~24</initialResistanceRange>
-    <backstoryFiltersOverride>
-      <li>
-        <categories>
-          <li>Wula_Backstory_Categories_For_Hostile_Faction</li>
-          <li>Wula_Old_Synth_Backstory_Categories</li>
-        </categories>
-      </li>
-    </backstoryFiltersOverride>
   </PawnKindDef>
   <PawnKindDef ParentName="Wula_Broken_Personality_Pawn_Base">
     <defName>Wula_Broken_Personality_Pawn_4</defName>
@@ -533,14 +517,6 @@
       <li>Wula_Ranged_Weapon_T2</li>
     </weaponTags>
     <initialResistanceRange>15~24</initialResistanceRange>
-    <backstoryFiltersOverride>
-      <li>
-        <categories>
-          <li>Wula_Backstory_Categories_For_Hostile_Faction</li>
-          <li>Wula_Old_Synth_Backstory_Categories</li>
-        </categories>
-      </li>
-    </backstoryFiltersOverride>
   </PawnKindDef>
   <!-- 特殊子个体 -->
   <PawnKindDef ParentName="Wula_Broken_Personality_Pawn_Base">
@@ -559,14 +535,6 @@
     </weaponTags>
     <initialResistanceRange>15~24</initialResistanceRange>
     <isGoodBreacher>true</isGoodBreacher>
-    <backstoryFiltersOverride>
-      <li>
-        <categories>
-          <li>Wula_Backstory_Categories_For_Hostile_Faction</li>
-          <li>Wula_Old_Synth_Backstory_Categories</li>
-        </categories>
-      </li>
-    </backstoryFiltersOverride>
   </PawnKindDef>
   <!-- 高级子个体 -->
   <PawnKindDef ParentName="Wula_Broken_Personality_Pawn_Base">
@@ -585,14 +553,6 @@
       <li>Wula_Ranged_Weapon_T2</li>
     </weaponTags>
     <initialResistanceRange>15~24</initialResistanceRange>
-    <backstoryFiltersOverride>
-      <li>
-        <categories>
-          <li>Wula_Backstory_Categories_For_Hostile_Faction</li>
-          <li>Wula_Old_Synth_Backstory_Categories</li>
-        </categories>
-      </li>
-    </backstoryFiltersOverride>
   </PawnKindDef>
   <PawnKindDef ParentName="Wula_Broken_Personality_Pawn_Base">
     <defName>Wula_Broken_Personality_Pawn_7</defName>
@@ -610,13 +570,5 @@
     </weaponTags>
     <initialResistanceRange>15~24</initialResistanceRange>
     <isGoodBreacher>true</isGoodBreacher>
-    <backstoryFiltersOverride>
-      <li>
-        <categories>
-          <li>Wula_Backstory_Categories_For_Hostile_Faction</li>
-          <li>Wula_Old_Synth_Backstory_Categories</li>
-        </categories>
-      </li>
-    </backstoryFiltersOverride>
   </PawnKindDef>
 </Defs>

1.6/Defs/PawnKinds/PawnKinds_Wula_FE_Spiritualist.xml

@@ -55,8 +55,8 @@
     <displayGizmoWhileUndrafted>True</displayGizmoWhileUndrafted>
     <disableGizmoWhileUndrafted>False</disableGizmoWhileUndrafted>
     <targetRequired>False</targetRequired>
-    <aiCanUse>false</aiCanUse>
+    <aiCanUse>true</aiCanUse>
-    <!-- <ai_SearchAOEForTargets>true</ai_SearchAOEForTargets> -->
+    <ai_SearchAOEForTargets>true</ai_SearchAOEForTargets>
     <statBases>
       <Ability_EffectRadius>12</Ability_EffectRadius>
     </statBases>
@@ -124,18 +124,18 @@
   <AbilityDef>
     <defName>Wula_Psi_Control</defName>
     <label>乌拉帝国术式：恩赐荣光</label>
-    <description>使用灵能能量强行支配范围内所有目标的心智，让其调转枪口攻击敌人。</description>
+    <description>使用灵能能量强行支配范围内所有目标的心智，让其调转枪口攻击敌人。它会对自己和其他机械体造成瞬间的失控，无法真正地影响机械体。</description>
     <iconPath>Wula/UI/Abilities/WULA_MW_Scepter_Of_Lost_Ability</iconPath>
     <writeCombatLog>True</writeCombatLog>
-    <showPsycastEffects>False</showPsycastEffects>
+    <showPsycastEffects>True</showPsycastEffects>
     <cooldownTicksRange>36000</cooldownTicksRange> <!-- 15 seconds -->
     <charges>2</charges>
     <cooldownPerCharge>true</cooldownPerCharge>
+    <targetRequired>False</targetRequired>
     <displayGizmoWhileUndrafted>True</displayGizmoWhileUndrafted>
     <disableGizmoWhileUndrafted>False</disableGizmoWhileUndrafted>
-    <targetRequired>False</targetRequired>
+    <aiCanUse>false</aiCanUse>
-    <aiCanUse>true</aiCanUse>
+    <!-- <ai_SearchAOEForTargets>true</ai_SearchAOEForTargets> -->
-    <ai_SearchAOEForTargets>true</ai_SearchAOEForTargets>
     <statBases>
       <Ability_EffectRadius>15</Ability_EffectRadius>
       <Ability_Duration>900</Ability_Duration>
@@ -144,12 +144,11 @@
     <verbProperties>
       <verbClass>Verb_CastAbility</verbClass>
       <defaultProjectile>Bullet_FleshmelterBolt</defaultProjectile>
-      <range>21</range>
+      <range>15</range>
-      <minRange>4</minRange>
       <drawAimPie>true</drawAimPie>
-      <warmupTime>0</warmupTime>
+      <warmupTime>0.5</warmupTime>
       <soundCast>AgonyPulse_Cast</soundCast>
-      <ai_IsWeapon>ture</ai_IsWeapon>
+      <ai_IsWeapon>true</ai_IsWeapon>
       <ai_ProjectileLaunchingIgnoresMeleeThreats>true</ai_ProjectileLaunchingIgnoresMeleeThreats>
       
       <targetParams>
@@ -160,10 +159,14 @@
       <li Class="CompProperties_AbilityGiveMentalState">
         <compClass>CompAbilityEffect_GiveMentalState</compClass>
         <stateDef>BerserkWarcall</stateDef>
-        <goodwillImpact>-20</goodwillImpact>
+        <stateDefForMechs>Wula_Fake_MechanoidBerserk</stateDefForMechs>
+        <psychic>True</psychic>
+        <durationMultiplier>PsychicSensitivity</durationMultiplier>
+        <goodwillImpact>-75</goodwillImpact>
         <casterEffect>AnimalWarcall_Cast</casterEffect>
         <targetEffect>AnimalWarcall_CastOnTarget</targetEffect>
         <excludeNPCFactions>false</excludeNPCFactions>
+        <applyToSelf>false</applyToSelf>
       </li>
       <li Class="CompProperties_AbilityFleckOnTarget">
         <fleckDef>PsycastPsychicEffect</fleckDef>

1.6/Defs/ThingDefs/WULA_Item.xml

@@ -1,22 +1,43 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <ThingDef ParentName="MealBase">
+  <ThingDef>
     <defName>WULA_Charge_Cube</defName>
     <label>乌拉帝国能源核心</label>
     <description>被高度压缩的能源核心，是机械乌拉的能源系统唯一可接受的外部输入性能量来源。</description>
+    <thingClass>ThingWithComps</thingClass>
+    <category>Item</category>
+    <drawerType>MapMeshOnly</drawerType>
+    <useHitPoints>true</useHitPoints>
+    <healthAffectsPrice>false</healthAffectsPrice>
+    <selectable>true</selectable>
     <graphicData>
       <texPath>Wula/Item/WULA_Charge_Cube</texPath>
       <graphicClass>Graphic_Single</graphicClass>
     </graphicData>
     <stackLimit>30</stackLimit>
     <statBases>
+      <Nutrition>1</Nutrition>
+      <MaxHitPoints>50</MaxHitPoints>
+      <Flammability>0</Flammability>
+      <Beauty>0</Beauty>
       <DeteriorationRate>0.01</DeteriorationRate>
       <MarketValue>24</MarketValue>
       <Mass>0.3</Mass>
       <WorkToMake>450</WorkToMake>
-      <Nutrition>1</Nutrition> <!-- Reverted to 1 as per user request -->
     </statBases>
+    <altitudeLayer>Item</altitudeLayer>
+    <tickerType>Rare</tickerType>
+    <socialPropernessMatters>true</socialPropernessMatters>
+    <thingCategories>
+      <li>FoodMeals</li>
+    </thingCategories>
+    <alwaysHaulable>true</alwaysHaulable>
+    <pathCost>14</pathCost>
     <ingestible>
+      <foodType>Liquor</foodType>
+      <maxNumToIngestAtOnce>1</maxNumToIngestAtOnce>
+      <defaultNumToIngestAtOnce>1</defaultNumToIngestAtOnce>
+      <optimalityOffsetHumanlikes>16</optimalityOffsetHumanlikes>
       <baseIngestTicks>270</baseIngestTicks>
       <preferability>MealSimple</preferability> <!-- Reverted to MealSimple as per user request -->
       <optimalityOffsetHumanlikes>-1000</optimalityOffsetHumanlikes>
@@ -32,7 +53,11 @@
     </ingestible>
     <allowedArchonexusCount>200</allowedArchonexusCount>
     <tradeability>None</tradeability>
+    <resourceReadoutPriority>Last</resourceReadoutPriority>
+    <drawGUIOverlay>true</drawGUIOverlay>
+    <uiIconForStackCount>1</uiIconForStackCount>
     <comps>
+      <li Class="CompProperties_Forbiddable" />
       <li Class="CompProperties_Usable">
         <useJob>WULA_IngestWulaEnergy</useJob>
         <useLabel>从能量核心中摄取能量</useLabel>

1.6/Defs/ThingDefs_Buildings/WULA_FallenEmpire_Buildings_Ritual.xml

@@ -25,9 +25,9 @@
     </graphicData>
     <size>(3, 3)</size>
     <terrainAffordanceNeeded>Light</terrainAffordanceNeeded>
-    <researchPrerequisites>
+    <!-- <researchPrerequisites>
       <li>PsychicRituals</li>
-    </researchPrerequisites>
+    </researchPrerequisites> -->
     <inspectorTabs>
       <li>ITab_Entity</li>
     </inspectorTabs>

1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml

@@ -29,6 +29,8 @@
       <WULA_Dark_Matter_Item>6</WULA_Dark_Matter_Item>
     </costList>
     <statBases>
+      <DeteriorationRate>0</DeteriorationRate>
+      <Flammability>0</Flammability>
       <WorkToMake>40000</WorkToMake>
       <Mass>0</Mass>
       <AccuracyTouch>1</AccuracyTouch>
@@ -172,8 +174,8 @@
       <texPath>Wula/Mote/WULA_Bullet_Dark_Matter_Beam</texPath>
       <color>(200, 40, 40, 255)</color>
       <graphicClass>Graphic_MoteWithAgeSecs</graphicClass>
-      <shaderType>MoteBeam</shaderType>
+      <shaderType>MoteGlow</shaderType>
-      <drawSize>(3,1)</drawSize>
+      <drawSize>(1.5,1)</drawSize>
       <shaderParameters>
         <_ExtraTexA>/Things/Mote/BeamSecondaryNoise_A</_ExtraTexA>
         <_ExtraTexB>/Things/Mote/BeamSecondaryNoise_B</_ExtraTexB>
@@ -220,6 +222,8 @@
       <WULA_Dark_Matter_Item>4</WULA_Dark_Matter_Item>
     </costList>
     <statBases>
+      <DeteriorationRate>0</DeteriorationRate>
+      <Flammability>0</Flammability>
       <WorkToMake>40000</WorkToMake>
       <Mass>0</Mass>
       <AccuracyTouch>2</AccuracyTouch>
@@ -348,8 +352,8 @@
       <texPath>Wula/Mote/WULA_Bullet_Dark_Matter_Beam</texPath>
       <color>(255, 255, 255, 255)</color>
       <graphicClass>Graphic_MoteWithAgeSecs</graphicClass>
-      <shaderType>MoteBeam</shaderType>
+      <shaderType>MoteGlow</shaderType>
-      <drawSize>(2,1)</drawSize>
+      <drawSize>(1.2,1)</drawSize>
       <shaderParameters>
         <_ExtraTexA>/Things/Mote/BeamSecondaryNoise_A</_ExtraTexA>
         <_ExtraTexB>/Things/Mote/BeamSecondaryNoise_B</_ExtraTexB>
@@ -396,6 +400,8 @@
       <WULA_Dark_Matter_Item>6</WULA_Dark_Matter_Item>
     </costList>
     <statBases>
+      <DeteriorationRate>0</DeteriorationRate>
+      <Flammability>0</Flammability>
       <WorkToMake>40000</WorkToMake>
       <Mass>0</Mass>
       <AccuracyTouch>1</AccuracyTouch>
@@ -467,8 +473,8 @@
       <texPath>Wula/Mote/WULA_Bullet_Dark_Matter_Beam</texPath>
       <color>(38, 204, 66, 255)</color>
       <graphicClass>Graphic_MoteWithAgeSecs</graphicClass>
-      <shaderType>MoteBeam</shaderType>
+      <shaderType>MoteGlow</shaderType>
-      <drawSize>(1.5,1)</drawSize>
+      <drawSize>(1,1)</drawSize>
       <shaderParameters>
         <_ExtraTexA>/Things/Mote/BeamSecondaryNoise_A</_ExtraTexA>
         <_ExtraTexB>/Things/Mote/BeamSecondaryNoise_B</_ExtraTexB>
@@ -561,6 +567,8 @@
       <ComponentSpacer>8</ComponentSpacer>
     </costList>
     <statBases>
+      <DeteriorationRate>0</DeteriorationRate>
+      <Flammability>0</Flammability>
       <WorkToMake>40000</WorkToMake>
       <Mass>0</Mass>
       <AccuracyTouch>0.5</AccuracyTouch>
@@ -574,6 +582,7 @@
         <verbClass>Verb_Shoot</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
         <defaultProjectile>Bullet_WULA_RW_Photon_Missile</defaultProjectile>
+        <forcedMissRadius>0.1</forcedMissRadius>
         <warmupTime>4.5</warmupTime>
         <burstShotCount>48</burstShotCount>
         <ticksBetweenBurstShots>1</ticksBetweenBurstShots>

1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml

@@ -1131,7 +1131,6 @@
         <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
         <ai_TargetHasRangedAttackScoreOffset>50</ai_TargetHasRangedAttackScoreOffset>
         <minRange>6</minRange>
-        <forcedMissRadius>4.9</forcedMissRadius>
         <targetParams>
           <canTargetLocations>true</canTargetLocations>
           <canTargetPawns>false</canTargetPawns>

1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml

@@ -690,6 +690,7 @@
       <WastepacksPerRecharge MayRequire="Ludeon.RimWorld.Biotech">5</WastepacksPerRecharge>
     </statBases>
     <race>
+      <fleshType>Mechanoid</fleshType>
       <body>WULA_AI_Heavy_Panzer_Body</body>
       <baseBodySize>10.0</baseBodySize>
 			<baseHealthScale>5</baseHealthScale>
@@ -763,6 +764,7 @@
       <WastepacksPerRecharge MayRequire="Ludeon.RimWorld.Biotech">5</WastepacksPerRecharge>
     </statBases>
     <race>
+      <fleshType>Mechanoid</fleshType>
       <body>Wula_AI_Engineer_Mother_Body</body>
       <baseBodySize>10.0</baseBodySize>
 			<baseHealthScale>4</baseHealthScale>

1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Spiritualist.xml

@@ -26,6 +26,7 @@
       <FlightCooldown>0</FlightCooldown> -->
     </statBases>
     <race>
+      <fleshType>Mechanoid</fleshType>
       <body>WULA_AI_Heavy_Panzer_Body</body>
       <baseBodySize>15.0</baseBodySize>
 			<baseHealthScale>3.5</baseHealthScale>