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

1.6/Defs/DamageDefs/Damages_Wula.xml

@@ -63,7 +63,7 @@
     <isRanged>true</isRanged>
     <makesAnimalsFlee>false</makesAnimalsFlee>
     <defaultDamage>20</defaultDamage>
-    <defaultArmorPenetration>3000</defaultArmorPenetration>
+    <defaultArmorPenetration>1.5</defaultArmorPenetration>
     <buildingDamageFactorImpassable>1</buildingDamageFactorImpassable>
     <buildingDamageFactorPassable>1</buildingDamageFactorPassable>
     <!-- <soundExplosion>Explosion_Vaporize</soundExplosion> -->
@@ -92,11 +92,12 @@
     <deathMessage>{0} 被灵能灼烧而死。</deathMessage>
     <defaultDamage>50</defaultDamage>
     <defaultStoppingPower>2.0</defaultStoppingPower>
-    <defaultArmorPenetration>3000</defaultArmorPenetration>
+    <defaultArmorPenetration>1.5</defaultArmorPenetration>
     <hediff>Burn</hediff>
     <armorCategory>Heat</armorCategory>
     <buildingDamageFactorImpassable>10</buildingDamageFactorImpassable>
     <buildingDamageFactorPassable>10</buildingDamageFactorPassable>
+    <soundExplosion>Pawn_Revenant_StartledScream</soundExplosion>
     <additionalHediffs>
       <li>
         <hediff>Wula_Psi_Damage_Hediff</hediff>
@@ -110,17 +111,18 @@
 
   <DamageDef>
     <defName>WULA_SP_Live_Shelter_Heal</defName>
-    <label>疗愈</label>
+    <label>灵能疗愈</label>
-    <workerClass>DamageWorker_AddInjury</workerClass>
+    <workerClass>DamageWorker_Stab</workerClass>
-    <externalViolence>true</externalViolence>
+    <stabChanceOfForcedInternal>0</stabChanceOfForcedInternal>
-    <deathMessage>{0} 被奶死了。</deathMessage>
+    <externalViolence>false</externalViolence>
-    <harmsHealth>true</harmsHealth>
+    <deathMessage>{0} 被本该治愈伤口的武器杀死了。</deathMessage>
+    <harmsHealth>false</harmsHealth>
     <hediff>Burn</hediff>
     <makesBlood>false</makesBlood>
     <consideredHelpful>true</consideredHelpful>
     <defaultDamage>1</defaultDamage>
     <defaultStoppingPower>0</defaultStoppingPower>
-    <defaultArmorPenetration>9999</defaultArmorPenetration>
+    <defaultArmorPenetration>5</defaultArmorPenetration>
     <buildingDamageFactorImpassable>0</buildingDamageFactorImpassable>
     <buildingDamageFactorPassable>0</buildingDamageFactorPassable>
     <additionalHediffs>

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/PsychicRitualDefs/WULA_FE_Spiritualist_Rituals.xml

@@ -154,6 +154,81 @@
       </li>
     </qualityThresholds>
   </WulaFallenEmpire.PsychicRitual_TechOffering>
