声音

2025-11-25 01:09:14 +08:00
parent 557902027d
commit 5cfbdb9f09
29 changed files with 1080 additions and 416 deletions
--- a/1.6/1.6/Assemblies/WulaFallenEmpire.dll
+++ b/1.6/1.6/Assemblies/WulaFallenEmpire.dll
--- a/1.6/1.6/Defs/AbilityDefs/WULA_Flyover_Ability.xml
+++ b/1.6/1.6/Defs/AbilityDefs/WULA_Flyover_Ability.xml
@@ -100,7 +100,7 @@
    <defName>WULA_ClearFlightPath</defName>
    <label>航道净空</label>
    <description>使近地轨道上的舰队离开，以使得其他乌拉帝国舰队可以入场</description>
-    <iconPath>Wula/UI/Abilities/WULA_CallConstructionShip</iconPath>
+    <iconPath>Wula/UI/Abilities/WULA_ClearFlightPath</iconPath>
    <cooldownTicksRange>1</cooldownTicksRange>
    <hotKey>Misc12</hotKey>
    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
@@ -918,8 +918,8 @@
        <bombardmentWidth>35</bombardmentWidth>
        <bombardmentLength>70</bombardmentLength>
        <targetSelectionChance>0.1</targetSelectionChance>
-        <minTargetCells>16</minTargetCells>
-        <maxTargetCells>16</maxTargetCells>
+        <minTargetCells>8</minTargetCells>
+        <maxTargetCells>8</maxTargetCells>
        <warmupTicks>240</warmupTicks>
        <rowDelayTicks>30</rowDelayTicks>
        <impactDelayTicks>2</impactDelayTicks>
--- a/1.6/1.6/Defs/EventDefs/EventDef_Wula/Wula_MainEvent.xml
+++ b/1.6/1.6/Defs/EventDefs/EventDef_Wula/Wula_MainEvent.xml
@@ -52,10 +52,6 @@
        </conditions>
        <hideWhenDisabled>false</hideWhenDisabled>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -77,15 +73,11 @@
          </li>
        </conditions>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
              <li Class="WulaFallenEmpire.Effect_OpenCustomUI">
-                <defName>WULA_GiveQuest_Colony_Promotion_UI_1</defName>
+                <defName>WULA_Colony_Promotion_UI_1</defName>
              </li>
              <li Class="WulaFallenEmpire.Effect_CloseDialog" />
            </effects>
@@ -95,10 +87,6 @@
      <li>
        <label>再见</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -222,10 +210,6 @@
      <li>
        <label>还有其他事情···</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -670,10 +654,6 @@
      <li>
        <label>好的</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
--- a/1.6/1.6/Defs/QuestScriptDefs/WULA_Base_Tex_Quest.xml
+++ b/1.6/1.6/Defs/QuestScriptDefs/WULA_Base_Tex_Quest.xml
@@ -210,10 +210,6 @@
      <li>
        <label>下次一定</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
--- a/1.6/1.6/Defs/QuestScriptDefs/WULA_Colony_Promotion.xml
+++ b/1.6/1.6/Defs/QuestScriptDefs/WULA_Colony_Promotion.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
  <WulaFallenEmpire.EventDef>
-    <defName>WULA_GiveQuest_Colony_Promotion_UI_1</defName>
+    <defName>WULA_Colony_Promotion_UI_1</defName>
    <label>未知通讯</label>
    <portraitPath>Wula/Events/Portraits/WULA_Legion_2</portraitPath>
    <characterName>「军团」,P.I.A</characterName>
@@ -12,17 +12,24 @@
      <li>
        <label>我们准备好了</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
+        <hideWhenDisabled>false</hideWhenDisabled>
+        <disabledReason>我记得我已经送了一个分体去你们殖民地了？在30天内，我不会再派出审查队。</disabledReason>
+        <conditions>
+          <li Class="WulaFallenEmpire.Condition_FlagNotExists">
+            <flagName>WULA_Colony_Promotion_Lock</flagName>
+          </li>
+        </conditions>
        <optionEffects>
          <li>
            <effects>
