From a27824f463d93665d9b62a488bde1b0e2068017b Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Wed, 10 Jul 2019 22:19:26 -0400
Subject: [PATCH] cSec
---
slave variables documentation - Pregmod.txt | 6 ------
src/js/SlaveState.js | 9 ++-------
src/js/rulesAutosurgery.js | 4 ++--
src/js/slaveCostJS.js | 2 +-
src/npc/uploadSlave.tw | 1 -
src/pregmod/csec.tw | 2 +-
src/pregmod/widgets/bodyswapWidgets.tw | 2 +-
src/uncategorized/pRivalryHostage.tw | 2 +-
src/uncategorized/reRelativeRecruiter.tw | 2 +-
src/uncategorized/remoteSurgery.tw | 4 ++--
src/utility/birthWidgets.tw | 10 +++++-----
src/utility/descriptionWidgetsFlesh.tw | 6 +++---
12 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index e11604861cb..0a08be6d6fb 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -2108,12 +2108,6 @@ variable used to set off the birth events
1 - birth this week
0 - not time yet
-cSec:
-
-does she have a c-section scar
-1 - yes
-0 - no
-
bellyAccessory:
may accept strings, use at own risk
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 6575f7c1263..8a1301d645b 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -1111,10 +1111,6 @@ App.Entity.SlaveState = class SlaveState {
*
* 1: birth this week; 0: not time yet */
this.labor = 0;
- /** does she have a c-section scar
- *
- * 1: yes; 0: no */
- this.cSec = 0;
/**
* may accept strings, use at own risk
*
@@ -2186,7 +2182,6 @@ App.Entity.SlaveState = class SlaveState {
* 0: no; 1: yes */
this.pubertyXY = 0;
/**
- * not fully implemented.
* * 0: no scars
* * 1: light scarring
* * 2: heavy scarring
@@ -2194,8 +2189,8 @@ App.Entity.SlaveState = class SlaveState {
* * 4: burns
* * 5: menacing scar
* * 6: exotic scar
- */
- this.scars = 0;
+ * * @type {object} */
+ this.scar = {};
/**
* In a eugenics society, this slave is a designated breeder.
*
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index 33ea38b7fe8..5e1a36d641d 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -359,8 +359,8 @@ window.rulesAutosurgery = (function() {
slave.skill.oral -= 10;
}
});
- } else if (slave.cSec === 1 && thisSurgery.cosmetic > 0) {
- commitProcedure("surgery to remove a c-section scar", s => { s.cSec = 0; });
+ } else if (slave.scar["belly"] === 1 && thisSurgery.cosmetic > 0) {
+ commitProcedure("surgery to remove a c-section scar", s => { s.scar["belly"] = 0; });
} else if (slave.faceImplant <= 45 && slave.face <= 95 && thisSurgery.cosmetic === 2) {
commitProcedure("a nicer face", slave => {
if (slave.faceShape === "masculine") { slave.faceShape = "androgynous"; }
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index f931c98e452..fcce7deb225 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -200,7 +200,7 @@ window.Beauty = (function() {
if (slave.minorInjury !== 0) {
beauty -= 2;
}
- if (slave.cSec === 1) {
+ if (slave.scar["belly"] === 1) {
beauty -= 2;
}
if (slave.nails > 0) {
diff --git a/src/npc/uploadSlave.tw b/src/npc/uploadSlave.tw
index adb2e75377f..f3327e64679 100644
--- a/src/npc/uploadSlave.tw
+++ b/src/npc/uploadSlave.tw
@@ -116,7 +116,6 @@ broodmotherOnHold: $activeSlave.broodmotherOnHold,
broodmotherCountDown: $activeSlave.broodmotherCountDown,
labor: $activeSlave.labor,
births: $activeSlave.counter.births,
-cSec: $activeSlave.cSec,
armAccessory: "none",
legAccessory: "none",
bellyAccessory: "none",
diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw
index a88791f3fc2..73362991623 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.cSec = 1>>
+<<set $activeSlave.scar["belly"] = 1>>
<<run SetBellySize($activeSlave)>>
<<set $reservedChildren = FetusGlobalReserveCount("incubator")>>
<<set $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index 4af0368fe59..0122325deab 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -205,7 +205,7 @@
<<set $args[0].bellySag = $args[1].bellySag>>
<<set $args[0].bellySagPreg = $args[1].bellySagPreg>>
<<set $args[0].bellyPain = $args[1].bellyPain>>
- <<set $args[0].csec = $args[1].csec>>
+ <<set $args[0].scar["belly"] = $args[1].csec>>
<<set $args[0].cervixImplant = $args[1].cervixImplant>>
<<set $args[0].scars = $args[1].scars>>
<<set $args[0].pregControl = $args[1].pregControl>>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index 655201cae4d..307b9cab5a8 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.cSec = 1>>
+ <<set $activeSlave.scar["belly"] = 1>>
<<case "servant">>
<<set $activeSlave.career = "a maid">>
<<if $pedo_mode == 1>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 65c06919ed5..091b42cf987 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -109,7 +109,7 @@
<<set $activeSlave.lipsPiercing = 0>>
<<set $activeSlave.tonguePiercing = 0>>
<<set $activeSlave.vaginaPiercing = 0>>
- <<set $activeSlave.cSec = 0>>
+ <<set $activeSlave.scar["belly"] = 0>>
<<set $activeSlave.clitPiercing = 0>>
<<set $activeSlave.dick = 0>>
<<set $activeSlave.anus = 0>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 92687c30e64..e207d6d2313 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -839,10 +839,10 @@ $He's
<</if>>
<</if>>
-<<if ($activeSlave.cSec == 1)>>
+<<if ($activeSlave.scar["belly"] == 1)>>
<br>
$He has an unsightly c-section scar.
- [[Remove Caesarean scar|Surgery Degradation][$activeSlave.cSec = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "bellyscar"]]
+ [[Remove Caesarean scar|Surgery Degradation][$activeSlave.scar["belly"] = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "bellyscar"]]
<</if>>
<br><br>
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index 6f2b22a9e8e..f2790d6956f 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].cSec = 1>>
+ <<set $csec = 1, $slaves[$i].scar["belly"] = 1>>
<<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].cSec = 1>>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"] = 1>>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].cSec = 1>>
+ <<set $csec = 1, $slaves[$i].scar["belly"] = 1>>
$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].cSec = 1>>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"] = 1>>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].cSec = 1>>
+ <<set $csec = 1, $slaves[$i].scar["belly"] = 1>>
$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>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 3ff35c6e455..8b45ec0e7ec 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -15433,7 +15433,7 @@ $He has
It has a short length of chain dangling from it.
<</if>>
<</if>>
- <<if $activeSlave.cSec == 1>>
+ <<if $activeSlave.scar["belly"] == 1>>
$He has an unsightly c-section scar under $his navel.
<</if>>
<<if $activeSlave.bellyTat != 0>>
@@ -18416,7 +18416,7 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
<</if>>
<</if>>
- <<if $activeSlave.cSec == 1>>
+ <<if $activeSlave.scar["belly"] == 1>>
$He has an unsightly c-section scar under $his navel.
<</if>>
@@ -19519,7 +19519,7 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
<</if>>
<</if>>
-<<if $activeSlave.cSec == 1>>
+<<if $activeSlave.scar["belly"] == 1>>
$He has an unsightly c-section scar under $his navel.
<</if>>
--
GitLab