diff --git a/1.6/Defs/FleshTypeDefs/FleshType_WULA.xml b/1.6/Defs/FleshTypeDefs/FleshType_WULA.xml
index 80a0d4a3..84015b93 100644
--- a/1.6/Defs/FleshTypeDefs/FleshType_WULA.xml
+++ b/1.6/Defs/FleshTypeDefs/FleshType_WULA.xml
@@ -94,4 +94,98 @@
       </li>
     </hediffWounds> -->
   </FleshTypeDef>
+
+  <FleshTypeDef>
+    <defName>WULA_War_machine_Fleshtype</defName>
+    <corpseCategory>CorpsesMechanoid</corpseCategory>
+    <damageEffecter>Damage_HitMechanoid</damageEffecter>
+    <isOrganic>false</isOrganic>
+    <genericWounds>
+      <li>
+        <texture>Things/Pawn/Wounds/WoundMechA</texture>
+      </li>
+      <li>
+        <texture>Things/Pawn/Wounds/WoundMechB</texture>
+      </li>
+      <li>
+        <texture>Things/Pawn/Wounds/WoundMechC</texture>
+      </li>
+    </genericWounds>
+    <bandagedWounds>
+      <li>
+        <texture>Wula/Things/WulaSpecies/Wounds/WULA_Species_Wound_None</texture>
+      </li>
+      <!-- <li>
+        <texture>Things/Pawn/Wounds/BandagedB</texture>
+      </li>
+      <li>
+        <texture>Things/Pawn/Wounds/BandagedC</texture>
+      </li> -->
+    </bandagedWounds>
+    <!-- <hediffWounds>
+      <li MayRequire="Ludeon.RimWorld.Ideology">
+        <hediff>Scarification</hediff>
+        <wounds>
+          <li>
+            <texture>Things/Pawn/Wounds/ScarificationA</texture>
+            <tintWithSkinColor>true</tintWithSkinColor>
+            <displayOverApparel>false</displayOverApparel>
+            <displayPermanent>false</displayPermanent>
+            <drawOffsetSouth>(0, 0.001, -0.24)</drawOffsetSouth>
+            <drawOffsetEastWest>(-0.03, 0.001, -0.24)</drawOffsetEastWest>
+          </li>
+          <li>
+            <texture>Things/Pawn/Wounds/ScarificationB</texture>
+            <tintWithSkinColor>true</tintWithSkinColor>
+            <displayOverApparel>false</displayOverApparel>
+            <displayPermanent>false</displayPermanent>
+            <drawOffsetSouth>(0, 0.001, -0.24)</drawOffsetSouth>
+            <drawOffsetEastWest>(-0.03, 0.001, -0.24)</drawOffsetEastWest>
+          </li>
+          <li>
+            <texture>Things/Pawn/Wounds/ScarificationC</texture>
+            <tintWithSkinColor>true</tintWithSkinColor>
+            <displayOverApparel>false</displayOverApparel>
+            <displayPermanent>false</displayPermanent>
+            <drawOffsetSouth>(0, 0.001, -0.24)</drawOffsetSouth>
+            <drawOffsetEastWest>(-0.03, 0.001, -0.24)</drawOffsetEastWest>
+          </li>
+        </wounds>
+      </li>
+      <li>
+        <hediff>MissingBodyPart</hediff>
+        <wounds>
+          <li>
+            <textureSouth>Things/Pawn/Wounds/MissingEye_Scar_south</textureSouth>
+            <textureNorth>Things/Pawn/Wounds/MissingEye_Scar_south</textureNorth>
+            <textureEast>Things/Pawn/Wounds/MissingEye_Scar_east</textureEast>
+            <textureWest>Things/Pawn/Wounds/MissingEye_Scar_east</textureWest>
+            <flipWest>true</flipWest>
+            <onlyOnPart>Eye</onlyOnPart>
+            <flipOnWoundAnchorTag>LeftEye</flipOnWoundAnchorTag>
+            <flipOnRotation>South</flipOnRotation>
+            <tintWithSkinColor>true</tintWithSkinColor>
+            <missingBodyPartFresh>false</missingBodyPartFresh>
+            <scale>0.7</scale>
+            <drawOffsetSouth>(0, -0.001, -0.24)</drawOffsetSouth>
+            <drawOffsetEastWest>(0, -0.001, -0.24)</drawOffsetEastWest>
+          </li>
+          <li>
+            <textureSouth>Things/Pawn/Wounds/MissingEye_Fresh</textureSouth>
+            <textureNorth>Things/Pawn/Wounds/MissingEye_Fresh</textureNorth>
+            <textureEast>Things/Pawn/Wounds/MissingEye_Fresh</textureEast>
+            <textureWest>Things/Pawn/Wounds/MissingEye_Fresh</textureWest>
+            <flipWest>true</flipWest>
+            <onlyOnPart>Eye</onlyOnPart>
+            <flipOnWoundAnchorTag>LeftEye</flipOnWoundAnchorTag>
+            <flipOnRotation>South</flipOnRotation>
+            <missingBodyPartFresh>true</missingBodyPartFresh>
+            <scale>0.7</scale>
+            <drawOffsetSouth>(0, -0.001, -0.24)</drawOffsetSouth>
+            <drawOffsetEastWest>(0, -0.001, -0.24)</drawOffsetEastWest>
+          </li>
+        </wounds>
+      </li>
+    </hediffWounds> -->
+  </FleshTypeDef>
 </Defs>
diff --git a/1.6/Defs/PawnKinds/PawnKinds_Wula.xml b/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
index dc1cf809..4e0e68d0 100644
--- a/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
+++ b/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
@@ -88,14 +88,13 @@
     </backstoryFiltersOverride>
   </PawnKindDef>
   
-  <PawnKindDef>
+  <PawnKindDef ParentName="HeavyMechanoidKind">
     <defName>Wula_AI_Heavy_Panzer_PawnKind</defName>
     <label>SMp-38"萨克森"</label>
     <race>Wula_AI_Heavy_Panzer</race>
     <defaultFactionType>PlayerColony</defaultFactionType>
-    <allowInMechClusters>False</allowInMechClusters>
-    <initialWillRange>9999</initialWillRange>
-    <initialResistanceRange>9999</initialResistanceRange>
+    <allowInMechClusters>false</allowInMechClusters>
+    <combatPower>500</combatPower>
     <lifeStages>
       <li>
         <bodyGraphicData>
@@ -103,63 +102,43 @@
           <maskPath>Wula/Things/WULA_Cat/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>1.1</drawSize>
+          <drawSize>5</drawSize>
         </bodyGraphicData>
       </li>
     </lifeStages>
-    <minGenerationAge MayRequire="Ludeon.RimWorld.Biotech">200</minGenerationAge>
-    <combatPower>600</combatPower>
+    <weaponMoney>99999~99999</weaponMoney>
     
     <weaponTags>
-      <li>WULA_AI_Heavy_Panzer_Init_Weapon</li>
+      <li>WULA_AI_Heavy_Panzer_AT_Weapon</li>
     </weaponTags>
-    <weaponMoney>99999~99999</weaponMoney>
 
-    <backstoryFiltersOverride>
-      <li>
-        <categories>
-          <li>WULA_AI_War_Machine_Backstory_Categories</li>
-          <li>WULA_AI_Heavy_Panzer_Backstory_Categories</li>
-        </categories>
-      </li>
-    </backstoryFiltersOverride>
+    <controlGroupPortraitZoom>1</controlGroupPortraitZoom>  
   </PawnKindDef>
-  
-  <PawnKindDef>
-    <defName>Wula_Armour_PawnKind</defName>
-    <label>SMp-11"甲胄"</label>
-    <race>Wula_Armour</race>
+  <PawnKindDef ParentName="HeavyMechanoidKind">
+    <defName>Wula_AI_Heavy_Panzer_Gunnery_PawnKind</defName>
+    <label>SMp-38A"斯佩萨特"</label>
+    <race>Wula_AI_Heavy_Panzer_Gunnery</race>
     <defaultFactionType>PlayerColony</defaultFactionType>
-    <initialWillRange>9999</initialWillRange>
-    <initialResistanceRange>9999</initialResistanceRange>
+    <allowInMechClusters>false</allowInMechClusters>
+    <combatPower>500</combatPower>
     <lifeStages>
       <li>
         <bodyGraphicData>
-          <texPath>Wula/Things/Wula_Armour/Bodies/Naked_Thin</texPath>
+          <texPath>Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin</texPath>
           <maskPath>Wula/Things/WULA_Cat/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>1.1</drawSize>
+          <drawSize>5</drawSize>
         </bodyGraphicData>
       </li>
     </lifeStages>
-    <minGenerationAge MayRequire="Ludeon.RimWorld.Biotech">200</minGenerationAge>
-    <combatPower>600</combatPower>
-    <allowInMechClusters>False</allowInMechClusters>
+    <weaponMoney>99999~99999</weaponMoney>
     
     <weaponTags>
-      <li>WULA_Armour_Init_Weapon</li>
+      <li>WULA_AI_Heavy_Panzer_Gunner_Weapon</li>
     </weaponTags>
-    <weaponMoney>99999~99999</weaponMoney>
 
-    <backstoryFiltersOverride>
-      <li>
-        <categories>
-          <li>WULA_AI_War_Machine_Backstory_Categories</li>
-          <li>WULA_Armour_Backstory_Categories</li>
-        </categories>
-      </li>
-    </backstoryFiltersOverride>
+    <controlGroupPortraitZoom>1</controlGroupPortraitZoom>  
   </PawnKindDef>
     
   <PawnKindDef ParentName="NonCombatLightMechanoidKind">
diff --git a/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml b/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
index 79a6ce97..b464b150 100644
--- a/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
+++ b/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
@@ -239,7 +239,7 @@
       <li>WULA_Machine_Productor_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
-  <ResearchProjectDef ParentName="WULAtechBase">
+  <!-- <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_Machine_Equipment_Technology</defName>
     <label>机械体武装构装套件</label>
     <description>获取构建乌拉帝国高级机械体武装的知识，以为机械体换装不同的武备。</description>
@@ -249,7 +249,7 @@
     <prerequisites>
       <li>WULA_Machine_Productor_Technology</li>
     </prerequisites>
-  </ResearchProjectDef>
+  </ResearchProjectDef> -->
   <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_AI_Machine_Panzer_Technology</defName>
     <label>基础战车部署套件</label>
@@ -258,11 +258,10 @@
     <researchViewX>4.00</researchViewX>
     <researchViewY>4.60</researchViewY>
     <prerequisites>
-      <li>WULA_Machine_Equipment_Technology</li>
       <li>WULA_Machine_Productor_1_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
-  <ResearchProjectDef ParentName="WULAtechBase">
+  <!-- <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_Armour_Technology</defName>
     <label>基础战甲套件</label>
     <description>获取构建乌拉帝国大型战甲SMp-11"甲胄"的知识，并得以生产它所装备的各种大型近战武器和远程武器。</description>
@@ -273,7 +272,7 @@
       <li>WULA_Machine_Equipment_Technology</li>
       <li>WULA_Machine_Productor_1_Technology</li>
     </prerequisites>
-  </ResearchProjectDef>
+  </ResearchProjectDef> -->
   <!-- 植入物 -->
   <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_Synth_Addons_Technology</defName>
@@ -286,7 +285,7 @@
       <li>WULA_Repair_All_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
