diff --git a/src/art/artWidgets.tw b/src/art/artWidgets.tw index 2499316887aa9e12460356a9e21104af983b289d..a129d50d5096642754c928139f82a8438c7ea710 100644 --- a/src/art/artWidgets.tw +++ b/src/art/artWidgets.tw @@ -254,13 +254,13 @@ vector art added later is drawn over previously added art <<else>> <<print "<img class='paperdoll' src=" + _imgSkinLoc + "/feet.svg'" + " style='"+ _skinFilter + "'>">> <</if>> -<<if $args[0].shoes == "extreme heels" or $args[0].shoes == "boots">> +<<if $args[0].shoes == "extreme heels" || $args[0].shoes == "boots">> <<if $args[0].fuckdoll != 0 || $args[0].clothes == "restrictive latex" || $args[0].clothes == "a latex catsuit">> <<set _shoesType = _shoesType + " latex">> <</if>> <<print "<img class='paperdoll' src=" + _folderLoc + "/outfit/" + _shoesType + ".svg'" + "/>">> <</if>> -<<if $args[0].shoes == "heels" or $args[0].shoes == "flats">> +<<if $args[0].shoes == "heels" || $args[0].shoes == "flats">> <<if $args[0].fuckdoll != 0 || $args[0].clothes == "restrictive latex" || $args[0].clothes == "a latex catsuit">> <<set _shoesType = _shoesType + " latex">> <<print "<img class='paperdoll' src=" + _folderLoc + "/outfit/" + _shoesType + ".svg'" + "/>">> @@ -356,7 +356,7 @@ vector art added later is drawn over previously added art <</if>> /% Glasses %/ -<<if $args[0].eyewear == "corrective glasses" or $args[0].eyewear == "glasses" or $args[0].eyewear == "blurring glasses">> +<<if $args[0].eyewear == "corrective glasses" || $args[0].eyewear == "glasses" || $args[0].eyewear == "blurring glasses">> <<print "<img class='paperdoll' src=" + _folderLoc + "/outfit/glasses.svg'" + "/>">> <</if>> diff --git a/src/art/vector/Head.tw b/src/art/vector/Head.tw index d14312f7a7ea383b274ebaebe67bc9f9d4094d92..d9eaa575ec295464c241a432f82d91aafff22b72 100644 --- a/src/art/vector/Head.tw +++ b/src/art/vector/Head.tw @@ -23,7 +23,7 @@ <<if _artSlave.collar == "massive dildo gag">> <<include Art_Vector_Massive_Dildo_Gag>> <</if>> -<<if _artSlave.eyewear == "corrective glasses" or _artSlave.eyewear == "glasses" or _artSlave.eyewear == "blurring glasses">> +<<if _artSlave.eyewear == "corrective glasses" || _artSlave.eyewear == "glasses" || _artSlave.eyewear == "blurring glasses">> <<include Art_Vector_Glasses>> <</if>> diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw index b8166af4ddcd5df52cc5fc9c24ef680a32ea734a..3f86c6a1fc46eee817fc8d7ea51247c944ca4233 100644 --- a/src/uncategorized/options.tw +++ b/src/uncategorized/options.tw @@ -17,7 +17,7 @@ End of week autosaving is currently @@.red;DISABLED@@. [[Enable|Options][$autosa End of week autosaving is currently @@.cyan;ENABLED@@. [[Disable|Options][$autosave = 0]] <</if>> -<<if ($releaseID >= 1000) || $ver.startsWith("0.9") or $ver.startsWith("0.8") or $ver.startsWith("0.7") or $ver.startsWith("0.6")>> +<<if ($releaseID >= 1000) || $ver.startsWith("0.9") || $ver.startsWith("0.8") || $ver.startsWith("0.7") || $ver.startsWith("0.6")>> <br><br> ''NEW GAME PLUS'' <br> diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw index e60c34c274f676f44aed89c1bc2584f1b8a983e0..e140289f4f84fb32cdfc276e4f23f70ca160fa60 100644 --- a/src/uncategorized/personalAssistantAppearance.tw +++ b/src/uncategorized/personalAssistantAppearance.tw @@ -3,7 +3,7 @@ <<set $seed = random(1,8)>> <<switch $assistantAppearance>> <<case "monstergirl">> -She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>>monstergirl with <<if $arcologies[0].FSSupremacist != "unset">><<if $arcologies[0].FSSupremacistRace == "black">><<print either("black", "brown", "light brown")>><<elseif $arcologies[0].FSSupremacistRace == "white">><<print either("pale", "tanned", "fair")>><<elseif $arcologies[0].FSSupremacistRace == "latina">><<print either("olive", "brown", "light brown")>><<elseif $arcologies[0].FSSupremacistRace == "indo-aryan" or $arcologies[0].FSSupremacistRace == "malay" or $arcologies[0].FSSupremacistRace == "pacific islander" or $arcologies[0].FSSupremacistRace == "amerindian">><<print either("dark", "light")>><<elseif $arcologies[0].FSSupremacistRace == "asian">><<print either("pale", "dark", "light")>><<elseif $arcologies[0].FSSupremacistRace == "middle eastern" or $arcologies[0].FSSupremacistRace == "semitic" or $arcologies[0].FSSupremacistRace == "southern european">><<print either("pale", "dark", "light")>><</if>><<else>>pale<</if>> skin, perky breasts, green tentacles instead of hair, and two dicks. Her eyes are large, expressive, and surprisingly innocent. +She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>>monstergirl with <<if $arcologies[0].FSSupremacist != "unset">><<if $arcologies[0].FSSupremacistRace == "black">><<print either("black", "brown", "light brown")>><<elseif $arcologies[0].FSSupremacistRace == "white">><<print either("pale", "tanned", "fair")>><<elseif $arcologies[0].FSSupremacistRace == "latina">><<print either("olive", "brown", "light brown")>><<elseif ["indo-aryan", "malay", "pacific islander", "amerindian"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark", "light")>><<elseif $arcologies[0].FSSupremacistRace == "asian">><<print either("pale", "dark", "light")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSupremacistRace)>><<print either("pale", "dark", "light")>><</if>><<else>>pale<</if>> skin, perky breasts, green tentacles instead of hair, and two dicks. Her eyes are large, expressive, and surprisingly innocent. <<if $assistantFSOptions>> <<switch $assistantFSAppearance>> <<case "paternalist">> @@ -80,7 +80,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0] <</if>> <<case "shemale">> -She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>>bimbo shemale with blonde hair, <<if $arcologies[0].FSSupremacist != "unset">><<if $arcologies[0].FSSupremacistRace == "black">><<print either("black", "brown", "light brown")>><<elseif $arcologies[0].FSSupremacistRace == "white">><<print either("tanned", "fair")>><<elseif $arcologies[0].FSSupremacistRace == "latina">><<print either("olive", "brown", "light brown")>><<elseif $arcologies[0].FSSupremacistRace == "indo-aryan" or $arcologies[0].FSSupremacistRace == "malay" or $arcologies[0].FSSupremacistRace == "pacific islander" or $arcologies[0].FSSupremacistRace == "amerindian">><<print either("dark", "tanned")>><<elseif $arcologies[0].FSSupremacistRace == "asian">><<print either("dark", "tanned")>><<elseif $arcologies[0].FSSupremacistRace == "middle eastern" or $arcologies[0].FSSupremacistRace == "semitic" or $arcologies[0].FSSupremacistRace == "southern european">><<print either("dark", "tanned")>><</if>><<else>>tanned<</if>> skin, huge lips, and ridiculous tits. Her cock hangs past her knees when limp. + +She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>>bimbo shemale with blonde hair, <<if $arcologies[0].FSSupremacist != "unset">><<if $arcologies[0].FSSupremacistRace == "black">><<print either("black", "brown", "light brown")>><<elseif $arcologies[0].FSSupremacistRace == "white">><<print either("tanned", "fair")>><<elseif $arcologies[0].FSSupremacistRace == "latina">><<print either("olive", "brown", "light brown")>><<elseif ["indo-aryan", "malay", "pacific islander", "amerindian"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark", "tanned")>><<elseif $arcologies[0].FSSupremacistRace == "asian">><<print either("dark", "tanned")>><<elseif ["middle eastern", "semitic", "southern european"].includes($arcologies[0].FSSupremacistRace)>><<print either("dark", "tanned")>><</if>><<else>>tanned<</if>> skin, huge lips, and ridiculous tits. Her cock hangs past her knees when limp. <<if $assistantFSOptions>> <<switch $assistantFSAppearance>> <<case "paternalist">> diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw index 2f3ef3425ecef06b682a8585b44223ead3187c5f..a965275af24cc2e50e6d6878e66eada59e49dab2 100644 --- a/src/utility/extendedFamilyWidgets.tw +++ b/src/utility/extendedFamilyWidgets.tw @@ -138,10 +138,10 @@ /*testtest grandchild passage - determines how many grandchildren the current slave has*/ <<for $i = 0; $i < $slaves.length; $i++>> <<if $slaves[$i].ID != $activeSlave.ID>> - <<if $activeSlave.ID == $slaves[$i].mother or $activeSlave.ID == $slaves[$i].father>> + <<if $activeSlave.ID == $slaves[$i].mother || $activeSlave.ID == $slaves[$i].father>> <<for $j = 0; $j < $slaves.length; $j++>> <<if $slaves[$i].ID != $slaves[$j].ID>> - <<if $slaves[$i].ID == $slaves[$j].mother or $slaves[$i].ID == $slaves[$j].father>> + <<if $slaves[$i].ID == $slaves[$j].mother || $slaves[$i].ID == $slaves[$j].father>> <<set $children.push($slaves[$j])>> <</if>> <</if>>