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

1.6/1.6/Defs/FactionDefs/Factions_WULA_FE_Materialist.xml

@@ -91,18 +91,6 @@
         <li>(100000,10000)</li>
       </points>
     </maxPawnCostPerTotalPointsCurve>
-    <pawnGroupMakers>
-      <li>
-        <kindDef>Combat</kindDef>
-        <commonality>50</commonality>
-        <options>
-          <Mech_WULA_Cat_Assault>60</Mech_WULA_Cat_Assault>
-          <Mech_WULA_Cat_Constructor>30</Mech_WULA_Cat_Constructor>
-          <Mech_WULA_Cat_Fire>20</Mech_WULA_Cat_Fire>
-          <Mech_WULA_Cat_EMP>20</Mech_WULA_Cat_EMP>
-        </options>
-      </li>
-    </pawnGroupMakers>
     <settlementTexturePath>World/WorldObjects/DefaultSettlement</settlementTexturePath>
     <allowedArrivalTemperatureRange>-100~200</allowedArrivalTemperatureRange>
     <maxConfigurableAtWorldCreation>1</maxConfigurableAtWorldCreation>

1.6/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml

@@ -971,18 +971,25 @@
       </li>
     </stages>
     <comps>
-      <li Class="WulaFallenEmpire.HediffCompProperties_MakesMechanitor"/>
-      <li Class="HediffCompProperties_GiveHediffsInRange">
+      <!-- 这里使用我们新创建的C#类的完整名称 -->
+      <li Class="WulaFallenEmpire.HediffCompProperties_GiveHediffsInRangeToRace">
         <range>45</range>
-        <!-- <mote>Mote_WorkCommand</mote> -->
-        <hideMoteWhenNotDrafted>true</hideMoteWhenNotDrafted>
+        <hediff>WULA_Addons_Antenna_Commander_Hediff</hediff>
+        
+        <!-- 定义可以被影响的种族列表 -->
+        <targetRaces>
+          <li>WulaSpecies</li>
+        </targetRaces>
+
+        <!-- 其他参数和原版一样 -->
         <targetingParameters>
           <canTargetBuildings>false</canTargetBuildings>
           <canTargetAnimals>false</canTargetAnimals>
           <canTargetMechs>false</canTargetMechs>
           <onlyTargetColonists>true</onlyTargetColonists>
         </targetingParameters>
-        <hediff>WULA_Addons_Antenna_Commander_Hediff</hediff>
+        <onlyPawnsInSameFaction>true</onlyPawnsInSameFaction>
+        <hideMoteWhenNotDrafted>true</hideMoteWhenNotDrafted>
       </li>
     </comps>
   </HediffDef>
@@ -992,7 +999,7 @@
     <defaultLabelColor>(0.52, 1, 0.95)</defaultLabelColor>
     <hediffClass>HediffWithComps</hediffClass>
     <descriptionHyperlinks>
-      <ThingDef>WULA_Addons_Antenna_Hediff_Spuernode</ThingDef>
+      <HediffDef>WULA_Addons_Antenna_Hediff_Spuernode</HediffDef>
     </descriptionHyperlinks>
     <isBad>false</isBad>
     <description>一个高级节点正在附近指挥这只机械乌拉，并分担了其综合计算压力。</description>
@@ -1036,7 +1043,7 @@
       <li>RewardStandardMidFreq</li>
     </thingSetMakerTags>
     <recipeMaker>
-      <researchPrerequisite>WULA_Synth_Addons_1_Technology</researchPrerequisite>
+      <researchPrerequisite>WULA_Synth_Antenna_Technology</researchPrerequisite>
       <recipeUsers>
         <li>WULA_Cube_Productor_Energy</li>
       </recipeUsers>
@@ -1082,6 +1089,146 @@
       <li>WulaSpecies</li>
     </recipeUsers>
   </RecipeDef>