-  <ResearchProjectDef ParentName="WULAtechBase">
+  <!-- <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_Synth_Addons_2_Technology</defName>
     <label>高级植入物套件</label>
     <description>获取构建乌拉帝国合成人进阶植入物的技术，用以增强乌拉帝国合成人的机体性能。</description>
@@ -296,5 +295,5 @@
     <prerequisites>
       <li>WULA_Synth_Addons_Technology</li>
     </prerequisites>
-  </ResearchProjectDef>
+  </ResearchProjectDef> -->
 </Defs>
\ No newline at end of file
diff --git a/1.6/Defs/ThingDefs_Buildings/Buildings_WULA.xml b/1.6/Defs/ThingDefs_Buildings/Buildings_WULA.xml
index 193c6069..9c28645d 100644
--- a/1.6/Defs/ThingDefs_Buildings/Buildings_WULA.xml
+++ b/1.6/Defs/ThingDefs_Buildings/Buildings_WULA.xml
@@ -400,7 +400,7 @@
     </comps>
   </ThingDef>
   <!-- 武装生产器 -->
-  <ThingDef ParentName="BenchBase">
+  <!-- <ThingDef ParentName="BenchBase">
     <defName>WULA_War_Machine_Weapon_Productor</defName>
     <label>乌拉帝国智械武装组装台</label>
     <description>一台专门用于构建乌拉帝国各种高阶机械体所用武器和装甲的特殊工作台。</description>
@@ -417,6 +417,7 @@
         <cornerBR>Damage/Corner</cornerBR>
       </damageData>
     </graphicData>
+    <size>(2,2)</size>
     <castEdgeShadows>true</castEdgeShadows>
     <fillPercent>0.5</fillPercent>
     <constructEffect>ConstructMetal</constructEffect>
@@ -434,7 +435,6 @@
       <Flammability>1.0</Flammability>
       <WorkTableWorkSpeedFactor>0.5</WorkTableWorkSpeedFactor>
     </statBases>
-    <size>(2,2)</size>
     <designationCategory>Production</designationCategory>
     <uiOrder>2120</uiOrder>
     <passability>PassThroughOnly</passability>
@@ -460,7 +460,7 @@
     <building>
       <spawnedConceptLearnOpportunity>BillsTab</spawnedConceptLearnOpportunity>
     </building>
-  </ThingDef>
+  </ThingDef> -->
 
   <!-- 充电器 -->
   <ThingDef ParentName="BaseMechCharger">
@@ -532,4 +532,81 @@
       </li>
     </comps>
   </ThingDef>
+
+  <!-- 联络台 -->
+  <!-- <ThingDef ParentName="BuildingBase">
+    <defName>WULA_Communicator_Station</defName>
+    <label>乌拉帝国通讯基站</label>
+    <description>乌拉帝国内部用于联系的通讯基站。</description>
+    <thingClass>Building</thingClass>
+    <minifiedDef>MinifiedThing</minifiedDef>	
+	  <tickerType>Normal</tickerType>
+    <thingCategories>
+      <li>BuildingsProduction</li>
+    </thingCategories>
+    <costStuffCount>150</costStuffCount>
+    <costList>
+      <Plasteel>500</Plasteel>
+    </costList>
+    <graphicData>
+      <texPath>Wula/Building/WULA_War_Machine_Weapon_Productor</texPath>
+      <graphicClass>Graphic_Multi</graphicClass>
+      <drawSize>(2,2)</drawSize>
+      <damageData>
+        <cornerTL>Damage/Corner</cornerTL>
+        <cornerTR>Damage/Corner</cornerTR>
+        <cornerBL>Damage/Corner</cornerBL>
+        <cornerBR>Damage/Corner</cornerBR>
+      </damageData>
+    </graphicData>
+    <size>(2,2)</size>
+    <hasInteractionCell>True</hasInteractionCell>
+    <interactionCellOffset>(0,0,-1)</interactionCellOffset>
+    <castEdgeShadows>true</castEdgeShadows>
+    <staticSunShadowHeight>0.20</staticSunShadowHeight>
+    <altitudeLayer>BuildingOnTop</altitudeLayer>
+		<passability>PassThroughOnly</passability>
+		<fillPercent>0.15</fillPercent>
+    <pathCost>50</pathCost>
+    <statBases>
+      <MaxHitPoints>1600</MaxHitPoints>
+      <WorkToBuild>5000</WorkToBuild>
+      <Flammability>1.0</Flammability>
+      <Mass>10</Mass>
+      <ResearchSpeedFactor>1.0</ResearchSpeedFactor>
+    </statBases>
+    <comps Inherit="False">
+      <li Class="CompProperties_Forbiddable"/>
+      <li Class="CompProperties_Usable">
+        <useJob>TriggerObject</useJob>
+        <useLabel>操作通讯台</useLabel>
+        <useDuration>1</useDuration>
+        <ignoreOtherReservations>true</ignoreOtherReservations>
+      </li>
+      <li Class="CompProperties_UseEffect">
+        <compClass>WulaFallenEmpire.Communicator_EventWindow</compClass>
+      </li>
+      <li>
+        <compClass>SRA.CompCommunicator</compClass>
+      </li>
+    </comps>
+    <interactionCellOffset>(0,0,-1)</interactionCellOffset>
+    <terrainAffordanceNeeded IsNull="True" />
+    <hasInteractionCell>true</hasInteractionCell>
+    <designationCategory>Production</designationCategory>
+    <uiOrder>2610</uiOrder>
+    <surfaceType>Item</surfaceType>
+    <designationHotKey>Misc4</designationHotKey>
+    <constructionSkillPrerequisite>6</constructionSkillPrerequisite>
+    <placeWorkers>
+      <li>PlaceWorker_ShowFacilitiesConnections</li>
+      <li>PlaceWorker_PreventInteractionSpotOverlap</li>
+      <li>PlaceWorker_DrawLinesToBookcasesInRoom</li>
+    </placeWorkers>
+    <building>
+      <isEdifice>false</isEdifice>
+      <paintable>true</paintable>
+    </building>
+    <clearBuildingArea>false</clearBuildingArea>
+  </ThingDef> -->
 </Defs>
\ No newline at end of file
diff --git a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
index a0b629db..ce0a2fd1 100644
--- a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
+++ b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
@@ -201,141 +201,6 @@
       <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
     </recipeMaker>
   </ThingDef>
-  <!-- 长枪 -->
-  <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
-    <defName>WULA_MW_Lance</defName>
-    <label>CMl-28"骑枪"</label>
-    <description>乌拉帝国骑士所喜爱的重型近战武器，采用高强度纳米碳纤维复合材料内芯，外层覆盖着带有散热格栅和能量导流槽的记忆合金装甲板，在进行穿刺时能短暂激活反推引擎增加攻击力。</description>
-    <weaponTags>
-      <li>Spear</li>
-    </weaponTags>
-    <graphicData>
-      <texPath>Wula/Weapon/WULA_MW_Lance</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <shaderType>CutoutComplex</shaderType>
-      <drawSize>2</drawSize>
-    </graphicData>
-    <!-- <equippedAngleOffset>-65</equippedAngleOffset> -->
-    <techLevel>Spacer</techLevel>
-    <equippedAngleOffset>-25</equippedAngleOffset>
-    <costStuffCount>120</costStuffCount>
-    <stuffCategories>
-      <li>Metallic</li>
-    </stuffCategories>
-    <costList Inherit="False">
-      <Plasteel>10</Plasteel>
-      <ComponentIndustrial>6</ComponentIndustrial>
-    </costList>
-    <statBases>
-      <WorkToMake>20000</WorkToMake>
-      <Mass>10</Mass>
-    </statBases>
-    <tools>
-      <li>
-        <label>横扫</label>
-        <capacities>
-          <li>Blunt</li>
-          <li>Poke</li>
-        </capacities>
-        <power>42</power>
-        <cooldownTime>1.6</cooldownTime>
-        <surpriseAttack>
-          <extraMeleeDamages>
-            <li>
-              <def>Stun</def>
-              <amount>14</amount>
-            </li>
-          </extraMeleeDamages>
-        </surpriseAttack>
-      </li>
-      <li>
-        <label>穿刺</label>
-        <capacities>
-          <li>Stab</li>
-        </capacities>
-        <power>65</power>
-        <armorPenetration>0.80</armorPenetration>
-        <cooldownTime>2.6</cooldownTime>
-      </li>
-    </tools>
-    <recipeMaker>
-      <recipeUsers Inherit="False">
-        <li>WULA_Cube_Productor_Energy</li>
-      </recipeUsers>
-      <researchPrerequisite>WULA_Synth_Weapon_2_Melee_Technology</researchPrerequisite>
-      <skillRequirements>
-        <Crafting>7</Crafting>
-      </skillRequirements>
-      <displayPriority>450</displayPriority>
-      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-    </recipeMaker>
-  </ThingDef>
-  <!-- 链锯剑 -->
-  <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
-    <defName>WULA_MW_ChainSword</defName>
-    <label>CMs-1"链锯剑"</label>
-    <description>这种嗡嗡作响的乌拉帝国链锯类武器有多条环绕剑脊高速旋转的多层复合锯齿链条，之间嵌有能量传导节点或微型冷却剂喷口，是力量与纯粹疯狂的象征。</description>
-    <graphicData>
-      <texPath>Wula/Weapon/WULA_MW_ChainSword</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <shaderType>CutoutComplex</shaderType>
-    </graphicData>
-    <!-- <equippedAngleOffset>-65</equippedAngleOffset> -->
-    <techLevel>Spacer</techLevel>
-    <costStuffCount>60</costStuffCount>
-    <stuffCategories>
-      <li>Metallic</li>
-    </stuffCategories>
-    <costList Inherit="False">
-      <Plasteel>5</Plasteel>
-      <ComponentIndustrial>3</ComponentIndustrial>
-    </costList>
-    <statBases>
-      <WorkToMake>20000</WorkToMake>
-      <Mass>2.5</Mass>
-    </statBases>
-    <tools>
-      <li>
-        <label>链锯</label>
-        <capacities>
-          <li>Cut</li>
-        </capacities>
-        <armorPenetration>0.5</armorPenetration>
-        <power>18</power> <!-- 2.5x natural fist -->
-        <cooldownTime>1</cooldownTime>
-        <soundMeleeHit>Pawn_Melee_PowerClaw_Hit</soundMeleeHit>
-        <soundMeleeMiss>Pawn_Melee_PowerClaw_Miss</soundMeleeMiss>
-      </li>
-      <li>
-        <label>柄击</label>
-        <capacities>
-          <li>Blunt</li>
-          <li>Poke</li>
-        </capacities>
-        <power>14</power>
-        <cooldownTime>0.75</cooldownTime>
-        <surpriseAttack>
-          <extraMeleeDamages>
-            <li>
-              <def>Stun</def>
-              <amount>5</amount>
-            </li>
-          </extraMeleeDamages>
-        </surpriseAttack>
-      </li>
-    </tools>
-    <recipeMaker>
-      <recipeUsers Inherit="False">
-        <li>WULA_Cube_Productor_Energy</li>
-      </recipeUsers>
-      <researchPrerequisite>WULA_Synth_Weapon_2_Melee_Technology</researchPrerequisite>
-      <skillRequirements>
-        <Crafting>7</Crafting>
-      </skillRequirements>
-      <displayPriority>450</displayPriority>
-      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-    </recipeMaker>
-  </ThingDef>
   <!-- 动力钉头锤 -->
   <ThingDef ParentName="BaseMeleeWeapon_Blunt_Quality">
     <defName>WULA_MW_Charge_Mace</defName>
