From d454cf7859ee16c2977ad1e0dec7445223c730a9 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 22 Jan 2019 13:12:39 -0600
Subject: [PATCH] Space
---
src/facilities/nursery/previousChildInLine.tw | 2 -
src/js/economy.js | 2 +-
src/pregmod/pRaped.tw | 110 +++++++++---------
src/pregmod/seBurst.tw | 8 +-
src/uncategorized/BackwardsCompatibility.tw | 2 +-
src/uncategorized/brothel.tw | 2 +-
src/uncategorized/newSlaveIntro.tw | 6 +-
7 files changed, 65 insertions(+), 67 deletions(-)
diff --git a/src/facilities/nursery/previousChildInLine.tw b/src/facilities/nursery/previousChildInLine.tw
index dcd12c3d124..e39472e65c9 100644
--- a/src/facilities/nursery/previousChildInLine.tw
+++ b/src/facilities/nursery/previousChildInLine.tw
@@ -11,6 +11,4 @@
<</if>>
<<goto "Child Interact">>
-
<</silently>>
-
diff --git a/src/js/economy.js b/src/js/economy.js
index 21983bcdc88..cfb93ccf7d1 100644
--- a/src/js/economy.js
+++ b/src/js/economy.js
@@ -40,7 +40,7 @@ window.predictCost = function(array) {
predictTotalSlaveCosts(array2)
);
- //these two apply a multiplicative effect to all costs so far.
+ //these two apply a multiplicative effect to all costs so far.
totalCosts = getEnvironmentCosts(totalCosts);
totalCosts = getPCMultiplierCosts(totalCosts);
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 8934289c811..0a338cbe7c5 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -162,11 +162,11 @@ Now the only question is what to do with the would-be rapist. You could toss the
<<set $activeSlave.sexualFlaw = "hates penetration">>
<<set $activeSlave.anus = 2>>
<<if $activeSlave.vagina > -1>>
- <<set $activeSlave.vagina = 2>>
- <<if random(1,100) > 60 && isFertile($activeSlave)>>
- <<set $activeSlave.preg = 1>>
- <<set $activeSlave.pregSource = -2>>
- <</if>>
+ <<set $activeSlave.vagina = 2>>
+ <<if random(1,100) > 60 && isFertile($activeSlave)>>
+ <<set $activeSlave.preg = 1>>
+ <<set $activeSlave.pregSource = -2>>
+ <</if>>
<</if>>
<<if $activeSlave.publicCount>><<set $activeSlave.publicCount += 47>><<else>><<set $activeSlave.publicCount = 47>><</if>>
<<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
@@ -178,62 +178,62 @@ Now the only question is what to do with the would-be rapist. You could toss the
<</replace>>
<</link>>
<<if $arcade > 0>>
- <br><<link "Enslave $him and sentence $him to a month in the arcade">>
- <<= assignJob($activeSlave, "be confined in the arcade")>>
- <<set $activeSlave.sentence = 4>>
- <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
- <<replace "#result">>
- You complete the legalities and biometric scanning quickly and cautiously. The idiot will be in for a surprise when $he awakes to find $he can't move and a dick is in $his ass.
- <<run newSlave($activeSlave)>> /* skip New Slave Intro */
- <</replace>>
- <</link>>
+ <br><<link "Enslave $him and sentence $him to a month in the arcade">>
+ <<= assignJob($activeSlave, "be confined in the arcade")>>
+ <<set $activeSlave.sentence = 4>>
+ <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
+ <<replace "#result">>
+ You complete the legalities and biometric scanning quickly and cautiously. The idiot will be in for a surprise when $he awakes to find $he can't move and a dick is in $his ass.
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
+ <</replace>>
+ <</link>>
<</if>>
<<if $dairy > 0>>
- <<if $dairyRestraintsSetting > 1>>
- <br><<link "Enslave $him and send $him straight to the industrial dairy">>
- <<= assignJob($activeSlave, "work in the dairy")>>
- <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
- <<replace "#result">>
- You complete the legalities and biometric scanning quickly and cautiously. The idiot will wake up <<if $dairyStimulatorsSetting > 1>>in agony as $his anus takes the rectal hydration dildo<<else>>to find $his chest has begun swelling with milk<</if>>.
- <<set $activeSlave.boobs += 300>>
- <<run newSlave($activeSlave)>> /* skip New Slave Intro */
- <</replace>>
- <</link>>
- <</if>>
+ <<if $dairyRestraintsSetting > 1>>
+ <br><<link "Enslave $him and send $him straight to the industrial dairy">>
+ <<= assignJob($activeSlave, "work in the dairy")>>
+ <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
+ <<replace "#result">>
+ You complete the legalities and biometric scanning quickly and cautiously. The idiot will wake up <<if $dairyStimulatorsSetting > 1>>in agony as $his anus takes the rectal hydration dildo<<else>>to find $his chest has begun swelling with milk<</if>>.
+ <<set $activeSlave.boobs += 300>>
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
+ <</replace>>
+ <</link>>
+ <</if>>
<</if>>
<<if $farmyard > 0>>
- <br><<link "Enslave $him and send $him straight to the farmyard">>
- <<= assignJob($activeSlave, "work as a farmhand")>>
- <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
- <<replace "#result">>
- You complete the legalities and biometric scanning quickly and cautiously. /*TODO: finish writing this subsection */
- <<run newSlave($activeSlave)>> /* skip New Slave Intro */
- <</replace>>
- <</link>>
+ <br><<link "Enslave $him and send $him straight to the farmyard">>
+ <<= assignJob($activeSlave, "work as a farmhand")>>
+ <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
+ <<replace "#result">>
+ You complete the legalities and biometric scanning quickly and cautiously. /*TODO: finish writing this subsection */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
+ <</replace>>
+ <</link>>
<</if>>
<<if $seeExtreme > 0>>
- <br><<link "Punitively amputate $his limbs, and then enslave $him">>
- <<set $activeSlave.health -= 20>>
- <<set $activeSlave.amp = 1>>
- <<set $activeSlave.heels = 0>>
- <<set $activeSlave.behavioralFlaw = "odd">>
- <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
- <<replace "#result">>
- You want $him to suffer for what $he tried to pull on you. You make sure $he is fully awake as $he is strapped into the autosurgery. You take great pleasure in watching $him struggle as $his limbs are taken, one by one. Of course, @@.red;$his health is affected@@ and the horrible experience has left $him @@.red;acting oddly.@@ After $he has stabilized, it's off to the penthouse for basic slave induction. You'd like to see $him try and touch you again without arms and legs.
- <</replace>>
- <</link>>
- <br><<link "Enslave the criminal and geld $him">>
- <<set $activeSlave.health -= 20>>
- <<set $activeSlave.balls = 0>>
- <<set $activeSlave.devotion -= 25>>
- <<set $activeSlave.trust -= 25>>
- <<run newSlave($activeSlave)>>
- <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
- <<replace "#result">>
- You want $him to suffer for what $he tried to pull on you. You make sure $he is fully awake as $he is strapped into the autosurgery, taking the time to roughly fondle $his balls. You take great pleasure in watching $him struggle as $his testicles are removed. Once $he can stand again, it's off to the penthouse for basic slave induction.
- <<include "New Slave Intro">>
- <</replace>>
- <</link>>
+ <br><<link "Punitively amputate $his limbs, and then enslave $him">>
+ <<set $activeSlave.health -= 20>>
+ <<set $activeSlave.amp = 1>>
+ <<set $activeSlave.heels = 0>>
+ <<set $activeSlave.behavioralFlaw = "odd">>
+ <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
+ <<replace "#result">>
+ You want $him to suffer for what $he tried to pull on you. You make sure $he is fully awake as $he is strapped into the autosurgery. You take great pleasure in watching $him struggle as $his limbs are taken, one by one. Of course, @@.red;$his health is affected@@ and the horrible experience has left $him @@.red;acting oddly.@@ After $he has stabilized, it's off to the penthouse for basic slave induction. You'd like to see $him try and touch you again without arms and legs.
+ <</replace>>
+ <</link>>
+ <br><<link "Enslave the criminal and geld $him">>
+ <<set $activeSlave.health -= 20>>
+ <<set $activeSlave.balls = 0>>
+ <<set $activeSlave.devotion -= 25>>
+ <<set $activeSlave.trust -= 25>>
+ <<run newSlave($activeSlave)>>
+ <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
+ <<replace "#result">>
+ You want $him to suffer for what $he tried to pull on you. You make sure $he is fully awake as $he is strapped into the autosurgery, taking the time to roughly fondle $his balls. You take great pleasure in watching $him struggle as $his testicles are removed. Once $he can stand again, it's off to the penthouse for basic slave induction.
+ <<include "New Slave Intro">>
+ <</replace>>
+ <</link>>
<</if>>
<<else>>
//You lack the necessary funds to enslave $him.//
diff --git a/src/pregmod/seBurst.tw b/src/pregmod/seBurst.tw
index 707783ca4fb..10cd461d44b 100644
--- a/src/pregmod/seBurst.tw
+++ b/src/pregmod/seBurst.tw
@@ -6,12 +6,12 @@
<<if $slaves[_b].burst == 1>>
<<if (($slaves[_b].belly > ($slaves[_b].pregAdaptation*3200)) || $slaves[_b].bellyPreg > 600000)>>
-
+
<<set $slaves[_b].curBabies = WombBirth($slaves[_b], $slaves[_b].pregData.minLiveBirth)>>
<<set $slaves[_b].curStillBirth = 0 >>
<<set _curBabies = $slaves[_b].curBabies.length>> /*just to improve speed and usability here.*/
<<set $birthsTotal += _curBabies>>
-
+
<<set _others = 0, _PC = 0, _citizens = 0, _oldMaster = 0, _arcOwner = 0, _lab = 0, _fathers = [], _babyFatherLink = []>>
<<for _cb = 0; _cb < $slaves[_b].curBabies.length; _cb++>>
<<if $slaves[_b].curBabies[_cb].fatherID == 0 || $slaves[_b].curBabies[_cb].fatherID == -5>>
@@ -129,7 +129,7 @@
/* ------------------------------------------------ */
$slaves[_b].slaveName's straining womb finally gave out and burst, taking $his
-
+
<<if _curBabies > 0>>
life, but not <<if _curBabies <= 1>>that of $his child<<else>>those of all $his children<</if>>;
<<if _fathersReduced.length > 2>>
@@ -287,7 +287,7 @@
<<set $reservedChildren = FetusGlobalReserveCount("incubator")>>
<<set $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
-
+
<<elseif $slaves[_b].inflation != 0>>
<<pop $slaves[_b]>>
<</if>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 39abd5238c9..22049f114f5 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3411,7 +3411,7 @@ Setting missing slave variables:
<<set _Slave = $genePool[_bci]>>
<<PMODinit _Slave>>
-
+
<<if $genePool.map(function(s) { return s.ID; }).count(_Slave.ID) > 1>> /* first check for duplicate IDs, keep the first entry and delete the others */
<<for _bci2 = _bci + 1; _bci2 < $genePool.length; _bci2++>>
<<if $genePool[_bci2].ID == _Slave.ID>>
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index e808b0c15da..8efe26db319 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -195,7 +195,7 @@ Last week this
<<set $lastWeeksCashProfits.brothelAds = $lastWeeksCashIncome.brothelAds + $lastWeeksCashExpenses.brothelAds>>
<<if $lastWeeksCashProfits.brothelAds > 0>>
made you an extra @@.green;<<print cashFormat($lastWeeksCashProfits.brothelAds)>>@@,<<if $brothelSlaves > 1>> as well as increasing business for your whores.<</if>>
-<<elseif $lastWeeksCashProfits.brothelAds < 0>>
+<<elseif $lastWeeksCashProfits.brothelAds < 0>>
cost you @@.red;<<print cashFormat($lastWeeksCashProfits.brothelAds)>>@@,<<if $brothelSlaves > 1>> but still increased business for your whores.<</if>>
<</if>>
<<link "Manage brothel advertisements" "Brothel Advertisement">><<set $nextLink = passage(), $nextButton = "Back">><</link>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 2ebbf2a95f8..a03ba55433c 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1257,7 +1257,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</if>>
<</if>>
<br><br>
- Whenever you feel able, you drain your balls into $his <<if $activeSlave.mpreg == 1>>ass<<else>>cunt<</if>>, only releasing $him for other duties when scans verify a fertilized ovum.
+ Whenever you feel able, you drain your balls into $his <<if $activeSlave.mpreg == 1>>ass<<else>>cunt<</if>>, only releasing $him for other duties when scans verify a fertilized ovum.
<<if $activeSlave.intelligence+$activeSlave.intelligenceImplant < -50>>
$He didn't properly understand the scans, so $he just thought it was bound, forced sex; $he won't realize what happened for some weeks at least.
<<elseif $activeSlave.fetish == "pregnancy">>
@@ -1265,8 +1265,8 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<else>>
$He wasn't sure what this was all about, but $he has $his suspicions.
<</if>>
-
-
+
+
<<if $activeSlave.mpreg == 1>>
<<= AnalVCheck()>>
<<else>>
--
GitLab