24 Jan 2023 Update

eebasso · Jan 24, 2023 · cd4e66a · cd4e66a
1 parent 78eb2b5
commit cd4e66a
Show file tree

Hide file tree

Showing 104 changed files with 5,985 additions and 6,625 deletions.
diff --git a/1.4/Assemblies/Psychology.dll b/1.4/Assemblies/Psychology.dll
diff --git a/1.4/Defs/HediffDefs/Hediffs_Local_Chronic.xml b/1.4/Defs/HediffDefs/Hediffs_Local_Chronic.xml
@@ -82,7 +82,7 @@
 				<mentalStateGivers>
 					<li>
 						<mentalState>PanicAttack</mentalState>
-						<mtbDays>5</mtbDays>
+						<mtbDays>6.8</mtbDays>
           </li>
         </mentalStateGivers>
 			</li>
@@ -102,7 +102,7 @@
 				<mentalStateGivers>
 					<li>
 						<mentalState>PanicAttack</mentalState>
-						<mtbDays>4</mtbDays>
+						<mtbDays>4.2</mtbDays>
           </li>
         </mentalStateGivers>
 			</li>
@@ -122,7 +122,7 @@
 				<mentalStateGivers>
 					<li>
 						<mentalState>PanicAttack</mentalState>
-						<mtbDays>3</mtbDays>
+						<mtbDays>2.6</mtbDays>
           </li>
         </mentalStateGivers>
 			</li>
@@ -142,7 +142,7 @@
 				<mentalStateGivers>
 					<li>
 						<mentalState>PanicAttack</mentalState>
-						<mtbDays>2</mtbDays>
+						<mtbDays>1.6</mtbDays>
           </li>
         </mentalStateGivers>
 			</li>
@@ -174,10 +174,10 @@
 			</li>
 			<li Class="HediffCompProperties_Immunizable">
 				<severityPerDayNotImmune>0.0002</severityPerDayNotImmune>
-				<severityPerDayNotImmuneRandomFactor>
+				<!--<severityPerDayNotImmuneRandomFactor>
 					<min>0.4</min>
 					<max>4</max>
-				</severityPerDayNotImmuneRandomFactor>
+				</severityPerDayNotImmuneRandomFactor>-->
 			</li>
 		</comps>
 	</HediffDef>

diff --git a/1.4/Defs/HediffGiverSetDefs/HediffGiverSets.xml b/1.4/Defs/HediffGiverSetDefs/HediffGiverSets.xml
@@ -11,9 +11,9 @@
 				</partsToAffect>
 				<ageFractionChanceCurve>
 					<points>
-						<li>(0.15, 0.0)</li>
+						<li>(0.15,   0.0)</li>
 						<li>(0.3375, 0.00225)</li>
-						<li>(0.45, 0.0003375)</li>
+						<li>(0.45,   0.0003375)</li>
 						<li>(0.5625, 0.0)</li>
 					</points>
 				</ageFractionChanceCurve>

diff --git a/1.4/Defs/JoyDefs/Joy_Romance.xml b/1.4/Defs/JoyDefs/Joy_Romance.xml
@@ -4,7 +4,8 @@
   <JoyGiverDef>
     <defName>TryHookup</defName>
     <giverClass>Psychology.JoyGiver_CasualHookup</giverClass>
-    <baseChance>5.0</baseChance>
+    <!--<baseChance>5</baseChance>-->
+    <baseChance>1</baseChance>
     <jobDef>LeadHookup</jobDef>
     <joyKind>Lewd</joyKind>
   </JoyGiverDef>

diff --git a/1.4/Defs/MentalStateDefs/MentalStates_Psychology.xml b/1.4/Defs/MentalStateDefs/MentalStates_Psychology.xml
@@ -459,12 +459,12 @@
 	</MentalStateDef>
 
 	<!-- Panic attack -->
-	<MentalBreakDef>
+	<!--<MentalBreakDef>
 		<defName>PanicAttack</defName>
 		<mentalState>PanicAttack</mentalState>
 		<baseCommonality>1</baseCommonality>
 		<intensity>Major</intensity>
-	</MentalBreakDef>
+	</MentalBreakDef>-->
 	<MentalStateDef ParentName="BaseMentalState">
 		<defName>PanicAttack</defName>
 		<stateClass>Psychology.MentalState_PanicAttack</stateClass>
@@ -476,15 +476,14 @@
 		<beginLetterLabel>panic attack</beginLetterLabel>
 		<beginLetter>{0} is having a panic attack.</beginLetter>
 		<beginLetterDef>NegativeEvent</beginLetterDef>
-		<minTicksBeforeRecovery>2000</minTicksBeforeRecovery>
-		<recoveryMtbDays>0.1</recoveryMtbDays>
-		<maxTicksBeforeRecovery>10000</maxTicksBeforeRecovery>
-		<recoveryMessage>{0}'s panic attack has stopped.</recoveryMessage>
+		<minTicksBeforeRecovery>5000</minTicksBeforeRecovery>
+		<recoveryMtbDays>0.167</recoveryMtbDays>
+		<maxTicksBeforeRecovery>15000</maxTicksBeforeRecovery>
+		<recoveryMessage>{0}'s panic attack has come to an end.</recoveryMessage>
 		<baseInspectLine>Mental state: Panic attack</baseInspectLine>
 		<!--<tale>MentalStatePanicAttack</tale>-->
 		<recoverFromSleep>false</recoverFromSleep>
 		<inCaravanCanDo>false</inCaravanCanDo>
-		<!--<moodRecoveryThought>Catharsis</moodRecoveryThought>-->
 	</MentalStateDef>
 
 </Defs>
