穿梭机图像和其他bug修复

1.6/1.6/Defs/Effects/WulaFleckDefs.xml

@@ -9,7 +9,7 @@
       <texPath>Wula/Mote/WULA_GunTail_Plasma</texPath>
       <shaderType>MoteGlow</shaderType>
       <drawSize>1.25</drawSize>
-      <color>(3,189,243,155)</color>
+      <color>(218,255,200,155)</color>
     </graphicData>
   </FleckDef>
   <FleckDef  ParentName="WULA_GunTail_Plasma">
@@ -49,7 +49,7 @@
       <texPath>Things/Mote/BlastEMP</texPath>
       <shaderType>TransparentPostLight</shaderType>
       <renderInstanced>true</renderInstanced>
-      <color>(0.1, 0.9, 0.1 , 0.5)</color>
+      <color>(0.9, 1 , 0.8 , 0.5)</color>
     </graphicData>
     <altitudeLayer>MoteOverhead</altitudeLayer>
     <solidTime>0</solidTime>

1.6/1.6/Defs/ThingDefs/WULA_Item.xml

@@ -224,7 +224,7 @@
     <statBases>
       <MarketValue>1000</MarketValue>
       <Mass>0.01</Mass>
-      <WorkToMake>30000</WorkToMake>
+      <MaxHitPoints>50</MaxHitPoints>
     </statBases>
     <thingCategories>
       <li>ResourcesRaw</li>
@@ -310,6 +310,79 @@
     <possessionCount>50</possessionCount>
   </ThingDef>
 
+  <!-- 制造有机物前体 -->
+  <ThingDef ParentName="ResourceBase">
+    <defName>Wula_Organic_Precursor</defName>
+    <label>有机物前体</label>
+    <description>一坨经过封包之后完全认不出原料的玩意，只能扔进乌拉帝国铸铁仪中加工为钢铁。</description>
+    <graphicData>
+      <texPath>Wula/Item/WULA_Dark_Matter_Item</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <tickerType>Rare</tickerType>
+    <smeltable>false</smeltable>
+    <genericMarketSellable>false</genericMarketSellable>
+    <healthAffectsPrice>false</healthAffectsPrice>
+    <statBases>
+      <MaxHitPoints>60</MaxHitPoints>
+      <DeteriorationRate>6</DeteriorationRate>
+      <MarketValue>1</MarketValue>
+      <Mass>0.1</Mass>
+    </statBases>
+    <thingCategories>
+      <li>ResourcesRaw</li>
+    </thingCategories>
+  </ThingDef>
+  <RecipeDef>
+    <defName>Make_Wula_Organic_Precursor</defName>
+    <label>制造有机物前体</label>
+    <description>制造有机物前体以供乌拉帝国铸铁仪器使用</description>
+    <jobString>正在制造有机物前体。</jobString>
+    <workAmount>450</workAmount>
+    <workSpeedStat>CookSpeed</workSpeedStat>
+    <effectWorking>Cook</effectWorking>
+    <soundWorking>Recipe_CookMeal</soundWorking>
+    <allowMixingIngredients>true</allowMixingIngredients>
+    <ingredients>
+      <li>
+        <filter>
+          <customSummary>有机物</customSummary>
+          <categories>
+            <li>MeatRaw</li>
+            <li>AnimalProductRaw</li>
+            <li>PlantFoodRaw</li>
+          </categories>
+          <thingDefs>
+            <li>Hay</li>
+            <li>WoodLog</li>
+          </thingDefs>
+        </filter>
+        <count>30</count>
+      </li>
+    </ingredients>
+    <products>
+      <Wula_Organic_Precursor>30</Wula_Organic_Precursor>
+    </products>
+    <fixedIngredientFilter>
+      <categories>
+        <li>FoodRaw</li>
+      </categories>
+      <thingDefs>
+        <li>Hay</li>
+        <li>WoodLog</li>
+      </thingDefs>
+    </fixedIngredientFilter>
+    <defaultIngredientFilter>
+      <categories>
+        <li>Foods</li>
+      </categories>
+      <thingDefs>
+        <li>Hay</li>
+      </thingDefs>
+    </defaultIngredientFilter>
+    <workSkill>Cooking</workSkill>
+  </RecipeDef>
+
   <ThingDef Abstract="True" Name="WULA_Syhth_Trainer">
     <!-- <defName>WULA_Syhth_Trainer</defName>
     <label>乌拉帝国技能预设</label> -->