+  <WulaFallenEmpire.PsychicRitual_TechOffering>
+    <defName>WULA_FE_Rituals_Create_Live_Shelter</defName>
+    <label>镌刻：生灵庇佑术式</label>
+    <description>使用镌刻法术创造一把携带了生灵庇佑术式的法杖，需求魂楔作为额外祭品以提升仪式质量，仪式的质量将影响镌刻完成时法杖的质量。</description>
+    <hoursUntilOutcome>2</hoursUntilOutcome>
+    <cooldownHours>120</cooldownHours>
+    <!-- <researchPrerequisite>BasicPsychicRituals</researchPrerequisite> -->
+    <iconPath>Wula/Weapon/WULA_SP_Live_Shelter</iconPath>
+    <descriptionHyperlinks>
+      <ThingDef>WULA_SP_Live_Shelter</ThingDef>
+      <ThingDef>WULA_Soul_Wedge</ThingDef>
+    </descriptionHyperlinks>
+
+    <invokerRole>Invoker</invokerRole>
+    <chanterRole>Chanter</chanterRole>
+
+    <!-- ==================== 核心祭品定义 ==================== -->
+    <!-- requiredOffering: 定义了启动仪式所必须的基础祭品。 -->
+    <!-- 如果没有这个祭品，仪式本身无法开始。 -->
+    <requiredOffering>
+      <filter>
+        <thingDefs>
+          <li>WULA_Dark_Matter_Item</li>
+        </thingDefs>
+      </filter>
+      <count>3</count>
+      <!-- <count>3000</count> -->
+    </requiredOffering>
+    
+    <!-- ==================== 额外祭品定义 ==================== -->
+    <!-- extraOfferings: 定义了可以增加仪式“能量”的额外祭品。 -->
+    <!-- 能量值会影响最终奖励的品质。每种物品的power值代表单个物品能增加多少能量。 -->
+    <extraOfferings>
+      <li>
+        <thingDef>WULA_Soul_Wedge</thingDef>
+        <!-- 2000魂楔满质量 -->
+        <power>0.0005</power>
+      </li>
+    </extraOfferings>
+
+    <!-- ==================== 奖励池定义 ==================== -->
+    <!-- rewardWeaponPool: 定义了仪式成功后可能获得的奖励物品列表。 -->
+    <!-- 系统会从这个列表中随机选择一个作为奖励。 -->
+    <rewardWeaponPool>
+      <li>WULA_SP_Live_Shelter</li>
+    </rewardWeaponPool>
+
+    <!-- ==================== 品质阈值定义 ==================== -->
+    <!-- qualityThresholds: 定义了不同的能量值（power）所对应的奖励品质。 -->
+    <!-- 系统会从高到低检查，使用第一个满足条件的阈值。 -->
+    <qualityThresholds>
+      <li>
+        <!-- <threshold>1.0</threshold>: 能量值达到或超过1.0。 -->
+        <threshold>1.0</threshold>
+        <!-- <quality>Legendary</quality>: 奖励品质为“传奇”。 -->
+        <quality>Legendary</quality>
+      </li>
+      <li>
+        <threshold>0.95</threshold>
+        <quality>Masterwork</quality>
+      </li>
+      <li>
+        <threshold>0.6</threshold>
+        <quality>Excellent</quality>
+      </li>
+      <li>
+        <threshold>0.4</threshold>
+        <quality>Normal</quality>
+      </li>
+      <li>
+        <threshold>0.0</threshold>
+        <quality>Poor</quality>
+      </li>
+    </qualityThresholds>
+  </WulaFallenEmpire.PsychicRitual_TechOffering>
 
   <WulaFallenEmpire.PsychicRitualDef_AddHediff>
     <defName>WULA_ImbuePsychicShock</defName>

1.6/Defs/ThingDefs_Misc/WULA_FE_Spiritualist_Apparel.xml

@@ -43,6 +43,7 @@
 			<MeleeDodgeChance>50</MeleeDodgeChance>	
       <MentalBreakThreshold>-0.25</MentalBreakThreshold>
     </equippedStatOffsets>
+    <tradeability>None</tradeability>
     <costStuffCount>200</costStuffCount>
     <stuffCategories>
       <li>Fabric</li>
@@ -75,7 +76,7 @@
 
         <!-- EMP 效果 -->
         <isImmuneToEMP>true</isImmuneToEMP> <!-- 是否免疫EMP伤害 -->
-        <disarmedByEmpForTicks>600</disarmedByEmpForTicks> <!-- 被EMP击中后，额外的眩晕/瘫痪时间 (ticks) -->
+        <disarmedByEmpForTicks>0</disarmedByEmpForTicks> <!-- 被EMP击中后，额外的眩晕/瘫痪时间 (ticks) -->
 
         <!-- 被动恢复 -->
         <rechargeHitPointsIntervalTicks>5</rechargeHitPointsIntervalTicks> <!-- 未破盾时，每隔多少ticks恢复1点生命值 -->
