2025-8-20

1.6/1.6/Defs/ThingDefs/WULA_Item.xml

@@ -124,6 +124,7 @@
     <soundDrop>Metal_Drop</soundDrop>
     <useHitPoints>false</useHitPoints>
     <healthAffectsPrice>false</healthAffectsPrice>
+    <stackLimit>500</stackLimit>
     <statBases>
       <MarketValue>0.75</MarketValue>
       <Mass>0.01</Mass>

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

@@ -888,7 +888,7 @@
       <li>
         <verbClass>Verb_Shoot</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>Bullet_WULA_RW_MG_Beam</defaultProjectile>
+        <defaultProjectile>Bullet_WULA_RW_Sphene_MG</defaultProjectile>
         <warmupTime>0.5</warmupTime>
         <range>33.9</range>
         <burstShotCount>32</burstShotCount>
@@ -902,20 +902,19 @@
       <li>RewardStandardQualitySuper</li>
     </thingSetMakerTags>
   </ThingDef>
-
   <ThingDef ParentName="BaseBullet">
-    <defName>Bullet_WULA_RW_MG_Beam</defName>
+    <defName>Bullet_WULA_RW_Sphene_MG</defName>
-    <label>光束</label>
+    <label>榍石光束</label>
     <thingClass>Beam</thingClass>
     <graphicData>
       <texPath>Things/Projectile/ChargeLanceShot</texPath>
       <graphicClass>Graphic_Single</graphicClass>
     </graphicData>
     <projectile>
-      <damageDef>BeamBypassShields</damageDef>
+      <damageDef>Beam</damageDef><!-- BeamBypassShields -->
       <damageAmountBase>5</damageAmountBase>
       <beamStartOffset>0.5</beamStartOffset>
-      <armorPenetrationBase>0.5</armorPenetrationBase>
+      <armorPenetrationBase>1.5</armorPenetrationBase>
       <stoppingPower>1</stoppingPower>
       <beamMoteDef>Mote_WULA_RW_Penetrating_Beam</beamMoteDef>
     </projectile>
@@ -1693,7 +1692,7 @@
   <ThingDef ParentName="BaseGun">
     <defName>WULA_WM_Panzer_Turret</defName>
     <label>ATt-6"金红石"</label>
-    <description>由乌拉帝国的"萨克森"战车所装备的战车炮塔，可以从极远距离上精准地点杀高价值目标。</description>
+    <description>由乌拉帝国的"萨克森"战车所装备的战车炮塔，可以从极远距离上精准地点杀高价值目标，并穿透路径上的所有敌人。</description>
     <techLevel>Ultra</techLevel>
     <relicChance>0</relicChance>
     <graphicData>
@@ -1739,7 +1738,14 @@
   <ThingDef ParentName="BaseBullet">
     <defName>Bullet_WULA_WM_Panzer_Turret</defName>
     <label>金红石穿甲弹</label>
-    <thingClass>Projectile_Explosive</thingClass>
+    <thingClass>WulaFallenEmpire.Projectile_WulaLineAttack</thingClass>
+    <modExtensions>
+      <li Class="WulaFallenEmpire.Wula_PathPierce_Extension">
+        <maxHits>-1</maxHits>        <!-- 无限穿透 -->
+        <damageFalloff>0</damageFalloff>        <!-- 无伤害衰减 -->
+        <preventFriendlyFire>false</preventFriendlyFire>        <!-- 是否阻止友方火力 -->
+      </li>
+    </modExtensions>
     <tickerType>Normal</tickerType>
     <neverMultiSelect>True</neverMultiSelect>
     <graphicData>
@@ -1752,10 +1758,9 @@
       <damageDef>Bullet</damageDef>
       <damageAmountBase>385</damageAmountBase>
       <speed>220</speed>
-      <explosionRadius>3.5</explosionRadius>
+      <armorPenetrationBase>1.5</armorPenetrationBase>
-      <arcHeightFactor>0.4</arcHeightFactor>
+      <stoppingPower>5</stoppingPower>
       <soundExplode>Explosion_Rocket</soundExplode>
-      <armorPenetrationBase>1</armorPenetrationBase>
     </projectile>
   </ThingDef>
   <ThingDef Name="WULA_WM_Panzer_Autocannon" ParentName="BaseGun">

1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon_Penetrating.xml

@@ -262,31 +262,6 @@
     </projectile>
   </ThingDef>
 
