From dabd8beaccdefd08cf6c3044e207f8f574c7223b Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Thu, 7 Mar 2019 15:52:48 -0600
Subject: [PATCH] CustomS
---
src/js/eventSelectionJS.js | 8 ++++--
src/uncategorized/RESS.tw | 4 +--
src/uncategorized/RETS.tw | 4 +--
src/uncategorized/customSlave.tw | 33 ++++++++++++++++++++++
src/uncategorized/randomIndividualEvent.tw | 4 ++-
src/uncategorized/seCustomSlaveDelivery.tw | 2 ++
src/utility/slaveCreationWidgets.tw | 26 +++++++++++++++++
7 files changed, 74 insertions(+), 7 deletions(-)
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 265b4d9cd04..c20ae53c1b3 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -180,7 +180,9 @@ window.generateRandomEventPoolStandard = function (eventSlave) {
if (eventSlave.livingRules === "luxurious") {
if (eventSlave.devotion > 20) {
if (eventSlave.energy > 80) {
- State.variables.RETSevent.push("taste test");
+ if (canTaste(eventSlave)) {
+ State.variables.RETSevent.push("taste test");
+ }
}
}
}
@@ -1951,7 +1953,9 @@ window.generateRandomEventPoolServant = function (eventSlave) {
if (eventSlave.livingRules === "luxurious") {
if (eventSlave.devotion > 20) {
if (eventSlave.energy > 80) {
- State.variables.RETSevent.push("taste test");
+ if (canTaste(eventSlave)) {
+ State.variables.RETSevent.push("taste test");
+ }
}
}
}
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index e383760969d..126703c6373 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -10192,7 +10192,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<else>>
with plenty of tongue,
<</if>>
- and then goes back to work, @@.mediumaquamarine;smiling unconsciously@@ as $he savors the lingering <<if $PC.refreshmentType == 3 || $PC.refreshmentType == 4 || $PC.refreshmentType == 5 || $PC.refreshmentType == 6>>rush<<else>>flavor<</if>>.
+ and then goes back to work, @@.mediumaquamarine;smiling unconsciously@@ as $he savors the lingering <<if $PC.refreshmentType == 3 || $PC.refreshmentType == 4 || $PC.refreshmentType == 5 || $PC.refreshmentType == 6>>rush<<else>><<if canTaste($activeSlave)>>flavor<<else>>sensation<</if>><</if>>.
<<set $activeSlave.trust += 4>>
<</replace>>
<</link>>
@@ -15450,7 +15450,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<br><<link "Squirt on $his face">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You stand over $him, quietly masturbating while watching $him sleep. Several of $his fellow slaves come and go as you do so, but if they're surprised by the sight, they have the presence of mind not to show it. You're on excellent terms with your cunt, and you know just what it takes to make yourself squirt. When you feel the heat building just right, you quickly straddle $his face without touching $him, angling yourself carefully and increasing the pace of your schlicking. In no time at all, a jet of femcum splashes onto $his face and down across $his chest. $He sputters with surprise and then outrage, but then $he <<if canSee($activeSlave)>>realizes whose pussy $he's staring straight into<<else>>recognizes your flavor<</if>> and @@.gold;freezes in terror.@@
+ You stand over $him, quietly masturbating while watching $him sleep. Several of $his fellow slaves come and go as you do so, but if they're surprised by the sight, they have the presence of mind not to show it. You're on excellent terms with your cunt, and you know just what it takes to make yourself squirt. When you feel the heat building just right, you quickly straddle $his face without touching $him, angling yourself carefully and increasing the pace of your schlicking. In no time at all, a jet of femcum splashes onto $his face and down across $his chest. $He sputters with surprise and then outrage, but then $he <<if canSee($activeSlave)>>realizes whose pussy $he's staring straight into<<else>>recognizes your <<if canTaste($activeSlave)>>flavor<<else>>presence<</if>><</if>> and @@.gold;freezes in terror.@@
<<if $activeSlave.intelligence+$activeSlave.intelligenceImplant > 50>>
$He's quick, and $he immediately realizes
<<elseif $activeSlave.intelligence+$activeSlave.intelligenceImplant >= -15>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 0457b87fe4b..f7a19804e38 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -166,8 +166,8 @@
<<set _clothesTemp = $activeSlave.clothes>>
<<set _clothesTemp2 = $subSlave.clothes>>
<<switch $RETSevent>>
- /*Some events start with the slave naked (any event that starts with the daily inspection, for example). Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/
- <<case "taste test" "anal cowgirl" "boob collision" "if you enjoy it" "shower force" "repressed anal virgin" "top exhaustion" "cockmilk interception" "interslave begging" "incestuous nursing">>
+ /*Some events start with the slave naked (any event that starts with the daily inspection, for example). Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/
+ <<case "anal cowgirl" "boob collision" "cockmilk interception" "if you enjoy it" "incestuous nursing" "interslave begging" "repressed anal virgin" "shower force" "taste test" "top exhaustion">>
<<set $activeSlave.clothes = "no clothing">>
<<set $subSlave.clothes = "no clothing">>
<<case "date please" "simple assault">>
diff --git a/src/uncategorized/customSlave.tw b/src/uncategorized/customSlave.tw
index 657330778d9..dbbc741e5bc 100644
--- a/src/uncategorized/customSlave.tw
+++ b/src/uncategorized/customSlave.tw
@@ -1188,6 +1188,39 @@ Skin tone: <span id = "skin">
<br>
<<if $seeExtreme == 1>>
+<span id = "smelling">
+<<if $customSlave.smells == -1>>None.
+<<else>>Normal.
+<</if>>
+</span>
+<<link "None">>
+ <<set $customSlave.smells = -1>>
+ <<CustomSlaveSmell>>
+<</link>>
+|
+<<link "Normal">>
+ <<set $customSlave.smells = 0>>
+ <<CustomSlaveSmell>>
+<</link>>
+
+<br>
+<span id = "tasting">
+<<if $customSlave.tastes == -1>>None.
+<<else>>Normal.
+<</if>>
+</span>
+<<link "None">>
+ <<set $customSlave.tastes = -1>>
+ <<CustomSlaveTaste>>
+<</link>>
+|
+<<link "Normal">>
+ <<set $customSlave.tastes = 0>>
+ <<CustomSlaveTaste>>
+<</link>>
+
+<br>
+
<span id = "amputation">
<<if $customSlave.amp == 1>>Limbless.
<<else>>Limbed.
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index e1b4fbf070c..3060c064d3a 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -85,7 +85,9 @@
<<if $slaves[$i].livingRules == "luxurious">>
<<if $slaves[$i].devotion >= -20>>
<<if $slaves[$i].anus != 0>>
- <<set $RETasteTestSubIDs.push($slaves[$i].ID)>>
+ <<if canTaste($slaves[$i])>>
+ <<set $RETasteTestSubIDs.push($slaves[$i].ID)>>
+ <</if>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index ba50a95ec45..19eed2188e3 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -193,6 +193,8 @@
<<set $activeSlave.combatSkill = $customSlave.combatSkills>>
<<set $activeSlave.eyes = $customSlave.eyes>>
<<set $activeSlave.hears = $customSlave.hears>>
+<<set $activeSlave.smells = $customSlave.smells>>
+<<set $activeSlave.tastes = $customSlave.tastes>>
<<set $activeSlave.amp = $customSlave.amp>>
<<set $activeSlave.weekAcquired = $week>>
<<set $activeSlave.origin = "You purchased her by special order.">>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index cb855561408..8d94ee3cba4 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -1838,6 +1838,32 @@
<</replace>>
<</widget>>
+/%
+ Call as <<CustomSlaveSmell>>
+%/
+<<widget "CustomSlaveSmell">>
+ <<replace #smelling>>
+ <<if $seeExtreme == 1>>
+ <<if $customSlave.smells == -1>>None.
+ <<else>>Normal.
+ <</if>>
+ <</if>>
+ <</replace>>
+<</widget>>
+
+/%
+ Call as <<CustomSlaveTaste>>
+%/
+<<widget "CustomSlaveTaste">>
+ <<replace #tasting>>
+ <<if $seeExtreme == 1>>
+ <<if $customSlave.tastes == -1>>None.
+ <<else>>Normal.
+ <</if>>
+ <</if>>
+ <</replace>>
+<</widget>>
+
/%
Call as <<CustomSlaveAmp>>
%/
--
GitLab