1.6/1.6/Defs/ThingDefs_Buildings/Buildings_WULA.xml

@@ -277,7 +277,6 @@
   <ThingDef ParentName="BasicBedBase">
     <defName>WULA_Charging_Station_Synth</defName>
     <thingClass>Building_Bed</thingClass>
-    <tickerType>Normal</tickerType>
     <label>合成人充电站</label>
     <description>一台供乌拉帝国合成人进行机体充能和改装的检修站，当机械乌拉需要充电时会优先前往此处充电。</description>
     <tickerType>Normal</tickerType>
@@ -836,4 +835,78 @@
       <li>PlaceWorker_PreventInteractionSpotOverlap</li>
     </placeWorkers>
   </ThingDef>
+
+  <!-- 产铁机 -->
+  <ThingDef ParentName="BuildingBase">
+    <defName>WULA_Steel_Assembler</defName>
+    <label>乌拉帝国铸铁仪</label>
+    <description>一台来自于乌拉帝国的极其复杂的机器，无法在边缘世界建造。其可以将有机物转化通过分子重构转换为无机物钢铁，以辅助乌拉帝国殖民地的开拓进程。</description>
+    <thingClass>Building</thingClass>
+    <minifiedDef>MinifiedThing</minifiedDef>
+    <graphicData>
+      <texPath>Things/Building/Production/FabricationBench</texPath>
+      <graphicClass>Graphic_Multi</graphicClass>
+      <drawSize>(3.5, 1.5)</drawSize>
+      <damageData>
+        <cornerTL>Damage/Corner</cornerTL>
+        <cornerTR>Damage/Corner</cornerTR>
+        <cornerBL>Damage/Corner</cornerBL>
+        <cornerBR>Damage/Corner</cornerBR>
+      </damageData>
+    </graphicData>
+    <altitudeLayer>Building</altitudeLayer>
+    <passability>PassThroughOnly</passability>
+    <fillPercent>0.5</fillPercent>
+    <pathCost>70</pathCost>
+    <rotatable>true</rotatable>
+    <thingCategories>
+      <li>BuildingsMisc</li>
+    </thingCategories>
+    <statBases>
+      <MaxHitPoints>1000</MaxHitPoints>
+      <Flammability>0</Flammability>
+      <Beauty>-15</Beauty>
+      <Mass>20</Mass>
+    </statBases>
+    <tickerType>Normal</tickerType>
+    <size>(3,3)</size>
+    <comps>
+      <!-- Power Connection -->
+      <li Class="CompProperties_Power">
+        <compClass>CompPowerTrader</compClass>
+        <basePowerConsumption>100</basePowerConsumption>
+      </li>
+      <li Class="CompProperties_Flickable"/>
+      
+      <li Class="WulaFallenEmpire.CompProperties_MultiFuelSpawner">
+        <spawnIntervalRange>120000~120000</spawnIntervalRange>
+        <products>
+          <li>
+            <thingDef>Steel</thingDef>
+            <count>100</count>
+          </li>
+        </products>
+        <showMessageIfOwned>true</showMessageIfOwned>
+      </li>
+
+      <li Class="WulaFallenEmpire.CompProperties_RefuelableWithKey">
+        <saveKeysPrefix>steel</saveKeysPrefix>
+        <fuelLabel>有机物储量</fuelLabel>
+        <fuelFilter>
+          <thingDefs>
+            <li>Wula_Organic_Precursor</li>
+          </thingDefs>
+        </fuelFilter>
+        <fuelCapacity>200</fuelCapacity>
+        <fuelConsumptionRate>10</fuelConsumptionRate>
+        <canEjectFuel>true</canEjectFuel>
+        <autoRefuelPercent>1</autoRefuelPercent>
+        <consumeFuelOnlyWhenUsed>false</consumeFuelOnlyWhenUsed>
+        <showAllowAutoRefuelToggle>true</showAllowAutoRefuelToggle>
+        <targetFuelLevelConfigurable>true</targetFuelLevelConfigurable>
+      </li>
+      <li Class="CompProperties_Breakdownable"/>
+    </comps>
+    <terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
+  </ThingDef>
 </Defs>

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

