2025-8-4

1.6/Defs/DamageDefs/Damages_Wula.xml

@@ -97,6 +97,7 @@
     <armorCategory>Heat</armorCategory>
     <buildingDamageFactorImpassable>10</buildingDamageFactorImpassable>
     <buildingDamageFactorPassable>10</buildingDamageFactorPassable>
+    <soundExplosion>Pawn_Revenant_StartledScream</soundExplosion>
     <additionalHediffs>
       <li>
         <hediff>Wula_Psi_Damage_Hediff</hediff>
@@ -111,7 +112,8 @@
   <DamageDef>
     <defName>WULA_SP_Live_Shelter_Heal</defName>
     <label>灵能疗愈</label>
-    <workerClass>DamageWorker_Nerve</workerClass>
+    <workerClass>DamageWorker_Stab</workerClass>
+    <stabChanceOfForcedInternal>0</stabChanceOfForcedInternal>
     <externalViolence>false</externalViolence>
     <deathMessage>{0} 被本该治愈伤口的武器杀死了。</deathMessage>
     <harmsHealth>false</harmsHealth>

1.6/Defs/HediffDefs/Hediffs_WULA_Damage_Effect.xml

@@ -159,7 +159,9 @@
     </stages>
     <comps>
       <li Class="HediffCompProperties_SeverityPerDay">
-        <severityPerDay>-10</severityPerDay>
+        <severityPerDay>-50</severityPerDay>
+        <showDaysToRecover>true</showDaysToRecover>
+        <showHoursToRecover>true</showHoursToRecover>
       </li>
       <li Class="HediffCompProperties_DisappearsOnDeath"/>
     </comps>

1.6/Defs/PawnKinds/PawnKinds_Wula_FE_Spiritualist.xml

@@ -38,7 +38,78 @@
 
     <abilities>
       <li>FleshmelterBolt</li>
-      <li>AgonyPulse</li>
+      <li>Wula_Psi_Explosive_Shock</li>
     </abilities>
   </PawnKindDef>
+  <AbilityDef>
+    <defName>Wula_Psi_Explosive_Shock</defName>
+    <label>乌拉帝国术式：灵能尖啸</label>
+    <description>以灵能能量发出非人尖啸，使得周围的人员感觉到撕心裂肺的痛苦。这不会造成永久的伤害，但是很可能放倒那些无法承受此番痛苦的生灵。</description>
+    <iconPath>Wula/UI/Abilities/WULA_MW_Scepter_Of_Flash_Ability</iconPath>
+    <writeCombatLog>True</writeCombatLog>
+    <showPsycastEffects>True</showPsycastEffects>
+    <cooldownTicksRange>36000</cooldownTicksRange> <!-- 15 seconds -->
+    <statBases>
+      <Ability_EffectRadius>5</Ability_EffectRadius>
+    </statBases>
+    <warmupEffecter>HoraxianSpellLight_Warmup</warmupEffecter>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <defaultProjectile>Bullet_FleshmelterBolt</defaultProjectile>
+      <range>5</range>
+      <warmupTime>0.5</warmupTime>
+      <soundCast>Pawn_Revenant_Death</soundCast>
+      <ai_IsWeapon>true</ai_IsWeapon>
+      <ai_ProjectileLaunchingIgnoresMeleeThreats>true</ai_ProjectileLaunchingIgnoresMeleeThreats>
+      <targetable>false</targetable>
+      <targetParams>
+        <canTargetSelf>true</canTargetSelf>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="CompProperties_AbilityGiveHediffPsychic">
+        <compClass>CompAbilityEffect_GiveHediffPsychic</compClass>
+        <durationSecondsOverride>2000~4000</durationSecondsOverride> <!-- 2 to 4 days -->
+        <replaceExisting>true</replaceExisting>
+        <hediffDef>Wula_Psi_Explosive_Shock_Hediff</hediffDef>
+        <onlyBrain>true</onlyBrain>
+        <ignoreSelf>true</ignoreSelf>
+        <severity>0</severity>
+      </li>
+      <li Class="CompProperties_AbilityFleckOnTarget">
+        <fleckDef>PsycastPsychicEffect</fleckDef>
+      </li>
+      <li Class="CompProperties_AbilityEffecterOnTarget">
+        <effecterDef>AgonyPulseExplosion</effecterDef>
+      </li>
+    </comps>
+  </AbilityDef>
+  <HediffDef>
+    <hediffClass>HediffWithComps</hediffClass>
+    <defName>Wula_Psi_Explosive_Shock_Hediff</defName>
+    <label>灵能尖啸</label>
+    <description>震耳欲聋、撕心裂肺的灵能尖啸所带来的极度痛苦，不会造成永久的伤害，但是需要时间缓解</description>
+    <initialSeverity>0.001</initialSeverity>
+    <maxSeverity>1</maxSeverity>
+    <comps>
+      <li Class="HediffCompProperties_Disappears">
+        <showRemainingTime>true</showRemainingTime>
+      </li>
+      <li Class="HediffCompProperties_SeverityPerSecond">
+        <severityPerSecondRange>0.01</severityPerSecondRange> <!-- 10 to 15 seconds -->
+      </li>
+    </comps>
+    <stages>
+      <li>
+        <minSeverity>0</minSeverity>
+        <painOffset>1</painOffset>
+        <label>撕裂</label>
+      </li>
+      <li>
+        <minSeverity>0.5</minSeverity>
+        <painOffset>0.25</painOffset>
+        <label>恢复</label>
+      </li>
+    </stages>
+  </HediffDef>
 </Defs>

