From 8c272b5e2d5d2bba41ade56d808213239b7d3091 Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Wed, 22 Aug 2018 11:50:30 -0500 Subject: [PATCH] Races Still --- src/events/gameover.tw | 2 +- src/pregmod/widgets/pregmodWidgets.tw | 3 +-- src/uncategorized/policies.tw | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/events/gameover.tw b/src/events/gameover.tw index 30ed2fd55bb..3fad2c30da4 100644 --- a/src/events/gameover.tw +++ b/src/events/gameover.tw @@ -79,7 +79,7 @@ <<elseif $gameover == "Idiot Ball 2 The Dumbassening" || $gameover == "Idiot Ball 3 Totally Not Idiot Ball 2 Again">> <<set $ui = "start">> - As you leave your penthouse to conduct your daily rounds, you promptly get <<if $arcologyUpgrade.drones == 1>>tased by the nearest drone<<else>>tackled hard against the wall<</if>>. When you awake, it hits you like a truck; you idiotically enslaved your $PC.origRace ass by decreeing all <<if $gameover == "Idiot Ball 2 The Dumbassening">>non-<<print $arcologies[0].FSSupremacistRace>><<else>><<print $arcologies[0].FSSubjugationistRace>><</if>><<if $PC.origRace != "mixed race">>s<<else>> individuals<</if>> 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. + As you leave your penthouse to conduct your daily rounds, you promptly get <<if $arcologyUpgrade.drones == 1>>tased by the nearest drone<<else>>tackled hard against the wall<</if>>. When you awake, it hits you like a truck; you idiotically enslaved your $PC.race ass by decreeing all <<if $gameover == "Idiot Ball 2 The Dumbassening">>non-<<print $arcologies[0].FSSupremacistRace>><<else>><<print $arcologies[0].FSSubjugationistRace>><</if>><<if $PC.race != "mixed race">>s<<else>> individuals<</if>> 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'' diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index 22bcb9add1f..c37218d0ca0 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -1275,8 +1275,7 @@ extremely pale -5 var parents = State.variables.args; var skin0 = parents[0] ? (skinToMelanin[parents[0].skin] || 5) : 3; var skin1 = parents[1] ? (skinToMelanin[parents[1].skin] || 5) : 3; - var tempnum = Math.round(Math.random() * (skin1 - skin0) + skin0); - var skin = Math.round(tempnum * 2) / 2; + var skin = Math.round(Math.random() * ((skin1 - skin0) + skin0)); State.variables.activeSlave.skin = ['pure white', 'extremely pale', 'pale', 'extremely fair', 'very fair', 'fair', 'white', 'light', 'lightened', 'light olive', 'olive', 'natural', 'tanned', 'bronzed', 'dark olive', 'dark', 'light brown', 'brown', 'dark brown', 'ebony', 'black', 'pure black'][skin]; })(); <</script>> diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw index de00d8a2df8..50ae50e60e0 100644 --- a/src/uncategorized/policies.tw +++ b/src/uncategorized/policies.tw @@ -1,9 +1,9 @@ :: Policies [nobr] <<set $nextButton = "Back">> -<<if $arcologies[0].FSSupremacistLawME == 1 && $PC.origRace != $arcologies[0].FSSupremacistRace>> +<<if $arcologies[0].FSSupremacistLawME == 1 && $PC.race != $arcologies[0].FSSupremacistRace>> <<set $nextLink = "Gameover", $gameover = "Idiot Ball 2 The Dumbassening">> -<<elseif $arcologies[0].FSSubjugationistLawME == 1 && $PC.origRace == $arcologies[0].FSSubjugationistRace>> +<<elseif $arcologies[0].FSSubjugationistLawME == 1 && $PC.race == $arcologies[0].FSSubjugationistRace>> <<set $nextLink = "Gameover", $gameover = "Idiot Ball 3 Totally Not Idiot Ball 2 Again">> <<else>> <<set $nextLink = "Main">> -- GitLab