Merge branch 'main' of https://git.ra3battle.cn/Kalospacer/WulaFallenEmpireRW

1.6/Defs/DamageDefs/Damages_Wula.xml

@@ -64,14 +64,14 @@
     <makesAnimalsFlee>false</makesAnimalsFlee>
     <defaultDamage>20</defaultDamage>
     <defaultArmorPenetration>3000</defaultArmorPenetration>
-    <buildingDamageFactorImpassable>0.01</buildingDamageFactorImpassable>
+    <buildingDamageFactorImpassable>1</buildingDamageFactorImpassable>
-    <buildingDamageFactorPassable>0.01</buildingDamageFactorPassable>
+    <buildingDamageFactorPassable>1</buildingDamageFactorPassable>
     <!-- <soundExplosion>Explosion_Vaporize</soundExplosion> -->
     <additionalHediffs>
       <li>
-        <hediff>ToxicBuildup</hediff>
+        <hediff>Wula_Psi_Damage_Hediff</hediff>
         <severityPerDamageDealt>0.015</severityPerDamageDealt>
-        <victimSeverityScaling>ToxicResistance</victimSeverityScaling>
+        <!-- <victimSeverityScaling>PsychicSensitivity</victimSeverityScaling> -->
         <inverseStatScaling>true</inverseStatScaling>
         <victimSeverityScalingByInvBodySize>true</victimSeverityScalingByInvBodySize>
       </li>

1.6/Defs/HediffDefs/Hediffs_WULA_Damage_Effect.xml

@@ -2,9 +2,9 @@
 
 <Defs>
   <HediffDef>
-    <defName>ToxicBuildup</defName>
+    <defName>Wula_Psi_Damage_Hediff</defName>
-    <label>toxic buildup</label>
+    <label>灵能混乱</label>
-    <description></description>
+    <description>由乌拉帝国灵能术式打击造成的短暂混乱，可能会导致四肢失调等状态，进而失去战斗力。</description>
     <hediffClass>HediffWithComps</hediffClass>
     <defaultLabelColor>(0.7, 1.0, 0.7)</defaultLabelColor>
     <lethalSeverity>1</lethalSeverity>
@@ -13,12 +13,12 @@
     <scenarioCanAdd>true</scenarioCanAdd>
     <taleOnVisible>ToxicityRevealed</taleOnVisible>
     <comps>
-      <li Class="HediffCompProperties_Immunizable">
+      <li Class="HediffCompProperties_Disappears">
-        <compClass>HediffComp_ImmunizableToxic</compClass>
+        <disappearsAfterTicks>12000</disappearsAfterTicks> <!-- 1 days -->
-        <severityPerDayNotImmune>-0.08</severityPerDayNotImmune>
+        <showRemainingTime>true</showRemainingTime>
       </li>
       <li Class="HediffCompProperties_SurgeryInspectable">
-        <surgicalDetectionDesc>{PAWN_nameDef} is showing early signs of toxic buildup. Keep {PAWN_objective} away from sources of toxins.</surgicalDetectionDesc>
+        <surgicalDetectionDesc>{PAWN_nameDef} 正在因为乌拉帝国的灵能术式打击而陷入混乱状态——它不会造成永久伤害，但是需要时间缓解。</surgicalDetectionDesc>
       </li>
     </comps>
     <stages>
@@ -56,20 +56,6 @@
             <offset>-0.15</offset>
           </li>
         </capMods>
-        <hediffGivers>
-          <li Class="HediffGiver_Random">
-            <hediff>Dementia</hediff>
-            <mtbDays>146</mtbDays>
-            <partsToAffect>
-              <li>Brain</li>
-            </partsToAffect>
-          </li>
-          <li Class="HediffGiver_Random">
-            <hediff>Carcinoma</hediff>
-            <mtbDays>438</mtbDays>
-            <canAffectAnyLivePart>true</canAffectAnyLivePart>
-          </li>
-        </hediffGivers>
       </li>
       <li>
         <label>serious</label>
@@ -81,20 +67,6 @@
             <offset>-0.25</offset>
           </li>
         </capMods>
-        <hediffGivers>
-          <li Class="HediffGiver_Random">
-            <hediff>Dementia</hediff>
-            <mtbDays>37</mtbDays>
-            <partsToAffect>
-              <li>Brain</li>
-            </partsToAffect>
-          </li>
-          <li Class="HediffGiver_Random">
-            <hediff>Carcinoma</hediff>
-            <mtbDays>111</mtbDays>
-            <canAffectAnyLivePart>true</canAffectAnyLivePart>
-          </li>
-        </hediffGivers>
       </li>
       <li>
         <label>extreme</label>
@@ -110,20 +82,6 @@
             <offset>-0.25</offset>
           </li>
         </capMods>
-        <hediffGivers>
-          <li Class="HediffGiver_Random">
-            <hediff>Dementia</hediff>
-            <mtbDays>13</mtbDays>
-            <partsToAffect>
-              <li>Brain</li>
-            </partsToAffect>
-          </li>
-          <li Class="HediffGiver_Random">
-            <hediff>Carcinoma</hediff>
-            <mtbDays>39</mtbDays>
-            <canAffectAnyLivePart>true</canAffectAnyLivePart>
-          </li>
-        </hediffGivers>
       </li>
     </stages>
   </HediffDef>

1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml

@@ -2,8 +2,8 @@
 <Defs>
   <ThingDef ParentName="BaseHumanMakeableGun">
     <defName>WULA_SP_Spear_Impale</defName>
-    <label>圣痕：圣枪穿刺术式</label>
+    <label>圣印记：圣枪穿刺术式</label>
-    <description>这是乌拉星人所创造的最强大的进攻术式，在帝国内战后乌拉星人改进了这个术式，以使其不需要整个唱诗班即可发动。这种术式发射的纯净灵能能量能绕过几乎所有防御，在敌人的集群中连续弹跳，瞬间烧穿无信之徒的可悲躯体。</description>
+    <description>这是乌拉星人所创造的最强大的进攻术式，在帝国内战后乌拉星人改进了这个术式，以使其不需要整个唱诗班即可发动。这种术式发射的纯净灵能能量能绕过几乎所有防御，在敌人的集群中连续弹跳，瞬间烧穿无信之徒的可悲躯体。然而，这种术式的能量和战舰唱诗班的相去甚远，因此它发射的能量无法攻击建筑。</description>
     <techLevel>Ultra</techLevel>
     <!-- <techLevel>Spacer</techLevel> -->
     <graphicData>
@@ -11,6 +11,7 @@
       <graphicClass>Graphic_Single</graphicClass>
       <drawSize>1.2</drawSize>
     </graphicData>
+    <uiIconPath>Wula/Weapon/WULA_SP_Spear_Impale</uiIconPath>
     <weaponTags>
       <li>Wula_Spell_Weapon_T1</li>
     </weaponTags>
@@ -38,12 +39,12 @@
         <verbClass>WulaFallenEmpire.Verb_ShootArc</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
         <damageDef>Wula_Psi_Damage</damageDef>
-        <damageAmount>80</damageAmount>
+        <damageAmount>30</damageAmount>
         <EMPDamageAmount>0</EMPDamageAmount>
         <warmupTime>4</warmupTime>
         <range>48</range>
         <affectedAngle>25</affectedAngle>
-        <armorPenetration>1.0</armorPenetration>
+        <armorPenetration>1000</armorPenetration>
         <soundCast>AgonyPulse_Cast</soundCast>
         <soundCastTail>GunTail_Medium</soundCastTail>
         <muzzleFlashScale>9</muzzleFlashScale>