@@ -377,6 +242,78 @@
         </extraMeleeDamages>
       </li>
     </tools>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_Cube_Productor_Energy</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Synth_Weapon_2_Stun_Technology</researchPrerequisite>
+      <skillRequirements>
+        <Crafting>7</Crafting>
+      </skillRequirements>
+      <displayPriority>450</displayPriority>
+      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+    </recipeMaker>
+  </ThingDef>
+  <!-- 长枪 -->
+  <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
+    <defName>WULA_MW_Lance</defName>
+    <label>CMl-28"铳枪"</label>
+    <description>乌拉帝国骑士所喜爱的枪炮合一的重型近战武器，采用高强度纳米碳纤维复合材料内芯，外层覆盖着带有散热格栅和能量导流槽的记忆合金装甲板，既可以在近战中刺穿对手，也可以从远距离上发射高精度射弹打击敌军。</description>
+    <weaponTags>
+      <li>Spear</li>
+    </weaponTags>
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_MW_Lance</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>CutoutComplex</shaderType>
+      <drawSize>2</drawSize>
+    </graphicData>
+    <techLevel>Spacer</techLevel>
+    <costStuffCount>120</costStuffCount>
+    <stuffCategories>
+      <li>Metallic</li>
+    </stuffCategories>
+    <costList Inherit="False">
+      <Plasteel>10</Plasteel>
+      <ComponentIndustrial>6</ComponentIndustrial>
+    </costList>
+    <statBases>
+      <WorkToMake>20000</WorkToMake>
+      <Mass>10</Mass>
+      <AccuracyTouch>0.5</AccuracyTouch>
+      <AccuracyShort>0.5</AccuracyShort>
+      <AccuracyMedium>0.4</AccuracyMedium>
+      <AccuracyLong>0.3</AccuracyLong>
+      <RangedWeapon_Cooldown>0</RangedWeapon_Cooldown>
+    </statBases>
+    <tools>
+      <li>
+        <label>横扫</label>
+        <capacities>
+          <li>Blunt</li>
+          <li>Poke</li>
+        </capacities>
+        <power>42</power>
+        <cooldownTime>1.6</cooldownTime>
+        <surpriseAttack>
+          <extraMeleeDamages>
+            <li>
+              <def>Stun</def>
+              <amount>14</amount>
+            </li>
+          </extraMeleeDamages>
+        </surpriseAttack>
+      </li>
+      <li>
+        <label>穿刺</label>
+        <capacities>
+          <li>Stab</li>
+        </capacities>
+        <power>65</power>
+        <armorPenetration>0.80</armorPenetration>
+        <cooldownTime>2.6</cooldownTime>
+      </li>
+    </tools>
     <recipeMaker>
       <recipeUsers Inherit="False">
         <li>WULA_Cube_Productor_Energy</li>
@@ -388,6 +325,167 @@
       <displayPriority>450</displayPriority>
       <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
     </recipeMaker>
+    <verbs>
+      <li>
+        <verbClass>Verb_Shoot</verbClass>
+        <hasStandardCommand>true</hasStandardCommand>
+        <defaultProjectile>Bullet_WULA_MW_Lance</defaultProjectile>
+        <warmupTime>2.25</warmupTime>
+        <minRange>3</minRange>
+        <forcedMissRadius>0.1</forcedMissRadius>
+        <range>38</range>
+        <burstShotCount>1</burstShotCount>
+        <soundCast>Shot_TurretSniper</soundCast>
+        <soundCastTail>GunTail_Heavy</soundCastTail>
+        <muzzleFlashScale>6</muzzleFlashScale>
+      </li>
+    </verbs>
+  </ThingDef>
+  <ThingDef ParentName="BaseBullet">
+    <defName>Bullet_WULA_MW_Lance</defName>
+    <label>铳枪穿甲弹</label>
+    <thingClass>Projectile_Explosive</thingClass>
+    <tickerType>Normal</tickerType>
+    <neverMultiSelect>True</neverMultiSelect>
+    <graphicData>
+      <texPath>Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>TransparentPostLight</shaderType>
+      <drawSize>3.4</drawSize>
+    </graphicData>
+    <projectile>
+      <damageDef>Bullet</damageDef>
+      <damageAmountBase>120</damageAmountBase>
+      <speed>180</speed>
+      <explosionRadius>1.6</explosionRadius>
+      <arcHeightFactor>0.4</arcHeightFactor>
+      <soundExplode>Explosion_Rocket</soundExplode>
+      <armorPenetrationBase>0.7</armorPenetrationBase>
+    </projectile>
+  </ThingDef>
+  <!-- 链锯剑 -->
+  <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
+    <defName>WULA_MW_ChainSword</defName>
+    <label>CMs-1"链锯剑"</label>
+    <description>这种嗡嗡作响的乌拉帝国链锯类武器有多条环绕剑脊高速旋转的多层复合锯齿链条，之间嵌有能量传导节点或微型冷却剂喷口，是力量与纯粹疯狂的象征。</description>
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_MW_ChainSword</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>CutoutComplex</shaderType>
+    </graphicData>
+    <!-- <equippedAngleOffset>-65</equippedAngleOffset> -->
+    <techLevel>Spacer</techLevel>
+    <costStuffCount>60</costStuffCount>
+    <stuffCategories>
+      <li>Metallic</li>
+    </stuffCategories>
+    <costList Inherit="False">
+      <Plasteel>5</Plasteel>
+      <ComponentIndustrial>3</ComponentIndustrial>
+    </costList>
+    <statBases>
+      <WorkToMake>20000</WorkToMake>
+      <Mass>2.5</Mass>
+    </statBases>
+    <tools>
+      <li>
+        <label>链锯</label>
+        <capacities>
+          <li>Cut</li>
+        </capacities>
+        <armorPenetration>0.5</armorPenetration>
+        <power>18</power> <!-- 2.5x natural fist -->
+        <cooldownTime>1.4</cooldownTime>
+        <soundMeleeHit>Pawn_Melee_PowerClaw_Hit</soundMeleeHit>
+        <soundMeleeMiss>Pawn_Melee_PowerClaw_Miss</soundMeleeMiss>
+      </li>
+      <li>
+        <label>柄击</label>
+        <capacities>
+          <li>Blunt</li>
+          <li>Poke</li>
+        </capacities>
+        <power>14</power>
+        <cooldownTime>1.75</cooldownTime>
+        <surpriseAttack>
+          <extraMeleeDamages>
+            <li>
+              <def>Stun</def>
+              <amount>5</amount>
+            </li>
+          </extraMeleeDamages>
+        </surpriseAttack>
+      </li>
+    </tools>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_Cube_Productor_Energy</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Synth_Weapon_2_Melee_Technology</researchPrerequisite>
+      <skillRequirements>
+        <Crafting>7</Crafting>
+      </skillRequirements>
+      <displayPriority>450</displayPriority>
+      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+    </recipeMaker>
+  </ThingDef>
+  <!-- 双头刀 -->
+  <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
+    <defName>WULA_MW_Glaive</defName>
+    <label>CMl-99"剑冢"</label>
+    <description>乌拉帝国修女惯用的大型双头刀，装备了悬浮轴承、能量刃、惯性控制场和精密的传感器系统，让使用者能像舞蹈般挥舞两端的致命锋刃。</description>
+    <weaponTags>
+      <li>Spear</li>
+    </weaponTags>
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_MW_Glaive</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>CutoutComplex</shaderType>
+      <drawSize>1.2</drawSize>
+    </graphicData>
+    <!-- <uiIconScale>0.4</uiIconScale> -->
+    <!-- <equippedAngleOffset>-65</equippedAngleOffset> -->
+    <techLevel>Spacer</techLevel>
+    <!-- <equippedAngleOffset>-25</equippedAngleOffset> -->
+    <costStuffCount>200</costStuffCount>
+    <stuffCategories>
+      <li>Metallic</li>
+    </stuffCategories>
+    <costList Inherit="False">
+      <Plasteel>10</Plasteel>
+      <ComponentIndustrial>6</ComponentIndustrial>
+    </costList>
+    <statBases>
+      <WorkToMake>30000</WorkToMake>
+      <Mass>100</Mass>
+    </statBases>
+    <tools>
+      <li>
+        <label>横扫</label>
+        <capacities>
+          <li>Cut</li>
+        </capacities>
+        <power>32</power>
+        <cooldownTime>1.7</cooldownTime>
+        <armorPenetration>0.50</armorPenetration>
+      </li>
+      <li>
+        <label>穿刺</label>
+        <capacities>
+          <li>Stab</li>
+        </capacities>
+        <power>40</power>
+        <armorPenetration>0.90</armorPenetration>
+        <cooldownTime>2.1</cooldownTime>
+      </li>
+    </tools>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_Cube_Productor_Energy</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Synth_Weapon_2_Melee_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+    </recipeMaker>
   </ThingDef>
 
   <!-- 法杖 -->
@@ -1310,7 +1408,7 @@
     </recipeMaker>
     <statBases>
       <WorkToMake>50000</WorkToMake>
-      <Mass>10</Mass>
+      <Mass>20</Mass>
       <AccuracyTouch>0.6</AccuracyTouch>
       <AccuracyShort>0.6</AccuracyShort>
       <AccuracyMedium>0.6</AccuracyMedium>
@@ -1383,87 +1481,164 @@
       <screenShakeFactor>1.5</screenShakeFactor>
     </projectile>
   </ThingDef>
-
-  <!-- 萨克森装备 -->
-  <ThingDef ParentName="BaseGun">
-    <defName>WULA_WM_Rocket_Pod</defName>
-    <label>PRr-34"石英"</label>
-    <description>由乌拉帝国的"萨克森"战车所装备的火箭发射器，可以发射密集的火箭覆盖可见范围内的敌人。</description>
+  <!-- 自动炮 -->
+  <ThingDef ParentName="BaseHumanMakeableGun">
+    <defName>WULA_RW_AutoCannon</defName>
+    <label>FLm-78"萤石"</label>
+    <description>一般由乌拉帝国跳帮组或骑士军团携带的自动炮，在拥有长射程的同时火力也非常凶猛，会造成区域性的爆炸效果以控制集群敌军。</description>
     <techLevel>Ultra</techLevel>
+    <!-- <techLevel>Spacer</techLevel> -->
     <graphicData>
-      <texPath>Wula/Weapon/WULA_WM_Rocket_Pod</texPath>
+      <texPath>Wula/Weapon/WULA_RW_AutoCannon</texPath>
       <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>1.35</drawSize>
+      <drawSize>1.65</drawSize>
     </graphicData>
-    <tradeability>None</tradeability>
+    <uiIconScale>0.75</uiIconScale>
+    <soundInteract>Interact_ChargeRifle</soundInteract>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_Cube_Productor_Energy</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Synth_Weapon_3_Bomb_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+    </recipeMaker>
     <costList Inherit="False">
-      <Steel>500</Steel>
-      <Plasteel>150</Plasteel>
+      <Steel>300</Steel>
+      <Plasteel>80</Plasteel>
       <ComponentSpacer>8</ComponentSpacer>
     </costList>
     <statBases>
       <WorkToMake>40000</WorkToMake>