-              <li Class="WulaFallenEmpire.Effect_CloseDialog" />
+              <li Class="WulaFallenEmpire.Effect_SetTimedFlag">
+                <flagName>WULA_Colony_Promotion_Lock</flagName>
+                <durationTicks>1800000</durationTicks>
+              </li>
              <li Class="WulaFallenEmpire.Effect_AddQuest">
                <quest>WULA_Colony_Promotion</quest>
              </li>
+              <li Class="WulaFallenEmpire.Effect_CloseDialog" />
            </effects>
          </li>
        </optionEffects>
@@ -30,10 +37,6 @@
      <li>
        <label>现在不是太合适···</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -328,9 +331,9 @@
            <parms>
              <allowedThreats>Raids</allowedThreats>
              <onDays>1.0</onDays>
-              <offDays>0.5</offDays>
+              <offDays>1.5</offDays>
              <minSpacingDays>0.04</minSpacingDays>
-              <numIncidentsRange>1~1.5</numIncidentsRange>
+              <numIncidentsRange>1~1</numIncidentsRange>
              <currentThreatPointsFactor>1.1</currentThreatPointsFactor>
              <minThreatPoints>500</minThreatPoints>
            </parms>
@@ -375,7 +378,7 @@
              </li>
              <li Class="QuestNode_End">
                <outcome>Fail</outcome>
-                <goodwillChangeAmount>-5</goodwillChangeAmount>
+                <goodwillChangeAmount>-30</goodwillChangeAmount>
                <goodwillChangeFactionOf>$asker</goodwillChangeFactionOf>
                <goodwillChangeReason>QuestPawnArrested</goodwillChangeReason>
              </li>
@@ -395,7 +398,7 @@
              </li>
              <li Class="QuestNode_End">
                <outcome>Fail</outcome>
-                <goodwillChangeAmount>-5</goodwillChangeAmount>
+                <goodwillChangeAmount>-30</goodwillChangeAmount>
                <goodwillChangeFactionOf>$asker</goodwillChangeFactionOf>
                <goodwillChangeReason>PerformedHarmfulSurgery</goodwillChangeReason>
              </li>
@@ -415,7 +418,7 @@
              </li>
              <li Class="QuestNode_End">
                <outcome>Fail</outcome>
-                <goodwillChangeAmount>-5</goodwillChangeAmount>
+                <goodwillChangeAmount>-30</goodwillChangeAmount>
                <goodwillChangeFactionOf>$asker</goodwillChangeFactionOf>
                <goodwillChangeReason>XenogermAbsorbed</goodwillChangeReason>
              </li>
@@ -435,7 +438,7 @@
              </li>
              <li Class="QuestNode_End">
                <outcome>Fail</outcome>
-                <goodwillChangeAmount>-5</goodwillChangeAmount>
+                <goodwillChangeAmount>-30</goodwillChangeAmount>
                <goodwillChangeFactionOf>$asker</goodwillChangeFactionOf>
                <goodwillChangeReason>QuestPawnLost</goodwillChangeReason>
              </li>
@@ -455,7 +458,7 @@
              </li>
              <li Class="QuestNode_End">
                <outcome>Fail</outcome>
-                <goodwillChangeAmount>-5</goodwillChangeAmount>
+                <goodwillChangeAmount>-30</goodwillChangeAmount>
                <goodwillChangeFactionOf>$asker</goodwillChangeFactionOf>
                <goodwillChangeReason>ShuttleDestroyed</goodwillChangeReason>
              </li>
@@ -475,7 +478,7 @@
              </li>
              <li Class="QuestNode_End">
                <outcome>Fail</outcome>
-                <goodwillChangeAmount>-5</goodwillChangeAmount>
+                <goodwillChangeAmount>-30</goodwillChangeAmount>
                <goodwillChangeFactionOf>$asker</goodwillChangeFactionOf>
                <goodwillChangeReason>QuestPawnLost</goodwillChangeReason>
              </li>
@@ -493,7 +496,7 @@
              </li>
              <li Class="WulaFallenEmpire.QuestNode_EventLetter">
                <inSignal>pickupShipThing.SentSatisfied</inSignal>
