冠军甲

1.6/1.6/Defs/AbilityDefs/WULA_Misc_Ability.xml

@@ -51,7 +51,7 @@
     <defName>WULA_PsiCrusher</defName>
     <label>乌拉帝国术式：灵能尖啸</label>
     <description>以灵能能量发出非人尖啸，直接解构面前扇形区域内的所有目标，无论是建筑物还是活物都难逃毁灭。这种术式需要的灵能难以估量，只有搭载大量封闭灵能回路的灵能泰坦可以连续使用。</description>
-    <iconPath>UI/Abilities/FireSpew</iconPath>
+    <iconPath>Wula/UI/Abilities/WULA_PsiCrusher</iconPath>
     <writeCombatLog>True</writeCombatLog>
     <showPsycastEffects>False</showPsycastEffects>
     <aiCanUse>true</aiCanUse>
@@ -247,7 +247,7 @@
     <defName>WULA_Psi_Skip</defName>
     <label>乌拉帝国术式：灵能跃迁</label>
     <description>使用灵能撕开一个连接自身、虚境和目的地的单向通道，随后以极短的时间穿过整个通道，以瞬间移动到目标地点。</description>
-    <iconPath>UI/Abilities/Skip</iconPath>
+    <iconPath>Wula/UI/Abilities/WULA_TeleportSelf</iconPath>
     <writeCombatLog>True</writeCombatLog>
     <showPsycastEffects>False</showPsycastEffects>
     <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
@@ -396,7 +396,7 @@
     <defName>WULA_Psi_Black_Hole</defName>
     <label>乌拉帝国术式：虚境阴影</label>
     <description>撕开虚境的裂口，在目标地点召唤一道虚境阴影，它泄露的庞大灵能会持续伤害范围内的敌方单位和建筑，并让物品快速损坏，即使是心灵失聪的目标也不能完全免疫这种超现实伤害——对于高心灵敏感度的单位这种伤害则更加致命。</description>
-    <iconPath>UI/Abilities/FireSpew</iconPath>
+    <iconPath>Wula/UI/Abilities/WULA_Psi_Black_Hole</iconPath>
     <writeCombatLog>True</writeCombatLog>
     <showPsycastEffects>False</showPsycastEffects>
     <aiCanUse>true</aiCanUse>

1.6/1.6/Defs/EventDefs/EventDef_Wula/Wula_MainEvent.xml

@@ -675,6 +675,84 @@
       <li>这是一个测试选项，你可以吃到各种打</li>
     </descriptions>
     <options>
+      <li>
+        <label>来，冠军勇士援军</label>
+        <optionEffects>
+          <li>
+            <effects>
+              <li Class="WulaFallenEmpire.Effect_TriggerRaid">
+                <points>4000</points>
+                <faction>Wula_PIA_Legion_Faction</faction>
+                <raidStrategy>ImmediateAttackFriendly</raidStrategy>
+                <raidArrivalMode>EdgeDropGroups</raidArrivalMode>
+                <groupKind>Combat</groupKind>
+                <pawnGroupMakers>
+                  <li>
+                    <kindDef>Combat</kindDef>
+                    <commonality>100</commonality>
+                    <options>
+                      <Wula_PIA_Heavy_Unit_Melee>1</Wula_PIA_Heavy_Unit_Melee>
+                    </options>
+                  </li>
+                </pawnGroupMakers>
+              </li>
+              <li Class="WulaFallenEmpire.Effect_CloseDialog" />
+            </effects>
+          </li>
+        </optionEffects>
+      </li>
+      <li>
+        <label>来，百战军锋援军</label>
+        <optionEffects>
+          <li>
+            <effects>
+              <li Class="WulaFallenEmpire.Effect_TriggerRaid">
+                <points>4000</points>
+                <faction>Wula_PIA_Legion_Faction</faction>
+                <raidStrategy>ImmediateAttackFriendly</raidStrategy>
+                <raidArrivalMode>EdgeDropGroups</raidArrivalMode>
+                <groupKind>Combat</groupKind>
+                <pawnGroupMakers>
+                  <li>
+                    <kindDef>Combat</kindDef>
+                    <commonality>100</commonality>
+                    <options>
+                      <Wula_PIA_Heavy_Unit_Range>1</Wula_PIA_Heavy_Unit_Range>
+                    </options>
+                  </li>
+                </pawnGroupMakers>
+              </li>
+              <li Class="WulaFallenEmpire.Effect_CloseDialog" />
+            </effects>
+          </li>
+        </optionEffects>
+      </li>
+      <li>
+        <label>来，断爪卫队</label>
+        <optionEffects>
+          <li>
+            <effects>
+              <li Class="WulaFallenEmpire.Effect_TriggerRaid">
+                <points>1000</points>
+                <faction>Wula_PIA_Legion_Faction</faction>
+                <raidStrategy>ImmediateAttackFriendly</raidStrategy>
+                <raidArrivalMode>EdgeDropGroups</raidArrivalMode>
+                <groupKind>Combat</groupKind>
+                <pawnGroupMakers>
+                  <li>
+                    <kindDef>Combat</kindDef>
+                    <commonality>100</commonality>
+                    <options>
+                      <Wula_PIA_Legion_Escort_Unit>1</Wula_PIA_Legion_Escort_Unit>
+                    </options>
+                  </li>
+                </pawnGroupMakers>
+              </li>
+              <li Class="WulaFallenEmpire.Effect_CloseDialog" />
+            </effects>
+          </li>
+        </optionEffects>
+      </li>
       <li>
         <label>来，陆行舰</label>
         <optionEffects>

