From 610e6202395963369c369f101159c730683f5605 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Fri, 30 Mar 2018 00:30:00 -0400 Subject: [PATCH] proper law enforcement --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 1 + src/events/gameover.tw | 8 ++++++++ src/uncategorized/policies.tw | 2 +- src/uncategorized/seWedding.tw | 4 ++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 04c1883f77f..70f22992473 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -6,6 +6,7 @@ 16 -various corrections to enslaved citizens not being the right race when the supremacist law is in play + -a certain policy is now properly enforced 3/29/2018 diff --git a/src/events/gameover.tw b/src/events/gameover.tw index 3fb54271faa..17dfd1afabe 100644 --- a/src/events/gameover.tw +++ b/src/events/gameover.tw @@ -76,6 +76,14 @@ <br><br> ''GAME OVER'' + +<<elseif $gameover == "Idiot Ball 2 The Dumbassening">> + <<set $ui = "start">> + As you leave your penthouse to conduct your daily rounds, you promptly get tazed by the nearest drone. When you awake, it hits you like a truck; you idiotically enslaved your $PC.origRace ass by decreeing all non-<<print $arcologies[0].FSSupremacistRace>>s slaves, and since you are now a slave, lack the authority to revert the policy. The story of your remaining years may be worth telling, as is your legendary blunder, but it must be told elsewhere. + + <br><br> + ''GAME OVER'' + <<else>> <<set $ui = "start">> Since you are without slaves, Free Cities society no longer considers you a citizen of the first rank. Your personal story may continue, but that part of it worthy of retelling has now ended. diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw index 2a7163a6251..45b019fcf33 100644 --- a/src/uncategorized/policies.tw +++ b/src/uncategorized/policies.tw @@ -1,7 +1,7 @@ :: Policies [nobr] <<set $nextButton = "Back">> -<<set $nextLink = "Main">> +<<if $arcologies[0].FSSupremacistLawME == 1 && $PC.origRace != $arcologies[0].FSSupremacistRace>><<set $nextLink = "Gameover", $gameover = "Idiot Ball 2 The Dumbassening">><<else>><<set $nextLink = "Main">><</if>> <<set $showEncyclopedia = 1>><<set $encyclopedia = "Future Societies">> <<if $rep < 0>><<set $rep = 0>><</if>> <<set $customRetirementAge = Math.clamp($customRetirementAge, 20, 120)>> diff --git a/src/uncategorized/seWedding.tw b/src/uncategorized/seWedding.tw index 5b6331eacdf..4c4b272b704 100644 --- a/src/uncategorized/seWedding.tw +++ b/src/uncategorized/seWedding.tw @@ -542,7 +542,7 @@ <<if $activeSlave.relationship != 0>> <<if $activeSlave.devotion+$activeSlave.trust >= 175>> <<if $activeSlave.relationship > 0>> - Her <<$activeSlave.relationship > 2>>ex<<else>>friend<</if>> is @@.mediumorchid;disappointed@@ that their relationship had to end and @@.gold;worries@@ for her <<$activeSlave.relationship > 2>>love<<else>>companion<</if>>'s future. + Her <<if $activeSlave.relationship > 2>>ex<<else>>friend<</if>> is @@.mediumorchid;disappointed@@ that their relationship had to end and @@.gold;worries@@ for her <<if $activeSlave.relationship > 2>>love<<else>>companion<</if>>'s future. <<if $activeSlave.relationship == 4>> <<set $slaves[_m].devotion -= 5, $slaves[_m].trust -= 5>> <<elseif $activeSlave.relationship == 3>> @@ -710,7 +710,7 @@ <<if $activeSlave.relationship != 0>> <<if $activeSlave.devotion+$activeSlave.trust >= 175>> <<if $activeSlave.relationship > 0>> - Her <<$activeSlave.relationship > 2>>ex<<else>>friend<</if>> is @@.mediumorchid;disappointed@@ that their relationship had to end and @@.gold;worries@@ for her <<$activeSlave.relationship > 2>>love<<else>>companion<</if>>'s future. + Her <<if $activeSlave.relationship > 2>>ex<<else>>friend<</if>> is @@.mediumorchid;disappointed@@ that their relationship had to end and @@.gold;worries@@ for her <<if $activeSlave.relationship > 2>>love<<else>>companion<</if>>'s future. <<if $activeSlave.relationship == 4>> <<set $slaves[_m].devotion -= 5, $slaves[_m].trust -= 5>> <<elseif $activeSlave.relationship == 3>> -- GitLab