From 7e5f21bef335b689f155264b294d47bd89ca50d8 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 23 Mar 2020 15:28:18 -0500
Subject: [PATCH] Fixes
---
Changelog.txt | 12 +-
src/003-assets/CSS/arcologyBuilding.css | 118 +++++++++----------
src/003-assets/CSS/table.css | 34 +++---
src/Corporation/corporateMarket.tw | 2 +-
src/endWeek/healthFunctions.js | 12 +-
src/events/intro/locationIntro.tw | 2 +-
src/events/reSnatchAndGrabFollowup.tw | 2 +-
src/facilities/farmyard/farmyardReport.tw | 2 +-
src/facilities/nursery/nursery.tw | 14 +--
src/js/food.js | 2 +-
src/npc/interaction/fBeg.tw | 3 +-
src/player/electiveSurgery.tw | 8 +-
src/pregmod/slaveOnSlaveFeedingWorkAround.tw | 4 +-
src/uncategorized/cellblock.tw | 6 +-
src/uncategorized/clinic.tw | 12 +-
src/uncategorized/clubAdvertisement.tw | 2 +-
src/uncategorized/clubReport.tw | 2 +-
src/uncategorized/costsReport.tw | 2 +-
src/uncategorized/dairy.tw | 36 +++---
src/uncategorized/genericPlotEvents.tw | 2 +-
src/uncategorized/ptWorkaround.tw | 8 +-
src/uncategorized/saLiveWithHG.tw | 16 +--
src/uncategorized/saLongTermEffects.tw | 10 +-
src/uncategorized/salon.tw | 2 +-
src/uncategorized/schoolroom.tw | 16 +--
src/uncategorized/servantsQuarters.tw | 1 -
src/uncategorized/slaveInteract.tw | 2 +-
src/uncategorized/wardrobe.tw | 2 +-
28 files changed, 167 insertions(+), 167 deletions(-)
diff --git a/Changelog.txt b/Changelog.txt
index fab7c58b607..b5e844dbeb9 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -12,7 +12,7 @@ Pregmod
0.10.7.1-3.3.x
3/07/2020
-
+
3
-added corrective diet
-food market tweaking
@@ -21,21 +21,21 @@ Pregmod
-more code improvement
3/02/2020
-
+
2
-fixed lingering assistant issues
3/01/2020
-
+
1
-added a follow up event to "snatch and grab"
-assistant code restructuring
-corrected breast description desyncs
-continued code domming
-fixes
-
+
2/23/2020
-
+
0
-tiredness overhauled (temp disabled)
-illness tweaked
@@ -64,7 +64,7 @@ Pregmod
12/25/2019
0
- -slave health overhaul (short and long term health, exhuastion effects and illness)
+ -slave health overhaul (short and long term health, exhaustion effects and illness)
-slave release rules overhaul (better control of who they do in their free time)
-eye object overhaul
-organ farm cleanup
diff --git a/src/003-assets/CSS/arcologyBuilding.css b/src/003-assets/CSS/arcologyBuilding.css
index 741851cbffe..436aa054937 100644
--- a/src/003-assets/CSS/arcologyBuilding.css
+++ b/src/003-assets/CSS/arcologyBuilding.css
@@ -1,173 +1,173 @@
div.building {
- display: flex;
- flex-direction: column;
- width: 100%;
+ display: flex;
+ flex-direction: column;
+ width: 100%;
}
div.building.basement {
- border-top: solid 1px #333333;
- margin-top: -1px;
- background-image: repeating-linear-gradient(135deg, transparent, transparent 20px, #333333 20px, #333333 30px);
+ border-top: solid 1px #333333;
+ margin-top: -1px;
+ background-image: repeating-linear-gradient(135deg, transparent, transparent 20px, #333333 20px, #333333 30px);
}
div.building div.row {
- display: flex;
- flex-direction: row;
- width: 70%;
- margin: 0 auto;
- justify-content: center;
+ display: flex;
+ flex-direction: row;
+ width: 70%;
+ margin: 0 auto;
+ justify-content: center;
}
div.building div.outerCell {
- /* fill cell fully, part 1: trick to fill the full height even if content is smaller */
- display: flex;
- flex-direction: row;
+ /* fill cell fully, part 1: trick to fill the full height even if content is smaller */
+ display: flex;
+ flex-direction: row;
}
div.building div.innerCell:not(.filler) {
- margin: 3px;
- border: 5px solid;
- padding: 2px;
- text-align: center;
- /* fill cell fully, part 2: full width */
- width: 100%;
- /* overwriting with the default background color to hide the basement indicator */
- background-color: #111;
+ margin: 3px;
+ border: 5px solid;
+ padding: 2px;
+ text-align: center;
+ /* fill cell fully, part 2: full width */
+ width: 100%;
+ /* overwriting with the default background color to hide the basement indicator */
+ background-color: #111;
}
/* introduction special formatting */
/* makes all links unusable */
.intro div.building a {
- color: white;
- pointer-events: none;
- cursor: default;
+ color: white;
+ pointer-events: none;
+ cursor: default;
}
.intro div.building .hotkey {
- display: none;
+ display: none;
}
/* penthouse formatting */
div.building div.gridWrapper {
- display: grid;
+ display: grid;
}
div.building div.gridWrapper.grid1 {
- grid-template-columns: 100%;
+ grid-template-columns: 100%;
}
div.building div.gridWrapper.grid2 {
- grid-template-columns: repeat(2, 50%);
+ grid-template-columns: repeat(2, 50%);
}
div.building div.gridWrapper.grid3 {
- grid-template-columns: repeat(3, 33.3%);
+ grid-template-columns: repeat(3, 33.3%);
}
div.building div.gridWrapper div {
- display: inline flow-root;
- line-height: 1.1;
- padding-bottom: 0.3em;
+ display: inline flow-root;
+ line-height: 1.1;
+ padding-bottom: 0.3em;
}
div.building div.collapsed {
- display: inline flow-root;
- margin: 0 0.2em;
+ display: inline flow-root;
+ margin: 0 0.2em;
}
/* border color for each cell */
div.building div.row div.apartments {
- border-color: limegreen;
+ border-color: limegreen;
}
div.building div.row div.arcade {
- border-color: deeppink;
+ border-color: deeppink;
}
div.building div.row div.brothel {
- border-color: violet;
+ border-color: violet;
}
div.building div.row div.barracks {
- border-color: olivedrab;
+ border-color: olivedrab;
}
div.building div.row div.club {
- border-color: orchid;
+ border-color: orchid;
}
div.building div.row div.corporateMarket {
- border-color: purple;
+ border-color: purple;
}
div.building div.row div.dairy {
- border-color: white;
+ border-color: white;
}
div.building div.row div.denseApartments {
- border-color: seagreen;
+ border-color: seagreen;
}
div.building div.row div.empty {
- border-color: lightgray;
+ border-color: lightgray;
}
div.building div.row div.farmyard {
- border-color: brown;
+ border-color: brown;
}
div.building div.row div.fsShops {
- border-color: mediumpurple;
+ border-color: mediumpurple;
}
div.building div.row div.manufacturing {
- border-color: slategray;
+ border-color: slategray;
}
div.building div.row div.markets {
- border-color: mediumorchid;
+ border-color: mediumorchid;
}
div.building div.row div.nursery {
- border-color: deepskyblue;
+ border-color: deepskyblue;
}
div.building div.row div.luxuryApartments {
- border-color: palegreen;
+ border-color: palegreen;
}
div.building div.row div.pens {
- border-color: goldenrod;
+ border-color: goldenrod;
}
div.building div.row div.penthouse {
- border-color: teal;
+ border-color: teal;
}
div.building div.row div.pit {
- border-color: orangered;
+ border-color: orangered;
}
div.building div.row div.private {
- border-color: red;
+ border-color: red;
}
div.building div.row div.shops {
- border-color: thistle;
+ border-color: thistle;
}
div.building div.row div.sweatshops {
- border-color: gray;
+ border-color: gray;
}
div.building div.row div.transportHub {
- border-color: magenta;
+ border-color: magenta;
}
div.building div.row div.weaponsManufacturing {
- border-color: springgreen;
+ border-color: springgreen;
}
div.building div.row div.filler {
- border-color: transparent;
+ border-color: transparent;
}
diff --git a/src/003-assets/CSS/table.css b/src/003-assets/CSS/table.css
index 260ffb48b22..2df00a8ec00 100644
--- a/src/003-assets/CSS/table.css
+++ b/src/003-assets/CSS/table.css
@@ -1,26 +1,26 @@
table.wardrobe {
- text-align: left;
- border-collapse: separate;
- border-spacing: 5px;
- /*border-style: hidden;*/
- /*empty-cells: hide;*/
- width: 900px
+ text-align: left;
+ border-collapse: separate;
+ border-spacing: 5px;
+ /*border-style: hidden;*/
+ /*empty-cells: hide;*/
+ width: 900px
}
table.wardrobe td {
- width: 50%;
- border: 1px solid white;
+ width: 50%;
+ border: 1px solid white;
}
table.budget {
- text-align: right;
- border-collapse: separate;
- width: 90%;
- border-style: solid;
- border-width: 1px;
- border-color: white;
- padding: 5px;
- font-family: "monospace";
+ text-align: right;
+ border-collapse: separate;
+ width: 90%;
+ border-style: solid;
+ border-width: 1px;
+ border-color: white;
+ padding: 5px;
+ font-family: "monospace";
}
table.budget tr.colored {
- background-color: #001700;
+ background-color: #001700;
}
diff --git a/src/Corporation/corporateMarket.tw b/src/Corporation/corporateMarket.tw
index 15f32aaa8a1..641e5b782de 100644
--- a/src/Corporation/corporateMarket.tw
+++ b/src/Corporation/corporateMarket.tw
@@ -45,7 +45,7 @@ sales<<if $corp.SpecAge == 3>>_womanU<<else>>_girlU<</if>> in a slutty suit gree
<<if $corp.SpecNationality>>
<<set _corpSpecRace = $corp.SpecNationality>>
<<elseif ($corp.SpecRaces.length == 1)>>
- <<set _corpSpecRace = $corp.SpecRaces.random()>>
+ <<set _corpSpecRace = $corp.SpecRaces.random()>>
<</if>>
_HeU's <<print _corpSpecRace>>, of course<<if $corp.SpecAccent == 1>>, and has a cute accent<</if>>.
<</if>>
diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index 254ee4b69d1..76e4acc132a 100644
--- a/src/endWeek/healthFunctions.js
+++ b/src/endWeek/healthFunctions.js
@@ -37,7 +37,7 @@ Tiredness
Being tired or exhausted also reduces a slave's ability to resist the player, increasing devotion and fear.
Health
- The aggregate of condition, short term damage and long term damage to provide an indication of the current overal state of the slave. The slave will die once this reached -100.
+ The aggregate of condition, short term damage and long term damage to provide an indication of the current overall state of the slave. The slave will die once this reached -100.
*/
/* Getting ill depends on the following factors;
@@ -45,9 +45,9 @@ Health
- long term damage (accumulated through getting old(er) and residual from short term damage)
- short term damage (accumulated through serious illness, chemical carcinogens, damaging surgeries and other health damage sources) 125%
- chemical carcinogens (more serious illness chance with high carcinogen levels)
- - age (long term damge takes care of older slaves, the young ones need a specific vulnerability)
+ - age (long term damage takes care of older slaves, the young ones need a specific vulnerability)
- use of curatives
- - assignment (rest, clinic, spa and master suite less likely, whoring, slutting and goloryholes more likely.)
+ - assignment (rest, clinic, spa and master suite less likely, whoring, slutting and gloryholes more likely.)
- random chance
Can be blocked with preventatives.
*/
@@ -68,7 +68,7 @@ window.illness = function illness(slave) {
} = getPronouns(slave));
let sicknessDegree = ["fine", "minor illness", "illness", "bad illness", "severe illness", "life-threatening illness"];
- // On the macro side of things disease could also happen to the acrology's population as the arcology becomes crowded, killing citizens and putting slaves at greater risk of getting ill. Again with upgrades/policies to mitigate the issue made available TODO?
+ // On the macro side of things disease could also happen to the arcology's population as the arcology becomes crowded, killing citizens and putting slaves at greater risk of getting ill. Again with upgrades/policies to mitigate the issue made available TODO?
if (slave.assignment === "live with your agent" || slave.assignment === "be your agent") {
if (H.illness !== 0) {
H.illness = 0;
@@ -118,7 +118,7 @@ window.illness = function illness(slave) {
let bonus_modifiers = random + assignBonus + nurse_effectiveness;
let curativesBonus = (slave.curatives > 1 || slave.inflationType === "curative") ? 2 : 1;
- // When ill, a slave has a 60% chance of getting better the next week at complete default, 70% with a favourable assignment, 80% with curatives, 90% with both measures active and additional benefits depending on the nurse on duty
+ // When ill, a slave has a 60% chance of getting better the next week at complete default, 70% with a favorable assignment, 80% with curatives, 90% with both measures active and additional benefits depending on the nurse on duty
if (H.illness > 0 && ((health_adjusted + age_modifier) / 3) + bonus_modifiers > 40 / curativesBonus) {
if (nurse_effectiveness > 30 && (jsRandom(1, 2) === 2 || slave.assignment === "get treatment in the clinic") && H.illness > 1) { // A particularly effective nurse can improve illness faster
H.illness -= 2;
@@ -282,7 +282,7 @@ window.endWeekHealthDamage = function endWeekHealthDamage(slave) {
shortToCondition += Math.max(Math.trunc(H.shortDamage * 0.5), 1); // 50% of short term damage gets transferred
H.shortDamage -= shortToCondition;
if (slave.assignment === "get treatment in the clinic") {
- H.shortDamage = Math.trunc(H.shortDamage * 0.5); // An aditional 50% of short term damage reduction (75% total) for getting treatment in the clinic
+ H.shortDamage = Math.trunc(H.shortDamage * 0.5); // An additional 50% of short term damage reduction (75% total) for getting treatment in the clinic
} else if (slave.assignment === "rest" || slave.assignment === "rest in the spa") {
H.shortDamage = Math.trunc(H.shortDamage * 0.75); // An additional 25% of short term damage reduction (62.5% total) for resting
}
diff --git a/src/events/intro/locationIntro.tw b/src/events/intro/locationIntro.tw
index 87b8fe0f3d5..50d999c0969 100644
--- a/src/events/intro/locationIntro.tw
+++ b/src/events/intro/locationIntro.tw
@@ -1,7 +1,7 @@
:: Location Intro [nobr]
<p>
- As the old countries crumble and technology stagnates, the gap between rich and poor increases. In order to continue living a good life without having their property taken by the mob, many of the wealthy and powerful come together to form 'Free Cities.' These are new cities on undeveloped land, in remote areas, or even afloat, fully free of any allegiance or law. These new cities are built on new ideas, with most buildings designed as futuristic, self-contained 'arcologies.' An arcology and everything in it is usually owned by a single person. And you're determined that you will soon be one of those single people.
+ As the old countries crumble and technology stagnates, the gap between rich and poor increases. In order to continue living a good life without having their property taken by the mob, many of the wealthy and powerful come together to form 'Free Cities.' These are new cities on undeveloped land, in remote areas, or even afloat, fully free of any allegiance or law. These new cities are built on new ideas, with most buildings designed as futuristic, self-contained 'arcologies.' An arcology and everything in it is usually owned by a single person. And you're determined that you will soon be one of those single people.
<span class="intro question">In what part of the world is your new arcology going to be located?</span>
</p>
diff --git a/src/events/reSnatchAndGrabFollowup.tw b/src/events/reSnatchAndGrabFollowup.tw
index 91ef361a54d..2cfb04ba18d 100644
--- a/src/events/reSnatchAndGrabFollowup.tw
+++ b/src/events/reSnatchAndGrabFollowup.tw
@@ -72,7 +72,7 @@
<</if>>
<<set _slave.sexualQuirk = "perverted">>
<p>Over the next few weeks, you also begin to notice some significant changes in behavior. Although _slave.slaveName has always been remarkably horny, $he has become much more <span class="flaw break">perverted.</span></p>
- <</if>>
+ <</if>>
<</replace>>
<</link>> //This will cost <<= cashFormat($surgeryCost*4)>>//<br>
<<link "Let it be">>
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 1fe6c966f86..feb3c95fb00 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -298,7 +298,7 @@
<</if>>
</span>
<</for>>
-
+
<<set _profits += $cash-_oldCash, _foodWeek += $food-_oldFood>>
<!-- Record statistics gathering -->
<<script>>
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index caedd5777b0..57fd9578eda 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -108,7 +108,7 @@ There <<if _NL == 1>>is<<else>>are<</if>> _NL nann<<if _NL != 1>>ies<<else>>y<</
<</if>>
<<if $nurseryNannies < 5>>
<div class="choices">
- [[Expand the nursery|Nursery][cashX(forceNeg(_Tmult0), "capEx"), $nurseryNannies += 1, $PC.skill.engineering += .1]]
+ [[Expand the nursery|Nursery][cashX(forceNeg(_Tmult0), "capEx"), $nurseryNannies += 1, $PC.skill.engineering += .1]]
<span class="note">
Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs
</span>
@@ -148,7 +148,7 @@ There <<if _NL == 1>>is<<else>>are<</if>> _NL nann<<if _NL != 1>>ies<<else>>y<</
<br><br>It can support $nursery child<<if $nursery != 1>>ren<</if>>. There <<if $nurseryBabies == 1>>is<<else>>are<</if>> currently $nurseryBabies room<<if $nurseryBabies != 1>>s<</if>> in use in $nurseryName.
<<if $nursery < 50>>
<div class="choices">
- [[Add another room|Nursery][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "nursery"), $nursery += 5]]
+ [[Add another room|Nursery][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "nursery"), $nursery += 5]]
<span class="note">
Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>> and will increase upkeep costs
</span>
@@ -164,7 +164,7 @@ There <<if _NL == 1>>is<<else>>are<</if>> _NL nann<<if _NL != 1>>ies<<else>>y<</
<<if $nursery > 1 && $reservedChildrenNursery < $freeCribs>>
<div class="choices">
- [[Remove a room|Nursery][cashX(forceNeg(Math.trunc(1000*$upgradeMultiplierArcology)), "nursery"), $nursery -= 5]]
+ [[Remove a room|Nursery][cashX(forceNeg(Math.trunc(1000*$upgradeMultiplierArcology)), "nursery"), $nursery -= 5]]
<span class="note">
Costs <<print cashFormat(Math.trunc(1000*$upgradeMultiplierArcology))>> and will reduce upkeep costs
</span>
@@ -272,7 +272,7 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
<</if>>
<</if>>
<<elseif ($reservedChildrenNursery < $freeCribs) && ($freeCribs > _WL)>>
- <<if _WL - _reservedIncubator == 0>>
+ <<if _WL - _reservedIncubator == 0>>
<span class="note">
$His children are already reserved for $incubatorName
</span>
@@ -345,7 +345,7 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
<</if>>
<</if>>
<<elseif $reservedChildrenNursery < $freeCribs>>
- <<if _WL - _reservedIncubator == 0>>
+ <<if _WL - _reservedIncubator == 0>>
<span class="note">
Your child<<if _WL > 0>>ren are<<else>>is<</if>> already reserved for $incubatorName
</span>
@@ -423,7 +423,7 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
<</if>>
<<else>>
The children ''are not'' getting any exercise, meaning they will likely end up becoming fairly weak and frail.
- [[Allow the children to remain active|Nursery][cashX(forceNeg(Math.trunc(1000*$upgradeMultiplierArcology)), "nursery"), $nurseryMuscles = 1]]
+ [[Allow the children to remain active|Nursery][cashX(forceNeg(Math.trunc(1000*$upgradeMultiplierArcology)), "nursery"), $nurseryMuscles = 1]]
<span class="note">
Requires a Matron or at least one nanny and costs <<print cashFormat(Math.trunc(1000*$upgradeMultiplierArcology))>> and will increase upkeep costs
</span>
@@ -474,7 +474,7 @@ FIXME: not sure if this works
*/
<p>
- Rename $nurseryName: <<textbox "$nurseryName" $nurseryName "Nursery">>
+ Rename $nurseryName: <<textbox "$nurseryName" $nurseryName "Nursery">>
<span class="note">
Use a noun or similar short phrase
</span>
diff --git a/src/js/food.js b/src/js/food.js
index cabebceceab..ab0f896d381 100644
--- a/src/js/food.js
+++ b/src/js/food.js
@@ -18,7 +18,7 @@ App.Facilities.Farmyard.foodAmount = function(slave) {
}
if (V.farmyardUpgrade.machinery === 1) {
food += 65; // machinery upgrade for farmyard
- }
+ }
if (V.Farmer === 0) {
return null;
} else {
diff --git a/src/npc/interaction/fBeg.tw b/src/npc/interaction/fBeg.tw
index 30404f19a71..bb171297eee 100644
--- a/src/npc/interaction/fBeg.tw
+++ b/src/npc/interaction/fBeg.tw
@@ -4,6 +4,7 @@
/* priority! femPC support! */
<<set $AS = $activeSlave.ID>>
+<<setPlayerPronouns>>
<<setLocalPronouns $activeSlave>>
<<run Enunciate($activeSlave)>>
<<setSpokenLocalPronouns $activeSlave $activeSlave>>
@@ -433,7 +434,7 @@ You give $him permission to speak, and tell $him that $he may beg $his <<= Writt
<</if>>
<<elseif (random(1,100) > (110 - getSlave($AS).devotion))>>
<<if (getSlave($AS).fetish == "none") && (getSlave($AS).behavioralFlaw != "liberated")>>
- Feeling the joy of kneeling before such a powerful <<= WrittenMaster()>> and begging at his feet has @@.lightcoral;encouraged $him to be more submissive.@@
+ Feeling the joy of kneeling before such a powerful <<= WrittenMaster()>> and begging at _hisP feet has @@.lightcoral;encouraged $him to be more submissive.@@
<<set getSlave($AS).fetish = "submissive", getSlave($AS).fetishKnown = 1>>
<</if>>
<</if>>
diff --git a/src/player/electiveSurgery.tw b/src/player/electiveSurgery.tw
index 7bc1d89baee..57616755ec3 100644
--- a/src/player/electiveSurgery.tw
+++ b/src/player/electiveSurgery.tw
@@ -23,7 +23,7 @@ You're @@.orange;$PC.actualAge years old.@@
You could benefit from a face lift.
<br>
<<if $PC.visualAge >= 25>>
- [[Get a face lift|PC Surgery Degradation][$PC.faceImplant = 1, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "ageDown"]] |
+ [[Get a face lift|PC Surgery Degradation][$PC.faceImplant = 1, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "ageDown"]] |
<</if>>
[[Remodel your face to appear older|PC Surgery Degradation][$PC.faceImplant = 1, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "ageUp"]]
<</if>>
@@ -38,7 +38,7 @@ You're @@.orange;$PC.actualAge years old.@@
You could benefit from a face lift.
<br>
<<if $PC.visualAge >= 25>>
- [[Get a face lift|PC Surgery Degradation][$PC.faceImplant = 1, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "ageDown"]] |
+ [[Get a face lift|PC Surgery Degradation][$PC.faceImplant = 1, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "ageDown"]] |
<</if>>
[[Remodel your face to appear older|PC Surgery Degradation][$PC.faceImplant = 1, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "ageUp"]]
<</if>>
@@ -53,7 +53,7 @@ You're @@.orange;$PC.actualAge years old.@@
You could go for a face lift, though making yourself look older could be useful.
<br>
<<if $PC.visualAge >= 25>>
- [[Get a face lift|PC Surgery Degradation][$PC.faceImplant = 1, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "ageDown"]] |
+ [[Get a face lift|PC Surgery Degradation][$PC.faceImplant = 1, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "ageDown"]] |
<</if>>
[[Remodel your face to appear older|PC Surgery Degradation][$PC.faceImplant = 1, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "ageUp"]]
<</if>>
@@ -68,7 +68,7 @@ You're @@.orange;$PC.actualAge years old.@@
You could undergo facial surgery to make yourself look older, though you could also make yourself look even younger.
<br>
<<if $PC.visualAge >= 25>>
- [[Remodel your face to appear younger|PC Surgery Degradation][$PC.faceImplant = 1, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "ageDown"]] |
+ [[Remodel your face to appear younger|PC Surgery Degradation][$PC.faceImplant = 1, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "ageDown"]] |
<</if>>
[[Remodel your face to appear older|PC Surgery Degradation][$PC.faceImplant = 1, cashX(forceNeg(5000), "PCmedical"), $surgeryType = "ageUp"]]
<</if>>
diff --git a/src/pregmod/slaveOnSlaveFeedingWorkAround.tw b/src/pregmod/slaveOnSlaveFeedingWorkAround.tw
index 22bc11a99c1..df66a280842 100644
--- a/src/pregmod/slaveOnSlaveFeedingWorkAround.tw
+++ b/src/pregmod/slaveOnSlaveFeedingWorkAround.tw
@@ -101,7 +101,7 @@
/* 4 Liters */
<td>
<<for _i = 0; _i < $slaves.length; _i++>>
- <div>
+ <div>
<<if $slaves[_i].milkOutput >= 4>>
<<if ($slaves[_i].ID != $activeSlave.ID) && $slaves[_i].nipples != "fuckable">>
<<set _name = SlaveFullName($slaves[_i])>>
@@ -248,7 +248,7 @@
<</if>>
</div>
<</for>>
-
+
<<if (_eligibilityCum4 == 0)>>
<div class="note>
You have no slaves capable of producing four liters of cum.
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index f989f32ffcf..903ecea20d5 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -91,7 +91,7 @@
$cellblockNameCaps has room for $cellblock slaves to be kept in close confinement.
There <<if _CL == 1>>is<<else>>are<</if>> currently _CL slaves<<if _CL != 1>>s<</if>> kept in close confinement in $cellblockName.
<div class="choices">
- [[Expand the cellblock|Cellblock][cashX(forceNeg(_Tmult0), "capEx"), $cellblock += 5, $PC.skill.engineering += .1]]
+ [[Expand the cellblock|Cellblock][cashX(forceNeg(_Tmult0), "capEx"), $cellblock += 5, $PC.skill.engineering += .1]]
<span class="note">
Costs <<print cashFormat(_Tmult0)>>
</span>
@@ -105,7 +105,7 @@
<<set _Tmult1 = Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier)>>
Its compliance systems are standard.
<div class="choices">
- [[Upgrade them to soften slave flaws|Cellblock][cashX(forceNeg(_Tmult1), "capEx"), $cellblockUpgrade = 1, $PC.skill.engineering += 0.1, $PC.skill.hacking += 0.1]]
+ [[Upgrade them to soften slave flaws|Cellblock][cashX(forceNeg(_Tmult1), "capEx"), $cellblockUpgrade = 1, $PC.skill.engineering += 0.1, $PC.skill.hacking += 0.1]]
<span class="note">
Costs <<print cashFormat(_Tmult1)>>
</span>
@@ -142,7 +142,7 @@
</p>
<p>
- Rename $cellblockName: <<textbox "$cellblockName" $cellblockName "Cellblock">>
+ Rename $cellblockName: <<textbox "$cellblockName" $cellblockName "Cellblock">>
<span class="note">
Use a noun or similar short phrase
</span>
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index 6490c567bc5..ee8cf5a1f06 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -87,7 +87,7 @@
$clinicNameCaps has room to support $clinic slaves while they receive treatment.
There <<if _CL == 1>>is<<else>>are<</if>> currently _CL slave<<if _CL != 1>>s<</if>> receiving treatment in $clinicName.
<div class="choices">
- [[Expand the clinic|Clinic][cashX(forceNeg(_Tmult0), "capEx"), $clinic += 5, $PC.skill.engineering += .1]]
+ [[Expand the clinic|Clinic][cashX(forceNeg(_Tmult0), "capEx"), $clinic += 5, $PC.skill.engineering += .1]]
<span class="note">
Costs <<print cashFormat(_Tmult0)>>
</span>
@@ -106,7 +106,7 @@
<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier))>>
It mounts powerful medical scanning technology.
<div class="choices">
- [[Upgrade the scanners to help detect genomic damage|Clinic][cashX(forceNeg(_Tmult1), "capEx"), $clinicUpgradeScanner = 1, $PC.skill.hacking += 0.1]]
+ [[Upgrade the scanners to help detect genomic damage|Clinic][cashX(forceNeg(_Tmult1), "capEx"), $clinicUpgradeScanner = 1, $PC.skill.hacking += 0.1]]
<span class="note">
Costs <<print cashFormat(_Tmult1)>>
</span>
@@ -127,7 +127,7 @@
<<if $clinicUpgradePurge === 0>>
The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities.
<div class="choices">
- [[Increase the effectiveness of the impurity purging|Clinic][cashX(forceNeg(_Tmult3), "capEx"), $clinicUpgradePurge = 1, $PC.skill.hacking += 0.1]]
+ [[Increase the effectiveness of the impurity purging|Clinic][cashX(forceNeg(_Tmult3), "capEx"), $clinicUpgradePurge = 1, $PC.skill.hacking += 0.1]]
<span class="note">
Costs <<print cashFormat(_Tmult3)>> and may cause health problems in slaves.
</span>
@@ -135,7 +135,7 @@
<<elseif $clinicUpgradePurge === 1>>
Add nano magnets into the process to increase the rate that impurities are pulled from the body.
<div class="choices">
- [[Further increase the effectiveness of the impurity purging|Clinic][cashX(forceNeg(_Tmult3*2), "capEx"), $clinicUpgradePurge = 3, $PC.skill.hacking += 0.1]]
+ [[Further increase the effectiveness of the impurity purging|Clinic][cashX(forceNeg(_Tmult3*2), "capEx"), $clinicUpgradePurge = 3, $PC.skill.hacking += 0.1]]
<span class="note">
Costs <<print cashFormat(_Tmult3*2)>>
</span>
@@ -150,7 +150,7 @@
<<set _Tmult2 = Math.trunc(50000*$upgradeMultiplierArcology*Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier))>>
It includes standard dialysis equipment.
<div class="choices">
- [[Install advanced blood treatment equipment to help address drug side effects|Clinic][cashX(forceNeg(_Tmult2), "capEx"), $clinicUpgradeFilters = 1, $PC.skill.hacking += 0.1]]
+ [[Install advanced blood treatment equipment to help address drug side effects|Clinic][cashX(forceNeg(_Tmult2), "capEx"), $clinicUpgradeFilters = 1, $PC.skill.hacking += 0.1]]
<span class="note">
Costs <<print cashFormat(_Tmult2)>>
</span>
@@ -211,7 +211,7 @@
</p>
<p>
- Rename $clinicName: <<textbox "$clinicName" $clinicName "Clinic">>
+ Rename $clinicName: <<textbox "$clinicName" $clinicName "Clinic">>
<span class="note">
Use a noun or similar short phrase
</span>
diff --git a/src/uncategorized/clubAdvertisement.tw b/src/uncategorized/clubAdvertisement.tw
index 2f36be58ba7..c63b53f4bbc 100644
--- a/src/uncategorized/clubAdvertisement.tw
+++ b/src/uncategorized/clubAdvertisement.tw
@@ -148,7 +148,7 @@
</div>
</p>
-<h2>Design $clubNameCaps Ad Campaign</h2>
+<h2>Design $clubNameCaps Ad Campaign</h2>
<div class="note">
Will replace relevant variety bonuses
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 0365f3ad295..0e55e1f72c6 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -223,7 +223,7 @@
<p>
<<= App.Ads.report("club")>>
</p>
-
+
<!-- Record statistics gathering -->
<<script>>
var b = State.variables.facility.club;
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 1b2c9071492..947bbe35e79 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -15,7 +15,7 @@
EVERYTHING BELOW THIS LINE IS IGNORED BY THE GAME AND IS FOR REFERANCE/ARCHIVE PURPOSES ONLY
<<set _arcologyCosts = 0>>
-<<set _total = 0>>
+<<set _total = 0>>
//Your weekly costs are as follows.//
<br><br>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index dbaa325034b..d4e3abf5d05 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -384,7 +384,7 @@
<<elseif $dairyPregSetting == 2>>
''industrially employed.''
<<if ($seeExtreme != 0) && ($seeHyperPreg == 1) && ($dairyRestraintsSetting == 2) && ($dairyHyperPregRemodel == 1)>>
- [[Mass Production|Dairy][$dairyPregSetting = 3]] |
+ [[Mass Production|Dairy][$dairyPregSetting = 3]] |
<</if>>
[[Moderate|Dairy][$dairyPregSetting = 1, $dairyPregSettingChanged = -1]]
<<elseif $dairyPregSetting == 1>>
@@ -467,7 +467,7 @@
[[Only during milking|Dairy][$dairyRestraintsSetting = 1, $dairyFeedersSettingChanged = -1]]
<<elseif $dairyRestraintsSetting == 1>>
''when being milked,'' giving the machines full play.
- [[Free range|Dairy][$dairyRestraintsSetting = 0, $dairyFeedersSettingChanged = -1]] |
+ [[Free range|Dairy][$dairyRestraintsSetting = 0, $dairyFeedersSettingChanged = -1]] |
[[Permanent machine milking|Dairy][$dairyRestraintsSetting = 2, $dairyFeedersSettingChanged = 1]]
<<else>>
''only when necessary,'' allowing obedient cows freedom to range around.
@@ -583,29 +583,29 @@
<<if $dairyImplantsSetting == 1>>
All cows will undergo lactation implant surgery to increase their milk output.
<div class="choices">
- [[Restrict lactation surgery on cum-cows|Dairy][$dairyImplantsSetting = 0]] |
- [[Restrict maximization surgery on cattle|Dairy][$dairyImplantsSetting = 2]] |
+ [[Restrict lactation surgery on cum-cows|Dairy][$dairyImplantsSetting = 0]] |
+ [[Restrict maximization surgery on cattle|Dairy][$dairyImplantsSetting = 2]] |
[[Encourage natural lactation in cattle|Dairy][$dairyImplantsSetting = 3]]
</div>
<<elseif $dairyImplantsSetting == 2>>
Cows will not undergo surgical procedures to maximize production.
<div class="choices">
- [[Maximize production in all cattle|Dairy][$dairyImplantsSetting = 1]] |
- [[Maximize production in only milkable cows|Dairy][$dairyImplantsSetting = 0]] |
+ [[Maximize production in all cattle|Dairy][$dairyImplantsSetting = 1]] |
+ [[Maximize production in only milkable cows|Dairy][$dairyImplantsSetting = 0]] |
[[Encourage natural lactation in cattle|Dairy][$dairyImplantsSetting = 3]]
</div>
<<elseif $dairyImplantsSetting == 3>>
Non-lactating cows incapable of producing cum will undergo manual stimulation to promote natural production.
<div class="choices">
- [[Maximize production in all cattle|Dairy][$dairyImplantsSetting = 1]] |
- [[Maximize production in only milkable cows|Dairy][$dairyImplantsSetting = 0]] |
+ [[Maximize production in all cattle|Dairy][$dairyImplantsSetting = 1]] |
+ [[Maximize production in only milkable cows|Dairy][$dairyImplantsSetting = 0]] |
[[Restrict maximization surgery on cattle|Dairy][$dairyImplantsSetting = 2]]
</div>
<<else>>
Naturally lactating cows, cows with non-lactating breasts, and cows incapable of producing cum will undergo lactation implant surgery to increase their milk output.
<div class="choices">
- [[Maximize lactation in all cattle|Dairy][$dairyImplantsSetting = 1]] |
- [[Restrict maximization surgery on cattle|Dairy][$dairyImplantsSetting = 2]] |
+ [[Maximize lactation in all cattle|Dairy][$dairyImplantsSetting = 1]] |
+ [[Restrict maximization surgery on cattle|Dairy][$dairyImplantsSetting = 2]] |
[[Encourage natural lactation in cattle|Dairy][$dairyImplantsSetting = 3]]
</div>
<</if>>
@@ -623,38 +623,38 @@
<<if $dairyWeightSetting == 0>>
$dairyNameCaps is keeping cows at least chubby.
<div class="choices">
- [[Increase Weight Target|Dairy][$dairyWeightSetting = 1]] |
+ [[Increase Weight Target|Dairy][$dairyWeightSetting = 1]] |
[[Disable Dietary Control|Dairy][$dairyWeightSetting = -1]]
<<print _note>>
</div>
<<elseif $dairyWeightSetting == 1>>
$dairyNameCaps aims to keep cows overweight.
<div class="choices">
- [[Increase Weight Target|Dairy][$dairyWeightSetting = 2]] |
- [[Decrease Weight Target|Dairy][$dairyWeightSetting = 0]] |
+ [[Increase Weight Target|Dairy][$dairyWeightSetting = 2]] |
+ [[Decrease Weight Target|Dairy][$dairyWeightSetting = 0]] |
[[Disable Dietary Control|Dairy][$dairyWeightSetting = -1]]
<<print _note>>
</div>
<<elseif $dairyWeightSetting == 2>>
$dairyNameCaps aims to keep cows fat.
<div class="choices">
- [[Increase Weight Target|Dairy][$dairyWeightSetting = 3]] |
- [[Decrease Weight Target|Dairy][$dairyWeightSetting = 1]] |
+ [[Increase Weight Target|Dairy][$dairyWeightSetting = 3]] |
+ [[Decrease Weight Target|Dairy][$dairyWeightSetting = 1]] |
[[Disable Dietary Control|Dairy][$dairyWeightSetting = -1]]
<<print _note>>
</div>
<<elseif $dairyWeightSetting == 3>>
$dairyNameCaps aims to keep cows very fat.
<div class="choices">
- [[Increase Weight Target|Dairy][$dairyWeightSetting = 4]] |
- [[Decrease Weight Target|Dairy][$dairyWeightSetting = 2]] |
+ [[Increase Weight Target|Dairy][$dairyWeightSetting = 4]] |
+ [[Decrease Weight Target|Dairy][$dairyWeightSetting = 2]] |
[[Disable Dietary Control|Dairy][$dairyWeightSetting = -1]]
<<print _note>>
</div>
<<elseif $dairyWeightSetting == 4>>
$dairyNameCaps aims to keep cows so fat they can barely move.
<div class="choices">
- [[Decrease Weight Target|Dairy][$dairyWeightSetting = 3]] |
+ [[Decrease Weight Target|Dairy][$dairyWeightSetting = 3]] |
[[Disable Dietary Control|Dairy][$dairyWeightSetting = -1]]
<<print _note>>
</div>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index d4fdb67d2a1..9c53edff850 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -52,7 +52,7 @@ The firm promptly pays @@.yellowgreen; a large compensation@@ for potentially ru
It's been a good few weeks, getting settled in as owner of $arcologies[0].name. The power of being overlord of this great building and everyone in it is incredible, but so is the responsibility. It's a good thing you have ample opportunities for stress relief. You're going to need them after today. There's a nasty disturbance on a business level of the arcology. Normally, the arcology's public safety drones would suppress this kind of nonsense, but $assistant.name program is suggesting that you resolve the dispute.
<br><br>
-As you step off the elevator, you hear several <<if $seeDicks != 100>>female <</if>>voices shouting. Apparently one of $arcologies[0].name's few remaining strip joints has closed. It was a topless bar and strip club all in one, but the owner is packing up his things. He's explaining to a crowd of his angry former employees that he can't make ends meet. As the price of a slave whore is barely higher than that of a lap dance from a free stripper; it's not surprising. It looks like the girls are on the verge of trashing the place.
+As you step off the elevator, you hear several <<if $seeDicks != 100>>female <</if>>voices shouting. Apparently one of $arcologies[0].name's few remaining strip joints has closed. It was a topless bar and strip club all in one, but the owner is packing up his things. He's explaining to a crowd of his angry former employees that he can't make ends meet. As the price of a slave whore is barely higher than that of a lap dance from a free stripper, it's not surprising. It looks like the former dancers are on the verge of trashing the place.
<<case "strip club aftermath">>
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index 0b42660588b..7ee7dc8ea4d 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -443,7 +443,7 @@
<<else>>
and is in chastity,
<</if>>
- you spend time teaching $him sexual positions and how to someday use $his pussy to its potential. You have $him work $his Kegel muscles all week to prepare $him for the future. @@.lime;$His vaginal skills have improved,@@ but it's a slow process without practical experience.
+ you spend time teaching $him sexual positions and how to someday use $his pussy to its potential. You have $him work $his Kegel muscles all week to prepare $him for the future. @@.lime;$His vaginal skills have improved,@@ but it's a slow process without practical experience.
<<= SkillIncrease.Vaginal($activeSlave, _vaginalTrainingEfficiency)>>
<<elseif $activeSlave.skill.anal <= 30>>
Since $he has only rudimentary anal skills,
@@ -454,7 +454,7 @@
<<else>>
and is in anal chastity,
<</if>>
- you spend time teaching $him sexual positions and how to someday use $his asshole to its potential. You have $him work $his Kegel muscles and anal sphincter all week to prepare $him for the future. @@.lime;$His anal skills have improved,@@ but it's a slow process without practical experience.
+ you spend time teaching $him sexual positions and how to someday use $his asshole to its potential. You have $him work $his Kegel muscles and anal sphincter all week to prepare $him for the future. @@.lime;$His anal skills have improved,@@ but it's a slow process without practical experience.
<<= SkillIncrease.Anal($activeSlave, _analTrainingEfficiency)>>
<<elseif $activeSlave.skill.vaginal < 100 && $activeSlave.vagina >= 0>>
$He already a skilled pussy slut,
@@ -465,7 +465,7 @@
<<else>>
despite $his chastity,
<</if>>
- but lacks practical experience. You train $him in the basics of <<if $seePee == 1>>urine play, <</if>>massage, pet play, needle play, and many other niche skills. You also work with $him to develop a personal regimen of vaginal muscle exercises. This will enable $him to squeeze and massage dicks with $his practiced vaginal walls. You spend time expanding $his knowledge of sexual positions. @@.lime;$His vaginal skills have improved,@@ but it's a slow process without proper training.
+ but lacks practical experience. You train $him in the basics of <<if $seePee == 1>>urine play, <</if>>massage, pet play, needle play, and many other niche skills. You also work with $him to develop a personal regimen of vaginal muscle exercises. This will enable $him to squeeze and massage dicks with $his practiced vaginal walls. You spend time expanding $his knowledge of sexual positions. @@.lime;$His vaginal skills have improved,@@ but it's a slow process without proper training.
<<= SkillIncrease.Vaginal($activeSlave, _vaginalTrainingEfficiency)>>
<<elseif $activeSlave.skill.anal < 100>>
$He already a skilled anal bitch,
@@ -476,7 +476,7 @@
<<else>>
despite $his anal chastity,
<</if>>
- but lacks practical experience. You train $him in the basics of <<if $seePee == 1>>urine play, <</if>>massage, pet play, needle play, and many other niche skills. You also expand $his knowledge of sexual positions. $He learns to balance $himself on tiptoe for the challenge of standing anal sex without support. @@.lime;$His anal skills have improved,@@ but it's a slow process without proper training.
+ but lacks practical experience. You train $him in the basics of <<if $seePee == 1>>urine play, <</if>>massage, pet play, needle play, and many other niche skills. You also expand $his knowledge of sexual positions. $He learns to balance $himself on tiptoe for the challenge of standing anal sex without support. @@.lime;$His anal skills have improved,@@ but it's a slow process without proper training.
<<= SkillIncrease.Anal($activeSlave, _analTrainingEfficiency)>>
<<else>>
$He's learned everything you can teach, and is now a masterful
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index 5b45bbf846d..edb4a7b6c25 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -850,22 +850,22 @@
<</if>>
<<elseif
(
- ($slaves[$i].muscles <= 95 &&
+ ($slaves[$i].muscles <= 95 &&
(
- ($arcologies[0].FSPhysicalIdealist > 0 && $arcologies[0].FSPhysicalIdealistLaw == 0) ||
+ ($arcologies[0].FSPhysicalIdealist > 0 && $arcologies[0].FSPhysicalIdealistLaw == 0) ||
(
- ($HeadGirl.fetish == "submissive" || $HeadGirl.fetish == "masochist") &&
+ ($HeadGirl.fetish == "submissive" || $HeadGirl.fetish == "masochist") &&
$HeadGirl.fetishKnown == 1)
)
)
- ||
- ($slaves[$i].muscles <= 45 &&
+ ||
+ ($slaves[$i].muscles <= 45 &&
(
- $arcologies[0].FSPhysicalIdealist > 0 &&
+ $arcologies[0].FSPhysicalIdealist > 0 &&
$arcologies[0].FSPhysicalIdealistLaw == 1)
)
- ||
- $slaves[$i].muscles <= 5 &&
+ ||
+ $slaves[$i].muscles <= 5 &&
(
!isAmputee($slaves[$i])
)
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 27009ac1f26..f263a91c444 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -4395,7 +4395,7 @@
It's $Stud.slaveName's role to provide sperm for fertile slaves, but _his2 sperm is unable to fertilize $slaves[$i].slaveName's ova, so there is no point in forcing the union.
<<else>>
<<set _studRandiness = 0>> /* used to control the slave reaction. 1 - fucks slave, -1 - slave fucks stud, 0 - inert */
- It's $Stud.slaveName's role to
+ It's $Stud.slaveName's role to
/* stud's reaction to the role */
<<if $Stud.fuckdoll > 0>>
provide sperm for $him; all $he needs to do is signal the suit to stimulate an ejaculation.
@@ -4436,7 +4436,7 @@
<<set $Stud.fetishStrength += 4>>
<</if>>
<<elseif ($Stud.fetish == "dom") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
- fill $him with child, a task your dominant Stud @@.mediumaquamarine;carries out with glee@@ as _he2 steadily dominates your slaves.
+ fill $him with child, a task your dominant Stud @@.mediumaquamarine;carries out with glee@@ as _he2 steadily dominates your slaves.
<<if ($Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 dominant tendencies@@ by indulgence.
<<set $Stud.fetishStrength += 4>>
@@ -4448,14 +4448,14 @@
<<set _studRandiness = 1>>
<<elseif $Stud.trust >= -20>>
<<if ($Stud.fetish == "pregnancy") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
- fill $him with child, a task your pregnancy fetishist Stud @@.mediumaquamarine;takes unwarranted pride@@ in.
+ fill $him with child, a task your pregnancy fetishist Stud @@.mediumaquamarine;takes unwarranted pride@@ in.
<<set $Stud.trust += 3>>
<<if ($Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 pregnancy fetish@@ by indulgence.
<<set $Stud.fetishStrength += 2>>
<</if>>
<<elseif ($Stud.fetish == "dom") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
- fill $him with child, a task your dominant Stud @@.mediumaquamarine;takes unwarranted pride@@ in.
+ fill $him with child, a task your dominant Stud @@.mediumaquamarine;takes unwarranted pride@@ in.
<<set $Stud.trust += 3>>
<<if ($Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 dominant tendencies@@ by indulgence.
@@ -4633,7 +4633,7 @@
<</if>>
<<elseif ($slaves[$i].devotion <= 75)>>
<<if ($slaves[$i].fetish == "pregnancy") && ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
- $slaves[$i].slaveName, a pregnancy fetishist, is
+ $slaves[$i].slaveName, a pregnancy fetishist, is
<<if _studRandiness == 1>>
@@.hotpink;very willing to be bred@@ by your Stud, but never expected to be @@.lime;impregnated via tribbing.@@
<<set $slaves[$i].need -= 20>>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 225df3426cf..56997e25503 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -71,7 +71,7 @@
<div>
Custom glass eyes and cosmetic lenses:
$He has <<print App.Desc.eyesType(getSlave($AS))>><<if hasAnyEyes(getSlave($AS))>>, they are <<print App.Desc.eyeColor(getSlave($AS))>><</if>>.
-
+
<div class="choices">
/* remove lenses */
<<set _n = 0>>
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index 59888609993..24e18f34120 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -87,7 +87,7 @@
<<set _Tmult0 = Math.trunc($schoolroom*1000*$upgradeMultiplierArcology)>>
$schoolroomNameCaps has room to house $schoolroom slaves while they learn. There <<if $SchlRiIDs.length == 1>>is<<else>>are<</if>> currently $SchlRiIDs.length slave<<if $SchlRiIDs.length != 1>>s<</if>> learning in $schoolroomName.
<div class="choices">
- [[Expand the schoolroom|Schoolroom][cashX(forceNeg(_Tmult0), "capEx"), $schoolroom += 5, $PC.skill.engineering += .1]]
+ [[Expand the schoolroom|Schoolroom][cashX(forceNeg(_Tmult0), "capEx"), $schoolroom += 5, $PC.skill.engineering += .1]]
<span class="note">
Costs <<print cashFormat(_Tmult0)>>
</span>
@@ -107,7 +107,7 @@
<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology)>>
$schoolroomNameCaps inculcates the basic skills necessary to a sex slave.
<div class="choices">
- [[Upgrade the curriculum to cover some intermediate skills|Schoolroom][cashX(forceNeg(_Tmult1), "capEx"), $schoolroomUpgradeSkills = 1]]
+ [[Upgrade the curriculum to cover some intermediate skills|Schoolroom][cashX(forceNeg(_Tmult1), "capEx"), $schoolroomUpgradeSkills = 1]]
<span class="note">
Costs <<print cashFormat(_Tmult1)>>
</span>
@@ -122,7 +122,7 @@
<<else>>
$schoolroomNameCaps includes only basic language classes in its curriculum.
<div class="choices">
- [[Install advanced linguistic interfaces to efficiently teach the arcology's lingua franca|Schoolroom][cashX(forceNeg(_Tmult2), "capEx"), $schoolroomUpgradeLanguage = 1, $PC.skill.hacking += 0.1]]
+ [[Install advanced linguistic interfaces to efficiently teach the arcology's lingua franca|Schoolroom][cashX(forceNeg(_Tmult2), "capEx"), $schoolroomUpgradeLanguage = 1, $PC.skill.hacking += 0.1]]
<span class="note">
Costs <<print cashFormat(_Tmult2)>>
</span>
@@ -134,7 +134,7 @@
<<if $schoolroomRemodelBimbo == 1>>
<<set _Tmult3 = Math.trunc(7500*$upgradeMultiplierArcology*$HackingSkillMultiplier)>>
<div>
- $schoolroomNameCaps is designed with moronic slaves in mind and seeks to dumb down slaves by providing them a confusing, contradictory education that retards decision making skills and undoes existing schooling. [[Restore the curriculum to the standard|Schoolroom][cashX(forceNeg(_Tmult3), "capEx"), $schoolroomRemodelBimbo = 0]]
+ $schoolroomNameCaps is designed with moronic slaves in mind and seeks to dumb down slaves by providing them a confusing, contradictory education that retards decision making skills and undoes existing schooling. [[Restore the curriculum to the standard|Schoolroom][cashX(forceNeg(_Tmult3), "capEx"), $schoolroomRemodelBimbo = 0]]
<span class="note">
Costs <<print cashFormat(_Tmult3)>>
</span>
@@ -143,7 +143,7 @@
<<if $schoolroomUpgradeRemedial == 1>>
$schoolroomNameCaps has been upgraded with advanced teaching tools to help even the smartest slave learn at an acceptable pace. Dumb slaves won't learn much faster as a result, but smarties will benefit a great deal.
<<else>>
- $schoolroomNameCaps teaches woefully smart slaves using its modified methods. [[Purchase specialized materials to help smart slaves get on the right track|Schoolroom][cashX(forceNeg(_Tmult2), "capEx"), $schoolroomUpgradeRemedial = 1]]
+ $schoolroomNameCaps teaches woefully smart slaves using its modified methods. [[Purchase specialized materials to help smart slaves get on the right track|Schoolroom][cashX(forceNeg(_Tmult2), "capEx"), $schoolroomUpgradeRemedial = 1]]
<span class="note">
Costs <<print cashFormat(_Tmult2)>>
</span>
@@ -155,7 +155,7 @@
<<set _Tmult3 = Math.trunc(7500*$upgradeMultiplierArcology*$HackingSkillMultiplier)>>
$schoolroomNameCaps is designed with intelligent slaves in mind and seeks to smarten slaves by providing them with an education.
<div class="choices">
- [[Redesign the curriculum to undo pesky educations and retard slaves while benefiting the most simple of minds|Schoolroom][cashX(forceNeg(_Tmult3), "capEx"), $schoolroomRemodelBimbo = 1]]
+ [[Redesign the curriculum to undo pesky educations and retard slaves while benefiting the most simple of minds|Schoolroom][cashX(forceNeg(_Tmult3), "capEx"), $schoolroomRemodelBimbo = 1]]
<span class="note">
Costs <<print cashFormat(_Tmult3)>>
</span>
@@ -168,7 +168,7 @@
<<else>>
$schoolroomNameCaps teaches idiots using standard methods.
<div class="choices">
- [[Purchase specialized materials to help stupid slaves learn good|Schoolroom][cashX(forceNeg(_Tmult2), "capEx"), $schoolroomUpgradeRemedial = 1]]
+ [[Purchase specialized materials to help stupid slaves learn good|Schoolroom][cashX(forceNeg(_Tmult2), "capEx"), $schoolroomUpgradeRemedial = 1]]
<span class="note">
Costs <<print cashFormat(_Tmult2)>>
</span>
@@ -183,7 +183,7 @@
</p>
<p>
- Rename $schoolroomName: <<textbox "$schoolroomName" $schoolroomName "Schoolroom">>
+ Rename $schoolroomName: <<textbox "$schoolroomName" $schoolroomName "Schoolroom">>
<span class="note">
Use a noun or similar short phrase
</span>
diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw
index 225a08f86b5..b49d6d0fb49 100644
--- a/src/uncategorized/servantsQuarters.tw
+++ b/src/uncategorized/servantsQuarters.tw
@@ -81,7 +81,6 @@
</div>
<</if>>
-
</p>
<div>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 92429ee6ed2..0ce34fc0bbb 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -521,7 +521,7 @@
<<link "Grant">><<set $slaves[_i].rules.release.master = 1>><<replace "#relMaster">>granted<</replace>><</link>> |
<<link "Deny">><<set $slaves[_i].rules.release.master = 0>><<replace "#relMaster">>denied<</replace>><</link>>
</div>
-
+
<<if $slaves[_i].voice != 0>>
<br>Speech rules: ''<span id="speechRules">$slaves[_i].rules.speech</span>.''
<<link "Restrictive">><<set $slaves[_i].rules.speech = "restrictive">><<replace "#speechRules">>$slaves[_i].rules.speech<</replace>><</link>> |
diff --git a/src/uncategorized/wardrobe.tw b/src/uncategorized/wardrobe.tw
index 677130ff9e2..77435f54c98 100644
--- a/src/uncategorized/wardrobe.tw
+++ b/src/uncategorized/wardrobe.tw
@@ -13,7 +13,7 @@
<p class="scene-intro">
The room containing all the clothes and accessories you have available to dress your slaves in, as well as the supplies and tools your tailor needs to resize them to better fit your slaves. Several mirrors are set up for a slave to try on outfits should they be allowed to dress themselves. The selection includes
<<set _ownItAll = (
- App.Data.misc.niceClothes.every((i) => isItemAccessible.entry(i.value, "clothing")) &&
+ App.Data.misc.niceClothes.every((i) => isItemAccessible.entry(i.value, "clothing")) &&
App.Data.misc.harshClothes.every((i) => isItemAccessible.entry(i.value, "clothing"))
)>>
<<if _ownItAll>>
--
GitLab