1.6/1.6/Defs/FactionDefs/Factions_Player_WULA.xml

@@ -36,7 +36,7 @@
   <FactionDef ParentName="FactionBase">
     <defName>Wula_PIA_Legion_Faction</defName>
     <label>乌拉帝国 行星封锁机关</label>
-    <description>隶属于乌拉帝国开发署的暴力机关，主要职责是对那些已经有人占领但是军事实力较弱的星球进行封锁和原住民驱离。虽然她们不是真正的军队，但是所保有的舰队和武装力量足以支撑其发起一场横跨星域的战争。\n\n她们之中大部分人居住在自己的庞大舰队中，地表只有零星前哨殖民地。她们也不会派出商队之类的交易者，只会在自己的派系范围内活动，并使用舰队支援这些地面据点的生产和战斗。你可以通过任务接洽和</description>
+    <description>隶属于乌拉帝国开发署的暴力机关，主要职责是对那些已经有人占领但是军事实力较弱的星球进行封锁和原住民驱离。虽然她们不是真正的军队，但是所保有的舰队和武装力量足以支撑其发起一场横跨星域的战争。\n\n她们之中大部分人居住在自己的庞大舰队中，地表只有零星前哨殖民地。她们也不会派出商队之类的交易者，只会在自己的派系范围内活动，并使用舰队支援这些地面据点的生产和战斗。</description>
     <basicMemberKind>Wula_PawnKind</basicMemberKind>
     <pawnSingular>乌拉帝国合成人</pawnSingular>
     <pawnsPlural>乌拉帝国合成人</pawnsPlural>

1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
+  <!-- 保持这个pawnkind是无派系以供空投系统调取，其他的乌拉pawnkind必须有默认派系 -->
   <PawnKindDef>
     <defName>Wula_PawnKind</defName>
     <label>机械乌拉</label>
@@ -55,7 +56,7 @@
           <maskPath>Wula/Things/WULA_Cat/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>1</drawSize>
+          <drawSize>1.2</drawSize>
         </bodyGraphicData>
       </li>
     </lifeStages>
@@ -68,7 +69,7 @@
           <maskPath>Wula/Things/WULA_Attack_Cat/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>1</drawSize>
+          <drawSize>1.2</drawSize>
         </bodyGraphicData>
       </li>
     </lifeStages>
@@ -95,7 +96,7 @@
           <maskPath>Wula/Things/WULA_Constructor_Cat/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>1</drawSize>
+          <drawSize>1.2</drawSize>
         </bodyGraphicData>
       </li>
     </lifeStages>
@@ -112,7 +113,7 @@
           <maskPath>Wula/Things/WULA_Assault_Cat/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>1</drawSize>
+          <drawSize>1.2</drawSize>
         </bodyGraphicData>
       </li>
     </lifeStages>
@@ -212,7 +213,7 @@
           <maskPath>Wula/Things/WULA_Cat/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>3.8</drawSize>
+          <drawSize>3.4</drawSize>
           <shadowData>
             <volume>(1.4, 1.8, 1.4)</volume>
           </shadowData>
@@ -345,6 +346,7 @@
     <defName>Wula_PIA_Light_Unit</defName>
     <label>帝国冲锋队</label>
     <race>WulaSpecies</race>
+    <defaultFactionType>Wula_PIA_Legion_Faction</defaultFactionType>
     <lifeStages>
       <li>
         <bodyGraphicData>
@@ -370,6 +372,7 @@
     <isFighter>true</isFighter>
     <apparelTags>
       <li>Wula_Armor_Light</li>
+      <li>Wula_Inner</li>
     </apparelTags>
     <weaponTags>
       <li>Wula_Melee_Weapon_T1</li>
@@ -402,6 +405,7 @@
     <defName>Wula_PIA_Heavy_Unit</defName>
     <label>军团步兵</label>
     <race>WulaSpecies</race>
+    <defaultFactionType>Wula_PIA_Legion_Faction</defaultFactionType>
     <lifeStages>
       <li>
         <bodyGraphicData>
@@ -427,6 +431,7 @@
     <isFighter>true</isFighter>
     <apparelTags>
       <li>Wula_Armor_Super_Heavy</li>
+      <li>Wula_Inner</li>
     </apparelTags>
     <weaponTags>
       <li>Wula_Melee_Weapon_T1</li>
@@ -460,6 +465,7 @@
     <defName>Wula_PIA_Heavy_Unit_Melee</defName>
     <label>野心冠军勇士</label>
     <race>WulaSpecies</race>
+    <defaultFactionType>Wula_PIA_Legion_Faction</defaultFactionType>
     <lifeStages>
       <li>
         <bodyGraphicData>
