Merge Duplicate Def into Patch

- GameConditionDef - MentalBreakDef
masakitenchi · Jun 29, 2024 · 9eba04c · 9eba04c
1 parent e8d9887
commit 9eba04c
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 59 deletions.
diff --git a/Mods/Core_SK/Defs/GameConditionDefs/GameConditions_SK.xml b/Mods/Core_SK/Defs/GameConditionDefs/GameConditions_SK.xml
@@ -281,20 +281,6 @@ It will last anywhere between a season to several years.</description>
 		<allowUnderground>false</allowUnderground>
 	</GameConditionDef>
 
-	<GameConditionDef>
-		<defName>SunBlocker</defName>
-		<conditionClass>SK.Events.GameCondition_Eclipse</conditionClass>
-		<label>sun blocked</label>
-		<description>A nearby sun blocker machine is turning the upper atmosphere opaque, blocking the sun.</description>
-		<letterText>A sun blocker machine has begun blocking the sun.</letterText>
-		<letterDef>NegativeEvent</letterDef>
-		<canBePermanent>true</canBePermanent>
-		<allowUnderground>false</allowUnderground>
-		<silencedByConditions>
-			<li MayRequire="Ludeon.RimWorld.Anomaly">UnnaturalDarkness</li>
-		</silencedByConditions>
-	</GameConditionDef>
-
 	<GameConditionDef>
 		<defName>StorytellerFrenzy</defName>
 		<label>storyteller frenzy</label>

diff --git a/Mods/Core_SK/Defs/MentalStateDefs/MentalStates_Mood.xml b/Mods/Core_SK/Defs/MentalStateDefs/MentalStates_Mood.xml
diff --git a/Mods/Core_SK/Defs/ThingDefs_Buildings/Buildings_Exotic.xml b/Mods/Core_SK/Defs/ThingDefs_Buildings/Buildings_Exotic.xml
@@ -91,16 +91,6 @@
 		</building>
 	</ThingDef>
 
-	<GameConditionDef>
-		<defName>PsychicDroner</defName>
-		<conditionClass>GameCondition_PsychicEmanation</conditionClass>
-		<label>psychic droner</label>
-		<description>A psychic droner tuned to the {0} gender is driving {0}s mad.</description>
-		<letterText>A psychic droner machine has begun affecting this region.</letterText>
-		<canBePermanent>false</canBePermanent>
-		<natural>false</natural>
-	</GameConditionDef>
-
 	<!-- =============================== Defoliator ship part ============================ -->
 
 	<ThingDef ParentName="CrashedShipPartBase">

diff --git a/Mods/Core_SK/Patches/Core/GameConditionDefs.xml b/Mods/Core_SK/Patches/Core/GameConditionDefs.xml
@@ -5,6 +5,10 @@
 		<xpath>Defs/GameConditionDef[defName="SunBlocker"]</xpath>
 		<value>
 			<conditionClass>SK.Events.GameCondition_Eclipse</conditionClass>
+			<allowUnderground>false</allowUnderground>
+			<silencedByConditions>
+				<li MayRequire="Ludeon.RimWorld.Anomaly">UnnaturalDarkness</li>
+			</silencedByConditions>
 		</value>
 	</Operation>
 </Patch>
diff --git a/Mods/Core_SK/Patches/Core/MentalStateDefs/MentalStates_Mood.xml b/Mods/Core_SK/Patches/Core/MentalStateDefs/MentalStates_Mood.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Patch>
+
+	<Operation Class="SK.PatchOperationReplaceExtended">
+		<xpath>Defs/MentalBreakDef[defName="RunWild"]</xpath>
+		<value>
+			<baseCommonality>0.2</baseCommonality>
+			<commonalityFactorPerPopulationCurve>
+				<points>
+					<li>(1, 0.01)</li>
+					<li>(2, 0.20)</li>
+					<li>(5, 0.25)</li>
+					<li>(8, 0.30)</li>
+					<li>(12, 0.35)</li>
+					<li>(20, 0.40)</li>
+				</points>
+			</commonalityFactorPerPopulationCurve>
+		</value>
+	</Operation>
+
+	<Operation Class="SK.PatchOperationReplaceExtended">
+		<xpath>Defs/MentalBreakDef[defName="GiveUpExit"]</xpath>
+		<value>
+			<baseCommonality>0.5</baseCommonality>
+			<commonalityFactorPerPopulationCurve>
+				<points>
+					<li>(10, 0)</li>
+					<li>(20, 1)</li>
+				</points>
+			</commonalityFactorPerPopulationCurve>
+		</value>
+	</Operation>
+</Patch>