diff --git a/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/Assemblies/WulaFallenEmpire.dll
index aebff2a8..8df64fec 100644
Binary files a/1.6/Assemblies/WulaFallenEmpire.dll and b/1.6/Assemblies/WulaFallenEmpire.dll differ
diff --git a/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA.xml b/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA.xml
index 0d8b9e9d..91f08251 100644
--- a/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA.xml
+++ b/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA.xml
@@ -558,90 +558,7 @@
false
-
- WULA_AI_Heavy_Panzer_Body
-
-
- Torso
- Middle
- Outside
-
- Torso
-
-
-
-
- WULA_Outer_Armor_Bodypart
- 0.99
- Top
-
- Torso
-
-
-
- WULA_Panzer_Core_Bodypart
- 0.025
- Inside
-
- Torso
-
-
-
- WULA_AI_Core_Bodypart
- 0.025
- Inside
-
- Torso
-
-
-
- SightSensor
- 0.13
-
- Torso
-
-
-
- WULA_Panzer_OutBrust_Bodypart
- 第一反推喷气孔
- 0.025
- Inside
-
- Torso
-
-
-
- WULA_Panzer_OutBrust_Bodypart
- 第二反推喷气孔
- 0.025
- Inside
-
- Torso
-
-
-
- WULA_Panzer_OutBrust_Bodypart
- 第三反推喷气孔
- 0.025
- Inside
-
- Torso
-
-
-
- WULA_Panzer_OutBrust_Bodypart
- 第四反推喷气孔
- 0.025
- Inside
-
- Torso
-
-
-
-
-
-
-
+
Wula_AI_Engineer_Mother_Body
@@ -881,4 +798,5 @@
+
\ No newline at end of file
diff --git a/1.6/Defs/HediffDefs/Hediffs_WULA_Maintenance.xml b/1.6/Defs/HediffDefs/Hediffs_WULA_Maintenance.xml
index 73d90179..83a942da 100644
--- a/1.6/Defs/HediffDefs/Hediffs_WULA_Maintenance.xml
+++ b/1.6/Defs/HediffDefs/Hediffs_WULA_Maintenance.xml
@@ -6,7 +6,11 @@
如果缺乏定期维护,身体机能将会出现衰退迹象。需要进入维护舱进行修复。
HediffWithComps
(0.8, 0.35, 0.35)
- true
+ false
+ 0
+ 0
+ 2
+
60
@@ -41,7 +45,7 @@
Consciousness
- -0.10
+ -0.20
@@ -51,7 +55,17 @@
Consciousness
- -0.25
+ 0.5
+
+
+
+
+
+ 2.0
+
+
+ Consciousness
+ 0.1
diff --git a/1.6/Defs/JobDefs/WULA_JobDefs.xml b/1.6/Defs/JobDefs/WULA_JobDefs.xml
index 6bd73007..581a7251 100644
--- a/1.6/Defs/JobDefs/WULA_JobDefs.xml
+++ b/1.6/Defs/JobDefs/WULA_JobDefs.xml
@@ -2,7 +2,7 @@
- WULA_HaulToMaintenancePod
+ WULA_LoadComponentsToMaintenancePod
WulaFallenEmpire.JobDriver_HaulToMaintenancePod
正在为维护舱补充修复组件。
true
diff --git a/1.6/Defs/ThingDefs/WULA_Item.xml b/1.6/Defs/ThingDefs/WULA_Item.xml
index 3428a656..606a6493 100644
--- a/1.6/Defs/ThingDefs/WULA_Item.xml
+++ b/1.6/Defs/ThingDefs/WULA_Item.xml
@@ -59,7 +59,7 @@
- WULA_IngestWulaEnergy
+ Ingest
从能量核心中摄取能量
true
diff --git a/1.6/Defs/Buildings/Buildings_Structure.xml b/1.6/Defs/ThingDefs_Buildings/Buildings_Structure.xml
similarity index 100%
rename from 1.6/Defs/Buildings/Buildings_Structure.xml
rename to 1.6/Defs/ThingDefs_Buildings/Buildings_Structure.xml
diff --git a/Source/WulaFallenEmpire/CompMaintenancePod.cs b/Source/WulaFallenEmpire/CompMaintenancePod.cs
index 80891532..350206c7 100644
--- a/Source/WulaFallenEmpire/CompMaintenancePod.cs
+++ b/Source/WulaFallenEmpire/CompMaintenancePod.cs
@@ -241,7 +241,7 @@ namespace WulaFallenEmpire
List options = new List();
foreach (Pawn p in parent.Map.mapPawns.FreeColonists)
{
- if (p.health.hediffSet.HasHediff(Props.hediffToRemove))
+ if (Props.hediffToRemove != null && p.health.hediffSet.HasHediff(Props.hediffToRemove))
{
float required = RequiredComponents(p);
if (storedComponents >= required)
diff --git a/Source/WulaFallenEmpire/WorkGiver_HaulToMaintenancePod.cs b/Source/WulaFallenEmpire/WorkGiver_HaulToMaintenancePod.cs
index 838243d3..24b37049 100644
--- a/Source/WulaFallenEmpire/WorkGiver_HaulToMaintenancePod.cs
+++ b/Source/WulaFallenEmpire/WorkGiver_HaulToMaintenancePod.cs
@@ -54,7 +54,7 @@ namespace WulaFallenEmpire
return null;
}
- Job job = JobMaker.MakeJob(JobDefOf_WULA.WULA_HaulToMaintenancePod, component, t);
+ Job job = JobMaker.MakeJob(JobDefOf_WULA.WULA_LoadComponentsToMaintenancePod, component, t);
job.count = Math.Min(component.stackCount, (int)(comp.Props.capacity - comp.storedComponents));
return job;
}