1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml

@@ -374,14 +374,14 @@
     <techLevel>Archotech</techLevel>
     <!-- <techLevel>Spacer</techLevel> -->
     <graphicData>
-      <texPath>Wula/Weapon/WULA_MW_Scepter_Of_Explosive</texPath>
+      <texPath>Wula/Weapon/WULA_MW_Scepter_Of_Feather</texPath>
       <graphicClass>Graphic_Single</graphicClass>
       <drawSize>1.3</drawSize>
     </graphicData>
     <descriptionHyperlinks>
       <ThingDef>WULA_Soul_Wedge</ThingDef>
     </descriptionHyperlinks>
-    <uiIconPath>Wula/Weapon/WULA_SP_Spear_Impale</uiIconPath>
+    <uiIconPath>Wula/Weapon/WULA_SP_Live_Shelter</uiIconPath>
     <weaponTags>
       <li>Wula_Spell_Weapon_T1</li>
     </weaponTags>
@@ -422,7 +422,7 @@
         <conductFriendly>True</conductFriendly>
         <conductHostile>false</conductHostile>
         <conductNum>3</conductNum>
-        <beamMoteDef>WULA_SP_Spear_Impale_ArcBeam</beamMoteDef>
+        <beamMoteDef>WULA_SP_Live_Shelter_ArcBeam</beamMoteDef>
         <aimingChargeMote>Mote_HellsphereCannon_Charge</aimingChargeMote>
       </li>
     </verbs>
@@ -583,6 +583,14 @@
         <range>48</range>
         <soundCast>AgonyPulse_Cast</soundCast>
         <muzzleFlashScale>12</muzzleFlashScale>
+      
+        <aimingLineMote>Mote_FleshmelterBolt_Aim</aimingLineMote>
+        <aimingChargeMote>Mote_FleshmelterBolt_Charge</aimingChargeMote> 
+        <aimingChargeMoteOffset>1.07</aimingChargeMoteOffset>
+        <aimingLineMoteFixedLength>15.9</aimingLineMoteFixedLength>
+        <aimingTargetMote>Mote_FleshmelterBolt_Target</aimingTargetMote> 
+        <!-- <soundAiming>FleshmelterBolt_Charging</soundAiming> -->
+
         <targetParams>
           <canTargetLocations>true</canTargetLocations>
         </targetParams>
@@ -616,7 +624,7 @@
 				<customDamageDef>Bomb</customDamageDef>
 				<customDamageAmount>8</customDamageAmount>
 				<customExplosionRadius>1</customExplosionRadius>
-				<customSoundExplode>MortarBomb_Explode</customSoundExplode>
+				<customSoundExplode>Pawn_Revenant_StartledScream</customSoundExplode>
 
 				<useSubExplosions>true</useSubExplosions>
 				<subExplosionCount>0</subExplosionCount>
@@ -627,7 +635,7 @@
 				<subSoundExplode>MortarBomb_Explode</subSoundExplode>
 			</li>
 		</modExtensions>
-    <projectile>
+    <projectile>FleshmelterBolt_Launch
       <damageDef>Wula_Psi_Bomb</damageDef>
       <damageAmountBase>1</damageAmountBase>
       <speed>22</speed>
@@ -635,7 +643,7 @@
       <armorPenetrationBase>1.5</armorPenetrationBase>
       <flyOverhead>true</flyOverhead>
       <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-      <soundExplode>MortarBomb_Explode</soundExplode>
+      <soundExplode>Pawn_Revenant_StartledScream</soundExplode>
       <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
       <soundAmbient>MortarRound_Ambient</soundAmbient>
     </projectile>

1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml

@@ -853,120 +853,6 @@
       </li>
     </comps>
   </AbilityDef>