@@ -1541,6 +1541,7 @@
     </statBases>
     <recipeMaker>
       <recipeUsers Inherit="False">
+        <li>WULA_Cube_Productor_BIO</li>
         <li>WULA_Cube_Productor_Energy</li>
       </recipeUsers>
       <researchPrerequisite>WULA_Synth_Weapon_2_Missile_Technology</researchPrerequisite>
@@ -1638,7 +1639,6 @@
           <min>60</min>
           <max>120</max>
         </destroyTicksAfterLosingTrack>
-        <tailFleckDef>WULA_GunTail_Blue</tailFleckDef>
         <impactThreshold>1</impactThreshold>
       </li>
     </modExtensions>

1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Balistic_Weapon.xml

@@ -33,8 +33,7 @@
       <li>
         <verbClass>Verb_Shoot</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
-        <!-- <defaultProjectile>Bullet_AssaultRifle</defaultProjectile> -->
-        <defaultProjectile>Bullet_WULA_Weapon_Plasm_HomingExplosive</defaultProjectile>
+        <defaultProjectile>Bullet_AssaultRifle</defaultProjectile>
         <warmupTime>1</warmupTime>
         <range>25</range>
         <burstShotCount>1</burstShotCount>

1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Missile_Weapon.xml

@@ -90,7 +90,6 @@
           <min>60</min>
           <max>120</max>
         </destroyTicksAfterLosingTrack>
-        <tailFleckDef>WULA_GunTail_Blue</tailFleckDef>
         <impactThreshold>1</impactThreshold>
       </li>
     </modExtensions>

1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml

@@ -1313,7 +1313,12 @@
       </lifeStageAges>
       <!-- <thinkTreeConstant>WarUrchinConstant</thinkTreeConstant> -->
       <!-- <baseHealthScale>4</baseHealthScale> -->
-       <canFlyInVacuum>true</canFlyInVacuum>
+      <!-- <canFlyInVacuum>true</canFlyInVacuum> -->
+      <deathAction Class="DeathActionProperties_Vanish">
+        <workerClass>DeathActionWorker_Vanish</workerClass>
+        <filth>Filth_MachineBits</filth>
+        <filthCountRange>1~2</filthCountRange>
+      </deathAction>
     </race>
     <comps>
       <!--加上这个组件的机械体会直接跳过原版指挥范围判定-->
@@ -1372,7 +1377,12 @@
       </lifeStageAges>
       <!-- <thinkTreeConstant>WarUrchinConstant</thinkTreeConstant> -->
       <!-- <baseHealthScale>4</baseHealthScale> -->
-      <canFlyInVacuum>true</canFlyInVacuum>
+      <!-- <canFlyInVacuum>true</canFlyInVacuum> -->
+      <deathAction Class="DeathActionProperties_Vanish">
+        <workerClass>DeathActionWorker_Vanish</workerClass>
+        <filth>Filth_MachineBits</filth>
+        <filthCountRange>1~2</filthCountRange>
+      </deathAction>
     </race>
     <comps>
       <!--
@@ -1483,7 +1493,12 @@
       </lifeStageAges>
       <!-- <thinkTreeConstant>WarUrchinConstant</thinkTreeConstant> -->
       <!-- <baseHealthScale>4</baseHealthScale> -->
