From 00979af4b3d9719bdf92de7e20b418a5db7b708d Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Mon, 11 Feb 2019 09:26:35 -0500
Subject: [PATCH] Fixes and cleanup
---
devNotes/legacy files/artWidgets-legacy | 2 +-
src/art/artWidgets.tw | 2 +-
src/art/vector_revamp/vectorRevampedArtControl.js | 2 +-
src/facilities/nursery/childInteract.tw | 4 ++--
src/facilities/nursery/nursery.tw | 2 +-
src/uncategorized/RESS.tw | 8 ++++----
src/uncategorized/assistantEvents.tw | 4 ++--
src/uncategorized/saLongTermEffects.tw | 4 ++--
src/uncategorized/slaveInteract.tw | 4 ++--
src/utility/descriptionWidgetsPiercings.tw | 8 ++++----
10 files changed, 20 insertions(+), 20 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/art/artWidgets.tw b/src/art/artWidgets.tw
index 5155656a65a..75fdbc0ef47 100644
--- a/src/art/artWidgets.tw
+++ b/src/art/artWidgets.tw
@@ -272,7 +272,7 @@ vector art added later is drawn over previously added art
<<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/art/vector_revamp/vectorRevampedArtControl.js b/src/art/vector_revamp/vectorRevampedArtControl.js
index 1bc9c96030a..b47df8824f3 100644
--- a/src/art/vector_revamp/vectorRevampedArtControl.js
+++ b/src/art/vector_revamp/vectorRevampedArtControl.js
@@ -1036,7 +1036,7 @@ class RevampedArtControl {
result.push("Art_Vector_Revamp_Clit_Piercing");
else if (this.artSlave.clitPiercing == 2)
result.push("Art_Vector_Revamp_Clit_Piercing_Heavy");
- else if (this.artSlave.clitPiercing == 1)
+ else if (this.artSlave.clitPiercing >= 3)
result.push("Art_Vector_Revamp_Clit_Piercing_Smart");
return result;
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index 3b68c62da0f..bd04563d14d 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -901,10 +901,10 @@ Typical reward: ''<span id="standardReward">$activeChild.standardReward</span>.'
<<link "Have $him remain chaste">><<set $activeChild.releaseRules = "chastity">><<replace "#releaseRules">>$activeChild.releaseRules<</replace>><</link>>
/* TODO: will children be able to have clit piercings? */
-<<if $activeChild.clitPiercing == 3>>
+<<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/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 660d8036a8f..0e2205237ea 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -472,7 +472,7 @@ Target age for release: <<textbox "$targetAgeNursery" $targetAgeNursery "Nursery
<br>
<<for _c = 0; _c <$cribs.length; _c++>>
-<<capture _c>>
+<<capture $cribs[_c]>>
<<link "$cribs[_c].slaveName" "Long Child Description">>
<<include "Child Summary">>
<<set $activeChild = $cribs[_c]>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 2c927d2b557..4b6ae1dc759 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1542,7 +1542,7 @@ $He did not expect to find you here, and is so preoccupied that $he doesn't noti
<br><br>
<<if ($activeSlave.aphrodisiacs > 0) || $activeSlave.inflationType == "aphrodisiac">>
The aphrodisiacs racing through $his system have $him desperate to get off, right now.
-<<elseif ($activeSlave.clitPiercing == 3) && ($activeSlave.clitSetting != "none")>>
+<<elseif ($activeSlave.clitPiercing >= 3) && ($activeSlave.clitSetting != "none")>>
$His <<if $activeSlave.vagina > -1>>clit<<else>>frenulum<</if>> piercing is keeping $his arousal exquisitely balanced for $his inspection.
<<else>>
The mild aphrodisiacs in the slave food have clearly built up some arousal that $he hasn't been able to address recently.
@@ -10180,8 +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")>>
- 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>>
@@ -17730,7 +17730,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<else>>
thin
<</if>>
- waist, running your hands across $his skin. Then you <<if $activeSlave.clitPiercing == 3>>activate $his smart frenulum piercing<<else>>secure a couple of little egg vibes to $his dick<</if>>. $He gasps as the vibration starts, and then gasps again as $his anus tightens involuntarily with the stimulation, squeezing the <<if $PC.dick == 1>>warm penis<<else>>phallus<</if>> that fills it. $He <<if $activeSlave.voice > 0>>moans openly<<else>>rasps mutely<</if>> as you pull out and then thrust into $him. Much against $his will, $he <<if canAchieveErection($activeSlave)>>quickly becomes erect<<else>>starts to drip precum, which is $his ballsless body's way of showing arousal<</if>>.
+ waist, running your hands across $his skin. Then you <<if $activeSlave.clitPiercing >= 3>>activate $his <<if $activeSlave.clitPiercing == 4>>advanced<<else>>smart<</if>> frenulum piercing<<else>>secure a couple of little egg vibes to $his dick<</if>>. $He gasps as the vibration starts, and then gasps again as $his anus tightens involuntarily with the stimulation, squeezing the <<if $PC.dick == 1>>warm penis<<else>>phallus<</if>> that fills it. $He <<if $activeSlave.voice > 0>>moans openly<<else>>rasps mutely<</if>> as you pull out and then thrust into $him. Much against $his will, $he <<if canAchieveErection($activeSlave)>>quickly becomes erect<<else>>starts to drip precum, which is $his ballsless body's way of showing arousal<</if>>.
<<if $activeSlave.fetish == "buttslut">>
<<if $activeSlave.fetishKnown == 1>>
<<if $activeSlave.fetishStrength > 95>>
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index 9c65ac2f5fb..3fd41a543ff 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -37,7 +37,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>>
@@ -1162,7 +1162,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/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 64a15e71d9d..dde0e82bea7 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -1587,9 +1587,9 @@
/* SMART PIERCING EFFECTS */
-<<if ($slaves[$i].clitPiercing == 3)>>
+<<if ($slaves[$i].clitPiercing >= 3)>>
<<if $slaves[$i].fuckdoll > 0>>
- $His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing is slaved to $his stimulation systems.
+ $His <<if $activeSlave.clitPiercing == 4>>advanced<<else>>smart<</if>> <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing is slaved to $his stimulation systems.
<<elseif $slaves[$i].fetish == "mindbroken">>
The effects of $his smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing cannot reach $his shattered mind.
<<else>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 0bb68500f68..b6eede07b46 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1620,10 +1620,10 @@ Hormones: <strong><span id="hormones">
<</if>>
<</if>>
-<<if $activeSlave.clitPiercing == 3>>
+<<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 b061c126c13..1d59e5c3bff 100644
--- a/src/utility/descriptionWidgetsPiercings.tw
+++ b/src/utility/descriptionWidgetsPiercings.tw
@@ -285,8 +285,8 @@
<<if ($activeSlave.clothes == "slutty jewelry")>>
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 > 2) && ($activeSlave.vagina != -1) && ($activeSlave.dick == 0)>>
- $He has a smart piercing in $his clit.
+ <<elseif ($activeSlave.clitPiercing >= 3) && ($activeSlave.vagina != -1) && ($activeSlave.dick == 0)>>
+ $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)>>
@@ -294,8 +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 > 2)>>
- $He has a smart 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