@@ -477,8 +483,8 @@
     <minGenerationAge>18</minGenerationAge>
 		<maxGenerationAge>20</maxGenerationAge>
     <combatPower>500</combatPower>
-    <initialWillRange>10~20</initialWillRange>
-    <initialResistanceRange>10~20</initialResistanceRange>
+    <initialWillRange>99~99</initialWillRange>
+    <initialResistanceRange>99~99</initialResistanceRange>
     <itemQuality>Legendary</itemQuality>
     <minApparelQuality>Legendary</minApparelQuality>
     <maxApparelQuality>Legendary</maxApparelQuality>
@@ -488,13 +494,14 @@
     <weaponStuffOverride>Plasteel</weaponStuffOverride>
     <apparelTags>
       <li>Wula_Armor_Super_Heavy</li>
+      <li>Wula_Inner</li>
     </apparelTags>
     <weaponTags>
       <li>Wula_Melee_Weapon_T3</li>
     </weaponTags>
     <apparelRequired>
       <li>WULA_Heavy_Infantry_PowerArmor</li>
-      <li>WULA_Heavy_Infantry_Helmet</li>
+      <li>WULA_Heavy_Infantry_Helmet_Nomask</li>
     </apparelRequired>
     <weaponMoney>999999~999999</weaponMoney>
     <biocodeWeaponChance>1</biocodeWeaponChance>
@@ -523,6 +530,7 @@
     <defName>Wula_PIA_Heavy_Unit_Range</defName>
     <label>帝国百战军锋</label>
     <race>WulaSpecies</race>
+    <defaultFactionType>Wula_PIA_Legion_Faction</defaultFactionType>
     <lifeStages>
       <li>
         <bodyGraphicData>
@@ -540,8 +548,8 @@
     <minGenerationAge>18</minGenerationAge>
 		<maxGenerationAge>20</maxGenerationAge>
     <combatPower>500</combatPower>
-    <initialWillRange>10~20</initialWillRange>
-    <initialResistanceRange>10~20</initialResistanceRange>
+    <initialWillRange>99~99</initialWillRange>
+    <initialResistanceRange>99~99</initialResistanceRange>
     <itemQuality>Legendary</itemQuality>
     <minApparelQuality>Legendary</minApparelQuality>
     <maxApparelQuality>Legendary</maxApparelQuality>
@@ -549,6 +557,7 @@
     <apparelTags>
       <li>Wula_Armor_Super_Heavy</li>
       <li>Wula_Armor_Shield</li>
+      <li>Wula_Inner</li>
     </apparelTags>
     <weaponTags>
       <li>Wula_Ranged_Weapon_T3</li>
@@ -586,6 +595,7 @@
     <defName>WULA_Legion_PawnKind</defName>
     <label>「军团」</label>
     <race>WulaSpecies</race>
+    <defaultFactionType>Wula_PIA_Legion_Faction</defaultFactionType>
     <lifeStages>
       <li>
         <bodyGraphicData>
@@ -600,6 +610,7 @@
         </bodyGraphicData>
       </li>
     </lifeStages>
+
     <forceDeathOnDowned>true</forceDeathOnDowned>
     <combatPower>0</combatPower>
     <factionLeader>true</factionLeader>
@@ -625,6 +636,7 @@
     <defName>Wula_PIA_Legion_Escort_Unit</defName>
     <label>断爪卫队</label>
     <race>WulaSpecies</race>
+    <defaultFactionType>Wula_PIA_Legion_Faction</defaultFactionType>
     <lifeStages>
       <li>
         <bodyGraphicData>
@@ -639,11 +651,15 @@
         </bodyGraphicData>
       </li>
     </lifeStages>
+    
+    <isBoss>true</isBoss>
+    <maxPerGroup>1</maxPerGroup>
+    
     <minGenerationAge>18</minGenerationAge>
 		<maxGenerationAge>20</maxGenerationAge>
     <combatPower>500</combatPower>
-    <initialWillRange>10~20</initialWillRange>
-    <initialResistanceRange>10~20</initialResistanceRange>
+    <initialWillRange>99~99</initialWillRange>
+    <initialResistanceRange>99~99</initialResistanceRange>
     <itemQuality>Legendary</itemQuality>
     <minApparelQuality>Legendary</minApparelQuality>
     <maxApparelQuality>Legendary</maxApparelQuality>
@@ -652,14 +668,14 @@
     <isFighter>true</isFighter>
     <weaponStuffOverride>Plasteel</weaponStuffOverride>
     <apparelTags>
-      <li>Wula_Armor_Super_Heavy</li>
+      <li>Wula_Legion_Apparel</li>
     </apparelTags>
     <weaponTags>
       <li>WULA_MW_Twohanded_ChainBroadsword</li>
     </weaponTags>
     <apparelRequired>
-      <li>WULA_Heavy_Infantry_PowerArmor</li>
-      <li>WULA_Heavy_Infantry_Helmet</li>
+      <li>WULA_Heavy_Infantry_Helmet_Nomask</li>
+      <li>WULA_Champion_Warrior_Armor</li>
     </apparelRequired>
     <weaponMoney>999999~999999</weaponMoney>
     <biocodeWeaponChance>1</biocodeWeaponChance>