-      <Mass>150</Mass>
-      <AccuracyTouch>0.6</AccuracyTouch>
-      <AccuracyShort>0.6</AccuracyShort>
-      <AccuracyMedium>0.6</AccuracyMedium>
-      <AccuracyLong>0.4</AccuracyLong>
-      <RangedWeapon_Cooldown>4.0</RangedWeapon_Cooldown>
+      <Mass>20</Mass>
+      <AccuracyTouch>0.85</AccuracyTouch>
+      <AccuracyShort>0.85</AccuracyShort>
+      <AccuracyMedium>0.75</AccuracyMedium>
+      <AccuracyLong>0.65</AccuracyLong>
+      <RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
     </statBases>
-    <recipeMaker>
-      <recipeUsers Inherit="False">
-        <li>WULA_War_Machine_Weapon_Productor</li>
-      </recipeUsers>
-      <researchPrerequisite>WULA_AI_Machine_Panzer_Technology</researchPrerequisite>
-      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-    </recipeMaker>
     <verbs>
       <li>
         <verbClass>Verb_Shoot</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
-        <warmupTime>2.2</warmupTime>
-        <minRange>4</minRange>
-        <defaultProjectile>Bullet_WULA_WM_Rocket_Pod</defaultProjectile>
-        <range>38</range>
-        <ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-        <burstShotCount>32</burstShotCount>
-        <forcedMissRadius>6.25</forcedMissRadius>
-        <forcedMissEvenDispersal>true</forcedMissEvenDispersal>
+        <defaultProjectile>Bullet_WULA_RW_AutoCannon</defaultProjectile>
+        <warmupTime>1.5</warmupTime>
+        <range>32</range>
+        <forcedMissRadius>0.1</forcedMissRadius>
+        <burstShotCount>6</burstShotCount>
+        <ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+        <soundCast>Shot_ChargeRifle</soundCast>
+        <soundCastTail>GunTail_Medium</soundCastTail>
+        <muzzleFlashScale>9</muzzleFlashScale>
         <targetParams>
           <canTargetPawns>true</canTargetPawns>
           <canTargetLocations>true</canTargetLocations>
           <canTargetBuildings>true</canTargetBuildings>
         </targetParams>
-        <soundCast>RocketswarmLauncher_Fire</soundCast>
-        <soundCastTail>GunTail_Heavy</soundCastTail>
-        <muzzleFlashScale>14</muzzleFlashScale>
       </li>
     </verbs>
   </ThingDef>
-  <ThingDef>
-    <defName>Bullet_WULA_WM_Rocket_Pod</defName>
-    <label>石英非制导火箭</label>
+  <ThingDef ParentName="BaseBullet">
+    <defName>Bullet_WULA_RW_AutoCannon</defName>
+    <label>萤石自动炮子弹</label>
     <thingClass>Projectile_Explosive</thingClass>
-    <category>Projectile</category>
     <tickerType>Normal</tickerType>
-    <altitudeLayer>Projectile</altitudeLayer>
-    <useHitPoints>False</useHitPoints>
     <neverMultiSelect>True</neverMultiSelect>
     <graphicData>
-      <texPath>Things/Projectile/Rocket_Swarm</texPath>
+      <texPath>Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red</texPath>
       <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>1.2</drawSize>
+      <shaderType>TransparentPostLight</shaderType>
+      <drawSize>1.4</drawSize>
     </graphicData>
     <projectile>
-      <damageDef>Bomb</damageDef>
-      <explosionRadius>2.5</explosionRadius>
-      <speed>38</speed>
-      <armorPenetrationBase>0.35</armorPenetrationBase>
-      <damageAmountBase>50</damageAmountBase>
+      <damageDef>Bullet</damageDef>
+      <damageAmountBase>22</damageAmountBase>
+      <speed>90</speed>
+      <explosionRadius>1.2</explosionRadius>
       <arcHeightFactor>0.4</arcHeightFactor>
       <soundExplode>Explosion_Rocket</soundExplode>
+      <armorPenetrationBase>0.75</armorPenetrationBase>
+      <screenShakeFactor>0.1</screenShakeFactor>
     </projectile>
   </ThingDef>
+  <!-- 榴弹发射器 -->
+  <ThingDef ParentName="BaseHumanMakeableGun">
+    <defName>WULA_RW_Auto_GL</defName>
+    <label>SEl-78"角砾岩"</label>
+    <description>乌拉帝国所装备的自动榴弹炮，所发射高抛的高爆榴弹或许杀伤力没有想象的这么强，但是射速极快，几乎可以依靠单兵创造一片轰炸区。</description>
+    <techLevel>Ultra</techLevel>
+    <!-- <techLevel>Spacer</techLevel> -->
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_RW_Auto_GL</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <drawSize>1.65</drawSize>
+    </graphicData>
+    <uiIconScale>0.75</uiIconScale>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_Cube_Productor_Energy</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Synth_Weapon_3_Bomb_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+    </recipeMaker>
+    <costList Inherit="False">
+      <Steel>380</Steel>
+      <Plasteel>60</Plasteel>
+      <ComponentSpacer>8</ComponentSpacer>
+    </costList>
+    <statBases>
+      <WorkToMake>40000</WorkToMake>
+      <Mass>20</Mass>
+      <AccuracyTouch>0.5</AccuracyTouch>
+      <AccuracyShort>0.5</AccuracyShort>
+      <AccuracyMedium>0.4</AccuracyMedium>
+      <AccuracyLong>0.3</AccuracyLong>
+      <RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+    </statBases>
+    <verbs>
+      <li>
+        <verbClass>Verb_Shoot</verbClass>
+        <hasStandardCommand>true</hasStandardCommand>
+        <defaultProjectile>Bullet_WULA_RW_Auto_GL</defaultProjectile>
+        <warmupTime>0.2</warmupTime>
+        <forcedMissRadius>1</forcedMissRadius>
+        <forcedMissRadiusClassicMortars>1</forcedMissRadiusClassicMortars>
+        <isMortar>true</isMortar>
+        <requireLineOfSight>false</requireLineOfSight>
+        <minRange>4</minRange>
+        <range>48</range>
+        <burstShotCount>1</burstShotCount>
+        <soundCast>Mortar_LaunchA</soundCast>
+        <muzzleFlashScale>12</muzzleFlashScale>
+        <targetParams>
+          <canTargetLocations>true</canTargetLocations>
+        </targetParams>
+      </li>
+    </verbs>
+  </ThingDef>
+  <ThingDef ParentName="BaseBullet">
+    <defName>Bullet_WULA_RW_Auto_GL</defName>
+    <label>角砾岩榴弹</label>
+    <graphicData>
+      <texPath>Wula/Projectile/WULA_Shrapnel</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>TransparentPostLight</shaderType>
+    </graphicData>
+    <thingClass>Projectile_Explosive</thingClass>
+    <projectile>
+      <damageDef>Bomb</damageDef>
+      <damageAmountBase>25</damageAmountBase>
+      <speed>35</speed>
+      <explosionRadius>3.5</explosionRadius>
+      <armorPenetrationBase>0.1</armorPenetrationBase>
+      <flyOverhead>true</flyOverhead>
+      <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+      <soundExplode>MortarBomb_Explode</soundExplode>
+      <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+      <soundAmbient>MortarRound_Ambient</soundAmbient>
+    </projectile>
+  </ThingDef>
+
+  <!-- 萨克森装备 -->
   <ThingDef ParentName="BaseGun">
     <defName>WULA_WM_Panzer_Turret</defName>
     <label>ATt-6"金红石"</label>
@@ -1472,9 +1647,10 @@
     <graphicData>
       <texPath>Wula/Weapon/WULA_WM_Panzer_Turret</texPath>
       <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>1.35</drawSize>
+      <drawSize>2</drawSize>
     </graphicData>
     <tradeability>None</tradeability>
+    <uiIconScale>0.5</uiIconScale>
     <statBases>
       <WorkToMake>20000</WorkToMake>
       <Mass>150</Mass>
@@ -1497,7 +1673,7 @@
       <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
     </recipeMaker>
     <weaponTags>
-      <li>WULA_AI_Heavy_Panzer_Init_Weapon</li>
+      <li>WULA_AI_Heavy_Panzer_AT_Weapon</li>
     </weaponTags>
     <verbs>
       <li>
@@ -1540,13 +1716,14 @@
   <ThingDef ParentName="BaseGun">
     <defName>WULA_WM_Panzer_Autocannon</defName>
     <label>SRc-15"辉锑"</label>
-    <description>由乌拉帝国的"萨克森"战车所装备的自动炮，能够组织起高射速的弹幕压制杀伤大规模目标。</description>
+    <description>由乌拉帝国的"萨克森"战车所装备的自动炮，能够组织起高射速的弹幕压制杀伤大规模目标，并且外挂了两具PRr-34"石英"火箭发射器，用于对抗集群冲击。</description>
     <techLevel>Ultra</techLevel>
     <graphicData>
       <texPath>Wula/Weapon/WULA_WM_Panzer_Autocannon</texPath>
       <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>1.35</drawSize>
+      <drawSize>2</drawSize>
     </graphicData>
+    <uiIconScale>0.5</uiIconScale>
     <tradeability>None</tradeability>
     <statBases>
       <WorkToMake>40000</WorkToMake>
@@ -1557,6 +1734,9 @@
       <AccuracyLong>0.65</AccuracyLong>
       <RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
     </statBases>
+    <weaponTags>
+      <li>WULA_AI_Heavy_Panzer_Gunner_Weapon</li>
+    </weaponTags>
     <costList Inherit="False">
       <Steel>500</Steel>
       <Plasteel>150</Plasteel>
@@ -1589,6 +1769,18 @@
         </targetParams>
       </li>
     </verbs>
+
+    <comps Inherit="False">
+      <li Class="CompProperties_EquippableAbilityReloadable">
+        <abilityDef>WULA_WM_Panzer_Autocannon_Ability</abilityDef>
+        <!-- <maxCharges>2</maxCharges> -->
+        <soundReload>AnomalyAbilityWarmup</soundReload>
+        <chargeNoun>火箭弹</chargeNoun>
+        <!-- <ammoDef>WULA_Soul_Wedge</ammoDef> -->
+        <!-- <ammoCountPerCharge>20</ammoCountPerCharge> -->
+        <baseReloadTicks>60</baseReloadTicks>
+      </li>
+    </comps>
   </ThingDef>
   <ThingDef ParentName="BaseBullet">
     <defName>Bullet_WULA_WM_Panzer_Autocannon</defName>
@@ -1613,398 +1805,71 @@
       <screenShakeFactor>0.1</screenShakeFactor>
     </projectile>
   </ThingDef>