-                <eventDefName>WULA_GiveQuest_Colony_Promotion_UI_2</eventDefName>
+                <eventDefName>WULA_Colony_Promotion_UI_2</eventDefName>
              </li>
              <li Class="QuestNode_End">
                <outcome>Success</outcome>
@@ -513,7 +516,7 @@
              </li>
              <li Class="QuestNode_End">
                <outcome>Fail</outcome>
-                <goodwillChangeAmount>-5</goodwillChangeAmount>
+                <goodwillChangeAmount>-30</goodwillChangeAmount>
                <goodwillChangeFactionOf>$asker</goodwillChangeFactionOf>
                <goodwillChangeReason>MemberMissedShuttle</goodwillChangeReason>
              </li>
@@ -544,7 +547,7 @@
    </root>
  </ThingSetMakerDef>
  <WulaFallenEmpire.EventDef>
-    <defName>WULA_GiveQuest_Colony_Promotion_UI_2</defName>
+    <defName>WULA_Colony_Promotion_UI_2</defName>
    <label>未知通讯</label>
    <portraitPath>Wula/Events/Portraits/WULA_Legion_2</portraitPath>
    <characterName>「军团」,P.I.A</characterName>
@@ -576,10 +579,6 @@
      <li>
        <label>帝国荣光永存</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
--- a/1.6/1.6/Defs/QuestScriptDefs/WULA_Intro_NewColony.xml
+++ b/1.6/1.6/Defs/QuestScriptDefs/WULA_Intro_NewColony.xml
@@ -60,10 +60,6 @@
      <li>
        <label>你是谁？</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -78,10 +74,6 @@
      <li>
        <label>我们需要做什么？（发展流程）</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -96,10 +88,6 @@
      <li>
        <label>收到，帝国荣光永存</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -125,10 +113,6 @@
      <li>
        <label>行星封锁机关？</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -143,10 +127,6 @@
      <li>
        <label>机械行会？</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -161,10 +141,6 @@
      <li>
        <label>我们没有相关问题了···</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -190,10 +166,6 @@
      <li>
        <label>我们还有别的问题···</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -208,10 +180,6 @@
      <li>
        <label>我们没有相关问题了···</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -237,10 +205,6 @@
      <li>
        <label>我们还有别的问题···</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -255,10 +219,6 @@
      <li>
        <label>我们没有相关问题了···</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -284,10 +244,6 @@
      <li>
        <label>我们还有别的问题···</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -302,10 +258,6 @@
      <li>
        <label>我们没有相关问题了···</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -331,10 +283,6 @@
      <li>
        <label>你是谁？</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -349,10 +297,6 @@
      <li>
        <label>我们需要做什么？（发展流程）</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -367,10 +311,6 @@
      <li>
        <label>收到，帝国荣光永存</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -396,10 +336,6 @@
      <li>
        <label>（结束通讯）</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
--- a/1.6/1.6/Defs/QuestScriptDefs/WULA_Intro_Spy.xml
+++ b/1.6/1.6/Defs/QuestScriptDefs/WULA_Intro_Spy.xml
@@ -418,10 +418,6 @@
      <li>
        <label>你们是谁？</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -436,10 +432,6 @@
      <li>
        <label>我们能得到什么好处？</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -454,10 +446,6 @@
      <li>
        <label>好的，我们会留意的</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -480,10 +468,6 @@
      <li>
        <label>还有别的事情···</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -509,10 +493,6 @@
      <li>
        <label>还有别的事情···</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -538,10 +518,6 @@
      <li>
        <label>我们好像还不知道你的名字？</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
@@ -595,10 +571,6 @@
      <li>
        <label>好的，奖励我们就收下了</label>
        <useCustomColors>false</useCustomColors>
-        <normalColor>(255,255,255,255)</normalColor>
-        <hoverColor>(157,201,185,195)</hoverColor>
-        <textColor>(255,255,255,255)</textColor>
-        <textHoverColor>(255,255,255,255)</textHoverColor>
        <optionEffects>
          <li>
            <effects>
--- a/1.6/1.6/Defs/SoundDefs/Wula_Sound_Weapons.xml
+++ b/1.6/1.6/Defs/SoundDefs/Wula_Sound_Weapons.xml
@@ -204,6 +204,76 @@
    </subSounds>
  </SoundDef>

