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

1.6/1.6/Defs/FleshTypeDefs/FleshType_WULA.xml

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 
 <Defs>
   <FleshTypeDef>
     <defName>WULA_Fleshtype</defName>
     <corpseCategory>CorpsesMechanoid</corpseCategory>
     <damageEffecter>Damage_HitMechanoid</damageEffecter>
-    <isOrganic>true</isOrganic>
+    <isOrganic>false</isOrganic>
     <genericWounds>
       <li>
         <texture>Things/Pawn/Wounds/WoundMechA</texture>

1.6/1.6/Defs/JobDefs/WULA_JobDefs.xml

@@ -4,37 +4,30 @@
   <JobDef>
     <defName>WULA_EnterMaintenancePod</defName>
     <driverClass>WulaFallenEmpire.JobDriver_EnterMaintenancePod</driverClass>
-    <reportString>正在进入维护舱。</reportString>
+    <reportString>正在进入维护舱</reportString>
     <allowOpportunisticPrefix>true</allowOpportunisticPrefix>
   </JobDef>
 
   <JobDef>
     <defName>WULA_IngestWulaEnergy</defName>
     <driverClass>WulaFallenEmpire.JobDriver_IngestWulaEnergy</driverClass>
-    <reportString>正在摄取能量。</reportString>
+    <reportString>正在摄取能量</reportString>
     <allowOpportunisticPrefix>true</allowOpportunisticPrefix>
   </JobDef>
 
   <JobDef>
     <defName>WULA_FeedWulaPatient</defName>
     <driverClass>WulaFallenEmpire.JobDriver_FeedWulaPatient</driverClass>
-    <reportString>正在喂食能量核心。</reportString>
+    <reportString>正在喂食能量核心</reportString>
     <allowOpportunisticPrefix>true</allowOpportunisticPrefix>
   </JobDef>
 
   <JobDef>
     <defName>WULA_HaulToMaintenancePod</defName>
     <driverClass>WulaFallenEmpire.JobDriver_HaulToMaintenancePod</driverClass>
-    <reportString>正在将TargetA抬到TargetB。</reportString>
+    <reportString>正在将TargetA抬到TargetB</reportString>
     <allowOpportunisticPrefix>true</allowOpportunisticPrefix>
     <casualInterruptible>false</casualInterruptible>
   </JobDef>
 
-  <JobDef>
-    <defName>WULA_LayDownToCharge</defName>
-    <driverClass>WulaFallenEmpire.JobDriver_WulaLayDownToCharge</driverClass>
-    <reportString>正在充电。</reportString>
-    <casualInterruptible>false</casualInterruptible>
-  </JobDef>
-
 </Defs>

1.6/1.6/Defs/ThingDefs_Buildings/Buildings_WULA.xml

@@ -269,6 +269,7 @@
   <ThingDef ParentName="BasicBedBase">
     <defName>WULA_Charging_Station_Synth</defName>
     <thingClass>Building_Bed</thingClass>
+    <tickerType>Normal</tickerType>
     <label>合成人修复站</label>
     <description>一台供乌拉帝国合成人进行机体修复的检修站。</description>
     <tickerType>Normal</tickerType>

1.6/1.6/Defs/ThinkTreeDefs/WULA_ThinkTrees.xml

@@ -265,21 +265,30 @@
               <emergency>true</emergency>
             </li>
             
-            <!-- Get Wula energy (only if starving) -->
-            <li Class="ThinkNode_ConditionalNeedPercentageAbove">
-              <need>WULA_Energy</need>
-              <threshold>0.5</threshold> <!-- 能量低于10%时触发 -->
-              <invert>true</invert>
+            <!-- Satisfy Needs -->
+            <li Class="ThinkNode_Tagger">
+              <tagToGive>SatisfyingNeeds</tagToGive>
               <subNodes>
-                <li Class="ThinkNode_Tagger">
-                  <tagToGive>SatisfyingNeeds</tagToGive>
+                <li Class="ThinkNode_PrioritySorter">
                   <subNodes>
+                    <li Class="JobGiver_Autofeed" MayRequire="Ludeon.RimWorld.Biotech" />
                     <li Class="WulaFallenEmpire.JobGiver_WulaGetEnergy">
                       <leaveJoinableLordIfIssuesJob>true</leaveJoinableLordIfIssuesJob>
                       <minEnergyLevelPercentage>0.3</minEnergyLevelPercentage>
-                      <maxEnergyLevelPercentage>0.9</maxEnergyLevelPercentage>
+                      <maxEnergyLevelPercentage>1.0</maxEnergyLevelPercentage>
                       <emergencyPriority>9.5</emergencyPriority>
                     </li>
+                    <li Class="JobGiver_SatisfyChemicalNeed"/>
+                    <li Class="JobGiver_SatifyChemicalDependency" MayRequire="Ludeon.RimWorld.Biotech" />
+                    <li Class="JobGiver_GetHemogen" MayRequire="Ludeon.RimWorld.Biotech" />
+                    <li Class="JobGiver_GetDeathrest" MayRequire="Ludeon.RimWorld.Biotech" />
+                    <li Class="ThinkNode_Priority_GetJoy">
+                      <subNodes>
+                        <li Class="JobGiver_GetJoy"/>
+                        <li Class="JobGiver_GetJoyInBed"/>
+                      </subNodes>
+                    </li>
+                    <li Class="JobGiver_Meditate"/>
                   </subNodes>
                 </li>
               </subNodes>

1.6/Anomaly/Defs/ThingDefs/WULA_FE_Spiritualist_Item.xml

@@ -57,7 +57,7 @@
         </li>
       </outcomeDoers>
     </ingestible>
-    <recipeMaker Inherit="False"/>
+    <recipeMaker Inherit="False" IsNull="True"/>
       <!-- <researchPrerequisite>PsychiteRefining</researchPrerequisite>
       <soundWorking>Recipe_Drug</soundWorking>
       <displayPriority>1700</displayPriority>

1.6/Defs/JobDefs/WULA_Jobs.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-  <JobDef>
-    <defName>WULA_LayDownToCharge</defName>
-    <driverClass>WulaFallenEmpire.JobDriver_WulaLayDownToCharge</driverClass>
-    <reportString>正在充电。</reportString>
-    <casualInterruptible>false</casualInterruptible>
-  </JobDef>
-</Defs>

1.6/Odyssey/Defs/WeaponTraitDefs/WULA_WeaponTraitDefs.xml

@@ -33,6 +33,17 @@
     <statFactors>
     </statFactors>
   </WeaponTraitDef>
+  <WeaponTraitDef>
+    <defName>WULA_MissileLauncher</defName>
+    <label>乌拉帝国导弹</label>
+    <description>这把武器的抛射体会跟踪敌人，如果没有明确的敌人作为目标，则会在落地前散开以形成轰炸区。</description>
+    <commonality>1</commonality>
+    <weaponCategory>WULA_Missile</weaponCategory>
+    <statOffsets>
+    </statOffsets>
+    <statFactors>
+    </statFactors>
+  </WeaponTraitDef>
   <WeaponTraitDef>
     <defName>WULA_Melee_Cleave</defName>
     <label>溅射伤害</label>