@@ -104,6 +105,7 @@
     <equippedStatOffsets>
       <PsychicSensitivity>0.75</PsychicSensitivity>
     </equippedStatOffsets>
+    <tradeability>None</tradeability>
     <costStuffCount>150</costStuffCount>
     <costList Inherit="False">
       <WULA_Soul_Wedge>3000</WULA_Soul_Wedge>
@@ -151,7 +153,7 @@
 
         <!-- EMP 效果 -->
         <isImmuneToEMP>true</isImmuneToEMP> <!-- 是否免疫EMP伤害 -->
-        <disarmedByEmpForTicks>600</disarmedByEmpForTicks> <!-- 被EMP击中后，额外的眩晕/瘫痪时间 (ticks) -->
+        <disarmedByEmpForTicks>0</disarmedByEmpForTicks> <!-- 被EMP击中后，额外的眩晕/瘫痪时间 (ticks) -->
 
         <!-- 被动恢复 -->
         <rechargeHitPointsIntervalTicks>5</rechargeHitPointsIntervalTicks> <!-- 未破盾时，每隔多少ticks恢复1点生命值 -->
@@ -188,6 +190,7 @@
     <equippedStatOffsets>
       <PsychicSensitivity>0.5</PsychicSensitivity>
     </equippedStatOffsets>
+    <tradeability>None</tradeability>
     <costStuffCount>200</costStuffCount>
     <costList Inherit="False">
       <ComponentSpacer>8</ComponentSpacer>
@@ -219,7 +222,7 @@
 
         <!-- EMP 效果 -->
         <isImmuneToEMP>true</isImmuneToEMP> <!-- 是否免疫EMP伤害 -->
-        <disarmedByEmpForTicks>600</disarmedByEmpForTicks> <!-- 被EMP击中后，额外的眩晕/瘫痪时间 (ticks) -->
+        <disarmedByEmpForTicks>0</disarmedByEmpForTicks> <!-- 被EMP击中后，额外的眩晕/瘫痪时间 (ticks) -->
 
         <!-- 被动恢复 -->
         <rechargeHitPointsIntervalTicks>5</rechargeHitPointsIntervalTicks> <!-- 未破盾时，每隔多少ticks恢复1点生命值 -->
@@ -259,6 +262,7 @@
       </tags>
       <wornGraphicPath>Wula/Apparel/WULA_Skitarii_veil</wornGraphicPath>
     </apparel>
+    <tradeability>None</tradeability>
     <costStuffCount>30</costStuffCount>
     <costList Inherit="False">
       <ComponentIndustrial>1</ComponentIndustrial>
@@ -284,7 +288,7 @@
 
         <!-- EMP 效果 -->
         <isImmuneToEMP>true</isImmuneToEMP> <!-- 是否免疫EMP伤害 -->
-        <disarmedByEmpForTicks>600</disarmedByEmpForTicks> <!-- 被EMP击中后，额外的眩晕/瘫痪时间 (ticks) -->
+        <disarmedByEmpForTicks>0</disarmedByEmpForTicks> <!-- 被EMP击中后，额外的眩晕/瘫痪时间 (ticks) -->
 
         <!-- 被动恢复 -->
         <rechargeHitPointsIntervalTicks>5</rechargeHitPointsIntervalTicks> <!-- 未破盾时，每隔多少ticks恢复1点生命值 -->

1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <ThingDef ParentName="BaseHumanMakeableGun">
+  <ThingDef Name="WULA_SP_Spear_Impale" ParentName="BaseHumanMakeableGun">
     <defName>WULA_SP_Spear_Impale</defName>
     <label>圣枪穿刺术式</label>
     <description>这是乌拉星人所创造的最强大的进攻术式，来源于乌拉星人的泰坦和旗舰。这种术式发射的纯净灵能能量能绕过几乎所有防御，在敌人的集群中连续弹跳，瞬间烧穿无信之徒的可悲躯体。\n\n然而，这种术式的能量和战舰唱诗班的相去甚远，因此它发射的能量无法攻击建筑。\n\n为了弥补缺陷，法杖还附带了一个需要魂楔充能的进攻型法术，可以从很远的地方发射灵能射弹轰炸目标区域。</description>
