From 37080a3692b0c9c10b9e0053dc32c3615d64a6e3 Mon Sep 17 00:00:00 2001 From: lowercase-donkey <lowercasedonkey@gmail.com> Date: Fri, 22 Feb 2019 23:15:01 -0500 Subject: [PATCH] simplify surgery display especially for herms --- src/uncategorized/remoteSurgery.tw | 112 ++++++++++++++--------------- 1 file changed, 53 insertions(+), 59 deletions(-) diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 443ef84e686..7f3be4103ab 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -1055,9 +1055,38 @@ Work on $his sex: <</if>> <</if>> -<<if $activeSlave.vagina > -1>> - <br> +<br> +<<if ($activeSlave.dick == 0) && ($activeSlave.vagina == -1)>> + $He is a null, possessing neither penis nor vagina. +<<elseif ($activeSlave.dick != 0)>> + <<if ($seeCircumcision == 1) && ($activeSlave.indentureRestrictions < 2)>> + <<if ($activeSlave.vagina == -1) && ($activeSlave.foreskin == 0)>> + $He has a circumcised penis. + <<elseif ($activeSlave.vagina == -1) && ($activeSlave.foreskin >= 1)>> + $He has an uncircumcised penis. + <<elseif ($activeSlave.ovaries != 0) && ($activeSlave.foreskin == 0)>> + $He has a circumcised penis and a + <<elseif ($activeSlave.ovaries != 0) && ($activeSlave.foreskin >= 1)>> + $He has an uncircumcised penis and a + <<elseif ($activeSlave.vagina != -1) && ($activeSlave.foreskin == 0)>> + $He has a circumcised penis and a<<if $activeSlave.genes == "XY">>n artificial<</if>> + <<elseif ($activeSlave.vagina != -1) && ($activeSlave.foreskin >= 1)>> + $He has an uncircumcised penis and a<<if $activeSlave.genes == "XY">>n artificial<</if>> + <</if>> + <<else>> + <<if ($activeSlave.vagina == -1)>> + $He has a penis. + <<elseif ($activeSlave.ovaries != 0)>> + $He has a penis and a vagina + <<elseif ($activeSlave.vagina != -1)>> + $He has a penis and a<<if $activeSlave.genes == "XY">>n artificial<</if>> + <</if>> + <</if>> +<<elseif ($activeSlave.dick == 0)>> $He has a +<</if>> + +<<if $activeSlave.vagina > -1>> <<if $activeSlave.vagina == 0>> virgin pussy. <<elseif $activeSlave.vagina == 1>> @@ -1072,75 +1101,24 @@ Work on $his sex: gaping cunt. <</if>> <</if>> -<<if ($activeSlave.vagina > 3)>> - <br> - $His vagina could benefit from surgical repair. - [[Repair pussy|Surgery Degradation][$activeSlave.vagina = 3,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "vagina"]] //This will reduce $his vaginal skills// -<<elseif ($surgeryUpgrade == 1) && ($activeSlave.indentureRestrictions < 2)>> - <<if ($activeSlave.vagina > 1)>> - <br> - $His vaginal muscles could benefit from microsurgical rejuvenation. - [[Tighten pussy|Surgery Degradation][$activeSlave.vagina = 1,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "vagina"]] //This will reduce $his vaginal skills// - <<elseif ($activeSlave.vagina > 0)>> - <br> - $His pussy is as tight as a virgin's, and $his hymen could be restored. - [[Restore virginity|Surgery Degradation][$activeSlave.vagina = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "vagina"]] //This will reduce $his vaginal skills// - <</if>> + +<<if ($activeSlave.dick != 0) && (($activeSlave.ovaries != 0) || ($activeSlave.vagina != -1))>> + It's possible to remove either and leave $him sexually functional. <</if>> <<if ($activeSlave.vagina > -1) && ($activeSlave.dick > 0)>> <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>> - <br> - Since $he has both a penis and a vagina, it's possible to remove $his pussy and leave $his sexually functional. - [[Remove pussy|Surgery Degradation][$activeSlave.vagina = -1,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregSource = 0,$activeSlave.vaginalSkill = 0,$activeSlave.vaginalAccessory = "none",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 20,$surgeryType = "vaginaRemoval"]] <<if $activeSlave.ovaries == 1>>//This will remove $his ovaries as well//<</if>> + | [[Remove pussy|Surgery Degradation][$activeSlave.vagina = -1,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregSource = 0,$activeSlave.vaginalSkill = 0,$activeSlave.vaginalAccessory = "none",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 20,$surgeryType = "vaginaRemoval"]] <<if $activeSlave.ovaries == 1>>//This will remove $his ovaries as well//<</if>> <</if>> <<elseif $activeSlave.vagina > -1>> <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>> - <br> - $His pussy can be removed at the cost of $his sexual functionality, leaving $him a null. - [[Remove pussy|Surgery Degradation][$activeSlave.vagina = -1,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregSource = 0,$activeSlave.vaginalSkill = 0,$activeSlave.vaginalAccessory = "none",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 20,$surgeryType = "vaginaRemoval"]] <<if $activeSlave.ovaries == 1>>//This will remove $his ovaries as well//<</if>> - <</if>> -<</if>> - -<<if ($activeSlave.dick == 0) && ($activeSlave.vagina == -1)>> - <br> - $He is a null, possessing neither penis nor vagina. -<<elseif ($seeCircumcision == 1) && ($activeSlave.indentureRestrictions < 2)>> - <<if ($activeSlave.dick != 0) && ($activeSlave.vagina == -1) && ($activeSlave.foreskin == 0)>> - <br> - $He has a circumcised penis. - <<elseif ($activeSlave.dick != 0) && ($activeSlave.vagina == -1) && ($activeSlave.foreskin >= 1)>> - <br> - $He has an uncircumcised penis. - <<elseif ($activeSlave.dick != 0) && ($activeSlave.ovaries != 0) && ($activeSlave.foreskin == 0)>> - <br> - $He has a circumcised penis and a vagina. - <<elseif ($activeSlave.dick != 0) && ($activeSlave.ovaries != 0) && ($activeSlave.foreskin >= 1)>> - <br> - $He has an uncircumcised penis and a vagina. - <<elseif ($activeSlave.dick != 0) && ($activeSlave.vagina != -1) && ($activeSlave.foreskin == 0)>> - <br> - $He has a circumcised penis and a<<if $activeSlave.genes == "XY">>n artificial<</if>> vagina. - <<elseif ($activeSlave.dick != 0) && ($activeSlave.vagina != -1) && ($activeSlave.foreskin >= 1)>> - <br> - $He has an uncircumcised penis and a<<if $activeSlave.genes == "XY">>n artificial<</if>> vagina. - <</if>> -<<else>> - <<if ($activeSlave.dick != 0) && ($activeSlave.vagina == -1)>> - <br> - $He has a penis. - <<elseif ($activeSlave.dick != 0) && ($activeSlave.ovaries != 0)>> - <br> - $He has a penis and a vagina. - <<elseif ($activeSlave.dick != 0) && ($activeSlave.vagina != -1)>> - <br> - $He has a penis and a<<if $activeSlave.genes == "XY">>n artificial<</if>> vagina. + | [[Remove pussy|Surgery Degradation][$activeSlave.vagina = -1,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregSource = 0,$activeSlave.vaginalSkill = 0,$activeSlave.vaginalAccessory = "none",cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 20,$surgeryType = "vaginaRemoval"]] <<if $activeSlave.ovaries == 1>>//This will remove $his ovaries as well//<</if>> <</if>> <</if>> <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>> <<if ($activeSlave.vagina == -1) && ($activeSlave.dick != 0)>> - [[Convert genitalia to female|Surgery Degradation][$activeSlave.dick = 0,$activeSlave.dickAccessory = "none",$activeSlave.dickTat = 0,$activeSlave.foreskin = 0,$activeSlave.scrotum = 0,$activeSlave.balls = 0,$activeSlave.ballType = "human",$activeSlave.vasectomy = 0,$activeSlave.vagina = 0,$activeSlave.preg = -2,$activeSlave.vaginalSkill = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $surgeryType = "mtf"]] + | [[Convert genitalia to female|Surgery Degradation][$activeSlave.dick = 0,$activeSlave.dickAccessory = "none",$activeSlave.dickTat = 0,$activeSlave.foreskin = 0,$activeSlave.scrotum = 0,$activeSlave.balls = 0,$activeSlave.ballType = "human",$activeSlave.vasectomy = 0,$activeSlave.vagina = 0,$activeSlave.preg = -2,$activeSlave.vaginalSkill = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $surgeryType = "mtf"]] <</if>> <<if ($activeSlave.vagina == -1) && ($activeSlave.dick == 0) && ($surgeryUpgrade == 1)>> | [[Create a vagina|Surgery Degradation][$activeSlave.vagina = 0,$activeSlave.vaginalSkill = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $surgeryType = "ntf"]] @@ -1166,6 +1144,22 @@ Work on $his sex: <</if>> <</if>> +<<if ($activeSlave.vagina > 3)>> + <br> + $His vagina could benefit from surgical repair. + [[Repair pussy|Surgery Degradation][$activeSlave.vagina = 3,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "vagina"]] //This will reduce $his vaginal skills// +<<elseif ($surgeryUpgrade == 1) && ($activeSlave.indentureRestrictions < 2)>> + <<if ($activeSlave.vagina > 1)>> + <br> + $His vaginal muscles could benefit from microsurgical rejuvenation. + [[Tighten pussy|Surgery Degradation][$activeSlave.vagina = 1,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "vagina"]] //This will reduce $his vaginal skills// + <<elseif ($activeSlave.vagina > 0)>> + <br> + $His pussy is as tight as a virgin's, and $his hymen could be restored. + [[Restore virginity|Surgery Degradation][$activeSlave.vagina = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "vagina"]] //This will reduce $his vaginal skills// + <</if>> +<</if>> + <<if ($activeSlave.balls > 0)>> <<if ($activeSlave.balls == 1)>> <br> -- GitLab