-  <ThingDef ParentName="MoteBase">
-    <defName>Mote_WULA_RW_Penetrating_Beam</defName>
-    <thingClass>MoteDualAttached</thingClass>
-    <altitudeLayer>MoteOverhead</altitudeLayer>
-    <mote>
-      <fadeInTime>0.1</fadeInTime>
-      <fadeOutTime>0.1</fadeOutTime>
-      <solidTime>0.1</solidTime>
-      <rotateTowardsTarget>True</rotateTowardsTarget>
-      <scaleToConnectTargets>True</scaleToConnectTargets>
-    </mote>
-    <drawOffscreen>true</drawOffscreen>
-    <graphicData>
-      <texPath>Things/Projectile/ChargeLanceShot</texPath>
-      <graphicClass>Graphic_MoteWithAgeSecs</graphicClass>
-      <shaderType>MoteBeam</shaderType>
-      <shaderParameters>
-        <_ScrollSpeedA>0</_ScrollSpeedA>
-        <_ScrollSpeedB>0</_ScrollSpeedB>
-        <_Intensity>2</_Intensity>
-      </shaderParameters>
-    </graphicData>
-  </ThingDef>
-
-
   <AbilityDef>
     <defName>WULA_RW_Penetrating_Beam_RifleSwitchAbility</defName>
     <label>武装解放 / 武装闭锁</label>
@@ -324,5 +299,4 @@
 			</li>-->
     </comps>
   </AbilityDef>
-
 </Defs>

1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml

@@ -892,7 +892,7 @@
   <ThingDef Name="Wula_AI_Heavy_Panzer" ParentName="HeavyMechanoid">
 		<defName>Wula_AI_Heavy_Panzer</defName>
 		<label>SMp-38"萨克森"</label>
-		<description>乌拉帝国所使用的中型突击战车，以逆重的方式悬浮于战场上，搭载了一门在远距离上可以发挥高威力的穿甲主炮，并且拥有足以保护一支突击小队的护盾。</description>
+		<description>乌拉帝国所使用的中型突击战车，以逆重的方式悬浮于战场上，搭载了一门在远距离上可以穿透路径上的敌人的穿甲主炮，并且拥有足以保护一支突击小队的护盾。</description>
     <uiIconPath>Wula/Things/Wula_AI_Heavy_Panzer/Wula_AI_Heavy_Panzer_Icon</uiIconPath>
     <statBases>
       <BandwidthCost>3</BandwidthCost>

1.6/1.6/Defs/ThingDefs_Races/WULA_Race_Mech_Warqueen_Example.xml

@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-
-  <!-- 这是一个使用我们新系统的战争女皇示例 -->
-  <!-- 它被设置为自动生产，且生产不消耗资源 -->
-  
   <ThingDef ParentName="SuperHeavyMechanoid">
-    <defName>WULA_Alpha_Wolf</defName> <!-- 修改了defName以避免冲突 -->
+    <defName>WULA_Superme_Commander</defName> <!-- 修改了defName以避免冲突 -->
-    <label>SNm-6"头狼"</label>
+    <label>HNm-99"至高"</label>
     <description>乌拉帝国中型机械体</description>
     <statBases>
-      <MoveSpeed>4.6</MoveSpeed>
+      <MoveSpeed>3</MoveSpeed>
       <MeleeDoorDamageFactor>1.5</MeleeDoorDamageFactor>
     </statBases>
     <race>
@@ -40,6 +36,99 @@
       </li>
     </tools>
     <comps>