-  <ThingDef ParentName="BaseGun">
-    <defName>WULA_WM_Panzer_Mortar</defName>
-    <label>PLm-15"镍铁"</label>
-    <description>由乌拉帝国的"萨克森"战车所装备的迫击炮，虽然型号老旧但是射速相当快，提供的弹药投射量也是不容置疑的。</description>
-    <techLevel>Ultra</techLevel>
-    <graphicData>
-      <texPath>Wula/Weapon/WULA_WM_Panzer_Mortar</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>1.35</drawSize>
-    </graphicData>
-    <tradeability>None</tradeability>
-    <statBases>
-      <WorkToMake>40000</WorkToMake>
-      <Mass>150</Mass>
-      <AccuracyTouch>0.5</AccuracyTouch>
-      <AccuracyShort>0.9</AccuracyShort>
-      <AccuracyMedium>0.9</AccuracyMedium>
-      <AccuracyLong>0.9</AccuracyLong>
-      <RangedWeapon_Cooldown>2.1</RangedWeapon_Cooldown>
-    </statBases>
-    <costList Inherit="False">
-      <Steel>500</Steel>
-      <Plasteel>150</Plasteel>
-      <ComponentSpacer>8</ComponentSpacer>
-    </costList>
-    <recipeMaker>
-      <recipeUsers Inherit="False">
-        <li>WULA_War_Machine_Weapon_Productor</li>
-      </recipeUsers>
-      <researchPrerequisite>WULA_AI_Machine_Panzer_Technology</researchPrerequisite>
-      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-    </recipeMaker>
-    <verbs>
-      <li>
-        <verbClass>Verb_Shoot</verbClass>
-        <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>Bullet_WULA_WM_Panzer_Mortar</defaultProjectile>
-        <warmupTime>0.75</warmupTime>
-        <forcedMissRadius>3</forcedMissRadius>
-        <forcedMissRadiusClassicMortars>1</forcedMissRadiusClassicMortars>
-        <isMortar>true</isMortar>
-        <requireLineOfSight>false</requireLineOfSight>
-        <minRange>8</minRange>
-        <range>500</range>
-        <!-- <burstShotCount>3</burstShotCount>
-        <ticksBetweenBurstShots>10</ticksBetweenBurstShots> -->
-        <soundCast>Mortar_LaunchA</soundCast>
-        <muzzleFlashScale>12</muzzleFlashScale>
-        <targetParams>
-          <canTargetLocations>true</canTargetLocations>
-        </targetParams>
-        <explosionRadiusRingColor>(0.8, 0.8, 0.4, 1)</explosionRadiusRingColor><!-- Keep in sync with PlaceWorker_GlowRadius.RingColor -->
+  <AbilityDef>
+    <defName>WULA_WM_Panzer_Autocannon_Ability</defName>
+    <label>PRr-34"石英"</label>
+    <description>发射大威力的火箭弹轰炸目标区域，这种火箭可以有效杀伤软目标，并对仍然活着的敌人造成巨大的震撼效果。</description>
+    <iconPath>Wula/Projectile/WULA_Mortar_Shell</iconPath>
+    <writeCombatLog>True</writeCombatLog>
+    <showPsycastEffects>False</showPsycastEffects>
+    <cooldownTicksRange>3600</cooldownTicksRange>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <range>26</range>
+      <warmupTime>1</warmupTime>
+      <muzzleFlashScale>9</muzzleFlashScale>
+      <beamTargetsGround>true</beamTargetsGround>
+      <soundAiming>HellsphereCannon_Aiming</soundAiming>
+      <ai_IsWeapon>true</ai_IsWeapon>
+      <soundCast>Shot_HellsphereCannonGun</soundCast>
+      
+      <aimingLineMote>Mote_HellsphereCannon_Aim</aimingLineMote>
+      <aimingChargeMote>Mote_HellsphereCannon_Charge</aimingChargeMote>
+      <aimingChargeMoteOffset>1.07</aimingChargeMoteOffset>
+      <aimingLineMoteFixedLength>3.9</aimingLineMoteFixedLength>
+      <aimingTargetMote>Mote_HellsphereCannon_Target</aimingTargetMote>
+      
+      <targetParams>
+        <canTargetLocations>true</canTargetLocations>
+        <canTargetSelf>false</canTargetSelf>
+        <canTargetPawns>true</canTargetPawns>
+        <canTargetBuildings>true</canTargetBuildings>
+        <canTargetPlants>true</canTargetPlants>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="CompProperties_AbilityLaunchProjectile">
+        <projectileDef>Bullet_WULA_WM_Panzer_Autocannon_Ability</projectileDef>
+        <psychic>false</psychic>
+        <screenShakeIntensity>1</screenShakeIntensity>
       </li>
-    </verbs>
-  </ThingDef>
+    </comps>
+  </AbilityDef>
   <ThingDef ParentName="BaseBullet">
-    <defName>Bullet_WULA_WM_Panzer_Mortar</defName>
-    <label>镍铁迫击炮弹</label>
+    <defName>Bullet_WULA_WM_Panzer_Autocannon_Ability</defName>
+    <label>石英非制导火箭</label>
+    <thingClass>Projectile_Explosive</thingClass>
     <graphicData>
       <texPath>Wula/Projectile/WULA_Mortar_Shell</texPath>
       <graphicClass>Graphic_Single</graphicClass>
-      <shaderType>TransparentPostLight</shaderType>
+      <shaderType>Mote</shaderType>
+      <drawSize>(2, 2)</drawSize>
     </graphicData>
-    <thingClass>Projectile_Explosive</thingClass>
     <projectile>
-      <damageDef>Bomb</damageDef>
-      <damageAmountBase>30</damageAmountBase>
-      <speed>25</speed>
-      <explosionRadius>4.2</explosionRadius>
-      <armorPenetrationBase>0.1</armorPenetrationBase>
-      <flyOverhead>true</flyOverhead>
+      <damageDef>BombSuper</damageDef>
+      <damageAmountBase>120</damageAmountBase>
+      <speed>41</speed>
+      <explosionRadius>6.9</explosionRadius>
+      <stoppingPower>15</stoppingPower>
+      <explosionChanceToStartFire>1</explosionChanceToStartFire>
+      <explosionDamageFalloff>true</explosionDamageFalloff>
+      <explosionEffect>GiantExplosion</explosionEffect>
+      <flyOverhead>false</flyOverhead>
       <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-      <soundExplode>MortarBomb_Explode</soundExplode>
+      <soundExplode>Explosion_GiantBomb</soundExplode>
       <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
       <soundAmbient>MortarRound_Ambient</soundAmbient>
