diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index c51108d9c802290f6f89dbfa77e664869d615e67..e0b5a57741d8aa0dc9ef46dade2d5fb9cea5009a 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -1872,6 +1872,7 @@ is clit pierced
1 - yes
2 - heavy
3 - smart
+4 - advanced
clitSetting:
diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw
index 75abf368f29948f0bf93ec5b605b191cca57f4af..b9d8b9ce53782bad4ed64d8bea9be8c805f776ea 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -222,7 +222,7 @@
<<set _atkMod -= 0.10>>
<<set _defMod -= 0.10>>
<<set _tacChance -= 0.20>>
- <<elseif $assistantPower == 2>>
+ <<elseif $assistantPower == 3>>
<<set _atkMod += 0.15>>
<<set _defMod += 0.15>>
<<set _tacChance += 0.30>>
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 2743b8d2a15541298895fd45acd50141ad81279d..414c273e75d68829921af3e46aeccd896f80bcad 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -926,7 +926,7 @@
your assistant gives a rather poor field performance, due to the limited computing power available to _himA.
<<elseif $assistantPower == 1>>
your assistant performs decently. While nothing to write home about your men are pleasantly surprised.
- <<elseif $assistantPower == 2>>
+ <<elseif $assistantPower >= 2>>
your assistant performs admirably. _HisA vast computing power allows _himA to be everywhere on the battlefield, greatly enhancing the efficiency of your troops and the effectiveness of your battle plan.
<</if>>
<<elseif $leadingTroops == "bodyguard">>
diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index 54c7f81e2f2342ac77b4aa6e1f50369b7b22df9c..fd60787105ec32a617d5013a990e598a3ea4e39b 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -80,7 +80,7 @@
<<if $assistantPower == 1>>
<<set _lostCash -= 20000>>
<br>Fortunately, the computing power available to $assistantName allowed _himA to somewhat limit the losses.
- <<elseif $assistantPower == 2>>
+ <<elseif $assistantPower >= 2>>
<<set _lostCash -= 30000>>
<br>Fortunately, the computing power available to $assistantName allowed _himA to limit the losses.
<</if>>
diff --git a/src/SecExp/tradeReport.tw b/src/SecExp/tradeReport.tw
index b5df9dfc6694ec0093c6070dfdf4d9a8da3e66fe..fa33a67889149ca0ed085d4fc6a45228aa49ebdf 100644
--- a/src/SecExp/tradeReport.tw
+++ b/src/SecExp/tradeReport.tw
@@ -47,7 +47,7 @@
<<if $assistantPower == 1>>
Thanks to the computing power available to her, $assistantName is able to guide the commercial development of the arcology to greater levels. <<set _tradeChange++>>
-<<elseif $assistantPower == 2>>
+<<elseif $assistantPower >= 2>>
Thanks to the incredible computing power available to her, $assistantName is able to guide the commercial development of the arcology to greater levels. <<set _tradeChange += 2>>
<</if>>
diff --git a/src/art/artJS.js b/src/art/artJS.js
index fb8a7fce5d0208aa9650e3f5fab470af0b117565..ac994a3b5efc68aded894289e131d7f74f84fc97 100644
--- a/src/art/artJS.js
+++ b/src/art/artJS.js
@@ -3560,7 +3560,7 @@ window.VectorArt = (function (artSlave) {
r += jsInclude("Art_Vector_Clit_Piercing");
else if (slave.clitPiercing === 2)
r += jsInclude("Art_Vector_Clit_Piercing_Heavy");
- else if (slave.clitPiercing === 3)
+ else if (slave.clitPiercing === 3 || slave.clitPiercing === 4)
r += jsInclude("Art_Vector_Clit_Piercing_Smart");
}
}
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/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw
index 0cf445c450cbe4848da0258342a75d6d3d5759af..ca02263569c789aadb0321857441964a9ee7b6f6 100644
--- a/src/cheats/mod_EditChildCheatNew.tw
+++ b/src/cheats/mod_EditChildCheatNew.tw
@@ -2915,6 +2915,7 @@
<<radiobutton "$tempSlave.clitPiercing" 1>> Standard
<<radiobutton "$tempSlave.clitPiercing" 2>> Big
<<radiobutton "$tempSlave.clitPiercing" 3>> Smart piercing
+ <<radiobutton "$tempSlave.clitPiercing" 4>> Advanced piercing
<br>
''Pussylips piercings (0-2): @@.yellow;$tempSlave.vaginaPiercing@@''
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index bb9a18a01e782b80889f8e07caac2dac2c1f6f76..b60dbf29a5d195f0b2802ce2afc8244ee5ba35c5 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -1460,6 +1460,7 @@ Paraphilias:
<<radiobutton "$tempSlave.clitPiercing" 1>> Standard
<<radiobutton "$tempSlave.clitPiercing" 2>> Big
<<radiobutton "$tempSlave.clitPiercing" 3>> Smart Piercing
+<<radiobutton "$tempSlave.clitPiercing" 4>> Advanced Piercing
<br>
''Pussylips piercings (0-2): $tempSlave.vaginaPiercing''
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index a4692a3fd827b99e915b717bd56fc282a9cbcfbf..be752d8843ab18384e49da88d4cc5427503eaad0 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -3664,6 +3664,7 @@
<<radiobutton "$tempSlave.clitPiercing" 1>> Standard
<<radiobutton "$tempSlave.clitPiercing" 2>> Big
<<radiobutton "$tempSlave.clitPiercing" 3>> Smart piercing
+ <<radiobutton "$tempSlave.clitPiercing" 4>> Advanced piercing
<br>
''Pussylips piercings (0-2): @@.yellow;$tempSlave.vaginaPiercing@@''
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index 3b68c62da0f8dd1c242242fe1356e14a742c5d89..c90a3542104917b193b17b09fdc69c8cbafaebee 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -901,7 +901,7 @@ 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
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 94026f56c35bc21483cff86afdd58fd3d0868f77..8f4bed063bfff12ff8a4f7d9560e468934218e26 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -2193,6 +2193,8 @@ window.DefaultRules = (function() {
if (rule.clitPiercing === 3)
cashX(-1000, "slaveMod");
+ else if (rule.clitPiercing === 4)
+ cashX(-5000, "slaveMod");
else
cashX(forceNeg(V.modCost), "slaveMod", slave);
}
@@ -2336,7 +2338,7 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessSmartPiercings(slave, rule) {
- if ((slave.clitPiercing === 3)) {
+ if ((slave.clitPiercing >= 3)) {
let _used = 0;
if (rule.clitSetting !== undefined && (rule.clitSetting !== "no default setting")) {
if (slave.clitSetting !== rule.clitSetting) {
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 6ef1a9c7f7fec1854373a66c78dfaf9fbc210d7d..ddc98c3653ed9ca07972d17158760721bf29012f 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -876,6 +876,7 @@ App.Entity.SlaveState = class SlaveState {
* * 1: yes
* * 2: heavy
* * 3: smart
+ * * 4: advanced
*/
this.clitPiercing = 0;
/**
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 62ea88d163ae3c8e1fb13e00e316f4aafdb3140f..05874759ee5532693116a8a0e2789c4756f19272 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -100,7 +100,7 @@ window.PiercingScore = /** @param {App.Entity.SlaveState} slave */ function (sla
if (slave.tonguePiercing > 0 ) {
piercingScore += slave.tonguePiercing*0.75-0.25;
}
- if (slave.clitPiercing === 3) {
+ if (slave.clitPiercing >= 3) {
piercingScore += 1.25; /* smart piercing */
} else if (slave.clitPiercing > 0) {
piercingScore += slave.clitPiercing*0.75-0.25;
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 5e7917ef37ff16968fcb2869e30c722bd61a7f69..bad5c1431f63d58beedfb791b1fc2156f2d68909 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -290,7 +290,7 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
slave.areolaePiercing = Math.clamp(+slave.areolaePiercing, 0, 2) || 0;
slave.corsetPiercing = Math.clamp(+slave.corsetPiercing, 0, 1) || 0;
slave.navelPiercing = Math.clamp(+slave.navelPiercing, 0, 2) || 0;
- slave.clitPiercing = Math.clamp(+slave.clitPiercing, 0, 3) || 0;
+ slave.clitPiercing = Math.clamp(+slave.clitPiercing, 0, 4) || 0;
slave.vaginaPiercing = Math.clamp(+slave.vaginaPiercing, 0, 2) || 0;
slave.dickPiercing = Math.clamp(+slave.dickPiercing, 0, 2) || 0;
slave.anusPiercing = Math.clamp(+slave.anusPiercing, 0, 2) || 0;
@@ -864,7 +864,7 @@ window.childPiercingsDatatypeCleanup = function childPiercingsDatatypeCleanup(ch
child.areolaePiercing = Math.clamp(+child.areolaePiercing, 0, 2) || 0;
child.corsetPiercing = Math.clamp(+child.corsetPiercing, 0, 1) || 0;
child.navelPiercing = Math.clamp(+child.navelPiercing, 0, 2) || 0;
- child.clitPiercing = Math.clamp(+child.clitPiercing, 0, 3) || 0;
+ child.clitPiercing = Math.clamp(+child.clitPiercing, 0, 4) || 0;
child.vaginaPiercing = Math.clamp(+child.vaginaPiercing, 0, 2) || 0;
child.dickPiercing = Math.clamp(+child.dickPiercing, 0, 2) || 0;
child.anusPiercing = Math.clamp(+child.anusPiercing, 0, 2) || 0;
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 8009942fcfbdc36d704301077f5c23a3b67560bf..f9daa49363c33083c9dc5138f06e28afa93b35ce 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -2684,7 +2684,8 @@ window.rulesAssistantOptions = (function() {
["None", 0],
["Light", 1],
["Heavy", 2],
- ["Smart (expensive)", 3]
+ ["Smart (expensive)", 3],
+ ["Advanced", 4]
];
super("Clit piercing", pairs);
this.setValue(current_rule.set.clitPiercing);
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 10485bc49124e4a386320ba667cfce3609fa1cfa..0147847318b1a30bfbd2c7b058b1147e40994c64 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -193,7 +193,7 @@ window.SlaveSummaryUncached = (function(){
if (slave.attrKnown === 1)
short_attraction(slave);
}
- if (slave.clitPiercing === 3) {
+ if (slave.clitPiercing >= 3) {
short_smart_fetish(slave);
short_smart_attraction(slave);
}
@@ -208,7 +208,7 @@ window.SlaveSummaryUncached = (function(){
if (slave.attrKnown === 1)
long_attraction(slave);
}
- if (slave.clitPiercing === 3) {
+ if (slave.clitPiercing >= 3) {
long_smart_fetish(slave);
long_smart_attraction(slave);
}
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 859270205d47a8dd9c9bd6e88455acd6b2ae2ea9..f02033a127488c9075f837dbb2f16ca7661c0310 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1670,6 +1670,9 @@ Setting missing global variables:
<<if ndef $assistantPower>>
<<set $assistantPower = 0>>
<</if>>
+<<if ndef $smartPiercings>>
+ <<set $smartPiercings = 0>>
+<</if>>
<<if ndef $CulturalOpenness>>
<<set $CulturalOpenness = 0>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 2c927d2b557a04d26cdf87b60c7e82093438b71d..58cc4a7344f35c3605c92d26e93552a910cba88f 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.
@@ -10181,6 +10181,8 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<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
<<else>>
slave food
@@ -17730,7 +17732,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..e0e4d57a9764852c10852856b3190a9a62353071 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -18,6 +18,7 @@ One morning, after seeing to an immense pile of business with $assistantName pro
"However, if I understand the line of questioning correctly, I can make myself more entertaining, if you wish." The voice grows sultry and feminine. "I'd be happy to speak a little differently, to refer to myself as female, and to act as though some of the more complex sex toys in the arcology are, well, me."
<<case "assistant SP">>
+/* TODO: update this with advanced piercings */
<<set $assistantOptions = 1>>
<<set _smartPiercings = 0>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index f1d23864cb8129fc3b51d49d27037e4a5a28115b..539f70c0902156d3a27ffb2bb82818eb19b6229d 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -380,7 +380,9 @@ Piercings:
Choose piercing style:
<<if $piercingLevel != 1>>[[Light|Body Modification][$piercingLevel = 1]]<<else>>Light<</if>>
<<if $piercingLevel != 2>>| [[Heavy|Body Modification][$piercingLevel = 2]]<<else>>| Heavy<</if>>
-<<if $piercingLevel != 3>>| [[Smart|Body Modification][$piercingLevel = 3]]<<else>>| Smart<</if>>
+<<if $smartPiercings > 0>>
+ <<if $piercingLevel != 3>>| [[Smart|Body Modification][$piercingLevel = 3]]<<else>>| Smart<</if>>
+<</if>>
<<if $piercingLevel != 0>>| [[Remove|Body Modification][$piercingLevel = 0]]<<else>>| Remove<</if>>
@@ -496,14 +498,23 @@ Choose piercing style:
<<if $activeSlave.anusPiercing != 2>> | [[Anus|Body Modification][$activeSlave.anusPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>>
<</if>>
-<<if $piercingLevel == 3>>
- <<if ($activeSlave.vagina != -1) || ($activeSlave.dick != 0)>>
- <<if $activeSlave.clitPiercing != 3>>
- <br>
- Give $him a [[smart piercing?|Body Modification][$activeSlave.clitPiercing = 3,$activeSlave.clitSetting = "all",cashX(forceNeg($SPcost), "slaveMod", $activeSlave),$degradation += 1]] //Costs <<print cashFormat($SPcost)>>, unlocks options to mold sexuality//
- <<else>>
- <br>
- $He already has a smart piercing!
+<<if $smartPiercings > 0>>
+ <<if $piercingLevel >= 3>>
+ <<if ($activeSlave.vagina != -1) || ($activeSlave.dick != 0)>>
+ <<if $activeSlave.clitPiercing < 3>>
+ <br>
+ $He does not have a smart piercing.
+ [["Give " + $him + " one"|Body Modification][$activeSlave.clitPiercing = 3,$activeSlave.clitSetting = "all",cashX(forceNeg($SPcost), "slaveMod", $activeSlave),$degradation += 1]]
+ //Will cost <<print cashFormat($SPcost)>> and unlocks options to mold sexuality//
+ <<elseif $activeSlave.clitPiercing < 4>>
+ <br>
+ $He has a standard smart piercing.
+ [[Upgrade to an advanced smart piercing|Body Modification][$activeSlave.clitPiercing = 4,$activeSlave.clitSetting = "all",cashX(forceNeg($SPcost*5), "slaveMod", $activeSlave)]]
+ //Will cost <<print cashFormat($SPcost*5)>> and has a greater effect on sexuality//
+ <<else>>
+ <br>
+ //$He already has an advanced smart piercing//
+ <</if>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
index 94ab779deb786ace0c23e6b1fc3b1cce15d6085b..d6b8c75292b78a5488afdd9ced0ae3d18a80933a 100644
--- a/src/uncategorized/personalAssistantOptions.tw
+++ b/src/uncategorized/personalAssistantOptions.tw
@@ -30,14 +30,39 @@ __Computer Core Upgrades__
<br>
<<if $assistantPower == 0>>
- //The first upgrade needed is a switch to a holographic memory core to store the immense quantity of data $assistantName gathers. This upgrade will cost <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>.// [[Install holographic memory core|Personal assistant options][cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), "capEx"), $assistantPower += 1, $PC.engineering += 1, $PC.hacking += 1]]
+ The first upgrade needed is a switch to a holographic memory core to store the immense quantity of data $assistantName gathers.
+ //Will cost <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
+ [[Install holographic memory core|Personal assistant options][cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), "capEx"), $assistantPower += 1, $PC.engineering += 1, $PC.hacking += 1]]
<<elseif $assistantPower == 1>>
- //The final upgrade needed is a transition to optical RAM. This huge project will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>.// [[Install optical RAM|Personal assistant options][cashX(forceNeg(Math.trunc(50000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), "capEx"), $assistantPower += 1, $PC.engineering += 1, $PC.hacking += 1]]
+ The next upgrade needed is a liquid nitrogen cooling system to allow for extensive overclocking.
+ //Will cost <<print cashFormat(Math.trunc(35000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>> and will allow you to upgrade the smart piercings in $arcologies[0].name//
+ [[Install upgraded cooling system|Personal assistant options][cashX(forceNeg(Math.trunc(35000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), "capEx"), $assistantPower += 1, $PC.engineering += 1, $PC.hacking += 1]]
+<<elseif $assistantPower == 2>>
+ The final upgrade needed is a transition to optical RAM.
+ //Will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
+ [[Install optical RAM|Personal assistant options][cashX(forceNeg(Math.trunc(50000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), "capEx"), $assistantPower += 1, $PC.engineering += 1, $PC.hacking += 1]]
<<else>>
- //The arcology's computer core is fully upgraded.//
+ The arcology's computer core is fully upgraded.
<</if>>
<br>
+<<if $smartPiercings == 0>>
+ $arcologies[0].name cannot currently support any smart piercings.
+ //Will cost <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
+ [[Install a wireless reciever|Personal assistant options][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), "capEx"), $smartPiercings += 1]]
+ <br>
+<<elseif $smartPiercings == 1>>
+ $arcologies[0].name is able to use standard smart piercings, readily available on the market.
+ <<if $assistantPower > 1>>
+ //Will cost <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
+ [[Upgrade piercings|Personal assistant options][cashX(forceNeg(Math.trunc(15000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), "capEx"), $smartPiercings += 1]]
+ <</if>>
+ <br>
+<<elseif $smartPiercings == 2>>
+ $arcologies[0].name is capable of using an advanced, more powerful version of the standard smart piercing.
+ <br>
+<</if>>
+
<<if $assistantOptions>>
<br>
__Behavior settings:__
diff --git a/src/uncategorized/reStandardPunishment.tw b/src/uncategorized/reStandardPunishment.tw
index 951c44166578476b81b35a53aa08fc8676f3ba2b..4cac130d4db18a856d31d1b15d1a477e6789a1e5 100644
--- a/src/uncategorized/reStandardPunishment.tw
+++ b/src/uncategorized/reStandardPunishment.tw
@@ -186,7 +186,7 @@
<<EventNameDelink $activeSlave>>
<<replace "#result">>
Since you use chastity as a punishment, you're accustomed to using your office for supervising sexual denial. You order her to place her hands in one of the many sets of restraints set high up on the office walls for the purpose.
- <<if $activeSlave.clitPiercing != 3>>
+ <<if $activeSlave.clitPiercing < 3>>
You equip her with a set of smart vibrators. The first is attached <<if $activeSlave.dick > 0>>to her dickhead<<else>>against her clit<</if>>,
<<else>>
Her smart piercing makes the next step easy. She gets three vibrators in total:
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 64a15e71d9dd48f84151779815848eb6b7ea1bf9..da28372d9c27e460cf5d6331a0511b140c18b8d9 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -488,7 +488,7 @@
<<set $slaves[$i].fetishStrength += 4>>
<</if>>
<</switch>>
- <<if ($slaves[$i].clitPiercing != 3)>>
+ <<if ($slaves[$i].clitPiercing < 3)>>
<<if _fetishChangeChance > random(0,100)>>
<<switch $slaves[$i].behavioralQuirk>>
<<case "confident">>
@@ -629,7 +629,7 @@
<<set $slaves[$i].fetishStrength += 4>>
<</if>>
<</switch>>
- <<if ($slaves[$i].clitPiercing != 3)>>
+ <<if ($slaves[$i].clitPiercing < 3)>>
<<if _fetishChangeChance > random(0,100)>>
<<switch $slaves[$i].sexualQuirk>>
<<case "gagfuck queen">>
@@ -1586,8 +1586,9 @@
<</if>>
/* SMART PIERCING EFFECTS */
+/* TODO: update this for the advanced piercing */
-<<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.
<<elseif $slaves[$i].fetish == "mindbroken">>
@@ -1773,7 +1774,7 @@
<<if $slaves[$i].fuckdoll == 0>>
<<if ($slaves[$i].fetish != "mindbroken")>>
- <<if ($slaves[$i].clitPiercing != 3) || ($slaves[$i].clitSetting == "off") || ($slaves[$i].clitSetting == "none") || ($slaves[$i].clitSetting == "all") || ($slaves[$i].clitSetting == "men") || ($slaves[$i].clitSetting == "women")>>
+ <<if ($slaves[$i].clitPiercing < 3) || ($slaves[$i].clitSetting == "off") || ($slaves[$i].clitSetting == "none") || ($slaves[$i].clitSetting == "all") || ($slaves[$i].clitSetting == "men") || ($slaves[$i].clitSetting == "women")>>
<<if canDoAnal($slaves[$i])>>
<<if $slaves[$i].vagina > -1 && !canDoVaginal($slaves[$i])>>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index cf48b56d4c56f8c3da9e67549c4b59514c965ab1..56c0f40ea1de5381ffea485af52d3dfea704c9e9 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -830,9 +830,9 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea
A few of $his fans recognize $him and eagerly make use of $him.
<</if>>
-<<if ($slaves[$i].clitPiercing > 2) && ($slaves[$i].devotion >= -20)>>
+<<if ($slaves[$i].clitPiercing >= 3) && ($slaves[$i].devotion >= -20)>>
Almost everyone loves $his orgasms encouraged by $his smart piercing.
-<<elseif ($slaves[$i].clitPiercing > 2)>>
+<<elseif ($slaves[$i].clitPiercing >= 3)>>
Almost everyone appreciates $his reduced reluctance caused by $his smart piercing.
<</if>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index a7daf6d67828cd0662be7efb7c6badb771887b9a..be5f071b4e428268666263e6cc54451648e405a8 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -745,9 +745,9 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
<</if>>
<</if>>
-<<if ($slaves[$i].clitPiercing > 2) && ($slaves[$i].devotion >= -20)>>
+<<if ($slaves[$i].clitPiercing >= 3) && ($slaves[$i].devotion >= -20)>>
Almost everyone loves $his enthusiasm for sex encouraged by $his smart piercing.
-<<elseif ($slaves[$i].clitPiercing > 2)>>
+<<elseif ($slaves[$i].clitPiercing >= 3)>>
Almost everyone appreciates $his reduced reluctance towards sex encouraged by $his smart piercing.
<</if>>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index aeda3b784264ee8aa80e6404622a5e307d17952e..8ef9c12ccf19846ca61b42515e352e25a9a53784 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -4,8 +4,6 @@
<<set $showEncyclopedia = 1>><<set $encyclopedia = "The Auto Salon">>
-<<set _oldHLength = $activeSlave.hLength, _newHLength = 0>>
-
<h1>The Auto Salon</h1>
//$activeSlave.slaveName is seated in the auto salon. $He is awaiting your artistic pleasure.//
@@ -336,14 +334,14 @@
<<elseif $activeSlave.hLength < 150>>
| [[Apply extensions|Salon][$activeSlave.hLength += 10,cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<</if>>
- /* FIXME: get this to work
- | Custom length: <<textbox "_newHLength" _oldHLength "Salon">>
- <<if (_newHLength < _oldHLength) && (_newHLength > 0)>>
- <<set $activeSlave.hLength = _newHLength>>
+ | Custom length: <<textbox "$activeSlave.hLength" $activeSlave.hLength "Salon">>
+ <<if $showInches >= 1>>
+ cm (<<= cmToInchString($activeSlave.hLength)>>)
+ [[Apply|Salon][cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<<else>>
- <<set $activeSlave.hLength = _oldHLength>>
+ cm
+ [[Apply|Salon][cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<</if>>
- */
<br>
Have $his hair carefully maintained at its current length:
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 0bb68500f687419618fa9d61ee2f3538377fa2c1..63ec1b5f90b8763c42497eb4497ed97ab4b9ac2f 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1620,7 +1620,7 @@ 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
diff --git a/src/utility/descriptionWidgetsPiercings.tw b/src/utility/descriptionWidgetsPiercings.tw
index b061c126c13dcf64c8c7e1a360e4119782bd5024..658901bdd184992179a5fbfd305aa7434c7c3b44 100644
--- a/src/utility/descriptionWidgetsPiercings.tw
+++ b/src/utility/descriptionWidgetsPiercings.tw
@@ -285,8 +285,12 @@
<<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)>>
+ <<if $activeSlave.clitPiercing == 3>>
+ $He has a smart piercing in $his clit.
+ <<else>>
+ $He has an advanced piercing in $his clit.
+ <</if>>
<<elseif ($activeSlave.clitPiercing == 1)>>
$He has a simple dickhead stud.
<<elseif ($activeSlave.clitPiercing == 2)>>
@@ -294,8 +298,10 @@
<<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)>>
+ <<elseif ($activeSlave.clitPiercing == 3)>>
$He has a smart frenulum piercing.
+ <<elseif ($activeSlave.clitPiercing == 4)>>
+ $He has an advanced frenulum piercing.
<</if>>
<<if $activeSlave.fuckdoll > 0>>It anchors the suit's material.<</if>>
<</widget>>