From 81b4029eae741c4f174ad95cdc4739b733e126a2 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 17 Jun 2018 00:20:31 -0400
Subject: [PATCH] Subjugationist bad end and other tweaks/fixes
---
devNotes/twine JS | 4 ++--
src/events/gameover.tw | 4 ++--
src/js/eventSelectionJS.tw | 4 ++--
src/npc/fRelation.tw | 7 +++----
src/pregmod/widgets/slaveSummaryWidgets.tw | 8 ++++----
src/uncategorized/policies.tw | 8 +++++++-
6 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/devNotes/twine JS b/devNotes/twine JS
index e8be76c373e..39d61f66d81 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -4311,7 +4311,7 @@ if(eventSlave.fetish != "mindbroken") {
}
}
- if(eventSlave.slaveName != eventSlave.birthName) {
+ if(eventSlave.slaveName != eventSlave.birthName && eventSlave.birthName !== "") {
if(eventSlave.devotion <= 20) {
if(eventSlave.trust > -20) {
if(eventSlave.anus > 0 && canDoAnal(eventSlave)) {
@@ -5870,7 +5870,7 @@ if(eventSlave.fetish != "mindbroken") {
}
}
- if(eventSlave.slaveName != eventSlave.birthName) {
+ if(eventSlave.slaveName != eventSlave.birthName && eventSlave.birthName !== "") {
if(eventSlave.devotion <= 20) {
if(eventSlave.trust > -20) {
if(eventSlave.anus > 0 && canDoAnal(eventSlave)) {
diff --git a/src/events/gameover.tw b/src/events/gameover.tw
index 73398b51a44..37bee288a05 100644
--- a/src/events/gameover.tw
+++ b/src/events/gameover.tw
@@ -77,9 +77,9 @@
<br><br>
''GAME OVER''
-<<elseif $gameover == "Idiot Ball 2 The Dumbassening">>
+<<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 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.
+ 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>>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''
diff --git a/src/js/eventSelectionJS.tw b/src/js/eventSelectionJS.tw
index 4ba6b697945..359f3ddae64 100644
--- a/src/js/eventSelectionJS.tw
+++ b/src/js/eventSelectionJS.tw
@@ -506,7 +506,7 @@ if(eventSlave.fetish != "mindbroken") {
}
}
- if(eventSlave.slaveName != eventSlave.birthName) {
+ if(eventSlave.slaveName != eventSlave.birthName && eventSlave.birthName !== "") {
if(eventSlave.devotion <= 20) {
if(eventSlave.trust > -20) {
if(eventSlave.anus > 0 && canDoAnal(eventSlave)) {
@@ -2065,7 +2065,7 @@ if(eventSlave.fetish != "mindbroken") {
}
}
- if(eventSlave.slaveName != eventSlave.birthName) {
+ if(eventSlave.slaveName != eventSlave.birthName && eventSlave.birthName !== "") {
if(eventSlave.devotion <= 20) {
if(eventSlave.trust > -20) {
if(eventSlave.anus > 0 && canDoAnal(eventSlave)) {
diff --git a/src/npc/fRelation.tw b/src/npc/fRelation.tw
index ebf31834f84..e1a6642663a 100644
--- a/src/npc/fRelation.tw
+++ b/src/npc/fRelation.tw
@@ -75,13 +75,12 @@ You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your off
<<PartnerVCheck>>
<<elseif canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 20) && (_activeSlaveRel == "daughter")>>
$activeSlave.slaveName is enthusiastic when $he hears you order $slaves[$partner].slaveName to come over. $His total immersion in sexual slavery has clearly uncovered a willingness to get very close to $his mother. You<<if ($PC.dick == 0)>> don a strap-on,<</if>> lie on the floor and instruct $slaves[$partner].slaveName to ride you. _He2 complies, and finds _his2 daughter $activeSlave.slaveName <<if ($slaves[$partner].dick > 0)>>
- stroking _his2 cock while $he humps $his <<if $seeRace == 1>>$activeSlave.race <</if>>butt up and down on your cock.
+ stroking _his2 cock while _he2 humps _his2 <<if $seeRace == 1>>$activeSlave.race <</if>>butt up and down on your cock.
<<else>>
- licking _his2 anus while $he humps $himself up and down on your cock.
+ licking _his2 anus while _he2 humps _himself2 up and down on your cock.
<</if>>
- Your use of $slaves[$partner].slaveName's mature body is the focus. _He2 finds _himself2 caught up in a miasma of sexual pleasure and perversion, moaning and blushing as your <<if ($PC.dick == 0)>>strap-on and fingers<<else>>cock<</if>> and $slaves[$partner].slaveName's mouth tour $his body. When you finish in $his <<if ($slaves[$partner].dick > 0)>>asshole, $his daughter hastens to lavish attention on _his2 mother's well fucked, cum filled butt.<<else>>pussy, $his daughter hastens to lavish attention on _his2 mother's well fucked, cum filled cunt.<</if>>
+ Your use of $slaves[$partner].slaveName's mature body is the focus. _He2 finds _himself2 caught up in a miasma of sexual pleasure and perversion, moaning and blushing as your <<if ($PC.dick == 0)>>strap-on and fingers<<else>>cock<</if>> and $active.slaveName's mouth tour _his2 body. When you finish in _his2 <<if ($slaves[$partner].dick > 0)>>asshole, _his2 daughter hastens to lavish attention on $his mother's well fucked, cum filled butt.<<else>>pussy, _his2 daughter hastens to lavish attention on $his mother's well fucked, cum filled cunt.<</if>>
<<set $activeSlave.oralCount += 2, $slaves[$partner].oralCount += 2, $oralTotal += 2>>
- <<BothVCheck>>
<<PartnerVCheck>>
<<elseif canDoVaginal($activeSlave) && canDoVaginal($slaves[$partner]) && canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 50) && (_activeSlaveRel == "twin")>>
$activeSlave.slaveName and $slaves[$partner].slaveName are such devoted sex slaves that they've long since lost any hesitations about their partnership, and generally approach sex as though their bodies were interchangeable. (This means that they almost never masturbate, for one thing, preferring to have sex with each other, instead.) Giggling and kissing each other, they eagerly kneel before your chair and give you simultaneous oral sex, making an effort to play with their symmetry. They kiss around your <<if ($PC.dick == 0)>>pussy<<else>>cock, making a complete seal around you with their lips<</if>>, one on each side. Then they jump up on your desk and press their <<if ($activeSlave.dick > 0) && ($slaves[$partner].dick > 0)>>cocks<<elseif ($activeSlave.dick > 0) || ($slaves[$partner].dick > 0)>>cock and pussy<<else>>pussies<</if>> against one another<<if ($PC.dick == 0)>> while you don a strap-on<</if>>, spreading their legs to offer you everything. You switch back and forth, with the twin you're not in rubbing and grinding against their sister, until both of $slaves[$partner].slaveName and $activeSlave.slaveName are lying on the desk<<if ($PC.dick == 1)>> with cum dripping out of them<</if>>, making out tiredly.
diff --git a/src/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw
index db7d58c56af..900a5b7d6ba 100644
--- a/src/pregmod/widgets/slaveSummaryWidgets.tw
+++ b/src/pregmod/widgets/slaveSummaryWidgets.tw
@@ -2157,13 +2157,13 @@ _Slave.faceShape face.
<</if>>
<<if _Slave.attrKnown == 1>>
<<if _Slave.clitSetting == "women">>
- <<if _Slave.attrXX < 95>>SP:women<</if>>
+ <<if _Slave.attrXX < 95>>SP:women<<else>>SP:monitoring<</if>>
<<elseif _Slave.clitSetting == "men">>
- <<if _Slave.attrXY < 95>>SP:men<</if>>
+ <<if _Slave.attrXY < 95>>SP:men<<else>>SP:monitoring<</if>>
<<elseif _Slave.clitSetting == "anti-women">>
- <<if _Slave.attrXX > 0>>SP:anti-women<</if>>
+ <<if _Slave.attrXX > 0>>SP:anti-women<<else>>SP:monitoring<</if>>
<<elseif _Slave.clitSetting == "anti-men">>
- <<if _Slave.attrXY > 0>>SP:anti-men<</if>>
+ <<if _Slave.attrXY > 0>>SP:anti-men<<else>>SP:monitoring<</if>>
<</if>>
<<else>>
<<if _Slave.clitSetting == "women">>
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index 2cf059ba422..d49ab91886a 100644
--- a/src/uncategorized/policies.tw
+++ b/src/uncategorized/policies.tw
@@ -1,7 +1,13 @@
:: Policies [nobr]
<<set $nextButton = "Back">>
-<<if $arcologies[0].FSSupremacistLawME == 1 && $PC.origRace != $arcologies[0].FSSupremacistRace>><<set $nextLink = "Gameover", $gameover = "Idiot Ball 2 The Dumbassening">><<else>><<set $nextLink = "Main">><</if>>
+<<if $arcologies[0].FSSupremacistLawME == 1 && $PC.origRace != $arcologies[0].FSSupremacistRace>>
+ <<set $nextLink = "Gameover", $gameover = "Idiot Ball 2 The Dumbassening">>
+<<eleeif arcologies[0].FSSubjugationistLawME == 1 && $PC.origRace == $arcologies[0].FSSubjugationistRace>>
+ <<set $nextLink = "Gameover", $gameover = "Idiot Ball 3 Totally Not Idiot Ball 2 Again">>
+<<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)>>
--
GitLab