@@ -682,5 +698,9 @@
 		<fixedAdultBackstories>
 			<li>WULA_Adult_Backstory_Legion_Escort</li>
 		</fixedAdultBackstories>
+
+    <forcedTraits>
+      <li>WULA_Trait_Broken_Personality</li>
+    </forcedTraits>
   </PawnKindDef>
 </Defs>

1.6/1.6/Defs/QuestScriptDefs/WULA_Colony_Promotion.xml

@@ -331,9 +331,9 @@
             <parms>
               <allowedThreats>Raids</allowedThreats>
               <onDays>1.0</onDays>
-              <offDays>1.5</offDays>
+              <offDays>0.25</offDays>
               <minSpacingDays>0.04</minSpacingDays>
-              <numIncidentsRange>1~1</numIncidentsRange>
+              <numIncidentsRange>1~2</numIncidentsRange>
               <currentThreatPointsFactor>1.1</currentThreatPointsFactor>
               <minThreatPoints>500</minThreatPoints>
             </parms>

1.6/1.6/Defs/Scenarios/Scenarios_WULA.xml

@@ -81,11 +81,6 @@
           <thingDef>Apparel_WULA_Manpack_Loitering_Munition</thingDef>
           <count>2</count>
         </li>
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>WULA_Charge_Cube</thingDef>
-          <count>10</count>
-        </li>
         <li Class="ScenPart_StartingThing_Defined">
           <def>StartingThing_Defined</def>
           <thingDef>WULA_Fake_Mothership_Beacon_Building</thingDef>

1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml

@@ -1618,7 +1618,7 @@
       <texPath>Wula/Building/Wula_Fusion_Generators_Incoming</texPath>
       <graphicClass>Graphic_Single</graphicClass>
       <shaderType>CutoutFlying</shaderType>
-      <drawSize>(3,3)</drawSize>
+      <drawSize>(3.5,3.5)</drawSize>
     </graphicData>
     <skyfaller>
       <movementType>Accelerate</movementType>
@@ -1654,7 +1654,8 @@
     <graphicData>
       <texPath>Wula/Building/Wula_Fusion_Generators</texPath>
       <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>(3,3)</drawSize>
+      <drawSize>(3.5,3.5)</drawSize>
+      <drawOffset>(0, 0, 0.3)</drawOffset>
       <shadowData>
         <volume>(1.93,1,1.69)</volume>
         <offset>(-0.03,0,-0.1)</offset>

1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml

@@ -751,6 +751,8 @@
     </statBases>
     <equippedStatOffsets>
       <IncomingDamageFactor>-0.1</IncomingDamageFactor>
+      <ToxicResistance>1</ToxicResistance>
+      <ToxicEnvironmentResistance MayRequire="Ludeon.RimWorld.Biotech">1</ToxicEnvironmentResistance>
     </equippedStatOffsets>
     <apparel>
       <tags>
@@ -766,6 +768,134 @@
       <Uranium>20</Uranium>
     </costList>
   </ThingDef>