+  
+  <SoundDef>
+    <defName>WULA_Firepower_Minigun_Fire_sound</defName>
+    <context>MapOnly</context>
+    <maxSimultaneous>2</maxSimultaneous>
+    <subSounds>
+      <li>
+        <grains>
+          <li Class="AudioGrain_Clip">
+            <clipPath>Wula/WULA_Basttleship_Shootingsound_S</clipPath>
+          </li>
+        </grains>
+        <volumeRange>35</volumeRange>
+        <pitchRange>0.9~1.1</pitchRange>
+        <onCamera>True</onCamera>
+      </li>
+    </subSounds>
+  </SoundDef>
+  <SoundDef>
+    <defName>WULA_Firepower_Cannon_Fire_sound</defName>
+    <context>MapOnly</context>
+    <maxSimultaneous>2</maxSimultaneous>
+    <subSounds>
+      <li>
+        <grains>
+          <li Class="AudioGrain_Clip">
+            <clipPath>Wula/WULA_Basttleship_Shootingsound_M</clipPath>
+          </li>
+        </grains>
+        <volumeRange>45</volumeRange>
+        <pitchRange>0.9~1.1</pitchRange>
+        <onCamera>True</onCamera>
+      </li>
+    </subSounds>
+  </SoundDef>
+  <SoundDef>
+    <defName>WULA_Firepower_Primary_Cannon_Fire_sound</defName>
+    <context>MapOnly</context>
+    <maxSimultaneous>2</maxSimultaneous>
+    <subSounds>
+      <li>
+        <grains>
+          <li Class="AudioGrain_Clip">
+            <clipPath>Wula/WULA_Basttleship_Shootingsound_L</clipPath>
+          </li>
+        </grains>
+        <volumeRange>55</volumeRange>
+        <pitchRange>0.9~1.1</pitchRange>
+        <onCamera>True</onCamera>
+      </li>
+    </subSounds>
+  </SoundDef>
+  <SoundDef>
+    <defName>WULA_MotherShip_Planet_Interdiction_IncomingSound</defName>
+    <context>MapOnly</context>
+    <maxSimultaneous>2</maxSimultaneous>
+    <subSounds>
+      <li>
+        <grains>
+          <li Class="AudioGrain_Clip">
+            <clipPath>Wula/WULA_MotherShip_Planet_Interdiction_IncomingSound</clipPath>
+          </li>
+        </grains>
+        <volumeRange>55</volumeRange>
+        <pitchRange>0.9~1.1</pitchRange>
+        <onCamera>True</onCamera>
+      </li>
+    </subSounds>
+  </SoundDef>
+
  <!-- 单位 -->
  <SoundDef>
    <defName>Pawn_Wula_AI_Heavy_Panzer_Call</defName>  
--- a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml
+++ b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml
@@ -996,7 +996,7 @@
      </li>
      <li Class="CompProperties_Power">
        <compClass>CompPowerTrader</compClass>
-        <basePowerConsumption>400</basePowerConsumption>
+        <basePowerConsumption>100</basePowerConsumption>
      </li>
    </comps>
  </ThingDef>
--- a/1.6/1.6/Defs/ThingDefs_Misc/WULA_Flyover_Item.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/WULA_Flyover_Item.xml
@@ -768,58 +768,8 @@
    <altitudeLayer>MetaOverlays</altitudeLayer>
    <comps>
      <!-- 入场信封信息 -->
