From 070c017ba567441b724e6e285126d26641c4f48e Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 8 Mar 2018 19:43:21 -0500
Subject: [PATCH] maids and your harem are now counted by the BG and you can no
longer set the same race as inferior and superior.
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 2 +
src/uncategorized/futureSocities.tw | 62 ++++++++++----------
src/uncategorized/saGuardsYou.tw | 2 +-
3 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index dfd852556ef..2954d6e4077 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -6,6 +6,8 @@
387
-tweaked saGuardsYou to actually count facility heads the BG has trained when it comes to counting successors
+ -your BG nows considers servants and your harem in her count
+ -a race now no longer be both superior and inferior
386
-tweaked childgen to only random face and int for playerXmarked if the child is below the minimum value
diff --git a/src/uncategorized/futureSocities.tw b/src/uncategorized/futureSocities.tw
index 3e5b683ce73..752fa057890 100644
--- a/src/uncategorized/futureSocities.tw
+++ b/src/uncategorized/futureSocities.tw
@@ -629,22 +629,22 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<<else>>
<<if $FSCredits > 0>>
- <br>[[Racial supremacism|Future Society][$arcologies[0].FSSupremacist = 4, $FSCredits -= 1]]: a belief in <<if $arcologies[0].FSSupremacistRace == 0>>the superiority of a chosen race<<else>>$arcologies[0].FSSupremacistRace superiority<</if>>.
- <br> Select race:
-<<if $arcologies[0].FSSupremacistRace != "white">>[[White|Future Society][$arcologies[0].FSSupremacistRace = "white"]]<<else>>White<</if>> |
-<<if $arcologies[0].FSSupremacistRace != "asian">>[[Asian|Future Society][$arcologies[0].FSSupremacistRace = "asian"]]<<else>>Asian<</if>> |
-<<if $arcologies[0].FSSupremacistRace != "latina">>[[Latino|Future Society][$arcologies[0].FSSupremacistRace = "latina"]]<<else>>Latino<</if>> |
-<<if $arcologies[0].FSSupremacistRace != "middle eastern">>[[Middle Eastern|Future Society][$arcologies[0].FSSupremacistRace = "middle eastern"]]<<else>>Middle Eastern<</if>> |
-<<if $arcologies[0].FSSupremacistRace != "black">>[[Black|Future Society][$arcologies[0].FSSupremacistRace = "black"]]<<else>>Black<</if>> |
-<<if $arcologies[0].FSSupremacistRace != "indo-aryan">>[[Indo-Aryan|Future Society][$arcologies[0].FSSupremacistRace = "indo-aryan"]]<<else>>Indo-Aryan<</if>> |
-<<if $arcologies[0].FSSupremacistRace != "amerindian">>[[Amerindian|Future Society][$arcologies[0].FSSupremacistRace = "amerindian"]]<<else>>Amerindian<</if>> |
-<<if $arcologies[0].FSSupremacistRace != "pacific islander">>[[Pacific Islander|Future Society][$arcologies[0].FSSupremacistRace = "pacific islander"]]<<else>>Pacific Islander<</if>> |
-<<if $arcologies[0].FSSupremacistRace != "malay">>[[Malay|Future Society][$arcologies[0].FSSupremacistRace = "malay"]]<<else>>Malay<</if>> |
-<<if $arcologies[0].FSSupremacistRace != "southern european">>[[Southern European|Future Society][$arcologies[0].FSSupremacistRace = "southern european"]]<<else>>Southern European<</if>> |
-<<if $arcologies[0].FSSupremacistRace != "semitic">>[[Semitic|Future Society][$arcologies[0].FSSupremacistRace = "semitic"]]<<else>>Semitic<</if>> |
-<<if $arcologies[0].FSSupremacistRace != "mixed race">>[[Mixed Race|Future Society][$arcologies[0].FSSupremacistRace = "mixed race"]]<<else>>Mixed Race<</if>>
+ <br>[[Racial supremacism|Future Society][$arcologies[0].FSSupremacist = 4, $FSCredits -= 1]]: a belief in <<if $arcologies[0].FSSupremacistRace == 0>>the superiority of a chosen race<<else>>$arcologies[0].FSSupremacistRace superiority<</if>>.
+ <br> Select race:
+ <<if $arcologies[0].FSSubjugationist != "unset" && $arcologies[0].FSSubjugationistRace == "white">>It is established that whites are inferior.<<elseif $arcologies[0].FSSupremacistRace != "white">>[[White|Future Society][$arcologies[0].FSSupremacistRace = "white"]]<<else>>White<</if>> |
+ <<if $arcologies[0].FSSubjugationist != "unset" && $arcologies[0].FSSubjugationistRace == "asian">>It is established that asians are inferior.<<elseif $arcologies[0].FSSupremacistRace != "asian">>[[Asian|Future Society][$arcologies[0].FSSupremacistRace = "asian"]]<<else>>Asian<</if>> |
+ <<if $arcologies[0].FSSubjugationist != "unset" && $arcologies[0].FSSubjugationistRace == "latina">>It is established that latinas are inferior.<<elseif $arcologies[0].FSSupremacistRace != "latina">>[[Latino|Future Society][$arcologies[0].FSSupremacistRace = "latina"]]<<else>>Latino<</if>> |
+ <<if $arcologies[0].FSSubjugationist != "unset" && $arcologies[0].FSSubjugationistRace == "middle eastern">>It is established that middle easterners are inferior.<<elseif $arcologies[0].FSSupremacistRace != "middle eastern">>[[Middle Eastern|Future Society][$arcologies[0].FSSupremacistRace = "middle eastern"]]<<else>>Middle Eastern<</if>> |
+ <<if $arcologies[0].FSSubjugationist != "unset" && $arcologies[0].FSSubjugationistRace == "black">>It is established that blacks are inferior.<<elseif $arcologies[0].FSSupremacistRace != "black">>[[Black|Future Society][$arcologies[0].FSSupremacistRace = "black"]]<<else>>Black<</if>> |
+ <<if $arcologies[0].FSSubjugationist != "unset" && $arcologies[0].FSSubjugationistRace == "indo-aryan">>It is established that indo-aryans are inferior.<<elseif $arcologies[0].FSSupremacistRace != "indo-aryan">>[[Indo-Aryan|Future Society][$arcologies[0].FSSupremacistRace = "indo-aryan"]]<<else>>Indo-Aryan<</if>> |
+ <<if $arcologies[0].FSSubjugationist != "unset" && $arcologies[0].FSSubjugationistRace == "amerindian">>It is established that amerindians are inferior.<<elseif $arcologies[0].FSSupremacistRace != "amerindian">>[[Amerindian|Future Society][$arcologies[0].FSSupremacistRace = "amerindian"]]<<else>>Amerindian<</if>> |
+ <<if $arcologies[0].FSSubjugationist != "unset" && $arcologies[0].FSSubjugationistRace == "pacific islander">>It is established that pacific islanders are inferior.<<elseif $arcologies[0].FSSupremacistRace != "pacific islander">>[[Pacific Islander|Future Society][$arcologies[0].FSSupremacistRace = "pacific islander"]]<<else>>Pacific Islander<</if>> |
+ <<if $arcologies[0].FSSubjugationist != "unset" && $arcologies[0].FSSubjugationistRace == "malay">>It is established that malay are inferior.<<elseif $arcologies[0].FSSupremacistRace != "malay">>[[Malay|Future Society][$arcologies[0].FSSupremacistRace = "malay"]]<<else>>Malay<</if>> |
+ <<if $arcologies[0].FSSubjugationist != "unset" && $arcologies[0].FSSubjugationistRace == "southern european">>It is established that southern europeans are inferior.<<elseif $arcologies[0].FSSupremacistRace != "southern european">>[[Southern European|Future Society][$arcologies[0].FSSupremacistRace = "southern european"]]<<else>>Southern European<</if>> |
+ <<if $arcologies[0].FSSubjugationist != "unset" && $arcologies[0].FSSubjugationistRace == "semitic">>It is established that semites are inferior.<<elseif $arcologies[0].FSSupremacistRace != "semitic">>[[Semitic|Future Society][$arcologies[0].FSSupremacistRace = "semitic"]]<<else>>Semitic<</if>> |
+ <<if $arcologies[0].FSSubjugationist != "unset" && $arcologies[0].FSSubjugationistRace == "mixed race">>It is established that those with mixed blood are inferior.<<elseif $arcologies[0].FSSupremacistRace != "mixed race">>[[Mixed Race|Future Society][$arcologies[0].FSSupremacistRace = "mixed race"]]<<else>>Mixed Race<</if>>
<<else>>
- /*//''Racial supremacism'': a belief in the superiority of a chosen race.//*/
+ /*//''Racial supremacism'': a belief in the superiority of a chosen race.//*/
<</if>>
<</if>>
@@ -688,22 +688,22 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<<else>>
<<if $FSCredits > 0>>
- <br>''''[[Racial subjugationism|Future Society][$arcologies[0].FSSubjugationist = 4, $FSCredits -= 1]]: a belief in <<if $arcologies[0].FSSubjugationistRace == 0>>the inferiority of a chosen race<<else>>$arcologies[0].FSSubjugationistRace inferiority<</if>>.
- <br> Select race:
-<<if $arcologies[0].FSSubjugationistRace != "white">>[[White|Future Society][$arcologies[0].FSSubjugationistRace = "white"]]<<else>>White<</if>> |
-<<if $arcologies[0].FSSubjugationistRace != "asian">>[[Asian|Future Society][$arcologies[0].FSSubjugationistRace = "asian"]]<<else>>Asian<</if>> |
-<<if $arcologies[0].FSSubjugationistRace != "latina">>[[Latino|Future Society][$arcologies[0].FSSubjugationistRace = "latina"]]<<else>>Latino<</if>> |
-<<if $arcologies[0].FSSubjugationistRace != "middle eastern">>[[Middle Eastern|Future Society][$arcologies[0].FSSubjugationistRace = "middle eastern"]]<<else>>Middle Eastern<</if>> |
-<<if $arcologies[0].FSSubjugationistRace != "black">>[[Black|Future Society][$arcologies[0].FSSubjugationistRace = "black"]]<<else>>Black<</if>> |
-<<if $arcologies[0].FSSubjugationistRace != "indo-aryan">>[[Indo-Aryan|Future Society][$arcologies[0].FSSubjugationistRace = "indo-aryan"]]<<else>>Indo-Aryan<</if>> |
-<<if $arcologies[0].FSSubjugationistRace != "amerindian">>[[Amerindian|Future Society][$arcologies[0].FSSubjugationistRace = "amerindian"]]<<else>>Amerindian<</if>> |
-<<if $arcologies[0].FSSubjugationistRace != "pacific islander">>[[Pacific Islander|Future Society][$arcologies[0].FSSubjugationistRace = "pacific islander"]]<<else>>Pacific Islander<</if>> |
-<<if $arcologies[0].FSSubjugationistRace != "malay">>[[Malay|Future Society][$arcologies[0].FSSubjugationistRace = "malay"]]<<else>>Malay<</if>> |
-<<if $arcologies[0].FSSubjugationistRace != "southern european">>[[Southern European|Future Society][$arcologies[0].FSSubjugationistRace = "southern european"]]<<else>>Southern European<</if>> |
-<<if $arcologies[0].FSSubjugationistRace != "semitic">>[[Semitic|Future Society][$arcologies[0].FSSubjugationistRace = "semitic"]]<<else>>Semitic<</if>> |
-<<if $arcologies[0].FSSubjugationistRace != "mixed race">>[[Mixed Race|Future Society][$arcologies[0].FSSubjugationistRace = "mixed race"]]<<else>>Mixed Race<</if>>
- <<else>>
- /*//''Racial subjugationism'': a belief in the inferiority of a subject race.//*/
+ <br>''''[[Racial subjugationism|Future Society][$arcologies[0].FSSubjugationist = 4, $FSCredits -= 1]]: a belief in <<if $arcologies[0].FSSubjugationistRace == 0>>the inferiority of a chosen race<<else>>$arcologies[0].FSSubjugationistRace inferiority<</if>>.
+ <br> Select race:
+ <<if $arcologies[0].FSSupremacist != "unset" && $arcologies[0].FSSupremacistRace == "white">>It is established that whites are superior.<<elseif $arcologies[0].FSSubjugationistRace != "white">>[[White|Future Society][$arcologies[0].FSSubjugationistRace = "white"]]<<else>>White<</if>> |
+ <<if $arcologies[0].FSSupremacist != "unset" && $arcologies[0].FSSupremacistRace == "asian">>It is established that asians are superior.<<elseif $arcologies[0].FSSubjugationistRace != "asian">>[[Asian|Future Society][$arcologies[0].FSSubjugationistRace = "asian"]]<<else>>Asian<</if>> |
+ <<if $arcologies[0].FSSupremacist != "unset" && $arcologies[0].FSSupremacistRace == "latina">>It is established that latinas are superior.<<elseif $arcologies[0].FSSubjugationistRace != "latina">>[[Latino|Future Society][$arcologies[0].FSSubjugationistRace = "latina"]]<<else>>Latino<</if>> |
+ <<if $arcologies[0].FSSupremacist != "unset" && $arcologies[0].FSSupremacistRace == "middle eastern">>It is established that middle easterners are superior.<<elseif $arcologies[0].FSSubjugationistRace != "middle eastern">>[[Middle Eastern|Future Society][$arcologies[0].FSSubjugationistRace = "middle eastern"]]<<else>>Middle Eastern<</if>> |
+ <<if $arcologies[0].FSSupremacist != "unset" && $arcologies[0].FSSupremacistRace == "black">>It is established that blacks are superior.<<elseif $arcologies[0].FSSubjugationistRace != "black">>[[Black|Future Society][$arcologies[0].FSSubjugationistRace = "black"]]<<else>>Black<</if>> |
+ <<if $arcologies[0].FSSupremacist != "unset" && $arcologies[0].FSSupremacistRace == "indo-aryan">>It is established that indo-aryans are superior.<<elseif $arcologies[0].FSSubjugationistRace != "indo-aryan">>[[Indo-Aryan|Future Society][$arcologies[0].FSSubjugationistRace = "indo-aryan"]]<<else>>Indo-Aryan<</if>> |
+ <<if $arcologies[0].FSSupremacist != "unset" && $arcologies[0].FSSupremacistRace == "amerindian">>It is established that amerindians are superior.<<elseif $arcologies[0].FSSubjugationistRace != "amerindian">>[[Amerindian|Future Society][$arcologies[0].FSSubjugationistRace = "amerindian"]]<<else>>Amerindian<</if>> |
+ <<if $arcologies[0].FSSupremacist != "unset" && $arcologies[0].FSSupremacistRace == "pacific islander">>It is established that pacific islanders are superior.<<elseif $arcologies[0].FSSubjugationistRace != "pacific islander">>[[Pacific Islander|Future Society][$arcologies[0].FSSubjugationistRace = "pacific islander"]]<<else>>Pacific Islander<</if>> |
+ <<if $arcologies[0].FSSupremacist != "unset" && $arcologies[0].FSSupremacistRace == "malay">>It is established that malay are superior.<<elseif $arcologies[0].FSSubjugationistRace != "malay">>[[Malay|Future Society][$arcologies[0].FSSubjugationistRace = "malay"]]<<else>>Malay<</if>> |
+ <<if $arcologies[0].FSSupremacist != "unset" && $arcologies[0].FSSupremacistRace == "southern european">>It is established that southern europeaners are superior.<<elseif $arcologies[0].FSSubjugationistRace != "southern european">>[[Southern European|Future Society][$arcologies[0].FSSubjugationistRace = "southern european"]]<<else>>Southern European<</if>> |
+ <<if $arcologies[0].FSSupremacist != "unset" && $arcologies[0].FSSupremacistRace == "semitic">>It is established that semites are superior.<<elseif $arcologies[0].FSSubjugationistRace != "semitic">>[[Semitic|Future Society][$arcologies[0].FSSubjugationistRace = "semitic"]]<<else>>Semitic<</if>> |
+ <<if $arcologies[0].FSSupremacist != "unset" && $arcologies[0].FSSupremacistRace == "mixed race">>It is established that those with mixed blood are superior.<<elseif $arcologies[0].FSSubjugationistRace != "mixed race">>[[Mixed Race|Future Society][$arcologies[0].FSSubjugationistRace = "mixed race"]]<<else>>Mixed Race<</if>>
+ <<else>>
+ /*//''Racial subjugationism'': a belief in the inferiority of a subject race.//*/
<</if>>
<</if>>
diff --git a/src/uncategorized/saGuardsYou.tw b/src/uncategorized/saGuardsYou.tw
index b33d58603d6..7ffb74d06ff 100644
--- a/src/uncategorized/saGuardsYou.tw
+++ b/src/uncategorized/saGuardsYou.tw
@@ -181,7 +181,7 @@ Being continually trusted with your life @@.hotpink;increases her devotion to yo
<<if $bodyguardTrains == 1 && $slaves[$i].devotion > 95 && $slaves[$i].trust > 50 && $slaves[$i].combatSkill > 0 && $slaves[$i].intelligence > 0>>
She's confident in her martial skills, but smart enough to know that she isn't immortal, and devoted enough to worry about who will protect you should she die.
<<set _successorCandidates = $slaves.filter( function(s) { return (s.assignmentVisible == 1 || s.assignement == "be your Concubine" || s.assignement == "be the Wardeness" || s.assignement ==
-"be your Head Girl") && bodyguardSuccessorEligible(s); } )>>
+"be your Head Girl" || s.assignement == "work as a servant" || s.assignement == "serve in the master suite") && bodyguardSuccessorEligible(s); } )>>
<<set _combatSkilled = _successorCandidates.filter( function(s) { return s.combatSkill > 0; })>>
<<if _combatSkilled.length < 2>>
<<unset $subSlave>>
--
GitLab