From 3ce6c69a21c6d042e174b883a822f240366f3637 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Wed, 7 Aug 2024 20:44:15 +0500 Subject: [PATCH 1/4] Fixed SocialAffection precept descriptions and file formatting --- .../PreceptDefs/Precepts_SocialAffection.xml | 106 +++++++++--------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/1.5/Defs/PreceptDefs/Precepts_SocialAffection.xml b/1.5/Defs/PreceptDefs/Precepts_SocialAffection.xml index b4ee222..fe10b90 100644 --- a/1.5/Defs/PreceptDefs/Precepts_SocialAffection.xml +++ b/1.5/Defs/PreceptDefs/Precepts_SocialAffection.xml @@ -1,62 +1,62 @@ - + - - - SocialAffection - - UI/Issues/SocialAffection - + + + SocialAffection + + UI/Issues/SocialAffection + - + - - SocialAffection_Normal - SocialAffection - - Just normal. - Low - 50 - 1000 - + + SocialAffection_Normal + SocialAffection + + Just normal. + Low + 50 + 1000 + - - SocialAffection_Small - SocialAffection - - Care about only immediate family. - Medium - 40 - 1000 - + + SocialAffection_Small + SocialAffection + + Care about only immediate family. + Medium + 40 + 1000 + - - SocialAffection_OnlyFamily - SocialAffection - - Don't care about non-family memeber's tragedy. - Medium - 30 - 1000 - + + SocialAffection_OnlyFamily + SocialAffection + + Don't care about the tragedy of a non-family member. + Medium + 30 + 1000 + - - SocialAffection_Dry - SocialAffection - - Don't care about family memeber's tragedy. - High - 20 - 1000 - + + SocialAffection_Dry + SocialAffection + + Don't care about the tragedy of a family member. + High + 20 + 1000 + - - SocialAffection_Psychopath - SocialAffection - - Don't care about others. - High - 10 - 1000 - + + SocialAffection_Psychopath + SocialAffection + + Don't care about others. + High + 10 + 1000 + \ No newline at end of file From 6fba292d66b4a69aa18051006b67a887a1edebf2 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Wed, 7 Aug 2024 20:45:41 +0500 Subject: [PATCH 2/4] Why is MyHalfSiblingLost listed 4 times? --- 1.5/Patches/RJW_ThoughtDefsDeath.xml | 6 +++--- 1.5/Patches/RJW_ThoughtDefsLost.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/1.5/Patches/RJW_ThoughtDefsDeath.xml b/1.5/Patches/RJW_ThoughtDefsDeath.xml index 99ea439..3071e66 100644 --- a/1.5/Patches/RJW_ThoughtDefsDeath.xml +++ b/1.5/Patches/RJW_ThoughtDefsDeath.xml @@ -2,9 +2,9 @@ - Defs/ThoughtDef[defName="MyKinDied" or defName="MyCousinDied" or defName="MyGrandparentDied" or defName="MyUncleDied" or defName="MyAuntDied" or defName="MyHalfSiblingDied" or defName="MyNephewDied" or defName="MyNieceDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied"]/nullifyingPrecepts + Defs/ThoughtDef[defName="MyKinDied" or defName="MyCousinDied" or defName="MyGrandparentDied" or defName="MyUncleDied" or defName="MyAuntDied" or defName="MyHalfSiblingDied" or defName="MyNephewDied" or defName="MyNieceDied"]/nullifyingPrecepts - Defs/ThoughtDef[defName="MyKinDied" or defName="MyCousinDied" or defName="MyGrandparentDied" or defName="MyUncleDied" or defName="MyAuntDied" or defName="MyHalfSiblingDied" or defName="MyNephewDied" or defName="MyNieceDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied"] + Defs/ThoughtDef[defName="MyKinDied" or defName="MyCousinDied" or defName="MyGrandparentDied" or defName="MyUncleDied" or defName="MyAuntDied" or defName="MyHalfSiblingDied" or defName="MyNephewDied" or defName="MyNieceDied"]
  • SocialAffection_Psychopath
    • @@ -14,7 +14,7 @@     - Defs/ThoughtDef[defName="MyKinDied" or defName="MyCousinDied" or defName="MyGrandparentDied" or defName="MyUncleDied" or defName="MyAuntDied" or defName="MyHalfSiblingDied" or defName="MyNephewDied" or defName="MyNieceDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied"]/nullifyingPrecepts + Defs/ThoughtDef[defName="MyKinDied" or defName="MyCousinDied" or defName="MyGrandparentDied" or defName="MyUncleDied" or defName="MyAuntDied" or defName="MyHalfSiblingDied" or defName="MyNephewDied" or defName="MyNieceDied"]/nullifyingPrecepts
  • SocialAffection_Psychopath
  • SocialAffection_Dry
    • diff --git a/1.5/Patches/RJW_ThoughtDefsLost.xml b/1.5/Patches/RJW_ThoughtDefsLost.xml index 43dd8fb..5c94b8a 100644 --- a/1.5/Patches/RJW_ThoughtDefsLost.xml +++ b/1.5/Patches/RJW_ThoughtDefsLost.xml @@ -2,9 +2,9 @@ - Defs/ThoughtDef[defName="MyKinLost" or defName="MyCousinLost" or defName="MyGrandparentLost" or defName="MyUncleLost" or defName="MyAuntLost" or defName="MyHalfSiblingLost" or defName="MyNephewLost" or defName="MyNieceLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost"]/nullifyingPrecepts + Defs/ThoughtDef[defName="MyKinLost" or defName="MyCousinLost" or defName="MyGrandparentLost" or defName="MyUncleLost" or defName="MyAuntLost" or defName="MyHalfSiblingLost" or defName="MyNephewLost" or defName="MyNieceLost"]/nullifyingPrecepts - Defs/ThoughtDef[defName="MyKinLost" or defName="MyCousinLost" or defName="MyGrandparentLost" or defName="MyUncleLost" or defName="MyAuntLost" or defName="MyHalfSiblingLost" or defName="MyNephewLost" or defName="MyNieceLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost"] + Defs/ThoughtDef[defName="MyKinLost" or defName="MyCousinLost" or defName="MyGrandparentLost" or defName="MyUncleLost" or defName="MyAuntLost" or defName="MyHalfSiblingLost" or defName="MyNephewLost" or defName="MyNieceLost"]
  • SocialAffection_Psychopath
    • @@ -14,7 +14,7 @@     - Defs/ThoughtDef[defName="MyKinLost" or defName="MyCousinLost" or defName="MyGrandparentLost" or defName="MyUncleLost" or defName="MyAuntLost" or defName="MyHalfSiblingLost" or defName="MyNephewLost" or defName="MyNieceLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost"]/nullifyingPrecepts + Defs/ThoughtDef[defName="MyKinLost" or defName="MyCousinLost" or defName="MyGrandparentLost" or defName="MyUncleLost" or defName="MyAuntLost" or defName="MyHalfSiblingLost" or defName="MyNephewLost" or defName="MyNieceLost"]/nullifyingPrecepts
  • SocialAffection_Psychopath
  • SocialAffection_Dry
    • From b9b8de14a2db7973a9ced7970bb97bcd9f99a6e4 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Wed, 7 Aug 2024 20:49:11 +0500 Subject: [PATCH 3/4] Fised SocialAffection_OnlyFamily suppressing SoldMyLovedOne_Beast thought --- 1.5/Patches/RJW_Thought_Family_Beast.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/1.5/Patches/RJW_Thought_Family_Beast.xml b/1.5/Patches/RJW_Thought_Family_Beast.xml index ba190c9..051eb58 100644 --- a/1.5/Patches/RJW_Thought_Family_Beast.xml +++ b/1.5/Patches/RJW_Thought_Family_Beast.xml @@ -709,7 +709,6 @@
  • SocialAffection_Psychopath
  • SocialAffection_Dry
    • -
  • SocialAffection_OnlyFamily
    •      @@ -718,7 +717,6 @@
  • SocialAffection_Psychopath
  • SocialAffection_Dry
    • -
  • SocialAffection_OnlyFamily
    •      From 9b25392911fb182a488287a5fa46d657db69a5e1 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Wed, 7 Aug 2024 20:51:25 +0500 Subject: [PATCH 4/4] These are core thoughts --- .../{RJW_ThoughtDefsDeath.xml => Core_ThoughtDefsDeath.xml} | 0 1.5/Patches/{RJW_ThoughtDefsLost.xml => Core_ThoughtDefsLost.xml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename 1.5/Patches/{RJW_ThoughtDefsDeath.xml => Core_ThoughtDefsDeath.xml} (100%) rename 1.5/Patches/{RJW_ThoughtDefsLost.xml => Core_ThoughtDefsLost.xml} (100%) diff --git a/1.5/Patches/RJW_ThoughtDefsDeath.xml b/1.5/Patches/Core_ThoughtDefsDeath.xml similarity index 100% rename from 1.5/Patches/RJW_ThoughtDefsDeath.xml rename to 1.5/Patches/Core_ThoughtDefsDeath.xml diff --git a/1.5/Patches/RJW_ThoughtDefsLost.xml b/1.5/Patches/Core_ThoughtDefsLost.xml similarity index 100% rename from 1.5/Patches/RJW_ThoughtDefsLost.xml rename to 1.5/Patches/Core_ThoughtDefsLost.xml