-    </projectile>
-  </ThingDef>
-  <!-- 甲胄装备 -->
-  <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
-    <defName>WULA_MW_Armour_Glaive</defName>
-    <label>CMl-99"剑冢"</label>
-    <description>由SMp-11"甲胄"所持的大型双头刀，攻防兼备，可以劈开坚固的装甲。</description>
-    <weaponTags>
-      <li>WULA_Armour_Init_Weapon</li>
-      <li>Spear</li>
-    </weaponTags>
-    <graphicData>
-      <texPath>Wula/Weapon/WULA_MW_Armour_Glaive</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <shaderType>CutoutComplex</shaderType>
-      <drawSize>3.5</drawSize>
-    </graphicData>
-    <uiIconScale>0.4</uiIconScale>
-    <!-- <equippedAngleOffset>-65</equippedAngleOffset> -->
-    <techLevel>Spacer</techLevel>
-    <equippedAngleOffset>-25</equippedAngleOffset>
-    <costStuffCount>120</costStuffCount>
-    <stuffCategories>
-      <li>Metallic</li>
-    </stuffCategories>
-    <costList Inherit="False">
-      <Plasteel>10</Plasteel>
-      <ComponentIndustrial>6</ComponentIndustrial>
-    </costList>
-    <statBases>
-      <WorkToMake>30000</WorkToMake>
-      <Mass>100</Mass>
-    </statBases>
-    <tools>
-      <li>
-        <label>横扫</label>
-        <capacities>
-          <li>Cut</li>
-        </capacities>
-        <power>82</power>
-        <cooldownTime>2</cooldownTime>
-        <armorPenetration>0.50</armorPenetration>
-      </li>
-      <li>
-        <label>穿刺</label>
-        <capacities>
-          <li>Stab</li>
-        </capacities>
-        <power>75</power>
-        <armorPenetration>0.90</armorPenetration>
-        <cooldownTime>1.7</cooldownTime>
-      </li>
-    </tools>
-    <recipeMaker>
-      <recipeUsers Inherit="False">
-        <li>WULA_War_Machine_Weapon_Productor</li>
-      </recipeUsers>
-      <researchPrerequisite>WULA_Armour_Technology</researchPrerequisite>
-      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-    </recipeMaker>
-  </ThingDef>
-  <ThingDef ParentName="BaseHumanMakeableGun">
-    <defName>WULA_RW_Armour_AR</defName>
-    <label>FLm-78"萤石"</label>
-    <description>由SMp-11"甲胄"所持的重型自动炮，火力比单兵装备要凶猛得多。</description>
-    <techLevel>Ultra</techLevel>
-    <!-- <techLevel>Spacer</techLevel> -->
-    <graphicData>
-      <texPath>Wula/Weapon/WULA_RW_Armour_AR</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>2.75</drawSize>
-    </graphicData>
-    <uiIconScale>0.4</uiIconScale>
-    <soundInteract>Interact_ChargeRifle</soundInteract>
-    <recipeMaker>
-      <recipeUsers Inherit="False">
-        <li>WULA_War_Machine_Weapon_Productor</li>
-      </recipeUsers>
-      <researchPrerequisite>WULA_Armour_Technology</researchPrerequisite>
-      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-    </recipeMaker>
-    <costList Inherit="False">
-      <Steel>350</Steel>
-      <Plasteel>200</Plasteel>
-      <ComponentSpacer>8</ComponentSpacer>
-    </costList>
-    <statBases>
-      <WorkToMake>40000</WorkToMake>
-      <Mass>100</Mass>
-      <AccuracyTouch>0.85</AccuracyTouch>
-      <AccuracyShort>0.85</AccuracyShort>
-      <AccuracyMedium>0.75</AccuracyMedium>
-      <AccuracyLong>0.65</AccuracyLong>
-      <RangedWeapon_Cooldown>1.25</RangedWeapon_Cooldown>
-    </statBases>
-    <verbs>
-      <li>
-        <verbClass>Verb_Shoot</verbClass>
-        <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>Bullet_WULA_RW_Armour_AR</defaultProjectile>
-        <warmupTime>0.5</warmupTime>
-        <range>32</range>
-        <forcedMissRadius>0.1</forcedMissRadius>
-        <burstShotCount>12</burstShotCount>
-        <ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-        <soundCast>Shot_ChargeRifle</soundCast>
-        <soundCastTail>GunTail_Medium</soundCastTail>
-        <muzzleFlashScale>9</muzzleFlashScale>
-        <targetParams>
-          <canTargetPawns>true</canTargetPawns>
-          <canTargetLocations>true</canTargetLocations>
-          <canTargetBuildings>true</canTargetBuildings>
-        </targetParams>
-      </li>
-    </verbs>
-  </ThingDef>
-  <ThingDef ParentName="BaseBullet">
-    <defName>Bullet_WULA_RW_Armour_AR</defName>
-    <label>萤石自动炮子弹</label>
-    <thingClass>Projectile_Explosive</thingClass>
-    <tickerType>Normal</tickerType>
-    <neverMultiSelect>True</neverMultiSelect>
-    <graphicData>
-      <texPath>Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <shaderType>TransparentPostLight</shaderType>
-      <drawSize>1.4</drawSize>
-    </graphicData>
-    <projectile>
-      <damageDef>Bullet</damageDef>
-      <damageAmountBase>22</damageAmountBase>
-      <speed>90</speed>
-      <explosionRadius>1.2</explosionRadius>
-      <arcHeightFactor>0.4</arcHeightFactor>
-      <soundExplode>Explosion_Rocket</soundExplode>
-      <armorPenetrationBase>0.75</armorPenetrationBase>
-      <screenShakeFactor>0.1</screenShakeFactor>
-    </projectile>
-  </ThingDef>
-  <ThingDef ParentName="BaseHumanMakeableGun">
-    <defName>WULA_RW_Armour_GL</defName>
-    <label>SEl-78"角砾岩"</label>
-    <description>由SMp-11"甲胄"所持的自动榴弹炮，得益于战甲庞大的身躯，这种重型武器可以跟随小队移动并向敌人释放铺天盖地的榴弹雨。</description>
-    <techLevel>Ultra</techLevel>
-    <!-- <techLevel>Spacer</techLevel> -->
-    <graphicData>
-      <texPath>Wula/Weapon/WULA_RW_Armour_GL</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>2.75</drawSize>
-    </graphicData>
-    <uiIconScale>0.4</uiIconScale>
-    <recipeMaker>
-      <recipeUsers Inherit="False">
-        <li>WULA_War_Machine_Weapon_Productor</li>
-      </recipeUsers>
-      <researchPrerequisite>WULA_Armour_Technology</researchPrerequisite>
-      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-    </recipeMaker>
-    <costList Inherit="False">
-      <Steel>350</Steel>
-      <Plasteel>200</Plasteel>
-      <ComponentSpacer>8</ComponentSpacer>
-    </costList>
-    <statBases>
-      <WorkToMake>40000</WorkToMake>
-      <Mass>150</Mass>
-      <AccuracyTouch>0.5</AccuracyTouch>
-      <AccuracyShort>0.5</AccuracyShort>
-      <AccuracyMedium>0.4</AccuracyMedium>
-      <AccuracyLong>0.3</AccuracyLong>
-      <RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-    </statBases>
-    <verbs>
-      <li>
-        <verbClass>Verb_Shoot</verbClass>
-        <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>Bullet_WULA_RW_Armour_GL</defaultProjectile>
-        <warmupTime>0.2</warmupTime>
-        <forcedMissRadius>1</forcedMissRadius>
-        <forcedMissRadiusClassicMortars>1</forcedMissRadiusClassicMortars>
-        <isMortar>true</isMortar>
-        <requireLineOfSight>false</requireLineOfSight>
-        <minRange>4</minRange>
-        <range>54</range>
-        <burstShotCount>1</burstShotCount>
-        <soundCast>Mortar_LaunchA</soundCast>
-        <muzzleFlashScale>12</muzzleFlashScale>
-        <targetParams>
-          <canTargetLocations>true</canTargetLocations>
-        </targetParams>
-      </li>
-    </verbs>
-  </ThingDef>
-  <ThingDef ParentName="BaseBullet">
-    <defName>Bullet_WULA_RW_Armour_GL</defName>
-    <label>角砾岩榴弹</label>
-    <graphicData>
-      <texPath>Wula/Projectile/WULA_Shrapnel</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <shaderType>TransparentPostLight</shaderType>
-    </graphicData>
-    <thingClass>Projectile_Explosive</thingClass>
-    <projectile>
-      <damageDef>Bomb</damageDef>
-      <damageAmountBase>35</damageAmountBase>
-      <speed>35</speed>
-      <explosionRadius>3.5</explosionRadius>
-      <armorPenetrationBase>0.1</armorPenetrationBase>
-      <flyOverhead>true</flyOverhead>
-      <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-      <soundExplode>MortarBomb_Explode</soundExplode>
-      <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-      <soundAmbient>MortarRound_Ambient</soundAmbient>
-    </projectile>
-  </ThingDef>
-  <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
-    <defName>WULA_MW_Armour_Lance</defName>
-    <label>CMl-67"铳枪"</label>
-    <description>SMp-11"甲胄"所持的枪炮合一的武器，既可以在近战中刺穿对手，也可以从远距离上发射高精度炮弹打击敌军。</description>
-    <weaponTags>
-      <li>Spear</li>
-    </weaponTags>
-    <graphicData>
-      <texPath>Wula/Weapon/WULA_MW_Armour_Lance</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <shaderType>CutoutComplex</shaderType>
-      <drawSize>3.5</drawSize>
-    </graphicData>
-    <uiIconScale>0.4</uiIconScale>
-    <!-- <equippedAngleOffset>-65</equippedAngleOffset> -->
-    <techLevel>Spacer</techLevel>
-    <!-- <equippedAngleOffset>-25</equippedAngleOffset> -->
-    <costList Inherit="False">
-      <Steel>500</Steel>
-      <Plasteel>120</Plasteel>
-      <ComponentIndustrial>12</ComponentIndustrial>
-    </costList>
-    <statBases>
-      <WorkToMake>50000</WorkToMake>
-      <Mass>150</Mass>
-      <AccuracyTouch>0.5</AccuracyTouch>
-      <AccuracyShort>0.5</AccuracyShort>
-      <AccuracyMedium>0.4</AccuracyMedium>
-      <AccuracyLong>0.3</AccuracyLong>
-      <RangedWeapon_Cooldown>0</RangedWeapon_Cooldown>
-    </statBases>
-    <tools>
-      <li>
-        <label>横扫</label>
-        <capacities>
-          <li>Blunt</li>
-          <li>Poke</li>
-        </capacities>
-        <power>36</power>
-        <cooldownTime>2.2</cooldownTime>
-        <surpriseAttack>
-          <extraMeleeDamages>
-            <li>
-              <def>Stun</def>
-              <amount>18</amount>
-            </li>
-          </extraMeleeDamages>
-        </surpriseAttack>
-      </li>
-      <li>
-        <label>穿刺</label>
-        <capacities>
-          <li>Stab</li>
-        </capacities>
-        <power>45</power>
-        <armorPenetration>0.80</armorPenetration>
-        <cooldownTime>2</cooldownTime>
-      </li>
-    </tools>
-    <recipeMaker>
-      <recipeUsers Inherit="False">
-        <li>WULA_War_Machine_Weapon_Productor</li>
-      </recipeUsers>
-      <researchPrerequisite>WULA_Armour_Technology</researchPrerequisite>
-      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-    </recipeMaker>
-    <verbs>
-      <li>
-        <verbClass>Verb_Shoot</verbClass>
-        <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>Bullet_WULA_MW_Armour_Lance</defaultProjectile>
-        <warmupTime>2.25</warmupTime>
-        <minRange>3</minRange>
-        <forcedMissRadius>0.1</forcedMissRadius>
-        <range>68</range>
-        <burstShotCount>1</burstShotCount>
-        <soundCast>Shot_TurretSniper</soundCast>
-        <soundCastTail>GunTail_Heavy</soundCastTail>
-        <muzzleFlashScale>18</muzzleFlashScale>
-      </li>
-    </verbs>
-  </ThingDef>
-  <ThingDef ParentName="BaseBullet">
-    <defName>Bullet_WULA_MW_Armour_Lance</defName>
-    <label>铳枪穿甲弹</label>
-    <thingClass>Projectile_Explosive</thingClass>
-    <tickerType>Normal</tickerType>
-    <neverMultiSelect>True</neverMultiSelect>
-    <graphicData>
-      <texPath>Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <shaderType>TransparentPostLight</shaderType>
-      <drawSize>3.4</drawSize>
-    </graphicData>
-    <projectile>
-      <damageDef>Bullet</damageDef>
-      <damageAmountBase>300</damageAmountBase>
-      <speed>180</speed>
-      <explosionRadius>2.6</explosionRadius>
-      <arcHeightFactor>0.4</arcHeightFactor>
-      <soundExplode>Explosion_Rocket</soundExplode>
-      <armorPenetrationBase>1</armorPenetrationBase>
+      <!-- <preExplosionSpawnSingleThingDef>CraterMedium</preExplosionSpawnSingleThingDef> -->
     </projectile>
   </ThingDef>
 </Defs>
\ No newline at end of file
diff --git a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml
index c20b5e24..f6e28089 100644
--- a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml
+++ b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml
@@ -460,353 +460,6 @@
         </adaptableDamageDefs>
       </li>
     </comps>
