diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt index e11604861cb165dd728803d717fff3539eccc8f7..0a08be6d6fb11aeef9f7b7d02adc44b07a08caae 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 6575f7c1263d48d619010693e9a12e99302c4250..8a1301d645b61117b2b9a21db05f4e2e8c59b5d0 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 33ea38b7fe807f8a4f5659e725d75eabc3fe12ce..5e1a36d641df6e67a9faaf03198d575a323c018a 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 f931c98e452ebfd822f9cf6fc349eef7ecf7ea61..fcce7deb225028ce039c0feb95284a163b18c4e6 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 adb2e75377ffc9d091568c65128b0b3a853f3a99..f3327e64679041eeb30dc5d1d33551fb76295a1b 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 a88791f3fc2eaafa19d54535575d4d32eaf14162..73362991623c4e109f0e76d90d60fb8641dd8560 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 4af0368fe596abb3c93d84c1e514c249ed71d21f..0122325deabe99bbdf5d9176c62bfeecf64b21a1 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 655201cae4d04b8d2d0c23ec1ff15bc2bf32e419..307b9cab5a80a743b150205d7a0ae0f4e478efae 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 65c06919ed51bcf7b3a63c7ccc19cf680f338941..091b42cf987d404e189b348dcc01326ea0ac2295 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 92687c30e64f9079b876b68ecc09422aa3a8f55a..e207d6d2313fcab84d568018a6fe97faa4c3160f 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 6f2b22a9e8eaacaaed2fb929215c45085a36c2ef..f2790d6956f78c137975c642a147babfb89896b1 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 3ff35c6e455a6140026344bd8fe14d29374bbc17..8b45ec0e7ec1d0455317f20f115778919ef33ab8 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>>