From 04396783955e17cf7b1f6e336fed58ece7fa7e4f Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Fri, 12 Jul 2019 23:58:20 -0400
Subject: [PATCH] bg and old scar healing
---
src/pregmod/widgets/bodyswapWidgets.tw | 2 +-
src/uncategorized/longSlaveDescription.tw | 21 ++++++++++++-------
src/uncategorized/remoteSurgery.tw | 12 +++++------
src/uncategorized/saLongTermEffects.tw | 23 ++++++++++++++-------
src/uncategorized/slaveAssignmentsReport.tw | 5 -----
5 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index 3b3d3fc4643..0e961f7c507 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -207,7 +207,7 @@
<<set $args[0].bellyPain = $args[1].bellyPain>>
<<set $args[0].scar["belly"] = $args[1].scar["belly"]>>
<<set $args[0].cervixImplant = $args[1].cervixImplant>>
- <<set $args[0].scars = $args[1].scars>>
+ <<set $args[0].scar = $args[1].scar>>
<<set $args[0].pregControl = $args[1].pregControl>>
<</if>>
/*
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 6b075408cf5..d442f471bd4 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -2018,14 +2018,19 @@ $He is
<</if>>
<</if>>
*/
-
-<<if ($activeSlave.ID == $Bodyguard.ID) && ($activeSlave.scars > 1) && ($activeSlave.scars < 6)>>
- $His scars make $him look even more menacing than $he actually is.
-<<elseif ($activeSlave.ID == $Bodyguard.ID) && ($activeSlave.scars == 6)>>
- $His menacing scar makes $him look terrifying.
-<<elseif ($activeSlave.ID == $Wardeness.ID) && ($activeSlave.scars > 1)>>
- $His scars make $him look like $he's in the right place.
-<</if>>
+<<set _scarCounter = 0>>
+<<for _scarName, _scar range $activeSlave.scar>>
+ <<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>>
+ $His menacing scar makes $him look terrifying.
+ <<break>>
+ <<elseif ($activeSlave.ID == $Wardeness.ID) && _scarCounter > 1>>
+ $His scars make $him look like $he's in the right place.
+ <</if>>
+ <<set _scarCounter++>>
+<</for>>
<<if $activeSlave.fuckdoll == 0>>
<<if $activeSlave.markings == "birthmark" && $activeSlave.prestige == 0 && $activeSlave.pornPrestige < 2>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 87374597766..2751b88935a 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -489,14 +489,14 @@ $He has
<</if>>
-<<if $activeSlave.scars > 0>>
+<<if $activeSlave.scar["left cheek"]>>
<br>
- $He has notable facial scarring.
- [[Remove scars|Surgery Degradation][$activeSlave.scars = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "scarRemov"]]
-<<elseif $activeSlave.scars == 0>>
+ $He has <<= App.Desc.describeScarInt($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.scars = 5, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "scarFear"]] |
- [[Give an exotic scar|Surgery Degradation][$activeSlave.scars = 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"] = 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"]]
<</if>>
<br><br>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 774b7182e2a..a4b5680a832 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -5617,14 +5617,19 @@
<</if>>
/* pregmod */
- <<if ($slaves[$i].scars != 0) && ($slaves[$i].scars != 6)>>
- <<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)>>
- <<elseif $arcologies[0].FSPaternalist != "unset">>
- Society @@.red;mildly disapproves@@ of your scarred slaves, viewing them as a sign of mistreatment.
- <<= FutureSocieties.ChangePorn("Paternalist", -1)>>
- <</if>>
+ <<if !(jQuery.isEmptyObject($slaves[$i].scar))>>
+ <<for _scarName, _scar range $slaves[$i].scar>>
+ <<if $slaves[$i].scar[_scar] != 6>>
+ <<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)>>
+ <<elseif $arcologies[0].FSPaternalist != "unset">>
+ Society @@.red;mildly disapproves@@ of your scarred slaves, viewing them as a sign of mistreatment.
+ <<= FutureSocieties.ChangePorn("Paternalist", -1)>>
+ <</if>>
+ <<break>>
+ <</if>>
+ <</for>>
<</if>>
<<if $arcologies[0].FSBodyPurist != "unset">>
@@ -8164,10 +8169,12 @@
<</if>>
/* pregmod */
+/*
<<if ($slaves[$i].scarheal == 5)>>
$slaves[$i].slaveName's wound has @@.green;healed@@ leaving a big scar. It is still @@.red;quite ugly@@ but doesn't hurt anymore.
<<set $slaves[$i].scars -= 1>>
<</if>>
+*/
/* LANGUAGE */
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index d239cfa9be3..bcd580715d8 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -613,11 +613,6 @@ $NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSuppl
<</if>>
<</if>>
-/*
-<<if ($slaves[$i].scars == 3)>>
- <<set $slaves[$i].scarheal += 1>>
-<</if>>
-*/
<<if $slaves[$i].fetish == "mindbroken" && $slaves[$i].relationship == -3>>
<<if (def $slaves[$i].kindness) && $slaves[$i].kindness > 0>>
<<set $slaves[$i].kindness-->>
--
GitLab