-      <li Class="WulaFallenEmpire.CompProperties_SendLetterAfterTicks">
-        <ticksDelay>60</ticksDelay> <!-- 2秒后发送 -->
-        <letterLabel>全域封锁</letterLabel>
-        <letterText>全域封锁舰队已抵达，请自行寻找掩护！</letterText>
-        <letterDef>PositiveEvent</letterDef>
-        <onlySendOnce>true</onlySendOnce>
-        <requireOnMap>true</requireOnMap>
-        <destroyAfterSending>false</destroyAfterSending> <!-- 发送后销毁flyover -->
-      </li>
-      <li Class="WulaFallenEmpire.CompProperties_FlyOverEscort">
-        <escortFlyOverDef>WULA_Striker_Escort</escortFlyOverDef>
-        
-        <!-- 生成配置 -->
-        <spawnIntervalTicks>1000</spawnIntervalTicks> <!-- 5秒 -->
-        <maxEscorts>30</maxEscorts>
-        <spawnCount>2</spawnCount>
-        
-        <!-- 位置配置 -->
-        <spawnDistance>0</spawnDistance>
-        <lateralOffset>100</lateralOffset>
-        <verticalOffset>5</verticalOffset>
-        <useRandomOffset>true</useRandomOffset>
-        <minSafeDistanceBetweenEscorts>10</minSafeDistanceBetweenEscorts> <!-- 伴飞物之间的距离 -->
-        <minSafeDistanceFromMain>70</minSafeDistanceFromMain> <!-- 与主飞行物的距离检查 -->
-        
-        <!-- 飞行配置 -->
-        <escortSpeedMultiplier>50</escortSpeedMultiplier> <!-- 比主舰稍快 -->
-        <escortAltitudeOffset>10</escortAltitudeOffset> <!-- 比主舰稍高 -->
-        <mirrorMovement>false</mirrorMovement>
-        
-        <!-- 行为配置 -->
-        <spawnOnStart>true</spawnOnStart>
-        <destroyWithParent>false</destroyWithParent>
-        <continuousSpawning>true</continuousSpawning>
-        
-        <!-- 外观配置 -->
-        <useParentRotation>true</useParentRotation>
-      
-        <!-- 缩放区间配置 -->
-        <escortScaleRange>
-          <min>0.3</min>
-          <max>0.6</max>
-        </escortScaleRange>
-        
-        <!-- 高度遮罩配置 -->
-        <useHeightMask>true</useHeightMask>
-        <heightMaskAlphaRange>
-          <min>0.6</min>
-          <max>0.8</max>
-        </heightMaskAlphaRange>
-        <heightMaskColor>(0.7,0.85,1.0,1.0)</heightMaskColor>
-        <heightMaskScaleMultiplier>1.3</heightMaskScaleMultiplier>
+      <li Class="WulaFallenEmpire.CompProperties_PlaySoundOnSpawn">
+        <sound>WULA_MotherShip_Planet_Interdiction_IncomingSound</sound>
      </li>
      <li Class="WulaFallenEmpire.CompProperties_FlyOverEscort">
        <escortFlyOverDef>WULA_BattleShip_Planet_Interdiction</escortFlyOverDef>
@@ -831,7 +781,7 @@
        
        <!-- 位置配置 -->
        <spawnDistance>0</spawnDistance>
-        <lateralOffset>80</lateralOffset>
+        <lateralOffset>70</lateralOffset>
        <verticalOffset>5</verticalOffset>
        <useRandomOffset>true</useRandomOffset>
        <minSafeDistanceBetweenEscorts>30</minSafeDistanceBetweenEscorts> <!-- 伴飞物之间的距离 -->
@@ -865,6 +815,17 @@
        <heightMaskColor>(0.7,0.85,1.0,1.0)</heightMaskColor>
        <heightMaskScaleMultiplier>1.3</heightMaskScaleMultiplier>
      </li>
+      <li Class="WulaFallenEmpire.CompProperties_ShipArtillery">
+        <ticksBetweenAttacks>300</ticksBetweenAttacks>
+        <attackDurationTicks>300</attackDurationTicks>
+        <attackRadius>65</attackRadius>
+        <skyfallerDef>WULA_Firepower_Cannon_Salvo_Skyfaller</skyfallerDef>
+        <shellsPerVolley>12</shellsPerVolley>
+        
+        <!-- 新增派系甄别配置 -->
+        <useFactionDiscrimination>true</useFactionDiscrimination>
+        <useMicroTracking>true</useMicroTracking>
+      </li>
    </comps>
  </ThingDef> 
  <ThingDef ParentName="EtherealThingBase">
@@ -912,6 +873,50 @@
    <alwaysHaulable>false</alwaysHaulable>
    <altitudeLayer>MetaOverlays</altitudeLayer>
    <comps>