+      <!-- 这里是我们修改的核心部分 -->
+      <li Class="WulaFallenEmpire.CompProperties_AutoMechCarrier">
+        <freeProduction>false</freeProduction> <!-- 改为消耗资源以测试独立成本 -->
+        <disableHediff>WULA_MechCarrierSwitchHediff</disableHediff>
+        <fixedIngredient>Steel</fixedIngredient>
+        <maxIngredientCount>500</maxIngredientCount> <!-- 定义最大资源容量 -->
+        <startingIngredientCount>500</startingIngredientCount> <!-- 定义初始资源数量 -->
+        <costPerPawn>999</costPerPawn> <!-- 设置一个很高的全局默认成本，以确保独立成本生效 -->
+        <cooldownTicks>9999</cooldownTicks> <!-- 设置一个很高的全局默认冷却，以确保独立冷却生效 -->
+        <productionQueue>
+          <li>
+            <pawnKind>WULA_Alpha_Wolf</pawnKind>
+            <count>2</count>
+            <cooldownTicks>600</cooldownTicks> <!-- 独立冷却: 10秒 -->
+            <cost>10</cost> <!-- 独立成本: 10 钢铁 -->
+          </li>
+          <!-- <li>
+            <pawnKind>Mech_Lancer</pawnKind>
+            <count>1</count>
+            <cooldownTicks>1200</cooldownTicks>
+            <cost>25</cost>
+          </li> -->
+        </productionQueue>
+        <spawnEffecter>WarqueenWarUrchinsSpawned</spawnEffecter>
+        <spawnedMechEffecter>WarUrchinSpawned</spawnedMechEffecter>
+      </li>
+    </comps>
+  </ThingDef>
+  <PawnKindDef ParentName="HeavyMechanoidKind">
+    <defName>WULA_Superme_Commander</defName> <!-- 修改了defName以避免冲突 -->
+    <label>HNm-99"至高"</label>
+    <race>WULA_Superme_Commander</race>
+    <combatPower>600</combatPower>
+    <allowInMechClusters>false</allowInMechClusters>
+    <defaultFactionType>PlayerColony</defaultFactionType>
+    <abilities>
+      <li>WULA_GiveSwitchHediff</li>   <!-- 添加“停止生产”技能 -->
+      <li>WULA_RemoveSwitchHediff</li> <!-- 保留“恢复生产”技能 -->
+    </abilities>
+    <lifeStages>
+      <li>
+        <bodyGraphicData>
+          <texPath>Things/Pawn/Mechanoid/Warqueen</texPath>
+          <maskPath>Things/Pawn/Mechanoid/AllegianceOverlays/MechWarqueen</maskPath>
+          <shaderType>CutoutWithOverlay</shaderType>
+          <graphicClass>Graphic_Multi</graphicClass>
+          <drawSize>3</drawSize>
+          <shadowData>
+            <volume>(0.7, 0.8, 0.7)</volume>
+          </shadowData>
+        </bodyGraphicData>
+      </li>
+    </lifeStages>
+    <controlGroupPortraitZoom>0.7</controlGroupPortraitZoom>  
+  </PawnKindDef>
+
+  <ThingDef ParentName="HeavyMechanoid">
+    <defName>WULA_Alpha_Wolf</defName> <!-- 修改了defName以避免冲突 -->
+    <label>SNm-6"头狼"</label>
+    <description>乌拉帝国中型机械体</description>
+    <statBases>
+      <BandwidthCost>0</BandwidthCost>
+      <MoveSpeed>4.6</MoveSpeed>
+      <MeleeDoorDamageFactor>1.5</MeleeDoorDamageFactor>
+    </statBases>
+    <race>
+      <body>Mech_Warqueen</body>
+      <baseBodySize>5</baseBodySize>
+      <lifeStageAges>
+        <li>
+          <def>MechanoidFullyFormed</def>
+          <minAge>0</minAge>
+          <soundWounded>Pawn_Mech_Warqueen_Wounded</soundWounded>
+          <soundDeath>Pawn_Mech_Warqueen_Death</soundDeath>
+          <soundCall>Pawn_Mech_Warqueen_Call</soundCall>
+        </li>
+      </lifeStageAges>
+      <baseHealthScale>5.2</baseHealthScale>
+    </race>
+    <tools>
+      <li>
+        <label>head</label>
+        <capacities>
+          <li>Blunt</li>
+        </capacities>
+        <power>4</power>
+        <cooldownTime>2</cooldownTime>
+        <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+        <chanceFactor>0.2</chanceFactor>
+      </li>
+    </tools>
+    <comps Inherit="False">
       <!-- 这里是我们修改的核心部分 -->
       <li Class="WulaFallenEmpire.CompProperties_AutoMechCarrier">
         <freeProduction>true</freeProduction> <!-- 改为消耗资源以测试独立成本 -->
@@ -52,26 +141,31 @@
         <productionQueue>
           <li>
             <pawnKind>Mech_WarUrchin</pawnKind>
-            <count>2</count>
+            <count>5</count>
             <cooldownTicks>600</cooldownTicks> <!-- 独立冷却: 10秒 -->
             <cost>10</cost> <!-- 独立成本: 10 钢铁 -->
           </li>
-          <li>
+          <!-- <li>
             <pawnKind>Mech_Lancer</pawnKind>
             <count>1</count>
-            <cooldownTicks>1200</cooldownTicks> <!-- 独立冷却: 20秒 -->
+            <cooldownTicks>1200</cooldownTicks>
-            <cost>25</cost> <!-- 独立成本: 25 钢铁 -->
+            <cost>25</cost>
-          </li>
+          </li> -->
         </productionQueue>
         <spawnEffecter>WarqueenWarUrchinsSpawned</spawnEffecter>
         <spawnedMechEffecter>WarUrchinSpawned</spawnedMechEffecter>
       </li>