-    <techLevel>Ultra</techLevel>
+    <techLevel>Archotech</techLevel>
     <!-- <techLevel>Spacer</techLevel> -->
     <graphicData>
       <texPath>Wula/Weapon/WULA_MW_Scepter_Of_Explosive</texPath>
@@ -16,7 +16,7 @@
     </descriptionHyperlinks>
     <uiIconPath>Wula/Weapon/WULA_SP_Spear_Impale</uiIconPath>
     <weaponTags>
-      <li>Wula_Spell_Weapon_T1</li>
+      <li>Wula_Spell_Weapon_T3</li>
     </weaponTags>
     <useHitPoints>False</useHitPoints>
     <uiIconScale>1</uiIconScale>
@@ -183,12 +183,19 @@
       </shaderParameters>
     </graphicData>
   </ThingDef>
+  <ThingDef ParentName="WULA_SP_Spear_Impale">
+    <defName>WULA_SP_Spear_Impale_For_Enermy</defName>
+    <destroyOnDrop>true</destroyOnDrop>
+    <weaponTags>
+      <li>WULA_SP_Spear_Impale_For_Enermy</li>
+    </weaponTags>
+  </ThingDef>
 
-  <ThingDef ParentName="BaseHumanMakeableGun">
+  <ThingDef Name="WULA_SP_Cotton_Counter" ParentName="BaseHumanMakeableGun">
     <defName>WULA_SP_Cotton_Counter</defName>
     <label>飘絮反制术式</label>
     <description>这是乌拉星人在舰船上用于反制敌方飞行器和导弹的特殊术式，核心在于高爆发性高追踪性的输出，通过快速吟唱汇聚的灵能能量使对方迅速失能。\n\n法杖同时携带了一个需要魂楔充能的辅助型技能，允许将自身遮蔽起来以进入隐身状态。</description>
-    <techLevel>Ultra</techLevel>
+    <techLevel>Archotech</techLevel>
     <!-- <techLevel>Spacer</techLevel> -->
     <graphicData>
       <texPath>Wula/Weapon/WULA_MW_Scepter_Of_CLoak</texPath>
@@ -320,7 +327,7 @@
       <damageAmountBase>15</damageAmountBase>
       <beamMoteDef>WULA_SP_Cotton_Counter_ArcBeam</beamMoteDef>
       <beamStartOffset>0.5</beamStartOffset>
-      <armorPenetrationBase>3000</armorPenetrationBase>
+      <armorPenetrationBase>1.5</armorPenetrationBase>
     </projectile>
   </ThingDef>
   <ThingDef ParentName="MoteBase">
@@ -352,22 +359,29 @@
       </shaderParameters>
     </graphicData>
   </ThingDef>
+  <ThingDef ParentName="WULA_SP_Cotton_Counter">
+    <defName>WULA_SP_Cotton_Counter_For_Enermy</defName>
+    <destroyOnDrop>true</destroyOnDrop>
+    <weaponTags>
+      <li>WULA_SP_Cotton_Counter_For_Enermy</li>
+    </weaponTags>
+  </ThingDef>
 
   <ThingDef ParentName="BaseHumanMakeableGun">
     <defName>WULA_SP_Live_Shelter</defName>
     <label>生灵庇佑术式</label>
     <description>这是乌拉星人用于救治伤者的法术，可以使用灵能诱发伤口以非常规的方式快速愈合，并且效果会在友方个体间弹跳。\n\n法杖同时携带了一个需要魂楔充能的生产型技能，可以为大范围内的所有殖民者和机械体提供持续数天的额外移动速度和工作速度。</description>