+      <li Class="WulaFallenEmpire.CompProperties_FlyOverEscort">
+        <escortFlyOverDef>WULA_Striker_Escort</escortFlyOverDef>
+        
+        <!-- 生成配置 -->
+        <spawnIntervalTicks>1000</spawnIntervalTicks> <!-- 5秒 -->
+        <maxEscorts>30</maxEscorts>
+        <spawnCount>2</spawnCount>
+        
+        <!-- 位置配置 -->
+        <spawnDistance>0</spawnDistance>
+        <lateralOffset>100</lateralOffset>
+        <verticalOffset>5</verticalOffset>
+        <useRandomOffset>true</useRandomOffset>
+        <minSafeDistanceBetweenEscorts>10</minSafeDistanceBetweenEscorts> <!-- 伴飞物之间的距离 -->
+        <minSafeDistanceFromMain>70</minSafeDistanceFromMain> <!-- 与主飞行物的距离检查 -->
+        
+        <!-- 飞行配置 -->
+        <escortSpeedMultiplier>10</escortSpeedMultiplier> <!-- 比主舰稍快 -->
+        <escortAltitudeOffset>10</escortAltitudeOffset> <!-- 比主舰稍高 -->
+        <mirrorMovement>false</mirrorMovement>
+        
+        <!-- 行为配置 -->
+        <spawnOnStart>true</spawnOnStart>
+        <destroyWithParent>false</destroyWithParent>
+        <continuousSpawning>true</continuousSpawning>
+        
+        <!-- 外观配置 -->
+        <useParentRotation>true</useParentRotation>
+      
+        <!-- 缩放区间配置 -->
+        <escortScaleRange>
+          <min>0.3</min>
+          <max>0.6</max>
+        </escortScaleRange>
+        
+        <!-- 高度遮罩配置 -->
+        <useHeightMask>true</useHeightMask>
+        <heightMaskAlphaRange>
+          <min>0.6</min>
+          <max>0.8</max>
+        </heightMaskAlphaRange>
+        <heightMaskColor>(0.7,0.85,1.0,1.0)</heightMaskColor>
+        <heightMaskScaleMultiplier>1.3</heightMaskScaleMultiplier>
+      </li>
      <li Class="WulaFallenEmpire.CompProperties_ShipArtillery">
        <ticksBetweenAttacks>300</ticksBetweenAttacks>
        <attackDurationTicks>300</attackDurationTicks>
@@ -1455,20 +1460,25 @@
      <cameraShake>1</cameraShake>
      <rotationCurve>
        <points>
-          <li>(0,180)</li>
-          <li>(1, 181)</li>
+          <li>(0,150)</li>
+          <li>(1, 151)</li>
        </points>
      </rotationCurve>
      <angleCurve>
        <points>
-          <li>(0,0)</li>
-          <li>(1, 1)</li>
+          <li>(0,-30)</li>
+          <li>(1, -31)</li>
        </points>
      </angleCurve>
      <explosionRadius>4</explosionRadius>
      <explosionDamage>WULA_Firepower_Minigun_Strafe_Damage</explosionDamage>
      <explosionDamageFactor>1</explosionDamageFactor>
    </skyfaller>
+    <comps>
+      <li Class="WulaFallenEmpire.CompProperties_PlaySoundOnSpawn">
+        <sound>WULA_Firepower_Minigun_Fire_sound</sound>
+      </li>
+    </comps>
  </ThingDef>
  <ThingDef ParentName="SkyfallerBase">
    <defName>WULA_Firepower_Cannon_Salvo_Skyfaller</defName>
@@ -1493,20 +1503,25 @@
      <cameraShake>1</cameraShake>
      <rotationCurve>
        <points>
-          <li>(0,180)</li>
-          <li>(1, 181)</li>
+          <li>(0,150)</li>
+          <li>(1, 151)</li>
        </points>
      </rotationCurve>
      <angleCurve>
        <points>
-          <li>(0,0)</li>
-          <li>(1, 1)</li>
+          <li>(0,-30)</li>
+          <li>(1, -31)</li>
        </points>
      </angleCurve>
      <explosionRadius>6</explosionRadius>