-       <canFlyInVacuum>true</canFlyInVacuum>
+       <!-- <canFlyInVacuum>true</canFlyInVacuum> -->
+      <deathAction Class="DeathActionProperties_Vanish">
+        <workerClass>DeathActionWorker_Vanish</workerClass>
+        <filth>Filth_MachineBits</filth>
+        <filthCountRange>1~2</filthCountRange>
+      </deathAction>
     </race>
     <comps>
       <!--加上这个组件的机械体会直接跳过原版指挥范围判定-->

1.6/1.6/Patches/Patch.xml

@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
-    <Operation Class="PatchOperationSequence" MayRequire="Ludeon.RimWorld.Odyssey">
-        <operations>
-            <li Class="PatchOperationAdd">
-                <xpath>*/ThingDef[defName = "GravEngine"]/comps/li[@Class = "CompProperties_AffectedByFacilities"]/linkableFacilities</xpath>
-                <value>
-                    <li>Wula_DarkEnergy_FuelTank</li>
-                </value>
-            </li>
-        </operations>
-    </Operation>
+  <Operation Class="PatchOperationSequence" MayRequire="Ludeon.RimWorld.Odyssey">
+    <operations>
+      <li Class="PatchOperationAdd">
+        <xpath>*/ThingDef[defName = "GravEngine"]/comps/li[@Class = "CompProperties_AffectedByFacilities"]/linkableFacilities</xpath>
+        <value>
+          <li>Wula_DarkEnergy_FuelTank</li>
+        </value>
+      </li>
+    </operations>
+  </Operation>
+  <Operation Class="PatchOperationSequence">
+    <operations>
+      <li Class="PatchOperationAdd">
+          <xpath>*/ThingDef[defName = "TableButcher"]/recipes</xpath>
+          <value>
+            <li>Make_Wula_Organic_Precursor</li>
+          </value>
+      </li>
+    </operations>
+  </Operation>
 </Patch>

1.6/Odyssey/Defs/ThingDefs_Buildings/Building_WULA_Shuttle.xml

@@ -35,15 +35,7 @@
       <Comfort>0.65</Comfort>
     </statBases>
     <tickerType>Normal</tickerType>
-    <designationCategory>WULA_Buildings</designationCategory>
     <constructionSkillPrerequisite>8</constructionSkillPrerequisite>
-    <costList>
-      <Steel>300</Steel>
-      <Plasteel>200</Plasteel>
-      <ComponentIndustrial>8</ComponentIndustrial>
-      <ComponentSpacer>2</ComponentSpacer>
-      <ShuttleEngine>1</ShuttleEngine>
-    </costList>
     <canOverlapZones>true</canOverlapZones>
     <killedLeavings>
       <Steel>60</Steel>
@@ -79,9 +71,9 @@
       <li>ITab_ContentsTransporter</li>
       <li>ITab_Shells</li>
     </inspectorTabs>
-    <researchPrerequisites>
+    <!-- <researchPrerequisites>
       <li>Shuttles</li>
-    </researchPrerequisites>
+    </researchPrerequisites> -->
     <comps>
       <li Class="CompProperties_Shuttle">
         <shipDef>Ship_ArmedShuttle</shipDef>
@@ -153,7 +145,7 @@
     <blockWind>true</blockWind>
     <passability>PassThroughOnly</passability>
     <fillPercent>0.5</fillPercent>
-    <size>(4,4)</size>
+    <size>(2,2)</size>
     <drawHighlight>true</drawHighlight>
     <highlightColor>(0.56, 0.62, 0.9)</highlightColor>
     <uiIconScale>1</uiIconScale>
@@ -161,10 +153,11 @@
       <graphicClass>Graphic_Multi</graphicClass>
       <texPath>Wula/Building/WULA_ArmedShuttle</texPath>
       <shaderType>CutoutComplex</shaderType>
-      <drawSize>(4,4)</drawSize>
+      <drawSize>(3,3.25)</drawSize>
+      <drawOffset>(0, 8, 0.8)</drawOffset>
       <shadowData>