-    <techLevel>Ultra</techLevel>
+    <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>
@@ -400,7 +414,7 @@
         <warmupTime>4</warmupTime>
         <range>20</range>
         <affectedAngle>25</affectedAngle>
-        <armorPenetration>3000</armorPenetration>
+        <armorPenetration>1.5</armorPenetration>
         <soundCast>AgonyPulse_Cast</soundCast>
         <soundCastTail>GunTail_Medium</soundCastTail>
         <muzzleFlashScale>9</muzzleFlashScale>
@@ -408,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>
@@ -435,6 +449,35 @@
     </comps>
     <tradeability>None</tradeability>
   </ThingDef>
+  <ThingDef ParentName="MoteBase">
+    <defName>WULA_SP_Live_Shelter_ArcBeam</defName>
+    <thingClass>MoteDualAttached</thingClass>
+    <altitudeLayer>MoteOverhead</altitudeLayer>
+    <mote>
+      <fadeInTime>0</fadeInTime>
+      <fadeOutTime>1</fadeOutTime>
+      <solidTime>0.4</solidTime>
+      <needsMaintenance>False</needsMaintenance>
+      <rotateTowardsTarget>True</rotateTowardsTarget>
+      <scaleToConnectTargets>True</scaleToConnectTargets>
+      <fadeOutUnmaintained>False</fadeOutUnmaintained>
+    </mote>
+    <drawOffscreen>true</drawOffscreen>
+    <graphicData>
+      <texPath>Wula/Mote/WULA_Bullet_Dark_Matter_Beam</texPath>
+      <color>(38, 204, 66, 255)</color>
+      <graphicClass>Graphic_MoteWithAgeSecs</graphicClass>
+      <shaderType>MoteBeam</shaderType>
+      <drawSize>(1.5,1)</drawSize>
+      <shaderParameters>
+        <_ExtraTexA>/Things/Mote/BeamSecondaryNoise_A</_ExtraTexA>
+        <_ExtraTexB>/Things/Mote/BeamSecondaryNoise_B</_ExtraTexB>
+        <_ScrollSpeedA>-4 </_ScrollSpeedA>
+        <_ScrollSpeedB>3</_ScrollSpeedB>
+        <_Intensity>2</_Intensity>
+      </shaderParameters>
+    </graphicData>
+  </ThingDef>
   <AbilityDef ParentName="PsycastBase">
     <defName>WULA_MW_Scepter_Of_Feather_Ability</defName>
     <label>羽之杖：激励</label>
@@ -497,11 +540,11 @@
   <ThingDef ParentName="BaseHumanMakeableGun">
     <defName>WULA_RW_Photon_Missile</defName>
     <label>星光追猎术式</label>
-    <description>乌拉星人在舰船上用于代替导弹的一种特殊术式，当其被吟唱时，大量的灵能星光将倾巢而出追击轰炸敌军。万幸，依托于灵能泰坦这个庞大载体，该法术的威力并未遭到太多削弱。</description>
+    <description>乌拉星人在舰船上用于代替导弹的一种特殊术式，现在则被镌刻在灵能泰坦上。当其被吟唱时，大量的灵能星光将倾巢而出追击轰炸敌军。\n\n当攻击某个单体的时候，灵能星光将会追踪敌军并准确击中目标；当攻击地面时，灵能星光会分散以形成一片轰炸区。依托于纯净灵能能能量，灵能星光可以穿越任何地形阻碍和护盾进行轰炸。</description>
-    <techLevel>Ultra</techLevel>
+    <techLevel>Archotech</techLevel>
     <tradeability>None</tradeability>
     <!-- <techLevel>Spacer</techLevel> -->
-    <uiIconPath>Wula/Weapon/WULA_SP_Spear_Impale</uiIconPath>
+    <uiIconPath>Wula/Weapon/WULA_RW_Photon_Missile</uiIconPath>
     <graphicData>
       <texPath>Wula/Weapon/WULA_Weapon_Empty</texPath>
       <graphicClass>Graphic_Single</graphicClass>
