diff --git a/devNotes/legacy files/artWidgets-legacy b/devNotes/legacy files/artWidgets-legacy index 2ab0c78478d5410310311d6a8f7604469c17435d..c9b8a29c6e17b3d7850f77a8e1f5e8e8639abfbb 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 5155656a65aba59a0607b30c31269ea1fb6c4a8d..75fdbc0ef47e5c86de576265c40d90bb799f79d2 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 1bc9c96030ae580fe5e39013bb20e16d58d8f856..b47df8824f3b4aa40e8897ecd912805ead68cf34 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 3b68c62da0f8dd1c242242fe1356e14a742c5d89..bd04563d14dccbcb91707ad0c05bd22f98ebc457 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 660d8036a8f0dc6ecf7d37d3f98ed0f3b610553f..0e2205237ead4b414711aeb0044b363b4940c571 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 2c927d2b557a04d26cdf87b60c7e82093438b71d..4b6ae1dc7594010559d2b441b42eae8ea8a3ddd2 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 9c65ac2f5fbda92648cd0176b20fdae93c528f82..3fd41a543ff664a8ac275a7434ddb5be666a7d7d 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 64a15e71d9dd48f84151779815848eb6b7ea1bf9..dde0e82bea7566ab721caa06e745666e4622cc0a 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 0bb68500f687419618fa9d61ee2f3538377fa2c1..b6eede07b46b9829f11c8a4b9d987f9ea3f6bc74 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 b061c126c13dcf64c8c7e1a360e4119782bd5024..1d59e5c3bff7a38885e22077ebeffbda2abc07bb 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>>