diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index 2082c83ddf880aff219673abdb2547bc967a39e7..9f9b1d14b1978448930b6141a81124e63fc5df8a 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -18,7 +18,7 @@ App.UI.SlaveInteract.placeInLine = function(slave) {
prevIndex = curSlaveIndex - 1;
}
- return [ slaveList[prevIndex].ID, slaveList[nextIndex].ID ];
+ return [slaveList[prevIndex].ID, slaveList[nextIndex].ID];
};
/**
@@ -58,33 +58,33 @@ App.UI.SlaveInteract.modify = function(slave) {
makeRoomLink(el, "Auto salon", "Salon", ' Modify hair (color, length, style), nails, and even skin color.',
() => {
V.activeSlave = slave,
- V.degradation = 0,
- V.primaryHairColor = "",
- V.secondaryHairColor = "",
- V.primaryEarColor = "",
- V.secondaryEarColor = "",
- V.primaryTailColor = "",
- V.secondaryTailColor = "",
- V.artificialEyeColor = "",
- V.artificialEyeShape = "",
- V.artificialEyeFill = "",
- V.tattooChoice = "",
- V.piercingLevel = "";
+ V.degradation = 0,
+ V.primaryHairColor = "",
+ V.secondaryHairColor = "",
+ V.primaryEarColor = "",
+ V.secondaryEarColor = "",
+ V.primaryTailColor = "",
+ V.secondaryTailColor = "",
+ V.artificialEyeColor = "",
+ V.artificialEyeShape = "",
+ V.artificialEyeFill = "",
+ V.tattooChoice = "",
+ V.piercingLevel = "";
}
);
makeRoomLink(el, "Body mod studio", "Body Modification", ' Mark your slave with piercings, tattoos, brands or even scars.',
() => {
V.activeSlave = slave,
- V.degradation = 0,
- V.tattooChoice = undefined;
+ V.degradation = 0,
+ V.tattooChoice = undefined;
},
);
makeRoomLink(el, "Remote surgery", "Remote Surgery", ` Surgically modify your slave with state of the art plastic surgery and more. Alter ${his} senses, skeletal structure, organs, and even more.`,
() => {
V.activeSlave = slave,
- V.degradation = 0;
+ V.degradation = 0;
}
);
@@ -93,7 +93,7 @@ App.UI.SlaveInteract.modify = function(slave) {
makeRoomLink(el, "Configure cybernetics", "Prosthetics Configuration", ` Configure prosthetics, if ${he} has been surgically implanted with interfaces that support it.`,
() => {
V.activeSlave = slave,
- V.prostheticsConfig = "main";
+ V.prostheticsConfig = "main";
}
);
}
@@ -164,6 +164,183 @@ App.UI.SlaveInteract.fucktoyPref = function(slave) {
return jQuery('#fucktoypref').empty().append(el);
};
+App.UI.SlaveInteract.work = function(slave) {
+ let el = new DocumentFragment();
+ let p;
+ let div;
+ let span;
+ const links = [];
+ const {
+ // eslint-disable-next-line no-unused-vars
+ he,
+ him,
+ his,
+ hers,
+ himself,
+ boy,
+ He,
+ His
+ } = getPronouns(slave);
+
+ function appendLink(text, whoreClass, enabled, disabledText) {
+ const link = {text: text};
+ if (enabled) {
+ link.whoreClass = whoreClass;
+ } else {
+ link.disabled = disabledText;
+ }
+ links.push(link);
+ }
+
+ p = document.createElement('p');
+ if (["be your agent", "live with your agent"].includes(slave.assignment)) {
+ p.className = "scene-intro";
+ p.textContent = `Recall your agent to modify them.`;
+ } else {
+ div = document.createElement('div');
+ div.id = "miniscene";
+ p.appendChild(div);
+
+ span = document.createElement('span');
+ span.id = "useSlave";
+ p.appendChild(span);
+ p.appendChild(App.UI.SlaveInteract.useSlaveDisplay(slave));
+ }
+ el.append(p);
+
+ p = document.createElement('p');
+ span = document.createElement('span');
+ span.className = "note";
+ switch (slave.assignment) {
+ case "recover from surgery":
+ span.textContent = `${He} is recovering from surgery this week`;
+ break;
+ case "guard you":
+ span.textContent = `${He} is your Bodyguard and is not available for other work`;
+ break;
+ case "be the Madam":
+ span.textContent = `${He} is the Madam and is not available for other work`;
+ break;
+ case "be the DJ":
+ span.textContent = `${He} is the DJ and is not available for other work`;
+ break;
+ case "be the Milkmaid":
+ span.textContent = `${He} is the Milkmaid and is not available for other work`;
+ break;
+ case "be the Farmer":
+ span.textContent = `${He} is the Farmer and is not available for other work`;
+ break;
+ case "be the Stewardess":
+ span.textContent = `${He} is the Stewardess and is not available for other work`;
+ break;
+ case "be your Head Girl":
+ span.textContent = `${He} is your Head Girl and is not available for other work`;
+ break;
+ case "recruit girls":
+ span.textContent = `${He} is recruiting slaves and is not available for other work`;
+ break;
+ case "be the Nurse":
+ span.textContent = `${He} is the Nurse and is not available for other work`;
+ break;
+ case "be the Attendant":
+ span.textContent = `${He} is the Attendant of the spa and is not available for other work`;
+ break;
+ case "be the Matron":
+ span.textContent = `${He} is the Matron of the nursery and is not available for other work`;
+ break;
+ case "be the Schoolteacher":
+ span.textContent = `${He} is the Schoolteacher and is not available for other work`;
+ break;
+ case "be your Concubine":
+ span.textContent = `${He} is your Concubine and is not available for other work`;
+ break;
+ case "be the Wardeness":
+ span.textContent = `${He} is the Wardeness and is not available for other work`;
+ break;
+ default:
+
+ // CAN BE REASSIGNED
+ span.classList.remove("note");
+ span.id = "assignmentLinks";
+ span.appendChild(App.UI.SlaveInteract.assignmentBlock("assignmentLinks", slave));
+
+
+ if ((V.brothel + V.club + V.dairy + V.farmyard + V.servantsQuarters + V.masterSuite + V.spa + V.nursery + V.clinic + V.schoolroom + V.cellblock + V.arcade + V.HGSuite) > 0) {
+ span.append(`Transfer to: `);
+ span.appendChild(App.UI.jobLinks.assignmentsFragment(slave.ID, "Main", (slave, assignment) => { App.UI.SlaveList.ScrollPosition.record(); assignJob(slave, assignment); }));
+ }
+
+ div = document.createElement('div');
+ div.id = "fucktoypref";
+ span.appendChild(div);
+ App.UI.SlaveInteract.fucktoyPref(slave);
+ } // END CAN BE REASSIGNED
+ el.append(span);
+
+ if (slave.assignment === "whore" || slave.assignment === "work in the brothel") {
+ div = document.createElement('div');
+ div.textContent = `Whoring Target: `;
+ span = document.createElement('span');
+ span.style.fontWeight = "bold";
+
+ span.id = "whoreClass";
+ if (!slave.whoreClass) {
+ span.textContent = `auto`;
+ } else if (slave.whoreClass === 1) {
+ span.textContent = `the lower class`;
+ } else if (slave.whoreClass === 2) {
+ span.textContent = `the middle class`;
+ } else if (slave.whoreClass === 3) {
+ span.textContent = `the upper class`;
+ } else if (slave.whoreClass === 4) {
+ span.textContent = `millionaires`;
+ } else {
+ span.textContent = `THERE HAS BEEN AN ERROR`;
+ }
+ div.append(span);
+ div.append(`. `);
+
+ span = document.createElement('span');
+ span.className = "note";
+ span.textContent = `This is the highest class they are allowed to service, when eligible `;
+ div.append(span);
+
+ appendLink(`Auto`, 0, true);
+ appendLink(`Lower Class`, 1, true);
+ appendLink(`Middle Class`, 2, true);
+ appendLink(`Upper Class`, 3, true);
+ appendLink(`Millionaires Class`, 4, true);
+ div.appendChild(App.UI.SlaveInteract.generateLinksStrip(links, generateLink));
+
+ el.append(div);
+ }
+
+ function generateLink(linkDesc) {
+ // is it just text?
+ if (linkDesc.disabled) { return App.UI.DOM.disabledLink(linkDesc.text, [linkDesc.disabled]); }
+ // Are they already on this whoreClass?
+ if (linkDesc.whoreClass === slave.whoreClass) { return document.createTextNode(linkDesc.text); }
+ // Set up the link
+ const link = App.UI.DOM.link(
+ linkDesc.text,
+ () => {
+ slave.whoreClass = linkDesc.whoreClass;
+ App.UI.SlaveInteract.work(slave);
+ },
+ );
+
+ // add a note node if required
+ if (linkDesc.note) {
+ App.UI.DOM.appendNewElement("span", link, `${linkDesc.note} `, "note");
+ }
+ return link;
+ }
+
+
+
+ return jQuery('#work').empty().append(el);
+};
+
/**
* @param {string} blockId
* @param {App.Entity.SlaveState} slave
@@ -211,7 +388,7 @@ App.UI.SlaveInteract.assignmentBlock = function(blockId, slave) {
`Stay on this assignment for another month`,
() => {
slave.sentence += 4;
- App.UI.SlaveInteract.assignmentBlock(blockId, slave);
+ App.UI.SlaveInteract.work(slave);
},
)
);
@@ -230,7 +407,7 @@ App.UI.SlaveInteract.assignmentBlock = function(blockId, slave) {
)
);
el.appendChild(links);
- return jQuery(`#${blockId}`).empty().append(el);
+ return el;
};
App.UI.SlaveInteract.drugs = function(slave) {
@@ -311,10 +488,10 @@ App.UI.SlaveInteract.drugs = function(slave) {
nipples.push({text: `Reducers`, disabled: `Nipples are ${slave.nipples}`});
}
}
- if(V.dispensary) {
+ if (V.dispensary) {
if ((["inverted", "partially inverted", "cute", "tiny", "puffy"].includes(slave.nipples))) {
nipples.push({text: `Enhancement`, updateSlave: {drugs: `nipple enhancers`}});
- } else if(slave.nipples === "huge") {
+ } else if (slave.nipples === "huge") {
nipples.push({text: `Enhancement`, disabled: `Nipples are already huge`});
} else {
nipples.push({text: `Enhancement`, disabled: `Has no effect on ${slave.nipples} nipples`});
@@ -589,7 +766,7 @@ App.UI.SlaveInteract.hormones = function(slave) {
title.textContent = `Hormones: `;
let choice = document.createElement('span');
choice.style.fontWeight = "bold";
- switch(slave.hormones) {
+ switch (slave.hormones) {
case 2: {
choice.textContent = `intensive female. `;
break;
@@ -763,7 +940,7 @@ App.UI.SlaveInteract.dietBase = function(slave) {
const cum = [];
// Milk
- if (slave.dietCum <2) {
+ if (slave.dietCum < 2) {
milk.push({text: `Milk added`, updateSlave: {dietMilk: 1}});
if (slave.dietCum < 2) {
milk.push({text: `Milk based`, updateSlave: {dietMilk: 2, dietCum: 0}});
@@ -777,7 +954,7 @@ App.UI.SlaveInteract.dietBase = function(slave) {
// Cum
- if (slave.dietMilk <2) {
+ if (slave.dietMilk < 2) {
cum.push({text: `Cum added`, updateSlave: {dietCum: 1}});
cum.push({text: `Cum based`, updateSlave: {dietCum: 2, dietMilk: 0}});
if (slave.dietCum) {
@@ -1295,7 +1472,7 @@ App.UI.SlaveInteract.useSlaveDisplay = function(slave) {
return;
}
}
- return jQuery('#useSlave').empty().append(el);
+ return el;
};
App.UI.SlaveInteract.bloating = function(slave) {
@@ -2091,9 +2268,9 @@ App.UI.SlaveInteract.smartSettings = function(slave) {
title.textContent += `and smart bullet vibrator are `;
} else {
title.textContent += `is `;
- }
- title.textContent += `set to: `;
- } else{
+ }
+ title.textContent += `set to: `;
+ } else {
title.textContent = `${His} smart frenulum piercing `;
if (slave.vaginalAccessory === "smart bullet vibrator") {
title.textContent += `and smart bullet vibrator are `;
@@ -2368,8 +2545,8 @@ App.UI.SlaveInteract.custom = (function() {
` Stop using a custom title`,
() => {
jQuery('#result').empty().append(
- document.createTextNode(`${He} will no longer refer to you with a special title.`)
- ),
+ document.createTextNode(`${He} will no longer refer to you with a special title.`)
+ ),
slave.custom.title = "";
slave.custom.titleLisp = "";
}
@@ -2515,7 +2692,7 @@ App.UI.SlaveInteract.custom = (function() {
},
false,
"Rename"
- );
+ );
label.appendChild(textbox);
slaveSurnameNode.appendChild(label);
@@ -3190,9 +3367,7 @@ App.UI.SlaveInteract.generateRows = function(array, slave, category, accessCheck
App.UI.SlaveInteract.refreshAll = function(slave) {
App.UI.SlaveInteract.fucktoyPref(slave);
- App.UI.SlaveInteract.assignmentBlock("assignmentLinks", slave);
App.UI.SlaveInteract.drugs(slave);
- App.UI.SlaveInteract.useSlaveDisplay(slave);
App.UI.SlaveInteract.bloating(slave);
App.UI.SlaveInteract.fertility(slave);
App.UI.SlaveInteract.curatives(slave);
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 3a4e300f5db25cdffe15618520a0cd35ae1a68f7..83550af2493902931580e114b76664d95b73c113 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -152,79 +152,10 @@
<div id="Work" class="tabcontent">
<div class="content">
- <p>
- <<if ["be your agent", "live with your agent"].includes(getSlave($AS).assignment)>>
- <p class="scene-intro">
- Recall your agent to modify them.
- </p>
- <<else>>
- <div id="miniscene"></div>
- <span id="useSlave"></span>
- <script>
- App.UI.SlaveInteract.useSlaveDisplay(getSlave(V.activeSlave.ID));
- </script>
-
- <</if>>
- </p>
- <p>
- <<switch getSlave($AS).assignment>>
- <<case "recover from surgery">>
- //$He is recovering from surgery this week//
- <<case "guard you">>
- //$He is your Bodyguard and is not available for other work//
- <<case "be the Madam">>
- //$He is the Madam and is not available for other work//
- <<case "be the DJ">>
- //$He is the DJ and is not available for other work//
- <<case "be the Milkmaid">>
- //$He is the Milkmaid and is not available for other work//
- <<case "be the Farmer">>
- //$He is the Farmer and is not available for other work//
- <<case "be the Stewardess">>
- //$He is the Stewardess and is not available for other work//
- <<case "be your Head Girl">>
- //$He is your Head Girl and is not available for other work//
- <<case "recruit girls">>
- //$He is recruiting slaves and is not available for other work//
- <<case "be the Nurse">>
- //$He is the Nurse and is not available for other work//
- <<case "be the Attendant">>
- //$He is the Attendant of the spa and is not available for other work//
- <<case "be the Matron">>
- //$He is the Matron of the nursery and is not available for other work//
- <<case "be the Schoolteacher">>
- //$He is the Schoolteacher and is not available for other work//
- <<case "be your Concubine">>
- //$He is your Concubine and is not available for other work//
- <<case "be the Wardeness">>
- //$He is the Wardeness and is not available for other work//
- <<default>>
-
- /* CAN BE REASSIGNED */
-
- <span id="assignmentLinks"></span>
- <script>App.UI.SlaveInteract.assignmentBlock("assignmentLinks", getSlave(V.activeSlave.ID))</script>
-
- <<set _numFacilities = $brothel+$club+$dairy+$farmyard+$servantsQuarters+$masterSuite+$spa+$nursery+$clinic+$schoolroom+$cellblock+$arcade+$HGSuite>>
-
- <<if _numFacilities > 0>>
- Transfer to: <<= App.UI.jobLinks.transfers($activeSlave.ID)>>
- <</if>> /* closes _numFacilities */
-
- <div id="fucktoypref"></div>
- <script>App.UI.SlaveInteract.fucktoyPref(getSlave(V.activeSlave.ID))</script>
-
- <</switch>> /* END CAN BE REASSIGNED */
-
- <<if getSlave($AS).assignment == "whore" || getSlave($AS).assignment == "work in the brothel">>
- <br>Whoring Target: <strong><span id="whoreClass"><<if !getSlave($AS).whoreClass>>auto<<elseif getSlave($AS).whoreClass == 1>>the lower class<<elseif getSlave($AS).whoreClass == 2>>the middle class<<elseif getSlave($AS).whoreClass == 3>>the upper class<<elseif getSlave($AS).whoreClass == 4>>millionaires<<else>>THERE HAS BEEN AN ERROR<</if>></span></strong>. //This is the highest class they are allowed to service, when eligible//
- <<link "Auto">><<set getSlave($AS).whoreClass = 0>><<replace "#whoreClass">>auto<</replace>><</link>> |
- <<link "Lower Class">><<set getSlave($AS).whoreClass = 1>><<replace "#whoreClass">>the lower class<</replace>><</link>> |
- <<link "Middle Class">><<set getSlave($AS).whoreClass = 2>><<replace "#whoreClass">>the middle class<</replace>><</link>> |
- <<link "Upper Class">><<set getSlave($AS).whoreClass = 3>><<replace "#whoreClass">>the upper class<</replace>><</link>> |
- <<link "Millionaires">><<set getSlave($AS).whoreClass = 4>><<replace "#whoreClass">>millionaires<</replace>><</link>>
- <</if>>
- </p>
+ <p id="work"></p>
+ <script>
+ App.UI.SlaveInteract.work(getSlave(V.activeSlave.ID))
+ </script>
</div>
</div>