+  <ThingDef ParentName="WULA_ApparelHelmetBase">
+    <defName>WULA_Heavy_Infantry_Helmet_Nomask</defName>
+    <label>乌拉帝国重装头盔（无面罩）</label>
+    <description>与乌拉帝国重装装甲配套的头盔，防御力强大。这个版本不配发面罩，因为军需处终于想起来了机械乌拉是不会中毒的。</description>
+    <thingCategories>
+      <li>HeadgearNoble</li>
+    </thingCategories>
+    <recipeMaker>
+      <skillRequirements>
+        <Crafting>10</Crafting>
+      </skillRequirements>
+      <researchPrerequisite>WULA_Synth_Armor_2_Technology</researchPrerequisite>
+    </recipeMaker>
+    <graphicData>
+      <texPath>Wula/Apparel/WULA_Heavy_Infantry_Helmet_Nomask</texPath>
+    </graphicData>
+    <statBases>
+      <WorkToMake>20000</WorkToMake>
+      <MaxHitPoints>1000</MaxHitPoints>
+      <Mass>5</Mass>
+      <Flammability>0</Flammability>
+      <ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+      <ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+      <ArmorRating_Heat>2.0</ArmorRating_Heat>
+      <EquipDelay>5</EquipDelay>
+    </statBases>
+    <equippedStatOffsets>
+      <IncomingDamageFactor>-0.1</IncomingDamageFactor>
+    </equippedStatOffsets>
+    <apparel>
+      <tags>
+        <li>WULA_Heavy_Infantry_Helmet_Nomask</li>
+        <li>RoyalTier5</li>
+        <li>Royal</li>
+      </tags>
+      <wornGraphicPath>Wula/Apparel/WULA_Heavy_Infantry_Helmet_Nomask</wornGraphicPath>
+    </apparel>
+    <costStuffCount>0</costStuffCount>
+    <costList Inherit="False">
+      <WULA_Neutronium>2</WULA_Neutronium>
+      <Uranium>15</Uranium>
+    </costList>
+  </ThingDef>
+  <ThingDef ParentName="WULA_ApparelArmorBase">
+    <defName>WULA_Champion_Warrior_Armor</defName>
+    <label>乌拉帝国冠军甲胄</label>
+    <description>为乌拉帝国的野心冠军勇士提供的护甲，它比起那些重型护甲要轻便不少。此外，它装备了稀有的双层全反射盾，外部射弹根本无法穿透其护盾，这使得对手只能进入护盾范围内与其近身搏斗。</description>
+    <thingCategories>
+      <li>ApparelNoble</li>
+    </thingCategories>
+    <recipeMaker Inherit="False"/>
+    <useHitPoints>false</useHitPoints>
+    <graphicData>
+      <texPath>Wula/Apparel/WULA_Champion_Warrior_Armor</texPath>
+    </graphicData>
+    <statBases>
+      <WorkToMake>50000</WorkToMake>
+      <Mass>5</Mass>
+      <Flammability>0</Flammability>
+      <ArmorRating_Sharp>1.3</ArmorRating_Sharp>
+      <ArmorRating_Blunt>1.3</ArmorRating_Blunt>
+      <ArmorRating_Heat>1.5</ArmorRating_Heat>
+      <EquipDelay>1</EquipDelay>
+      <MaxHitPoints>-1</MaxHitPoints>
+      <Flammability>0</Flammability>
+      <DeteriorationRate>0</DeteriorationRate>
+
+      <EnergyShieldEnergyMax>3</EnergyShieldEnergyMax>
+    </statBases>
+    <equippedStatOffsets>
+      <IncomingDamageFactor>-0.8</IncomingDamageFactor>
+      <StaggerDurationFactor>-2</StaggerDurationFactor>
+			<CarryingCapacity>250</CarryingCapacity>
+			<MoveSpeed>1</MoveSpeed>
+      <Flammability>-2</Flammability>
+    </equippedStatOffsets>
+    <costStuffCount>0</costStuffCount>
+    <costList Inherit="False">
+      <WULA_Alloy>300</WULA_Alloy>
+      <WULA_Dark_Matter_Item>25</WULA_Dark_Matter_Item>
+      <WULA_Neutronium>25</WULA_Neutronium>
+      <Uranium>200</Uranium>
+    </costList>
+    <apparel>
+      <tags>
+        <li>WULA_Champion_Warrior_Armor</li>
+        <li>RoyalTier5</li>
+        <li>Royal</li>
+      </tags>
+      <wornGraphicPath>Wula/Apparel/WULA_Champion_Warrior_Armor</wornGraphicPath>
+    </apparel>
+    <comps>
+      <li Class="CompProperties_Shield">
+        <startingTicksToReset>1000</startingTicksToReset><!-- 10 mins -->
+        <minDrawSize>2.5</minDrawSize>
+        <maxDrawSize>2.8</maxDrawSize>
+        <energyLossPerDamage>0.01</energyLossPerDamage>
+        <energyOnReset>4.0</energyOnReset>
+        <blocksRangedWeapons>false</blocksRangedWeapons>
+      </li>
+      <li Class="WulaFallenEmpire.CompProperties_AreaShield">
+        <radius>6</radius>
+        <baseHitPoints>1</baseHitPoints>
+        <rechargeDelay>1</rechargeDelay>
+        <rechargeHitPointsIntervalTicks>30</rechargeHitPointsIntervalTicks>
+        
+        <!-- 效果器配置 -->
+        <absorbEffecter>Interceptor_BlockedProjectile</absorbEffecter>
+        <interceptEffecter>Interceptor_BlockedProjectile</interceptEffecter>
+        <breakEffecter>Shield_Break</breakEffecter>
+        <reactivateEffecter>BulletShieldGenerator_Reactivate</reactivateEffecter>
+        
+        <color>(0.9, 0.2, 0.2, 0.5)</color> <!-- 护盾气泡的颜色 (RGBA) -->
+        
+        <!-- 拦截设置 -->
+        <interceptGroundProjectiles>true</interceptGroundProjectiles>
+        <interceptNonHostileProjectiles>false</interceptNonHostileProjectiles>
+        <interceptAirProjectiles>true</interceptAirProjectiles>
+      
+        <!-- 反射设置 -->
+        <canReflect>true</canReflect>
+        <reflectChance>1</reflectChance>
+        <reflectAngleRange>30</reflectAngleRange>
+        <reflectCost>0</reflectCost>
+        <reflectEffecter>Interceptor_BlockedProjectile</reflectEffecter>
+      </li>
+    </comps>
+  </ThingDef>
 
   <ThingDef ParentName="WULA_ApparelShieldBase">
     <defName>WULA_Shield_Base</defName>

1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml

@@ -324,7 +324,7 @@
           <li>WULA_MW_ChainSword_MultiStrike</li>
         </capacities>
         <armorPenetration>1.75</armorPenetration>
