diff --git a/src/js/slaveInteract.js b/src/js/slaveInteract.js
index bd732d5f6b6b78d4fe0937b97f6353ab9eb4f2a1..9c64ce856481c96519585495a42b4dabbeb09094 100644
--- a/src/js/slaveInteract.js
+++ b/src/js/slaveInteract.js
@@ -1,5 +1,3 @@
-App.UI.SlaveInteract = {};
-
App.UI.SlaveInteract.drugs = function(slave) {
let el = document.createElement('div');
@@ -10,8 +8,8 @@ App.UI.SlaveInteract.drugs = function(slave) {
} = getPronouns(slave);
const drugOptions = [];
- // <br>Drugs: <strong>slave.drugs</strong>.
-// <<link "None">>slave.drugs = "no drugs";<</link>>
+
+ drugOptions.push({text: `None`, drug: `no drugs`});
if (slave.indentureRestrictions < 2) {
if (
slave.drugs === "intensive breast injections" ||
@@ -200,6 +198,14 @@ App.UI.SlaveInteract.drugs = function(slave) {
drugOptions.push({text: `Sag-B-Gone breast lifting cream`, drug: `sag-B-gone`});
}
}
+
+ let title = document.createElement('div');
+ title.textContent = `Drugs: ${capFirstChar(slave.drugs)}`;
+ title.style.fontWeight = "bold";
+ el.append(title);
+
+ el.appendChild(generateRow(drugOptions));
+
function generateRow(drugArray) {
let row = document.createElement('span');
for (let i = 0; i < drugArray.length; i++) {
@@ -209,7 +215,7 @@ App.UI.SlaveInteract.drugs = function(slave) {
// Test to see if there was a problem with the key
for (let j = 0; j < keys.length; j++) {
- if (["text", "scene", "goto", "updateSlave", "update", "note"].includes(keys[j])) {
+ if (["text", "drug"].includes(keys[j])) {
continue;
} else {
drugArray[i].text += " ERROR, THIS SCENE WAS NOT ENTERED CORRECTLY";
@@ -217,6 +223,7 @@ App.UI.SlaveInteract.drugs = function(slave) {
break;
}
}
+
// is it just text?
if (keys.length === 1) {
if (drugArray[i].text) {
@@ -225,19 +232,17 @@ App.UI.SlaveInteract.drugs = function(slave) {
console.log(`expected 'text' only, got: ${drugArray[i]}`);
link = document.createTextNode("error, text not found");
}
+ // Are they already on this drug?
+ } else if (drugArray[i].drug === slave.drugs) {
+ link = document.createTextNode(drugArray[i].text);
+ // Set up the link
} else {
- // if slave is already on drug whitetext
- let passage = "";
- if (drugArray[i].goto) {
- passage = drugArray[i].goto;
- }
-
- // Set up the link
link = App.UI.DOM.link(
drugArray[i].text,
- () => { click(drugArray[i]); },
- [],
- passage
+ () => {
+ slave.drugs = drugArray[i].drug,
+ App.UI.SlaveInteract.drugs(slave);
+ },
);
// add a note node if required
@@ -254,18 +259,6 @@ App.UI.SlaveInteract.drugs = function(slave) {
}
return row;
-
- function click(drugOption) {
- if (drugOption.updateSlave) {
- Object.assign(slave, drugOption.updateSlave);
- }
- if (drugOption.update) {
- Object.assign(V, drugOption.update);
- }
-
- SlaveInteractRefreshAll(slave);
- return;
- }
}
return jQuery('#drugs').empty().append(el);
};
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index b5c779d17f7a5bc373a4b861f03c7028fafa0870..5203120eed94c6fdb7e4fadd43c5d4b8de7d718f 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -702,7 +702,7 @@
<br><br>__Physical Regimen:__
<span id="drugs"></span>
-<script>App.UI.SlaveInteract.Drugs(V.activeSlave)</script>
+<script>App.UI.SlaveInteract.drugs(V.activeSlave)</script>
<br>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 416b17605a5b7944bc81859e6e9721e198b11d7e..d29ab3c6e288a5e8baa021bcd1d24259224d3444 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -10,201 +10,6 @@ Allows for dynamic updating of the next button in the storyCaption (left side-ba
<<replace "#nextButton">> <<userButton>> <</replace>>
<</widget>>
-/%
-Call as <<SlaveInteractDrugs>>
-%/
-<<widget "SlaveInteractDrugs">>
- <<replace #drugs>>
- <br>Drugs: <strong>$activeSlave.drugs</strong>.
- <<link "None">><<set $activeSlave.drugs = "no drugs">><<SlaveInteractDrugs>><</link>>
- <<if $activeSlave.indentureRestrictions < 2>>
- <<if $activeSlave.drugs == "intensive breast injections" || $activeSlave.drugs == "intensive butt injections" || $activeSlave.drugs == "intensive penis enhancement" || $activeSlave.drugs == "intensive testicle enhancement">>
- | <<link "Moderate">>
- <<switch $activeSlave.drugs>>
- <<case "intensive breast injections">>
- <<set $activeSlave.drugs = "breast injections">>
- <<case "intensive butt injections">>
- <<set $activeSlave.drugs = "butt injections">>
- <<case "intensive penis enhancement">>
- <<set $activeSlave.drugs = "penis enhancement">>
- <<case "intensive testicle enhancement">>
- <<set $activeSlave.drugs = "testicle enhancement">>
- <</switch>>
- <<SlaveInteractDrugs>>
- <</link>>
- <<elseif $activeSlave.drugs == "breast injections" || $activeSlave.drugs == "butt injections" || $activeSlave.drugs == "penis enhancement" || $activeSlave.drugs == "testicle enhancement">>
- | <<link "Intensify">>
- <<set $activeSlave.drugs = "intensive " + $activeSlave.drugs>>
- <<SlaveInteractDrugs>>
- <</link>>
- <</if>>
- <<if ($activeSlave.intelligence > -100) && $activeSlave.indentureRestrictions < 1>>
- | <<link "Psychosuppressants">><<set $activeSlave.drugs = "psychosuppressants">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Psychosuppressants
- <</if>>
- <<if $arcologies[0].FSSlaveProfessionalismResearch == 1>>
- <<if canImproveIntelligence($activeSlave)>>
- | <<link "Psychostimulants">><<set $activeSlave.drugs = "psychostimulants">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Psychostimulants
- <</if>>
- <</if>>
- <<if ($activeSlave.boobs < 48000)>>
- | <<link "Breasts">><<set $activeSlave.drugs = "breast injections">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Breasts
- <</if>>
- <<if $arcologies[0].FSAssetExpansionistResearch == 1>>
- <<if ($activeSlave.boobs < 25000)>>
- | <<link "Hyper-Breasts">><<set $activeSlave.drugs = "hyper breast injections">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Hyper Breasts
- <</if>>
- <</if>>
- <<if $arcologies[0].FSSlimnessEnthusiastResearch == 1>>
- <<if ($activeSlave.boobs-$activeSlave.boobsImplant-$activeSlave.boobsMilk > 100)>>
- | <<link "Breast reducers">><<set $activeSlave.drugs = "breast redistributors">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Breast reducers
- <</if>>
- <<if ($activeSlave.nipples == "huge" || $activeSlave.nipples == "puffy" || $activeSlave.nipples == "cute")>>
- | <<link "Nipple reducers">><<set $activeSlave.drugs = "nipple atrophiers">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Nipple reducers
- <</if>>
- <</if>>
- <<if ($activeSlave.butt < 9)>>
- | <<link "Buttocks">><<set $activeSlave.drugs = "butt injections">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Buttocks
- <</if>>
- <<if $arcologies[0].FSAssetExpansionistResearch == 1>>
- <<if ($activeSlave.butt < 20)>>
- | <<link "Hyper-Buttocks">><<set $activeSlave.drugs = "hyper butt injections">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Hyper Buttocks
- <</if>>
- <</if>>
- <<if $arcologies[0].FSSlimnessEnthusiastResearch == 1>>
- <<if ($activeSlave.butt-$activeSlave.buttImplant > 0)>>
- | <<link "Butt reducers">><<set $activeSlave.drugs = "butt redistributors">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Butt reducers
- <</if>>
- <</if>>
- <<if ($activeSlave.lips <= 95) || (($activeSlave.lips <= 85) && ($seeExtreme != 1))>>
- | <<link "Lips">><<set $activeSlave.drugs = "lip injections">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Lips
- <</if>>
- <<if $arcologies[0].FSSlimnessEnthusiastResearch == 1>>
- <<if ($activeSlave.lips-$activeSlave.lipsImplant > 0)>>
- | <<link "Lip reducers">><<set $activeSlave.drugs = "lip atrophiers">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Lip reducers
- <</if>>
- <</if>>
- <<if $growthStim == 1>>
- <<if canImproveHeight($activeSlave)>>
- | <<link "Growth Stimulants">><<set $activeSlave.drugs = "growth stimulants">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Growth Stimulants
- <</if>>
- <</if>>
- | <<link "Fertility">><<set $activeSlave.drugs = "fertility drugs">><<SlaveInteractDrugs>><</link>>
- <<if ($seeHyperPreg == 1) && ($activeSlave.indentureRestrictions < 1) && ($superFertilityDrugs == 1) && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
- | <<link "Fertility+">><<set $activeSlave.drugs = "super fertility drugs">><<SlaveInteractDrugs>><</link>>
- <</if>>
- <<if ($activeSlave.dick > 0)>>
- <<if ($activeSlave.dick < 10)>>
- | <<link "Penis enhancement">><<set $activeSlave.drugs = "penis enhancement">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Penis enhancement
- <</if>>
- <<else>>
- <<if ($activeSlave.clit < 5)>>
- | <<link "Clitoris enhancement">><<set $activeSlave.drugs = "penis enhancement">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Clitoris enhancement
- <</if>>
- <</if>>
- <<if $arcologies[0].FSAssetExpansionistResearch == 1>>
- <<if ($activeSlave.dick > 0)>>
- <<if ($activeSlave.dick < 31)>>
- | <<link "Hyper penis enhancement">><<set $activeSlave.drugs = "hyper penis enhancement">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Hyper penis enhancement
- <</if>>
- <<else>>
- <<if ($activeSlave.clit < 5)>>
- | <<link "Hyper clitoris enhancement">><<set $activeSlave.drugs = "penis enhancement">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Hyper clitoris enhancement
- <</if>>
- <</if>>
- <</if>>
- <<if $arcologies[0].FSSlimnessEnthusiastResearch == 1>>
- <<if ($activeSlave.dick > 1)>>
- | <<link "Penis reducers">><<set $activeSlave.drugs = "penis atrophiers">><<SlaveInteractDrugs>><</link>>
- <<elseif $activeSlave.dick == 1>>
- | Penis reducers
- <</if>>
- <</if>>
- <<if $activeSlave.dick > 0 && $activeSlave.dick < 11 && !canAchieveErection($activeSlave) && $activeSlave.chastityPenis != 1>>
- | <<link "Erectile dysfunction circumvention">><<set $activeSlave.drugs = "priapism agents">><<SlaveInteractDrugs>><</link>>
- <</if>>
- <<if ($activeSlave.balls > 0)>>
- | <<link "Testicle enhancement">><<set $activeSlave.drugs = "testicle enhancement">><<SlaveInteractDrugs>><</link>>
- <<if $arcologies[0].FSAssetExpansionistResearch == 1>>
- | <<link "Hyper testicle enhancement">><<set $activeSlave.drugs = "hyper testicle enhancement">><<SlaveInteractDrugs>><</link>>
- <</if>>
- <</if>>
- <<if $arcologies[0].FSSlimnessEnthusiastResearch == 1>>
- <<if ($activeSlave.balls > 1)>>
- | <<link "Testicle reducers">><<set $activeSlave.drugs = "testicle atrophiers">><<SlaveInteractDrugs>><</link>>
- <<elseif $activeSlave.balls == 1>>
- | Testicle reducers
- <</if>>
- <<if ($activeSlave.clit > 0)>>
- | <<link "Clitoris reducers">><<set $activeSlave.drugs = "clitoris atrophiers">><<SlaveInteractDrugs>><</link>>
- <</if>>
- <<if ($activeSlave.labia > 0)>>
- | <<link "Labia reducers">><<set $activeSlave.drugs = "labia atrophiers">><<SlaveInteractDrugs>><</link>>
- <</if>>
- <</if>>
- <<if $arcologies[0].FSYouthPreferentialistResearch == 1>>
- <<if ($activeSlave.visualAge > 18)>>
- | <<link "Anti-aging cream">><<set $activeSlave.drugs = "anti-aging cream">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Anti-aging cream
- <</if>>
- <</if>>
- | <<link "Steroids">><<set $activeSlave.drugs = "steroids">><<SlaveInteractDrugs>><</link>>
- <<if $arcologies[0].FSSlimnessEnthusiastResearch == 1>>
- <<if ($activeSlave.weight > -95)>>
- | <<link "Weight loss pills">><<set $activeSlave.drugs = "appetite suppressors">><<SlaveInteractDrugs>><</link>>
- <<else>>
- | Weight loss pills
- <</if>>
- <</if>>
- <<if $precociousPuberty == 1 && $pubertyHormones == 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
- <<if ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1) && $activeSlave.pubertyXX == 0>>
- | <<link "Female hormone injections">><<set $activeSlave.drugs = "female hormone injections">><<SlaveInteractDrugs>><</link>>
- <</if>>
- <<if $activeSlave.balls > 0 && $activeSlave.pubertyXY == 0>>
- | <<link "Male hormone injections">><<set $activeSlave.drugs = "male hormone injections">><<SlaveInteractDrugs>><</link>>
- <</if>>
- <</if>>
- | <<link "Hormone enhancers">><<set $activeSlave.drugs = "hormone enhancers">><<SlaveInteractDrugs>><</link>>
- | <<link "Hormone blockers">><<set $activeSlave.drugs = "hormone blockers">><<SlaveInteractDrugs>><</link>>
- <<if $activeSlave.boobs > 250 && $activeSlave.boobShape != "saggy" && $purchasedSagBGone == 1>>
- | <<link "Sag-B-Gone breast lifting cream">><<set $activeSlave.drugs = "sag-B-gone">><<SlaveInteractDrugs>><</link>>
- <</if>>
- <</if>>
- <</replace>>
-<</widget>>
-
<<widget "Master">><<if def $args[0]>><<run Enunciate($args[0])>><<elseif ndef $titleEnunciate>><<run Enunciate($activeSlave)>><</if>>$titleEnunciate<</widget>>
<<widget "say">><<if (def $args[0]) && $sayEnunciate != "lisp">>$args[0]<<else>>$sayEnunciate<</if>><</widget>>
<<widget "s">>$sEnunciate<</widget>>