diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 00364e7dad2a0a9118c3f5362a48b8696e7e3869..987049b859ec9bf14b45d0ad357f93de93cd0ffc 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,10 +2,17 @@
0.10.7.0/1
+3/02/18
+
+ 381
+ -ocular implants now get consumed on use
+ -fixed minor text bugs
+
3/01/18
380
-addition gui support for jquery (git only for now)
+ -crimeanon's secEx replenish all option and fixes
2/28/18
diff --git a/src/interaction/cyberConfig.tw b/src/interaction/cyberConfig.tw
index 51ac5a01124190fe3051354356bd5170dd103615..4033214b7ea0fcf13bf98bf317aa7adab944d0a7 100644
--- a/src/interaction/cyberConfig.tw
+++ b/src/interaction/cyberConfig.tw
@@ -4,7 +4,7 @@
<<case 0>>
This room is lined with shelves and cabinets, it could be easily mistaken for a storage room if it were not for examination table in its center.<br>
- <<set $nextButton to "Back", $nextLink to "Slave Interact">>
+ <<set $nextButton = "Back", $nextLink = "Slave Interact">>
<<if $activeSlave.amp != 1>>
Your slave $activeSlave.slaveName is obediently waiting for your instructions.
<<else>>
@@ -21,47 +21,47 @@
They are turned off.
<</if>>
<br><br>
- <<if $activeSlave.eyes != 1>>[[Restore vision|cyberConfig][$activeSlave.eyes to 1,$temp to 3]] | <</if>>
- <<if $activeSlave.eyes != -1>>[[Blur|cyberConfig][$activeSlave.eyes to -1,$temp to 3]] | <</if>>
- <<if $activeSlave.eyes != -2>>[[Disable|cyberConfig][$activeSlave.eyes to -2,$temp to 3]]<</if>>
+ <<if $activeSlave.eyes != 1>>[[Restore vision|cyberConfig][$activeSlave.eyes = 1,$temp = 3]] | <</if>>
+ <<if $activeSlave.eyes != -1>>[[Blur|cyberConfig][$activeSlave.eyes = -1,$temp = 3]] | <</if>>
+ <<if $activeSlave.eyes != -2>>[[Disable|cyberConfig][$activeSlave.eyes = -2,$temp = 3]]<</if>>
$pronounCap currently has $activeSlave.eyeColor lenses equipped.
<br>
Swap out $possessive lenses:
- [[Blue|cyberConfig][$activeSlave.eyeColor to "blue",$temp to 2,$cash -= $modCost]]
- | [[Black|cyberConfig][$activeSlave.eyeColor to "black",$temp to 2,$cash -= $modCost]]
- | [[Brown|cyberConfig][$activeSlave.eyeColor to "brown",$temp to 2,$cash -= $modCost]]
- | [[Green|cyberConfig][$activeSlave.eyeColor to "green",$temp to 2,$cash -= $modCost]]
- | [[Turquoise|cyberConfig][$activeSlave.eyeColor to "turquoise",$temp to 2,$cash -= $modCost]]
- | [[Sky-blue|cyberConfig][$activeSlave.eyeColor to "sky-blue",$temp to 2,$cash -= $modCost]]
- | [[Hazel|cyberConfig][$activeSlave.eyeColor to "hazel",$temp to 2,$cash -= $modCost]]
- | [[Pale-grey|cyberConfig][$activeSlave.eyeColor to "pale-grey",$temp to 2,$cash -= $modCost]]
- | [[White|cyberConfig][$activeSlave.eyeColor to "white",$temp to 2,$cash -= $modCost]]
- | [[Pink|cyberConfig][$activeSlave.eyeColor to "pink",$temp to 2,$cash -= $modCost]]
- | [[Amber|cyberConfig][$activeSlave.eyeColor to "amber",$temp to 2,$cash -= $modCost]]
- | [[Red|cyberConfig][$activeSlave.eyeColor to "red",$temp to 2,$cash -= $modCost]]
- | [[Catlike|cyberConfig][$activeSlave.eyeColor to "catlike",$temp to 2,$cash -= $modCost]]
- | [[Serpent-like|cyberConfig][$activeSlave.eyeColor to "serpent-like",$temp to 2,$cash -= $modCost]]
- | [[Devilish|cyberConfig][$activeSlave.eyeColor to "devilish",$temp to 2,$cash -= $modCost]]
- | [[Demonic|cyberConfig][$activeSlave.eyeColor to "demonic",$temp to 2,$cash -= $modCost]]
- | [[Hypnotic|cyberConfig][$activeSlave.eyeColor to "hypnotic",$temp to 2,$cash -= $modCost]]
- | [[Heart-shaped|cyberConfig][$activeSlave.eyeColor to "heart-shaped",$temp to 2,$cash -= $modCost]]
+ [[Blue|cyberConfig][$activeSlave.eyeColor = "blue",$temp = 2,$cash -= $modCost]]
+ | [[Black|cyberConfig][$activeSlave.eyeColor = "black",$temp = 2,$cash -= $modCost]]
+ | [[Brown|cyberConfig][$activeSlave.eyeColor = "brown",$temp = 2,$cash -= $modCost]]
+ | [[Green|cyberConfig][$activeSlave.eyeColor = "green",$temp = 2,$cash -= $modCost]]
+ | [[Turquoise|cyberConfig][$activeSlave.eyeColor = "turquoise",$temp = 2,$cash -= $modCost]]
+ | [[Sky-blue|cyberConfig][$activeSlave.eyeColor = "sky-blue",$temp = 2,$cash -= $modCost]]
+ | [[Hazel|cyberConfig][$activeSlave.eyeColor = "hazel",$temp = 2,$cash -= $modCost]]
+ | [[Pale-grey|cyberConfig][$activeSlave.eyeColor = "pale-grey",$temp = 2,$cash -= $modCost]]
+ | [[White|cyberConfig][$activeSlave.eyeColor = "white",$temp = 2,$cash -= $modCost]]
+ | [[Pink|cyberConfig][$activeSlave.eyeColor = "pink",$temp = 2,$cash -= $modCost]]
+ | [[Amber|cyberConfig][$activeSlave.eyeColor = "amber",$temp = 2,$cash -= $modCost]]
+ | [[Red|cyberConfig][$activeSlave.eyeColor = "red",$temp = 2,$cash -= $modCost]]
+ | [[Catlike|cyberConfig][$activeSlave.eyeColor = "catlike",$temp = 2,$cash -= $modCost]]
+ | [[Serpent-like|cyberConfig][$activeSlave.eyeColor = "serpent-like",$temp = 2,$cash -= $modCost]]
+ | [[Devilish|cyberConfig][$activeSlave.eyeColor = "devilish",$temp = 2,$cash -= $modCost]]
+ | [[Demonic|cyberConfig][$activeSlave.eyeColor = "demonic",$temp = 2,$cash -= $modCost]]
+ | [[Hypnotic|cyberConfig][$activeSlave.eyeColor = "hypnotic",$temp = 2,$cash -= $modCost]]
+ | [[Heart-shaped|cyberConfig][$activeSlave.eyeColor = "heart-shaped",$temp = 2,$cash -= $modCost]]
<</if>>
<<if $activeSlave.PLimb > 0>><br><br>
$pronounCap has PLimb interface installed. You can assign and adjust $possessive prosthetics here.
<<if $activeSlave.amp <= -1>><br>
$possessiveCap prosthetics are currently attached, if you wish to change them you will first need to detach them.<br>
- [[Detach|cyberConfig][$temp to 1,$nextButton to "Continue", $nextLink to "cyberConfig"]]
+ [[Detach|cyberConfig][$temp = 1,$nextButton = "Continue", $nextLink = "cyberConfig"]]
<<else>><br>
- <<if $stockpile.basicPLimb > 0>>[[Attach basic limbs|cyberConfig][$temp to 4, $activeSlave.amp to -1, $stockpile.basicPLimb -= 1]]<</if>>
- <<if $stockpile.advSexPLimb > 0>>[[Attach sex limbs|cyberConfig][$temp to 4, $activeSlave.amp to -2, $stockpile.advSexPLimb -= 1]]<</if>>
- <<if $stockpile.advGracePLimb > 0>>[[Attach beauty limbs|cyberConfig][$temp to 4, $activeSlave.amp to -3, $stockpile.advGracePLimb -= 1]]<</if>>
- <<if $stockpile.advCombatPLimb > 0>>[[Attach combat limbs|cyberConfig][$temp to 4, $activeSlave.amp to -4, $stockpile.advCombatPLimb -= 1]]<</if>>
+ <<if $stockpile.basicPLimb > 0>>[[Attach basic limbs|cyberConfig][$temp = 4, $activeSlave.amp = -1, $stockpile.basicPLimb -= 1]]<</if>>
+ <<if $stockpile.advSexPLimb > 0>>[[Attach sex limbs|cyberConfig][$temp = 4, $activeSlave.amp = -2, $stockpile.advSexPLimb -= 1]]<</if>>
+ <<if $stockpile.advGracePLimb > 0>>[[Attach beauty limbs|cyberConfig][$temp = 4, $activeSlave.amp = -3, $stockpile.advGracePLimb -= 1]]<</if>>
+ <<if $stockpile.advCombatPLimb > 0>>[[Attach combat limbs|cyberConfig][$temp = 4, $activeSlave.amp = -4, $stockpile.advCombatPLimb -= 1]]<</if>>
<<if $activeSlave.PLimb == 2>>
- <<if $stockpile.cyberneticPLimb > 0>>[[Attach cybernetic limbs|cyberConfig][$temp to 4, $activeSlave.amp to -5, $stockpile.cyberneticPLimb -= 1]]<</if>>
+ <<if $stockpile.cyberneticPLimb > 0>>[[Attach cybernetic limbs|cyberConfig][$temp = 4, $activeSlave.amp = -5, $stockpile.cyberneticPLimb -= 1]]<</if>>
<<else>>
//To equip more advanced prosthetics you will need to upgrade your slaves' PLimb interface.//
<</if>>
@@ -76,14 +76,14 @@
<</if>>
<<case 1>>
- <<set $temp to 0, $nextButton to "Continue", $nextLink to "cyberConfig">>
- <<if $activeSlave.amp is -1>><<set $stockpile.basicPLimb += 1>>
- <<elseif $activeSlave.amp is -2>><<set $stockpile.advSexPLimb += 1>>
- <<elseif $activeSlave.amp is -3>><<set $stockpile.advGracePLimb += 1>>
- <<elseif $activeSlave.amp is -4>><<set $stockpile.advCombatPLimb += 1>>
- <<elseif $activeSlave.amp is -5>><<set $stockpile.cyberneticPLimb += 1>>
+ <<set $temp = 0, $nextButton = "Continue", $nextLink = "cyberConfig">>
+ <<if $activeSlave.amp == -1>><<set $stockpile.basicPLimb += 1>>
+ <<elseif $activeSlave.amp == -2>><<set $stockpile.advSexPLimb += 1>>
+ <<elseif $activeSlave.amp == -3>><<set $stockpile.advGracePLimb += 1>>
+ <<elseif $activeSlave.amp == -4>><<set $stockpile.advCombatPLimb += 1>>
+ <<elseif $activeSlave.amp == -5>><<set $stockpile.cyberneticPLimb += 1>>
<</if>>
- <<set $activeSlave.amp to 1>>
+ <<set $activeSlave.amp = 1>>
Due to built-in safeties it is necessary to remove each limb separately, first releasing the lock and then waiting for automated seal release.<br>
<<if ($activeSlave.devotion > 20)>>
You instruct $possessive to lie down on the table and proceed to remove $possessive limbs. $pronounCap <<if canSee($activeSlave)>>watches<<else>>listens<</if>> with interest as you work.<<if ($activeSlave.devotion > 50)>> As you remove the last limb $pronoun playfully wiggles $possessive stumps at you.<</if>>
@@ -92,10 +92,10 @@
<</if>>
<<case 2>>
- <<set $temp to 0, $nextButton to "Continue", $nextLink to "cyberConfig">>
+ <<set $temp = 0, $nextButton = "Continue", $nextLink = "cyberConfig">>
<<if $activeSlave.amp != 1>>You have $possessive lie down and<<else>>You<</if>> use speculum to keep $possessive eyes open while you disengage $possessive lenses remotely and swap them out with $possessive new $activeSlave.eyeColor lenses.
<<case 3>>
- <<set $temp to 0, $nextButton to "Continue", $nextLink to "cyberConfig">>
+ <<set $temp = 0, $nextButton = "Continue", $nextLink = "cyberConfig">>
<<if $activeSlave.eyes == 1>>
$pronounCap blinks as $possessive vision returns.
<<elseif $activeSlave.eyes == -1>>
@@ -104,7 +104,7 @@
$pronounCap has a panicked expression when $possessive vision suddenly goes out.
<</if>>
<<case 4>>
- <<set $temp to 0, $nextButton to "Continue", $nextLink to "cyberConfig">>
+ <<set $temp = 0, $nextButton = "Continue", $nextLink = "cyberConfig">>
Attaching $possessive limbs is a simple procedure, simply push connector on each limb into the socket in $possessive implants until lock engages.<<if $activeSlave.PLimb == 2>> $pronounCap jumps a bit as limbs connect to $possessive nerves.<</if>> When you are done, $pronoun sits up and
<<if $activeSlave.amp == -2>>experimentally engages the vibe function in $possessive fingers.
<<elseif $activeSlave.amp == -3>>runs a hand over the smooth skin of $possessive new legs.
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index dd4fc84297e99432ae883fef9e2c0281d54e339f..64a5168e7aece655a5369e75378c02d109921c43 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -273,7 +273,7 @@ She sees you examining at her, and looks back at you submissively, too tired to
<<link "Make her the face of an ad campaign">>
<<replace "#name">>$activeSlave.slaveName<</replace>>
<<replace "#result">>
- You bring her out to a pretty balcony and put her through an extended photoshoot. She has no idea what you're planning, but she's skilled enough not to need to. She dons different outfits, changes makeup, and even shifts personas for the camera, producing hundreds of elegant, sensual and eye-catching images. You dismiss her back to the club when you're done, and she clearly thinks little of it. The next day, however, you walk her out onto the club in the morning. When the two of you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> and DJ, reach the main club, she stops short when she catches sight of the main billboard screen. There she is, resplendent and opulent, ten meters tall, giving the viewer a sultry look. She only breaks down for a single moment, but it's quite a moment: she cries rather inelegantly, <<if canTalk($activeSlave)>><<say sobb>>ing "I love you <<Master>>" into your ear<</if>> before giving you a @@.hotpink;wet kiss.@@ Then she runs over to stand under the screen, looking back at you to give you a @@.green;picture-perfect@@ imitation of the billboard she's standing under before laughing at herself a little.
+ You bring her out to a pretty balcony and put her through an extended photoshoot. She has no idea what you're planning, but she's skilled enough not to need to. She dons different outfits, changes makeup, and even shifts personas for the camera, producing hundreds of elegant, sensual and eye-catching images. You dismiss her back to the club when you're done, and she clearly thinks little of it. The next day, however, you walk her out onto the club in the morning. When the two of you, <<WrittenMaster>> and DJ, reach the main club, she stops short when she catches sight of the main billboard screen. There she is, resplendent and opulent, ten meters tall, giving the viewer a sultry look. She only breaks down for a single moment, but it's quite a moment: she cries rather inelegantly, <<if canTalk($activeSlave)>><<say sobb>>ing "I love you <<Master>>" into your ear<</if>> before giving you a @@.hotpink;wet kiss.@@ Then she runs over to stand under the screen, looking back at you to give you a @@.green;picture-perfect@@ imitation of the billboard she's standing under before laughing at herself a little.
<<set $cash -= 1000>>
<<set $rep += 500>>
<<set $activeSlave.devotion += 4>>
@@ -282,7 +282,7 @@ She sees you examining at her, and looks back at you submissively, too tired to
<br><<link "Keep her to yourself for a week">>
<<replace "#name">>$activeSlave.slaveName<</replace>>
<<replace "#result">>
- Exclusivity and slavery interact in ways more than merely complex. $activeSlave.slaveName's most passionate devotees are devastated to find her nowhere but by your side for the whole week. Their reaction is mixed: awe, envy, resentment; but mostly @@.green;renewed respect@@ that she is your creature, and yours alone. A lesser slave might show off the particularity you show her, bringing shame on you by giving the impression that you care for her as more than a slave. She is no lesser slave, though, and thoroughly understands the fine line the two of you must walk as <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> and slave. She makes @@.hotpink;painstakingly@@ clear, through every public glance and gesture, that she is yours as a matter of @@mediumaquamarine;trust@@ rather than as a matter of love.
+ Exclusivity and slavery interact in ways more than merely complex. $activeSlave.slaveName's most passionate devotees are devastated to find her nowhere but by your side for the whole week. Their reaction is mixed: awe, envy, resentment; but mostly @@.green;renewed respect@@ that she is your creature, and yours alone. A lesser slave might show off the particularity you show her, bringing shame on you by giving the impression that you care for her as more than a slave. She is no lesser slave, though, and thoroughly understands the fine line the two of you must walk as <<WrittenMaster>> and slave. She makes @@.hotpink;painstakingly@@ clear, through every public glance and gesture, that she is yours as a matter of @@.mediumaquamarine;trust@@ rather than as a matter of love.
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.trust += 4>>
<<set $rep += 100>>
@@ -305,7 +305,7 @@ She sees you examining at her, and looks back at you submissively, too tired to
<<link "Use her ass as she looks after herself">>
<<replace "#name">>$activeSlave.slaveName<</replace>>
<<replace "#result">>
- Wordlessly, you<<if ($PC.dick == 0)>> don a strap-on and<</if>> come up behind her; the first thing to touch her is <<if ($PC.dick == 0)>>the phallus<<else>>your rapidly hardening dick<</if>>, which pokes against <<if $activeSlave.height >= 170>>right up against her asshole, since she's nice and tall enough for standing anal. She gasps a little and angles her hips to accept your cock.<<else>>her lower back, since she's shorter than you. She gasps a little and hikes herself up on tiptoe to accept your cock.<</if>> As she feels you slide into her body she whimpers with devotion, turning her upper body so she can kiss her <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> while he sodomizes her. <<if !canTalk($activeSlave)>>She uses gestures to thank you for making her feel like the milkers do.<<else>>"<<S>>o thi<<s>> i<<s>> how it feel<<s>> when I do them," she whispers.<</if>> She uses the lotion to masturbate while she takes it, wincing whenever she loses control and squeezes her sore cock too hard. When you're done she sinks to the bathroom floor in a boneless pool of @@.hotpink;satisfied sexual exhaustion,@@ dripping ejaculate from her front<<if ($PC.dick == 0)>><<else>> and back<</if>>.
+ Wordlessly, you<<if ($PC.dick == 0)>> don a strap-on and<</if>> come up behind her; the first thing to touch her is <<if ($PC.dick == 0)>>the phallus<<else>>your rapidly hardening dick<</if>>, which pokes against <<if $activeSlave.height >= 170>>right up against her asshole, since she's nice and tall enough for standing anal. She gasps a little and angles her hips to accept your cock.<<else>>her lower back, since she's shorter than you. She gasps a little and hikes herself up on tiptoe to accept your cock.<</if>> As she feels you slide into her body she whimpers with devotion, turning her upper body so she can kiss her <<WrittenMaster>> while he sodomizes her. <<if !canTalk($activeSlave)>>She uses gestures to thank you for making her feel like the milkers do.<<else>>"<<S>>o thi<<s>> i<<s>> how it feel<<s>> when I do them," she whispers.<</if>> She uses the lotion to masturbate while she takes it, wincing whenever she loses control and squeezes her sore cock too hard. When you're done she sinks to the bathroom floor in a boneless pool of @@.hotpink;satisfied sexual exhaustion,@@ dripping ejaculate from her front<<if ($PC.dick == 0)>><<else>> and back<</if>>.
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.analCount += 1>>
<<set $analTotal += 1>>
diff --git a/src/uncategorized/multiImplant.tw b/src/uncategorized/multiImplant.tw
index b52d0542adadc95f954966738f0784ca9b56107b..970f9003755770c94183cd32302bcd52e411e746 100644
--- a/src/uncategorized/multiImplant.tw
+++ b/src/uncategorized/multiImplant.tw
@@ -84,8 +84,8 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<if _slaveOrgans.eyes != 0>>
<<if ($activeSlave.eyes == -2) && $activeSlave.origEye != "implant">>
<<set $cash -= $surgeryCost>>
- <<set $activeSlave.eyes to 1>>
- <<set $activeSlave.eyeColor to $activeSlave.origEye>>
+ <<set $activeSlave.eyes = 1>>
+ <<set $activeSlave.eyeColor = $activeSlave.origEye>>
/* no way to salvage original eye color */
<<set $activeSlave.health -= 20>>
<<if $organFarmUpgrade == 2>>
@@ -97,10 +97,10 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<elseif $activeSlave.origEye == "implant">>
<<set $cash -= $surgeryCost>>
<<set $stockpile.ocularImplant++>>
- <<set $activeSlave.eyes to 1>>
+ <<set $activeSlave.eyes = 1>>
<<set _oldEyes = $genePool.find(function(s) { return s.ID = $activeSlave.ID; })>>
<<set $activeSlave.origEye = _oldEyes.origEye>>
- <<set $activeSlave.eyeColor to $activeSlave.origEye>>
+ <<set $activeSlave.eyeColor = $activeSlave.origEye>>
<<set $activeSlave.health -= 20>>
<<if $organFarmUpgrade == 2>>
<<set $activeSlave.chem += 20>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 9848980bb507d9b9278a4b183bfea47c53606300..a1c4bad7e0b213b5a8a11bc93ef7d69b363c10f5 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -150,7 +150,7 @@ $possessiveCap $activeSlave.faceShape face is
<</if>>
<<if ($cyberMod == 1) && ($stockpile.ocularImplant > 0) && ($activeSlave.origEye != "implant")>>
<<if ($activeSlave.eyes != -3)>> | <</if>>
- | [[Give her ocular implants|Surgery Degradation][$activeSlave.origEye = "implant",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "ocular implant"]]
+ | [[Give her ocular implants|Surgery Degradation][$activeSlave.origEye = "implant", $stockpile.ocularImplant--,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "ocular implant"]]
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 27454553bec0383894916cb7482c53ea453a9143..c97ab48a68c2cd5005e73575980c0e8cdaf96c50 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -27,6 +27,7 @@
<<if ($activeSlave.health < random(-100,-80)) && ($surgeryType != "braces") && ($surgeryType != "removeBraces")>>
$activeSlave.slaveName @@.red;has died from complications of surgery.@@
+ <<if $surgeryType == "ocular implant">>At least the ocular implants are still good.<<set $stockpile.ocularImplant++>><</if>>
<<include "Remove activeSlave">>
<<set $nextLink = "Main">>
<<elseif $surgeryType == "breastShapePreservation" && (($activeSlave.health-($activeSlave.boobs/1000)) < random(-100,-80))>>