-        <power>35</power>
+        <power>30</power>
         <cooldownTime>2</cooldownTime>
         <soundMeleeHit>WULA_MW_ChainSword_Hit</soundMeleeHit>
         <soundMeleeMiss>WULA_MW_ChainSword_Hit</soundMeleeMiss>
@@ -351,17 +351,19 @@
         <strikeCount>8~12</strikeCount>
         <damageMultiplierPerStrike>0.2</damageMultiplierPerStrike>
       </li>
-      <li Class="CompProperties_EquippableAbilityReloadable">
-        <abilityDef>WULA_MW_Twohanded_ChainBroadsword_Ability</abilityDef>
-        <chargeNoun>传送核心</chargeNoun>
+      <li Class="WulaFallenEmpire.CompProperties_EquippableAbilities">
+        <abilityDefs>
+          <li>WULA_MW_Twohanded_ChainBroadsword_Second_Ability</li>
+          <li>WULA_MW_Twohanded_ChainBroadsword_Ability</li>
+        </abilityDefs>
       </li>
     </comps>
   </ThingDef>
   <AbilityDef>
     <defName>WULA_MW_Twohanded_ChainBroadsword_Ability</defName>
     <label>短距离跃迁</label>
-    <description>使用CBs-25"地狱牙"刀头的相位引擎立刻折跃至一个新的位置——这种折跃引擎只能折跃小型目标，如果持刀者体型大于1则无法发起传送。</description>
-    <iconPath>UI/Abilities/Skip</iconPath>
+    <description>使用CBs-25"地狱牙"刀头的相位引擎立刻折跃至一个新的位置——这种折跃引擎只能折跃小型目标，如果持刀者体型大于3则无法发起传送。</description>
+    <iconPath>Wula/UI/Abilities/WULA_TeleportSelf</iconPath>
     <writeCombatLog>True</writeCombatLog>
     <showPsycastEffects>False</showPsycastEffects>
     <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
@@ -385,7 +387,7 @@
           <min>0</min>
           <max>0</max>
         </stunTicks>
-        <maxBodySize>1</maxBodySize>
+        <maxBodySize>3</maxBodySize>
         <destClamorType>Impact</destClamorType>
         <destClamorRadius>3</destClamorRadius>
         <requireLineOfSight>false</requireLineOfSight>
@@ -399,6 +401,45 @@
       </li>
     </comps>
   </AbilityDef>
+  <AbilityDef>
+    <defName>WULA_MW_Twohanded_ChainBroadsword_Second_Ability</defName>
+    <label>空间删除</label>
+    <description>使用CBs-25"地狱牙"刀头的相位引擎将目标拉近到施法者身边——这种折跃引擎只能折跃小型目标，如果持刀者体型大于3则无法发起传送。</description>
+    <iconPath>Wula/UI/Abilities/WULA_PullTarget</iconPath>
+    <writeCombatLog>True</writeCombatLog>
+    <showPsycastEffects>False</showPsycastEffects>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <cooldownTicksRange>200</cooldownTicksRange>
+    <warmupEffecter>HoraxianSpellLight_Warmup</warmupEffecter>
+    <aiCanUse>true</aiCanUse>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <warmupTime>1</warmupTime>
+      <range>30</range>
+      <soundCast>WULA_Psi_Skip_Sound</soundCast>
+      <requireLineOfSight>false</requireLineOfSight>
+      <targetParams>
+        <canTargetLocations>true</canTargetLocations>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="WulaFallenEmpire.CompProperties_AbilityPullTarget">
+        <range>30</range>
+        <maxTargetBodySize>3</maxTargetBodySize>
+        <minRange>1.75</minRange> <!-- 最小距离1格 -->
+        <stunTicks>
+          <min>15</min>
+          <max>15</max>
+        </stunTicks>
+        <pullDestinationSearchRadius>3</pullDestinationSearchRadius>
+        <destClamorType>Impact</destClamorType>
+        <destClamorRadius>3</destClamorRadius>
+        <canPullHostile>true</canPullHostile>
+        <canPullNeutral>true</canPullNeutral>
+        <canPullFriendly>true</canPullFriendly>
+      </li>
+    </comps>
+  </AbilityDef>
   <ThingDef ParentName="WULA_ExperienceCore_Weapon_Melee">
     <defName>WULA_MW_Breaker_Bar</defName>
     <label>PMb-97"破墙槌"</label>
@@ -508,7 +549,7 @@
     <defName>WULA_MW_Breaker_Bar_Ability</defName>
     <label>破阵重击</label>
     <description>将PMb-97"破墙槌"的锤头加到最大压强，随后挥出必中的一击，以突破严密的人墙——即使敌人侥幸存活，也会头晕目眩并被砸飞出一段距离。</description>
-    <iconPath>UI/Abilities/UnnaturalHealing</iconPath>
+    <iconPath>Wula/UI/Abilities/WULA_MW_Breaker_Bar_Ability</iconPath>
     <cooldownTicksRange>300</cooldownTicksRange> <!-- 6 days -->
     <showPsycastEffects>false</showPsycastEffects>
     <stunTargetWhileCasting>true</stunTargetWhileCasting>