@@ -509,7 +552,6 @@
     <weaponTags>
       <li>WULA_RW_Photon_Missile_Weapon</li>
     </weaponTags>
-    <uiIconScale>0.75</uiIconScale>
     <recipeMaker>
       <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
     </recipeMaker>
@@ -533,19 +575,40 @@
         <hasStandardCommand>true</hasStandardCommand>
         <defaultProjectile>Bullet_WULA_RW_Photon_Missile</defaultProjectile>
         <warmupTime>4.5</warmupTime>
-        <burstShotCount>16</burstShotCount>
+        <burstShotCount>48</burstShotCount>
-        <ticksBetweenBurstShots>2</ticksBetweenBurstShots>
+        <ticksBetweenBurstShots>1</ticksBetweenBurstShots>
         <isMortar>true</isMortar>
         <requireLineOfSight>false</requireLineOfSight>
         <minRange>4</minRange>
         <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>
       </li>
     </verbs>
+    <comps>
+      <li Class="WulaFallenEmpire.CompProperties_CustomUniqueWeapon">
+				<forcedTraits>
+					<li>WULA_DamagePsychicScaling</li>
+					<li>WULA_PsychicIgnoreBlock</li>
+					<li>WULA_MissileLauncher</li>
+				</forcedTraits>
+				<numTraitsRange>
+					<min>3</min>
+					<max>3</max>
+				</numTraitsRange>
+			</li>
+    </comps>
   </ThingDef>
   <ThingDef ParentName="BaseBullet">
     <defName>Bullet_WULA_RW_Photon_Missile</defName>
@@ -558,31 +621,29 @@
     <thingClass>WulaFallenEmpire.Projectile_CruiseMissile</thingClass>
 		<modExtensions>
 			<li Class="WulaFallenEmpire.CruiseMissileProperties">
-				<!-- 主爆炸参数 -->
 				<customDamageDef>Bomb</customDamageDef>
 				<customDamageAmount>8</customDamageAmount>
-				<customExplosionRadius>2</customExplosionRadius>
+				<customExplosionRadius>1</customExplosionRadius>
-				<customSoundExplode>MortarBomb_Explode</customSoundExplode>
+				<customSoundExplode>Pawn_Revenant_StartledScream</customSoundExplode>
 
-				<!-- 子爆炸系统 -->
 				<useSubExplosions>true</useSubExplosions>
-				<subExplosionCount>2</subExplosionCount>
+				<subExplosionCount>0</subExplosionCount>
-				<subExplosionRadius>1.5</subExplosionRadius>
+				<subExplosionRadius>1</subExplosionRadius>
 				<subExplosionDamage>5</subExplosionDamage>
 				<subExplosionSpread>6</subExplosionSpread>
 				<subDamageDef>Wula_Psi_Bomb</subDamageDef>
 				<subSoundExplode>MortarBomb_Explode</subSoundExplode>
 			</li>
 		</modExtensions>
-    <projectile>
+    <projectile>FleshmelterBolt_Launch
       <damageDef>Wula_Psi_Bomb</damageDef>
-      <damageAmountBase>8</damageAmountBase>
+      <damageAmountBase>1</damageAmountBase>
       <speed>22</speed>
-      <explosionRadius>2</explosionRadius>
+      <explosionRadius>1.25</explosionRadius>
-      <armorPenetrationBase>0.1</armorPenetrationBase>
+      <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">

1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml

@@ -716,6 +716,8 @@
       </li>
     </tools>
     <comps>
+      <!--加上这个组件的机械体会直接跳过原版指挥范围判定-->
+      <li Class="WulaFallenEmpire.CompProperties_GlobalMechCommand" />
       <li Class="CompProperties_ProjectileInterceptor">
         <radius>3</radius>
         <interceptGroundProjectiles>true</interceptGroundProjectiles>
@@ -786,6 +788,10 @@
         <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
       </li>
     </tools>
