From 3eaf4dd22360bf65f7caa3aaab9ca095075852ef Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 12 Mar 2019 18:22:52 -0500
Subject: [PATCH] Spacery
---
src/pregmod/manageCorporation.tw | 10 +++++-----
src/pregmod/widgets/assignmentFilterWidget.tw | 2 +-
src/uncategorized/PESS.tw | 2 +-
src/uncategorized/PETS.tw | 2 +-
src/uncategorized/RECI.tw | 2 +-
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/REroyalblood.tw | 2 +-
src/uncategorized/costsBudget.tw | 2 +-
src/uncategorized/genericPlotEvents.tw | 2 +-
src/uncategorized/manageArcology.tw | 4 ++--
src/uncategorized/neighborsDevelopment.tw | 2 +-
src/uncategorized/remoteSurgery.tw | 4 ++--
src/uncategorized/repBudget.tw | 4 ++--
src/uncategorized/reputation.tw | 2 +-
src/uncategorized/rulesSlaveDeselectWorkaround.tw | 4 +---
src/uncategorized/rulesSlaveExclude.tw | 4 +---
src/uncategorized/rulesSlaveExcludeWorkaround.tw | 4 +---
src/uncategorized/rulesSlaveNoExcludeWorkaround.tw | 4 +---
src/uncategorized/rulesSlaveSelect.tw | 4 +---
src/uncategorized/rulesSlaveSelectWorkaround.tw | 4 +---
20 files changed, 27 insertions(+), 39 deletions(-)
diff --git a/src/pregmod/manageCorporation.tw b/src/pregmod/manageCorporation.tw
index d262f5433b1..958fdb83975 100644
--- a/src/pregmod/manageCorporation.tw
+++ b/src/pregmod/manageCorporation.tw
@@ -735,7 +735,7 @@ __Division Management__
<<elseif $corpDivTrainSurgerySwitch == 1 && $corpDivTrainSurgeryTimer < 5>>
<<set _corpDivTrainCost = Math.trunc(700 * $corpDivTrainSlaves + Math.pow($corpDivTrainDev, 2)),
_corpDivTrainCostPU = Math.trunc(_corpDivTrainCost / ($corpDivTrainSlaves * 0.2)),
- _corpDivTrainRev = Math.trunc(menialSlaveCost() * (26 + $corpDivTrainSurgeryTimer * 1.6)),
+ _corpDivTrainRev = Math.trunc(menialSlaveCost() * (26 + $corpDivTrainSurgeryTimer * 1.6)),
_corpDivTrainProc = Math.trunc($corpDivTrainDev * 0.2)>>
<br>The corporation has a slave training division.
<br>It can train an average of @@.green;<<print _corpDivTrainProc>> slaves@@ each week when filled to capacity ($corpDivTrainDev).
@@ -817,14 +817,14 @@ __Division Management__
<</if>>
| [[Sell all|Manage Corporation][$corpCash += $corpDivTrainSlaves2 * 26 * menialSlaveCost(-$corpDivTrainSlaves2), $corpDivTrainSlaves2 = 0, $menialDemandFactor -= $corpDivTrainSlaves2, $corpRev += $corpDivTrainSlaves2 * 26 * menialSlaveCost(-$corpDivTrainSlaves2)]]
<<elseif $corpDivTrainSurgerySwitch == 1 && $corpDivTrainSurgeryTimer < 5>>
- <br>You can sell these slaves on the market. [[Sell 1|Manage Corporation][$corpCash += Math.trunc((26 + $corpDivTrainSurgeryTimer * 1.6) * menialSlaveCost()), $corpDivTrainSlaves2 -= 1, $menialDemandFactor -= 1, $corpRev += Math.trunc((26 + $corpDivTrainSurgeryTimer * 1.6) * menialSlaveCost())]]
+ <br>You can sell these slaves on the market. [[Sell 1|Manage Corporation][$corpCash += Math.trunc((26 + $corpDivTrainSurgeryTimer * 1.6) * menialSlaveCost()), $corpDivTrainSlaves2 -= 1, $menialDemandFactor -= 1, $corpRev += Math.trunc((26 + $corpDivTrainSurgeryTimer * 1.6) * menialSlaveCost())]]
<<if $corpDivTrainSlaves2 >= 10>>
- | [[Sell 10|Manage Corporation][$corpCash += Math.trunc((26 + $corpDivTrainSurgeryTimer * 1.6) * 10 * menialSlaveCost(-10)), $corpDivTrainSlaves2 -= 10, $menialDemandFactor -= 10, $corpRev += Math.trunc((26 + $corpDivTrainSurgeryTimer * 1.6) * 10 * menialSlaveCost())]]
+ | [[Sell 10|Manage Corporation][$corpCash += Math.trunc((26 +\ $corpDivTrainSurgeryTimer * 1.6) * 10 * menialSlaveCost(-10)), $corpDivTrainSlaves2 -= 10, $menialDemandFactor -= 10, $corpRev += Math.trunc((26 + $corpDivTrainSurgeryTimer * 1.6) * 10 * menialSlaveCost())]]
<</if>>
<<if $corpDivTrainSlaves2 >= 100>>
- | [[Sell 100|Manage Corporation][$corpCash += Math.trunc((26 + $corpDivTrainSurgeryTimer * 1.6) * 100 * menialSlaveCost(-100)), $corpDivTrainSlaves2 -= 100, $menialDemandFactor -= 100, $corpRev += Math.trunc((26 + $corpDivTrainSurgeryTimer * 1.6) * 100 * menialSlaveCost())]]
+ | [[Sell 100|Manage Corporation][$corpCash += Math.trunc((26 + $corpDivTrainSurgeryTimer * 1.6) * 100 * menialSlaveCost(-100)), $corpDivTrainSlaves2 -= 100, $menialDemandFactor -= 100, $corpRev += Math.trunc((26 + $corpDivTrainSurgeryTimer * 1.6) * 100 * menialSlaveCost())]]
<</if>>
- | [[Sell all|Manage Corporation][$corpCash += Math.trunc($corpDivTrainSlaves2 * (26 + $corpDivTrainSurgeryTimer * 1.6) * menialSlaveCost(-$corpDivTrainSlaves2)), $corpDivTrainSlaves2 = 0, $menialDemandFactor -= $corpDivTrainSlaves2, $corpRev += Math.trunc($corpDivTrainSlaves2 * (26 + $corpDivTrainSurgeryTimer * 1.6) * menialSlaveCost(-$corpDivTrainSlaves2))]]
+ | [[Sell all|Manage Corporation][$corpCash += Math.trunc($corpDivTrainSlaves2 * (26 + $corpDivTrainSurgeryTimer * 1.6) * menialSlaveCost(-$corpDivTrainSlaves2)), $corpDivTrainSlaves2 = 0, $menialDemandFactor -= $corpDivTrainSlaves2, $corpRev += Math.trunc($corpDivTrainSlaves2 * (26 + $corpDivTrainSurgeryTimer * 1.6) * menialSlaveCost(-$corpDivTrainSlaves2))]]
<<else>>
<br>You can sell these slaves on the market. [[Sell 1|Manage Corporation][$corpCash += 34 * menialSlaveCost(), $corpDivTrainSlaves2 -= 1, $menialDemandFactor -= 1, $corpRev += 34 * menialSlaveCost()]]
<<if $corpDivTrainSlaves2 >= 10>>
diff --git a/src/pregmod/widgets/assignmentFilterWidget.tw b/src/pregmod/widgets/assignmentFilterWidget.tw
index d3c6ad02a0a..87ce972f2e3 100644
--- a/src/pregmod/widgets/assignmentFilterWidget.tw
+++ b/src/pregmod/widgets/assignmentFilterWidget.tw
@@ -44,7 +44,7 @@
<</widget>>
<<widget "farmyardAssignmentFilter">>
- <<set $slaves.map(function(y){y.assignmentVisible = 0})>><<set $slaves.filter(function(x){return x.assignment == "work as a farmhand" || x.assignment == "be the Farmer"}).map(function(y){y.assignmentVisible = 1})>>
+ <<set $slaves.map(function(y){y.assignmentVisible = 0})>><<set $slaves.filter(function(x){return x.assignment == "work as a farmhand" || x.assignment == "be the Farmer"}).map(function(y){y.assignmentVisible = 1})>>
<</widget>>
<<widget "headgirlSuiteAssignmentFilter">>
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index bfe0821e836..9bc6c000a7a 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -60,7 +60,7 @@
<<set _clothesTemp = $activeSlave.clothes>>
<<switch $PESSevent>>
- /*Some events start with the slave naked (any event that starts with the daily inspection, for example). Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/
+ /*Some events start with the slave naked (any event that starts with the daily inspection, for example). Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/
<<case "tired collectrix" "tired milkmaid" "loving concubine" "bodyguard bedtime" "headgirl dickgirl">>
<<set $activeSlave.clothes = "no clothing">>
<</switch>>
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index eb083f0c76a..78cd37b8415 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -59,7 +59,7 @@
<<set _clothesTemp = $activeSlave.clothes>>
<<set _clothesTemp2 = $subSlave.clothes>>
<<switch $PETSevent>>
- /*Some events start with the slave naked (any event that starts with the daily inspection, for example). Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/
+ /*Some events start with the slave naked (any event that starts with the daily inspection, for example). Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/
<<case "comforting attendant">>
<<set $activeSlave.clothes = "no clothing">>
<<set $subSlave.clothes = "no clothing">>
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index c5aff37ed70..9c3dbbeda74 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -43,7 +43,7 @@
<<set _clothesTemp = $activeSlave.clothes>>
<<switch $RECIevent>>
- /*Some events start with the slave naked (any event that starts with the daily inspection, for example). Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/
+ /*Some events start with the slave naked (any event that starts with the daily inspection, for example). Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/
<<case "butthole" "futa" "orientation" "MILF" "feminization" "ugly">>
<<set $activeSlave.clothes = "no clothing">>
<</switch>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 614bf206d3d..52ac6c1a92c 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -43,7 +43,7 @@
<<set _clothesTemp = $activeSlave.clothes>>
<<switch $RESSevent>>
-/*Some events start with the slave naked (any event that starts with the daily inspection, for example). Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/
+/*Some events start with the slave naked (any event that starts with the daily inspection, for example). Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/
<<case "devoted lotion" "sore shoulders" "bed snuggle" "confident tanning" "devoted nympho" "devoted exhibition" "permitted masturbation" "terrified inspection" "spa boobs" "resistant shower" "resistant gelding" "rebellious arrogant" "bondage gear" "vocal disobedience" "heavy piercing" "resting amp" "age implant" "shift masturbation" "shift sleep" "slave dick huge" "obedient idiot" "tendon fall" "unhappy virgin" "fearful balls" "extreme aphrodisiacs" "shaped areolae" "huge tits" "trusting HG" "ignorant horny" "used whore" "restricted smart" "restricted profession" "mods please" "penitent" "devoted waist" "muscles" "obedient girlish" "huge naturals" "hugely pregnant" "slave dick on slave" "slave clit on slave" "language lesson" "kitchen molestation" "mindbroken morning" "sleeping ambivalent" "sexy succubus" "PA flirting" "fucktoy tribbing" "tittymonster inspection" "bonded love" "bad dream" "cockfeeder resistance" "suppository resistance" "shower slip" "happy dance" "plimb help" "orchiectomy please" "torpedo squeeze" "retching cum feeding" "subjugation blues" "transition anxiety" "moist pussy" "breast expansion blues" "gaped asshole" "ara ara" "im scared" "ass fitting" "young PC age difference" "old PC age difference" "devoted educated slave" "devoted shortstack" "desperate null" "implant inspection" "back stretch" "modest clothes">>
<<set $activeSlave.clothes = "no clothing">>
<<case "whore rebellious">>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index e5dbca26f71..b0e92526acc 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -745,7 +745,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<br><br>
Eventually they all arrive in your penthouse. The prince and princess are flushed with embarrassment in their compromising position. The former prince is beside _himself2 with rage, but seems to be holding _himself2 back for _his2 little sister's sake, while $he struggles to maintain a façade of poise and grace. The slightest trembling of $his balled up fists, the minute tremors that mar $his immaculate posture, $his inability to meet your eyes with $his own — all signs that $he is still a scared $girl despite all $his royal trappings. Nonetheless, though the princess's court training is unlikely to be very beneficial to $him in $his new life in the penthouse, it does stand in stark contrast to $his more common slave peers. However, the prince's submission to life as a slave is another question entirely. The Queen, on the other hand, seems almost relieved and basks in the opulence of _his3 new surroundings. Yet, it seems likely that _his3 relief has more to do with saving _him3 from a lifetime of gang rape at the mercy of _his3 former subjects, than it does the familiar luxury. _He3 submits to biometric scanning obediently and without fuss<<if $seePreg != 0>>, during which you discover to _his3 surprise that _he3 is pregnant. Since _he3 hasn't begun to show yet, it's unclear whether the child is the former King's or the new arcology owner's. You don't have the means to discern the father of the child, but you notice _he3 cradles _his3 ever so slightly rounded stomach protectively nonetheless<</if>>. Lastly, the ladies seem comforted by the opulence of their new surroundings. Though they still retain much of their aristocratic arrogance, they each submit to biometric scanning with relative obedience. It seems likely that their obedience is borne out of a delusional rationalization that enslavement by one wealthy master is better than enslavement by the unwashed masses they once lorded over. You also scored @@.yellowgreen;<<print cashFormat(_loot)>>@@ in valuables from the raid.
<<set $arcologies[0].prosperity = 2>>
- <<set _repShares = Math.trunc($rep/-15)>> /*this event is supposed to end in reputation at 0. In order to slice up that pie, we find shares of "everything" here and give them out later, before finally setting leftovers to 0. 3 ladies at one share each, +3 for prince, +4 for queen, +5 for princess is 15 shares.*/
+ <<set _repShares = Math.trunc($rep/-15)>> /*this event is supposed to end in reputation at 0. In order to slice up that pie, we find shares of "everything" here and give them out later, before finally setting leftovers to 0. 3 ladies at one share each, +3 for prince, +4 for queen, +5 for princess is 15 shares.*/
/* ladies */
<<for $i = 0; $i < 3; $i++>>
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 9a0a76788dd..91585b2133d 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -128,7 +128,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<print budgetLine("weather",
"<<if $lastWeeksCashExpenses.weather < 0 && $weatherCladding == 0>>
- Weather is causing @@.red;expensive damage.@@ Consider a protective [[upgrade|Manage Arcology][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]].
+ Weather is causing @@.red;expensive damage.@@ Consider a protective [[upgrade|Manage Arcology][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]].
<<else>>
Weather
<</if>>")>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 57513060bb3..e36afbcbf1c 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -493,7 +493,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to be pregnant. %/
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = "white">>
- <<set _missLeader = GenerateNewSlave("XX")>>
+ <<set _missLeader = GenerateNewSlave("XX")>>
<<set _missLeader.origin = "She was the head nun of a conquered mission. Once claimed, she was reduced to nothing more than a cum dump for her black masters.">>
<<set _missLeader.career = "a nun">>
<<set _missLeader.intelligence = random(16,80)>>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index ae53475b18f..a2c96644e0b 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -66,7 +66,7 @@ __Construction__
<<if ($receiverAvailable == 1) && ($FCTVenable != 0) && ($FCTVreceiver == 0)>>
You have not installed an FCTV receiver. Installing this receiver yourself will cost <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology))>>. You can have your citizens pay for the fiberoptic upgrades, reducing the cost to <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>. You can also have them heavily subsidize installation, they will be upset about it, but it will only cost <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>.
- [[No subsidy|Manage Arcology][cashX(forceNeg(Math.trunc(25000*$upgradeMultiplierArcology)), "capEx"), $FCTVreceiver = 1, $receiverAvailable = $week, repX(500, "capEx"), $PC.engineering += 1]] | [[Light subsidy|Manage Arcology][cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "capEx"), $FCTVreceiver = 1, $receiverAvailable = $week, $PC.engineering += 1]] | [[Heavy subsidy|Manage Arcology][cashX(forceNeg(Math.trunc(10000*$upgradeMultiplierArcology)), "capEx"), $FCTVreceiver = 1, $receiverAvailable = $week, repX(-1500, "capEx"), $PC.engineering += 1]]
+ [[No subsidy|Manage Arcology][cashX(forceNeg(Math.trunc(25000*$upgradeMultiplierArcology)), "capEx"), $FCTVreceiver = 1, $receiverAvailable = $week, repX(500, "capEx"), $PC.engineering += 1]] | [[Light subsidy|Manage Arcology][cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "capEx"), $FCTVreceiver = 1, $receiverAvailable = $week, $PC.engineering += 1]] | [[Heavy subsidy|Manage Arcology][cashX(forceNeg(Math.trunc(10000*$upgradeMultiplierArcology)), "capEx"), $FCTVreceiver = 1, $receiverAvailable = $week, repX(-1500, "capEx"), $PC.engineering += 1]]
<<elseif ($FCTVreceiver == 3)>>
You have installed the FCTV receiver and have access to the full range of FCTV's programs. High viewership rates amongst your citizens makes it easier to pursue your societal goals.
<<elseif ($FCTVreceiver == 2)>>
@@ -165,7 +165,7 @@ __Special Arcology Upgrades__
<br><br>
-Your slaves have participated in approximately <<print commaNum($oralTotal+$vaginalTotal+$analTotal)>> sexual encounters: <<print commaNum($oralTotal)>> primarily oral, <<print commaNum($vaginalTotal)>> vanilla, <<print commaNum($mammaryTotal)>> mammary, <<print commaNum($analTotal)>> anal, and <<print commaNum($penetrativeTotal)>> with the slave penetrating another. They have produced about <<print commaNum($milkTotal)>> liters of marketable milk, <<if $seeDicks != 0>>about <<print commaNum($cumTotal)>> deciliters of marketable cum, <</if>>and have given birth <<print commaNum($birthsTotal)>> times.
+Your slaves have participated in approximately <<print commaNum($oralTotal+$vaginalTotal+$analTotal)>> sexual encounters: <<print commaNum($oralTotal)>> primarily oral, <<print commaNum($vaginalTotal)>> vanilla, <<print commaNum($mammaryTotal)>> mammary, <<print commaNum($analTotal)>> anal, and <<print commaNum($penetrativeTotal)>> with the slave penetrating another. They have produced about <<print commaNum($milkTotal)>> liters of marketable milk, <<if $seeDicks != 0>>about <<print commaNum($cumTotal)>> deciliters of marketable cum, <</if>>and have given birth <<print commaNum($birthsTotal)>> times.
<<if $pitKillsTotal > 0>>$pitKillsTotal slaves have died in your fighting pit.<</if>>
<<if $fuckdollsSold > 0>>$fuckdollsSold mindbroken arcade slaves have been converted into Fuckdolls and sold.<</if>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 9b02b666e2b..184cc19a78f 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -514,7 +514,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<set $arcologies[$i].prosperity -= $arcologies[0].CyberEconomic*2, _WarSpoils = Math.ceil(10+Math.max(((100/_weekModifier)*$arcologies[$i].prosperity*$arcologies[0].CyberEconomic),0))>>
<<set $arcologies[$i].prosperity = Math.clamp($arcologies[$i].prosperity, 1, 300)>>
<<if random(0,100) >= _Catchchance-(10*$arcologies[0].CyberEconomic)>>
- <<set $arcologies[0].prosperity -= $arcologies[0].CyberEconomic*3, _redHanded = 1>>
+ <<set $arcologies[0].prosperity -= $arcologies[0].CyberEconomic*3, _redHanded = 1>>
<<run repX(forceNeg(random(100,200)), "war")>>
<<if $secExp == 1>>
<<set $authority -= random(100,500)*$arcologies[0].CyberEconomic, $crime += random(10,25)>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 2df1acdcff4..cf1c8e9e694 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -213,7 +213,7 @@ $He has
$He has
<<if $activeSlave.earT == "none">>
<<if $activeSlave.earShape != "none">>only one set of ears<<else>>no secondary ears<</if>>.
- <<elseif $activeSlave.earT == "normal">>
+ <<elseif $activeSlave.earT == "normal">>
<<if $activeSlave.earShape != "none">>a second pair of ears grafted to $his head<<else>>a pair of ears grafted to the top of $his head<</if>>.
<<elseif $activeSlave.earT == "neko">>
a pair of cat ears adorning $his head.
@@ -306,7 +306,7 @@ $He has <<if $activeSlave.horn == "none">>no horns<<else>>$activeSlave.horn<</if
<<if $activeSlave.horn != "cow horns">>
| [[Bovine horns|Surgery Degradation][$activeSlave.horn = "cow horns", $activeSlave.hornColor = "ivory", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>>
<<if $activeSlave.horn != "one long oni horn">>
- | [[an oni horn|Surgery Degradation][$activeSlave.horn = "one long oni horn", $activeSlave.hornColor = $activeSlave.skin, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>>
+ | [[an oni horn|Surgery Degradation][$activeSlave.horn = "one long oni horn", $activeSlave.hornColor = $activeSlave.skin, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>>
<<if $activeSlave.horn != "two long oni horns">>
| [[2 oni horns|Surgery Degradation][$activeSlave.horn = "two long oni horns", $activeSlave.hornColor = $activeSlave.skin, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>>
<<if $activeSlave.horn != "small horns">>
diff --git a/src/uncategorized/repBudget.tw b/src/uncategorized/repBudget.tw
index 6f86fe8de1e..fe0d34951a2 100644
--- a/src/uncategorized/repBudget.tw
+++ b/src/uncategorized/repBudget.tw
@@ -12,7 +12,7 @@
<</if>>
<br>
-//Reputation is a difficult thing to quantify, <<= properTitle()>>. Here you see an overview of topics that interest people in the arcology, and in turn, reflect on your own reputation. The more symbols you see in a category, the more impact that category is having on your reputation lately.//
+//Reputation is a difficult thing to quantify, <<= properTitle()>>. Here you see an overview of topics that interest people in the arcology, and in turn, reflect on your own reputation. The more symbols you see in a category, the more impact that category is having on your reputation lately.//
<br style="clear:both"><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>>
<br>
@@ -168,7 +168,7 @@ for(var i = 0; i < State.variables.lastWeeksRepIncome.length; i++){
</td>
<td>
<<set $lastWeeksRepProfits.Total = ($lastWeeksRepIncome.Total + $lastWeeksRepExpenses.Total)>>
- /* each "profit" item is calculated on this sheet, and there's two ways to generate a profit total: the difference of the income and expense totals, and adding all the profit items. If they aren't the same, I probably forgot to properly add an item's profit calculation to this sheet.*/
+ /* each "profit" item is calculated on this sheet, and there's two ways to generate a profit total: the difference of the income and expense totals, and adding all the profit items. If they aren't the same, I probably forgot to properly add an item's profit calculation to this sheet.*/
<<if $lastWeeksRepProfits.Total != hashSum($lastWeeksRepProfits) - $lastWeeksRepProfits.Total>>/* The profits object includes the total number of profits, so we have to subtract it back out */
<<print (commaNum(Math.trunc(hashSum($lastWeeksRepProfits)-$lastWeeksRepProfits.Total)))>><br>
@@.red;Fix profit calc<br>@@
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 77ddf0e06a5..6aabb016be8 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -118,7 +118,7 @@ On formal occasions, you are announced as $PCTitle.
<</if>>
<</if>>
-/*play games with overflow. Gains are calculated (and then sadly rounded) on previous pages but losses are calculated here, after the overflow happened. Let's borrow from the past.*/
+/*play games with overflow. Gains are calculated (and then sadly rounded) on previous pages but losses are calculated here, after the overflow happened. Let's borrow from the past.*/
<<if $lastWeeksRepExpenses.overflow < 0>>
<<set $rep += Math.abs($lastWeeksRepExpenses.overflow)>>
<<set $lastWeeksRepExpenses.overflow = 0>>
diff --git a/src/uncategorized/rulesSlaveDeselectWorkaround.tw b/src/uncategorized/rulesSlaveDeselectWorkaround.tw
index 0650e4deb96..fda2a7f7570 100644
--- a/src/uncategorized/rulesSlaveDeselectWorkaround.tw
+++ b/src/uncategorized/rulesSlaveDeselectWorkaround.tw
@@ -1,6 +1,5 @@
-:: Rules Slave Deselect Workaround
+:: Rules Slave Deselect Workaround [nobr]
-<<nobr>>
<<set $nextButton = "Continue", $nextLink = "Rules Slave Select">>
<<if ruleSlaveSelected($activeSlave, $currentRule)>>
@@ -8,4 +7,3 @@
<</if>>
<<goto "Rules Slave Select">>
-<</nobr>>
diff --git a/src/uncategorized/rulesSlaveExclude.tw b/src/uncategorized/rulesSlaveExclude.tw
index 5c6e5a4f522..3bda3fbbe8e 100644
--- a/src/uncategorized/rulesSlaveExclude.tw
+++ b/src/uncategorized/rulesSlaveExclude.tw
@@ -1,6 +1,5 @@
-:: Rules Slave Exclude
+:: Rules Slave Exclude [nobr]
-<<nobr>>
<<set $nextButton = "Continue", $nextLink = "Rules Assistant">>
<<if ndef $currentRule.excludedSlaves>>
@@ -20,4 +19,3 @@
<<set $Flag = 0>>
<<include "Slave Summary">>
<</if>>
-<</nobr>>
diff --git a/src/uncategorized/rulesSlaveExcludeWorkaround.tw b/src/uncategorized/rulesSlaveExcludeWorkaround.tw
index 7c74635680c..e35b1fcd4c6 100644
--- a/src/uncategorized/rulesSlaveExcludeWorkaround.tw
+++ b/src/uncategorized/rulesSlaveExcludeWorkaround.tw
@@ -1,6 +1,5 @@
-:: Rules Slave Exclude Workaround
+:: Rules Slave Exclude Workaround [nobr]
-<<nobr>>
<<set $nextButton = "Continue", $nextLink = "Rules Slave Exclude">>
<<if !ruleSlaveExcluded($activeSlave, $currentRule)>>
@@ -11,4 +10,3 @@
<</if>>
<<goto "Rules Slave Exclude">>
-<</nobr>>
diff --git a/src/uncategorized/rulesSlaveNoExcludeWorkaround.tw b/src/uncategorized/rulesSlaveNoExcludeWorkaround.tw
index 3522b7ffc06..32137293398 100644
--- a/src/uncategorized/rulesSlaveNoExcludeWorkaround.tw
+++ b/src/uncategorized/rulesSlaveNoExcludeWorkaround.tw
@@ -1,6 +1,5 @@
-:: Rules Slave NoExclude Workaround
+:: Rules Slave NoExclude Workaround [nobr]
-<<nobr>>
<<set $nextButton = "Continue", $nextLink = "Rules Slave Exclude">>
<<if ruleSlaveExcluded($activeSlave, $currentRule)>>
@@ -8,4 +7,3 @@
<</if>>
<<goto "Rules Slave Exclude">>
-<</nobr>>
diff --git a/src/uncategorized/rulesSlaveSelect.tw b/src/uncategorized/rulesSlaveSelect.tw
index 2c7a4cf70ab..4f234f4a079 100644
--- a/src/uncategorized/rulesSlaveSelect.tw
+++ b/src/uncategorized/rulesSlaveSelect.tw
@@ -1,6 +1,5 @@
-:: Rules Slave Select
+:: Rules Slave Select [nobr]
-<<nobr>>
<<set $nextButton = "Continue", $nextLink = "Rules Assistant">>
<<if ndef $currentRule.selectedSlaves>>
@@ -20,4 +19,3 @@
<<set $Flag = 0>>
<<include "Slave Summary">>
<</if>>
-<</nobr>>
diff --git a/src/uncategorized/rulesSlaveSelectWorkaround.tw b/src/uncategorized/rulesSlaveSelectWorkaround.tw
index 61af797ced7..af9e05771eb 100644
--- a/src/uncategorized/rulesSlaveSelectWorkaround.tw
+++ b/src/uncategorized/rulesSlaveSelectWorkaround.tw
@@ -1,6 +1,5 @@
-:: Rules Slave Select Workaround
+:: Rules Slave Select Workaround [nobr]
-<<nobr>>
<<set $nextButton = "Continue", $nextLink = "Rules Slave Select">>
<<if !ruleSlaveSelected($activeSlave, $currentRule)>>
@@ -11,4 +10,3 @@
<</if>>
<<goto "Rules Slave Select">>
-<</nobr>>
--
GitLab