From 5263cf816c223160de3458c334828a217f8c1ff5 Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Mon, 16 Apr 2018 03:37:17 +1200 Subject: [PATCH] Reverting and standardisation --- src/uncategorized/arcadeReport.tw | 2 +- src/uncategorized/brothelReport.tw | 2 +- src/uncategorized/cellblockReport.tw | 2 +- src/uncategorized/clinicReport.tw | 2 +- src/uncategorized/clubReport.tw | 2 +- src/uncategorized/dairyReport.tw | 2 +- src/uncategorized/masterSuiteReport.tw | 2 +- src/uncategorized/saServeThePublic.tw | 15 ++------------- src/uncategorized/saWhore.tw | 2 +- src/uncategorized/schoolroomReport.tw | 2 +- src/uncategorized/servantsQuartersReport.tw | 2 +- src/uncategorized/spaReport.tw | 2 +- 12 files changed, 13 insertions(+), 24 deletions(-) diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw index c5fcd6c5cd4..c796fb05da9 100644 --- a/src/uncategorized/arcadeReport.tw +++ b/src/uncategorized/arcadeReport.tw @@ -22,7 +22,7 @@ Some of the better tenants located near the arcade consider it an @@.red;obnoxious@@ establishment to have nearby. <</if>> <<if $arcadeDecoration != "standard">> - <br> $arcadeNameCaps's customers enjoy @@.green;getting off in $arcadeDecoration surroundings.@@ + <br><br> $arcadeNameCaps's customers enjoy @@.green;getting off in $arcadeDecoration surroundings.@@ <</if>> <<for _dI = 0; _dI < _DL; _dI++>> diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index 73fcc9ca365..5579c9f888c 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -933,7 +933,7 @@ $brothelNameCaps makes you @@.yellowgreen;<<print cashFormat(_profits)>>@@ this week. <<if $brothelDecoration != "standard">> - <br>$brothelNameCaps's customers enjoy @@.green;fucking whores in $brothelDecoration surroundings.@@ + <br><br> $brothelNameCaps's customers enjoy @@.green;fucking whores in $brothelDecoration surroundings.@@ <</if>> <!-- Statistics output --> diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw index f8702c87bc0..660b4e43de2 100644 --- a/src/uncategorized/cellblockReport.tw +++ b/src/uncategorized/cellblockReport.tw @@ -302,7 +302,7 @@ _brokenSlaves slaves are now willing to @@.hotpink;do as they're told@@ and have been released. <</if>> <<if $cellblockDecoration != "standard">> - <br>$cellblockNameCaps's $cellblockDecoration atmosphere @@.hotpink;had an impact on <<if _brokenSlaves == 1>>her while she was<<else>>them while they were<</if>>@@ imprisoned. + <br><br> $cellblockNameCaps's $cellblockDecoration atmosphere @@.hotpink;had an impact on <<if _brokenSlaves == 1>>her while she was<<else>>them while they were<</if>>@@ imprisoned. <</if>> <</if>> <</if>> diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index 3aed2830579..d1b76e62318 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -327,7 +327,7 @@ <</if>> been returned to @@.green;health<<if ($Nurse != 0) && ($clinicUpgradeFilters == 1)>> and purity<</if>>@@ and will be released from the clinic before the end of the week. <<if $clinicDecoration != "standard">> - <br>$clinicNameCaps's $clinicDecoration atmosphere @@.hotpink;had an impact on <<if _restedSlaves == 1>>her while she was<<else>>them while they were<</if>>@@ getting treatment. + <br><br> $clinicNameCaps's $clinicDecoration atmosphere @@.hotpink;had an impact on <<if _restedSlaves == 1>>her while she was<<else>>them while they were<</if>>@@ getting treatment. <</if>> <</if>> <<if _DL > 0 || $Nurse != 0>> diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw index 70ba3cc748c..44f57aa00f7 100644 --- a/src/uncategorized/clubReport.tw +++ b/src/uncategorized/clubReport.tw @@ -749,7 +749,7 @@ b.profit = b.totalIncome / b.totalExpenses; <</script>> <<if $clubDecoration != "standard">> - <br>$clubNameCaps's customers enjoy @@.green;having sex in $clubDecoration surroundings.@@ + <br><br> $clubNameCaps's customers enjoy @@.green;having sex in $clubDecoration surroundings.@@ <</if>> <!-- Statistics output --> diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index 8ec5938f9ff..9d2ddaaec2c 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -1027,7 +1027,7 @@ Due to one-off costs of hormonal implants to encourage fluid production, your da <</if>> <<if $dairyDecoration != "standard">> - <br>$dairyNameCaps's @@.green;$dairyDecoration style is well known.@@ + <br><br> $dairyNameCaps's @@.green;$dairyDecoration style is well known.@@ <</if>> <<if _DL > 0>> diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw index c35e3bbc397..58cb55c4c01 100644 --- a/src/uncategorized/masterSuiteReport.tw +++ b/src/uncategorized/masterSuiteReport.tw @@ -394,7 +394,7 @@ <</if>> <<if $masterSuiteDecoration != "standard">> - <br>$masterSuiteNameCaps's $masterSuiteDecoration atmosphere @@.hotpink;has a minor impact on your fucktoys.@@ + <br><br> $masterSuiteNameCaps's $masterSuiteDecoration atmosphere @@.hotpink;has a minor impact on your fucktoys.@@ <</if>> <</if>> <<if _DL > 0 || $Concubine != 0>> diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw index 0410d08fc69..45116b33046 100644 --- a/src/uncategorized/saServeThePublic.tw +++ b/src/uncategorized/saServeThePublic.tw @@ -209,18 +209,7 @@ the public. <</if>> <<set $beauty = Math.trunc($beauty*$beautyMultiplier)>> -Her appearance attracted $beauty members of the public (<<print Math.trunc($beauty/7)>> a day)<<if $beauty > 160>>, so many that -<<switch $vaginalAccessory>> - <<case "combined chastity">> - her mouth was - <<case "chastity belt">> - her ass and mouth were - <<case "anal chastity">> - her vagina and mouth were - <<default>> - each of her holes was -<</switch>> -often filled by more than one cock<<elseif $beauty > 140>>, so many that she spent much of her time getting gangbanged<<elseif $beauty > 120>>, so many that citizens often spitroasted the slut<<elseif $beauty > 100>>, so many that she frequently had sex with multiple citizens at once<<elseif $beauty > 70>>, so many that she occasionally had sex with multiple citizens at once<</if>>. Most of them +Her appearance attracted $beauty members of the public (<<print Math.trunc($beauty/7)>> a day)<<if $beauty > 160>>, so many that each of her holes was often filled by more than one cock<<elseif $beauty > 140>>, so many that she spent much of her time getting gangbanged<<elseif $beauty > 120>>, so many that citizens often spitroasted the slut<<elseif $beauty > 100>>, so many that she frequently had sex with multiple citizens at once<<elseif $beauty > 70>>, so many that she occasionally had sex with multiple citizens at once<</if>>. Most of them <<if $FResult > 15>> were putty in her hands. <<elseif $FResult > 10>> @@ -248,7 +237,7 @@ often filled by more than one cock<<elseif $beauty > 140>>, so many that she spe <<elseif $slaves[$i].physicalAge == $fertilityAge && canGetPregnant($slaves[$i]) && ($arcologies[0].FSRepopulationFocus != "unset" || $arcologies[0].FSGenderFundamentalist != "unset")>> <<if $slaves[$i].birthWeek == 0>> She is expected to become fertile soon, giving her an immense boost to both popularity and appeal as citizens clamor to claim her fresh womb. - <<elseif $slaves[$i].birthWeek < 4 && $slaves[$i].preg == 0>> + <<elseif $slaves[$i].birthWeek < 4 && $slaves[$i].pregKnown == 0>> This is still the first month in which she was anticipated to become fertile, and her womb is still unoccupied, giving her a boost to both popularity and appeal. <</if>> <</if>> diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw index bb178473cfb..560992bccab 100644 --- a/src/uncategorized/saWhore.tw +++ b/src/uncategorized/saWhore.tw @@ -223,7 +223,7 @@ so many that each of her holes was often filled by more than one cock<<elseif $b <<elseif $slaves[$i].physicalAge == $fertilityAge && canGetPregnant($slaves[$i]) && ($arcologies[0].FSRepopulationFocus != "unset" || $arcologies[0].FSGenderFundamentalist != "unset")>> <<if $slaves[$i].birthWeek == 0>> She is expected to become fertile soon, giving her an immense boost to both popularity and price as customers clamor to claim her fresh womb. - <<elseif $slaves[$i].birthWeek < 4 && $slaves[$i].preg == 0>> + <<elseif $slaves[$i].birthWeek < 4 && $slaves[$i].pregKnown == 0>> This is still the first month in which she was anticipated to become fertile, and her womb is still unoccupied, giving her a boost to both popularity and price. <</if>> <</if>> diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw index 532e677600b..dcbb135bb45 100644 --- a/src/uncategorized/schoolroomReport.tw +++ b/src/uncategorized/schoolroomReport.tw @@ -250,7 +250,7 @@ @@.green;learned@@ all they can, and will be released from the schoolroom before the end of the week. <</if>> <<if $schoolroomDecoration != "standard">> - <br>$schoolroomNameCaps's $schoolroomDecoration atmosphere @@.hotpink;has a minor impact on the students.@@ + <br><br> $schoolroomNameCaps's $schoolroomDecoration atmosphere @@.hotpink;has a minor impact on the students.@@ <</if>> <<if _DL > 0 || $Schoolteacher != 0>> <br><br> diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw index 45bf72647dd..797268ee1ea 100644 --- a/src/uncategorized/servantsQuartersReport.tw +++ b/src/uncategorized/servantsQuartersReport.tw @@ -322,7 +322,7 @@ <</if>> <<if $servantsQuartersDecoration != "standard">> - <br>$servantsQuartersNameCaps's $servantsQuartersDecoration atmosphere @@.hotpink;has a minor impact on your servants.@@ + <br><br> $servantsQuartersNameCaps's $servantsQuartersDecoration atmosphere @@.hotpink;has a minor impact on your servants.@@ <</if>> <<set $servantMilkersMultiplier = 1, $repGain += _DL*20>> diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw index 4f88b17778a..cbfc0ce0e78 100644 --- a/src/uncategorized/spaReport.tw +++ b/src/uncategorized/spaReport.tw @@ -336,7 +336,7 @@ _restedSlaves slaves have rested until they reached a state of @@.hotpink;devotion@@ and @@.mediumaquamarine;trust@@ and will leave the spa before the end of the week. <</if>> <<if $spaDecoration != "standard">> - <br>$spaNameCaps's $spaDecoration atmosphere @@.hotpink;had an impact on <<if _restedSlaves == 1>>her while she was<<else>>them while they were<</if>>@@ resting. + <br><br> $spaNameCaps's $spaDecoration atmosphere @@.hotpink;had an impact on <<if _restedSlaves == 1>>her while she was<<else>>them while they were<</if>>@@ resting. <</if>> <</if>> <<if _DL > 0 || $Attendant != 0>> -- GitLab