diff --git a/src/js/physicalDevelopment.js b/src/js/physicalDevelopment.js
index 9c605b6d2ab1804b71d192234fd643af8030683b..3920db892290ad90ca176bfcf38ff284cfb5241a 100644
--- a/src/js/physicalDevelopment.js
+++ b/src/js/physicalDevelopment.js
@@ -32,6 +32,9 @@ window.physicalDevelopment = (function physicalDevelopment() {
if (slave.balls > 0 && slave.balls < 3) {
increaseBalls(slave);
}
+ if (slave.vagina > 0 && slave.ovaries > 0 && pubertyXX > 0) {
+ increaseWetness(slave);
+ }
if (slave.waist < 10) {
increaseWaistXY(slave);
}
@@ -60,6 +63,9 @@ window.physicalDevelopment = (function physicalDevelopment() {
if (slave.clit > 0) {
increaseClit(slave);
}
+ if (slave.vagina > 0 && slave.ovaries > 0 && pubertyXX > 0) {
+ increaseWetness(slave);
+ }
increaseWaistXX(slave);
increaseHipsXX(slave);
increaseButtXX(slave);
@@ -3203,6 +3209,92 @@ window.physicalDevelopment = (function physicalDevelopment() {
slave.clit++;
}
}
+
+ /**
+ * @param {App.Entity.SlaveState} slave
+ */
+ function increaseWetness(slave) {
+ if (slave.hormoneBalance <= -200) {
+ if (slave.physicalAge === 8 || slave.physicalAge === 9) {
+ if (slave.vaginaLube < 1) {
+ if (jsRandom(1, 100) > 90) {
+ slave.vaginaLube++;
+ }
+ }
+ } else if (slave.physicalAge <= 12) {
+ if (slave.vaginaLube < 1) {
+ if (jsRandom(1, 100) > 60) {
+ slave.vaginaLube++;
+ }
+ }
+ else if (slave.vaginaLube < 2) {
+ if (jsRandom(1, 100) > 80) {
+ slave.vaginaLube++;
+ }
+ }
+ } else if (slave.physicalAge <= 15) {
+ if (slave.vaginaLube < 1) {
+ if (jsRandom(1, 100) > 30) {
+ slave.vaginaLube++;
+ }
+ }
+ else if (slave.vaginaLube < 2) {
+ if (jsRandom(1, 100) > 50) {
+ slave.vaginaLube++;
+ }
+ }
+ } else if (slave.physicalAge <= 18) {
+ if (slave.vaginaLube < 1) {
+ if (jsRandom(1, 100) > 10) {
+ slave.vaginaLube++;
+ }
+ }
+ else if (slave.vaginaLube < 2) {
+ if (jsRandom(1, 100) > 20) {
+ slave.vaginaLube++;
+ }
+ }
+ }
+ } else if (slave.hormoneBalance <= -100) {
+ if (slave.physicalAge > 9 && slave.physicalAge <= 12) {
+ if (slave.vaginaLube < 1) {
+ if (jsRandom(1, 100) > 70) {
+ slave.vaginaLube++;
+ }
+ }
+ } else if (slave.physicalAge <= 15) {
+ if (slave.vaginaLube < 1) {
+ if (jsRandom(1, 100) > 40) {
+ slave.vaginaLube++;
+ }
+ }
+ else if (slave.vaginaLube < 2) {
+ if (jsRandom(1, 100) > 70) {
+ slave.vaginaLube++;
+ }
+ }
+ } else if (slave.physicalAge <= 18) {
+ if (slave.vaginaLube < 1) {
+ if (jsRandom(1, 100) > 20) {
+ slave.vaginaLube++;
+ }
+ }
+ else if (slave.vaginaLube < 2) {
+ if (jsRandom(1, 100) > 40) {
+ slave.vaginaLube++;
+ }
+ }
+ }
+ } else if (slave.hormoneBalance <= 20) {
+ if (slave.physicalAge > 15 && slave.physicalAge <= 18) {
+ if (slave.vaginaLube < 1) {
+ if (jsRandom(1,100) > 50) {
+ slave.vaginaLube++;
+ }
+ }
+ }
+ }
+ }
/**
* @param {App.Entity.SlaveState} slave
diff --git a/src/js/slaveGenerationJS.js b/src/js/slaveGenerationJS.js
index fe05acf90be7a3903becc7c5785175c33de0298c..d228006a17af6dd7fc376c5926e6e2f58d34e6b6 100644
--- a/src/js/slaveGenerationJS.js
+++ b/src/js/slaveGenerationJS.js
@@ -18,7 +18,12 @@ window.raceToNationality = function raceToNationality(slave) {
}
/* No success after 100 attempts, so just randomize according to race */
if (setup.raceSelector[slave.nationality] && !(slave.race in setup.raceSelector[slave.nationality]) && i === 100) {
- slave.nationality = hashChoice(setup[`${slave.race.toLowerCase().replace(/[ -]/g, "")}Nationalities`]);
+ const nationalityKey = `${slave.race.toLowerCase().replace(/[ -]/g, "")}Nationalities`;
+ if (nationalityKey in setup) {
+ slave.nationality = hashChoice(setup[nationalityKey]);
+ } else {
+ slave.nationality = "Stateless";
+ }
}
};
diff --git a/src/js/utils.js b/src/js/utils.js
index 4e51059a099180258057884edb03c5bbf979e8bf..eca740c543cbcfbf5729fa9fbd766671d7152e05 100644
--- a/src/js/utils.js
+++ b/src/js/utils.js
@@ -297,30 +297,3 @@ App.Utils.topologicalSort = function(keys, edges) {
return sorted;
};
-
-window.getBestSlaves = function({part, count=3, smallest=false, filter=null}={}){
- if(!_.isFunction(part)) {
- const partName = part;
- part = (slave)=>slave[partName];
- }
- const sortMethod = smallest ? (left, right) => left.value - right.value : (left, right) => right.value - left.value;
- if(filter == null) {
- filter = ()=>true;
- }
- return V.slaves.map((slave, index)=>({slave, index}))
- .filter(slaveInfo=>filter(slaveInfo.slave))
- .map(slaveInfo=>{ slaveInfo.value = part(slaveInfo.slave); return slaveInfo; })
- .sort(sortMethod)
- .slice(0, count);
-};
-window.getBestSlavesIndices= function(info) {
- return getBestSlaves(info).map(slaveInfo => slaveInfo.index);
-};
-
-/*
-//Example
-getBestSlaves({part:"butt", count: 5});
-getBestSlaves({part:"boobs"});//defaults to top 3
-getBestSlaves({part:"dick", smallest:true, filter:(slave)=>slave.dick > 0});//defaults to top 3
-getBestSlaves({part:slave=>slave.intelligence+slave.intelligenceImplant});
-*/
diff --git a/src/js/utilsFC.js b/src/js/utilsFC.js
index 2d710b52d4e3caaf8f4172bb608dfc00bb93cf27..c1a801b5599e7f08bfa82d78f19be4be60de6563 100644
--- a/src/js/utilsFC.js
+++ b/src/js/utilsFC.js
@@ -2860,3 +2860,38 @@ window.randomRapeRivalryTarget = function(slave, predicate) {
const arr = V.slaves.filter((s) => { return canBeARapeRival(s) && canRape(slave, s); }).shuffle();
return arr.find(predicate);
};
+
+/**
+ * @param {string|function(App.Entity.SlaveState): number} part slave object property or custom function
+ * @param {number} [count] number of slaves to return
+ * @param {boolean} [largest] should it search for the biggest or smallest value
+ * @param {function(App.Entity.SlaveState): boolean} [filter] filter out undesired slaves
+ * @return {App.Entity.SlaveState[]} sorted from best to worst
+ */
+window.getBestSlaves = function({part, count = 3, largest = true, filter = (() => true)} = {}) {
+ if (!_.isFunction(part)) {
+ const partName = part;
+ part = (slave) => slave[partName];
+ }
+ const sortMethod = largest ? (left, right) => right.value - left.value : (left, right) => left.value - right.value;
+ return V.slaves.filter(slave => filter(slave))
+ .map(slave => ({slave, value: part(slave)}))
+ .sort(sortMethod)
+ .slice(0, count)
+ .map(slaveInfo => slaveInfo.slave);
+};
+/**
+ * @param {{}} info see getBestSlaves()
+ * @return {number[]}
+ */
+window.getBestSlavesIndices = function(info) {
+ return getBestSlaves(info).map(slave => V.slaveIndices[slave.ID]);
+};
+
+/*
+//Example
+getBestSlaves({part:"butt", count: 5});
+getBestSlaves({part:"boobs"});//defaults to top 3
+getBestSlaves({part:"dick", smallest:true, filter:(slave)=>slave.dick > 0});//defaults to top 3
+getBestSlaves({part:slave=>slave.intelligence+slave.intelligenceImplant});
+*/
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index 666c46be9ad0a6aef9d77552d657e81080e3dac3..37a6a56122f35f16b667c3a06ffdd791b6ae41e2 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -289,7 +289,7 @@ You have <<print $arcologies.length-1>> neighbors. <br><br>
[[Appoint an agent|Agent Select]] <<set $him = "them">>
<<else>>
<<setLocalPronouns _Agent>>
- Your agent @@.deeppink;<<= SlaveFullName(_Agent)>>@@ is running this arcology. [[Recall and reenslave $him|Agent Retrieve]]
+ Your agent @@.deeppink;<<= SlaveFullName(_Agent)>>@@ is running this arcology. <<link "Recall and reenslave $him" "Agent Retrieve">><</link>>
<</if>>
<span id="rename"> | <<link "Instruct $him to rename the arcology">><<replace #rename>> | <<textbox "$arcologies[$activeArcologyIdx].name" $arcologies[$activeArcologyIdx].name>> [[Confirm name|Neighbor Interact]]<</replace>><</link>></span>
<<if $arcologies[_currentNeighbor].government === "your agent">>
diff --git a/src/uncategorized/underperformingSlaves.tw b/src/uncategorized/underperformingSlaves.tw
index 1f6f6ba4a600a625c6769b6dad7670991115048e..f0c2c1249d824ab42d1b5acc4fda09eb925f5034 100644
--- a/src/uncategorized/underperformingSlaves.tw
+++ b/src/uncategorized/underperformingSlaves.tw
@@ -32,8 +32,10 @@
<<print App.UI.SlaveList.render.listMarkup(
getBestSlavesIndices(
{
- part:(slave)=>(slaveCost(slave) / (slave.lastWeeksCashIncome - getSlaveCost(slave))),
- smallest:false,
+ part:(slave) => {
+ const ratio = slaveCost(slave) / (slave.lastWeeksCashIncome - getSlaveCost(slave));
+ return ratio > 0 ? ratio : 100000000 + ratio;
+ },
count: 7,
filter:(slave)=>(
["get milked", "work in the dairy", "whore", "work in the brothel", "work a glory hole", "be confined in the arcade"].includes(slave.assignment)
@@ -45,7 +47,7 @@
[],
App.UI.SlaveList.SlaveInteract.stdInteract,
(slave)=>$(document.createDocumentFragment()).append(
- `Worth ${cashFormatColor(slaveCost(slave))} / Nets ${cashFormatColor(slave.lastWeeksCashIncome - getSlaveCost(slave))} a week = ${(Math.trunc(slaveCost(slave) / (slave.lastWeeksCashIncome - getSlaveCost(slave))))} weeks`
+ `Worth ${cashFormatColor(slaveCost(slave))} / Nets ${cashFormatColor(slave.lastWeeksCashIncome - getSlaveCost(slave))} a week = ${(Math.trunc(slaveCost(slave) / (slave.lastWeeksCashIncome - getSlaveCost(slave)))) > 0 ? (Math.trunc(slaveCost(slave) / (slave.lastWeeksCashIncome - getSlaveCost(slave)))) : "infinite"} weeks`
).get(0)
)>>
</div>
@@ -60,7 +62,6 @@
getBestSlavesIndices(
{
part:(slave)=>(slave.lastWeeksCashIncome - getSlaveCost(slave)),
- smallest:true,
count: 7,
filter:(slave)=>(
["get milked", "work in the dairy", "whore", "work in the brothel", "work a glory hole", "be confined in the arcade"].includes(slave.assignment)
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index c31adf7081a0f3701bcc59becc044875706b0e98..a74e002f31814a1aeef86f2e0f94de4aad5ab058 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -906,7 +906,7 @@ $activeSlave.slaveName is
<</if>>
-<<case "a courtesean dress">>
+<<case "a courtesan dress">>
with exposed shoulders,
<<if hasAnyArms($activeSlave)>>
flowing sleeves,