From 29c2f031f192ea69cace9f8a4e7ee48f135186ac Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Wed, 15 May 2019 00:37:27 -0500
Subject: [PATCH] SPaces
---
Changelog.txt | 2 +-
src/SecExp/securityReport.tw | 12 +--
src/js/sexActsJS.js | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 2 +-
src/uncategorized/newSlaveIntro.tw | 5 +-
src/uncategorized/remoteSurgery.tw | 104 ++++++++++----------
6 files changed, 65 insertions(+), 62 deletions(-)
diff --git a/Changelog.txt b/Changelog.txt
index 8e9b2a4095a..0cd4443dd73 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -8078,7 +8078,7 @@ Experimental build
-Fixed a bug where a vaginaless slave would wear a fake belly leaving you with no way to remove it.
-Security Expansion (Officially integrated into Pregmod since 0.10.7.1 v153, 11/25/17 )
+Security Expansion (Officially integrated into Pregmod since 0.10.7.1 v153, 11/25/17)
PregmodBase v139
11/20/17
diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw
index 045b87328c2..bd57255876d 100644
--- a/src/SecExp/securityReport.tw
+++ b/src/SecExp/securityReport.tw
@@ -22,9 +22,9 @@
<strong>Security</strong>:
<<if $terrain === "oceanic">>
- Due to the @@.green;massive economic and logistical challenges@@ of attacking an oceanic arcology, your security force(s)
+ Due to the @@.green;massive economic and logistical challenges@@ of attacking an oceanic arcology, your security force(s)
<<else>>
- The @@.red;easily manageable economic and logistical challenges@@ of attacking an $terrain arcology ensure that your security force(s) do not
+ The @@.red;easily manageable economic and logistical challenges@@ of attacking an $terrain arcology ensure that your security force(s) do not
<</if>>
have the luxury of focusing exclusively on internal matters.<br>
<<if $secMenials > 0>>
@@ -174,9 +174,9 @@
<<else>>
<<set _secGrowth -= ($airport + $docks - $hubSecurity * 3) / 2>>
<</if>>
- The transport hub, for all its usefulness, is a hotspot of malicious
+ The transport hub, for all its usefulness, is a hotspot of malicious
<<if $airport + $docks > $hubSecurity * 3>>
- activity and hub security forces are not sufficient to keep up with all threats.
+ activity and hub security forces are not sufficient to keep up with all threats.
<<else>>
activity, but the hub security forces are up to the task.
<</if>>
@@ -248,7 +248,7 @@ The security level of the arcology is
<br><br>
<strong>Crime</strong>:
/* crime modifiers */
-Due to the deterioration of the old world countries, organized crime focuses more and more on the prosperous free cities, yours included. This has a
+Due to the deterioration of the old world countries, organized crime focuses more and more on the prosperous free cities, yours included. This has a
<<if $week < 30>>
small
<<set _crimeGrowth += 0.5>>
@@ -256,7 +256,7 @@ Due to the deterioration of the old world countries, organized crime focuses mor
noticeable
<<set _crimeGrowth += 1>>
<<elseif $week < 90>>
- moderate
+ moderate
<<set _crimeGrowth += 1.5>>
<<elseif $week < 120>>
big
diff --git a/src/js/sexActsJS.js b/src/js/sexActsJS.js
index f9ec0a9bf52..231f899b902 100644
--- a/src/js/sexActsJS.js
+++ b/src/js/sexActsJS.js
@@ -16,7 +16,7 @@ window.VCheck = (function () {
Simple: SimpleVCheck,
Partner: PartnerVCheck
};
-
+
function setScopedPronouns(slave) {
const pronouns = getPronouns(slave);
he = pronouns.pronoun;
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index c83886f6583..c32b67fae8b 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3522,7 +3522,7 @@ Updating gene pool records:
<<set _Slave.custom.tattoo = _Slave.customTat || "">>
<<set _Slave.custom.label = _Slave.custom.label || "">>
<<set _Slave.custom.desc = _Slave.custom.desc || "">>
- <<set _Slave.custom.title = _Slave.custom.title || "">>
+ <<set _Slave.custom.title = _Slave.custom.title || "">>
<<set _Slave.custom.titleLisp = _Slave.custom.titleLisp || "">>
<<set _Slave.custom.hairVector = _Slave.custom.hairVector || 0>>
<<set _Slave.custom.image = _Slave.custom.image || null>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 3760d2d1b39..bf6ecb20f1d 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1002,7 +1002,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
Judging from $his earlier, amateur attempt, it's clear $activeSlave.slaveName is unfamiliar with the subtle nuances of a high-quality rape. You decide to clear your schedule for the rest of the day and teach $him yourself<<if $PC.dick == 0>>, with the help of your trusty strap-on, of course<</if>>. Once $he's bent over across your desk and properly restrained, $his lesson begins with you thrusting your <<if $PC.dick == 0>>fake <</if>>cock down $his throat as far as it will go. Over the course of the next several hours, you ensure that $he understands the fine points of nonconsensual oral<<if $activeSlave.vagina > -1>>, vaginal,<</if>> and anal intercourse as intimately as possible. When you're finally too tired to continue,you unshackle $his @@.red;bruised and bloody body@@ and ask $him what $he learned. $His voice hoarse from the same brutal fucking that has gaped $his @@.lime;asshole@@<<if $activeSlave.vagina > -1>> and @@.lime;pussy@@<</if>>, $he hesitantly replies that $he has @@.hotpink;learned a great deal about true dominance,@@ before fainting on the spot from a mixture of total exhaustion and pure terror. You've taught your student well.
<</replace>>
<<set $activeSlave.counter.oral += 15, $oralTotal += 15>>
- <<set $activeSlave.anus = 2, $activeSlave.counter.anal += 15, $analTotal += 15>>
+ <<set $activeSlave.anus = 2, $activeSlave.counter.anal += 15, $analTotal += 15>>
<<if $activeSlave.vagina > -1>>
<<set $activeSlave.vagina = 2, $activeSlave.counter.vaginal += 15, $vaginalTotal += 15>>
<</if>>
@@ -1013,8 +1013,11 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</link>>
| <<link "Show $him that $he could have just asked">>
<<replace "#introResult">>
+ You tell $activeSlave.slaveName that while $his previous attempt to fuck you was very flattering, $he should know that one can catch more flies with honey. Ordering the confused slave to lean back over and onto your desk, you proceed to gently <<if $activeSlave.dick > 0>>stroke<<else>>finger<</if>> $him until $his arousal overwhelms $his wariness of you. Once $he's finally relaxed, you climb on top of $him, and gently ease yourself
<<if ($PC.vagina > 0) && (canPenetrate($activeSlave))>>
+ onto $his cock
<<else>>
+ into $his pussy
<</if>>
<</replace>>
<<set $activeSlave.trust += 100>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 2806cc33d3c..44a77885842 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -367,12 +367,12 @@ $He has
<</if>>
<<if $activeSlave.lipsImplant != 0>>
<<if $activeSlave.indentureRestrictions < 2>>
- | [[Remove lip implants|Surgery Degradation][$activeSlave.lips = ($activeSlave.lips-$activeSlave.lipsImplant),$activeSlave.lipsImplant = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "lips"]]
+ | [[Remove lip implants|Surgery Degradation][$activeSlave.lips = ($activeSlave.lips-$activeSlave.lipsImplant),$activeSlave.lipsImplant = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "lips"]]
<</if>>
<</if>>
<<if ($activeSlave.lips >= 10) && ($activeSlave.lipsImplant == 0)>>
<<if $activeSlave.indentureRestrictions < 2>>
- | [[Reduce lips|Surgery Degradation][$activeSlave.lips -= 10,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "lips"]]
+ | [[Reduce lips|Surgery Degradation][$activeSlave.lips -= 10,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "lips"]]
<</if>>
<</if>>
@@ -382,51 +382,51 @@ $He has
$He has crooked teeth.
[[Apply braces|Surgery Degradation][$activeSlave.teeth = "straightening braces",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$surgeryType = "braces"]]
<<if ($seeExtreme == 1) && ($activeSlave.indentureRestrictions < 1)>>
- | [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "sharp"]]
+ | [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "sharp"]]
<</if>>
<<case "gapped">>
$He has a noticeable gap in $his front teeth.
[[Apply braces|Surgery Degradation][$activeSlave.teeth = "straightening braces",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$surgeryType = "braces"]]
<<if ($seeExtreme == 1) && ($activeSlave.indentureRestrictions < 1)>>
- | [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "sharp"]]
+ | [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "sharp"]]
<</if>>
<<case "straightening braces">>
$His crooked teeth are in braces.
[[Remove braces|Remote Surgery][$activeSlave.teeth = "crooked",$surgeryType = "removeBraces"]]
<<if ($seeExtreme == 1) && ($activeSlave.indentureRestrictions < 1)>>
- | [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "sharp"]]
+ | [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "sharp"]]
<</if>>
<<case "cosmetic braces">>
$He has braces on $his straight teeth.
[[Remove braces|Remote Surgery][$activeSlave.teeth = "normal"]]
<<if ($seeExtreme == 1) && ($activeSlave.indentureRestrictions < 1)>>
- | [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "sharp"]]
+ | [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "sharp"]]
<</if>>
<<case "removable">>
$He has prosthetic teeth that can be removed for extreme oral sex.
<<if ($seeExtreme == 1) && ($activeSlave.indentureRestrictions < 1)>>
- [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "sharp"]] | [[Normal dental implants|Surgery Degradation][$activeSlave.teeth = "normal",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "oral"]]
+ [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "sharp"]] | [[Normal dental implants|Surgery Degradation][$activeSlave.teeth = "normal",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "oral"]]
<</if>>
<<case "pointy">>
$His teeth have been replaced with sturdy, realistic implants that mimic the dentition of a predator.
<<if ($seeExtreme == 1) && ($activeSlave.indentureRestrictions < 1)>>
- [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Normal dental implants|Surgery Degradation][$activeSlave.teeth = "normal",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "oral"]]
+ [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Normal dental implants|Surgery Degradation][$activeSlave.teeth = "normal",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "oral"]]
<</if>>
<<case "baby">>
$He has baby teeth.
<<if ($seeExtreme == 1) && ($activeSlave.indentureRestrictions < 1)>>
- [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "sharp"]] | [[Normal dental implants|Surgery Degradation][$activeSlave.teeth = "normal",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "oral"]]
+ [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "sharp"]] | [[Normal dental implants|Surgery Degradation][$activeSlave.teeth = "normal",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "oral"]]
<</if>>
<<case "mixed">>
$He has a mix of baby and normal teeth.
<<if ($seeExtreme == 1) && ($activeSlave.indentureRestrictions < 1)>>
- [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "sharp"]] | [[Normal dental implants|Surgery Degradation][$activeSlave.teeth = "normal",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "oral"]]
+ [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "sharp"]] | [[Normal dental implants|Surgery Degradation][$activeSlave.teeth = "normal",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "oral"]]
<</if>>
<<default>>
$He has normal, healthy teeth.
[[Unnecessary braces|Surgery Degradation][$activeSlave.teeth = "cosmetic braces",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$surgeryType = "braces"]]
<<if ($seeExtreme == 1) && ($activeSlave.indentureRestrictions < 1)>>
- | [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "sharp"]]
+ | [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "sharp"]]
<</if>>
<</switch>>
@@ -633,44 +633,44 @@ $He has
<<if $activeSlave.boobsImplant != 0>>
The shape of $his breasts is determined by $his implants.
<<else>>
-<<if $activeSlave.boobs <= 250>>
- $He's so flat-chested that $his breasts don't have much shape.
-<<else>>
- <<switch $activeSlave.boobShape>>
- <<case "perky">>
- They're perky, with nipples that point slightly upwards.
- <<case "downward-facing">>
- They're not attractively shaped; $his nipples pointing downward.
- <<case "torpedo-shaped">>
- They're torpedo-shaped, projecting some way from $his chest.
- <<case "wide-set">>
- They're wide-set, with nipples pointing away from $his sternum.
- <<case "saggy">>
- They're not attractively shaped, with $his nipples pointing down.
- <<default>>
- They're nicely rounded and rest naturally.
- <</switch>>
- <<if $activeSlave.indentureRestrictions >= 2>>
- //$His indenture does not allow breast restructuring//
- <<elseif $activeSlave.breastMesh == 1>>
- //$His supportive mesh implant prevents reconstruction//
+ <<if $activeSlave.boobs <= 250>>
+ $He's so flat-chested that $his breasts don't have much shape.
<<else>>
- <<if ($activeSlave.boobShape == "saggy") || ($activeSlave.boobShape == "downward-facing")>>
- [[Breast lift|Surgery Degradation][$activeSlave.boobShape = "normal", $activeSlave.health -= 20,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "breastLift"]]<<if $activeSlave.preg > $activeSlave.pregData.normalBirth/1.42 || ($activeSlave.boobs >= 5000 && $activeSlave.boobs < 8000)>> //$His current state may result in $his breasts becoming saggy again//<</if>>
+ <<switch $activeSlave.boobShape>>
+ <<case "perky">>
+ They're perky, with nipples that point slightly upwards.
+ <<case "downward-facing">>
+ They're not attractively shaped; $his nipples pointing downward.
+ <<case "torpedo-shaped">>
+ They're torpedo-shaped, projecting some way from $his chest.
+ <<case "wide-set">>
+ They're wide-set, with nipples pointing away from $his sternum.
+ <<case "saggy">>
+ They're not attractively shaped, with $his nipples pointing down.
+ <<default>>
+ They're nicely rounded and rest naturally.
+ <</switch>>
+ <<if $activeSlave.indentureRestrictions >= 2>>
+ //$His indenture does not allow breast restructuring//
+ <<elseif $activeSlave.breastMesh == 1>>
+ //$His supportive mesh implant prevents reconstruction//
<<else>>
- <<if ($activeSlave.boobShape == "normal")>>
- [[Reshape them to be perkier|Surgery Degradation][$activeSlave.boobShape = "perky",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "breastReconstruction"]]
- | [[Make them torpedo-shaped|Surgery Degradation][$activeSlave.boobShape = "torpedo-shaped",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "breastReconstruction"]]
+ <<if ($activeSlave.boobShape == "saggy") || ($activeSlave.boobShape == "downward-facing")>>
+ [[Breast lift|Surgery Degradation][$activeSlave.boobShape = "normal", $activeSlave.health -= 20,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "breastLift"]]<<if $activeSlave.preg > $activeSlave.pregData.normalBirth/1.42 || ($activeSlave.boobs >= 5000 && $activeSlave.boobs < 8000)>> //$His current state may result in $his breasts becoming saggy again//<</if>>
<<else>>
- [[Reshape them to be more normal|Surgery Degradation][$activeSlave.boobShape = "normal",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "breastReconstruction"]]
- <</if>>
- <<if ($activeSlave.boobShape != "saggy") && ($activeSlave.boobShape != "downward-facing") && ($activeSlave.boobs >= 2000) && ($activeSlave.boobsImplant == 0) && ($meshImplants == 1) && ($surgeryUpgrade == 1)>>
- | [[Implant a supportive mesh to preserve their shape|Surgery Degradation][$activeSlave.breastMesh = 1,cashX(forceNeg($surgeryCost*($activeSlave.boobs/100)), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "breastShapePreservation"]]
+ <<if ($activeSlave.boobShape == "normal")>>
+ [[Reshape them to be perkier|Surgery Degradation][$activeSlave.boobShape = "perky",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "breastReconstruction"]]
+ | [[Make them torpedo-shaped|Surgery Degradation][$activeSlave.boobShape = "torpedo-shaped",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "breastReconstruction"]]
+ <<else>>
+ [[Reshape them to be more normal|Surgery Degradation][$activeSlave.boobShape = "normal",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "breastReconstruction"]]
+ <</if>>
+ <<if ($activeSlave.boobShape != "saggy") && ($activeSlave.boobShape != "downward-facing") && ($activeSlave.boobs >= 2000) && ($activeSlave.boobsImplant == 0) && ($meshImplants == 1) && ($surgeryUpgrade == 1)>>
+ | [[Implant a supportive mesh to preserve their shape|Surgery Degradation][$activeSlave.breastMesh = 1,cashX(forceNeg($surgeryCost*($activeSlave.boobs/100)), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "breastShapePreservation"]]
+ <</if>>
<</if>>
<</if>>
<</if>>
<</if>>
-<</if>>
<<if $surgeryUpgrade == 1>>
<br>
@@ -1722,19 +1722,19 @@ Work on $him structurally:
<</if>>
<<if ($activeSlave.heightImplant == 0)>>
<<if $activeSlave.indentureRestrictions < 1>>
- [[Lengthen major bones|Surgery Degradation][$activeSlave.heightImplant = 1,$activeSlave.height += 10,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40,$surgeryType = "height"]] | [[Shorten major bones|Surgery Degradation][$activeSlave.heightImplant = -1,$activeSlave.height -= 10,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40,$surgeryType = "height"]]
+ [[Lengthen major bones|Surgery Degradation][$activeSlave.heightImplant = 1,$activeSlave.height += 10,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40,$surgeryType = "height"]] | [[Shorten major bones|Surgery Degradation][$activeSlave.heightImplant = -1,$activeSlave.height -= 10,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40,$surgeryType = "height"]]
<</if>>
<<elseif ($activeSlave.height < (Height.mean($activeSlave)+15)) && ($activeSlave.height >= (Height.mean($activeSlave)-15)) && ($surgeryUpgrade == 1)>>
<<if $activeSlave.indentureRestrictions < 1>>
- [[Advanced height gain surgery|Surgery Degradation][$activeSlave.heightImplant = 1,$activeSlave.height += 10,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40,$surgeryType = "height"]] | [[Advanced height reduction surgery|Surgery Degradation][$activeSlave.heightImplant = -1,$activeSlave.height -= 10,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40,$surgeryType = "height"]]
+ [[Advanced height gain surgery|Surgery Degradation][$activeSlave.heightImplant = 1,$activeSlave.height += 10,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40,$surgeryType = "height"]] | [[Advanced height reduction surgery|Surgery Degradation][$activeSlave.heightImplant = -1,$activeSlave.height -= 10,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40,$surgeryType = "height"]]
<</if>>
<<elseif ($activeSlave.height < (Height.mean($activeSlave)+15)) && ($surgeryUpgrade == 1)>>
<<if $activeSlave.indentureRestrictions < 1>>
- [[Advanced height gain surgery|Surgery Degradation][$activeSlave.heightImplant = 1,$activeSlave.height += 10,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40,$surgeryType = "height"]]
+ [[Advanced height gain surgery|Surgery Degradation][$activeSlave.heightImplant = 1,$activeSlave.height += 10,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40,$surgeryType = "height"]]
<</if>>
<<elseif ($activeSlave.height >= (Height.mean($activeSlave)-15)) && ($surgeryUpgrade == 1)>>
<<if $activeSlave.indentureRestrictions < 1>>
- [[Advanced height reduction surgery|Surgery Degradation][$activeSlave.heightImplant = -1,$activeSlave.height -= 10,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40,$surgeryType = "height"]]
+ [[Advanced height reduction surgery|Surgery Degradation][$activeSlave.heightImplant = -1,$activeSlave.height -= 10,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40,$surgeryType = "height"]]
<</if>>
<</if>>
<br>
@@ -1745,7 +1745,7 @@ Work on $him structurally:
<</if>>
<<if ($activeSlave.heels == 0) && ($seeExtreme == 1)>>
<<if $activeSlave.indentureRestrictions < 1>>
- [[Shorten tendons|Surgery Degradation][$activeSlave.heels = 1,$activeSlave.shoes = "heels",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "heels"]] //Prevents $him from walking in anything but very high heels//
+ [[Shorten tendons|Surgery Degradation][$activeSlave.heels = 1,$activeSlave.shoes = "heels",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "heels"]] //Prevents $him from walking in anything but very high heels//
<</if>>
<</if>>
<<if ($activeSlave.heels == 1)>>
@@ -1780,11 +1780,11 @@ Work on $him structurally:
<<if $activeSlave.amp == 0>>
<<if $activeSlave.indentureRestrictions < 1 && $seeExtreme == 1>>
- <<if $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "interfaceP1"}) == -1 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "interfaceP2"}) == -1>>
- [[Remove arms and legs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.shoes = "none", $activeSlave.legAccessory = "none", $activeSlave.heightImplant = 0, $activeSlave.legsTat = 0, $activeSlave.armsTat = 0, $activeSlave.releaseRules = "restrictive", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.nails = 0, $surgeryType = "amp"]] //This will greatly restrict $him//
- <<else>>
- [[Remove arms and legs|Surgery Degradation][$activeSlave.amp = 1, $activeSlave.heels = 0, $activeSlave.shoes = "none", $activeSlave.legAccessory = "none", $activeSlave.heightImplant = 0, $activeSlave.legsTat = 0, $activeSlave.armsTat = 0, $activeSlave.releaseRules = "restrictive", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.nails = 0, $surgeryType = "amp1"]] //This will greatly restrict $him//
- <</if>>
+ <<if $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "interfaceP1"}) == -1 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "interfaceP2"}) == -1>>
+ [[Remove arms and legs|Surgery Degradation][$activeSlave.amp = 1,$activeSlave.heels = 0,$activeSlave.shoes = "none", $activeSlave.legAccessory = "none", $activeSlave.heightImplant = 0, $activeSlave.legsTat = 0, $activeSlave.armsTat = 0, $activeSlave.releaseRules = "restrictive", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.nails = 0, $surgeryType = "amp"]] //This will greatly restrict $him//
+ <<else>>
+ [[Remove arms and legs|Surgery Degradation][$activeSlave.amp = 1, $activeSlave.heels = 0, $activeSlave.shoes = "none", $activeSlave.legAccessory = "none", $activeSlave.heightImplant = 0, $activeSlave.legsTat = 0, $activeSlave.armsTat = 0, $activeSlave.releaseRules = "restrictive", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.nails = 0, $surgeryType = "amp1"]] //This will greatly restrict $him//
+ <</if>>
<</if>>
<<elseif ($activeSlave.amp == 1) && ($activeSlave.PLimb == 0)>>
<<if $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "interfaceP1"}) != -1>> |
--
GitLab