From 1455f2cf5923c7ec85d87588626ce2edafab61b8 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Thu, 18 Jul 2019 21:20:16 -0400
Subject: [PATCH] remove ints entirely from scars
---
slave variables documentation - Pregmod.txt | 10 +--
src/init/storyInit.tw | 2 +-
src/js/SlaveState.js | 11 +--
src/js/datatypeCleanupJS.js | 2 +-
src/js/descriptionWidgets.js | 54 ++++++------
src/js/rulesAutosurgery.js | 2 +-
src/js/slaveCostJS.js | 2 +-
src/npc/databases/dSlavesDatabase.tw | 2 +-
src/pregmod/csec.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 2 +-
src/uncategorized/bodyModification.tw | 91 +++++----------------
src/uncategorized/longSlaveDescription.tw | 2 +-
src/uncategorized/newSlaveIntro.tw | 13 ++-
src/uncategorized/pRivalryHostage.tw | 2 +-
src/uncategorized/remoteSurgery.tw | 8 +-
src/uncategorized/saLongTermEffects.tw | 2 +-
src/uncategorized/universalRules.tw | 40 ++-------
src/utility/birthWidgets.tw | 10 +--
18 files changed, 95 insertions(+), 162 deletions(-)
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 11c9c225747..23b8bd603f3 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -3528,15 +3528,7 @@ Has the slave gone through male puberty.
scar:
is an object
-keys include any place on a slave body that can receive a scar, values are a string for the scar. Values can be int or string.
-
-1 - light scarring
-2 - heavy scarring
-3 - fresh scarring
-4 - burns
-5 - menacing scar
-6 - exotic scar
-7 - surgical scar
+keys include any place on a slave body that can receive a scar, values are a string for the scar.
breedingMark:
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index d8ea86c8b8c..b853461fdda 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1025,7 +1025,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $brandDesign = {primary: "your initials", local: "your initials"}>>
<<set $scarTarget = {primary: "left cheek", secondary: "left cheek", local: "left cheek"}>>
-<<set $scarDesign = {primary: 1, local: 1}>>
+<<set $scarDesign = {primary: "scarring", local: "scarring"}>>
<<set $oralTotal = 0>>
<<set $vaginalTotal = 0>>
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 8a1301d645b..5976c7e5044 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -2182,14 +2182,9 @@ App.Entity.SlaveState = class SlaveState {
* 0: no; 1: yes */
this.pubertyXY = 0;
/**
- * * 0: no scars
- * * 1: light scarring
- * * 2: heavy scarring
- * * 3: fresh scarring
- * * 4: burns
- * * 5: menacing scar
- * * 6: exotic scar
- * * @type {object} */
+ * scar
+ *
+ * @type {Object.<string, string>} */
this.scar = {};
/**
* In a eugenics society, this slave is a designated breeder.
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index c8abe96effe..84e80863e92 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -276,7 +276,7 @@ App.Entity.Utils.SlaveDataSchemeCleanup = (function() {
}
if (slave.hasOwnProperty("cSec")) { // if it's not 0
if (slave.cSec) { // not 0
- slave.scar["belly"] = 7;
+ slave.scar["belly"] = "c-section";
}
delete slave.cSec; // delete even if 0
}
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index a1569e3a636..f279bb023c1 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -740,7 +740,7 @@ App.Desc.scar = function(slave, surface) {
counter++;
surface = App.Desc.oppositeSides(bodyPart);
if (slave.scar[surface.center]) { // center defined, body part has no mirror.
- r += `${App.Desc.describeScarInt(slave, surface.center)} on ${his} ${surface.center}`;
+ r += `${App.Desc.expandScarString(slave, surface.center)} on ${his} ${surface.center}`;
} else { // Center not defined, body part has a mirror.
if (!slave.scar[surface.left] && !slave.scar[surface.right]) {
// no marks
@@ -749,16 +749,16 @@ App.Desc.scar = function(slave, surface) {
} else if (slave.scar[surface.left] === slave.scar[surface.right]) {
// matching places and marks
// note that the slave.scar object won't have slave.scar["upper armS"] with an S defined, just the left and right, so we just use the left since we know they match.
- r += `${App.Desc.describeScarInt(slave, surface.left)} on both ${his} ${surface.both}`;
+ r += `${App.Desc.expandScarString(slave, surface.left)} on both ${his} ${surface.both}`;
} else if (slave.scar[surface.left] && slave.scar[surface.right]) {
// matching places but different marks
- r += `both ${App.Desc.describeScarInt(slave, surface.left)} on ${his} ${surface.left}, and ${App.Desc.describeScarInt(slave, surface.right)} scared into ${his} ${surface.right}`;
+ r += `both ${App.Desc.expandScarString(slave, surface.left)} on ${his} ${surface.left}, and ${App.Desc.expandScarString(slave, surface.right)} scared into ${his} ${surface.right}`;
} else if (slave.scar[surface.left]) {
// left
- r += `${App.Desc.describeScarInt(slave, surface.left)} on ${his} ${surface.left}`;
+ r += `${App.Desc.expandScarString(slave, surface.left)} on ${his} ${surface.left}`;
} else if (slave.scar[surface.right]) {
// right
- r += `${App.Desc.describeScarInt(slave, surface.right)} on ${his} ${surface.right}`;
+ r += `${App.Desc.expandScarString(slave, surface.right)} on ${his} ${surface.right}`;
}
}
if (counter === length) {
@@ -775,23 +775,23 @@ App.Desc.scar = function(slave, surface) {
} else {
surface = App.Desc.oppositeSides(surface);
if (slave.scar[surface.center]) { // center defined, body part has no mirror.
- r += `${He} has ${App.Desc.describeScarInt(slave, surface.center)} on ${his} ${surface.center}. `;
+ r += `${He} has ${App.Desc.expandScarString(slave, surface.center)} on ${his} ${surface.center}. `;
} else { // Center not defined, body part has a mirror.
if (!slave.scar[surface.left] && !slave.scar[surface.right]) {
// no marks
} else if (slave.scar[surface.left] === slave.scar[surface.right]) {
// matching places and marks
// note that the slave.scar object won't have slave.scar["upper armS"] with an S defined, just the left and right, so we just use the left since we know they match.
- r += `${He} has ${App.Desc.describeScarInt(slave, surface.left)} on both ${his} ${surface.both}. `;
+ r += `${He} has ${App.Desc.expandScarString(slave, surface.left)} on both ${his} ${surface.both}. `;
} else if (slave.scar[surface.left] && slave.scar[surface.right]) {
// matching places but different marks
- r += `${He} has both ${App.Desc.describeScarInt(slave, surface.left)} on ${his} ${surface.left}, and ${App.Desc.describeScarInt(slave, surface.right)} scared into ${his} ${surface.right}. `;
+ r += `${He} has both ${App.Desc.expandScarString(slave, surface.left)} on ${his} ${surface.left}, and ${App.Desc.expandScarString(slave, surface.right)} scared into ${his} ${surface.right}. `;
} else if (slave.scar[surface.left]) {
// left
- r += `${He} has ${App.Desc.describeScarInt(slave, surface.left)} on ${his} ${surface.left}. `;
- } else if (App.Desc.describeScarInt(slave, surface.right)) {
+ r += `${He} has ${App.Desc.expandScarString(slave, surface.left)} on ${his} ${surface.left}. `;
+ } else if (App.Desc.expandScarString(slave, surface.right)) {
// right
- r += `${He} has ${App.Desc.describeScarInt(slave, surface.right)} on ${his} ${surface.right}. `;
+ r += `${He} has ${App.Desc.expandScarString(slave, surface.right)} on ${his} ${surface.right}. `;
}
}
}
@@ -820,17 +820,17 @@ App.Desc.scar = function(slave, surface) {
* @param {App.Entity.SlaveState} slave
* @returns {string} Slave's scar. Slave is the slave in question, but call the body part without modifiers. Rather than using "left breast" and "right breast" just use "breast". The function will then describe any scars on the breasts, if present, in natural language.
*/
-App.Desc.describeScarInt = function(slave, surface) { // scars can sometimes be an int. This function generates a reasonable description. It can later be expanded to apply to different body parts, or include features of the slave such as skin tone or weight
+App.Desc.expandScarString = function(slave, surface) { // scars can sometimes be an int. This function generates a reasonable description. It can later be expanded to apply to different body parts, or include features of the slave such as skin tone or weight
switch (slave.scar[surface]) {
- case 1:
+ case "scarring":
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";
+ return "scarring";
}
- case 2:
+ case "heavy scarring":
if (["left wrist", "right wrist", "left ankle", "right ankle"].includes(surface)) {
return "scars from heavy manacles";
} else if (["back"].includes(surface)) {
@@ -838,26 +838,32 @@ App.Desc.describeScarInt = function(slave, surface) { // scars can sometimes be
} else {
return "heavy scarring";
}
- case 3:
- return "fresh scarring";
- case 4:
+ /*case 3:
+ return "fresh scarring";*/
+ case "burns":
return "burns";
- case 5:
+ /*case 5:
return "a menacing scar";
case 6:
- return "an exotic scar";
- case 7:
- if (surface === "belly") {
- return "an unsightly c-section scar";
- } else if (surface === "left breast" || surface === "right breast" ) {
+ return "an exotic scar";*/
+ case "surgical":
+ if (surface === "left breast" || surface === "right breast" ) {
if (slave.boobsImplant > 0) {
return "scars from sloppily inserted implants";
} else {
return "scars as though from sloppy surgery to remove implants";
}
+ } else if (surface === "left buttock" || surface === "right buttock" ) {
+ if (slave.buttImplant > 0) {
+ return "scars from sloppily inserted implants";
+ } else {
+ return "scars as though from sloppy surgery to remove implants";
+ }
} else {
return "a surgical scar";
}
+ case "c-section":
+ return "an unsightly c-section scar";
default:
return slave.scar[surface];
}
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index e9934f6f8fe..5c2d38e1bb8 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -359,7 +359,7 @@ window.rulesAutosurgery = (function() {
slave.skill.oral -= 10;
}
});
- } else if (slave.scar["belly"] === 7 && thisSurgery.cosmetic > 0) {
+ } else if (slave.scar["belly"] === "c-section" && thisSurgery.cosmetic > 0) {
commitProcedure("surgery to remove a c-section scar", s => { delete s.scar["belly"]; });
} else if (slave.faceImplant <= 45 && slave.face <= 95 && thisSurgery.cosmetic === 2) {
commitProcedure("a nicer face", slave => {
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 98ea408fb77..f594e315a62 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -203,7 +203,7 @@ window.Beauty = (function() {
if (slave.scar !== {}) {
const scars = Object.keys(slave.scar);
for (const scar of scars) {
- if (scar === 7) {
+ if (scar.includes("surgical")) {
beauty -= 2;
}
}
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index 313ccc57506..07674349141 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -561,7 +561,7 @@
/*Tweaked smart piercing setting, corrected piercings -BoneyM*/
<<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Fleshlight", _HS.birthName = "Fleshlight", _HS.origin = "Nothing remains of the person $he originally was, either mentally or physically.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 20, _HS.devotion = 60, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 800, _HS.boobsImplant = 600, _HS.butt = 5, _HS.buttImplant = 2, _HS.lips = 55, _HS.lipsImplant = 2, _HS.lipsTat = "permanent makeup", _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.makeup = 3, _HS.nails = 3, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "mindbroken", _HS.fetishKnown = 1, _HS.custom.desc = "$He has many surgical scars and something seems off about $him.", _HS.scar["left breast"] = 7, _HS.scar["right breast"] = 7, _HS.scar["left buttock"] = 7, _HS.scar["right buttock"] = 7>>
+<<set _HS.slaveName = "Fleshlight", _HS.birthName = "Fleshlight", _HS.origin = "Nothing remains of the person $he originally was, either mentally or physically.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 20, _HS.devotion = 60, _HS.race = "white", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.override_Skin = 1, _HS.skin = "spray tanned", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 800, _HS.boobsImplant = 600, _HS.butt = 5, _HS.buttImplant = 2, _HS.lips = 55, _HS.lipsImplant = 2, _HS.lipsTat = "permanent makeup", _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.makeup = 3, _HS.nails = 3, _HS.skill.vaginal = 35, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "mindbroken", _HS.fetishKnown = 1, _HS.custom.desc = "$He has many surgical scars and something seems off about $him.", _HS.scar["left breast"] = "surgical", _HS.scar["right breast"] = "surgical", _HS.scar["left buttock"] = "surgical", _HS.scar["right buttock"] = "surgical">>
<<set $heroSlaves.push(_HS)>>
/*heels*/
/*Added origin, makeup and nails, changed eyes -BoneyM*/
diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw
index 89a078c3c5b..bedcd7a4b88 100644
--- a/src/pregmod/csec.tw
+++ b/src/pregmod/csec.tw
@@ -606,7 +606,7 @@ Since $his <<if $activeSlave.mpreg == 1>>ass<<else>>vagina<</if>> was spared fro
</span>
<</if>>
<</if>>
-<<set $activeSlave.scar["belly"] = 7>>
+<<set $activeSlave.scar["belly"] = "c-section">>
<<run SetBellySize($activeSlave)>>
<<set $reservedChildren = FetusGlobalReserveCount("incubator")>>
<<set $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 69e69c1208d..a6ff5d2aab5 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -58,7 +58,7 @@
<<set $scarTarget = {primary: "left cheek", secondary: "left cheek", local: "left cheek"}>>
<</if>>
<<if ndef $scarDesign>>
- <<set $scarDesign = {primary: 1, local: 1}>>
+ <<set $scarDesign = {primary: "scarring", local: "scarring"}>>
<</if>>
<<if def $servantMilkersJobs>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 2ba77040037..301070e4705 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -23,11 +23,11 @@
<<if $scarApplied>>
<<if $scarTarget.local === "entire body">>
<<switch $scarDesign.local>>
- <<case 1 2 3>> /* light heavy and fresh scarring */
+ <<case "scarring" "heavy scarring" "fresh scarring">> /* light heavy and fresh scarring */
The best way to apply scarring to the entire body is with a good old fashioned whip. $His body is a mess of crisscrossed lines.
- <<case 4>>
+ <<case "burns">>
Your goal wasn't to make the distinct shape of a brand, but rather to permanently mar the skin with an open flame.
- <<case 7>>
+ <<case "surgical">>
<<if $PC.medicine === 100>>
Your medical mastery is perfect, so creating Frankenstein's monster was a deliberate work of art.
<<elseif $PC.medicine > 0>>
@@ -41,11 +41,11 @@
<<set $activeSlave.health -= 20>>
<<else>>
<<switch $scarDesign.local>>
- <<case 1 2 3>> /* light heavy and fresh scarring */
+ <<case "scarring" "heavy scarring" "fresh scarring">> /* light heavy and fresh scarring */
You had no shortage of kinky and medical tools for applying scars. $His $activeSlave.skin $his $scarTarget.local is bleedy profusely.
- <<case 4>>
+ <<case "burns">>
Your goal wasn't to make the distinct shape of a brand, but rather to permanently mar the $activeSlave.skin skin of $his $scarTarget.local with an open flame.
- <<case 7>>
+ <<case "surgical">>
<<if $PC.medicine === 100>>
Your medical mastery is perfect, so creating such a scar was a deliberate act of degredation.
<<elseif $PC.medicine > 0>>
@@ -1150,34 +1150,10 @@ Or a custom site: <<textbox "$brandTarget.local" $brandTarget.local "Body Modifi
/* Scars */
-<<switch $scarDesign.local>>
- <<case 1>>
- <<set _printScar = "light scarring">>
- <<case 2>>
- <<set _printScar = "heavy scarring">>
- <<case 3>>
- <<set _printScar = "fresh scarring">>
- <<case 4>>
- <<set _printScar = "burns">>
- <<case 5>>
- <<set _printScar = "a menacing scar">>
- <<case 6>>
- <<set _printScar = "an exotic scar">>
- <<case 7>>
- <<if _scarName === "belly">>
- <<set _printScar = "an unsightly c-section scar">>
- <<else>>
- <<set _printScar = "a surgical scar">>
- <</if>>
- <<default>>
- <<set _printScar = $scarDesign.local>>
-<</switch>>
-
-
Scars:
<<for _scarName, _scar range $activeSlave.scar>>
<br>
- $His _scarName is marked with <<= App.Desc.describeScarInt($activeSlave, _scarName)>>:
+ $His _scarName is marked with <<= App.Desc.expandScarString($activeSlave, _scarName)>>:
<<capture _scarName>>
<<link "Remove Scar">>
<<set $scarApplied = 0>>
@@ -1194,14 +1170,14 @@ Scars:
<</if>>
<br>
-Use ''_printScar'' or choose another scar:
+Use ''$scarDesign.local'' or choose another scar:
-[[Light scarring|Body Modification][$scarDesign.local = 1]]
-| [[Heavy scarring|Body Modification][$scarDesign.local = 2]]
-| [[Fresh scarring|Body Modification][$scarDesign.local = 3]]
-| [[Burns|Body Modification][$scarDesign.local = 4]]
+[[Scarring|Body Modification][$scarDesign.local = "scarring"]]
+| [[Heavy scarring|Body Modification][$scarDesign.local = "heavy scarring"]]
+| [[Fresh scarring|Body Modification][$scarDesign.local = "fresh scarring"]]
+| [[Burns|Body Modification][$scarDesign.local = "burns"]]
| <<link "A menacing scar">>
- <<set $scarDesign.local = 5>>
+ <<set $scarDesign.local = "a menacing scar">>
<<if $scarTarget.local === "entire body">>
<<set $scarTarget.local = "left cheek">>
<</if>>
@@ -1209,13 +1185,13 @@ Use ''_printScar'' or choose another scar:
<</link>>
| <<link "An exotic scar">>
- <<set $scarDesign.local = 6>>
+ <<set $scarDesign.local = "an exotic scar">>
<<if $scarTarget.local === "entire body">>
<<set $scarTarget.local = "left cheek">>
<</if>>
<<goto "Body Modification">>
<</link>>
-| [[A surgical scar|Body Modification][$scarDesign.local = 7]]
+| [[A surgical scar|Body Modification][$scarDesign.local = "surgical"]]
<br>
@@ -1227,8 +1203,8 @@ Choose a site for scaring:
<<link "Entire body">>
<<set $scarTarget.local = "entire body">>
- <<if $scarDesign.local === 5 || $scarDesign.local === 6>>
- <<set $scarDesign.local = 1>>
+ <<if ["a menacing scar" "an exotic scar"].includes($scarDesign.local)>>
+ <<set $scarDesign.local = "scarring">>
<</if>>
<<goto "Body Modification">>
<</link>>
@@ -1282,12 +1258,12 @@ Or a custom site: <<textbox "$scarTarget.local" $scarTarget.local "Body Modifica
<<set _leftTarget = ("left " + $scarTarget.local)>>
<<set _rightTarget = ("right " + $scarTarget.local)>>
<<if $activeSlave.scar[_leftTarget]>>
- $His _leftTarget is already marked with <<= App.Desc.describeScarInt($activeSlave, _leftTarget)>>.
+ $His _leftTarget is already marked with <<= App.Desc.expandScarString($activeSlave, _leftTarget)>>.
<</if>>
<<if $activeSlave.scar[_rightTarget]>>
- $His _rightTarget is already marked with <<= App.Desc.describeScarInt($activeSlave, _rightTarget)>>.
+ $His _rightTarget is already marked with <<= App.Desc.expandScarString($activeSlave, _rightTarget)>>.
<</if>>
- Scar $him now with ''_printScar'' on the
+ Scar $him now with ''$scarDesign.local'' on the
<<link "left">>
<<set $scarApplied = 1>>
<<set $activeSlave.scar[_leftTarget] = $scarDesign.local>>
@@ -1305,7 +1281,7 @@ Or a custom site: <<textbox "$scarTarget.local" $scarTarget.local "Body Modifica
<</link>>? //scaring will slightly reduce $his beauty but may slowly increase your reputation.//
<<else>>
<<if $activeSlave.scar[$scarTarget.local] === $scarDesign.local>>
- $He already has _printScar on $his $scarTarget.local.
+ $He already has $scarDesign.local on $his $scarTarget.local.
<<else>>
<<link "Scar">>
<<if $scarTarget.local === "entire body">>
@@ -1324,29 +1300,6 @@ Or a custom site: <<textbox "$scarTarget.local" $scarTarget.local "Body Modifica
<<set $scarApplied = 1>>
<<goto "Body Modification">>
<</link>>
- with _printScar on the $scarTarget.local<<if $activeSlave.scar[$scarTarget.local]>>, covering the
- <<switch $activeSlave.scar[$scarTarget.local]>>
- <<case 1>>
- light scarring
- <<case 2>>
- heavy scarring
- <<case 3>>
- fresh scarring
- <<case 4>>
- burns
- <<case 5>>
- a menacing scar
- <<case 6>>
- an exotic scar
- <<case 7>>
- <<if $scarTarget.local === "belly">>
- cSection
- <<else>>
- surgical scar
- <</if>>
- <<default>>
- $activeSlave.scar[$scarTarget.local]
- <</switch>>
- that is already there?<<else>>.<</if>> //Scaring will slightly reduce $his beauty but may slowly increase your reputation.//
+ with $scarDesign.local on the $scarTarget.local<<if $activeSlave.scar[$scarTarget.local]>>, covering the $activeSlave.scar[$scarTarget.local] that is already there?<<else>>.<</if>> //Scaring will slightly reduce $his beauty but may slowly increase your reputation.//
<</if>>
<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index d442f471bd4..a08bb4f6448 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -2023,7 +2023,7 @@ $He is
<<if ($activeSlave.ID == $Bodyguard.ID) && _scarCounter > 1>>
$His scars make $him look even more menacing than $he actually is.
<<break>>
- <<elseif ($activeSlave.ID == $Bodyguard.ID) && $activeSlave.scar[_scarName] === 5>>
+ <<elseif ($activeSlave.ID == $Bodyguard.ID) && $activeSlave.scar[_scarName] === "a menacing scar">>
$His menacing scar makes $him look terrifying.
<<break>>
<<elseif ($activeSlave.ID == $Wardeness.ID) && _scarCounter > 1>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index f39c101eaf0..129174b719d 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1245,13 +1245,22 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Whip $him until $he scars">>
+ /* Whip marks */
<<set _scarArray = ["left breast", "right breast", "back", "lower back", "left buttock", "right buttock"]>>
<<if $activeSlave.amp != 1>>
- <<set _scarArray.push("left wrist", "right wrist", "left upper arm", "right upper arm", "left thigh", "right thigh", "left ankle", "right ankle")>>
+ <<set _scarArray.push("left upper arm", "right upper arm", "left thigh", "right thigh")>>
<</if>>
<<for _i to 0; _i < _scarArray.length; _i++>>
- <<set $activeSlave.scar[_scarArray[_i]] = 1>>
+ <<set $activeSlave.scar[_scarArray[_i]] = "scarring">>
<</for>>
+ /* Manacles */
+ <<if $activeSlave.amp != 1>>
+ <<set _scarArray = ["left wrist", "right wrist", "left ankle", "right ankle"]>>
+ <<for _i to 0; _i < _scarArray.length; _i++>>
+ <<set $activeSlave.scar[_scarArray[_i]] = "manacles">>
+ <</for>>
+ <</if>>
+
<<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>> /* Let's just bill once, for the whip and disinfectant. */
<<set $activeSlave.devotion -= 5>>
<<set $activeSlave.trust -= 10>>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index d54c751fcb1..718579af882 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -75,7 +75,7 @@
<<set $activeSlave.counter.vaginal = 158>>
<<set $activeSlave.counter.anal = 76>>
<<set $activeSlave.counter.mammary = 320>>
- <<set $activeSlave.scar["belly"] = 7>>
+ <<set $activeSlave.scar["belly"] = "c-section">>
<<case "servant">>
<<set $activeSlave.career = "a maid">>
<<if $pedo_mode == 1>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 2751b88935a..35b408616a2 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -491,12 +491,12 @@ $He has
<<if $activeSlave.scar["left cheek"]>>
<br>
- $He has <<= App.Desc.describeScarInt($activeSlave, "left cheek")>> on $his left cheek.
+ $He has <<= App.Desc.expandScarString($activeSlave, "left cheek")>> on $his left cheek.
[[Remove scars|Surgery Degradation][delete $activeSlave.scar["left cheek"], cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "scarRemov"]]
<<else>>
<br>
- $His face is unscarred. [[Give a menacing scar|Surgery Degradation][$activeSlave.scar["left cheek"] = 5, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "scarFear"]] |
- [[Give an exotic scar|Surgery Degradation][$activeSlave.scar["left cheek"] = 6, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "scarExo"]]
+ $His face is unscarred. [[Give a menacing scar|Surgery Degradation][$activeSlave.scar["left cheek"] = "a menacing scar", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "scarFear"]] |
+ [[Give an exotic scar|Surgery Degradation][$activeSlave.scar["left cheek"] = "an exotic scar", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "scarExo"]]
<</if>>
<br><br>
@@ -839,7 +839,7 @@ $He's
<</if>>
<</if>>
-<<if ($activeSlave.scar["belly"] == 7)>>
+<<if ($activeSlave.scar["belly"] == "c-section")>>
<br>
$He has an unsightly c-section scar.
<<link "Remove Caesarean scar">>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index a4b5680a832..a29b316ad73 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -5619,7 +5619,7 @@
/* pregmod */
<<if !(jQuery.isEmptyObject($slaves[$i].scar))>>
<<for _scarName, _scar range $slaves[$i].scar>>
- <<if $slaves[$i].scar[_scar] != 6>>
+ <<if $slaves[$i].scar[_scar] != "an exotic scar">>
<<if $arcologies[0].FSDegradationist != "unset">>
Society @@.green;mildly approves@@ of your slave's scarring; this encourages the further abuse of slaves.
<<= FutureSocieties.ChangePorn("Degradationist", 1)>>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index 4064e1749f0..d8c002e6210 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -317,29 +317,6 @@ Or design your own: <<textbox "$scarDesign.primary" $scarDesign.primary "Univers
''Scaring for slaves''
<br>
-<<switch $scarDesign.primary>>
- <<case 1>>
- <<set _printScar = "light scarring">>
- <<case 2>>
- <<set _printScar = "heavy scarring">>
- <<case 3>>
- <<set _printScar = "fresh scarring">>
- <<case 4>>
- <<set _printScar = "burns">>
- <<case 5>>
- <<set _printScar = "a menacing scar">>
- <<case 6>>
- <<set _printScar = "an exotic scar">>
- <<case 7>>
- <<if _scarName === "belly">>
- <<set _printScar = "an unsightly c-section scar">>
- <<else>>
- <<set _printScar = "a surgical scar">>
- <</if>>
- <<default>>
- <<set _printScar = $scarDesign.primary>>
-<</switch>>
-
One 'welcome' for a new slave is to have them scarred. Where would you like such scars to be applied?
<<if ["ankle", "breast", "buttock", "calf", "cheek", "ear", "foot", "hand", "lower arm", "shoulder", "testicle", "thigh", "upper arm", "wrist"].includes($scarTarget.primary)>>
<br> On the
@@ -425,14 +402,15 @@ One 'welcome' for a new slave is to have them scarred. Where would you like suc
<br>
-Use ''_printScar'' or choose another scar:
-[[Light scarring|Universal Rules][$scarDesign.primary = 1]]
-| [[Heavy scarring|Universal Rules][$scarDesign.primary = 2]]
-| [[Fresh scarring|Universal Rules][$scarDesign.primary = 3]]
-| [[Burns|Universal Rules][$scarDesign.primary = 4]]
-| [[A menacing scar|Universal Rules][$scarDesign.primary = 5]]
-| [[An exotic scar|Universal Rules][$scarDesign.primary = 6]]
-| [[A surgical scar|Universal Rules][$scarDesign.primary = 7]]
+Use ''$scarDesign.primary'' or choose another scar:
+[[Scarring|Universal Rules][$scarDesign.primary = "scarring"]]
+| [[Heavy scarring|Universal Rules][$scarDesign.primary = "heavy scarring"]]
+| [[Fresh scarring|Universal Rules][$scarDesign.primary = "fresh scarring"]]
+| [[Burns|Universal Rules][$scarDesign.primary = "burns"]]
+| [[A menacing scar|Universal Rules][$scarDesign.primary = "a menacing scar"]]
+| [[An exotic scar|Universal Rules][$scarDesign.primary = "an exotic scar"]]
+| [[A surgical scar|Universal Rules][$scarDesign.primary = "surgical"]]
+/* technically "c-section" is a common scar too, but I'm not listing it here because there are too many body parts. */
<br>
Or design your own: <<textbox "$scarDesign.primary" $scarDesign.primary "Universal Rules">> //For best results, use a single word//
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index f2efee69a82..e7e8134581f 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -4,7 +4,7 @@
<br>
<<if $birthDamage > 5 || $universalRulesCSec == 1>>
<<if $universalRulesCSec == 1 || ($slaves[$i].mpreg == 0 && $slaves[$i].vagina < 0)>>
- <<set $csec = 1, $slaves[$i].scar["belly"] = 7>>
+ <<set $csec = 1, $slaves[$i].scar["belly"] = "c-section">>
<<if $clinic != 0>>
$slaves[$i].slaveName is taken to $clinicName since $he
<<if ($slaves[$i].mpreg == 0 && $slaves[$i].vagina < 0)>>
@@ -24,9 +24,9 @@
<</if>>
<<else>>
<<if $clinic != 0>>
- $He is lead to $clinicName since $he is likely to face complications with childbirth. $He is helped from $his clothes and into a comfortable hospital bed to relax until $he is ready. $He makes $himself comfortable and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, fully aware of $his watching helpers. <<if $birthDamage > 10>><<set $csec = 1, $slaves[$i].scar["belly"] = 7>>After several hours of intense labor, $he is transferred to the surgery wing. Following an emergency c-section, $he is returned to the recovery wing to rest<<else>>After several hours, and a touch of morphine, $he has successfully given birth<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he is left under observation to make sure $he recovers.
+ $He is lead to $clinicName since $he is likely to face complications with childbirth. $He is helped from $his clothes and into a comfortable hospital bed to relax until $he is ready. $He makes $himself comfortable and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, fully aware of $his watching helpers. <<if $birthDamage > 10>><<set $csec = 1, $slaves[$i].scar["belly"] = "c-section">>After several hours of intense labor, $he is transferred to the surgery wing. Following an emergency c-section, $he is returned to the recovery wing to rest<<else>>After several hours, and a touch of morphine, $he has successfully given birth<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he is left under observation to make sure $he recovers.
<<else>>
- <<set $csec = 1, $slaves[$i].scar["belly"] = 7>>
+ <<set $csec = 1, $slaves[$i].scar["belly"] = "c-section">>
$He is lead to the autosurgery, since $he is likely to face complications with childbirth. $He is stripped from $his clothes and set up on the operating table. $He is quickly sedated and subjected to a c-section in order to avoid potential problems. The surgery is quick, and $he is moved to a bed to recover. When $he awakes, $his child<<if $slaves[$i].pregType > 1>>ren have<<else>> has<</if>> already been taken away.
<</if>>
<</if>>
@@ -409,9 +409,9 @@
<<if $birthDamage > 5>>
<<set $csec = 1>>
<<if $clinic != 0>>
- $He is carried to $clinicName, since $he is likely to face complications with childbirth. $He is stripped from $his clothes and set up in a comfortable hospital bed to relax until $he is ready. $He wiggles $himself into a comfortable spot and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, fully aware of $his watching helpers. <<if $birthDamage > 10>><<set $csec = 1, $slaves[$i].scar["belly"] = 7>>After several hours of intense labor, $he is transferred to the surgery wing. Following an emergency c-section, $he is returned to the recovery wing to rest<<else>>After several hours, and a touch of morphine, $he has successfully given birth<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he is left under observation to make sure $he recovers.
+ $He is carried to $clinicName, since $he is likely to face complications with childbirth. $He is stripped from $his clothes and set up in a comfortable hospital bed to relax until $he is ready. $He wiggles $himself into a comfortable spot and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, fully aware of $his watching helpers. <<if $birthDamage > 10>><<set $csec = 1, $slaves[$i].scar["belly"] = "c-section">>After several hours of intense labor, $he is transferred to the surgery wing. Following an emergency c-section, $he is returned to the recovery wing to rest<<else>>After several hours, and a touch of morphine, $he has successfully given birth<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he is left under observation to make sure $he recovers.
<<else>>
- <<set $csec = 1, $slaves[$i].scar["belly"] = 7>>
+ <<set $csec = 1, $slaves[$i].scar["belly"] = "c-section">>
$He is carried to the autosurgery, since $he is likely to face complications with childbirth. $He is stripped from $his clothes and set up on the operating table. $He is quickly sedated and subjected to a c-section in order to avoid potential problems. The surgery is quick and $he is moved to a bed to recover. When $he awakes, $his child<<if $slaves[$i].pregType > 1>>ren have<<else>> has<</if>> already been taking away.
<</if>>
--
GitLab