From 404c93ba76cf7f71aead67becbc19e3f531aa6d4 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Mon, 15 Jul 2019 01:04:28 -0400
Subject: [PATCH] fix
fix
---
src/js/descriptionWidgets.js | 6 ++-
src/uncategorized/newSlaveIntro.tw | 19 +++----
src/uncategorized/universalRules.tw | 84 ++++++++++++-----------------
3 files changed, 49 insertions(+), 60 deletions(-)
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index a6e779524cb..a1569e3a636 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -825,12 +825,16 @@ App.Desc.describeScarInt = function(slave, surface) { // scars can sometimes be
case 1:
if (["left wrist", "right wrist", "left ankle", "right ankle"].includes(surface)) {
return "scars from manacles";
+ } else if (["back"].includes(surface)) {
+ return "scarred from a whip";
} else {
return "light scarring";
- }
+ }
case 2:
if (["left wrist", "right wrist", "left ankle", "right ankle"].includes(surface)) {
return "scars from heavy manacles";
+ } else if (["back"].includes(surface)) {
+ return "scarred from a heavy whipping";
} else {
return "heavy scarring";
}
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 0b78a4eeef9..87d7835881e 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1227,28 +1227,29 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<link "Whip $him until $he scars">>
<<set _scarArray = ["left breast", "right breast", "back", "lower back", "left buttock", "right buttock"]>>
<<if $activeSlave.amp != 1>>
- <<set _scarArray.push("left upper arm", "right upper arm", "left thigh", "right thigh")>>
+ <<set _scarArray.push("left wrist", "right wrist", "left upper arm", "right upper arm", "left thigh", "right thigh", "left ankle", "right ankle")>>
<</if>>
<<for _i to 0; _i < _scarArray.length; _i++>>
- <<set $activeSlave.scar[_scarArray[_i]] = 2>>
+ <<set $activeSlave.scar[_scarArray[_i]] = 1>>
<</for>>
<<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>> /* Let's just bill once, for the whip and disinfectant. */
<<set $activeSlave.devotion -= 5>>
<<set $activeSlave.trust -= 10>>
<<set $activeSlave.health -= 10>>
<<replace "#introResult">>
- <<if $activeSlave.amp = 0>>
You drag $him to the
<<if $cellblock>>
$cellblockName
<<else>>
body modification studio
<</if>>
- and chain $him
+ and
<<if $activeSlave.amp != 1>>
- spread-eagled
+ chain $him spread-eagled
+ <<else>>
+ secure $him
<</if>>
- with $his face to the wall and $his naked back clear and defenseless. $He doesn't understand what's coming for a while, even as disinfectant is applied from $his neck
+ with $his face to the wall and $his naked back defenseless. $He doesn't understand what's coming for a while, even as disinfectant is applied from $his neck
<<if $activeSlave.amp != 1>>
to $his knees.
<<else>>
@@ -1261,11 +1262,11 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<if canHear($activeSlave)>>
but almost jumps out of $his $activeSlave.skin skin when you crack it behind $him.
<<else>>
- and in $his deaf state every blow is a complete suprise.
+ and in $his deaf state every blow is a devastating suprise.
<</if>>
$He frantically
<<if $activeSlave.amp != 1>>
- wrenches $his hands and feet but is completely unable to get free.
+ wrenches $his hands and feet as you work up and down $his exposed back and limbs, but is completely unable to get free.
<<else>>
twists and turns, but without limbs is powerless to escape the curling whip.
<</if>>
@@ -1282,7 +1283,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
| <<link "Scar $him on the _scarTarget">>
<<replace "#introResult">>
- You drag $him to the body modification studio and strap $him down with $his _scarTarget clear and defenseless. $He doesn't understand what's coming for a while, even as disinfectant is applied to $his _scarTarget. You have a wide selection of tools to create scars, the trick is to keep the wound from healing correctly afterward. Of course, $he has no way of knowing that the pain you are inflicting as you cut into $his flesh will leave such a permanent mark, but if $he didn't know $he was a slave before, @@.mediumorchid;$he does now,@@ and $he's got the @@.gold;agonizing@@ @@.red;injury@@ to prove it.
+ You drag $him to the body modification studio and strap $him down with $his _scarTarget clear and defenseless. $He doesn't understand what's coming for a while, even as disinfectant is applied to $his _scarTarget. You have a wide selection of tools to create scars, the trick is to keep the wound from healing correctly afterward. Of course, $he has no way of knowing that the pain you are inflicting as you cut into $his flesh will leave such a permanent mark, but the basic message is clear: if $he didn't know $he was a slave before, @@.mediumorchid;$he does now,@@ and $he's got the @@.gold;agonizing@@ @@.red;injury@@ to prove it.
<<if ($arcologies[0].FSSubjugationistRace == $activeSlave.race) && ($arcologies[0].FSSubjugationist > 0)>>
Society @@.green;approves@@ of your purchase and scarring of an inferior $activeSlave.race person; this advances the idea that $activeSlave.race people ought to be enslaved.
<<= FutureSocieties.Change("Subjugationist", 2)>>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index 8aa6358ba97..d77dd93b17e 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -151,46 +151,42 @@ Or design your own: <<textbox "$brandDesign.official" $brandDesign.official "Uni
<br><br>
One 'welcome' for a new slave is to have them branded. Where would you like such brands to be applied?
-<br>Current site is ''$brandTarget.primary'':
-
-[[Ears|Universal Rules][$brandTarget.primary = "ear"]]
-| [[Cheeks|Universal Rules][$brandTarget.primary = "cheek"]]
-| [[Shoulders|Universal Rules][$brandTarget.primary = "shoulder"]]
-| [[Breasts|Universal Rules][$brandTarget.primary = "breast"]]
-| [[Arm, upper|Universal Rules][$brandTarget.primary = "upper arm"]]
-| [[Arm, lower|Universal Rules][$brandTarget.primary = "lower arm"]]
-| [[Wrist|Universal Rules][$brandTarget.primary = "wrist"]]
-| [[Hand|Universal Rules][$brandTarget.primary = "hand"]]
-| [[Buttocks|Universal Rules][$brandTarget.primary = "buttock"]]
-| [[Thigh|Universal Rules][$brandTarget.primary = "thigh"]]
-| [[Calf|Universal Rules][$brandTarget.primary = "calve"]]
-| [[Ankle|Universal Rules][$brandTarget.primary = "ankle"]]
-| [[Feet|Universal Rules][$brandTarget.primary = "foot"]]
-| [[Neck|Universal Rules][$brandTarget.primary = "neck"]]
-| [[Chest|Universal Rules][$brandTarget.primary = "chest"]]
-| [[Belly|Universal Rules][$brandTarget.primary = "belly"]]
-| [[Pubic Mound|Universal Rules][$brandTarget.primary = "pubic mound"]]
-| [[Penis|Universal Rules][$brandTarget.primary = "penis"]]
-| [[Testicles|Universal Rules][$brandTarget.primary = "testicle"]]
-| [[Back|Universal Rules][$brandTarget.primary = "back"]]
-| [[Lower Back|Universal Rules][$brandTarget.primary = "lower back"]]
-
-
<<if ["ankle", "breast", "buttock", "calf", "cheek", "ear", "foot", "hand", "lower arm", "shoulder", "testicle", "thigh", "upper arm", "wrist"].includes($brandTarget.primary)>>
<br> On the
- <<link "left">>
- <<set $brandDesign.primary = ("left " + $brandTarget.primary)>>
- <<goto "Universal Rules">>
- <</link>>
+ [[left|Universal Rules][$brandTarget.primary = ("left " + $brandTarget.primary)]]
$brandTarget.primary, or the
- <<link "right">>
- <<set $brandDesign.primary = ("right " + $brandTarget.primary)>>
- <<goto "Universal Rules">>
- <</link>>?
+ [[right|Universal Rules][$brandTarget.primary = ("right " + $brandTarget.primary)]]?
+<<else>>
+ <br> Current site is ''$brandTarget.primary'':
+ [[Ears|Universal Rules][$brandTarget.primary = "ear"]]
+ | [[Cheeks|Universal Rules][$brandTarget.primary = "cheek"]]
+ | [[Shoulders|Universal Rules][$brandTarget.primary = "shoulder"]]
+ | [[Breasts|Universal Rules][$brandTarget.primary = "breast"]]
+ | [[Arm, upper|Universal Rules][$brandTarget.primary = "upper arm"]]
+ | [[Arm, lower|Universal Rules][$brandTarget.primary = "lower arm"]]
+ | [[Wrist|Universal Rules][$brandTarget.primary = "wrist"]]
+ | [[Hand|Universal Rules][$brandTarget.primary = "hand"]]
+ | [[Buttocks|Universal Rules][$brandTarget.primary = "buttock"]]
+ | [[Thigh|Universal Rules][$brandTarget.primary = "thigh"]]
+ | [[Calf|Universal Rules][$brandTarget.primary = "calve"]]
+ | [[Ankle|Universal Rules][$brandTarget.primary = "ankle"]]
+ | [[Feet|Universal Rules][$brandTarget.primary = "foot"]]
+ | [[Neck|Universal Rules][$brandTarget.primary = "neck"]]
+ | [[Chest|Universal Rules][$brandTarget.primary = "chest"]]
+ | [[Belly|Universal Rules][$brandTarget.primary = "belly"]]
+ | [[Pubic Mound|Universal Rules][$brandTarget.primary = "pubic mound"]]
+ | [[Penis|Universal Rules][$brandTarget.primary = "penis"]]
+ | [[Testicles|Universal Rules][$brandTarget.primary = "testicle"]]
+ | [[Back|Universal Rules][$brandTarget.primary = "back"]]
+ | [[Lower Back|Universal Rules][$brandTarget.primary = "lower back"]]
<</if>>
-<br>
-<<if [
+<<if ["ankle", "breast", "buttock", "calf", "cheek", "ear", "foot", "hand", "lower arm", "shoulder", "testicle", "thigh", "upper arm", "wrist"].includes($brandTarget.secondary)>>
+ <br> On the
+ [[left|Universal Rules][$brandTarget.secondary = ("left " + $brandTarget.secondary)]]
+ $brandTarget.secondary, or the
+ [[right|Universal Rules][$brandTarget.secondary = ("right " + $brandTarget.secondary)]]?
+<<elseif [
"left ankle", "right ankle",
"left calve", "right calve",
"left ear", "right ear",
@@ -203,7 +199,7 @@ One 'welcome' for a new slave is to have them branded. Where would you like suc
"left upper arm", "right upper arm",
"left wrist", "right wrist"
].includes($brandTarget.primary)>>
- It's possible that ''$brandTarget.primary'' may be missing from a slave. Choose a fallback in case it is not available: Current backup is ''$brandTarget.secondary'':
+ <br> It's possible that ''$brandTarget.primary'' may be missing from a slave. Choose a fallback in case it is not available: Current backup is ''$brandTarget.secondary'':
/* Material copied from bodyModification, but please leave commented out any sections that may not be on ALL slaves. */
/*<<if $activeSlave.earShape != "none">>[[Ears|Universal Rules][$brandTarget.secondary = "ear"]]<</if>>*/
@@ -235,22 +231,10 @@ One 'welcome' for a new slave is to have them branded. Where would you like suc
<</if>>*/
| [[Back|Universal Rules][$brandTarget.secondary = "back"]]
| [[Lower Back|Universal Rules][$brandTarget.secondary = "lower back"]]
- <br>
-
- <<if ["ankle", "breast", "buttock", "calf", "cheek", "ear", "foot", "hand", "lower arm", "shoulder", "testicle", "thigh", "upper arm", "wrist"].includes($brandTarget.primary)>>
- <br> On the
- <<link "left">>
- <<set $brandDesign.secondary = ("left " + $brandTarget.secondary)>>
- <<goto "Universal Rules">>
- <</link>>
- $brandTarget.secondary, or the
- <<link "right">>
- <<set $brandDesign.secondary = ("right " + $brandTarget.secondary)>>
- <<goto "Universal Rules">>
- <</link>>?
- <</if>>
<</if>>
+<br>
+
Use ''$brandDesign.primary'' or choose another brand:
[[Your slaving emblem|Universal Rules][$brandDesign.primary = "your personal symbol"]]
| [[Your initials|Universal Rules][$brandDesign.primary = "your initials"]]
--
GitLab