-      <explosionDamage>Bomb</explosionDamage>
-      <explosionDamageFactor>0.85</explosionDamageFactor>
+      <explosionDamage>WULA_GiantBomb</explosionDamage>
+      <explosionDamageFactor>0.28</explosionDamageFactor>
    </skyfaller>
+    <comps>
+      <li Class="WulaFallenEmpire.CompProperties_PlaySoundOnSpawn">
+        <sound>WULA_Firepower_Cannon_Fire_sound</sound>
+      </li>
+    </comps>
  </ThingDef>
  <ThingDef ParentName="SkyfallerBase">
    <defName>WULA_Firepower_Cannon_Surveillance_Skyfaller</defName>
@@ -1898,14 +1913,14 @@
      <cameraShake>1</cameraShake>
      <rotationCurve>
        <points>
-          <li>(0,180)</li>
-          <li>(1, 181)</li>
+          <li>(0,150)</li>
+          <li>(1, 151)</li>
        </points>
      </rotationCurve>
      <angleCurve>
        <points>
-          <li>(0,0)</li>
-          <li>(1, 1)</li>
+          <li>(0,-30)</li>
+          <li>(1, -31)</li>
        </points>
      </angleCurve>
      <explosionRadius>35</explosionRadius>
@@ -1913,6 +1928,11 @@
      <explosionDamageFactor>1</explosionDamageFactor>
      <spawnThing>CraterLarge</spawnThing>
    </skyfaller>
+    <comps>
+      <li Class="WulaFallenEmpire.CompProperties_PlaySoundOnSpawn">
+        <sound>WULA_Firepower_Primary_Cannon_Fire_sound</sound>
+      </li>
+    </comps>
  </ThingDef>
  <ThingDef ParentName="MoteBase">
    <defName>WULA_DarkMatterBomb_FlashStrong</defName>
@@ -2048,19 +2068,24 @@
      <cameraShake>1</cameraShake>
      <rotationCurve>
        <points>
-          <li>(0,180)</li>
-          <li>(1, 181)</li>
+          <li>(0,150)</li>
+          <li>(1, 151)</li>
        </points>
      </rotationCurve>
      <angleCurve>
        <points>
-          <li>(0,0)</li>
-          <li>(1, 1)</li>
+          <li>(0,-30)</li>
+          <li>(1, -31)</li>
        </points>
      </angleCurve>
      <explosionRadius>35</explosionRadius>
      <explosionDamage>EMP</explosionDamage>
      <explosionDamageFactor>10</explosionDamageFactor>
    </skyfaller>
+    <comps>
+      <li Class="WulaFallenEmpire.CompProperties_PlaySoundOnSpawn">
+        <sound>WULA_Firepower_Primary_Cannon_Fire_sound</sound>
+      </li>
+    </comps>
  </ThingDef>
 </Defs>
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml
@@ -396,6 +396,8 @@
      <graphicClass>Graphic_Single</graphicClass>
      <shaderType>CutoutComplex</shaderType>
    </graphicData>
+    <destroyOnDrop>true</destroyOnDrop>
+    <tradeability>None</tradeability>
    <equippedAngleOffset>-65</equippedAngleOffset>
    <techLevel>Spacer</techLevel>
    <smeltable>false</smeltable>
@@ -500,8 +502,8 @@
        <defaultProjectile>Bullet_WULA_RW_Base_AR</defaultProjectile>
        <warmupTime>1</warmupTime>
        <range>25</range>
-        <burstShotCount>3</burstShotCount>
-        <ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+        <burstShotCount>5</burstShotCount>
+        <ticksBetweenBurstShots>5</ticksBetweenBurstShots>
        <soundCast>Shot_AssaultRifle</soundCast>
        <soundCastTail>GunTail_Medium</soundCastTail>
        <muzzleFlashScale>7</muzzleFlashScale>
@@ -513,7 +515,6 @@
    </costList>
    <weaponTags Inherit="False">
      <li>Wula_Ranged_Weapon_T1</li>
-      <li>Wula_Assault_Cat_Weapon</li>
    </weaponTags>
    <comps>
      <li Class="CompProperties_EquippableAbilityReloadable">