+      <li Class="CompProperties_CanBeDormant" />
+      <li Class="CompProperties_WakeUpDormant">
+        <wakeUpOnDamage>true</wakeUpOnDamage>
+        <wakeUpCheckRadius>30</wakeUpCheckRadius>
+        <wakeUpSound>MechanoidsWakeUp</wakeUpSound>
+      </li>
+      <!-- <li Class="CompProperties_MechPowerCell">
+        <totalPowerTicks>15000</totalPowerTicks>
+      </li> -->
     </comps>
-    <killedLeavingsPlayerHostile>
-      <PowerfocusChip>1</PowerfocusChip>
-    </killedLeavingsPlayerHostile>
   </ThingDef>
-
   <PawnKindDef ParentName="HeavyMechanoidKind">
     <defName>WULA_Alpha_Wolf</defName> <!-- 修改了defName以避免冲突 -->
     <label>SNm-6"头狼"</label>
@@ -126,7 +220,6 @@
       </li>
     </comps>
   </AbilityDef>
-
   <!-- 新增的“施加Hediff”技能定义 -->
   <AbilityDef>
     <defName>WULA_GiveSwitchHediff</defName>
@@ -155,5 +248,4 @@
       </li>
     </comps>
   </AbilityDef>
-
 </Defs>

1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml

@@ -4,14 +4,14 @@
   <WulaFallenEmpire.EventDef>
     <defName>Wula_UI_FE_Spiritualist_1</defName>
     <label>乌拉帝国 大教堂</label>
-    <portraitPath>Wula/Events/Portraits/WULA_FE_Spiritualist_1</portraitPath>
+    <portraitPath>Wula/Events/Portraits/WULA_FE_Spiritualist_3</portraitPath>
     <characterName>帝国修女</characterName>
     <descriptions>
