diff --git a/devTools/FC.d.ts b/devTools/FC.d.ts index fe3cc903d631966127416c4d0829d5df7d3d888f..a652e7bc901b4ae34b6480ad89440a21d3c28522 100644 --- a/devTools/FC.d.ts +++ b/devTools/FC.d.ts @@ -197,6 +197,8 @@ declare namespace App { inflationType: string; brandTarget: string; brandDesign: string; + scarTarget: string; + scarDesign: string; hornColor: string; } diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index eeadfc021f3e83e67885f523015e4a465e184978..ab3616afe5834070edec79a81f8c78347754a791 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1024,6 +1024,10 @@ You should have received a copy of the GNU General Public License along with thi <<set $brandTarget = {primary: "buttock", secondary: "buttock", local: "buttock"}>> <<set $brandDesign = {primary: "your initials", local: "your initials"}>> +<<set $scarTarget = {primary: "left cheek", secondary: "left cheek", local: "left cheek"}>> +<<set $scarDesign = {primary: 1, local: 1}>> + + <<set $oralTotal = 0>> <<set $vaginalTotal = 0>> <<set $analTotal = 0>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index c5b651341614d86bec7c2d34fbc0102d0a47f433..69e69c1208dd88c5a313db4d7f7f2cf016461655 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -54,6 +54,13 @@ <<set $brandDesign.official = "your personal symbol">> <</if>> +<<if ndef $scarTarget>> + <<set $scarTarget = {primary: "left cheek", secondary: "left cheek", local: "left cheek"}>> +<</if>> +<<if ndef $scarDesign>> + <<set $scarDesign = {primary: 1, local: 1}>> +<</if>> + <<if def $servantMilkersJobs>> <<unset $servantMilkersJobs>> <</if>> diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw index f7bb9432a996416cda33539c6b434031fa3dc4dd..d61a46ad7b9b957aea2247f4e9d093e473363c8f 100644 --- a/src/uncategorized/bodyModification.tw +++ b/src/uncategorized/bodyModification.tw @@ -1103,3 +1103,196 @@ Or a custom site: <<textbox "$brandTarget.local" $brandTarget.local "Body Modifi <br> $He has an intricate tattoo on $his lower belly that suggests $he was made to be bred. [[Remove it|Body Modification][$activeSlave.breedingMark = 0]] <</if>> + +<br><br> + +/* Scars */ + + +<<switch $scarDesign.local>> + <<case 1>> + <<set _printScar = "light scarring">> + <<case 2>> + <<set _printScar = "heavy scarring">> + <<case 3>> + <<set _printScar = "fresh scarring">> + <<case 4>> + <<set _printScar = "burns">> + <<case 5>> + <<set _printScar = "a menacing scar">> + <<case 6>> + <<set _printScar = "an exotic scar">> + <<case 7>> + <<if _scarName === "belly">> + <<set _printScar = "a cSection">> + <<else>> + <<set _printScar = "a surgical scar">> + <</if>> + <<default>> + <<set _printScar = $scarDesign.local>> +<</switch>> + + +Scars: +<<for _scarName, _scar range $activeSlave.scar>> + <br> + <<switch _scar>> + <<case 1>> + $His _scarName is marked with light scarring: + <<case 2>> + $His _scarName is marked with heavy scarring: + <<case 3>> + $His _scarName is marked with fresh scarring: + <<case 4>> + $His _scarName is marked with burns: + <<case 5>> + $His _scarName is marked with a menacing scar: + <<case 6>> + $His _scarName is marked with an exotic scar: + <<case 7>> + <<if _scarName === "belly">> + $His _scarName is marked with a cSection: + <<else>> + $His _scarName is marked with a surgical scar: + <</if>> + <<default>> + $His _scarName is marked with _scar: + <</switch>> + <<capture _scarName>> + <<link "Remove Scar">> + <<set $scarApplied = 0>> + <<run delete $activeSlave.scar[_scarName]>> + <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>> + <<set $degradation -= 10>> + <<goto "Body Modification">> + <</link>> + <</capture>> +<</for>> +<<if (jQuery.isEmptyObject($activeSlave.scar))>> + <br> + $His skin is not scared. +<</if>> + +<br> +Use ''_printScar'' or choose another scar: + +[[Light scarring|Body Modification][$scarDesign.local = 1]] +| [[Heavy scarring|Body Modification][$scarDesign.local = 2]] +| [[Fresh scarring|Body Modification][$scarDesign.local = 3]] +| [[Burns|Body Modification][$scarDesign.local = 4]] +| [[A menacing scar|Body Modification][$scarDesign.local = 5]] +| [[An exotic scar|Body Modification][$scarDesign.local = 6]] +| [[A surgical scar|Body Modification][$scarDesign.local = 7]] + +<br> +Or design your own: <<textbox "$scarDesign.local" $scarDesign.local "Body Modification">> + + +<br> +Choose a site for scaring: +/* Sorted head to toe */ +/* Head */ +<<if $activeSlave.earShape != "none">>[[Ears|Body Modification][$scarTarget.local = "ear"]]<</if>> +| [[Cheeks|Body Modification][$scarTarget.local = "cheek"]] +| [[Neck|Body Modification][$scarTarget.local = "neck"]] + +/* Torso */ +| [[Chest|Body Modification][$scarTarget.local = "chest"]] +| [[Breasts|Body Modification][$scarTarget.local = "breast"]] +| [[Back|Body Modification][$scarTarget.local = "back"]] +| [[Lower Back|Body Modification][$scarTarget.local = "lower back"]] +| [[Belly|Body Modification][$scarTarget.local = "belly"]] +| [[Pubic Mound|Body Modification][$scarTarget.local = "pubic mound"]] +<<if $activeSlave.dick > 0>> + | [[Penis|Body Modification][$scarTarget.local = "penis"]] +<</if>> +<<if $activeSlave.balls > 0 && $activeSlave.scrotum > 0>> + | [[Testicles|Body Modification][$scarTarget.local = "testicle"]] +<</if>> + +/* Arms*/ +| [[Shoulders|Body Modification][$scarTarget.local = "shoulder"]] +<<if $activeSlave.amp == 0 && $activeSlave.missingArms != 3>> + | [[Arm, upper|Body Modification][$scarTarget.local = "upper arm"]] + | [[Arm, lower|Body Modification][$scarTarget.local = "lower arm"]] + | [[Wrists|Body Modification][$scarTarget.local = "wrist"]] + | [[Hands|Body Modification][$scarTarget.local = "hand"]] +<</if>> + +/* Legs */ +| [[Buttocks|Body Modification][$scarTarget.local = "buttock"]] +<<if $activeSlave.amp == 0 && $activeSlave.missingLegs != 3>> + | [[Thighs|Body Modification][$scarTarget.local = "thigh"]] + | [[Calves|Body Modification][$scarTarget.local = "calf"]] + | [[Ankles|Body Modification][$scarTarget.local = "ankle"]] + | [[Feet|Body Modification][$scarTarget.local = "foot"]] +<</if>> + +/* scaring expansion contributed by Anon1888 */ + +<br> +Or a custom site: <<textbox "$scarTarget.local" $scarTarget.local "Body Modification">> + +<br> +<<if ["ankle", "breast", "buttock", "calf", "cheek", "ear", "foot", "hand", "lower arm", "shoulder", "testicle", "thigh", "upper arm", "wrist"].includes($scarTarget.local)>> + <<set _leftTarget = ("left " + $scarTarget.local)>> + <<set _rightTarget = ("right " + $scarTarget.local)>> + <<if $activeSlave.scar[_leftTarget]>> + $His _leftTarget is already marked with <<print $activeSlave.scar[_leftTarget]>>. + <</if>> + <<if $activeSlave.scar[_rightTarget]>> + $His _rightTarget is already marked with <<print $activeSlave.scar[_rightTarget]>>. + <</if>> + Scar $him now with ''_printScar'' on the + <<link "left">> + <<set $scarApplied = 1>> + <<set $activeSlave.scar[_leftTarget] = $scarDesign.local>> + <<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>> + <<set $degradation += 10>> + <<goto "Body Modification">> + <</link>> + $scarTarget.local, or the + <<link "right">> + <<set $scarApplied = 1>> + <<set $activeSlave.scar[_rightTarget] = $scarDesign.local>> + <<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>> + <<set $degradation += 10>> + <<goto "Body Modification">> + <</link>>? //scaring will slightly reduce $his beauty but may slowly increase your reputation.// +<<else>> + <<if $activeSlave.scar[$scarTarget.local] === $scarDesign.local>> + $He already has _printScar on $his $scarTarget.local. + <<else>> + <<link "Scar">> + <<set $scarApplied = 1>> + <<set $activeSlave.scar[$scarTarget.local] = $scarDesign.local>> + <<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>> + <<set $degradation += 10>> + <<goto "Body Modification">> + <</link>> + with _printScar on the $scarTarget.local<<if $activeSlave.scar[$scarTarget.local]>>, covering the + <<switch $activeSlave.scar[$scarTarget.local]>> + <<case 1>> + light scarring + <<case 2>> + heavy scarring + <<case 3>> + fresh scarring + <<case 4>> + burns + <<case 5>> + a menacing scar + <<case 6>> + an exotic scar + <<case 7>> + <<if $scarTarget.local === "belly">> + cSection + <<else>> + surgical scar + <</if>> + <<default>> + $activeSlave.scar[$scarTarget.local] + <</switch>> + that is already there?<<else>>.<</if>> //Scaring will slightly reduce $his beauty but may slowly increase your reputation.// + <</if>> +<</if>> \ No newline at end of file