@@ -522,6 +523,59 @@
      </li>
    </comps>
  </ThingDef>
+  <!-- 给猫猫的特殊武器，扔在地上会消失、没有人格核心、没有闪光弹 -->
+  <ThingDef ParentName="BaseHumanMakeableGun">
+    <destroyOnDrop>true</destroyOnDrop>
+    <defName>WULA_RW_Base_AR_For_Cat</defName>
+    <label>DLa-1"页岩"</label>
+    <description>乌拉帝国的基础突击步枪，仍然使用可靠的导气式结构驱动自动射击构件，是一种便宜但好用的武器，通常派发给殖民地作自卫武器之用。</description>
+    <tickerType>Normal</tickerType>
+    <techLevel>Spacer</techLevel>
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_RW_Base_AR</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <soundInteract>Interact_Rifle</soundInteract>
+    <tradeability>None</tradeability>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_WeaponArmor_Productor</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Synth_Weapon_1_Base_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+    </recipeMaker>
+    <statBases>
+      <WorkToMake>1300</WorkToMake>
+      <!-- <MarketValue>370</MarketValue> -->
+      <Mass>3.5</Mass>
+      <AccuracyTouch>0.75</AccuracyTouch>
+      <AccuracyShort>0.75</AccuracyShort>
+      <AccuracyMedium>0.65</AccuracyMedium>
+      <AccuracyLong>0.45</AccuracyLong>
+      <RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+    </statBases>
+    <verbs>
+      <li>
+        <verbClass>Verb_Shoot</verbClass>
+        <hasStandardCommand>true</hasStandardCommand>
+        <defaultProjectile>Bullet_WULA_RW_Base_AR</defaultProjectile>
+        <warmupTime>1</warmupTime>
+        <range>25</range>
+        <burstShotCount>5</burstShotCount>
+        <ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+        <soundCast>Shot_AssaultRifle</soundCast>
+        <soundCastTail>GunTail_Medium</soundCastTail>
+        <muzzleFlashScale>7</muzzleFlashScale>
+      </li>
+    </verbs>
+    <costList Inherit="False">
+      <WULA_Alloy>40</WULA_Alloy>
+      <ComponentIndustrial>2</ComponentIndustrial>
+    </costList>
+    <weaponTags Inherit="False">
+      <li>Wula_Assault_Cat_Weapon</li>
+    </weaponTags>
+  </ThingDef>
  <ThingDef ParentName="BaseBullet">
    <defName>Bullet_WULA_RW_Base_AR</defName>
    <label>子弹</label>
@@ -2195,7 +2249,7 @@
    <defName>WULA_MW_Cheat_Weapon_Ability</defName>
    <label>放逐之门</label>
    <description>使得目标立刻被放逐——无视一切保护措施，将其从存档中永远擦除。</description>
-    <iconPath>Wula/UI/Abilities/WULA_RW_Auto_GL_Smoke_Ability</iconPath>
+    <iconPath>Wula/UI/Commands/Wula_Psi_Titan_AreaDamage</iconPath>
    <writeCombatLog>True</writeCombatLog>
    <showPsycastEffects>False</showPsycastEffects>
    <hotKey>Misc11</hotKey>
--- a/(简体中文)/Keyed/Misc_Gameplay.xml
+++ b/(简体中文)/Keyed/Misc_Gameplay.xml
@@ -301,4 +301,9 @@
  <ToggleAreaDamageDesc>启用或禁用区域伤害效果</ToggleAreaDamageDesc>
  <AreaDamageEnabled>区域伤害：已启用</AreaDamageEnabled>
  <AreaDamageDisabled>区域伤害：已禁用</AreaDamageDisabled>
+
+  <WULA_SwitchWeapon>更换武器</WULA_SwitchWeapon>
+  <WULA_SwitchWeapon_Desc>扔掉当前武器，并装备该单位的初始武器</WULA_SwitchWeapon_Desc>
+  <WULA_WeaponSwitched>{0} 更换了武器为 {1}</WULA_WeaponSwitched>
+  <WULA_NoWeaponAvailable>{0} 没有可用的武器类型</WULA_NoWeaponAvailable>
 </LanguageData>