@@ -1030,7 +1071,7 @@
     <defName>WULA_RW_EMP_RF_EMP_Ability</defName>
     <label>发射EMP榴弹</label>
     <description>使用FLm-78"萤石"下挂的榴弹发射器发射一枚EMP榴弹以击破护盾和控制机械族，这种重型榴弹发射器发射距离较远，但是需要一点时间架设开火。</description>
-    <iconPath>Wula/UI/Abilities/WULA_RW_Auto_GL_Smoke_Ability</iconPath>
+    <iconPath>Wula/UI/Abilities/WULA_RW_EMP_RF_EMP_Ability</iconPath>
     <writeCombatLog>True</writeCombatLog>
     <showPsycastEffects>False</showPsycastEffects>
     <hotKey>Misc11</hotKey>

1.6/1.6/Defs/TraitDefs/Traits_WULA.xml

@@ -166,7 +166,7 @@
     <degreeDatas>
       <li>
         <label>破碎人格</label>
-        <description>这个乌拉帝国合成人没有完整的人格，这使得她更像是一台真正的机械——除了饮食外，所有的需求都已经被禁用。</description>
+        <description>这个乌拉帝国合成人没有完整的人格，这使得她更像是一台真正的机械。</description>
         <disablesNeeds>
           <li>Mood</li>
           <li>Joy</li>

1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/Misc_Gameplay.xml

@@ -57,24 +57,6 @@
   <WULA_NanoRepair_DisabledMsg>{0}的纳米修复系统已禁用</WULA_NanoRepair_DisabledMsg>
   <WULA_NanoRepair_Disabled>纳米修复: 已禁用</WULA_NanoRepair_Disabled>
 
-  <!-- 消息文本 -->
-  <WULA_NoRecyclableMechanoidsNearby>附近没有可回收的乌拉猫猫。</WULA_NoRecyclableMechanoidsNearby>
-  <WULA_RecyclerStorageFull>地堡已满。</WULA_RecyclerStorageFull>
-  <WULA_CalledMechanoidsForRecycling>已调用 {0} 个乌拉猫猫回到地堡。</WULA_CalledMechanoidsForRecycling>
-  <WULA_MechanoidRecycled>已回收 {0}。</WULA_MechanoidRecycled>
-  <WULA_NoMechanoidsAvailableForConversion>没有可转换的乌拉猫猫。</WULA_NoMechanoidsAvailableForConversion>
-  <WULA_NotEnoughStoredMechanoids>地堡内的的乌拉猫猫不足。</WULA_NotEnoughStoredMechanoids>
-  <WULA_ConvertingMechanoids>正在将地堡内的{0}个乌拉猫猫转换为{1}。</WULA_ConvertingMechanoids>
-  <!-- Gizmo 文本 -->
-  <WULA_RecycleNearbyMechanoids>呼叫乌拉猫猫进驻</WULA_RecycleNearbyMechanoids>
-  <WULA_RecycleNearbyMechanoidsDesc>呼叫{0}格内的乌拉猫猫前来报到，以便转换为其他类型的猫猫，或是使用地堡内武器抵御敌军。</WULA_RecycleNearbyMechanoidsDesc>
-  <WULA_RecycleNearbyMechanoidsDisabled>地堡存储已满。</WULA_RecycleNearbyMechanoidsDisabled>
-  <WULA_ConvertMechanoids>释放乌拉猫猫</WULA_ConvertMechanoids>
-  <WULA_ConvertMechanoidsDesc>将地堡内的乌拉猫猫释放出来，它们可以在离开前重新选择装备以转变类型。\n容量：{0}/{1}</WULA_ConvertMechanoidsDesc>
-  <WULA_ConvertMechanoidsDisabled>地堡内没有乌拉猫猫待命。</WULA_ConvertMechanoidsDisabled>
-  <!-- 检查字符串 -->
-  <WULA_StoredInfo>容量：{0}/{1}</WULA_StoredInfo>
-
   <WULA_CallSkyfaller>召唤空投建筑</WULA_CallSkyfaller>
   <WULA_CallSkyfallerDesc>从乌拉帝国的舰队呼叫对应的建筑空投到此处</WULA_CallSkyfallerDesc>
   <WULA_SkyfallerIncoming>空投建筑将在 {0} 后到达</WULA_SkyfallerIncoming>
@@ -311,4 +293,54 @@
   <WULA_ShowAreaShieldLabel>显示区域反射盾</WULA_ShowAreaShieldLabel>
   <WULA_HideAreaShieldDesc>隐藏该单位的区域反射盾，这不会影响其实际功能，仅影响视觉效果</WULA_HideAreaShieldDesc>
   <WULA_ShowAreaShieldDesc>显示该单位的区域反射盾，这不会影响其实际功能，仅影响视觉效果</WULA_ShowAreaShieldDesc>