+    <comps>
+      <!--加上这个组件的机械体会直接跳过原版指挥范围判定-->
+      <li Class="WulaFallenEmpire.CompProperties_GlobalMechCommand" />
+    </comps>
   </ThingDef>
   <AbilityDef>
     <defName>Wula_AI_Engineer_Mother_Ability</defName>
@@ -1280,6 +1286,8 @@
        <canFlyInVacuum>true</canFlyInVacuum>
     </race>
     <comps>
+      <!--加上这个组件的机械体会直接跳过原版指挥范围判定-->
+      <li Class="WulaFallenEmpire.CompProperties_GlobalMechCommand" />
       <li Class="CompProperties_HunterDrone">
         <explosionRadius>30</explosionRadius>
         <explosionDamageType>BombSuper</explosionDamageType>

1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Spiritualist.xml

@@ -3,13 +3,13 @@
   <ThingDef ParentName="HeavyMechanoid">
 		<defName>Wula_Psi_Titan</defName>
 		<label>PAt-52"灵能泰坦"</label>
-		<description>由乌拉帝国大教堂所开发的重型灵能机械体</description>
+		<description>由乌拉帝国大教堂所开发的重型灵能机械体，以短距离折跃优雅地穿梭于炮火间，并用灵能盾抵挡敌方射弹侵袭。该机体不仅镌刻了破坏力强大的星光追猎术式用以发起远距离跟踪打击，还拥有一系列改变战局的灵能能力。\n\n但是在近身搏斗中，灵能泰坦是一个可笑的对手，并且它的秘文纹路很容易遭到外力破坏，不要让它陷入胶着的贴身状态！</description>
     <uiIconPath>Wula/Things/Wula_Psi_Titan/Wula_Psi_Titan_Icon</uiIconPath>
     <statBases>
       <!-- 心灵敏感，稍高 -->
       <PsychicSensitivity>3</PsychicSensitivity>
       <BandwidthCost>8</BandwidthCost>
-      <MoveSpeed>6</MoveSpeed>
+      <MoveSpeed>2</MoveSpeed>
       <VacuumResistance MayRequire="Ludeon.RimWorld.Odyssey">1</VacuumResistance>
       <ArmorRating_Sharp>0.5</ArmorRating_Sharp>
       <ArmorRating_Blunt>0.5</ArmorRating_Blunt>
@@ -22,8 +22,8 @@
       <WastepacksPerRecharge MayRequire="Ludeon.RimWorld.Biotech">5</WastepacksPerRecharge>
 
       <!-- 飞行参数 -->
-      <MaxFlightTime>9999</MaxFlightTime>
+      <!-- <MaxFlightTime>9999</MaxFlightTime>
-      <FlightCooldown>0</FlightCooldown>
+      <FlightCooldown>0</FlightCooldown> -->
     </statBases>
     <race>
       <body>WULA_AI_Heavy_Panzer_Body</body>
@@ -40,8 +40,8 @@
       <bulletStaggerEffecterDef>TunnelerSlowedDown</bulletStaggerEffecterDef>
 
       <!-- 飞行参数 -->
-      <flightStartChanceOnJobStart>1</flightStartChanceOnJobStart>
+      <!-- <flightStartChanceOnJobStart>1</flightStartChanceOnJobStart>
-      <flightSpeedFactor>3</flightSpeedFactor>
+      <flightSpeedFactor>3</flightSpeedFactor> -->
       <!-- <canFlyIntoMap>true</canFlyIntoMap> -->
     </race>
     <tools Inherit="False">
@@ -58,13 +58,15 @@
       </li>
     </tools>
     <comps>
+      <!--加上这个组件的机械体会直接跳过原版指挥范围判定-->
+      <li Class="WulaFallenEmpire.CompProperties_GlobalMechCommand" />
       <li Class="CompProperties_ProjectileInterceptor">
         <radius>7</radius>
         <interceptGroundProjectiles>true</interceptGroundProjectiles>
         <color>(0.5, 0.3, 0.9)</color>
         <reactivateEffect>BulletShieldGenerator_Reactivate</reactivateEffect>
         <activeSound>BulletShield_Ambience</activeSound>