-	</AlienRace.ThingDef_AlienRace>
-	<AlienRace.ThingDef_AlienRace ParentName="Human">
-		<defName>Wula_AI_Heavy_Panzer</defName>
-		<label>SMp-38"萨克森"</label>
-		<description>乌拉帝国所使用的中型突击战车，以逆重的方式悬浮于战场上，并使用其搭载的火力强大的武备撕碎敌人。</description>
-    <uiIconPath>Wula/Things/Wula_AI_Heavy_Panzer/Wula_AI_Heavy_Panzer_Icon</uiIconPath>
-
-    <alienRace>
-      <!-- 核心设置 -->
-      <generalSettings>
-        <!-- 男性生成几率 -->
-        <maleGenderProbability>0</maleGenderProbability>
-        <!-- 无视年龄疾病 -->
-        <immuneToAge>true</immuneToAge>
-				<!-- 在口角中造成的最大伤害 -->
-        <maxDamageForSocialfight>6</maxDamageForSocialfight>
-        <!-- 免疫人类的异形歧视 -->
-        <immuneToXenophobia>true</immuneToXenophobia>
-        <!-- 最小的可生成成人背景的年龄 -->
-        <minAgeForAdulthood>0</minAgeForAdulthood>
-        <!-- 手术继承自人类 -->
-        <humanRecipeImport>false</humanRecipeImport>
-        <!-- 睡觉定义 -->
-        <canLayDown>false</canLayDown>
-        <validBeds>
-        </validBeds>
-        <!-- 各种零件定义 -->
-        <alienPartGenerator Inherit="False">
-          <!-- 允许的头部 -->
-          <headTypes Inherit="False">
-            <li>AverageNormal</li>
-            <!-- <li>Female_AverageWide</li>
-            <li>Female_AveragePointy</li> -->
-          </headTypes>
-					<!-- 身体类型 -->
-					<bodyTypes Inherit="False">
-						<li>Thin</li>
-					</bodyTypes>
-					<!-- 颜色设置 -->
-					<colorChannels Inherit="false">
-						<li>
-							<name>skin</name>
-							<first Class="ColorGenerator_Options">
-								<options>
-									<li>
-										<weight>1</weight>
-										<only>RGBA(1,1,1,1)</only>
-									</li>
-								</options>
-							</first>
-						</li>
-						<li>
-							<name>favorite</name>
-							<first Class="ColorGenerator_Options">
-								<options>
-									<li>
-										<weight>1</weight>
-										<only>RGBA(1,1,1,1)</only>
-									</li>
-								</options>
-							</first>
-						</li>
-					</colorChannels>
-          <customDrawSize>(3, 3)</customDrawSize>
-          <borderScale>3.0</borderScale>
-        </alienPartGenerator>
-        <growthAges>
-          <li>0</li>
-        </growthAges>
-        <!-- 年龄工作效率等的覆盖 -->
-        <ageStatOverrides>
-          <WorkSpeedGlobal>
-            <useBiologicalYears>true</useBiologicalYears>
-            <curve>
-              <points>
-                <li>(0,1)</li>
-              </points>
-            </curve>
-          </WorkSpeedGlobal>
-          <ShootingAccuracyChildFactor MayRequire="Ludeon.RimWorld.Biotech">
-            <useBiologicalYears>true</useBiologicalYears>
-            <curve>
-              <points>
-                <li>(0,1)</li>
-              </points>
-            </curve>
-          </ShootingAccuracyChildFactor>
-          <MarketValue>
-            <useBiologicalYears>true</useBiologicalYears>
-            <curve>
-              <points>
-                <li>(0,1)</li>
-              </points>
-            </curve>
-          </MarketValue>
-          <MeleeHitChance>
-            <useBiologicalYears>true</useBiologicalYears>
-            <curve>
-              <points>
-                <li>(0,1)</li>
-              </points>
-            </curve>
-          </MeleeHitChance>
-          <AimingDelayFactor>
-            <useBiologicalYears>true</useBiologicalYears>
-            <curve>
-              <points>
-                <li>(0,1)</li>
-              </points>
-            </curve>
-          </AimingDelayFactor>
-          <ArrestSuccessChance>
-            <useBiologicalYears>true</useBiologicalYears>
-            <curve>
-              <points>
-                <li>(0, 1)</li>
-              </points>
-            </curve>
-          </ArrestSuccessChance>
-        </ageStatOverrides>
-      </generalSettings>
-      <!-- 图形 -->
-			<graphicPaths>
-				<body>Wula/Things/Wula_AI_Heavy_Panzer/Bodies/</body>
-				<head>Wula/Things/Wula_AI_Heavy_Panzer/Heads/</head>
-				<skeleton>Things/Pawn/Humanlike/Bodies/Dessicated/Dessicated_Thin</skeleton> 
-        <stump>Wula/Things/Wula_AI_Heavy_Panzer/Bodies</stump>
-        <skinColor>(1,1,1,1)</skinColor>
-			</graphicPaths>
-			<!-- 风格设置 -->
-			<styleSettings>
-				<!-- 头发 -->
-				<li>
-					<key>HairDef</key>
-					<value>
-						<hasStyle>false</hasStyle>
-					</value>
-				</li>
-				<!-- 纹身 -->
-				<li>
-					<key>TattooDef</key>
-					<value>
-						<hasStyle>false</hasStyle>
-					</value>
-				</li>
-				<!-- 胡须 -->
-				<li>
-					<key>BeardDef</key>
-					<value>
-						<hasStyle>false</hasStyle>
-					</value>
-				</li>
-			</styleSettings>
-      <!-- 种族的允许和禁止特化设置 -->
-      <raceRestriction>
-        <traitList>
-          <li>WULA_AI_War_Machine</li>
-        </traitList>
-        <!-- 武器列表 -->
-        <weaponList>
-          <li>WULA_WM_Rocket_Pod</li>
-          <li>WULA_WM_Panzer_Turret</li>
-          <li>WULA_WM_Panzer_Autocannon</li>
-          <li>WULA_WM_Panzer_Mortar</li>
-        </weaponList>
-        <!-- 可以穿戴的衣服 -->
-        <apparelList>
-          <li>WULA_SMp38_Shield</li>
-          <li>WULA_SMp38_Armor</li>
-          <li>WULA_SMp38_Engine</li>
-        </apparelList>
-        <!-- 允许的特质类型 -->
-        <traitList>
-          <li>WULA_AI_War_Machine</li>
-        </traitList>
-        <onlyUseRaceRestrictedApparel>true</onlyUseRaceRestrictedApparel>
-        <onlyUseRaceRestrictedWeapons>true</onlyUseRaceRestrictedWeapons>
-        <onlyBuildRaceRestrictedBuildings>true</onlyBuildRaceRestrictedBuildings>
-        <onlyGetRaceRestrictedTraits>true</onlyGetRaceRestrictedTraits>
-        <onlyEatRaceRestrictedFood>true</onlyEatRaceRestrictedFood>
-        <blackEndoCategories>
-          <li>Melanin</li>
-          <li>HairColor</li>
-          <li>BodyType</li>
-        </blackEndoCategories>
-        <onlyHaveRaceRestrictedGenes>true</onlyHaveRaceRestrictedGenes>
-        <!-- 生育能力 -->
-        <onlyReproduceWithRestrictedRaces>true</onlyReproduceWithRestrictedRaces>
-        <canReproduce>false</canReproduce>
-      </raceRestriction>
-      <!-- 想法设置 -->
-      <thoughtSettings>
-        <cannotReceiveThoughtsAtAll>true</cannotReceiveThoughtsAtAll>
-      </thoughtSettings>
-      <!-- 关系设置，不会生成任何随机关系 -->
-      <relationSettings>
-        <relationChanceModifierLover>0</relationChanceModifierLover>
-        <relationChanceModifierExLover>0</relationChanceModifierExLover>
-
-        <relationChanceModifierFiance>0</relationChanceModifierFiance>
-        <relationChanceModifierSpouse>0</relationChanceModifierSpouse>
-        <relationChanceModifierExSpouse>0</relationChanceModifierExSpouse>
-
-        <relationChanceModifierParent>0</relationChanceModifierParent>
-        <relationChanceModifierChild>0</relationChanceModifierChild>
-        <relationChanceModifierSibling>0</relationChanceModifierSibling>
-      </relationSettings>
-      <!-- 兼容性标签，非必要 -->
-      <compatibility>
-        <isFlesh>false</isFlesh>
-      </compatibility>
-    </alienRace>
-    
-    <!-- 以下是原版标签 -->
-    <!-- 受击音效 -->
-    <soundImpactDefault>BulletImpact_Metal</soundImpactDefault>
-    <statBases>
-      <BandwidthCost>5</BandwidthCost>
-      <MechEnergyLossPerHP MayRequire="Ludeon.RimWorld.Biotech">0</MechEnergyLossPerHP>
-      <WastepacksPerRecharge MayRequire="Ludeon.RimWorld.Biotech">5</WastepacksPerRecharge>
-      
-      <WorkToMake>40000</WorkToMake>
-      <MarketValue>10000</MarketValue>
-      <Mass>250</Mass>
-      <MoveSpeed>2.5</MoveSpeed>
-      <EatingSpeed>1000</EatingSpeed>
-      <!-- 温度适应性，在hediff修改 -->
-      <ComfyTemperatureMin>-300</ComfyTemperatureMin>
-      <ComfyTemperatureMax>300</ComfyTemperatureMax>
-      <!-- 心灵敏感，很低 -->
-      <PsychicSensitivity>0</PsychicSensitivity>
-      <!-- 肉量 -->
-      <MeatAmount>0</MeatAmount>
-      <!-- 皮革量 -->
-      <LeatherAmount>0</LeatherAmount>
-      <!-- 谈判能力 -->
-      <NegotiationAbility>1</NegotiationAbility>
-      <!-- 社交效果，机械乌拉社交的影响很小 -->
-      <SocialImpact>0.25</SocialImpact>
-      <!-- 挖矿速度 -->
-      <MiningSpeed>1</MiningSpeed>
-      <!-- 采矿效率 -->
-      <MiningYield>1</MiningYield>
-      <!-- 种植速度 -->
-      <PlantWorkSpeed>1</PlantWorkSpeed>
-      <!-- 狩猎隐蔽 -->
-      <HuntingStealth>1</HuntingStealth>
-      <!-- 建造速度 -->
-      <ConstructionSpeed>1</ConstructionSpeed>
-      <!-- 研究速度 -->
-      <ResearchSpeed>1</ResearchSpeed>
-      <VacuumResistance MayRequire="Ludeon.RimWorld.Odyssey">1</VacuumResistance>
-    </statBases>
-
-    <race>
-      <fleshType>Mechanoid</fleshType>
-			<hasGenders>false</hasGenders>
-			<!-- AI行为，勿改 -->
-			<thinkTreeMain>Mechanoid</thinkTreeMain>
-			<thinkTreeConstant>HumanlikeConstant</thinkTreeConstant>
-			<!-- 智力水平 -->
-			<intelligence>Humanlike</intelligence>
-			<!-- 血液，不流血 -->
-			<bloodDef>Filth_MachineBits</bloodDef>
-      <!-- 基础血量，很高 -->
-			<baseHealthScale>5</baseHealthScale>
-			<!-- 身体类型 -->
-			<body>WULA_AI_Heavy_Panzer_Body</body>
-      <!-- 大小 -->
-      <baseBodySize>10.0</baseBodySize>
-      <!-- 年龄阶段 -->
-      <lifeExpectancy>5000</lifeExpectancy>
-      <lifeStageWorkSettings MayRequire="Ludeon.RimWorld.Biotech">
-        <Firefighter>0</Firefighter>
-        <Patient>0</Patient>
-        <Doctor>0</Doctor>
-        <PatientBedRest>0</PatientBedRest>
-        <Childcare MayRequire="Ludeon.RimWorld.Biotech">0</Childcare>
-        <BasicWorker>0</BasicWorker>
-        <Warden>0</Warden>
-        <Handling>0</Handling>
-        <Cooking>0</Cooking>
-        <Hunting>0</Hunting>
-        <Construction>0</Construction>
-        <Growing>0</Growing>
-        <Mining>0</Mining>
-        <PlantCutting>0</PlantCutting>
-        <Smithing>0</Smithing>
-        <Tailoring>0</Tailoring>
-        <Art>0</Art>
-        <Crafting>0</Crafting>
-        <Hauling>0</Hauling>
-        <Cleaning>0</Cleaning>
-        <Research>0</Research>
-        <DarkStudy MayRequire="Ludeon.RimWorld.Anomaly">0</DarkStudy>
-      </lifeStageWorkSettings>
-      <lifeStageAges Inherit="False">
-        <li>
-          <def>Wula_Species_Lifestage</def>
-          <minAge>0</minAge>
-        </li>
-      </lifeStageAges>
-      <nameGenerator MayRequire="Ludeon.RimWorld.Biotech">NamerMech</nameGenerator>
-      <mechWeightClass>Heavy</mechWeightClass>
-      <canFlyInVacuum>true</canFlyInVacuum>
-      <!-- <mechFixedSkillLevel>20</mechFixedSkillLevel> -->
-    </race>
-
-    <butcherProducts>
-      <Steel>50</Steel>
-      <Plasteel>20</Plasteel>
-    </butcherProducts>
-    
-    <recipes>
-    </recipes>
-
-    <receivesSignals>true</receivesSignals>
-
-    <comps>
-      <li Class="CompProperties_CanBeDormant" />
-      <li Class="CompProperties_WakeUpDormant">
-        <wakeUpOnDamage>true</wakeUpOnDamage>
-        <wakeUpCheckRadius>30</wakeUpCheckRadius>
-        <wakeUpSound>MechanoidsWakeUp</wakeUpSound>
-      </li>
-      <li MayRequire="Ludeon.RimWorld.Biotech" Class="CompProperties_OverseerSubject">
-        <needsOverseerEffect>MechUncontrolled</needsOverseerEffect>
-        <delayUntilFeralCheck>60000</delayUntilFeralCheck>
-        <feralMtbDays>10</feralMtbDays>
-        <feralCascadeRadialDistance>25</feralCascadeRadialDistance>
-      </li>
-      <li MayRequire="Ludeon.RimWorld.Biotech" Class="CompProperties_MechRepairable" />
-    </comps>
-
-    <tools Inherit="False">
-      <li>
-        <label>碾压</label>
-        <labelNoLocation>碾压</labelNoLocation>
-        <capacities>
-          <li>Blunt</li>
-        </capacities>
-        <power>14</power>
-        <cooldownTime>2.9</cooldownTime>
-        <linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
-        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-      </li>
-    </tools>
 	</AlienRace.ThingDef_AlienRace>
 	<AlienRace.ThingDef_AlienRace ParentName="Human">
 		<defName>Wula_Armour</defName>
@@ -1138,7 +791,7 @@
         <needsOverseerEffect>MechUncontrolled</needsOverseerEffect>
         <delayUntilFeralCheck>60000</delayUntilFeralCheck>
         <feralMtbDays>10</feralMtbDays>
-        <feralCascadeRadialDistance>25</feralCascadeRadialDistance>
+        <feralCascadeRadialDistance>2500</feralCascadeRadialDistance>
       </li>
       <li MayRequire="Ludeon.RimWorld.Biotech" Class="CompProperties_MechRepairable" />
       <li Class="CompProperties_ProjectileInterceptor">
