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

1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml

@@ -449,6 +449,7 @@
         </bodyGraphicData>
       </li>
     </lifeStages>
+    <forceDeathOnDowned>true</forceDeathOnDowned>
     <combatPower>0</combatPower>
     <factionLeader>true</factionLeader>
     <minGenerationAge>18</minGenerationAge>

1.6/1.6/Defs/QuestScriptDefs/WULA_Colony_Promotion.xml

@@ -330,9 +330,9 @@
               <onDays>1.0</onDays>
               <offDays>0.5</offDays>
               <minSpacingDays>0.04</minSpacingDays>
-              <numIncidentsRange>1~2</numIncidentsRange>
+              <numIncidentsRange>1~1.5</numIncidentsRange>
-              <currentThreatPointsFactor>1.75</currentThreatPointsFactor>
+              <currentThreatPointsFactor>1.1</currentThreatPointsFactor>
-              <minThreatPoints>1000</minThreatPoints>
+              <minThreatPoints>500</minThreatPoints>
             </parms>
           </node>          
         </li>

1.6/1.6/Defs/RecipeDefs/Recipes_WULA.xml

@@ -65,6 +65,42 @@
       <li>WULA_Colony_License_LV1_Technology</li>
     </researchPrerequisites>
   </RecipeDef>
+  <RecipeDef>
+    <defName>Make_Component_By_WULA_Cube_Productor</defName>
+    <label>制作零部件</label>
+    <description>用乌拉帝国编织体制造零部件，耗时较精密装配台更长，并且耗费的资源更多。</description>
+    <jobString>正在制作零部件</jobString>
+    <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+    <!-- <requiredGiverWorkType>Crafting</requiredGiverWorkType> -->
+    <effectWorking>Smith</effectWorking>
+    <soundWorking>Recipe_Smith</soundWorking>
+    <workAmount>8500</workAmount>
+    <unfinishedThingDef>UnfinishedComponent</unfinishedThingDef>
+    <ingredients>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>WULA_Alloy</li>
+          </thingDefs>
+        </filter>
+        <count>10</count>
+      </li>
+    </ingredients>
+    <fixedIngredientFilter>
+      <thingDefs>
+        <li>WULA_Alloy</li>
+      </thingDefs>
+    </fixedIngredientFilter>
+    <products>
+      <ComponentIndustrial>1</ComponentIndustrial>
+    </products>
+    <workSkill>Crafting</workSkill>
+    <displayPriority>100</displayPriority>
+    
+    <researchPrerequisites>
+      <li>WULA_Colony_License_LV1_Technology</li>
+    </researchPrerequisites>
+  </RecipeDef>
 
   <!-- T2 -->
   <RecipeDef>
@@ -210,42 +246,6 @@
       <li>WULA_Colony_License_LV2_Technology</li>
     </researchPrerequisites>
   </RecipeDef>
-  <RecipeDef>
-    <defName>Make_Component_By_WULA_Cube_Productor</defName>
-    <label>制作零部件</label>
-    <description>用乌拉帝国编织体制造零部件，耗时较精密装配台更长，并且耗费的资源更多。</description>
-    <jobString>正在为乌拉帝国能源核心充能</jobString>
-    <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-    <!-- <requiredGiverWorkType>Crafting</requiredGiverWorkType> -->
-    <effectWorking>Smith</effectWorking>
-    <soundWorking>Recipe_Smith</soundWorking>
-    <workAmount>8500</workAmount>
-    <unfinishedThingDef>UnfinishedComponent</unfinishedThingDef>
-    <ingredients>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>WULA_Alloy</li>
-          </thingDefs>
-        </filter>
-        <count>10</count>
-      </li>
-    </ingredients>
-    <fixedIngredientFilter>
-      <thingDefs>
-        <li>WULA_Alloy</li>
-      </thingDefs>
-    </fixedIngredientFilter>
-    <products>
-      <ComponentIndustrial>1</ComponentIndustrial>
-    </products>
-    <workSkill>Crafting</workSkill>
-    <displayPriority>100</displayPriority>
-    
-    <researchPrerequisites>
-      <li>WULA_Colony_License_LV2_Technology</li>
-    </researchPrerequisites>
-  </RecipeDef>
 
   <!-- T3 -->
   <RecipeDef>