-        <hitPoints>10000</hitPoints>
+        <hitPoints>3000</hitPoints>
         <hitPointsRestoreInstantlyAfterCharge>true</hitPointsRestoreInstantlyAfterCharge>
         <chargeDurationTicks>1800</chargeDurationTicks>
         <rechargeHitPointsIntervalTicks>120</rechargeHitPointsIntervalTicks>
@@ -73,6 +75,38 @@
         <disarmedByEmpForTicks>1500</disarmedByEmpForTicks>
         <gizmoTipKey>ProjectileInterceptorTip</gizmoTipKey>
       </li>
+      <li Class="AutoBlink.CompProperties_AutoBlink" MayRequire="rabiosus.autoblink">
+        <!-- <gizmoIconPath></gizmoIconPath> -->
+        <blinkIntervalTicks>480</blinkIntervalTicks>
+        <delayAfterEligibleTicks>10</delayAfterEligibleTicks>
+        <cellsBeforeTarget>3</cellsBeforeTarget>
+        <maxDistanceToBlink>40</maxDistanceToBlink>
+        <minDistanceToBlink>4</minDistanceToBlink>
+        <postBlinkStanceTicks>0</postBlinkStanceTicks>
+        <excludedJobDefs>
+          <li>GotoWander</li>
+          <li>Carried</li>
+        </excludedJobDefs>
+
+        <preBlinkSoundDefs>
+          <li>AutoBlink_Skip_Small</li>
+        </preBlinkSoundDefs>
+        <postBlinkSoundDefs>
+          <li>AutoBlink_Skip_Exit_Small</li>
+        </postBlinkSoundDefs>
+
+        <preBlinkEffecterDefs>
+          <li>Skip_Entry</li>
+        </preBlinkEffecterDefs>
+
+        <postBlinkEffecterDefs>
+          <li>Skip_ExitNoDelay</li>
+        </postBlinkEffecterDefs>
+
+        <preBlinkMoteDefs/>
+        <postBlinkMoteDefs/>
+
+      </li>
     </comps>
   </ThingDef>
-</Defs>
+</Defs>

1.6/Defs/WeaponTraitDefs/WULA_WeaponCategoryDefs.xml

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-
   <WeaponCategoryDef>
     <defName>WULA_Psychic</defName>
     <label>灵能</label>
     <description>与心灵能量相互作用的武器。</description>
   </WeaponCategoryDef>
-
+  <WeaponCategoryDef>
+    <defName>WULA_Missile</defName>
+    <label>导弹</label>
+    <description>一种发射拥有跟踪能力的抛射体武器，弹速通常较慢。</description>
+  </WeaponCategoryDef>
 </Defs>

1.6/Defs/WeaponTraitDefs/WULA_WeaponTraitDefs.xml

@@ -22,4 +22,26 @@
     <statFactors>
     </statFactors>
   </WeaponTraitDef>
+  <WeaponTraitDef>
+    <defName>WULA_PsychicIgnoreBlock</defName>
+    <label>无视阻挡</label>
+    <description>这把武器的攻击无视所有的阻挡——无论是山体、墙体还是护盾。</description>
+    <commonality>1</commonality>
+    <weaponCategory>WULA_Psychic</weaponCategory>
+    <statOffsets>
+    </statOffsets>
+    <statFactors>
+    </statFactors>
+  </WeaponTraitDef>
+  <WeaponTraitDef>
+    <defName>WULA_MissileLauncher</defName>
+    <label>乌拉帝国导弹</label>
+    <description>这把武器的抛射体会跟踪敌人，如果没有明确的敌人作为目标，则会在落地前散开以形成轰炸区。</description>
+    <commonality>1</commonality>
+    <weaponCategory>WULA_Missile</weaponCategory>
+    <statOffsets>
+    </statOffsets>
+    <statFactors>
+    </statFactors>
+  </WeaponTraitDef>
 </Defs>