From 04948911c8846277172b802626f4bfe7bfab800c Mon Sep 17 00:00:00 2001
From: "ProjectKoi-Kalo\\Kalo" <kalospacer@gmail.com>
Date: Tue, 13 Aug 2024 20:44:45 +0800
Subject: [PATCH] tempsave
---
1.5/Core/Defs/AbilityDef/AbilityDefs_Base.xml | 16 ++++++------
1.5/Core/Defs/Drugs/Drugs_Antibiotics.xml | 10 +++----
.../Defs/HediffDefs/Hediffs_AutomatonBase.xml | 26 ++++++++-----------
3 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/1.5/Core/Defs/AbilityDef/AbilityDefs_Base.xml b/1.5/Core/Defs/AbilityDef/AbilityDefs_Base.xml
index 5bb2285..1828e13 100644
--- a/1.5/Core/Defs/AbilityDef/AbilityDefs_Base.xml
+++ b/1.5/Core/Defs/AbilityDef/AbilityDefs_Base.xml
@@ -36,11 +36,11 @@
<hediffClass>HediffWithComps</hediffClass>
<comps>
<li Class="HediffCompProperties_RemoveIfApparelDropped" />
- <li Class="MoharHediffs.HediffCompProperties_PostRemoveTrigger_HediffAdd">
+ <!--<li Class="MoharHediffs.HediffCompProperties_PostRemoveTrigger_HediffAdd">
<triggeredHediff>
<li>PN_ModuleUnstable_Industrial</li>
</triggeredHediff>
- </li>
+ </li>-->
</comps>
<isBad>false</isBad>
</HediffDef>
@@ -49,11 +49,11 @@
<hediffClass>HediffWithComps</hediffClass>
<comps>
<li Class="HediffCompProperties_RemoveIfApparelDropped" />
- <li Class="MoharHediffs.HediffCompProperties_PostRemoveTrigger_HediffAdd">
+ <!--<li Class="MoharHediffs.HediffCompProperties_PostRemoveTrigger_HediffAdd">
<triggeredHediff>
<li>PN_ModuleUnstable_Spacer</li>
</triggeredHediff>
- </li>
+ </li>-->
</comps>
<isBad>false</isBad>
</HediffDef>
@@ -87,7 +87,7 @@
<showRemainingTime>True</showRemainingTime>
</li>
<li Class="HediffCompProperties_DisappearsOnDeath"/>
- <li Class="MoharHediffs.HediffCompProperties_HediffNullifier">
+ <!--<li Class="MoharHediffs.HediffCompProperties_HediffNullifier">
<hediffToNullify>
<li MayRequire="Ludeon.RimWorld.Ideology">PN_OfficerCommand</li>
<li MayRequire="Ludeon.RimWorld.Ideology">PN_MeisterAdvice</li>
@@ -98,7 +98,7 @@
<li MayRequire="Ludeon.RimWorld.Ideology">PN_CQC</li>
</hediffToNullify>
<showMessage>false</showMessage>
- </li>
+ </li>-->
</comps>
<stages>
@@ -117,7 +117,7 @@
<showRemainingTime>True</showRemainingTime>
</li>
<li Class="HediffCompProperties_DisappearsOnDeath"/>
- <li Class="MoharHediffs.HediffCompProperties_HediffNullifier">
+ <!--<li Class="MoharHediffs.HediffCompProperties_HediffNullifier">
<hediffToNullify>
<li MayRequire="Ludeon.RimWorld.Ideology">PN_OfficerCommand</li>
<li MayRequire="Ludeon.RimWorld.Ideology">PN_MeisterAdvice</li>
@@ -128,7 +128,7 @@
<li MayRequire="Ludeon.RimWorld.Ideology">PN_CQC</li>
</hediffToNullify>
<showMessage>false</showMessage>
- </li>
+ </li>-->
</comps>
<stages>
diff --git a/1.5/Core/Defs/Drugs/Drugs_Antibiotics.xml b/1.5/Core/Defs/Drugs/Drugs_Antibiotics.xml
index a126745..64e0fe0 100644
--- a/1.5/Core/Defs/Drugs/Drugs_Antibiotics.xml
+++ b/1.5/Core/Defs/Drugs/Drugs_Antibiotics.xml
@@ -39,7 +39,7 @@
<drugCategory>Medical</drugCategory>
<outcomeDoers>
<li Class="IngestionOutcomeDoer_GiveHediff">
- <hediffDef>PN_AB_Bridge</hediffDef>
+ <hediffDef>PN_AB_Effect</hediffDef>
<severity>1</severity>
</li>
</outcomeDoers>
@@ -76,7 +76,7 @@
<maxSeverity>1.0</maxSeverity>
<isBad>false</isBad>
<comps>
- <li Class="MoharHediffs.HediffCompProperties_MultipleHediff">
+ <!--<li Class="MoharHediffs.HediffCompProperties_MultipleHediff">
<hediffAndBodypart>
<li>
<hediff>PN_ateFuel</hediff>
@@ -86,7 +86,7 @@
</li>
</hediffAndBodypart>
<debug>false</debug>
- </li>
+ </li>-->
</comps>
</HediffDef>
@@ -100,13 +100,13 @@
<maxSeverity>1.0</maxSeverity>
<isBad>false</isBad>
<comps>
- <li Class="MoharHediffs.HediffCompProperties_HediffExclusive">
+ <!--<li Class="MoharHediffs.HediffCompProperties_HediffExclusive">
<hediffToApply>PN_AB_Effect</hediffToApply>
<bodyDefWhiteList>
<li>PNBody</li>
</bodyDefWhiteList>
<debug>false</debug>
- </li>
+ </li>-->
</comps>
</HediffDef>
diff --git a/1.5/Core/Defs/HediffDefs/Hediffs_AutomatonBase.xml b/1.5/Core/Defs/HediffDefs/Hediffs_AutomatonBase.xml
index b0b9343..e33f27b 100644
--- a/1.5/Core/Defs/HediffDefs/Hediffs_AutomatonBase.xml
+++ b/1.5/Core/Defs/HediffDefs/Hediffs_AutomatonBase.xml
@@ -12,13 +12,6 @@
<initialSeverity>1</initialSeverity>
<isBad>false</isBad>
<countsAsAddedPartOrImplant>true</countsAsAddedPartOrImplant>
- <disablesNeeds>
- <li>Outdoors</li>
- <li>DrugDesire</li>
- <li>RoomSize</li>
- <li>Comfort</li>
- <li MayRequire="Dubwise.DubsBadHygiene">Bladder</li>
- </disablesNeeds>
<stages>
<li>
<becomeVisible>false</becomeVisible>
@@ -78,6 +71,13 @@
<initialSeverity>1</initialSeverity>
<isBad>false</isBad>
<countsAsAddedPartOrImplant>true</countsAsAddedPartOrImplant>
+ <disablesNeeds>
+ <li>Outdoors</li>
+ <li>DrugDesire</li>
+ <li>RoomSize</li>
+ <li>Comfort</li>
+ <li MayRequire="Dubwise.DubsBadHygiene">Bladder</li>
+ </disablesNeeds>
<stages>
<li>
<becomeVisible>false</becomeVisible>
@@ -89,11 +89,7 @@
<InjuryHealingFactor>0</InjuryHealingFactor>
<Fertility MayRequire="Ludeon.RimWorld.Biotech">0</Fertility>
</statFactors>
- </li>
- </stages>
- <comps>
- <li Class="MoharHediffs.HediffCompProperties_HediffNullifier">
- <hediffToNullify>
+ <makeImmuneTo>
<li>Carcinoma</li>
<li>BadBack</li>
<li>Frail</li>
@@ -115,10 +111,10 @@
<li>GoJuiceTolerance</li>
<li>Pregnant</li>
<li MayRequire="Ludeon.RimWorld.Biotech">PregnantHuman</li>
- </hediffToNullify>
- <showMessage>true</showMessage>
- <nullifyKey>PN_HediffNullifier</nullifyKey>
+ </makeImmuneTo>
</li>
+ </stages>
+ <comps>
</comps>
<modExtensions>
<li Class="YORHG.HediffDefModExtension">