2025-8-5

2025-08-05 23:08:01 +08:00
parent 6ecc1aaeb1
commit 63f7a5d526
14 changed files with 96 additions and 83 deletions
--- a/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
+++ b/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>
--- a/1.6/Defs/PawnKinds/PawnKinds_Wula_FE_Spiritualist.xml
+++ b/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>
-    <!-- <ai_SearchAOEForTargets>true</ai_SearchAOEForTargets> -->
+    <aiCanUse>true</aiCanUse>
+    <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>true</aiCanUse>
-    <ai_SearchAOEForTargets>true</ai_SearchAOEForTargets>
+    <aiCanUse>false</aiCanUse>
+    <!-- <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>
-      <minRange>4</minRange>
+      <range>15</range>
      <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>