+  <HediffDef ParentName="AddedBodyPartBase">
+    <defName>WULA_Addons_Antenna_Hediff_Shield</defName>
+    <label>连携斥力场天线</label>
+    <description>机械乌拉的特殊高频率天线，装备了这种天线的机械乌拉可以为自己和旁边的机械乌拉提供斥力护盾以抵消伤害，但是其本体将因为高额能量输出而变得非常脆弱。</description>
+    <descriptionHyperlinks>
+      <ThingDef>WULA_Addons_Antenna_Shield</ThingDef>
+      <HediffDef>WULA_Addons_Antenna_Protected_Hediff</HediffDef>
+    </descriptionHyperlinks>
+    <spawnThingOnRemoved>WULA_Addons_Antenna_Shield</spawnThingOnRemoved>
+    <addedPartProps>
+      <!-- <partEfficiency>1.5</partEfficiency> -->
+      <betterThanNatural>true</betterThanNatural>
+    </addedPartProps>
+    <stages>
+      <li>
+        <statFactors>
+          <MeleeDodgeChance>0</MeleeDodgeChance>
+          <StaggerDurationFactor>5</StaggerDurationFactor>
+          <IncomingDamageFactor>1.5</IncomingDamageFactor>
+        </statFactors>
+        <capMods>
+          <li>
+            <capacity>Consciousness</capacity>
+            <offset>-0.3</offset>
+          </li>
+        </capMods>
+      </li>
+    </stages>
+    <comps>
+      <!-- 这里使用我们新创建的C#类的完整名称 -->
+      <li Class="WulaFallenEmpire.HediffCompProperties_GiveHediffsInRangeToRace">
+        <range>3</range>
+        <hediff>WULA_Addons_Antenna_Protected_Hediff</hediff>
+        
+        <!-- 定义可以被影响的种族列表 -->
+        <targetRaces>
+          <li>WulaSpecies</li>
+        </targetRaces>
+
+        <!-- 其他参数和原版一样 -->
+        <targetingParameters>
+          <canTargetBuildings>false</canTargetBuildings>
+          <canTargetAnimals>false</canTargetAnimals>
+          <canTargetMechs>false</canTargetMechs>
+          <canTargetSelf>true</canTargetSelf>
+          <onlyTargetColonists>true</onlyTargetColonists>
+        </targetingParameters>
+        <onlyPawnsInSameFaction>true</onlyPawnsInSameFaction>
+        <hideMoteWhenNotDrafted>true</hideMoteWhenNotDrafted>
+      </li>
+    </comps>
+  </HediffDef>
+  <HediffDef>
+    <defName>WULA_Addons_Antenna_Protected_Hediff</defName>
+    <label>低级子节点（斥力场）</label>
+    <defaultLabelColor>(0.52, 1, 0.95)</defaultLabelColor>
+    <hediffClass>WulaFallenEmpire.Hediff_DamageShield</hediffClass>
+    <descriptionHyperlinks>
+      <HediffDef>WULA_Addons_Antenna_Hediff_Shield</HediffDef>
+    </descriptionHyperlinks>
+    <isBad>false</isBad>
+    <description>一个高级节点正在附近指挥这只机械乌拉，为其投射了特殊的能量护盾，可以抵挡一次伤害。</description>
+    <debugLabelExtra>other</debugLabelExtra>
+    <defaultInstallPart>WULA_Addons_Antenna_Bodypart</defaultInstallPart>
+    <initialSeverity>1</initialSeverity>        <!-- 初始层数设置为10 -->
+    <maxSeverity>1</maxSeverity>        <!-- 最大层数，可以根据需要调整 -->
+    <comps>
+      <li Class="HediffCompProperties_Disappears">
+        <showRemainingTime>false</showRemainingTime>
+      </li>
+      <li Class="HediffCompProperties_DisappearsOnDeath"/>
+      <li Class="HediffCompProperties_Link">
+        <requireLinkOnOtherPawn>false</requireLinkOnOtherPawn>
+        <maxDistance>3</maxDistance>
+        <!-- <customMote>Mote_WorkCommandLinkLine</customMote> -->
+      </li>
+    </comps>
+  </HediffDef>
+  <ThingDef ParentName="BodyPartBionicBase">
+    <defName>WULA_Addons_Antenna_Shield</defName>
+    <label>连携斥力场天线</label>
+    <description>机械乌拉的特殊高频率天线，装备了这种天线的机械乌拉可以为旁边的机械乌拉提供斥力护盾以抵消伤害，但是其本体将因为高额能量输出而变得非常脆弱。</description>
+    <tradeability>None</tradeability>
+    <descriptionHyperlinks>
+      <RecipeDef>Install_WULA_Addons_Antenna_Shield</RecipeDef>
+    </descriptionHyperlinks>
+    <costList>
+      <Steel>50</Steel>
+      <ComponentSpacer>1</ComponentSpacer>
+    </costList>
+    <thingSetMakerTags>
+      <li>RewardStandardMidFreq</li>
+    </thingSetMakerTags>
+    <recipeMaker>
+      <researchPrerequisite>WULA_Synth_Addons_2_Technology</researchPrerequisite>
+      <recipeUsers>
+        <li>WULA_Cube_Productor_Energy</li>
+      </recipeUsers>
+    </recipeMaker>
+    <statBases>
+      <Mass>0.3</Mass>
+    </statBases>
+  </ThingDef>
+  <RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">
+    <defName>Install_WULA_Addons_Antenna_Shield</defName>
+    <label>安装连携斥力场天线</label>
+    <description>为合成人安装连携斥力场天线。</description>
+    <descriptionHyperlinks>
+      <ThingDef>WULA_Addons_Antenna_Shield</ThingDef>
+      <HediffDef>WULA_Addons_Antenna_Hediff_Shield</HediffDef>
+    </descriptionHyperlinks>
+    <jobString>安装连携斥力场天线中</jobString>
+    <surgeryOutcomeEffect IsNull="True" />
+    <!-- Always succeeds -->
+    <anesthetize>false</anesthetize>
+    <ingredients Inherit="False">
+      <li>
+        <filter>
+          <thingDefs>
+            <li>WULA_Addons_Antenna_Shield</li>
+          </thingDefs>
+        </filter>
+        <count>1</count>
+      </li>
+    </ingredients>
+    <fixedIngredientFilter>
+      <thingDefs>
+        <li>WULA_Addons_Antenna_Shield</li>
+      </thingDefs>
+    </fixedIngredientFilter>
+    <appliedOnFixedBodyParts>
+      <li>WULA_Addons_Antenna_Bodypart</li>
+    </appliedOnFixedBodyParts>
+    <addsHediff>WULA_Addons_Antenna_Hediff_Shield</addsHediff>
+    <effectWorking>Smith</effectWorking>
+    <soundWorking>Recipe_Smith</soundWorking>
+    <recipeUsers Inherit="False">
+      <li>WulaSpecies</li>
+    </recipeUsers>
+  </RecipeDef>
 
   <!-- 抽魂 -->
   <RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">

