diff --git a/.gitignore b/.gitignore
index f3c1ee97..6e3801a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,4 +34,3 @@ Source/MCP/pid.txt
*.log
MCP/vector_cache/*.txt
MCP/mcpserver.log
-Source/ai_studio_code.txt
diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll
index fcd5bd41..887dd0ad 100644
Binary files a/1.6/1.6/Assemblies/WulaFallenEmpire.dll and b/1.6/1.6/Assemblies/WulaFallenEmpire.dll differ
diff --git a/1.6/1.6/Defs/FleshTypeDefs/FleshType_WULA.xml b/1.6/1.6/Defs/FleshTypeDefs/FleshType_WULA.xml
index 3a82395b..80a0d4a3 100644
--- a/1.6/1.6/Defs/FleshTypeDefs/FleshType_WULA.xml
+++ b/1.6/1.6/Defs/FleshTypeDefs/FleshType_WULA.xml
@@ -5,7 +5,7 @@
WULA_Fleshtype
CorpsesMechanoid
Damage_HitMechanoid
- false
+ true
Things/Pawn/Wounds/WoundMechA
@@ -21,6 +21,77 @@
Wula/Things/WulaSpecies/Wounds/WULA_Species_Wound_None
+
+
diff --git a/Source/WulaFallenEmpire/JobGiver_WulaGetEnergy.cs b/Source/WulaFallenEmpire/JobGiver_WulaGetEnergy.cs
index 1f6065b9..f0fec919 100644
--- a/Source/WulaFallenEmpire/JobGiver_WulaGetEnergy.cs
+++ b/Source/WulaFallenEmpire/JobGiver_WulaGetEnergy.cs
@@ -20,6 +20,12 @@ namespace WulaFallenEmpire
return 0f;
}
+ // 如果Pawn已经有充电Hediff,则不需要充电
+ if (pawn.health.hediffSet.HasHediff(HediffDef.Named("WULA_ChargingHediff")))
+ {
+ return 0f;
+ }
+
// 如果能量已充满,则不需要充电
if (energyNeed.CurLevel >= energyNeed.MaxLevel)
{