-      <li><![CDATA[这里是乌拉帝国教会，请问有何贵干？
+      <li><![CDATA[这里是乌拉帝国教会，很不高兴听你们废话。请问有何贵干？
       <color=#ff8c00><b>当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}</b></color>]]></li>
-      <li><![CDATA[你们是来聆听布道的，还是来谈生意的？
+      <li><![CDATA[好，好，你们是来聆听布道的，还是来谈生意的？
       <color=#ff8c00><b>当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}</b></color>]]></li>
-      <li><![CDATA[以主之名，我们当为边缘世界的愚昧众生带去教化。
+      <li><![CDATA[以主之名，我们当为边缘世界的愚昧众生带去教化——但是在那之前，这个蛮荒之地还有很多很多血要流。
       <color=#ff8c00><b>当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}</b></color>]]></li>
     </descriptions>
     <immediateEffects>
@@ -223,7 +223,83 @@
     </options>
   </WulaFallenEmpire.EventDef>
 
-
+  <!-- 普通好感初始事件 -->
+  <WulaFallenEmpire.EventDef>
+    <defName>Wula_UI_FE_Spiritualist_10</defName>
+    <label>乌拉帝国 大教堂</label>
+    <portraitPath>Wula/Events/Portraits/WULA_FE_Spiritualist_1</portraitPath>
+    <characterName>帝国修女</characterName>
+    <descriptions>
+      <li>我们是乌拉帝国国教教会，在帝国皇室没落以前，我们曾是每任皇帝的左膀右臂，负责维护</li>
+      <li><![CDATA[好，好，你们是来聆听布道的，还是来谈生意的？
+      <color=#ff8c00><b>当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}</b></color>]]></li>
+      <li><![CDATA[以主之名，我们当为边缘世界的愚昧众生带去教化——但是在那之前，这个蛮荒之地还有很多很多血要流。
+      <color=#ff8c00><b>当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}</b></color>]]></li>
+    </descriptions>
+    <immediateEffects>
+      <li>
+        <effects>
+          <li Class="WulaFallenEmpire.Effect_ClearVariable">
+            <name>Wula_FE_Spiritualist_Goodwill</name>
+          </li>
+          <li Class="WulaFallenEmpire.Effect_CheckFactionGoodwill">
+            <factionDef>Wula_FE_Spiritualist_Faction</factionDef>
+            <variableName>Wula_FE_Spiritualist_Goodwill</variableName>
+          </li>
+          <li Class="WulaFallenEmpire.Effect_SetVariable">
+            <name>WULA_FE_Spiritualist_Influence</name>
+            <value>0</value>
+            <type>Int</type>
+          </li>
+        </effects>
+      </li>
+    </immediateEffects>
+    <options>
+      <li>
+        <label>你们是谁？</label>
+        <optionEffects>
+          <li>
+            <effects>
+              <li Class="WulaFallenEmpire.Effect_CloseDialog" />
+            </effects>
+          </li>
+        </optionEffects>
+      </li>
+      <li>
+        <label>你们有什么任务可以给我们吗？</label>
+        <optionEffects>
+          <li>
+            <effects>
+              <!-- <li Class="WulaFallenEmpire.Effect_AddQuest">
+                <quest>Wula_FE_Quest_Attack_Mercenary</quest>
+              </li> -->
+              <li Class="WulaFallenEmpire.Effect_CloseDialog" />
+            </effects>
+          </li>
+        </optionEffects>
+      </li>
+      <li>
+        <label>我们有一个请求</label>
+        <optionEffects>
+          <li>
+            <effects>
+              <li Class="WulaFallenEmpire.Effect_CloseDialog" />
+            </effects>
+          </li>
+        </optionEffects>
+      </li>
+      <li>
+        <label>换个接线员</label>
+        <optionEffects>
+          <li>
+            <effects>
+              <li Class="WulaFallenEmpire.Effect_CloseDialog" />
+            </effects>
+          </li>
+        </optionEffects>
+      </li>
+    </options>
+  </WulaFallenEmpire.EventDef>
 
   <WulaFallenEmpire.EventDef>
     <defName>Wula_UI_FE_Spiritualist_10</defName>
@@ -299,4 +375,4 @@
       </li>
     </options>
   </WulaFallenEmpire.EventDef>
-</Defs>
+</Defs>

1.6/Anomaly/Defs/PsychicRitualDefs/WULA_FE_Spiritualist_Rituals.xml

@@ -351,10 +351,10 @@
     <requiredOffering>
       <filter>
         <thingDefs>
-          <li>WULA_Soul_Wedge</li>
+          <li>Wula_Zro</li>
         </thingDefs>
       </filter>
-      <count>500</count>
+      <count>300</count>
     </requiredOffering>
     <chanterRole>ChanterAdvanced</chanterRole>
     <iconPath>UI/PsychicRituals/PsychicRitual_ImbueDeathRefusal</iconPath>
@@ -373,10 +373,10 @@
     <requiredOffering>
       <filter>
         <thingDefs>
-          <li>WULA_Soul_Wedge</li>
+          <li>Wula_Zro</li>
         </thingDefs>
       </filter>
-      <count>500</count>
+      <count>300</count>
     </requiredOffering>
     <chanterRole>ChanterAdvanced</chanterRole>
     <iconPath>UI/PsychicRituals/PsychicRitual_ImbueDeathRefusal</iconPath>
@@ -395,10 +395,10 @@
     <requiredOffering>
       <filter>
         <thingDefs>
-          <li>WULA_Soul_Wedge</li>
+          <li>Wula_Zro</li>
         </thingDefs>
       </filter>
-      <count>500</count>
+      <count>300</count>
     </requiredOffering>
     <chanterRole>ChanterAdvanced</chanterRole>
     <iconPath>UI/PsychicRituals/PsychicRitual_ImbueDeathRefusal</iconPath>
@@ -417,10 +417,10 @@
     <requiredOffering>
       <filter>
         <thingDefs>
-          <li>WULA_Soul_Wedge</li>
+          <li>Wula_Zro</li>
         </thingDefs>
       </filter>
-      <count>500</count>
+      <count>300</count>
     </requiredOffering>
     <chanterRole>ChanterAdvanced</chanterRole>
     <iconPath>UI/PsychicRituals/PsychicRitual_ImbueDeathRefusal</iconPath>

1.6/Anomaly/Defs/ThingDefs/WULA_FE_Spiritualist_Item.xml

@@ -15,6 +15,7 @@
       <graphicClass>Graphic_Single</graphicClass>
       <drawSize>0.75</drawSize>
     </graphicData>
+    <stackLimit>300</stackLimit>
     <rotatable>false</rotatable>
     <statBases>
       <WorkToMake>350</WorkToMake>

1.6/Odyssey/Defs/ThingDefs_Misc/Weapons/WULA_Weapon_Odyssey.xml

@@ -14,7 +14,7 @@
       <drawSize>2</drawSize>
     </graphicData>
     <tradeability>None</tradeability>
-    <uiIconScale>1.4</uiIconScale>
+    <uiIconScale>1.2</uiIconScale>
     <statBases>
       <WorkToMake>20000</WorkToMake>
       <Mass>150</Mass>
@@ -82,7 +82,7 @@
       <drawSize>2</drawSize>
     </graphicData>
     <tradeability>None</tradeability>
-    <uiIconScale>1.4</uiIconScale>
+    <uiIconScale>1.2</uiIconScale>
     <statBases>
       <WorkToMake>20000</WorkToMake>
       <Mass>150</Mass>