diff --git a/1.4/Defs/PersonalityDefs/PersonalityNodes.xml b/1.4/Defs/PersonalityDefs/PersonalityNodes.xml
@@ -1261,6 +1261,10 @@
 			</li>
 		</memeCertaintyModifiers>
 		<preceptCertaintyModifiers>
+			<li>
+				<precept>MarriageName_UsuallyMans</precept>
+				<modifier>-0.4</modifier>
+			</li>
 			<li>
 				<precept>MarriageName_AlwaysMans</precept>
 				<modifier>-0.5</modifier>
@@ -2106,10 +2110,10 @@
 				<node>Extroverted</node>
 				<modifier>0.5</modifier>
 			</li>
-			<li>
+			<!--<li>
 				<node>Upbeat</node>
 				<modifier>0.3</modifier>
-			</li>
+			</li>-->
 			<li>
 				<node>LaidBack</node>
 				<modifier>0.85</modifier>
@@ -2301,6 +2305,12 @@
 				<weight>1</weight>
 			</li>
 		</tenAspects>
+		<memeCertaintyModifiers>
+			<li>
+				<meme>Raider</meme>
+				<modifier>-2</modifier>
+      </li>
+    </memeCertaintyModifiers>
 		<preceptCertaintyModifiers>
 			<li>
 				<precept>Execution_Abhorrent</precept>
@@ -3749,10 +3759,10 @@
 				<precept>IdeoDiversity_Disapproved</precept>
 				<modifier>0.5</modifier>
 			</li>
-			<li>
+			<!--<li>
 				<precept>IdeoDiversity_Standard</precept>
 				<modifier>0</modifier>
-			</li>
+			</li>-->
 			<li>
 				<precept>IdeoDiversity_Approved</precept>
 				<modifier>-0.5</modifier>

diff --git a/1.4/Defs/ThoughtDefs/Thoughts_Memory_Social.xml b/1.4/Defs/ThoughtDefs/Thoughts_Memory_Social.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
 
+	<!--<ThoughtDef>
+		<defName>MayorComplaint</defName>
+		<label>MayorComplaint</label>
+		<durationDays>1</durationDays>
+		<stackedEffectMultiplier>1</stackedEffectMultiplier>
+		<stackLimit>999</stackLimit>
+		<stages>
+
+    </stages>
+  </ThoughtDef>-->
+
 	<ThoughtDef>
     <defName>RebuffedMyHookupAttempt</defName>
     <thoughtClass>Thought_MemorySocial</thoughtClass>
@@ -262,7 +273,7 @@
 		<stages>
 			<li>
 				<label>rejected my proposal</label>
-				<baseOpinionOffset>23</baseOpinionOffset>
+				<baseOpinionOffset>20</baseOpinionOffset>
 			</li>
 		</stages>
 		<thoughtToMake>RejectedMyProposalCodependentMood</thoughtToMake>

diff --git a/1.4/Defs/ThoughtDefs/Thoughts_Situation_Special.xml b/1.4/Defs/ThoughtDefs/Thoughts_Situation_Special.xml
@@ -33,6 +33,7 @@
   <ThoughtDef>
     <defName>PanicAttack</defName>
     <!--<workerClass>Psychology.ThoughtWorker_PanicAttack</workerClass>-->
+    <durationDays>0.5</durationDays>
     <stages>
       <li>
         <label>having a panic attack</label>

diff --git a/1.4/Defs/TraitDefs/Traits_Singular.xml b/1.4/Defs/TraitDefs/Traits_Singular.xml
@@ -26,9 +26,9 @@
       <li>
         <label>insomniac</label>
         <description>[PAWN_nameDef] finds it difficult to sleep because of [PAWN_possessive] condition. [PAWN_pronoun] will prioritize sleep less, wake up sooner, and get less rest from sleeping.</description>
-        <statOffsets>
+       <!--<statOffsets>
           <RestRateMultiplier>1.50</RestRateMultiplier>
-        </statOffsets>
+        </statOffsets>-->
       </li>
     </degreeDatas>
     <conflictingTraits>

diff --git a/1.4/Languages/English/Keyed/WITabs.xml b/1.4/Languages/English/Keyed/WITabs.xml
@@ -54,7 +54,7 @@
 	<EditPsyche>Edit</EditPsyche>
 	<PsycheEditor>Modifying the psyche of {0}:</PsycheEditor>
 	<PsycheEditorNewColonist>Modifying colonist's psyche:</PsycheEditorNewColonist>
-	<PersonalityNodeWarning>You are editing the raw values of a pawn's personality. The actual stats will be adjusted by other factors.</PersonalityNodeWarning>
+	<PersonalityNodeWarning>You are editing the raw values of a pawn's personality. The actual stats will be adjusted by other factors such as traits, backstory, and correlations between different personality nodes.</PersonalityNodeWarning>
 	<SexDrive>Sex drive:</SexDrive>
 	<RomanticDrive>Romantic drive:</RomanticDrive>
 	<PsycheResetTooltip>Reset this pawn's psyche to default based on their unique HashCode ID.</PsycheResetTooltip>

diff --git a/1.4/Mods/CharacterEditor/Assemblies/PsychologyCEditor.dll b/1.4/Mods/CharacterEditor/Assemblies/PsychologyCEditor.dll
diff --git a/1.4/Mods/EdBPrepareCarefully/Assemblies/PsychologyEdBPC.dll b/1.4/Mods/EdBPrepareCarefully/Assemblies/PsychologyEdBPC.dll
diff --git a/1.4/Mods/HumanoidAlienRaces/Assemblies/PsychologyAlienRace.dll b/1.4/Mods/HumanoidAlienRaces/Assemblies/PsychologyAlienRace.dll