From 17b93ba350b3a9793c26865dc73ee655aa0029e7 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Thu, 14 Nov 2019 16:28:47 +0100
Subject: [PATCH] remove broken eye object
---
src/js/SlaveState.js | 6 ++-
src/js/surgery.js | 10 +----
src/pregmod/organFarmOptions.tw | 36 ++++++++---------
src/pregmod/seFCTVremote.tw | 13 ++++++-
src/uncategorized/RESS.tw | 39 +++++++++++++++++--
.../freeRangeDairyAssignmentScene.tw | 12 +++++-
src/uncategorized/remoteSurgery.tw | 13 +++----
7 files changed, 87 insertions(+), 42 deletions(-)
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index ef3382df424..f79030c5c06 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -669,10 +669,13 @@ App.Entity.SlaveState = class SlaveState {
/**
* eyes of the slave
*/
+ /*
this.eyeball = {
left: new App.Entity.EyeState(),
right: new App.Entity.EyeState()
};
+
+ */
/** slave hearing
*
* -2: deaf; -1: hard of hearing; 0: normal */
@@ -694,10 +697,11 @@ App.Entity.SlaveState = class SlaveState {
/**
* ears of the slave
*/
+ /*
this.auricle = {
left: new App.Entity.EarState(),
right: new App.Entity.EarState()
- };
+ };*/
/** sense of smell
0 - yes, -1 - no */
this.smells = 0;
diff --git a/src/js/surgery.js b/src/js/surgery.js
index 8c7bff3f518..d3b1a547085 100644
--- a/src/js/surgery.js
+++ b/src/js/surgery.js
@@ -517,17 +517,11 @@ window.surgeryAmp = function(slave, part) {
}
break;
case "left eye":
- slave.eyeball.left = null;
- if (!hasAnyEyes(slave)) {
- slave.eyes = -4;
- }
+ slave.eyes = -4;
slave.health -= 20;
break;
case "right eye":
- slave.eyeball.right = null;
- if (!hasAnyEyes(slave)) {
- slave.eyes = -4;
- }
+ slave.eyes = -4;
slave.health -= 20;
break;
default:
diff --git a/src/pregmod/organFarmOptions.tw b/src/pregmod/organFarmOptions.tw
index efd851e2661..935efd9b515 100644
--- a/src/pregmod/organFarmOptions.tw
+++ b/src/pregmod/organFarmOptions.tw
@@ -259,28 +259,24 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</if>>
<<if $slaveOrgans.eyes != 1>>
- <<if !hasBothNaturalEyes($activeSlave)>>
- <br>
- <<link "Eyes">>
- <<run cashX(-10000, "slaveSurgery", $activeSlave)>>
- <<set _newOrgan = {type: "eyes", weeksToCompletion: "10", ID: 0}>>
- <<set _newOrgan.ID = $activeSlave.ID>>
- <<set $organs.push(_newOrgan)>>
- <<goto "Remote Surgery">>
- <</link>> //Costs <<print cashFormat(10000)>> and is imperfect — eyes will lack natural color//
- <</if>>
+ <br>
+ <<link "Eyes">>
+ <<run cashX(-10000, "slaveSurgery", $activeSlave)>>
+ <<set _newOrgan = {type: "eyes", weeksToCompletion: "10", ID: 0}>>
+ <<set _newOrgan.ID = $activeSlave.ID>>
+ <<set $organs.push(_newOrgan)>>
+ <<goto "Remote Surgery">>
+ <</link>> //Costs <<print cashFormat(10000)>> and is imperfect — eyes will lack natural color//
<</if>>
<<if $slaveOrgans.ears != 1>>
- <<if !hasBothEars($activeSlave) || $activeSlave.earT == "none">>
- <br>
- <<link "Normal Ears">>
- <<run cashX(-1000, "slaveSurgery", $activeSlave)>>
- <<set _newOrgan = {type: "ears", weeksToCompletion: "2", ID: 0}>>
- <<set _newOrgan.ID = $activeSlave.ID>>
- <<set $organs.push(_newOrgan)>>
- <<goto "Remote Surgery">>
- <</link>> //Costs <<print cashFormat(1000)>>//
- <</if>>
+ <br>
+ <<link "Normal Ears">>
+ <<run cashX(-1000, "slaveSurgery", $activeSlave)>>
+ <<set _newOrgan = {type: "ears", weeksToCompletion: "2", ID: 0}>>
+ <<set _newOrgan.ID = $activeSlave.ID>>
+ <<set $organs.push(_newOrgan)>>
+ <<goto "Remote Surgery">>
+ <</link>> //Costs <<print cashFormat(1000)>>//
<</if>>
<<if $slaveOrgans.cochleae != 1>>
<<if $activeSlave.hears <= -2>>
diff --git a/src/pregmod/seFCTVremote.tw b/src/pregmod/seFCTVremote.tw
index a079f226483..acd3ab1e959 100644
--- a/src/pregmod/seFCTVremote.tw
+++ b/src/pregmod/seFCTVremote.tw
@@ -132,7 +132,18 @@ $He unboxes the new remote and turns $his back to you, eagerly demonstrating how
At the touch of a button, $his drone whirs to a stop and begins to fall to the floor. Before it hits, you touch a second and a dart hits $him in the neck. $He collapses into darkness.
<br><br>
- As the tech wakes up $he finds $himself resting on your couch, with you looking <<if hasAnyEyes($activeSlave)>>into $his eye<<if hasBothEyes($activeSlave)>>s<</if>><<else>>at $him<</if>> with concern. $He winces in pain and asks what happened. You gravely informed $him that $he must been working very hard and may have been dehydrated: $he passed out. $His back was quite bruised but other than some nausea, your systems report $he should be fine. You encourage $him to keep up $his fluids, then hand $him back $his communicator and mention it looks like $he is going to be late for $his other appointment. With a panicked look on $his face the tech thanks you, seizes $his device and heads out the door followed by $his drone. "I haven't seen that much debt outside of a slave in quite some time," $assistantName remarks. "$He's fortunate to have that job."
+ As the tech wakes up $he finds $himself resting on your couch, with you looking
+ /*<<if hasAnyEyes($activeSlave)>>
+ into $his eye<<if hasBothEyes($activeSlave)>>s<</if>>
+ <<else>>
+ at $him @Arkerthan
+ <</if>>*/
+ <<if $activeSlave.eyes > -2>>
+ into $his eyes
+ <<else>>
+ at $him
+ <</if>>
+ with concern. $He winces in pain and asks what happened. You gravely informed $him that $he must been working very hard and may have been dehydrated: $he passed out. $His back was quite bruised but other than some nausea, your systems report $he should be fine. You encourage $him to keep up $his fluids, then hand $him back $his communicator and mention it looks like $he is going to be late for $his other appointment. With a panicked look on $his face the tech thanks you, seizes $his device and heads out the door followed by $his drone. "I haven't seen that much debt outside of a slave in quite some time," $assistantName remarks. "$He's fortunate to have that job."
<br><br>
The tech, $activeSlave.slaveName, shoves $his way through the crowd as quickly as $he can. In front of $him no one pays much attention, but the crowd behind begins to titter and even point and laugh. Oblivious, $activeSlave.slaveName arrives at the desired address and pauses to catch a breath. Watching from the eyes of $his drone, you can tell $his back is stiff and $his running had been uncomfortable. You can't help but laugh at $his shirt. Unknown to $activeSlave.slaveName, the entire back of $his shirt has been replaced with a clear panel of similar feeling material. It clearly shows $his $activeSlave.skin skin, as well as $his new tattoo. Like the lettered shirt it replaced it also says "FCTV SERVICE" in identical block letters, but below that it reads
<<if $seeDicks == 0>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 35062449ccf..527a209267d 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -9733,7 +9733,13 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<link "Make an example by forcing $him to take a massive dose">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You take $him by the shoulders<<if hasAnyEyes($activeSlave)>>, look into $his eye<<if hasBothEyes($activeSlave)>>s<</if>>,<</if>> and tell $him you'll fix things so $he doesn't mind so much. $He looks hopeful, even when you tell $him to take $his pill. $He does, and you hand $him another. And another. $He's crying with dread by the fourth pill, knowing that this is $his punishment for complaining. $His pupils dilate, $he begins to breathe hard, and $his $activeSlave.skin skin flushes badly. $He tries to beg you to fuck $him but can't seem to find the words. $He begins to masturbate compulsively, so hard that $he collapses to the kitchen floor with $his first spastic orgasm.
+ You take $him by the shoulders<<if $activeSlave.eyes > -2>>,
+ look into $his eyes,
+ <</if>>
+ /*<<if hasAnyEyes($activeSlave)>>,
+ look into $his eye<<if hasBothEyes($activeSlave)>>s<</if>>, @Arkerthan
+ <</if>>*/
+ and tell $him you'll fix things so $he doesn't mind so much. $He looks hopeful, even when you tell $him to take $his pill. $He does, and you hand $him another. And another. $He's crying with dread by the fourth pill, knowing that this is $his punishment for complaining. $His pupils dilate, $he begins to breathe hard, and $his $activeSlave.skin skin flushes badly. $He tries to beg you to fuck $him but can't seem to find the words. $He begins to masturbate compulsively, so hard that $he collapses to the kitchen floor with $his first spastic orgasm.
<<if ($activeSlave.chastityPenis == 1)>>
$His cock is painfully compressed by $his chastity cage, but it does nothing to stop $his frantic efforts to come.
<<elseif canAchieveErection($activeSlave)>>
@@ -12336,7 +12342,21 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<link "Let $him speak briefly if $he's very quiet">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You stand up from your desk and approach $him very closely without touching $him. Looking straight <<if hasAnyEyes($activeSlave)>>into $his eye<<if hasBothEyes($activeSlave)>>s<</if>>, which are <<if canSee($activeSlave)>>fixed helplessly on you<<else>>gazing in your general direction<</if>><<else>>at $him<</if>>, you tell $him that you'll let $him say whatever it is $he needs to say to you, but only if $he's very quiet. $He <<if canSee($activeSlave)>>looks at you with huge eyes but<</if>> nods vigorously. $He waits until you lean into $him, making $him shiver at your proximity, before putting $his
+ You stand up from your desk and approach $him very closely without touching $him. Looking straight
+ /*<<if hasAnyEyes($activeSlave)>>
+ into $his eye<<if hasBothEyes($activeSlave)>>s<</if>>,
+ which are
+ <<if canSee($activeSlave)>>
+ fixed helplessly on you
+ <<else>>
+ gazing in your general direction
+ <</if>>
+ <<else>> @Arkerthan
+ at $him
+ <</if>>,
+ */
+ into $his eyes, which are fixed helplessly on you,
+ you tell $him that you'll let $him say whatever it is $he needs to say to you, but only if $he's very quiet. $He <<if canSee($activeSlave)>>looks at you with huge eyes but<</if>> nods vigorously. $He waits until you lean into $him, making $him shiver at your proximity, before putting $his
<<if $activeSlave.lips > 70>>
ridiculous
<<elseif $activeSlave.lips > 40>>
@@ -15565,7 +15585,10 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</if>>
sphincter,
<</if>>
- a gasp of air into $his lungs, and a slight shiver. There is a flaw at the corner of $his mouth that might be transitory pleasure, but a look <<if canSee($activeSlave)>>into $his eye<<if hasBothEyes($activeSlave)>>s<</if>><<else>>at $his face<</if>> confirms that it is not so.
+ a gasp of air into $his lungs, and a slight shiver. There is a flaw at the corner of $his mouth that might be transitory pleasure, but a look
+ /*<<if canSee($activeSlave)>>into $his eye<<if hasBothEyes($activeSlave)>>s<</if>><<else>>at $his face<</if>> @Arkerthan*/
+ into $his eyes
+ confirms that it is not so.
<</replace>>
<</link>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>//This option will take $his virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take $his anal virginity//<</if>>
<</if>>
@@ -17455,7 +17478,15 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</if>>
<</if>>
<br><br>
- There's a momentary flaw in $his rhythm, a catch in $his breath as $he realizes what you're doing, but $he gets right back into it, displaying $his pleasure with nothing more than a ghost of a smile<<if canSee($activeSlave) || canHear($activeSlave)>> and a <<if canSee($activeSlave)>>widening of $his eye<<if hasBothEyes($activeSlave)>>s<</if>> as $he looks you up and down<<else>>slight perk of $his ear<<if hasBothEars($activeSlave)>>s<</if>> as $he tracks your motion<</if>><</if>>. $He doesn't shove $himself against you; that would be coarse. Instead $he dances alluringly, just out of your grasp. Taking the dominant role, you encircle $him in your arms and draw $him in close, $his heat perceptible against your skin before the very first graze of $his $activeSlave.skin body against yours. $He continues to dance gorgeously as $he helps you out of your clothes.
+ There's a momentary flaw in $his rhythm, a catch in $his breath as $he realizes what you're doing, but $he gets right back into it, displaying $his pleasure with nothing more than a ghost of a smile/*<<if canSee($activeSlave) || canHear($activeSlave)>>
+ and a
+ <<if canSee($activeSlave)>>
+ widening of $his eye<<if hasBothEyes($activeSlave)>>s<</if>>as $he looks you up and down @Arkerthan
+ <<else>>
+ slight perk of $his ears as $he tracks your motion
+ <</if>>
+ <</if>>*/.
+ $He doesn't shove $himself against you; that would be coarse. Instead $he dances alluringly, just out of your grasp. Taking the dominant role, you encircle $him in your arms and draw $him in close, $his heat perceptible against your skin before the very first graze of $his $activeSlave.skin body against yours. $He continues to dance gorgeously as $he helps you out of your clothes.
<br><br>
When you're nude, $he turns $his back to you and starts to grind, letting you feel $his
<<if $activeSlave.weight > 160>>
diff --git a/src/uncategorized/freeRangeDairyAssignmentScene.tw b/src/uncategorized/freeRangeDairyAssignmentScene.tw
index d6d6242fed0..acfe4ef9b68 100644
--- a/src/uncategorized/freeRangeDairyAssignmentScene.tw
+++ b/src/uncategorized/freeRangeDairyAssignmentScene.tw
@@ -41,7 +41,17 @@ While <<if canWalk($activeSlave) >>walking<<else>>being carried<</if>> to $his d
<<if $slaves[_frdas].assignment == "work in the dairy" && $slaves[_frdas].ID != $activeSlave.ID && $slaves[_frdas].balls >= 10 && $slaves[_frdas].dick > 0>>
<<setLocalPronouns $slaves[_frdas] 2>>
<<set _aroused = true>>
- <br> The hyper-endowed cum-cow $slaves[_frdas].slaveName is the pride of $dairyName. _He2 is limply hanging on _his2 milking chair, panting heavily because of the constant suction on _his2 dick. _He2 is obviously nearing climax. Soon,<<if hasAnyNaturalEyes($slaves[_frdas])>>_his2 <<if hasBothNaturalEyes($slaves[_frdas])>>eyes bulge<<else>>eye bulges<</if>> and<</if>> _his2 muscles tense.
+ <br> The hyper-endowed cum-cow $slaves[_frdas].slaveName is the pride of $dairyName. _He2 is limply hanging on _his2 milking chair, panting heavily because of the constant suction on _his2 dick. _He2 is obviously nearing climax. Soon,
+ /*<<if hasAnyNaturalEyes($slaves[_frdas])>>
+ _his2
+ <<if hasBothNaturalEyes($slaves[_frdas])>>
+ eyes bulge
+ <<else>>
+ eye bulges
+ <</if>>
+ and @Arkerthan
+ <</if>>*/
+ _his2 muscles tense.
<<if $dairyStimulatorsSetting == 1>>
<<if $slaves[_frdas].prostate != 0>>
_His2 anus clenches around the dildo in _his2 rear. The automatic sodomizer speeds up to give _his2 prostate a helpful pounding.
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index f700ecb2f85..0b68e169bf6 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -148,15 +148,14 @@ $His $activeSlave.faceShape face is
<<if ($seeExtreme == 1)>>
<<if $activeSlave.indentureRestrictions < 1>>
- <<if hasAnyNaturalEyes($activeSlave)>>
- <<if (canSee($activeSlave))>>
+ <<if $activeSlave.eyes > -3>>
+ <<if $activeSlave.eyes > -2>>
| [[Blind|Surgery Degradation][$activeSlave.eyes = -2,$activeSlave.eyeColor = "dulled " + $activeSlave.origEye,$activeSlave.eyeColor = $activeSlave.origEye,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "blind"]]
<</if>>
- <<if (hasAnyEyes($activeSlave))>>
- | [[Remove eyes|Surgery Degradation][cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "remove eyes", surgeryAmp($activeSlave, "right eye"), surgeryAmp($activeSlave, "left eye")]]
- /* eyes are set in Surgery Degradation */
- <<if (canSee($activeSlave))>>//This will greatly restrict $him//<</if>>
- <</if>>
+ | [[Remove eyes|Surgery Degradation][cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "remove eyes", surgeryAmp($activeSlave, "right eye"), surgeryAmp($activeSlave, "left eye")]]
+ /* eyes are set in Surgery Degradation */
+ <<if (canSee($activeSlave))>>//This will greatly restrict $him//<</if>>
+ <<else>>
<<if isProstheticAvailable($activeSlave, "ocular")>>
| [["Give " + $him + " ocular implants"|Surgery Degradation][$activeSlave.eyesImplant = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "ocular implant"]]
<</if>>
--
GitLab