From a9efc4f6b80f747bd2506b62790e4fa8d56d99fd Mon Sep 17 00:00:00 2001 From: lowercase-donkey <lowercasedonkey@gmail.com> Date: Sat, 23 Mar 2019 18:24:03 -0400 Subject: [PATCH] tats are mods, not surgeries --- src/interaction/cyberConfig.tw | 96 ++++++++++----------- src/npc/abort.tw | 2 +- src/pregmod/saClothes.tw | 4 +- src/uncategorized/bodyModification.tw | 110 ++++++++++++------------- src/uncategorized/saDrugs.tw | 2 +- src/uncategorized/saLongTermEffects.tw | 4 +- 6 files changed, 109 insertions(+), 109 deletions(-) diff --git a/src/interaction/cyberConfig.tw b/src/interaction/cyberConfig.tw index eacceaf73b8..49ee44e440d 100644 --- a/src/interaction/cyberConfig.tw +++ b/src/interaction/cyberConfig.tw @@ -32,52 +32,52 @@ Swap out $his lenses: <br> Iris Color: - [[Blue|cyberConfig][$activeSlave.eyeColor = "blue",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Black|cyberConfig][$activeSlave.eyeColor = "black",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Brown|cyberConfig][$activeSlave.eyeColor = "brown",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Green|cyberConfig][$activeSlave.eyeColor = "green",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Turquoise|cyberConfig][$activeSlave.eyeColor = "turquoise",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Sky-Blue|cyberConfig][$activeSlave.eyeColor = "sky-blue",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Hazel|cyberConfig][$activeSlave.eyeColor = "hazel",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Pale-Grey|cyberConfig][$activeSlave.eyeColor = "pale-grey",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[White|cyberConfig][$activeSlave.eyeColor = "white",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Pink|cyberConfig][$activeSlave.eyeColor = "pink",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Amber|cyberConfig][$activeSlave.eyeColor = "amber",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Red|cyberConfig][$activeSlave.eyeColor = "red",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Yellow|cyberConfig][$activeSlave.eyeColor = "yellow",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Orange|cyberConfig][$activeSlave.eyeColor = "orange",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] + [[Blue|cyberConfig][$activeSlave.eyeColor = "blue",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Black|cyberConfig][$activeSlave.eyeColor = "black",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Brown|cyberConfig][$activeSlave.eyeColor = "brown",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Green|cyberConfig][$activeSlave.eyeColor = "green",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Turquoise|cyberConfig][$activeSlave.eyeColor = "turquoise",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Sky-Blue|cyberConfig][$activeSlave.eyeColor = "sky-blue",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Hazel|cyberConfig][$activeSlave.eyeColor = "hazel",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Pale-Grey|cyberConfig][$activeSlave.eyeColor = "pale-grey",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[White|cyberConfig][$activeSlave.eyeColor = "white",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Pink|cyberConfig][$activeSlave.eyeColor = "pink",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Amber|cyberConfig][$activeSlave.eyeColor = "amber",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Red|cyberConfig][$activeSlave.eyeColor = "red",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Yellow|cyberConfig][$activeSlave.eyeColor = "yellow",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Orange|cyberConfig][$activeSlave.eyeColor = "orange",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] <br> Pupil Shape: - <br>[[Circular|cyberConfig][$activeSlave.pupil = "circular",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Catlike|cyberConfig][$activeSlave.pupil = "catlike",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Serpent-Like|cyberConfig][$activeSlave.pupil = "serpent-like",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Devilish|cyberConfig][$activeSlave.pupil = "devilish",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Demonic|cyberConfig][$activeSlave.pupil = "demonic",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Hypnotic|cyberConfig][$activeSlave.pupil = "hypnotic",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Heart-Shaped|cyberConfig][$activeSlave.pupil = "heart-shaped",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Wide-Eyed|cyberConfig][$activeSlave.pupil = "wide-eyed",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Almond-Shaped|cyberConfig][$activeSlave.pupil = "almond-shaped",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Bright|cyberConfig][$activeSlave.pupil = "bright",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Teary|cyberConfig][$activeSlave.pupil = "teary",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Vacant|cyberConfig][$activeSlave.pupil = "vacant",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Star-Shaped|cyberConfig][$activeSlave.pupil = "star-shaped",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Goat-Like|cyberConfig][$activeSlave.pupil = "goat-like",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] + <br>[[Circular|cyberConfig][$activeSlave.pupil = "circular",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Catlike|cyberConfig][$activeSlave.pupil = "catlike",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Serpent-Like|cyberConfig][$activeSlave.pupil = "serpent-like",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Devilish|cyberConfig][$activeSlave.pupil = "devilish",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Demonic|cyberConfig][$activeSlave.pupil = "demonic",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Hypnotic|cyberConfig][$activeSlave.pupil = "hypnotic",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Heart-Shaped|cyberConfig][$activeSlave.pupil = "heart-shaped",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Wide-Eyed|cyberConfig][$activeSlave.pupil = "wide-eyed",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Almond-Shaped|cyberConfig][$activeSlave.pupil = "almond-shaped",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Bright|cyberConfig][$activeSlave.pupil = "bright",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Teary|cyberConfig][$activeSlave.pupil = "teary",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Vacant|cyberConfig][$activeSlave.pupil = "vacant",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Star-Shaped|cyberConfig][$activeSlave.pupil = "star-shaped",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Goat-Like|cyberConfig][$activeSlave.pupil = "goat-like",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] <br> Sclera Colors: - [[White|cyberConfig][$activeSlave.sclerae = "white",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Blue|cyberConfig][$activeSlave.sclerae = "blue",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Black|cyberConfig][$activeSlave.sclerae = "black",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Brown|cyberConfig][$activeSlave.sclerae = "brown",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Green|cyberConfig][$activeSlave.sclerae = "green",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Turquoise|cyberConfig][$activeSlave.sclerae = "turquoise",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Sky-Blue|cyberConfig][$activeSlave.sclerae = "sky-blue",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Hazel|cyberConfig][$activeSlave.sclerae = "hazel",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Pale-Grey|cyberConfig][$activeSlave.sclerae = "pale-grey",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Pink|cyberConfig][$activeSlave.sclerae = "pink",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Amber|cyberConfig][$activeSlave.sclerae = "amber",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Red|cyberConfig][$activeSlave.sclerae = "red",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Yellow|cyberConfig][$activeSlave.sclerae = "yellow",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Orange|cyberConfig][$activeSlave.sclerae = "orange",$temp = 2,cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] + [[White|cyberConfig][$activeSlave.sclerae = "white",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Blue|cyberConfig][$activeSlave.sclerae = "blue",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Black|cyberConfig][$activeSlave.sclerae = "black",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Brown|cyberConfig][$activeSlave.sclerae = "brown",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Green|cyberConfig][$activeSlave.sclerae = "green",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Turquoise|cyberConfig][$activeSlave.sclerae = "turquoise",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Sky-Blue|cyberConfig][$activeSlave.sclerae = "sky-blue",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Hazel|cyberConfig][$activeSlave.sclerae = "hazel",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Pale-Grey|cyberConfig][$activeSlave.sclerae = "pale-grey",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Pink|cyberConfig][$activeSlave.sclerae = "pink",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Amber|cyberConfig][$activeSlave.sclerae = "amber",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Red|cyberConfig][$activeSlave.sclerae = "red",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Yellow|cyberConfig][$activeSlave.sclerae = "yellow",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Orange|cyberConfig][$activeSlave.sclerae = "orange",$temp = 2,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] <</if>> <<if $activeSlave.earImplant == 1>><br><br> @@ -177,12 +177,12 @@ <br> Modify $his tail's appearance:<br> - [[Cat|cyberConfig][$activeSlave.tailShape = "neko",cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Dog|cyberConfig][$activeSlave.tailShape = "inu",cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Fox|cyberConfig][$activeSlave.tailShape = "kit",cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Kitsune|cyberConfig][$activeSlave.tailShape = "kitsune",cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Tanuki|cyberConfig][$activeSlave.tailShape = "tanuki",cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] - | [[Bovine|cyberConfig][$activeSlave.tailShape = "ushi",cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]] + [[Cat|cyberConfig][$activeSlave.tailShape = "neko",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Dog|cyberConfig][$activeSlave.tailShape = "inu",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Fox|cyberConfig][$activeSlave.tailShape = "kit",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Kitsune|cyberConfig][$activeSlave.tailShape = "kitsune",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Tanuki|cyberConfig][$activeSlave.tailShape = "tanuki",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Bovine|cyberConfig][$activeSlave.tailShape = "ushi",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] <</if>> <<case 1>> <<set $temp = 0, $nextButton = "Continue", $nextLink = "cyberConfig">> diff --git a/src/npc/abort.tw b/src/npc/abort.tw index 8e702f0eb30..aa35a0583a0 100644 --- a/src/npc/abort.tw +++ b/src/npc/abort.tw @@ -39,7 +39,7 @@ The remote surgery makes aborting a pregnancy quick and efficient. <<if $activeSlave.abortionTat > -1>> The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($activeSlave.abortionTat)>> crossed out infant. <<set $activeSlave.abortionTat++>> - <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>> + <<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>> <</if>> <<if lastPregRule($activeSlave,$defaultRules)>><<set $activeSlave.preg = -1>><<else>><<set $activeSlave.preg = 0>><</if>> diff --git a/src/pregmod/saClothes.tw b/src/pregmod/saClothes.tw index 9b36e290b7a..32f46420909 100644 --- a/src/pregmod/saClothes.tw +++ b/src/pregmod/saClothes.tw @@ -460,7 +460,7 @@ <<if $slaves[$i].abortionTat > -1>> The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].abortionTat)>> crossed out infant. <<set $slaves[$i].abortionTat++>> - <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>> + <<run cashX(forceNeg($modCost), "slaveMod", $slaves[$i])>> <</if>> <<else>> <<if $slaves[$i].waist <= -95>> @@ -823,7 +823,7 @@ <<if $slaves[$i].abortionTat > -1>> The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].abortionTat)>> crossed out infant. <<set $slaves[$i].abortionTat++>> - <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>> + <<run cashX(forceNeg($modCost), "slaveMod", $slaves[$i])>> <</if>> <</if>> <</if>> diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw index d651fed964c..a888abedc59 100644 --- a/src/uncategorized/bodyModification.tw +++ b/src/uncategorized/bodyModification.tw @@ -413,31 +413,31 @@ Choose piercing style: <<goto "Body Modification">> <</link>> - <<if $activeSlave.earPiercing != 1>> | [[Ear|Body Modification][$activeSlave.earPiercing = 1, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.nosePiercing != 1>> | [[Nose|Body Modification][$activeSlave.nosePiercing = 1, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.eyebrowPiercing != 1>> | [[Eyebrow|Body Modification][$activeSlave.eyebrowPiercing = 1, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.lipsPiercing != 1>> | [[Lips|Body Modification][$activeSlave.lipsPiercing = 1, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.tonguePiercing != 1>> | [[Tongue|Body Modification][$activeSlave.tonguePiercing = 1, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.earPiercing != 1>> | [[Ear|Body Modification][$activeSlave.earPiercing = 1, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> + <<if $activeSlave.nosePiercing != 1>> | [[Nose|Body Modification][$activeSlave.nosePiercing = 1, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> + <<if $activeSlave.eyebrowPiercing != 1>> | [[Eyebrow|Body Modification][$activeSlave.eyebrowPiercing = 1, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> + <<if $activeSlave.lipsPiercing != 1>> | [[Lips|Body Modification][$activeSlave.lipsPiercing = 1, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> + <<if $activeSlave.tonguePiercing != 1>> | [[Tongue|Body Modification][$activeSlave.tonguePiercing = 1, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> <<if $activeSlave.nipples != "fuckable">> - <<if $activeSlave.nipplesPiercing != 1>> | [[Nipples|Body Modification][$activeSlave.nipplesPiercing = 1, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.nipplesPiercing != 1>> | [[Nipples|Body Modification][$activeSlave.nipplesPiercing = 1, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> <</if>> - <<if $activeSlave.areolaePiercing != 1>> | [[Areolae|Body Modification][$activeSlave.areolaePiercing = 1, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.corsetPiercing != 1>> | [[Corset|Body Modification][$activeSlave.corsetPiercing = 1, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.navelPiercing != 1>> | [[Navel|Body Modification][$activeSlave.navelPiercing = 1, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.areolaePiercing != 1>> | [[Areolae|Body Modification][$activeSlave.areolaePiercing = 1, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> + <<if $activeSlave.corsetPiercing != 1>> | [[Corset|Body Modification][$activeSlave.corsetPiercing = 1, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> + <<if $activeSlave.navelPiercing != 1>> | [[Navel|Body Modification][$activeSlave.navelPiercing = 1, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> <<if ($activeSlave.vagina != -1) || ($activeSlave.dick != 0)>> <<if $activeSlave.vagina != -1>> - <<if $activeSlave.clitPiercing != 1>> | [[Clit|Body Modification][$activeSlave.clitPiercing = 1, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.clitPiercing != 1>> | [[Clit|Body Modification][$activeSlave.clitPiercing = 1, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> <<else>> - <<if $activeSlave.clitPiercing != 1>> | [[Dickhead|Body Modification][$activeSlave.clitPiercing = 1, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.clitPiercing != 1>> | [[Dickhead|Body Modification][$activeSlave.clitPiercing = 1, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> <</if>> <</if>> <<if ($activeSlave.vagina != -1)>> - <<if $activeSlave.vaginaPiercing != 1>> | [[Vagina|Body Modification][$activeSlave.vaginaPiercing = 1, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.vaginaPiercing != 1>> | [[Vagina|Body Modification][$activeSlave.vaginaPiercing = 1, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> <</if>> <<if ($activeSlave.dick > 0)>> - <<if $activeSlave.dickPiercing != 1>> | [[Dick|Body Modification][$activeSlave.dickPiercing = 1, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.dickPiercing != 1>> | [[Dick|Body Modification][$activeSlave.dickPiercing = 1, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> <</if>> - <<if $activeSlave.anusPiercing != 1>> | [[Anus|Body Modification][$activeSlave.anusPiercing = 1, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.anusPiercing != 1>> | [[Anus|Body Modification][$activeSlave.anusPiercing = 1, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> <</if>> <<if $piercingLevel == 2>> @@ -445,55 +445,55 @@ Choose piercing style: ''Heavily'' pierce $his: <<link "Entire body">> - <<if $activeSlave.earPiercing != 2>><<set $activeSlave.earPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveSurgery", $activeSlave), $degradation += 1>><</if>> - <<if $activeSlave.nosePiercing != 2>><<set $activeSlave.nosePiercing = 2>> <<set cashX(forceNeg($modCost), "slaveSurgery", $activeSlave), $degradation += 1>><</if>> - <<if $activeSlave.eyebrowPiercing != 2>><<set $activeSlave.eyebrowPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveSurgery", $activeSlave), $degradation += 1>><</if>> - <<if $activeSlave.lipsPiercing != 2>><<set $activeSlave.lipsPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveSurgery", $activeSlave), $degradation += 1>><</if>> - <<if $activeSlave.tonguePiercing != 2>><<set $activeSlave.tonguePiercing = 2>> <<set cashX(forceNeg($modCost), "slaveSurgery", $activeSlave), $degradation += 1>><</if>> + <<if $activeSlave.earPiercing != 2>><<set $activeSlave.earPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveMod", $activeSlave), $degradation += 1>><</if>> + <<if $activeSlave.nosePiercing != 2>><<set $activeSlave.nosePiercing = 2>> <<set cashX(forceNeg($modCost), "slaveMod", $activeSlave), $degradation += 1>><</if>> + <<if $activeSlave.eyebrowPiercing != 2>><<set $activeSlave.eyebrowPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveMod", $activeSlave), $degradation += 1>><</if>> + <<if $activeSlave.lipsPiercing != 2>><<set $activeSlave.lipsPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveMod", $activeSlave), $degradation += 1>><</if>> + <<if $activeSlave.tonguePiercing != 2>><<set $activeSlave.tonguePiercing = 2>> <<set cashX(forceNeg($modCost), "slaveMod", $activeSlave), $degradation += 1>><</if>> <<if $activeSlave.nipples != "fuckable">> - <<if $activeSlave.nipplesPiercing != 2>><<set $activeSlave.nipplesPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveSurgery", $activeSlave), $degradation += 1>><</if>> + <<if $activeSlave.nipplesPiercing != 2>><<set $activeSlave.nipplesPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveMod", $activeSlave), $degradation += 1>><</if>> <</if>> - <<if $activeSlave.areolaePiercing != 2>><<set $activeSlave.areolaePiercing = 2>> <<set cashX(forceNeg($modCost), "slaveSurgery", $activeSlave), $degradation += 1>><</if>> - <<if $activeSlave.corsetPiercing != 2>><<set $activeSlave.corsetPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveSurgery", $activeSlave), $degradation += 1>><</if>> - <<if $activeSlave.navelPiercing != 2>><<set $activeSlave.navelPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveSurgery", $activeSlave), $degradation += 1>><</if>> + <<if $activeSlave.areolaePiercing != 2>><<set $activeSlave.areolaePiercing = 2>> <<set cashX(forceNeg($modCost), "slaveMod", $activeSlave), $degradation += 1>><</if>> + <<if $activeSlave.corsetPiercing != 2>><<set $activeSlave.corsetPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveMod", $activeSlave), $degradation += 1>><</if>> + <<if $activeSlave.navelPiercing != 2>><<set $activeSlave.navelPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveMod", $activeSlave), $degradation += 1>><</if>> <<if ($activeSlave.vagina != -1) || ($activeSlave.dick != 0)>> - <<if $activeSlave.clitPiercing != 2>><<set $activeSlave.clitPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveSurgery", $activeSlave), $degradation += 1>><</if>> + <<if $activeSlave.clitPiercing != 2>><<set $activeSlave.clitPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveMod", $activeSlave), $degradation += 1>><</if>> <</if>> <<if ($activeSlave.vagina != -1)>> - <<if $activeSlave.vaginaPiercing != 2>><<set $activeSlave.vaginaPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveSurgery", $activeSlave), $degradation += 1>><</if>> + <<if $activeSlave.vaginaPiercing != 2>><<set $activeSlave.vaginaPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveMod", $activeSlave), $degradation += 1>><</if>> <</if>> <<if ($activeSlave.dick > 0)>> - <<if $activeSlave.dickPiercing != 2>><<set $activeSlave.dickPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveSurgery", $activeSlave), $degradation += 1>><</if>> + <<if $activeSlave.dickPiercing != 2>><<set $activeSlave.dickPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveMod", $activeSlave), $degradation += 1>><</if>> <</if>> - <<if $activeSlave.anusPiercing != 2>><<set $activeSlave.anusPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveSurgery", $activeSlave), $degradation += 1>><</if>> + <<if $activeSlave.anusPiercing != 2>><<set $activeSlave.anusPiercing = 2>> <<set cashX(forceNeg($modCost), "slaveMod", $activeSlave), $degradation += 1>><</if>> <<goto "Body Modification">> <</link>> - <<if $activeSlave.earPiercing != 2>> | [[Ear|Body Modification][$activeSlave.earPiercing = 2, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> - <<if $activeSlave.nosePiercing != 2>> | [[Nose|Body Modification][$activeSlave.nosePiercing = 2, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> - <<if $activeSlave.eyebrowPiercing != 2>> | [[Eyebrow|Body Modification][$activeSlave.eyebrowPiercing = 2, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> - <<if $activeSlave.lipsPiercing != 2>> | [[Lips|Body Modification][$activeSlave.lipsPiercing = 2, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> - <<if $activeSlave.tonguePiercing != 2>> | [[Tongue|Body Modification][$activeSlave.tonguePiercing = 2, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.earPiercing != 2>> | [[Ear|Body Modification][$activeSlave.earPiercing = 2, cashX(forceNeg($modCost), "slaveMod", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.nosePiercing != 2>> | [[Nose|Body Modification][$activeSlave.nosePiercing = 2, cashX(forceNeg($modCost), "slaveMod", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.eyebrowPiercing != 2>> | [[Eyebrow|Body Modification][$activeSlave.eyebrowPiercing = 2, cashX(forceNeg($modCost), "slaveMod", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.lipsPiercing != 2>> | [[Lips|Body Modification][$activeSlave.lipsPiercing = 2, cashX(forceNeg($modCost), "slaveMod", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.tonguePiercing != 2>> | [[Tongue|Body Modification][$activeSlave.tonguePiercing = 2, cashX(forceNeg($modCost), "slaveMod", $activeSlave),$degradation += 1]]<</if>> <<if $activeSlave.nipples != "fuckable">> - <<if $activeSlave.nipplesPiercing != 2>> | [[Nipples|Body Modification][$activeSlave.nipplesPiercing = 2, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.nipplesPiercing != 2>> | [[Nipples|Body Modification][$activeSlave.nipplesPiercing = 2, cashX(forceNeg($modCost), "slaveMod", $activeSlave),$degradation += 1]]<</if>> <</if>> - <<if $activeSlave.areolaePiercing != 2>> | [[Areolae|Body Modification][$activeSlave.areolaePiercing = 2, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> - <<if $activeSlave.corsetPiercing != 2>> | [[Corset|Body Modification][$activeSlave.corsetPiercing = 2, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> - <<if $activeSlave.navelPiercing != 2>> | [[Navel|Body Modification][$activeSlave.navelPiercing = 2, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.areolaePiercing != 2>> | [[Areolae|Body Modification][$activeSlave.areolaePiercing = 2, cashX(forceNeg($modCost), "slaveMod", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.corsetPiercing != 2>> | [[Corset|Body Modification][$activeSlave.corsetPiercing = 2, cashX(forceNeg($modCost), "slaveMod", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.navelPiercing != 2>> | [[Navel|Body Modification][$activeSlave.navelPiercing = 2, cashX(forceNeg($modCost), "slaveMod", $activeSlave),$degradation += 1]]<</if>> <<if ($activeSlave.vagina != -1) || ($activeSlave.dick != 0)>> <<if $activeSlave.vagina != -1>> - <<if $activeSlave.clitPiercing != 2>> | [[Clit|Body Modification][$activeSlave.clitPiercing = 2, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.clitPiercing != 2>> | [[Clit|Body Modification][$activeSlave.clitPiercing = 2, cashX(forceNeg($modCost), "slaveMod", $activeSlave),$degradation += 1]]<</if>> <<else>> - <<if $activeSlave.clitPiercing != 2>> | [[Dickhead|Body Modification][$activeSlave.clitPiercing = 2, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.clitPiercing != 2>> | [[Dickhead|Body Modification][$activeSlave.clitPiercing = 2, cashX(forceNeg($modCost), "slaveMod", $activeSlave),$degradation += 1]]<</if>> <</if>> <</if>> <<if ($activeSlave.vagina != -1)>> - <<if $activeSlave.vaginaPiercing != 2>> | [[Vagina|Body Modification][$activeSlave.vaginaPiercing = 2, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.vaginaPiercing != 2>> | [[Vagina|Body Modification][$activeSlave.vaginaPiercing = 2, cashX(forceNeg($modCost), "slaveMod", $activeSlave),$degradation += 1]]<</if>> <</if>> <<if ($activeSlave.dick > 0)>> - <<if $activeSlave.dickPiercing != 2>> | [[Dick|Body Modification][$activeSlave.dickPiercing = 2, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.dickPiercing != 2>> | [[Dick|Body Modification][$activeSlave.dickPiercing = 2, cashX(forceNeg($modCost), "slaveMod", $activeSlave),$degradation += 1]]<</if>> <</if>> - <<if $activeSlave.anusPiercing != 2>> | [[Anus|Body Modification][$activeSlave.anusPiercing = 2, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.anusPiercing != 2>> | [[Anus|Body Modification][$activeSlave.anusPiercing = 2, cashX(forceNeg($modCost), "slaveMod", $activeSlave),$degradation += 1]]<</if>> <</if>> <<if $piercingLevel == 3>> @@ -531,23 +531,23 @@ Choose piercing style: <</link>> - <<if $activeSlave.earPiercing > 0>> | [[Ear|Body Modification][$activeSlave.earPiercing = 0, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.nosePiercing > 0>> | [[Nose|Body Modification][$activeSlave.nosePiercing = 0, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.eyebrowPiercing > 0>> | [[Eyebrow|Body Modification][$activeSlave.eyebrowPiercing = 0, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.lipsPiercing > 0>> | [[Lips|Body Modification][$activeSlave.lipsPiercing = 0, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.tonguePiercing > 0>> | [[Tongue|Body Modification][$activeSlave.tonguePiercing = 0, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.nipplesPiercing > 0>> | [[Nipples|Body Modification][$activeSlave.nipplesPiercing = 0, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.areolaePiercing > 0>> | [[Areolae|Body Modification][$activeSlave.areolaePiercing = 0, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.corsetPiercing > 0>> | [[Corset|Body Modification][$activeSlave.corsetPiercing = 0, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.navelPiercing > 0>> | [[Navel|Body Modification][$activeSlave.navelPiercing = 0, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.earPiercing > 0>> | [[Ear|Body Modification][$activeSlave.earPiercing = 0, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> + <<if $activeSlave.nosePiercing > 0>> | [[Nose|Body Modification][$activeSlave.nosePiercing = 0, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> + <<if $activeSlave.eyebrowPiercing > 0>> | [[Eyebrow|Body Modification][$activeSlave.eyebrowPiercing = 0, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> + <<if $activeSlave.lipsPiercing > 0>> | [[Lips|Body Modification][$activeSlave.lipsPiercing = 0, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> + <<if $activeSlave.tonguePiercing > 0>> | [[Tongue|Body Modification][$activeSlave.tonguePiercing = 0, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> + <<if $activeSlave.nipplesPiercing > 0>> | [[Nipples|Body Modification][$activeSlave.nipplesPiercing = 0, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> + <<if $activeSlave.areolaePiercing > 0>> | [[Areolae|Body Modification][$activeSlave.areolaePiercing = 0, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> + <<if $activeSlave.corsetPiercing > 0>> | [[Corset|Body Modification][$activeSlave.corsetPiercing = 0, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> + <<if $activeSlave.navelPiercing > 0>> | [[Navel|Body Modification][$activeSlave.navelPiercing = 0, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> <<if $activeSlave.vagina != -1>> - <<if $activeSlave.clitPiercing > 0>> | [[Clit|Body Modification][$activeSlave.clitPiercing = 0, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.clitPiercing > 0>> | [[Clit|Body Modification][$activeSlave.clitPiercing = 0, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> <<else>> - <<if $activeSlave.clitPiercing > 0>> | [[Dickhead|Body Modification][$activeSlave.clitPiercing = 0, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.clitPiercing > 0>> | [[Dickhead|Body Modification][$activeSlave.clitPiercing = 0, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> <</if>> - <<if $activeSlave.vaginaPiercing > 0>> | [[Vagina|Body Modification][$activeSlave.vaginaPiercing = 0, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.dickPiercing > 0>> | [[Dick|Body Modification][$activeSlave.dickPiercing = 0, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.anusPiercing > 0>> | [[Anus|Body Modification][$activeSlave.anusPiercing = 0, cashX(forceNeg($modCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.vaginaPiercing > 0>> | [[Vagina|Body Modification][$activeSlave.vaginaPiercing = 0, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> + <<if $activeSlave.dickPiercing > 0>> | [[Dick|Body Modification][$activeSlave.dickPiercing = 0, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> + <<if $activeSlave.anusPiercing > 0>> | [[Anus|Body Modification][$activeSlave.anusPiercing = 0, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>> <</if>> <br><br> diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index 306bcbf9f45..a68e84f84e9 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -1102,7 +1102,7 @@ <<if $slaves[$i].abortionTat > -1>> The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].abortionTat)>> crossed out infant. <<set $slaves[$i].abortionTat++>> - <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>> + <<run cashX(forceNeg($modCost), "slaveMod", $slaves[$i])>> <</if>> <</if>> <</if>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index a1468eaf50b..e609ec05ba5 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -8227,7 +8227,7 @@ <<if $slaves[$i].abortionTat > -1>> But hey, $he gets a tattoo signifying $his abortion. Was it worth it? <<set $slaves[$i].abortionTat++>> - <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>> + <<run cashX(forceNeg($modCost), "slaveMod", $slaves[$i])>> <</if>> <</if>> <</if>> @@ -8361,7 +8361,7 @@ <<if $slaves[$i].abortionTat > -1>> The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].abortionTat)>> crossed out infant. <<set $slaves[$i].abortionTat++>> - <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>> + <<run cashX(forceNeg($modCost), "slaveMod", $slaves[$i])>> <</if>> <<run SetBellySize($slaves[$i])>> <<set _miscarriage = 1>> -- GitLab