diff --git a/src/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw index 2707537b7db9173b7ef22595d06ef1d2ed3192dd..2f1c32b90880d134bf2a97e3d12af4ae404a1df7 100644 --- a/src/cheats/mod_EditChildCheatNew.tw +++ b/src/cheats/mod_EditChildCheatNew.tw @@ -1802,12 +1802,16 @@ <br> ''C-Section scar:'' - <<if $tempSlave.cSec == 0>> - @@.yellow;false@@ - <<checkbox "$tempSlave.cSec" 0 1>> - <<else>> + <<if $tempSlave.scar.hasOwnProperty("belly") && $tempSlave.scar.belly["c-section"] > 0>> @@.yellow;true@@ - <<checkbox "$tempSlave.cSec" 0 1 checked>> + <<link "Remove">> + <<run App.Medicine.Modification.removeScar($tempSlave, "belly", "c-section")>> + <</link>> + <<else>> + @@.yellow;false@@ + <<link "Add">> + <<run App.Medicine.Modification.addScar($tempSlave, "belly", "c-section")>> + <</link>> <</if>> <br> @@ -3462,4 +3466,4 @@ /*.visualAge .ageImplant .birthWeek .health .chem .addict .devotion .oldDevotion .trust .oldTrust .face .faceShape .faceImplant .markings .bald .hLength .hStyle .hColor .origHColor*/ /*.eyebrowHColor .pubicHColor .pubicHStyle .underArmHColor .underArmHStyle .eyeColor .origEye .eyes .hears .lips .lipsImplant .teeth .voiceImplant .voice .accent .genes .amp .fuckdoll .muscles .weight*/ /*.waist .height .heightImplant .shoulders .shouldersImplant .hips .hipsImplant .bellyImplant .bellySag .burst .boobs .boobsImplant .boobsImplantType .lactation .boobShape .nipples .areolae*/ -/*.butt .buttImplant .anus .mpreg .vagina .vaginaLube .clit .labia .pubertyXX .pubertyAgeXX .crevixImplant .csec .breedingMark .ovaries .preg .pregType .pregSource .dick .foreskin .balls*/ +/*.butt .buttImplant .anus .mpreg .vagina .vaginaLube .clit .labia .pubertyXX .pubertyAgeXX .crevixImplant .breedingMark .ovaries .preg .pregType .pregSource .dick .foreskin .balls*/ diff --git a/src/cheats/mod_EditInfantCheatNew.tw b/src/cheats/mod_EditInfantCheatNew.tw index 9c3bd5f2932eff5ff2098d7175040463234fe765..fe2cf6c010f5bb5dcd1a33411dc429c87936dec9 100644 --- a/src/cheats/mod_EditInfantCheatNew.tw +++ b/src/cheats/mod_EditInfantCheatNew.tw @@ -1804,12 +1804,16 @@ <br> ''C-Section scar:'' - <<if $tempSlave.cSec == 0>> - @@.yellow;false@@ - <<checkbox "$tempSlave.cSec" 0 1>> - <<else>> + <<if $tempSlave.scar.hasOwnProperty("belly") && $tempSlave.scar.belly["c-section"] > 0>> @@.yellow;true@@ - <<checkbox "$tempSlave.cSec" 0 1 checked>> + <<link "Remove">> + <<run App.Medicine.Modification.removeScar($tempSlave, "belly", "c-section")>> + <</link>> + <<else>> + @@.yellow;false@@ + <<link "Add">> + <<run App.Medicine.Modification.addScar($tempSlave, "belly", "c-section")>> + <</link>> <</if>> <br> @@ -3464,4 +3468,4 @@ /*.visualAge .ageImplant .birthWeek .health .chem .addict .devotion .oldDevotion .trust .oldTrust .face .faceShape .faceImplant .markings .bald .hLength .hStyle .hColor .origHColor*/ /*.eyebrowHColor .pubicHColor .pubicHStyle .underArmHColor .underArmHStyle .eyeColor .origEye .eyes .hears .lips .lipsImplant .teeth .voiceImplant .voice .accent .genes .amp .fuckdoll .muscles .weight*/ /*.waist .height .heightImplant .shoulders .shouldersImplant .hips .hipsImplant .bellyImplant .bellySag .burst .boobs .boobsImplant .boobsImplantType .lactation .boobShape .nipples .areolae*/ -/*.butt .buttImplant .anus .mpreg .vagina .vaginaLube .clit .labia .pubertyXX .pubertyAgeXX .crevixImplant .csec .breedingMark .ovaries .preg .pregType .pregSource .dick .foreskin .balls*/ +/*.butt .buttImplant .anus .mpreg .vagina .vaginaLube .clit .labia .pubertyXX .pubertyAgeXX .crevixImplant .breedingMark .ovaries .preg .pregType .pregSource .dick .foreskin .balls*/ diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw index 3b6c9817069efe2676df58c861f376d7ac1aff22..6ddf809ca6fbd6267cc2a8de91b9066b1f494fd2 100644 --- a/src/cheats/mod_editSlaveCheatNew.tw +++ b/src/cheats/mod_editSlaveCheatNew.tw @@ -2754,20 +2754,20 @@ <br> - /*C-section editing is dummied out due to causing problems with the new scarring system.*/ - /*''C-Section scar:'' - <<if ndef $tempSlave.cSec>> - <<set $tempSlave.cSec = 0>> - <</if>> - <<if $tempSlave.cSec == 0>> - @@.yellow;false@@ - <<checkbox "$tempSlave.cSec" 0 1>> - <<else>> + ''C-Section scar:'' + <<if $tempSlave.scar.hasOwnProperty("belly") && $tempSlave.scar.belly["c-section"] > 0>> @@.yellow;true@@ - <<checkbox "$tempSlave.cSec" 0 1 checked>> + <<link "Remove">> + <<run App.Medicine.Modification.removeScar($tempSlave, "belly", "c-section")>> + <</link>> + <<else>> + @@.yellow;false@@ + <<link "Add">> + <<run App.Medicine.Modification.addScar($tempSlave, "belly", "c-section")>> + <</link>> <</if>> - <br>*/ + <br> ''Breeding mark (only for Eugenic Societies):'' <<if $tempSlave.breedingMark == 1>> @@ -4782,4 +4782,4 @@ /*.visualAge .ageImplant .birthWeek .health .chem .addict .devotion .oldDevotion .trust .oldTrust .face .faceShape .faceImplant .markings .bald .hLength .hStyle .hColor .origHColor*/ /*.eyebrowHColor .pubicHColor .pubicHStyle .underArmHColor .underArmHStyle .eyeColor .origEye .eyes .hears .lips .lipsImplant .teeth .voiceImplant .voice .accent .genes .amp .fuckdoll .muscles .weight*/ /*.waist .height .heightImplant .shoulders .shouldersImplant .hips .hipsImplant .bellyImplant .bellySag .burst .boobs .boobsImplant .boobsImplantType .lactation .boobShape .nipples .areolae*/ -/*.butt .buttImplant .anus .mpreg .vagina .vaginaLube .clit .labia .pubertyXX .pubertyAgeXX .crevixImplant .csec .breedingMark .ovaries .preg .pregType .pregSource .dick .foreskin .balls*/ +/*.butt .buttImplant .anus .mpreg .vagina .vaginaLube .clit .labia .pubertyXX .pubertyAgeXX .crevixImplant .breedingMark .ovaries .preg .pregType .pregSource .dick .foreskin .balls*/ diff --git a/src/facilities/nursery/nurseryDatatypeCleanup.js b/src/facilities/nursery/nurseryDatatypeCleanup.js index f17db121f258d2f8a2d8a0e942d1fbfe111572db..2eac8e034c34e9e7033675caafee57aa2264703f 100644 --- a/src/facilities/nursery/nurseryDatatypeCleanup.js +++ b/src/facilities/nursery/nurseryDatatypeCleanup.js @@ -158,7 +158,12 @@ App.Facilities.Nursery.ChildDatatypeCleanup = function(child) { function childPregnancyDatatypeCleanup(child) { child.induce = Math.clamp(+child.induce, 0, 1) || 0; child.labor = Math.clamp(+child.labor, 0, 1) || 0; - child.cSec = Math.clamp(+child.cSec, 0, 1) || 0; + if (child.hasOwnProperyty("cSec")) { + if (child.cSec > 0) { + App.Medicine.Modification.addScar(child, "belly", "c-section"); + } + delete child.cSec; + } child.prematureBirth = Math.clamp(+child.prematureBirth, 0, 1) || 0; child.ovaries = Math.clamp(+child.ovaries, 0, 1) || 0; child.vasectomy = Math.clamp(+child.vasectomy, 0, 1) || 0; diff --git a/src/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js index 969ca6e48d36cc0e30a0aa1eb869dda2545be8a2..72c75aa42b76172ded339e81535b0eab5bb635c9 100644 --- a/src/facilities/nursery/nurseryWidgets.js +++ b/src/facilities/nursery/nurseryWidgets.js @@ -15585,7 +15585,6 @@ App.Facilities.Nursery.infantToChild = function infantToChild(child) { child.buttTat = 0, child.buttplug = "none", child.buttplugAttachment = "none", - child.cSec = 0, child.canRecruit = 0, child.chastityAnus = 0, child.chastityPenis = 0, @@ -17491,10 +17490,6 @@ App.Facilities.Nursery.ChildState = class ChildState { * * 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 *