+  
+  <!-- Building_MechanoidRecycler.cs -->
+  <WULA_RecyclerFull>地堡已满。</WULA_RecyclerFull>
+  <WULA_MechRecycled>已回收 {0}。 (当前: {1}/{2})</WULA_MechRecycled>
+  <WULA_NoMechsToConvert>没有可转换的乌拉猫猫。</WULA_NoMechsToConvert>
+  <WULA_NotEnoughMechs>地堡内的的乌拉猫猫不足。</WULA_NotEnoughMechs>
+  <WULA_ConvertingMechs>正在将地堡内的{0}个乌拉猫猫转换为{1}。</WULA_ConvertingMechs>
+  <WULA_RecycleNearbyMechs>呼叫乌拉猫猫进驻</WULA_RecycleNearbyMechs>
+  <WULA_RecycleNearbyMechsDesc>呼叫{0}格内的乌拉猫猫前来报到，以便转换为其他类型的猫猫，或是使用地堡内武器抵御敌军。</WULA_RecycleNearbyMechsDesc>
+  <WULA_StorageFull>地堡存储已满。</WULA_StorageFull>
+  <WULA_ConvertMechs>释放乌拉猫猫</WULA_ConvertMechs>
+  <WULA_ConvertMechsDesc>将地堡内的乌拉猫猫释放出来，它们可以在离开前重新选择装备以转变类型。\n容量：{0}/{1}</WULA_ConvertMechsDesc>
+  <WULA_NoAvailableMechs>地堡内没有乌拉猫猫待命。</WULA_NoAvailableMechs>
+  <WULA_NoNearbyRecyclableMechs>附近没有可回收的乌拉猫猫。</WULA_NoNearbyRecyclableMechs>
+  <WULA_MechsOrderedToRecycle>已调用 {0} 个乌拉猫猫回到地堡。</WULA_MechsOrderedToRecycle>
+  <WULA_StoredMechs>容量: {0}/{1}</WULA_StoredMechs>
+  <WULA_TransformCooldown>转换冷却: {0} 小时</WULA_TransformCooldown>
+  
+  <!-- CompTransformAtFullCapacity.cs -->
+  <WULA_BuildingCooldown>建筑刚部署，需要等待 {0} 小时后才能转换</WULA_BuildingCooldown>
+  <WULA_NeedMoreMechs>需要进驻 {0} 个乌拉猫猫，当前: {1}/{2}</WULA_NeedMoreMechs>
+  <WULA_CooldownRemaining>冷却时间剩余: {0} 小时</WULA_CooldownRemaining>
+  <WULA_TargetUnit>目标单位: {0}</WULA_TargetUnit>
+  <WULA_MechsRequired>需要乌拉猫猫: {0} 个</WULA_MechsRequired>
+  <WULA_BuildingTransformedToPawn>{0} 已转换为 {1}</WULA_BuildingTransformedToPawn>
+  
+  <!-- CompTransformIntoBuilding.cs -->
+  <WULA_UnitNotSpawned>单位未生成或已销毁</WULA_UnitNotSpawned>
+  <WULA_CannotDetermineBuildingType>无法确定目标建筑类型</WULA_CannotDetermineBuildingType>
+  <WULA_NoSuitablePositionFound>周围没有找到合适的放置位置</WULA_NoSuitablePositionFound>
+  <WULA_DeployingAtNearbyPosition>将在附近位置 {0} 部署建筑</WULA_DeployingAtNearbyPosition>
+  <WULA_CannotDeployBuilding>无法部署建筑: {0}</WULA_CannotDeployBuilding>
+  <WULA_PawnDeployedAsBuilding>{0} 已部署为 {1}</WULA_PawnDeployedAsBuilding>
+  <WULA_WillRestoreTo>将恢复为: {0}</WULA_WillRestoreTo>
+  <WULA_MaxStorageCapacity>最大存储容量: {0} 个乌拉猫猫</WULA_MaxStorageCapacity>
+  <WULA_PositionValid>✓ 当前位置可以放置建筑</WULA_PositionValid>
+  <WULA_PositionInvalid>✗ {0}</WULA_PositionInvalid>
+
+  <WULA_TeleportFailedNoValidLocation>传送后无有效落脚位置，已取消传送。</WULA_TeleportFailedNoValidLocation>
+  <WULA_CannotTeleportToLocation>无效传送位置</WULA_CannotTeleportToLocation>
+
+  <!-- CompAbilityEffect_PullTarget.cs -->
+  <WULA_InvalidPullTarget>无法拉取该目标</WULA_InvalidPullTarget>
+  <WULA_TargetTooLarge>{0} 体型过大，无法拉取（最大体型：{1}）</WULA_TargetTooLarge>
+  <WULA_PullFailedNoValidLocation>拉取失败：找不到合适的落地位置</WULA_PullFailedNoValidLocation>
+  <WULA_MustTargetPawn>必须选择一个生物作为目标</WULA_MustTargetPawn>
+  <WULA_TargetOutOfRange>目标超出范围（最大范围：{0}）</WULA_TargetOutOfRange>
+  <WULA_TargetTooClose>目标距离过近（最小距离：{0}格）</WULA_TargetTooClose>
+  <WULA_NoLineOfSight>没有视线到目标</WULA_NoLineOfSight>
+  <WULA_CannotPullTarget>无法拉取该目标</WULA_CannotPullTarget>
 </LanguageData>