@@ -1183,6 +836,76 @@
       </li>
     </tools>
 	</AlienRace.ThingDef_AlienRace>
+
+  
+  <ThingDef Name="Wula_AI_Heavy_Panzer" ParentName="HeavyMechanoid">
+		<defName>Wula_AI_Heavy_Panzer</defName>
+		<label>SMp-38"萨克森"</label>
+		<description>乌拉帝国所使用的中型突击战车，以逆重的方式悬浮于战场上，搭载了一门在远距离上可以发挥高威力的穿甲主炮，并且拥有足以保护一支突击小队的护盾。</description>
+    <uiIconPath>Wula/Things/Wula_AI_Heavy_Panzer/Wula_AI_Heavy_Panzer_Icon</uiIconPath>
+    <statBases>
+      <BandwidthCost>3</BandwidthCost>
+      <MoveSpeed>3</MoveSpeed>
+      <VacuumResistance MayRequire="Ludeon.RimWorld.Odyssey">1</VacuumResistance>
+      <!-- 有自带护甲，对热量伤害有高抵抗 -->
+      <ArmorRating_Sharp>1</ArmorRating_Sharp>
+      <ArmorRating_Blunt>1</ArmorRating_Blunt>
+      <ArmorRating_Heat>2.00</ArmorRating_Heat>
+      <!-- 近战闪避 -->
+      <CarryingCapacity>1200</CarryingCapacity>
+      <ShootingAccuracyPawn>200</ShootingAccuracyPawn>
+      <IncomingDamageFactor>0.75</IncomingDamageFactor>
+    </statBases>
+    <race>
+      <body>WULA_AI_Heavy_Panzer_Body</body>
+      <baseBodySize>10.0</baseBodySize>
+			<baseHealthScale>5</baseHealthScale>
+      <lifeStageAges>
+        <li>
+          <def>MechanoidFullyFormed</def>
+          <soundWounded>Pawn_Mech_Tunneler_Wounded</soundWounded>
+          <soundDeath>Pawn_Mech_Tunneler_Death</soundDeath>
+          <soundCall>Pawn_Mech_Tunneler_Call</soundCall>
+        </li>
+      </lifeStageAges>
+      <bulletStaggerEffecterDef>TunnelerSlowedDown</bulletStaggerEffecterDef>
+    </race>
+    <tools Inherit="False">
+      <li>
+        <label>碾压</label>
+        <labelNoLocation>碾压</labelNoLocation>
+        <capacities>
+          <li>Blunt</li>
+        </capacities>
+        <power>14</power>
+        <cooldownTime>2.9</cooldownTime>
+        <linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
+        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+      </li>
+    </tools>
+    <comps>
+      <li Class="CompProperties_ProjectileInterceptor">
+        <radius>3</radius>
+        <interceptGroundProjectiles>true</interceptGroundProjectiles>
+        <color>(0.9, 0.2, 0.2)</color>
+        <reactivateEffect>BulletShieldGenerator_Reactivate</reactivateEffect>
+        <activeSound>BulletShield_Ambience</activeSound>
+        <hitPoints>500</hitPoints>
+        <hitPointsRestoreInstantlyAfterCharge>true</hitPointsRestoreInstantlyAfterCharge>
+        <chargeDurationTicks>1800</chargeDurationTicks>
+        <rechargeHitPointsIntervalTicks>120</rechargeHitPointsIntervalTicks>
+        <minIdleAlpha>0.2</minIdleAlpha>
+        <drawWithNoSelection>True</drawWithNoSelection>
+        <disarmedByEmpForTicks>1500</disarmedByEmpForTicks>
+        <gizmoTipKey>ProjectileInterceptorTip</gizmoTipKey>
+      </li>
+    </comps>
+  </ThingDef>
+  <ThingDef Name="Wula_AI_Heavy_Panzer_Gunnery" ParentName="Wula_AI_Heavy_Panzer">
+		<defName>Wula_AI_Heavy_Panzer_Gunnery</defName>
+		<label>SMp-38A"斯佩萨特"</label>
+		<description>乌拉帝国所使用的中型突击战车，以逆重的方式悬浮于战场上，搭载了联装机炮和用于杀伤软目标的"磷灰"火箭弹，并且拥有足以保护一支突击小队的护盾。</description>
+  </ThingDef>
     
   <ThingDef ParentName="LightMechanoid">
     <defName>Mech_WULA_Cat</defName>
@@ -1297,5 +1020,8 @@
         <li>Construction</li>
       </mechEnabledWorkTypes>
     </race>
+    <statBases>
+      <WorkSpeedGlobal>2</WorkSpeedGlobal>
+    </statBases>
   </ThingDef>
 </Defs>
\ No newline at end of file
diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_east.dds b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_east.dds
new file mode 100644
index 00000000..b88cc944
Binary files /dev/null and b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_east.dds differ
diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_east.png b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_east.png
new file mode 100644
index 00000000..37b54f7e
Binary files /dev/null and b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_east.png differ
diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_north.dds b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_north.dds
new file mode 100644
index 00000000..b88cc944
Binary files /dev/null and b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_north.dds differ
diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_north.png b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_north.png
new file mode 100644
index 00000000..37b54f7e
Binary files /dev/null and b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_north.png differ
diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_south.dds b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_south.dds
new file mode 100644
index 00000000..b88cc944
Binary files /dev/null and b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_south.dds differ
diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_south.png b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_south.png
new file mode 100644
index 00000000..37b54f7e
Binary files /dev/null and b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/AllegianceOverlays/None_south.png differ
diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.png b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.png
index d6a9c570..9bd8c6b8 100644
Binary files a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.png and b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.png differ
diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.sai2 b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.sai2
index 28ee68ad..a34c488c 100644
Binary files a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.sai2 and b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.sai2 differ
diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_north.png b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_north.png
index 3790c7ee..8f29d6eb 100644
Binary files a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_north.png and b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_north.png differ
diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_south.png b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_south.png
index 34d6dcdc..61fb45ad 100644
Binary files a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_south.png and b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_south.png differ
diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Heads/Average_Normal_east.png b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Heads/Average_Normal_east.png
deleted file mode 100644
index c5dbe5aa..00000000
Binary files a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Heads/Average_Normal_east.png and /dev/null differ
diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Heads/Average_Normal_north.png b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Heads/Average_Normal_north.png
deleted file mode 100644
index c5dbe5aa..00000000
Binary files a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Heads/Average_Normal_north.png and /dev/null differ
diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Heads/Average_Normal_south.png b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Heads/Average_Normal_south.png
deleted file mode 100644
index c5dbe5aa..00000000
Binary files a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Heads/Average_Normal_south.png and /dev/null differ
diff --git a/Textures/Wula/Weapon/WULA_MW_Armour_Glaive.png b/Textures/Wula/Weapon/WULA_MW_Glaive.png
similarity index 100%
rename from Textures/Wula/Weapon/WULA_MW_Armour_Glaive.png
rename to Textures/Wula/Weapon/WULA_MW_Glaive.png
diff --git a/Textures/Wula/Weapon/WULA_MW_Lance.png b/Textures/Wula/Weapon/WULA_MW_Lance.png
index ed441cb2..2d2c17ef 100644
Binary files a/Textures/Wula/Weapon/WULA_MW_Lance.png and b/Textures/Wula/Weapon/WULA_MW_Lance.png differ
diff --git a/Textures/Wula/Weapon/WULA_MW_Lance.sai2 b/Textures/Wula/Weapon/WULA_MW_Lance.sai2
index 17caf4d5..48c0775e 100644
Binary files a/Textures/Wula/Weapon/WULA_MW_Lance.sai2 and b/Textures/Wula/Weapon/WULA_MW_Lance.sai2 differ
diff --git a/Textures/Wula/Weapon/WULA_RW_Armour_AR.png b/Textures/Wula/Weapon/WULA_RW_AutoCannon.png
similarity index 100%
rename from Textures/Wula/Weapon/WULA_RW_Armour_AR.png
rename to Textures/Wula/Weapon/WULA_RW_AutoCannon.png
diff --git a/Textures/Wula/Weapon/WULA_RW_Armour_AR.sai2 b/Textures/Wula/Weapon/WULA_RW_AutoCannon.sai2
similarity index 100%
rename from Textures/Wula/Weapon/WULA_RW_Armour_AR.sai2
rename to Textures/Wula/Weapon/WULA_RW_AutoCannon.sai2
diff --git a/Textures/Wula/Weapon/WULA_RW_Armour_GL.png b/Textures/Wula/Weapon/WULA_RW_Auto_GL.png
similarity index 100%
rename from Textures/Wula/Weapon/WULA_RW_Armour_GL.png
rename to Textures/Wula/Weapon/WULA_RW_Auto_GL.png
diff --git a/Textures/Wula/Weapon/WULA_RW_Armour_GL.sai2 b/Textures/Wula/Weapon/WULA_RW_Auto_GL.sai2
similarity index 100%
rename from Textures/Wula/Weapon/WULA_RW_Armour_GL.sai2
rename to Textures/Wula/Weapon/WULA_RW_Auto_GL.sai2
diff --git a/Textures/Wula/Weapon/WULA_WM_Panzer_Autocannon.png b/Textures/Wula/Weapon/WULA_WM_Panzer_Autocannon.png
index 9ded5f70..aa64ed88 100644
Binary files a/Textures/Wula/Weapon/WULA_WM_Panzer_Autocannon.png and b/Textures/Wula/Weapon/WULA_WM_Panzer_Autocannon.png differ
diff --git a/Textures/Wula/Weapon/WULA_WM_Panzer_Autocannon.sai2 b/Textures/Wula/Weapon/WULA_WM_Panzer_Autocannon.sai2
index e12568d1..54b07bc5 100644
Binary files a/Textures/Wula/Weapon/WULA_WM_Panzer_Autocannon.sai2 and b/Textures/Wula/Weapon/WULA_WM_Panzer_Autocannon.sai2 differ
diff --git a/Textures/Wula/Weapon/WULA_WM_Panzer_Mortar.png b/Textures/Wula/Weapon/WULA_WM_Panzer_Mortar.png
deleted file mode 100644
index e39865fe..00000000
Binary files a/Textures/Wula/Weapon/WULA_WM_Panzer_Mortar.png and /dev/null differ
diff --git a/Textures/Wula/Weapon/WULA_WM_Panzer_Turret.png b/Textures/Wula/Weapon/WULA_WM_Panzer_Turret.png
index a4e9698e..83e258b3 100644
Binary files a/Textures/Wula/Weapon/WULA_WM_Panzer_Turret.png and b/Textures/Wula/Weapon/WULA_WM_Panzer_Turret.png differ
diff --git a/Textures/Wula/Weapon/WULA_WM_Panzer_Turret.sai2 b/Textures/Wula/Weapon/WULA_WM_Panzer_Turret.sai2
index 26402aa2..5f9662b8 100644
Binary files a/Textures/Wula/Weapon/WULA_WM_Panzer_Turret.sai2 and b/Textures/Wula/Weapon/WULA_WM_Panzer_Turret.sai2 differ
diff --git a/Textures/Wula/Weapon/WULA_WM_Rocket_Pod.png b/Textures/Wula/Weapon/WULA_WM_Rocket_Pod.png
deleted file mode 100644
index d584f6c7..00000000
Binary files a/Textures/Wula/Weapon/WULA_WM_Rocket_Pod.png and /dev/null differ