-        <volume>(1.4, 1, 1.3)</volume>
-        <offset>(-0.5, 0, -0.1)</offset>
+        <volume>(1, 1, 1)</volume>
+        <offset>(0, 0, -1.2)</offset>
       </shadowData>
     </graphicData>
     <staticSunShadowHeight Inherit="False" IsNull="True" />
@@ -195,7 +188,7 @@
     </killedLeavings>
     <rotatable>true</rotatable>
     <hasInteractionCell>true</hasInteractionCell>
-    <interactionCellOffset>(2, 0, 0)</interactionCellOffset>
+    <interactionCellOffset>(0, 1, 0)</interactionCellOffset>
     <defaultPlacingRot>East</defaultPlacingRot>
     <selectable>true</selectable>
     <terrainAffordanceNeeded>Light</terrainAffordanceNeeded>
@@ -338,7 +331,7 @@
     <techLevel>Ultra</techLevel>
     <relicChance>0</relicChance>
     <graphicData>
-      <texPath>Wula/Weapon/WULA_WM_Panzer_Autocannon</texPath>
+      <texPath>Wula/Weapon/WULA_Weapon_Empty</texPath>
       <graphicClass>Graphic_Single</graphicClass>
       <drawSize>2</drawSize>
     </graphicData>
@@ -413,11 +406,12 @@
       <graphicClass>Graphic_Multi</graphicClass>
       <texPath>Wula/Building/WULA_ArmedShuttle</texPath>
       <shaderType>CutoutComplex</shaderType>
-      <drawSize>(4,4)</drawSize>
+      <drawSize>(3,3.25)</drawSize>
+      <drawOffset>(0, 8, 0.8)</drawOffset>
     </graphicData>
     <staticSunShadowHeight Inherit="False" IsNull="True" />
     <castEdgeShadows>False</castEdgeShadows>
-    <size>(4,4)</size>
+    <size>(2,2)</size>
     <skyfaller>
       <anticipationSound>Shuttle_Landing</anticipationSound>
       <anticipationSoundTicks>250</anticipationSoundTicks>
@@ -455,11 +449,12 @@
       <graphicClass>Graphic_Multi</graphicClass>
       <texPath>Wula/Building/WULA_ArmedShuttle</texPath>
       <shaderType>CutoutComplex</shaderType>
-      <drawSize>(4,4)</drawSize>
+      <drawSize>(3,3.25)</drawSize>
+      <drawOffset>(0, 8, 0.8)</drawOffset>
     </graphicData>
     <staticSunShadowHeight Inherit="False" IsNull="True" />
     <castEdgeShadows>False</castEdgeShadows>
-    <size>(4,4)</size>
+    <size>(2,2)</size>
     <skyfaller>
       <reversed>true</reversed>
       <anticipationSound>Shuttle_Leaving</anticipationSound>
@@ -490,15 +485,20 @@
       </speedCurve>
     </skyfaller>
   </ThingDef>
-
   <TransportShipDef>
     <defName>Ship_ArmedShuttle</defName>
     <label>武装穿梭机</label>
     <shipThing>WULA_ArmedShuttle</shipThing>
     <arrivingSkyfaller>ArmedShuttleIncoming_WULA</arrivingSkyfaller>
     <leavingSkyfaller>ArmedShuttleLeaving_WULA</leavingSkyfaller>
-    <worldObject>PassengerShuttle</worldObject>
+    <worldObject>Wula_ArmedShuttle_Object</worldObject>
     <playerShuttle>true</playerShuttle>
   </TransportShipDef>
-
+  <WorldObjectDef ParentName="ShuttleWorldObjectBase">
+    <defName>Wula_ArmedShuttle_Object</defName>
+    <label>乌拉帝国武装穿梭机</label>
+    <description>一台正在飞行的乌拉帝国武装穿梭机。</description>
+    <expandingIconTexture>World/WorldObjects/Expanding/Wula_ArmedShuttle</expandingIconTexture>
+    <expandingIconDrawSize>1</expandingIconDrawSize>
+  </WorldObjectDef>
 </Defs>