-  <ThingDef ParentName="BaseMeleeWeapon_Blunt">
-    <defName>WULA_MW_Scepter_Of_Feather</defName>
-    <label>APs-72"羽之杖"</label>
-    <description>乌拉帝国修女所持武器，可以使用魂锲作为充能媒介施展灵能法术，为大范围内的所有殖民者和机械体提供持续数天的额外移动速度和工作速度。</description>
-    <graphicData>
-      <texPath>Wula/Weapon/WULA_MW_Scepter_Of_Feather</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>1.3</drawSize>
-    </graphicData>
-    <uiIconScale>1.1</uiIconScale>
-    <relicChance>0</relicChance>
-    <descriptionHyperlinks>
-      <ThingDef>WULA_Soul_Wedge</ThingDef>
-    </descriptionHyperlinks>
-    <techLevel>Ultra</techLevel>
-    <statBases>
-      <WorkToMake>10000</WorkToMake>
-      <Mass>2</Mass>
-    </statBases>
-    <costList>
-      <WULA_Soul_Wedge>20</WULA_Soul_Wedge>
-      <Steel>50</Steel>
-    </costList>
-    <equippedAngleOffset>-65</equippedAngleOffset>
-    <recipeMaker>
-      <recipeUsers Inherit="False">
-        <li>WULA_Cube_Productor_Energy</li>
-      </recipeUsers>
-      <researchPrerequisite>WULA_Synth_Psi_2_Technology</researchPrerequisite>
-      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-    </recipeMaker>
-    <tools>
-      <li>
-        <label>棍柄</label>
-        <capacities>
-          <li>Poke</li>
-        </capacities>
-        <power>9</power>
-        <cooldownTime>1</cooldownTime>
-        <chanceFactor>0.5</chanceFactor>
-      </li>
-    </tools>
-
-    <comps Inherit="False">
-      <li Class="CompProperties_Forbiddable"/>
-      <li Class="CompProperties_EquippableAbilityReloadable">
-        <abilityDef>WULA_MW_Scepter_Of_Feather_Ability</abilityDef>
-        <maxCharges>1</maxCharges>
-        <soundReload>AnomalyAbilityWarmup</soundReload>
-        <chargeNoun>魂锲</chargeNoun>
-        <ammoDef>WULA_Soul_Wedge</ammoDef>
-        <ammoCountPerCharge>20</ammoCountPerCharge>
-        <baseReloadTicks>60</baseReloadTicks>
-      </li>
-    </comps>
-  </ThingDef>
-  <AbilityDef ParentName="PsycastBase">
-    <defName>WULA_MW_Scepter_Of_Feather_Ability</defName>
-    <label>羽之杖：激励</label>
-    <description>以自身为中心，为大范围内的所有殖民者和机械体提供持续数天的额外移动速度和工作速度。</description>
-    <iconPath>Wula/UI/Abilities/WULA_MW_Scepter_Of_Feather_Ability</iconPath>
-    <writeCombatLog>True</writeCombatLog>
-    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
-    <level>-1</level>
-    <statBases>
-      <Ability_EntropyGain>0</Ability_EntropyGain>
-      <Ability_PsyfocusCost>-1</Ability_PsyfocusCost>
-      <Ability_Duration>4000</Ability_Duration>
-      <Ability_EffectRadius>500</Ability_EffectRadius>
-    </statBases>
-    <verbProperties>
-      <warmupTime>5</warmupTime>
-      <range>60</range>
-      <drawAimPie>true</drawAimPie>
-      <requireLineOfSight>false</requireLineOfSight>
-      <nonInterruptingSelfCast>true</nonInterruptingSelfCast>
-      <soundCast>VoidTerrorCast</soundCast>
-      <targetable>false</targetable>
-      <targetParams>
-        <canTargetSelf>true</canTargetSelf>
-      </targetParams>
-    </verbProperties>
-    <comps>
-      <li Class = "CompProperties_AbilityGiveHediff">
-        <compClass>CompAbilityEffect_GiveHediff</compClass>
-        <hediffDef>WULA_MW_Scepter_Of_Feather_Hediff</hediffDef>
-        <durationMultiplier>PsychicSensitivity</durationMultiplier>
-        <psychic>True</psychic>
-      </li>
-      <li Class="CompProperties_AbilityFleckOnTarget">
-        <fleckDef>PsycastPsychicEffect</fleckDef>
-      </li>
-    </comps>
-  </AbilityDef>
-  <HediffDef>
-    <defName>WULA_MW_Scepter_Of_Feather_Hediff</defName>
-    <label>羽之杖：激励</label>
-    <description>这个殖民者受到了乌拉帝国灵能法术的激励，行动和生产变得更加有效率了。</description>
-    <hediffClass>HediffWithComps</hediffClass>
-    <stages>
-      <li>
-        <statFactors>
-          <MoveSpeed>1.5</MoveSpeed>
-          <WorkSpeedGlobal>1.3</WorkSpeedGlobal>
-        </statFactors>
-      </li>
-    </stages>
-    <comps>
-      <li Class="HediffCompProperties_Disappears">
-        <disappearsAfterTicks>240000~240000</disappearsAfterTicks> <!-- 1~2 days -->
-        <showRemainingTime>true</showRemainingTime>
-      </li>
-    </comps>
-  </HediffDef>
 
   <!-- 乌拉帝国镇爆枪 -->
   <ThingDef ParentName="BaseHumanMakeableGun">