1.6/1.6/Defs/HediffDefs/Hediffs_WULA_AuraExample.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-  <HediffDef>
-    <defName>MyWulaAura</defName>
-    <label>乌拉共鸣光环</label>
-    <description>这是一个如何使用HediffComp_GiveHediffsInRangeToRace组件的示例。</description>
-    <hediffClass>HediffWithComps</hediffClass>
-    <comps>
-      <!-- 这里使用我们新创建的C#类的完整名称 -->
-      <li Class="WulaFallenEmpire.HediffCompProperties_GiveHediffsInRangeToRace">
-        <range>10</range>
-        <hediff>PsychicSoothe</hediff> <!-- 举例：要施加的Hediff -->
-        
-        <!-- 定义可以被影响的种族列表 -->
-        <targetRaces>
-          <li>WulaSpecies</li> <!-- 您的乌拉种族 -->
-          <li>Human</li>       <!-- 也可以添加其他种族 -->
-        </targetRaces>
-
-        <!-- 其他参数和原版一样 -->
-        <targetingParameters>
-          <canTargetAllies>true</canTargetAllies>
-        </targetingParameters>
-        <onlyPawnsInSameFaction>true</onlyPawnsInSameFaction>
-      </li>
-    </comps>
-  </HediffDef>
-
-</Defs>

1.6/1.6/Defs/HediffDefs/Hediffs_WULA_DamageShield.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-    <HediffDef>
-        <defName>WULA_DamageShield</defName>
-        <label>反应护盾</label>
-        <description>一种特殊的能量护盾，可以抵挡受到的伤害。每层护盾可以抵挡一次伤害。</description>
-        <hediffClass>WulaFallenEmpire.Hediff_DamageShield</hediffClass>
-        <initialSeverity>10</initialSeverity>        <!-- 初始层数设置为10 -->
-        <maxSeverity>999</maxSeverity>        <!-- 最大层数，可以根据需要调整 -->
-        <defaultLabelColor>(0.6, 0.6, 1.0)</defaultLabelColor>
-        <isBad>false</isBad>
-        <stages>
-            <li>
-                <label>活跃</label>
-                <minSeverity>1</minSeverity>
-                <!-- 这里可以添加一些统计数据偏移，例如增加防御等 -->
-            </li>
-        </stages>
-    </HediffDef>
-</Defs>