1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml

@@ -117,7 +117,7 @@
   <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_Colony_License_LV2_Technology</defName>
     <label>乌拉帝国殖民地许可：等级2</label>
-    <description>乌拉帝国的第二阶殖民地许可，代表此殖民地已经被乌拉帝国赋予更多特权，许可不会为殖民地带来什么好处，但是提升许可是继续研究乌拉帝国科技的重要条件。</description>
+    <description>乌拉帝国的第二阶殖民地许可，代表此殖民地已经被乌拉帝国赋予更多特权，许可不会为殖民地带来什么好处，但是提升许可是继续研究乌拉帝国科技的重要条件。\n\n要获得许可，你需要建造&lt;color=#6BB7B7>&lt;i>乌拉帝国作业通讯台&lt;/i>&lt;/color>，指派一名殖民者联系乌拉帝国行星封锁机关的长官，并开启审查流程任务，任务完成后将给予此许可。</description>
     <baseCost>15000</baseCost>
     <researchViewX>4.00</researchViewX>
     <researchViewY>3.20</researchViewY>
@@ -190,6 +190,7 @@
       <li>Wula_PIA_Legion_Faction</li>
     </heldByFactionCategoryTags>
     <prerequisites>
+      <li>Fabrication</li>
       <li>WULA_Colony_License_LV2_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
@@ -462,7 +463,6 @@
     <researchViewX>2.00</researchViewX>
     <researchViewY>0.90</researchViewY>
     <prerequisites>
-      <li>Fabrication</li>
       <li>WULA_WeaponArmor_Productor_Technology</li>
     </prerequisites>
   </ResearchProjectDef>

1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml

@@ -568,7 +568,7 @@
       </li>
       <li Class="CompProperties_Flickable"/>
       <li Class="CompProperties_Refuelable">
-        <fuelCapacity>20.0</fuelCapacity>
+        <fuelCapacity>3</fuelCapacity>
         <fuelFilter>
           <thingDefs>
             <li>ComponentIndustrial</li>
@@ -577,7 +577,9 @@
         <fuelLabel>零部件</fuelLabel>
         <consumeFuelOnlyWhenUsed>true</consumeFuelOnlyWhenUsed>
         <showAllowAutoRefuelToggle>true</showAllowAutoRefuelToggle>
-        <targetFuelLevelConfigurable>true</targetFuelLevelConfigurable>
+        <targetFuelLevelConfigurable>false</targetFuelLevelConfigurable>
+        <autoRefuelPercent>1</autoRefuelPercent>
+        <initialConfigurableTargetFuelLevel>3</initialConfigurableTargetFuelLevel>
       </li>
       <li Class="WulaFallenEmpire.CompProperties_MaintenancePod">
         <enterSound>BiosculpterPod_Enter</enterSound>
@@ -727,6 +729,10 @@
       <ComponentIndustrial>2</ComponentIndustrial>
     </costList>
     <altitudeLayer>Building</altitudeLayer>
+    <passability>Impassable</passability>
+    <blockWind>true</blockWind>
+    <fillPercent>1</fillPercent>
+    <blockLight>true</blockLight>
     <castEdgeShadows>false</castEdgeShadows>
     <fillPercent>0.5</fillPercent>
     <useHitPoints>True</useHitPoints>
@@ -745,7 +751,6 @@
     </recipes>
     <size>(3,3)</size>
     <uiOrder>2120</uiOrder>
-    <passability>PassThroughOnly</passability>
     <pathCost>50</pathCost>
     <hasInteractionCell>false</hasInteractionCell>
     <surfaceType>Item</surfaceType>

1.6/1.6/Defs/TraitDefs/Traits_WULA.xml

@@ -162,6 +162,7 @@
   </TraitDef>
   <TraitDef>
     <defName>WULA_Trait_Broken_Personality</defName>
+    <commonality>0</commonality>
     <degreeDatas>
       <li>
         <label>破碎人格</label>