From dbc153f8ad18f2649bce1e6b0ab9d44edb310347 Mon Sep 17 00:00:00 2001 From: DCoded <dcoded@live.com> Date: Mon, 11 Feb 2019 09:34:18 -0500 Subject: [PATCH] Fixes and cleanup --- devNotes/legacy files/artWidgets-legacy | 2 +- src/facilities/nursery/childInteract.tw | 2 +- src/uncategorized/RESS.tw | 6 ++---- src/uncategorized/assistantEvents.tw | 4 ++-- src/uncategorized/slaveInteract.tw | 2 +- src/utility/descriptionWidgetsPiercings.tw | 12 +++--------- 6 files changed, 10 insertions(+), 18 deletions(-) diff --git a/devNotes/legacy files/artWidgets-legacy b/devNotes/legacy files/artWidgets-legacy index 2ab0c78478d..c9b8a29c6e1 100644 --- a/devNotes/legacy files/artWidgets-legacy +++ b/devNotes/legacy files/artWidgets-legacy @@ -257,7 +257,7 @@ $args[2]: icon UI Display for vector art, 1 for on. <<print "<img class='paperdoll' src=" + _folderLoc + "/body/addon/clit piercing.svg'" + "/>">> <<elseif $args[0].clitPiercing == 2>> <<print "<img class='paperdoll' src=" + _folderLoc + "/body/addon/clit piercing heavy.svg'" + "/>">> - <<elseif $args[0].clitPiercing == 3>> + <<elseif $args[0].clitPiercing >= 3>> <<print "<img class='paperdoll' src=" + _folderLoc + "/body/addon/clit piercing smart.svg'" + "/>">> <</if>> <<if $args[0].vaginaPiercing == 1>> diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw index c90a3542104..bd04563d14d 100644 --- a/src/facilities/nursery/childInteract.tw +++ b/src/facilities/nursery/childInteract.tw @@ -904,7 +904,7 @@ Typical reward: ''<span id="standardReward">$activeChild.standardReward</span>.' <<if $activeChild.clitPiercing >= 3>> <br> <<if $activeChild.dick < 1>> - $His smart clit piercing is set to + $His <<if $activeSlave.clitPiercing == 4>>advanced<<else>>smart<</if>> clit piercing is set to <<else>>$His smart frenulum piercing is set to <</if>> <strong><span id="setting">$activeChild.clitSetting</span></strong>. diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 58cc4a7344f..4b6ae1dc759 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -10180,10 +10180,8 @@ You tell $him kindly that you understand, and that $he'll be trained to address You explain the effects of the <<if ($activeSlave.aphrodisiacs > 0) || $activeSlave.inflationType == "aphrodisiac">> sex drugs - <<elseif ($activeSlave.clitPiercing == 3) && ($activeSlave.clitSetting != "none")>> - smart <<if $activeSlave.vagina > -1>>clit<<else>>frenulum<</if>> piercing - <<elseif ($activeSlave.clitPiercing == 4) && ($activeSlave.clitSetting != "none")>> - advanced <<if $activeSlave.vagina > -1>>clit<<else>>frenulum<</if>> piercing + <<elseif ($activeSlave.clitPiercing >= 3) && ($activeSlave.clitSetting != "none")>> + <<if $activeSlave.clitPiercing == 4>>advanced<<else>>smart<</if>> <<if $activeSlave.vagina > -1>>clit<<else>>frenulum<</if>> piercing <<else>> slave food <</if>> diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw index e0e4d57a976..9984e5bb05d 100644 --- a/src/uncategorized/assistantEvents.tw +++ b/src/uncategorized/assistantEvents.tw @@ -38,7 +38,7 @@ One morning, after seeing to an immense pile of business with $assistantName pro <</if>> <<set _smartPiercings = 0>> <<for $i = 0; $i < $slaves.length; $i++>> - <<if ($slaves[$i].clitPiercing == 3)>> + <<if ($slaves[$i].clitPiercing >= 3)>> <<set _smartPiercings = 1>> <<break>> <</if>> @@ -1163,7 +1163,7 @@ and asks, "May I have a name?" <<set $marketAssistantAnnounced = 1>> <<set _smartPiercings = 0>> <<for $i = 0; $i < $slaves.length; $i++>> - <<if ($slaves[$i].clitPiercing == 3)>> + <<if ($slaves[$i].clitPiercing >= 3)>> <<set _smartPiercings = 1>> <<break>> <</if>> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index aa8f6147ad5..2b4dc9cd8c9 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -1631,7 +1631,7 @@ Hormones: <strong><span id="hormones"> <<if $activeSlave.clitPiercing >= 3>> <br> <<if $activeSlave.dick < 1>> - $His smart clit piercing is set to + $His <<if $activeSlave.clitPiercing == 4>>advanced<<else>>smart<</if>> clit piercing is set to <<else>>$His smart frenulum piercing is set to <</if>> <strong><span id="setting">$activeSlave.clitSetting</span></strong>. diff --git a/src/utility/descriptionWidgetsPiercings.tw b/src/utility/descriptionWidgetsPiercings.tw index 658901bdd18..1d59e5c3bff 100644 --- a/src/utility/descriptionWidgetsPiercings.tw +++ b/src/utility/descriptionWidgetsPiercings.tw @@ -286,11 +286,7 @@ Since $he's wearing slutty bangles $he has a short length of light chain dangling from $his clit ring; it constantly stimulates $his pussylips. <</if>> <<elseif ($activeSlave.clitPiercing >= 3) && ($activeSlave.vagina != -1) && ($activeSlave.dick == 0)>> - <<if $activeSlave.clitPiercing == 3>> - $He has a smart piercing in $his clit. - <<else>> - $He has an advanced piercing in $his clit. - <</if>> + $He has <<if $activeSlave.clitPiercing == 4>>an advanced<<else>>a smart<</if>> piercing in $his clit. <<elseif ($activeSlave.clitPiercing == 1)>> $He has a simple dickhead stud. <<elseif ($activeSlave.clitPiercing == 2)>> @@ -298,10 +294,8 @@ <<if ($activeSlave.clothes == "slutty jewelry")>> Since $he's wearing slutty bangles $he has a short length of light chain dangling from $his dickhead piercing; as $he moves it tugs lightly at $his cock. <</if>> - <<elseif ($activeSlave.clitPiercing == 3)>> - $He has a smart frenulum piercing. - <<elseif ($activeSlave.clitPiercing == 4)>> - $He has an advanced frenulum piercing. + <<elseif ($activeSlave.clitPiercing >= 3)>> + $He has <<if $activeSlave.clitPiercing == 4>>an advanced<<else>>a smart<</if>> frenulum piercing. <</if>> <<if $activeSlave.fuckdoll > 0>>It anchors the suit's material.<</if>> <</widget>> -- GitLab