1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml

@@ -205,10 +205,6 @@
     <combatPower>600</combatPower>
     <allowInMechClusters>false</allowInMechClusters>
     <defaultFactionType>PlayerColony</defaultFactionType>
-    <abilities>
-      <li>WULA_GiveSwitchHediff</li>   <!-- 添加“停止生产”技能 -->
-      <li>WULA_RemoveSwitchHediff</li> <!-- 保留“恢复生产”技能 -->
-    </abilities>
     <lifeStages>
       <li>
         <bodyGraphicData>
@@ -237,10 +233,6 @@
     <combatPower>600</combatPower>
     <allowInMechClusters>false</allowInMechClusters>
     <defaultFactionType>PlayerColony</defaultFactionType>
-    <abilities>
-      <li>WULA_GiveSwitchHediff</li>   <!-- 添加“停止生产”技能 -->
-      <li>WULA_RemoveSwitchHediff</li> <!-- 保留“恢复生产”技能 -->
-    </abilities>
     <lifeStages>
       <li>
         <bodyGraphicData>

1.6/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml

@@ -376,6 +376,17 @@
       <li>WULA_New_Synth_Skill_2_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
+  <ResearchProjectDef ParentName="WULAtechBase">
+    <defName>WULA_Synth_Antenna_Technology</defName>
+    <researchViewX>5.50</researchViewX>
+    <researchViewY>4.70</researchViewY>
+    <label>蜂群节点套件</label>
+    <description>获取特殊构型的机械乌拉天线，使得这些经过天线改装的乌拉可以胜任指挥任务。</description>
+    <baseCost>1000</baseCost>
+    <prerequisites>
+      <li>WULA_Synth_Addons_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_Synth_Addons_2_Technology</defName>
     <label>高级植入物套件</label>
@@ -388,4 +399,4 @@
       <li>WULA_Dark_Matter_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
-</Defs>
+</Defs>

1.6/1.6/Defs/ThingDefs/ThingDefs_WULA_Items_DamageShield.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-    <ThingDef ParentName="BodyPartProstheticMakeableBase">
+    <!-- <ThingDef ParentName="BodyPartProstheticMakeableBase">
         <defName>WULA_DamageShieldGenerator</defName>
         <label>乌拉反应护盾发生器</label>
         <description>一个便携式设备，可以激活并生成一个临时的能量护盾，抵挡即将到来的伤害。</description>
@@ -28,9 +28,9 @@
             </li>
             <li Class="WulaFallenEmpire.CompProperties_AddDamageShieldCharges">
                 <hediffDef>WULA_DamageShield</hediffDef>
-                <chargesToAdd>100</chargesToAdd> <!-- 每次使用添加 10 层 -->
+                <chargesToAdd>100</chargesToAdd>
             </li>
             <li Class="CompProperties_UseEffectDestroySelf" />
         </comps>
-    </ThingDef>
+    </ThingDef> -->
 </Defs>

1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml

@@ -646,7 +646,7 @@
       <AccuracyShort>0.9</AccuracyShort>
       <AccuracyMedium>0.5</AccuracyMedium>
       <AccuracyLong>0.25</AccuracyLong>
-      <RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+      <RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
     </statBases>
     <costList Inherit="False">
       <Steel>120</Steel>
@@ -661,9 +661,9 @@
         <warmupTime>0.2</warmupTime>
         <range>18</range>
         <burstShotCount>3</burstShotCount>
-        <ticksBetweenBurstShots>12</ticksBetweenBurstShots>
-        <soundCast>Shot_BoltActionRifle</soundCast>
-        <soundCastTail>GunTail_Heavy</soundCastTail>
+        <ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+        <soundCast>Shot_BeamRepeater</soundCast>
+        <soundCastTail>GunTail_Medium</soundCastTail>
         <muzzleFlashScale>7</muzzleFlashScale>
       </li>
     </verbs>

1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml

