From 94ef8740084a36e2c52b6bd48877ba2398a86fed Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 3 Feb 2020 16:08:49 -0600
Subject: [PATCH] Hands
---
src/003-assets/CSS/gridTemplates.css | 14 +++---
src/endWeek/saTakeClasses.js | 2 +-
src/events/intro/economyIntro.tw | 2 +-
src/events/intro/pcRumorIntro.tw | 28 ++++++------
src/events/intro/tradeIntro.tw | 50 +++++++++++-----------
src/facilities/ads.js | 2 +-
src/init/storyInit.tw | 2 +-
src/js/physicalDevelopment.js | 2 +-
src/js/rulesAssistant.js | 2 +-
src/pregmod/incubator.tw | 2 +-
src/uncategorized/RESS.tw | 10 ++---
src/uncategorized/RETS.tw | 2 +-
src/uncategorized/brothelReport.tw | 2 +-
src/uncategorized/dispensary.tw | 2 +-
src/uncategorized/futureSociety.tw | 2 +-
src/uncategorized/manageArcology.tw | 6 +--
src/uncategorized/pBioreactorPerfected.tw | 2 +-
src/uncategorized/reRelativeRecruiter.tw | 2 +-
src/uncategorized/recETS.tw | 2 +-
src/uncategorized/schoolroomReport.tw | 2 +-
src/uncategorized/surgeryDegradation.tw | 4 +-
src/uncategorized/underperformingSlaves.tw | 4 +-
src/utility/descriptionWidgetsFlesh.tw | 12 +++---
23 files changed, 79 insertions(+), 79 deletions(-)
diff --git a/src/003-assets/CSS/gridTemplates.css b/src/003-assets/CSS/gridTemplates.css
index 57d3dbdac5b..cc98ce2e105 100644
--- a/src/003-assets/CSS/gridTemplates.css
+++ b/src/003-assets/CSS/gridTemplates.css
@@ -1,18 +1,18 @@
/* general use */
div.grid-2columns-auto {
- display: grid;
- grid-template-columns: max-content auto;
+ display: grid;
+ grid-template-columns: max-content auto;
}
/* specific uses */
/* limb selector in limbs.js */
div.limb-selector {
- display: grid;
- grid-template-columns: 200px 100px 100px 100px 100px;
+ display: grid;
+ grid-template-columns: 200px 100px 100px 100px 100px;
}
div.limb-selector div.full {
- grid-column-start: 1;
- grid-column-end: 6;
- text-align: center;
+ grid-column-start: 1;
+ grid-column-end: 6;
+ text-align: center;
}
\ No newline at end of file
diff --git a/src/endWeek/saTakeClasses.js b/src/endWeek/saTakeClasses.js
index 728e1b228a8..754a47005f9 100644
--- a/src/endWeek/saTakeClasses.js
+++ b/src/endWeek/saTakeClasses.js
@@ -63,7 +63,7 @@ window.saTakeClasses = (function saServeThePublic() {
if (setup.schoolteacherCareers.includes(V.Schoolteacher.career)) {
teaching += 10;
} else if (V.Schoolteacher.skill.teacher >= V.masteredXP) {
- teaching += 10;
+ teaching += 10;
}
if (V.Schoolteacher.face > 40) {
teaching += 10;
diff --git a/src/events/intro/economyIntro.tw b/src/events/intro/economyIntro.tw
index c45964c9b78..10720c1b440 100644
--- a/src/events/intro/economyIntro.tw
+++ b/src/events/intro/economyIntro.tw
@@ -26,7 +26,7 @@
</span>
<span class="note">
Easy
- </span>
+ </span>
</div>
<div>
[[Harder|Economy Intro][$economy = 100, $baseDifficulty = 3]] | [[Easier|Economy Intro][$economy = 200, $baseDifficulty = 1]]
diff --git a/src/events/intro/pcRumorIntro.tw b/src/events/intro/pcRumorIntro.tw
index b4c2716465c..6280bc86a38 100644
--- a/src/events/intro/pcRumorIntro.tw
+++ b/src/events/intro/pcRumorIntro.tw
@@ -2,43 +2,43 @@
<<unset $showSecExp>>
<p>
- Who you are is something that you will have to define for yourself through your actions. Once you own an arcology, no one will be in a position to apply moral scorekeeping to you. In the brave new world of the Free Cities, you will be free to define yourself as the sum of your actions, rather than as the product of your past. The first decision that will define who you are as an arcology owner is your choice of method in acquiring one.
- <span class="intro question">
- What approach will you take?
- </span>
+ Who you are is something that you will have to define for yourself through your actions. Once you own an arcology, no one will be in a position to apply moral scorekeeping to you. In the brave new world of the Free Cities, you will be free to define yourself as the sum of your actions, rather than as the product of your past. The first decision that will define who you are as an arcology owner is your choice of method in acquiring one.
+ <span class="intro question">
+ What approach will you take?
+ </span>
</p>
<div>
- [[A judicious application of funds|Takeover Target][$PC.rumor = "wealth"]]
+ [[A judicious application of funds|Takeover Target][$PC.rumor = "wealth"]]
</div>
<div class="indent note">
- Start with <span class="cash.inc">extra money,</span> since you were wealthy enough to buy an arcology.
+ Start with <span class="cash.inc">extra money,</span> since you were wealthy enough to buy an arcology.
</div>
<div>
- [[Hard work and diligence|Takeover Target][$PC.rumor = "diligence"]]
+ [[Hard work and diligence|Takeover Target][$PC.rumor = "diligence"]]
</div>
<div class="indent note">
- New slaves will @@.hotpink;hate you less,@@ since it will be known that you worked hard to earn your position.
+ New slaves will @@.hotpink;hate you less,@@ since it will be known that you worked hard to earn your position.
</div>
<div>
- [[The remorseless use of force|Takeover Target][$PC.rumor = "force"]]
+ [[The remorseless use of force|Takeover Target][$PC.rumor = "force"]]
</div>
<div class="indent note">
- New slaves @@.gold;will fear you more,@@ since rumors about your violent takeover will inevitably circulate.
+ New slaves @@.gold;will fear you more,@@ since rumors about your violent takeover will inevitably circulate.
</div>
<div>
- [[Clever social engineering|Takeover Target][$PC.rumor = "social engineering"]]
+ [[Clever social engineering|Takeover Target][$PC.rumor = "social engineering"]]
</div>
<div class="indent note">
- Start with the @@.green;first societal option unlocked,@@ since you manipulated the arcology's citizens.
+ Start with the @@.green;first societal option unlocked,@@ since you manipulated the arcology's citizens.
</div>
<div>
- [[Blind luck|Takeover Target][$PC.rumor = "luck"]]
+ [[Blind luck|Takeover Target][$PC.rumor = "luck"]]
</div>
<div class="indent note">
- Start with a @@.green;good reputation,@@ since the story of your unlikely accession will be famous.
+ Start with a @@.green;good reputation,@@ since the story of your unlikely accession will be famous.
</div>
diff --git a/src/events/intro/tradeIntro.tw b/src/events/intro/tradeIntro.tw
index 0c37ac1779d..46208861b21 100644
--- a/src/events/intro/tradeIntro.tw
+++ b/src/events/intro/tradeIntro.tw
@@ -1,31 +1,31 @@
:: Trade Intro [nobr]
<p>
- Most of the Free Cities are run on radically libertarian or even anarcho-capitalist principles. The first Free Cities experimented with indentured servitude, and this rapidly developed into widespread slavery. By now, the Free Cities collectively are a fundamentally slaveowning society and maintain a thriving slave trade that feeds off the terrible conditions in parts of the old world.
- <span class="intro question">
- What attitude have the old world countries generally taken towards this trade?
- </span>
+ Most of the Free Cities are run on radically libertarian or even anarcho-capitalist principles. The first Free Cities experimented with indentured servitude, and this rapidly developed into widespread slavery. By now, the Free Cities collectively are a fundamentally slaveowning society and maintain a thriving slave trade that feeds off the terrible conditions in parts of the old world.
+ <span class="intro question">
+ What attitude have the old world countries generally taken towards this trade?
+ </span>
</p>
<p>
- <div>
- [[They've turned a blind eye, or even been complicit.|Extreme Intro][$internationalTrade = 1]]
- <span class="note">
- Slaves from all across the world will appear.
- </span>
- </div>
- <div>
- [[They've done what little they can to stop it.|Extreme Intro][$internationalTrade = 0]]
- <span class="note">
- Almost all slaves will be from the continent where the arcology is located.
- </span>
- </div>
- <div>
- <<link "Reactions have been mixed.">>
- <<set $internationalTrade = 0, $customVariety = 1, $customWA = 1>>
- <<goto "Customize Slave Trade">>
- <</link>>
- <span class="note">
- This will bypass arcology location restrictions, allowing you to adjust the nationalities encountered when buying non-customizable slaves.
- </span>
- </div>
+ <div>
+ [[They've turned a blind eye, or even been complicit.|Extreme Intro][$internationalTrade = 1]]
+ <span class="note">
+ Slaves from all across the world will appear.
+ </span>
+ </div>
+ <div>
+ [[They've done what little they can to stop it.|Extreme Intro][$internationalTrade = 0]]
+ <span class="note">
+ Almost all slaves will be from the continent where the arcology is located.
+ </span>
+ </div>
+ <div>
+ <<link "Reactions have been mixed.">>
+ <<set $internationalTrade = 0, $customVariety = 1, $customWA = 1>>
+ <<goto "Customize Slave Trade">>
+ <</link>>
+ <span class="note">
+ This will bypass arcology location restrictions, allowing you to adjust the nationalities encountered when buying non-customizable slaves.
+ </span>
+ </div>
</p>
\ No newline at end of file
diff --git a/src/facilities/ads.js b/src/facilities/ads.js
index d8e3aca11ab..3a2dbf54f1d 100644
--- a/src/facilities/ads.js
+++ b/src/facilities/ads.js
@@ -201,7 +201,7 @@ App.Ads.AdManager = class {
slavesMatchPrefs(category) {
const majority = this.slavesMajority(category);
return (majority !== 0 && majority === category.classifyLocalPreference());
- }
+ }
/** returns true if the majority of the girls fit the ad campaign in the given category */
slavesMatchAds(category) {
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 88fa2fcd158..422d20eda92 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -342,7 +342,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $verboseDescriptions = 0>>
/* Accordion 000-250-006 */
<<set $useAccordion = 0>>
-
+
<<set $debugMode = 0>>
<<set $showNeighborDetails = 1>>
<<set $useTabs = 0>>
diff --git a/src/js/physicalDevelopment.js b/src/js/physicalDevelopment.js
index e29d8a82ea2..603a42ac368 100644
--- a/src/js/physicalDevelopment.js
+++ b/src/js/physicalDevelopment.js
@@ -3209,7 +3209,7 @@ window.physicalDevelopment = (function physicalDevelopment() {
slave.clit++;
}
}
-
+
/**
* @param {App.Entity.SlaveState} slave
*/
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index df9badcf3b0..a9197586e59 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -211,7 +211,7 @@ window.ruleAppliesP = function ruleAppliesP(cond, slave) {
: undefined,
slave
);
- }
+ }
flag = between(
slaveAttribute,
cond.data.value[0],
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index edbe2490787..b104597ae22 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -513,7 +513,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<</if>>
<<if $incubatorOrgans[_i].type == "leftEye">>
<<set $tankOrgans.leftEye = 1>>
- <</if>>
+ <</if>>
<<if $incubatorOrgans[_i].type == "voicebox">>
<<set $tankOrgans.voicebox = 1>>
<</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index c240651734f..91f325830bf 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1020,7 +1020,7 @@ One day, you catch sight of <<EventNameLink>> <<if ($activeSlave.heels == 1) &&
<<if !hasAnyArms($activeSlave)>>
$he tries to communicate $his reluctance to wear the clothing as best as $he can with various head movements and facial expressions<<if $activeSlave.bellyPreg >= 5000>>, including several nods towards $his rounded middle<</if>>.
<<else>>
- $he uses gestures to communicate $his embarrassment with $his clothing, covering $his nipples, crotch and anus with $his hands one after the other and begging for clothes that do the same.<<if $activeSlave.bellyPreg >= 5000>> $He also gestures to $his rounded belly with a look of concern.<</if>>
+ $he uses gestures to communicate $his embarrassment with $his clothing, covering $his nipples, crotch, and anus with $his hand<<if hasBothArms($activeSlave)>>s<</if>> one after the other and begging for clothes that do the same.<<if $activeSlave.bellyPreg >= 5000>> $He also gestures to $his rounded belly with a look of concern.<</if>>
<</if>>
<<else>>
$he <<say>>s fearfully, "I'm <<s>>orry, <<Master>>, but tho<<s>>e thing<<s>> are ju<<s>>t <<s>>o embarra<<ss>>ing!<<if $activeSlave.bellyPreg >= 5000>> I'm al<<s>>o worried for my baby'<<s>> <<s>>afety.<</if>>"
@@ -3166,7 +3166,7 @@ As you're starting your day, $assistantName pauses _hisA review of business matt
$He turns to you as you enter, and <<if canSee($activeSlave)>>seeing<<else>>realizing<</if>> that it's you, $he
<<if !canTalk($activeSlave)>>
- uses hesitant gestures to beg you to let $him eat normally today. $His hands become vehement when it comes to the phallus in $his face, which $he apparently finds disgusting.
+ uses hesitant gestures to beg you to let $him eat normally today. $His hand<<if hasBothArms($activeSlave)>>s<</if>> become<<if !hasBothArms($activeSlave)>>s<</if>> vehement when it comes to the phallus in $his face, which $he apparently finds disgusting.
<<else>>
mumbles unhappily, "Plea<<s>>e, <<Master>>, plea<<s>>e, can I ju<<s>>t eat normally for one day? Thi<<s>> i<<s>>, um, kind of gro<<ss>>."
<</if>>
@@ -3274,7 +3274,7 @@ hips
and <<print $activeSlave.inflationType>>-filled belly
<</if>>
<</if>>
-in time with $his humming, $he runs $his hands sensually over them, along $his flanks, and over $his chest, <<if $activeSlave.boobs > 3000>>letting the vast mass of $his tits rest atop them<<elseif $activeSlave.boobs > 1000>>groping $his own heavy breasts<<else>>$his fingertips circling $his nipples<</if>> for an alluring moment. As $his hips maintain their sexual rhythm, $his hands continue, tracing up $his throat, over $his moist lips, and over $his head. As $he stretches up, $his torso begins to sway with the barely perceptible beat, $his
+in time with $his humming, $he runs $his hand<<if hasBothArms($activeSlave)>>s<</if>> sensually over them, along $his flanks, and over $his chest, <<if $activeSlave.boobs > 3000>>letting the vast mass of $his tits rest atop them<<elseif $activeSlave.boobs > 1000>>groping $his own heavy breasts<<else>>$his fingertips circling $his nipples<</if>> for an alluring moment. As $his hips maintain their sexual rhythm, $his hands continue, tracing up $his throat, over $his moist lips, and over $his head. As $he stretches up, $his torso begins to sway with the barely perceptible beat, $his
<<if ($activeSlave.boobsImplant/$activeSlave.boobs) >= .75>>
fake tits staying perfectly in place.
<<elseif $activeSlave.boobs > 2000>>
@@ -10216,7 +10216,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<replace "#result">>
You open a drawer of your desk and extract a razor-sharp ceramic-bladed knife. <<if canSee($activeSlave)>>You make a show of inspecting its edge and then place it on your desk before looking meaningfully at $his ballsack. $He watches this display with wide eyes<<else>>You describe what it is you took out of your desk and how easily it could be used to remove $his ballsack. $He cocks $his head slightly<</if>> until $he gets your meaning, and then collapses to the ground, almost wetting $himself.
<<if !canTalk($activeSlave)>>
- $He frantically uses $his hands to promise you perfect obedience if you'll only spare $him from emasculation.
+ $He frantically uses $his hand<<if hasBothArms($activeSlave)>>s<</if>> to promise you perfect obedience if you'll only spare $him from emasculation.
<<else>>
$He begs through tears, "Plea<<s>>e no, <<if $activeSlave.rudeTitle == 1>><<= PoliteRudeTitle($activeSlave)>><<else>><<Master>><</if>>! Plea<<s>>e let me keep them! Plea<<s>>e!"
<</if>>
@@ -13141,7 +13141,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
You pinch $his nipples and tug them hard, making the slave writhe and buck against you.
<</if>>
<<if $PC.dick == 0>>
- You grab one of $his hands and guide it down to $his
+ You grab <<if hasBothArms($activeSlave)>>one of $his hands<<elseif hasAnyArms($activeSlave>>$his hand<</if>> and guide it down to $his
<<if $activeSlave.dick > 0 && !($activeSlave.chastityPenis)>>
cock,
<<elseif canDoVaginal($activeSlave)>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index e8eab0b4cc9..f25beea4d18 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -2048,7 +2048,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<if $subSlave.lactation>>
loves nothing more than to have _his2 udders lovingly sucked dry. "I'll drain you," <<say>>s $activeSlave.slaveName, sticking $his tongue out to make $his meaning lewdly clear. "I'll nur<<s>>e from you until you come."
<<else>>
- can't resist having _his2 breasts pampered. "I'll give you a boob ma<<ss>>age," <<say>>s $activeSlave.slaveName, and puts up $his hands, flexing $his fingers lewdly. "A really good one. I'll be thorough!"
+ can't resist having _his2 breasts pampered. "I'll give you a boob ma<<ss>>age," <<say>>s $activeSlave.slaveName, and puts up $his hand<<if hasBothArms($activeSlave)>>s</if>>, flexing $his fingers lewdly. "A really good one. I'll be thorough!"
<</if>>
<<case "pregnancy">>
loves to be inseminated,
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 0b3c21bae8e..ca6df324048 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -304,7 +304,7 @@
<<include "SA devotion">>
<</silently>>
<</if>>
-
+
<<set _seed = Math.max(_adMgr.tallySlave($slaves[$i]), 1)>>
<<set _adsIncome = _seed * random(50,60) * Math.trunc($brothelAdsSpending/1000)>>
<<set _cashX = _adsIncome, getSlaveStatisticData($slaves[$i], $facility.brothel).adsIncome += _adsIncome>>
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index ac8ef253f19..a299b33a2fc 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -327,7 +327,7 @@ The hormone replacement therapies
<<if $seePreg != 0>>
<h2>Fertility Focused Pharmacology</h2>
-
+
<div>
<<if $seeHyperPreg == 1>>
<<if $superFertilityDrugs == 1 && ($rep > 10000*_PCSkillCheck) && $pregSpeedControl != 1>>
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index 4da246ab938..a1c43347ebf 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -529,7 +529,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<div>
- <<if $arcologies[0].FSChattelReligionist != "unset">>
+ <<if $arcologies[0].FSChattelReligionist != "unset">>
<<link "Give all your slaves devotional names">>
<<for _i = 0; _i < $slaves.length; _i++>>
<<set $slaves[_i].slaveName = setup.chattelReligionistSlaveNames.random()>>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index eb0f5cdf0b5..61993833f50 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -74,8 +74,8 @@ You own <strong>$arcologies[0].ownership%</strong> of $arcologies[0].name, <<if
<div>
<<if $weatherCladding == 0>>
<span class="note">
- Extreme weather is becoming common worldwide. The arcology's exterior can be hardened to reduce damage in case of heavy weather, but this will reduce its beauty somewhat and will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>.
- Your citizens are
+ Extreme weather is becoming common worldwide. The arcology's exterior can be hardened to reduce damage in case of heavy weather, but this will reduce its beauty somewhat and will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>.
+ Your citizens are
<<if $weatherAwareness == 0>>
likely to disapprove of this measure as alarmism.
<<else>>
@@ -188,7 +188,7 @@ You own <strong>$arcologies[0].ownership%</strong> of $arcologies[0].name, <<if
<<if ($PC.skill.engineering >= 100) || ($PC.career == "arcology owner")>>
<div class="note">
- Arcology upgrades are less expensive due to your
+ Arcology upgrades are less expensive due to your
<span class="player skill">
<<if $PC.career == "arcology owner">>experience in the Free Cities<<else>>arcology engineering training<</if>>.
</span>
diff --git a/src/uncategorized/pBioreactorPerfected.tw b/src/uncategorized/pBioreactorPerfected.tw
index 10d8c67e15b..adbe4d61f1d 100644
--- a/src/uncategorized/pBioreactorPerfected.tw
+++ b/src/uncategorized/pBioreactorPerfected.tw
@@ -183,7 +183,7 @@ You stop and consider the cow, from $his titanic breasts to $his <<if ($activeSl
<<set $bioreactorsXX += _bioreactorsXX>>
<<set $bioreactorsXY += _bioreactorsXY>>
<<set $bioreactorsHerm += _bioreactorsHerm>>
- <<set $bioreactorsBarren += _bioreactorsBarren>>
+ <<set $bioreactorsBarren += _bioreactorsBarren>>
<<= removeActiveSlave() >>
<<set $createBioreactors = 1>>
<</replace>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 8bbbe47a726..c3159087a45 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -371,7 +371,7 @@
<<set $activeSlave.pubertyXY = 0>>
<</if>>
<<if _relationType != "twin">>
- <<ResyncHeight $activeSlave>>
+ <<ResyncHeight $activeSlave>>
<</if>>
<<set $activeSlave.devotion = random(25,45)>>
<<set $activeSlave.trust = random(-15,15)>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index d8561d76e3a..79d4c099cb8 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -1745,7 +1745,7 @@
<<case "identical herm pair" "identical pair" "incest brother brother" "incest brother sister" "incest father daughter" "incest father son" "incest mother daughter" "incest mother son" "incest sister sister" "incest twin brother" "incest twin sister" "incest twins mixed" "matched pair">>
<<switch $RecETSevent>>
<<case "identical herm pair" "identical pair" "matched pair">>
- <<link "Buy them both">>
+ <<link "Buy them both">>
<<run newSlave($relative)>>
<<run newSlave($relative2)>>
<<run cashX(forceNeg(_ContractCost), "slaveTransfer", $relative)>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index 252b5d1c427..f92ebb1901e 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -178,7 +178,7 @@
<<if ($slaves[$i].skill.anal > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.anal > 10))>>
<<if ($slaves[$i].skill.vaginal > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.vaginal > 10)) || ($slaves[$i].vagina < 0)>>
<p>
- <span class="slave-name">$slaves[$i].slaveName</span> can learn little from further classes,
+ <span class="slave-name">$slaves[$i].slaveName</span> can learn little from further classes,
<span class="noteworthy">
<<if $assignmentRecords[$slaves[$i].ID]>>
<<set _oldJob = $assignmentRecords[$slaves[$i].ID]>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index ab2ac1f3526..cb77eb5d67f 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -890,7 +890,7 @@ As the remote surgery's long recovery cycle completes,
<<if hasAnyArms($activeSlave)>>$He's barely out of the surgery before $he's playing with $his new, perkier breasts despite the pain.<<else>>$He's barely out of the surgery before $he's rubbing $his new, perkier breasts against anything $he can reach, despite the pain.<</if>> $He's @@.hotpink;deliriously happy@@ with your changes to what $he thinks of as $his primary sexual organs, so much so that $he now @@.mediumaquamarine;trusts@@ your plans for $his body. As with all surgery @@.red;$his health has been slightly affected.@@
<<set $activeSlave.trust += 4, $activeSlave.devotion += 4>>
<<elseif ($activeSlave.devotion > 50)>>
- <<if hasAnyArms($activeSlave)>>$He runs $his hands over $his perkier breasts experimentally and turns to you with a smile to show them off. $He's still sore, so $he doesn't touch them much, but $he turns from side to side to let you see them from all angles.<<else>>$He bounces a little to feel $his perkier tits move before $he turns $his torso to you with a smile to show them off. $He's still sore, so $he doesn't move too violently, but $he wiggles $himself a little to show off.<</if>> @@.hotpink;$He's thrilled that you firmed up $his breasts.@@ As with all surgery @@.red;$his health has been slightly affected.@@
+ <<if hasAnyArms($activeSlave)>>$He runs $his hand<<if hasBothArms($activeSlave)>>s</if>> over $his perkier breasts experimentally and turns to you with a smile to show them off. $He's still sore, so $he doesn't touch them much, but $he turns from side to side to let you see them from all angles.<<else>>$He bounces a little to feel $his perkier tits move before $he turns $his torso to you with a smile to show them off. $He's still sore, so $he doesn't move too violently, but $he wiggles $himself a little to show off.<</if>> @@.hotpink;$He's thrilled that you firmed up $his breasts.@@ As with all surgery @@.red;$his health has been slightly affected.@@
<<set $activeSlave.devotion += 4>>
<<elseif ($activeSlave.devotion >= -20)>>
<<if canSee($activeSlave)>>$He eyes $his new, perkier breasts skeptically<<else>>The cool air flowing over the new location of $his nipples draws a skeptical expression to $his face<</if>>. <<if hasAnyArms($activeSlave)>>$He's still sore, so $he doesn't touch them.<<else>>$He's still sore, so $he keeps $his body still.<</if>> $He's come to terms with the fact that $he's a slave, but $he is @@.hotpink;quite happy@@ you'd take the time to make $his breasts prettier. As with all surgery @@.red;$his health has been slightly affected.@@ $He is @@.gold;sensibly fearful@@ of your total power over $his body and that this may be only the beginning of extensive breast surgery.
@@ -907,7 +907,7 @@ As the remote surgery's long recovery cycle completes,
<<if hasAnyArms($activeSlave)>>$He's barely out of the surgery before $he's playing with $his new, <<print $activeSlave.boobShape>> breasts despite the pain.<<else>>$He's barely out of the surgery before $he's rubbing $his new, <<print $activeSlave.boobShape>> breasts against anything $he can reach, despite the pain.<</if>> $He's @@.hotpink;deliriously happy@@ with your changes to what $he thinks of as $his primary sexual organs, so much so that $he now @@.mediumaquamarine;trusts@@ your plans for $his body. As with all surgery @@.red;$his health has been slightly affected.@@
<<set $activeSlave.trust += 4, $activeSlave.devotion += 4>>
<<elseif ($activeSlave.devotion > 50)>>
- <<if hasAnyArms($activeSlave)>>$He runs $his hands over $his <<print $activeSlave.boobShape>> breasts experimentally and turns to you with a smile to show them off. $He's still sore, so $he doesn't touch them much, but $he turns from side to side to let you see them from all angles.<<else>>$He bounces a little to feel $his <<print $activeSlave.boobShape>> tits move before $he turns $his torso to you with a smile to show them off. $He's still sore, so $he doesn't move too violently, but $he wiggles $himself a little to show off.<</if>> @@.hotpink;$He's happy with your changes to $his breasts.@@ As with all surgery @@.red;$his health has been slightly affected.@@
+ <<if hasAnyArms($activeSlave)>>$He runs $his hand<<if hasBothArms($activeSlave)>>s</if>> over $his <<print $activeSlave.boobShape>> breasts experimentally and turns to you with a smile to show them off. $He's still sore, so $he doesn't touch them much, but $he turns from side to side to let you see them from all angles.<<else>>$He bounces a little to feel $his <<print $activeSlave.boobShape>> tits move before $he turns $his torso to you with a smile to show them off. $He's still sore, so $he doesn't move too violently, but $he wiggles $himself a little to show off.<</if>> @@.hotpink;$He's happy with your changes to $his breasts.@@ As with all surgery @@.red;$his health has been slightly affected.@@
<<set $activeSlave.devotion += 4>>
<<elseif ($activeSlave.devotion >= -20)>>
<<if canSee($activeSlave)>>$He eyes $his new, <<print $activeSlave.boobShape>> breasts skeptically<<else>>The cool air flowing over the new location of $his nipples draws a skeptical expression to $his face<</if>>. <<if hasAnyArms($activeSlave)>>$He's still sore, so $he doesn't touch them.<<else>>$He's still sore, so $he keeps $his body still.<</if>> $He's come to terms with the fact that $he's a slave, so $he isn't much affected mentally despite the surprise of having $his breasts reshaped. As with all surgery @@.red;$his health has been slightly affected.@@ $He is @@.gold;sensibly fearful@@ of your total power over $his body.
diff --git a/src/uncategorized/underperformingSlaves.tw b/src/uncategorized/underperformingSlaves.tw
index eec5dffe3ce..06d52d92b9a 100644
--- a/src/uncategorized/underperformingSlaves.tw
+++ b/src/uncategorized/underperformingSlaves.tw
@@ -38,7 +38,7 @@
},
count: 7,
filter:(slave) => (
- ["get milked", "work in the dairy", "whore", "work in the brothel", "work a glory hole", "be confined in the arcade"].includes(slave.assignment)
+ ["be confined in the arcade", "get milked", "whore", "work a glory hole", "work in the brothel", "work in the dairy"].includes(slave.assignment)
&& ((slave.weekAcquired + 1) < V.week)
&& slave.lastWeeksCashIncome
)
@@ -64,7 +64,7 @@
part:(slave) => (slave.lastWeeksCashIncome - getSlaveCost(slave)),
count: 7,
filter:(slave) => (
- ["get milked", "work in the dairy", "whore", "work in the brothel", "work a glory hole", "be confined in the arcade"].includes(slave.assignment)
+ ["be confined in the arcade", "get milked", "whore", "work a glory hole", "work in the brothel", "work in the dairy"].includes(slave.assignment)
&& ((slave.weekAcquired + 1) < V.week)
&& slave.lastWeeksCashIncome
)
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index f133906912d..f578e96653e 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -1323,9 +1323,9 @@ $He's got a
<<if canWalk($activeSlave)>>
$His butt is so massive that it is difficult for $him to move.
<<if $activeSlave.muscles > 95>>
- However, $he is so powerfully built that $he can manage it with effort, using $his arms to support them.
+ However, $he is so powerfully built that $he can manage it with effort, using $his arm<<if hasBothArms($activeSlave)>>s</if>> to support them.
<<elseif $activeSlave.muscles > 30>>
- $He can barely manage to get to $his feet unaided, and usually walks with $his hands sunk into $his buttcheeks to help take their weight.
+ $He can barely manage to get to $his feet unaided, and usually walks with $his hand<<if hasBothArms($activeSlave)>>s</if>> sunk into $his buttcheeks to help take their weight.
<<elseif $activeSlave.muscles > 5>>
$He requires assistance to get to $his feet, and tries to rest $his huge cheeks on whatever nearby surfaces $he can.
<<else>>
@@ -1352,9 +1352,9 @@ $He's got a
<<if canWalk($activeSlave)>>
$His butt is so massive that it is difficult for $him to move.
<<if $activeSlave.muscles > 95>>
- However, $he is so powerfully built that $he can manage it with effort, using $his arms to support them.
+ However, $he is so powerfully built that $he can manage it with effort, using $his arm<<if hasBothArms($activeSlave)>>s</if>> to support them.
<<elseif $activeSlave.muscles > 30>>
- $He can barely manage to get to $his feet unaided, and usually walks with $his hands sunk into $his buttcheeks to help take their weight.
+ $He can barely manage to get to $his feet unaided, and usually walks with $his hand<<if hasBothArms($activeSlave)>>s</if>> sunk into $his buttcheeks to help take their weight.
<<elseif $activeSlave.muscles > 5>>
$He requires assistance to get to $his feet, and tries to rest $his huge cheeks on whatever nearby surfaces $he can.
<<else>>
@@ -1381,9 +1381,9 @@ $He's got a
<<if canWalk($activeSlave)>>
$His butt is so massive that it is difficult for $him to move.
<<if $activeSlave.muscles > 95>>
- However, $he is so powerfully built that $he can manage it with effort, using $his arms to support them.
+ However, $he is so powerfully built that $he can manage it with effort, using $his arm<<if hasBothArms($activeSlave)>>s</if>> to support them.
<<elseif $activeSlave.muscles > 30>>
- $He can barely manage to get to $his feet unaided, and usually walks with $his hands sunk into $his buttcheeks to help take their weight.
+ $He can barely manage to get to $his feet unaided, and usually walks with $his hand<<if hasBothArms($activeSlave)>>s</if>> sunk into $his buttcheeks to help take their weight.
<<elseif $activeSlave.muscles > 5>>
$He requires assistance to get to $his feet, and tries to rest $his huge cheeks on whatever nearby surfaces $he can.
<<else>>
--
GitLab