@@ -1287,6 +1287,13 @@
         这使得拥有此组件的机械体可以被机械师在地图的任何位置进行指挥，无视距离限制。
       -->
       <li Class="WulaFallenEmpire.CompProperties_GlobalMechCommand" />
+      <li Class="CompProperties_CauseHediff_AoE">
+        <hediff>Mech_WULA_Cat_Cute</hediff>
+        <range>5.9</range>
+        <canTargetSelf>false</canTargetSelf>
+        <drawLines>true</drawLines>
+        <ignoreMechs>true</ignoreMechs>
+      </li>
     </comps>
     <!-- <comps Inherit="False">
       <li Class="CompProperties_CanBeDormant" />
@@ -1391,6 +1398,13 @@
         <explosionDamageType>BombSuper</explosionDamageType>
         <explosionDamageAmount>550</explosionDamageAmount>
       </li>
+      <li Class="CompProperties_CauseHediff_AoE">
+        <hediff>Mech_WULA_Cat_Cute</hediff>
+        <range>5.9</range>
+        <canTargetSelf>false</canTargetSelf>
+        <drawLines>true</drawLines>
+        <ignoreMechs>true</ignoreMechs>
+      </li>
     </comps>
   </ThingDef>
 

1.6/Anomaly/Defs/FactionDefs/Factions_WULA_FE_Spiritualist.xml

@@ -91,18 +91,6 @@
         <li>(100000,10000)</li>
       </points>
     </maxPawnCostPerTotalPointsCurve>
-    <pawnGroupMakers>
-      <li>
-        <kindDef>Combat</kindDef>
-        <commonality>50</commonality>
-        <options>
-          <Mech_WULA_Cat_Assault>60</Mech_WULA_Cat_Assault>
-          <Mech_WULA_Cat_Constructor>30</Mech_WULA_Cat_Constructor>
-          <Mech_WULA_Cat_Fire>20</Mech_WULA_Cat_Fire>
-          <Mech_WULA_Cat_EMP>20</Mech_WULA_Cat_EMP>
-        </options>
-      </li>
-    </pawnGroupMakers>
     <settlementTexturePath>World/WorldObjects/DefaultSettlement</settlementTexturePath>
     <allowedArrivalTemperatureRange>-100~200</allowedArrivalTemperatureRange>
     <maxConfigurableAtWorldCreation>1</maxConfigurableAtWorldCreation>

1.6/Odyssey/Defs/ThingDefs_Races/Races_Wula_Odyssey.xml

@@ -451,6 +451,13 @@
         <explosionDamageType>Bomb</explosionDamageType>
         <explosionDamageAmount>40</explosionDamageAmount>
       </li>
+      <li Class="CompProperties_CauseHediff_AoE">
+        <hediff>Mech_WULA_Cat_Cute</hediff>
+        <range>5.9</range>
+        <canTargetSelf>false</canTargetSelf>
+        <drawLines>true</drawLines>
+        <ignoreMechs>true</ignoreMechs>
+      </li>
     </comps>
     <tools Inherit="False">
       <li>
@@ -512,6 +519,13 @@
         <drawWithNoSelection>True</drawWithNoSelection>
         <activeSound>Broadshield_Ambience</activeSound>
       </li>
+      <li Class="CompProperties_CauseHediff_AoE">
+        <hediff>Mech_WULA_Cat_Cute</hediff>
+        <range>5.9</range>
+        <canTargetSelf>false</canTargetSelf>
+        <drawLines>true</drawLines>
+        <ignoreMechs>true</ignoreMechs>
+      </li>
     </comps>
     <tools Inherit="False">
       <li>
@@ -556,6 +570,13 @@
         <tooltipOverride>这是被临时生产的乌拉猫猫，它们很快就会因为能源耗尽而倒地。</tooltipOverride>
         <showGizmoOnNonPlayerControlled>true</showGizmoOnNonPlayerControlled>
       </li>
+      <li Class="CompProperties_CauseHediff_AoE">
+        <hediff>Mech_WULA_Cat_Cute</hediff>
+        <range>5.9</range>
+        <canTargetSelf>false</canTargetSelf>
+        <drawLines>true</drawLines>
+        <ignoreMechs>true</ignoreMechs>
+      </li>
     </comps>
     <tools Inherit="False">
       <li>