diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 2677f2738139d7a4aa96c1e8913845dae1aa3142..47cd7488a7f693d1109b9582b5bb52bc70b7ac82 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with thi
<<set $returnTo = "init", $nextButton = "Continue", $nextLink = "Alpha disclaimer">>
<<unset $releaseID>>
-<<set $ver = "0.10.7", $pmodVer = "2.2.X", $releaseID = 1043>>
-<<if ndef $pmodVer>><<set $pmodVer = "2.2.X">><</if>>
+<<set $ver = "0.10.7", $pmodVer = "2.3.X", $releaseID = 1043>>
+<<if ndef $pmodVer>><<set $pmodVer = "2.3.X">><</if>>
/* This needs to be broken down into individual files that can be added to StoryInit instead. */
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 9de97334785a4471f602473791c5ef0f7670a053..999be50eb213979470dcdef36ec89067aa0936f9 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -592,7 +592,7 @@ window.DefaultRules = (function() {
ProcessAVirginDildos(slave, rule);
} else if (slave.vagina > 0) {
ProcessNonVirginDildos(slave, rule);
- ProcessVaginalAttachments(slave, rule);
+ ProcessVaginalAttachments(slave, rule);
}
}
@@ -791,7 +791,6 @@ window.DefaultRules = (function() {
slave.vaginalAttachment = rule.vaginalAttachment;
if (slave.vaginalAccessory !== "none") {
switch (slave.vaginalAttachment) {
-
case "none":
r += `<br>${slave.slaveName} has been instructed not to use an attachment for ${his} dildo.`;
break;
@@ -806,7 +805,6 @@ window.DefaultRules = (function() {
}
} else {
switch (slave.vaginalAttachment) {
-
case "none":
r += `<br>${slave.slaveName} has been instructed not to use any vaginal accessories.`;
break;
@@ -1370,8 +1368,9 @@ window.DefaultRules = (function() {
return -1;
}
if (a.weight < b.weight) {
- return 1; return 0; // TODO: unreachable code
+ return 1;
}
+ return 0;
});
if (slave.drugs !== _priorities[0].drug) {
slave.drugs = _priorities[0].drug;
@@ -1393,7 +1392,6 @@ window.DefaultRules = (function() {
}
r += "the targeted size.";
}
- return;
} else if (_priorities.length > 0) {
if (slave.drugs !== _priorities[0].drug) {
slave.drugs = _priorities[0].drug;
@@ -1406,11 +1404,9 @@ window.DefaultRules = (function() {
}
r += `that is the only part of ${his} body that does not meet the targeted size.`;
}
- return;
} else if (growthDrugs.has(slave.drugs)) {
slave.drugs = "no drugs";
r += `<br>${slave.slaveName}'s body has met all relevant growth targets, so ${his} pharmaceutical regime has been ended.`;
- return;
}
} else {
if (rule.growth_boobs !== "no default setting") {
@@ -1508,7 +1504,6 @@ window.DefaultRules = (function() {
if (growthDrugs.has(slave.drugs)) {
slave.drugs = "no drugs";
r += `<br>${slave.slaveName} has met all relevant growth targets, so ${his} pharmaceutical regime has been ended.`;
- return;
}
}
}
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 0a1bb7eee9096729c9e3c5f6032e816935d47c22..20ade11dc158f508561c794cf355214ea8c40f49 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
window.LivingRule = Object.freeze({LUXURIOUS: 'luxurious', NORMAL: 'normal', SPARE: 'spare'});
window.Job = Object.freeze({
DAIRY: 'work in the dairy', MILKMAID: 'be the Milkmaid', MASTER_SUITE: 'serve in the master suite', CONCUBINE: 'be your Concubine',
@@ -13,7 +12,7 @@ window.PersonalAttention = Object.freeze({TRADE: 'trading', WAR: 'warfare', SLAV
window.predictCost = function(array) {
const array2 = array;
let totalCosts = (
- getBrothelCosts() +
+ getBrothelCosts() +
getBrothelAdsCosts() +
getArcadeCosts() +
getClubCosts() +
@@ -591,7 +590,7 @@ window.getSlaveCost = function(s) {
const drugsCost = State.variables.drugsCost;
// Living expenses
- switch(s.assignment) {
+ switch (s.assignment) {
case Job.ARCADE:
cost += rulesCost * 0.75;
break;
@@ -607,7 +606,7 @@ window.getSlaveCost = function(s) {
}
break;
case Job.FARMYARD:
- if(s.livingRules === LivingRule.NORMAL) {
+ if (s.livingRules === LivingRule.NORMAL) {
cost += rulesCost * 1.5;
} else if (State.variables.farmyardDecoration === 'Roman Revivalist') {
cost += rulesCost * 1.5;
@@ -677,7 +676,7 @@ window.getSlaveCost = function(s) {
// Food
cost += foodCost * 4;
- switch(s.diet) {
+ switch (s.diet) {
case 'fattening': case 'muscle building':
cost += foodCost;
break;
@@ -801,7 +800,7 @@ window.getSlaveCost = function(s) {
// Enemas
if (s.inflation === 3) {
- switch(s.inflationType) {
+ switch (s.inflationType) {
case 'water':
cost += 100;
break;
@@ -813,7 +812,7 @@ window.getSlaveCost = function(s) {
break;
}
} else if (s.inflation === 2) {
- switch(s.inflationType) {
+ switch (s.inflationType) {
case 'water':
cost += 50;
break;
@@ -825,7 +824,7 @@ window.getSlaveCost = function(s) {
break;
}
} else if (s.inflation === 1) {
- switch(s.inflationType) {
+ switch (s.inflationType) {
case 'water':
cost += 25;
break;
@@ -839,7 +838,7 @@ window.getSlaveCost = function(s) {
}
// Drugs
- switch(s.drugs) {
+ switch (s.drugs) {
case 'anti-aging cream':
cost += drugsCost * 10;
break;
@@ -908,10 +907,10 @@ window.NPCSexSupply = function(LC) {
// Lower class calculations
LC += V.sexSubsidiesLC / 10 - V.sexSupplyBarriersLC / 20;
- if(LC >= 0.5) {
+ if (LC >= 0.5) {
NPCSexSupply.lowerClass += Math.max(Math.trunc(NPCSexSupply.lowerClass * ((LC - 0.5) * (0.2 - V.sexSupplyBarriersLC / 25))), (50 * (1 - V.sexSupplyBarriersLC / 5))); // Max growth of 10% per week, unless it is really low, than a flat 50
- } else if(LC < 0.5) {
- if(NPCSexSupply.lowerClass > V.lowerClass * (3 - V.sexSupplyBarriersLC / 2)) { // Natural market share of competitors is at least 30%
+ } else if (LC < 0.5) {
+ if (NPCSexSupply.lowerClass > V.lowerClass * (3 - V.sexSupplyBarriersLC / 2)) { // Natural market share of competitors is at least 30%
NPCSexSupply.lowerClass -= Math.trunc(NPCSexSupply.lowerClass * ((0.5 - LC) / 5)); // Max reduction of 10% per week
}
}
@@ -927,7 +926,7 @@ window.slaveJobValues = function() {
// This section is for specific slaves or non-unique slaves adding their values to the whole
// Accounting for fuckdolls
- if(V.fuckdolls > 0) {
+ if (V.fuckdolls > 0) {
slaveJobValues.arcade += (V.fuckdolls - (V.arcade - V.arcadeSlaves)) * 140 + (V.arcade - V.arcadeSlaves) * (175 + 35 * V.arcadeUpgradeInjectors);
}
@@ -935,68 +934,68 @@ window.slaveJobValues = function() {
V.DJ = V.slaves.find(s => {
return s.assignment === "be the DJ";
});
- if(V.DJ !== 0) {
- if(!canTalk(V.DJ)) {
- // ''__<span class=pink>$DJ.slaveName</span>__'' can't speak <span class=yell>w;and cannot serve as your DJ any more.</span><br>
+ if (V.DJ !== 0) {
+ if (!canTalk(V.DJ)) {
+ //''__@@.pink;$DJ.slaveName@@__'' can't speak @@.yellow;and cannot serve as your DJ any more.@@<br>
V.DJ = 0;
V.unDJ = 1;
- } else if(V.DJ.preg > 37 && V.DJ.broodmother === 2) {
- // ''__<span class=pink>$DJ.slaveName</span>__'' spends so much time giving birth and laboring that <span class=yell>w;$he cannot effectively serve as your DJ any longer.</span>
+ } else if (V.DJ.preg > 37 && V.DJ.broodmother === 2) {
+ //''__@@.pink;$DJ.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your DJ any longer.@@
V.DJ = 0;
V.unDJ = 2;
- } else if(V.DJ.fetish === "mindbroken") {
- // ''__<span class=pink>$DJ.slaveName</span>__'' is mindbroken <span class=yell>w;and cannot serve as your DJ any more.</span><br>
+ } else if (V.DJ.fetish === "mindbroken") {
+ //''__@@.pink;$DJ.slaveName@@__'' is mindbroken @@.yellow;and cannot serve as your DJ any more.@@<br>
V.DJ = 0;
V.unDJ = 3;
- } else if(!canWalk(V.DJ)) {
- // ''__<span class=pink>$DJ.slaveName</span>__'' is no longer independently mobile <span class=yell>w;and cannot serve as your DJ any more.</span><br>
+ } else if (!canWalk(V.DJ)) {
+ //''__@@.pink;$DJ.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your DJ any more.@@<br>
V.DJ = 0;
V.unDJ = 4;
- } else if(!canHear(V.DJ)) {
- // ''__<span class=pink>$DJ.slaveName</span>__'' can no longer hear <span class=yell>w;and cannot serve as your DJ any more.</span><br>
+ } else if (!canHear(V.DJ)) {
+ //''__@@.pink;$DJ.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your DJ any more.@@<br>
V.DJ = 0;
V.unDJ = 5;
}
}
- if(V.DJ !== 0) {
- if(V.DJ.relationship === -3 && V.DJ.devotion > 50) {
+ if (V.DJ !== 0) {
+ if (V.DJ.relationship === -3 && V.DJ.devotion > 50) {
DJRepBonus += 0.1;
// $He tries $his best to be your energetic, cheerful wife.
}
- if(V.DJ.eyes === -2) {
+ if (V.DJ.eyes === -2) {
DJRepBonus += 0.15;
}
- if(V.DJ.skill.entertainment <= 10) {
- // Though $DJ.slaveName does $his best to lead on the club, with $his lack of skill $he can do little.
- } else if(V.DJ.skill.entertainment <= 30) {
+ if (V.DJ.skill.entertainment <= 10) {
+ //Though $DJ.slaveName does $his best to lead on the club, with $his lack of skill $he can do little.
+ } else if (V.DJ.skill.entertainment <= 30) {
DJRepBonus += 0.05;
- // $DJ.slaveName's basic skills marginally <span class=gree>;improve</span> the atmosphere on $clubName.
- } else if(V.DJ.skill.entertainment <= 60) {
+ //$DJ.slaveName's basic skills marginally @@.green;improve@@ the atmosphere on $clubName.
+ } else if (V.DJ.skill.entertainment <= 60) {
DJRepBonus += 0.1;
- // $DJ.slaveName's skills <span class=gree>;improve</span> the atmosphere on $clubName.
- } else if(V.DJ.skill.entertainment < 100) {
+ //$DJ.slaveName's skills @@.green;improve@@ the atmosphere on $clubName.
+ } else if (V.DJ.skill.entertainment < 100) {
DJRepBonus += 0.15;
- // $DJ.slaveName's skills greatly <span class=gree>;improve</span> the atmosphere on $clubName.
- } else if(V.DJ.skill.entertainment >= 100) {
+ //$DJ.slaveName's skills greatly @@.green;improve@@ the atmosphere on $clubName.
+ } else if (V.DJ.skill.entertainment >= 100) {
DJRepBonus += 0.20;
// $DJ.slaveName's mastery immensely <span class=gree>;improves</span> the atmosphere on $clubName.
}
- if(V.DJ.muscles > 5 && V.DJ.muscles <= 95) {
+ if (V.DJ.muscles > 5 && V.DJ.muscles <= 95) {
V.DJRepBonus += 0.05;
// $His toned body helps $him lead $his fellow club girls by letting $him dance all night.
}
- if(V.DJ.intelligence + V.DJ.intelligenceImplant > 15) {
+ if (V.DJ.intelligence + V.DJ.intelligenceImplant > 15) {
DJRepBonus += 0.05 * Math.floor((V.DJ.intelligence + V.DJ.intelligenceImplant)/32);
// $He's smart enough to make an actual contribution to the music, greatly enhancing the entire experience.
}
- if(V.DJ.face > 95) {
+ if (V.DJ.face > 95) {
DJRepBonus += 0.05;
// $His great beauty is a further draw, even when $he's in $his DJ booth, but especially when $he comes out to dance.
}
- if(setup.DJCareers.includes(V.DJ.career)) {
+ if (setup.DJCareers.includes(V.DJ.career)) {
DJRepBonus += 0.05;
- // $He has musical experience from $his life before $he was a slave, a grounding that gives $his tracks actual depth.
- } else if(V.DJ.skill.DJ >= V.masteredXP) {
+ //$He has musical experience from $his life before $he was a slave, a grounding that gives $his tracks actual depth.
+ } else if (V.DJ.skill.DJ >= V.masteredXP) {
DJRepBonus += 0.05;
// $He has musical experience from working for you, giving $his tracks actual depth.
}
@@ -1006,7 +1005,7 @@ window.slaveJobValues = function() {
}
// Checking for space in the club
- if(V.club > 0 && V.ClubiIDs.length < V.club) {
+ if (V.club > 0 && V.ClubiIDs.length < V.club) {
clubSpots = V.club - V.ClubiIDs.length;
}
@@ -1026,15 +1025,14 @@ window.slaveJobValues = function() {
// The slave value sees use during individual end of the week evaluation
// The aggregate is used for determining macro variables like 'prices' for slave goods and services to then be used in end week calculations
V.slaves.forEach(s => {
-
// Arcade slaves adding to 'arcade'
- if(s.assignment === "be confined in the arcade") {
+ if (s.assignment === "be confined in the arcade") {
s.sexAmount = (jsRandom(200, 240) + (20 * (4 - (s.anus - 2 * V.arcadeUpgradeInjectors))) + (10 * (4 - (s.vagina - 2 * V.arcadeUpgradeInjectors))) + Math.trunc(s.health / 5));
slaveJobValues.arcade += s.sexAmount;
}
// Club and public sluts adding to 'club'. Also recruiters assigned as sexual ambassador to another arcology.
- if(s.assignment === "serve in the club" || (s.assignment === "recruit girls" && V.recruiterTarget === "other arcologies")) {
+ if (s.assignment === "serve in the club" || (s.assignment === "recruit girls" && V.recruiterTarget === "other arcologies")) {
SJVClub(s);
}
});
@@ -1044,142 +1042,142 @@ window.slaveJobValues = function() {
s.minorInjury = 0;
// The beauty multiplier
- if(s.sexualFlaw === "attention whore") {
+ if (s.sexualFlaw === "attention whore") {
beautyMultiplier += 0.1;
}
- if(V.arcologies[0].FSEdoRevivalist !== "unset") {
+ if (V.arcologies[0].FSEdoRevivalist !== "unset") {
beautyMultiplier += V.arcologies[0].FSEdoRevivalist / (V.FSLockinLevel * 3);
}
- if(((V.universalRulesFacilityWork === 1) && (s.assignment === "serve the public") && (clubSpots > 0)) || (s.assignment === "serve in the club")) {
- if(s.assignment === "serve the public") {
+ if (((V.universalRulesFacilityWork === 1) && (s.assignment === "serve the public") && (clubSpots > 0)) || (s.assignment === "serve in the club")) {
+ if (s.assignment === "serve the public") {
toTheClub = 1;
V.slavesGettingHelp += 1;
}
- if(V.clubAdsSpending !== 0) {
- if(V.clubAdsStacked === 1) {
- if(isStacked(s) === true) {
+ if (V.clubAdsSpending !== 0) {
+ if (V.clubAdsStacked === 1) {
+ if (isStacked(s) === true) {
beautyMultiplier += 0.05;
// $His stacked body fits $clubName's ad campaign, getting $him more attention.
}
- } else if(V.clubAdsStacked === -1) {
- if(isSlim(s) === true) {
+ } else if (V.clubAdsStacked === -1) {
+ if (isSlim(s) === true) {
beautyMultiplier += 0.05;
// $His slim body fits $clubName's ad campaign, getting $him more attention.
}
}
- if(V.clubAdsPreg === 1) {
- if(isPreg(s) === true) {
+ if (V.clubAdsPreg === 1) {
+ if (isPreg(s) === true) {
beautyMultiplier += 0.05;
// $His gravid body fits $clubName's ad campaign, getting $him more attention.
}
- } else if(V.clubAdsPreg === -1) {
- if(isNotPreg(s) === true) {
+ } else if (V.clubAdsPreg === -1) {
+ if (isNotPreg(s) === true) {
beautyMultiplier += 0.05;
// $His flat belly fits $clubName's ad campaign, getting $him more attention.
}
}
- if(V.clubAdsModded === 1) {
- if(isModded(s) === true) {
+ if (V.clubAdsModded === 1) {
+ if (isModded(s) === true) {
beautyMultiplier += 0.05;
// Body art like $hers is a major draw.
}
- } else if(V.clubAdsModded === -1) {
- if(isUnmodded(s) === true) {
+ } else if (V.clubAdsModded === -1) {
+ if (isUnmodded(s) === true) {
beautyMultiplier += 0.05;
// Very clean bodies like $hers are a major draw.
}
}
- if(V.clubAdsImplanted === 1) {
- if(isSurgicallyImproved(s) === true) {
+ if (V.clubAdsImplanted === 1) {
+ if (isSurgicallyImproved(s) === true) {
beautyMultiplier += 0.05;
// Many citizens come to $clubName looking to fuck a plastic slut like $him.
}
- } else if(V.clubAdsImplanted === -1) {
- if(isPure(s) === true) {
+ } else if (V.clubAdsImplanted === -1) {
+ if (isPure(s) === true) {
beautyMultiplier += 0.05;
// Many citizens come to $clubName looking to get with a natural $girl like $him.
}
}
- if(V.clubAdsOld === 1) {
- if(isYoung(s) === false) {
+ if (V.clubAdsOld === 1) {
+ if (isYoung(s) === false) {
beautyMultiplier += 0.05;
// $He's perfect for $clubName, which practically exists to match citizens up with mature slaves.
}
- } else if(V.clubAdsOld === -1) {
- if(isYoung(s) === true && s.physical >= 18) {
+ } else if (V.clubAdsOld === -1) {
+ if (isYoung(s) === true && s.physical >= 18) {
beautyMultiplier += 0.05;
// $He's perfect for $clubName, which practically exists to match citizens up with young slaves.
}
- } else if(V.clubAdsOld === -2) {
- if(s.physical <= 18 && s.physical >= 13) {
+ } else if (V.clubAdsOld === -2) {
+ if (s.physical <= 18 && s.physical >= 13) {
beautyMultiplier += 0.05;
// $He's perfect for $clubName, which practically exists to match citizens up with teenage slaves.
}
- } else if(V.clubAdsOld === -3) {
- if(s.physical < 13) {
+ } else if (V.clubAdsOld === -3) {
+ if (s.physical < 13) {
beautyMultiplier += 0.05;
// $He's perfect for $clubName, which practically exists to match citizens up with $loli slaves.
}
}
- if(V.clubAdsXX === 1) {
- if(s.dick === 0) {
+ if (V.clubAdsXX === 1) {
+ if (s.dick === 0) {
beautyMultiplier += 0.05;
// Almost everyone who comes to $clubName is looking to fuck a $girl like $him.
}
- } else if(V.clubAdsXX === -1) {
- if(s.dick > 0) {
+ } else if (V.clubAdsXX === -1) {
+ if (s.dick > 0) {
beautyMultiplier += 0.05;
// Almost everyone who comes to $clubName is looking to poke a $girl who cums when buttfucked.
}
}
}
}
- if(s.assignment === "serve in the club" || toTheClub === 1) {
+ if (s.assignment === "serve in the club" || toTheClub === 1) {
beautyMultiplier += DJRepBonus;
}
- if(canHear(s) === false) {
+ if (canHear(s) === false) {
beautyMultiplier -= 0.15;
// $His inability to move to the rhythm of the music is very off putting to those looking to party.
}
- // Injuries
- if(s.curatives < 1 || s.inflationType !== "curative") {
- if(s.health < -50) {
+ //Injuries
+ if (s.curatives < 1 || s.inflationType !== "curative") {
+ if (s.health < -50) {
s.health -= 8;
s.minorInjury = 1;
- } else if(s.health < -20 && jsRandom(1, 100) > 50) {
+ } else if (s.health < -20 && jsRandom(1, 100) > 50) {
s.health -= 5;
s.minorInjury = 1;
- } else if(!canDoVaginal(s)) {
- if(canDoAnal(s)) {
- if(jsRandom(1, 100) > 40+(10*(s.skill.anal + s.skill.oral))) {
- s.health -= 5;
- s.minorInjury = 1;
+ } else if (!canDoVaginal(s)) {
+ if (canDoAnal(s)) {
+ if (jsRandom(1, 100) > 40+(10*(s.skill.anal + s.skill.oral))) {
+ s.health -= 5;
+ s.minorInjury = 1;
}
- } else if(jsRandom(1, 100) > 40 + (10 * s.skill.oral)) {
+ } else if (jsRandom(1, 100) > 40 + (10 * s.skill.oral)) {
s.health -= 5;
s.minorInjury = 1;
}
- } else if(s.skill.anal + s.skill.oral + s.skill.vaginal < 300) {
- if(jsRandom(1, 100) > 10+((s.skill.anal + s.skill.oral + s.skill.vaginal)/10)) {
+ } else if (s.skill.anal + s.skill.oral + s.skill.vaginal < 300) {
+ if (jsRandom(1, 100) > 10+((s.skill.anal + s.skill.oral + s.skill.vaginal)/10)) {
s.minorInjury = 1;
}
}
}
- if(s.minorInjury === 1 && s.assignment === "serve the public") {
+ if (s.minorInjury === 1 && s.assignment === "serve the public") {
let injuryChance;
s.health -= 5;
beautyMultiplier -= 0.05;
- if(canDoAnal(s)) {
+ if (canDoAnal(s)) {
injuryChance = jsRandom(1, 100);
} else {
injuryChance = jsRandom(1, 80);
}
- if(injuryChance > 80) {
+ if (injuryChance > 80) {
s.minorInjury = "sore ass";
- } else if(injuryChance > 60) {
+ } else if (injuryChance > 60) {
s.minorInjury = "black eye";
- } else if(injuryChance > 40) {
+ } else if (injuryChance > 40) {
s.minorInjury = "split lip";
} else if (injuryChance > 20) {
s.minorInjury = "bad bruise";
@@ -1187,8 +1185,8 @@ window.slaveJobValues = function() {
s.minorInjury = "sore muscle";
}
}
- if((s.hears === -1 && s.earwear !== "hearing aids") || (s.hears === 0 && s.earwear === "muffling ear plugs") || (s.hears === -2)) {
- if(!canHear(s)) {
+ if ((s.hears === -1 && s.earwear !== "hearing aids") || (s.hears === 0 && s.earwear === "muffling ear plugs") || (s.hears === -2)) {
+ if (!canHear(s)) {
beautyMultiplier -= 0.5;
} else {
beautyMultiplier -= 0.75;
@@ -1198,8 +1196,8 @@ window.slaveJobValues = function() {
// The amount of sexual acts
s.sexAmount = Beauty(s) / 2 + 100;
- if(s.assignment === "be the DJ") {
- if((V.clubSlaves + toTheClubTotal > 0) && (V.clubSlaves + toTheClubTotal < 10)) {
+ if (s.assignment === "be the DJ") {
+ if ((V.clubSlaves + toTheClubTotal > 0) && (V.clubSlaves + toTheClubTotal < 10)) {
s.sexAmount *= (10 - V.clubSlaves - toTheClubTotal) / 10;
}
}
@@ -1207,40 +1205,39 @@ window.slaveJobValues = function() {
// The quality/value of each sexual act
s.sexQuality = FResult(s);
- if((s.releaseRules === "restrictive" || s.releaseRules === "chastity") && s.standardReward !== "orgasm" && s.energy >= 20) {
+ if ((s.releaseRules === "restrictive" || s.releaseRules === "chastity") && s.standardReward !== "orgasm" && s.energy >= 20) {
s.sexQuality += 2;
}
- if(canDoAnal(s) && s.anus === 0) {
+ if (canDoAnal(s) && s.anus === 0) {
s.sexQuality += 5; // This was at 10, not sure what the reasoning behind that was
}
- if(canDoVaginal(s) && s.vagina === 0) {
+ if (canDoVaginal(s) && s.vagina === 0) {
s.sexQuality += 5;
}
- if(s.devotion > 95 || s.energy > 95) {
+ if (s.devotion > 95 || s.energy > 95) {
s.sexQuality += 2;
- } else if(s.devotion > 50) {
+ } else if (s.devotion > 50) {
s.sexQuality += 1;
- } else if(s.devotion > 20) {
+ } else if (s.devotion > 20) {
// Nothing happens
- } else if(s.trust < -20) {
+ } else if (s.trust < -20) {
s.sexQuality -= 1;
} else {
s.sexQuality -= 2;
}
- if(s.assignment === "serve in the club") {
+ if (s.assignment === "serve in the club") {
s.sexQuality += 2;
- } else if(toTheClub === 1) {
+ } else if (toTheClub === 1) {
s.sexQuality += 2;
clubSpots -= 1;
}
- if(s.assignment !== "recruit girls") {
+ if (s.assignment !== "recruit girls") {
slaveJobValues.club += s.sexAmount * s.sexQuality;
}
- return;
}
// Saturation penalty for public servants. Even the most beautiful slaves lose some of their shine if they have too much competition.
- if(slaveJobValues.club > 0) {
+ if (slaveJobValues.club > 0) {
slaveJobValues.clubSP = (Math.pow(slaveJobValues.club / 1000, 0.95) * 1000) / slaveJobValues.club;
}
return slaveJobValues;
@@ -1252,49 +1249,48 @@ window.corpValue = function() {
const V = State.variables;
if (V.corpIncorporated === 0) {
return 0;
- } else {
- let corpAssets = 0;
- if (V.corpDivExtra > 0) {
- corpAssets += V.corpDivExtraDev * 16000 + V.corpDivExtraSlaves * 10000;
- }
- if (V.corpDivLegal > 0) {
- corpAssets += V.corpDivLegalDev * 20000 + V.corpDivLegalSlaves * 15000;
- }
- if (V.corpDivBreak > 0) {
- corpAssets += V.corpDivBreakDev * 7200 + V.corpDivBreakSlaves * 10000 + V.corpDivBreakSlaves2 * 15000;
- }
- if (V.corpDivSurgery > 0) {
- corpAssets += V.corpDivSurgeryDev * 16000 + V.corpDivSurgerySlaves * 15000 + V.corpDivSurgerySlaves2 * 23000;
- }
- if (V.corpDivTrain > 0) {
- if (V.corpDivSurgery + V.corpDivTrain < 2 && V.corpDivTrainSurgerySwitch === 0) {
- corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * 15000 + V.corpDivTrainSlaves2 * 26000;
- } else if (V.corpDivTrainSurgerySwitch === 1 && V.corpDivTrainSurgeryTimer < 5) {
- corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * (15000 + 1600 * V.corpDivTrainSurgeryTimer) + V.corpDivTrainSlaves2 * (26000 + 1600 * V.corpDivTrainSurgeryTimer);
- } else {
- corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * 23000 + V.corpDivTrainSlaves2 * 34000;
- }
- }
- if (V.corpDivArcade > 0) {
- corpAssets += V.corpDivArcadeDev * 4000 + V.corpDivArcadeSlaves * 10000;
- }
- if (V.corpDivMenial > 0) {
- corpAssets += V.corpDivMenialDev * 5200 + V.corpDivMenialSlaves * 15000;
- }
- if (V.corpDivDairy > 0) {
- corpAssets += V.corpDivDairyDev * 12000 + V.corpDivDairySlaves * 23000;
+ }
+ let corpAssets = 0;
+ if (V.corpDivExtra > 0) {
+ corpAssets += V.corpDivExtraDev * 16000 + V.corpDivExtraSlaves * 10000;
+ }
+ if (V.corpDivLegal > 0) {
+ corpAssets += V.corpDivLegalDev * 20000 + V.corpDivLegalSlaves * 15000;
+ }
+ if (V.corpDivBreak > 0) {
+ corpAssets += V.corpDivBreakDev * 7200 + V.corpDivBreakSlaves * 10000 + V.corpDivBreakSlaves2 * 15000;
+ }
+ if (V.corpDivSurgery > 0) {
+ corpAssets += V.corpDivSurgeryDev * 16000 + V.corpDivSurgerySlaves * 15000 + V.corpDivSurgerySlaves2 * 23000;
+ }
+ if (V.corpDivTrain > 0) {
+ if (V.corpDivSurgery + V.corpDivTrain < 2 && V.corpDivTrainSurgerySwitch === 0) {
+ corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * 15000 + V.corpDivTrainSlaves2 * 26000;
+ } else if (V.corpDivTrainSurgerySwitch === 1 && V.corpDivTrainSurgeryTimer < 5) {
+ corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * (15000 + 1600 * V.corpDivTrainSurgeryTimer) + V.corpDivTrainSlaves2 * (26000 + 1600 * V.corpDivTrainSurgeryTimer);
+ } else {
+ corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * 23000 + V.corpDivTrainSlaves2 * 34000;
}
- if (V.corpDivWhore > 0) {
- if (V.corpDivSurgery + V.corpDivTrain < 2 && V.corpDivTrainSurgerySwitch === 0) {
- corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * 26000;
- } else if (V.corpDivTrainSurgerySwitch === 1 && V.corpDivTrainSurgeryTimer < 20) {
- corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * (26000 + 400 * V.corpDivTrainSurgeryTimer);
- } else {
- corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * 34000;
- }
+ }
+ if (V.corpDivArcade > 0) {
+ corpAssets += V.corpDivArcadeDev * 4000 + V.corpDivArcadeSlaves * 10000;
+ }
+ if (V.corpDivMenial > 0) {
+ corpAssets += V.corpDivMenialDev * 5200 + V.corpDivMenialSlaves * 15000;
+ }
+ if (V.corpDivDairy > 0) {
+ corpAssets += V.corpDivDairyDev * 12000 + V.corpDivDairySlaves * 23000;
+ }
+ if (V.corpDivWhore > 0) {
+ if (V.corpDivSurgery + V.corpDivTrain < 2 && V.corpDivTrainSurgerySwitch === 0) {
+ corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * 26000;
+ } else if (V.corpDivTrainSurgerySwitch === 1 && V.corpDivTrainSurgeryTimer < 20) {
+ corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * (26000 + 400 * V.corpDivTrainSurgeryTimer);
+ } else {
+ corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * 34000;
}
- return corpAssets + V.corpDividend + V.corpCash;
}
+ return corpAssets + V.corpDividend + V.corpCash;
};
// Corporation Share Price
@@ -1304,9 +1300,8 @@ window.corpSharePrice = function(q = 0) {
const V = State.variables;
if (V.corpIncorporated === 0) {
return 0;
- } else {
- return Math.trunc(1000 * (corpValue() / (V.personalShares + V.publicShares + q)));
}
+ return Math.trunc(1000 * (corpValue() / (V.personalShares + V.publicShares + q)));
};
// Corporation Division Slave room
@@ -1317,63 +1312,56 @@ window.corpDivBreakSlavesRoom = function() {
const V = State.variables;
if (V.corpDivBreak === 1 && V.corpDivBreakDev > V.corpDivBreakSlaves) {
return V.corpDivBreakDev - V.corpDivBreakSlaves;
- } else {
- return 0;
}
+ return 0;
};
window.corpDivSurgerySlavesRoom = function() {
const V = State.variables;
if (V.corpDivSurgery === 1 && V.corpDivSurgeryDev > V.corpDivSurgerySlaves) {
return V.corpDivSurgeryDev - V.corpDivSurgerySlaves;
- } else {
- return 0;
}
+ return 0;
};
window.corpDivTrainSlavesRoom = function() {
const V = State.variables;
if (V.corpDivTrain === 1 && V.corpDivTrainDev > V.corpDivTrainSlaves) {
return V.corpDivTrainDev - V.corpDivTrainSlaves;
- } else {
- return 0;
}
+ return 0;
};
window.corpDivArcadeSlavesRoom = function() {
const V = State.variables;
if (V.corpDivArcade === 1 && V.corpDivArcadeDev > V.corpDivArcadeSlaves) {
return V.corpDivArcadeDev - V.corpDivArcadeSlaves;
- } else {
- return 0;
}
+ return 0;
};
window.corpDivMenialSlavesRoom = function() {
const V = State.variables;
if (V.corpDivMenial === 1 && V.corpDivMenialDev > V.corpDivMenialSlaves) {
return V.corpDivMenialDev - V.corpDivMenialSlaves;
- } else {
- return 0;
}
+ return 0;
};
window.corpDivDairySlavesRoom = function() {
const V = State.variables;
if (V.corpDivDairy === 1 && V.corpDivDairyDev > V.corpDivDairySlaves) {
return V.corpDivDairyDev - V.corpDivDairySlaves;
- } else {
- return 0;
}
+ return 0;
};
window.corpDivWhoreSlavesRoom = function() {
const V = State.variables;
if (V.corpDivWhore === 1 && V.corpDivWhoreDev > V.corpDivWhoreSlaves) {
return V.corpDivWhoreDev - V.corpDivWhoreSlaves;
- } else {
- return 0;
}
+ return 0;
};
// Corporation race blacklisting/whitelisting
@@ -1406,15 +1394,15 @@ window.getSlaveStatisticData = function(s, facility) {
if (facility.income.has(s.ID)) {
return facility.income.get(s.ID);
- } else {
- const data = {
- ID: s.ID, slaveName: s.slaveName, customLabel: s.custom.label,
- income: 0, adsIncome: 0, rep: 0, food: 0, cost: getSlaveCost(s),
- customers: 0 /* brothel, club, ... */
- };
- facility.income.set(s.ID, data);
- return data;
}
+
+ const data = {
+ ID: s.ID, slaveName: s.slaveName, customLabel: s.custom.label,
+ income: 0, adsIncome: 0, rep: 0, food: 0, cost: getSlaveCost(s),
+ customers: 0 /* brothel, club, ... */
+ };
+ facility.income.set(s.ID, data);
+ return data;
};
window.initFacilityStatistics = function(facility) {
@@ -1470,8 +1458,7 @@ window.cashX = function(cost, what, who) {
// INCOME
if (cost > 0) {
-
- // record the action
+ //record the action
if (typeof V.lastWeeksCashIncome[what] !== 'undefined') {
V.lastWeeksCashIncome[what] += cost;
} else {
@@ -1487,8 +1474,7 @@ window.cashX = function(cost, what, who) {
// EXPENSES
else if (cost < 0) {
-
- // record the action
+ //record the action
if (typeof V.lastWeeksCashExpenses[what] !== 'undefined') {
V.lastWeeksCashExpenses[what] += cost;
} else {
@@ -1521,8 +1507,7 @@ window.repX = function(rep, what, who) {
// INCOME
// These are all scaled relative to current rep except when recording the who, to keep comparisons between slaves possible across times. This quite drastically reduces rep income at high levels of rep and only slightly at low levels.
if (rep > 0) {
-
- // record the slave, if available
+ //record the slave, if available
if (typeof who !== 'undefined') {
who.lastWeeksRepIncome += rep;
who.lifetimeRepIncome += rep;
@@ -1542,8 +1527,7 @@ window.repX = function(rep, what, who) {
// EXPENSES
else if (rep < 0) {
-
- // record the action
+ //record the action
if (typeof V.lastWeeksRepExpenses[what] !== 'undefined') {
V.lastWeeksRepExpenses[what] += rep;
} else {
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index fa3eae7724cf573f63d1c3fc4ea9b6f92edbfbf2..85f4a11da34c0b8935d4eddb9d313b0d83d8b1fa 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -943,7 +943,12 @@ window.dickToInchString = function(s) {
// takes a dick value e.g. $activeSlave.dick, returns an int of the dick length in cm
window.dickToCM = function(s) {
- return (s < 9 ? s * 5 : (s === 9 ? 50 : s * 6)); // TODO: use if blocks instead of nested ternary operators for readibility?
+ if (s < 9) {
+ return s*5;
+ } else if (s === 9) {
+ return 50;
+ }
+ return s*6;
};
// takes a ball value e.g. $activeSlave.balls, returns a string in the format 3 inches
@@ -1656,82 +1661,77 @@ window.randomRaceHair = function(raceName) {
window.skinToneLevel = function(skinTone) {
if (!setup.naturalSkins.includes(skinTone)) {
return undefined;
- } else {
- let skinNumber;
- let skinToMelanin = {
- "pure black": 25,
- "ebony": 24,
- "black": 23,
- "dark brown": 22,
- "brown": 21,
- "light brown": 20,
- "dark beige": 19,
- "beige": 18,
- "light beige": 17,
- "dark": 16,
- "dark olive": 15,
- "bronze": 14,
- "olive": 13,
- "tan": 12,
- "light olive": 11,
- "light": 10,
- "fair": 9,
- "very fair": 8,
- "extremely fair": 7,
- "pale": 6,
- "very pale": 5,
- "extremely pale": 4,
- "white": 3,
- "ivory": 2,
- "pure white": 1
- };
- skinNumber = skinToMelanin[skinTone];
- return skinNumber;
}
+ const skinToMelanin = {
+ "pure black": 25,
+ "ebony": 24,
+ "black": 23,
+ "dark brown": 22,
+ "brown": 21,
+ "light brown": 20,
+ "dark beige": 19,
+ "beige": 18,
+ "light beige": 17,
+ "dark": 16,
+ "dark olive": 15,
+ "bronze": 14,
+ "olive": 13,
+ "tan": 12,
+ "light olive": 11,
+ "light": 10,
+ "fair": 9,
+ "very fair": 8,
+ "extremely fair": 7,
+ "pale": 6,
+ "very pale": 5,
+ "extremely pale": 4,
+ "white": 3,
+ "ivory": 2,
+ "pure white": 1
+ };
+ return skinToMelanin[skinTone];
};
window.changeSkinTone = function(skin, value) {
if (!setup.naturalSkins.includes(skin)) {
return skin;
- } else {
- let skinToMelanin = {
- "pure black": 25,
- "ebony": 24,
- "black": 23,
- "dark brown": 22,
- "brown": 21,
- "light brown": 20,
- "dark beige": 19,
- "beige": 18,
- "light beige": 17,
- "dark": 16,
- "dark olive": 15,
- "bronze": 14,
- "olive": 13,
- "tan": 12,
- "light olive": 11,
- "light": 10,
- "fair": 9,
- "very fair": 8,
- "extremely fair": 7,
- "pale": 6,
- "very pale": 5,
- "extremely pale": 4,
- "white": 3,
- "ivory": 2,
- "pure white": 1
- };
- let newSkin = (skinToMelanin[skin] + value);
- if (newSkin > 25) {
- newSkin = 25;
- } else if (newSkin < 1) {
- newSkin = 1;
- }
- let prop = "";
- for (prop in skinToMelanin) {
- if (!skinToMelanin.hasOwnProperty(prop)) continue;
- if (newSkin >= skinToMelanin[prop]) return prop;
- }
- return prop;
}
+ const skinToMelanin = {
+ "pure black": 25,
+ "ebony": 24,
+ "black": 23,
+ "dark brown": 22,
+ "brown": 21,
+ "light brown": 20,
+ "dark beige": 19,
+ "beige": 18,
+ "light beige": 17,
+ "dark": 16,
+ "dark olive": 15,
+ "bronze": 14,
+ "olive": 13,
+ "tan": 12,
+ "light olive": 11,
+ "light": 10,
+ "fair": 9,
+ "very fair": 8,
+ "extremely fair": 7,
+ "pale": 6,
+ "very pale": 5,
+ "extremely pale": 4,
+ "white": 3,
+ "ivory": 2,
+ "pure white": 1
+ };
+ let newSkin = (skinToMelanin[skin] + value);
+ if (newSkin > 25) {
+ newSkin = 25;
+ } else if (newSkin < 1) {
+ newSkin = 1;
+ }
+ for (prop in skinToMelanin) {
+ if (!skinToMelanin.hasOwnProperty(prop)) continue;
+ if (newSkin >= skinToMelanin[prop]) return prop;
+ }
+ return prop;
};
diff --git a/src/js/wombJS.js b/src/js/wombJS.js
index 2fb2c454e27d8f67fadb7a10c26fe1a3827743b2..ec546cd916ebf59f6fb4d94f7cdbc1bcc6691ad7 100644
--- a/src/js/wombJS.js
+++ b/src/js/wombJS.js
@@ -196,7 +196,7 @@ window.WombProgress = function (actor, ageToAdd, realAgeToAdd = ageToAdd) {
try {
actor.womb.forEach(ft => {
ft.age += ageToAdd;
- ft.realAge += realAgeToAdd
+ ft.realAge += realAgeToAdd;
});
} catch (err) {
WombInit(actor);
@@ -764,7 +764,7 @@ data.countLitter[x] = count of fetuses in "x" litter.
data.litterData[x] = contain array with actual fetuses that belong to a litter "x". Can be used to check anyithing related to fetus. (This is not copy, but reference to actual fetuses, so be careful with changes of this array).
-Sample of usage in SugarScript:
+Sample of usage in SugarScript:
---
<<set _wd = WombGetLittersData($activeSlave)>>
She is _wd.litters[0] weeks pregnant with her first set of _wd.countLitter[0] children<<if _wd.litters > 1>>, _wd.litters[1] weeks along with her second set<</if>><<if _wd.litters > 2>>, _wd.litters[2] and _wd.litters[2] weeks along with her third<</if>>.
@@ -799,7 +799,7 @@ window.WombGetLittersData = function (actor) {
data.litterData = litterData;
return data;
-}
+};
window.BCReserveInit = function()
{
diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw
index fe588df8d51b5c9a72810a6af67a35cb3f055c88..70961bb38aaf2a48324614e9c16a55d13017378f 100644
--- a/src/pregmod/analyzePlayerPregnancy.tw
+++ b/src/pregmod/analyzePlayerPregnancy.tw
@@ -69,7 +69,7 @@
<br>
Ova: $PC.womb[_ap].genetics.name
- <<if $geneticMappingUpgrade == 1>>
+ <<if $geneticMappingUpgrade >= 1>>
<br>
Gender: $PC.womb[_ap].genetics.gender
<br>
diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index 364e7b2b8d41e8cb45157169cd2728fb1038a0cb..23f05afee63992c204e4112550557f56f4312bcf 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -75,7 +75,7 @@
<br>
Age: $activeSlave.womb[_ap].age
- <<if $geneticMappingUpgrade == 1>>
+ <<if $geneticMappingUpgrade >= 1>>
<br>
Gender: $activeSlave.womb[_ap].genetics.gender
<br>
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index 4ff23b3d2a8ef60c5252d038dbd8942d77aaf03f..c41e4525217eaa1aafc9bf7c74c3840bdc1cea5f 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -320,7 +320,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<<capture $i>>
<<setLocalPronouns $tanks[$i]>>
<br><br>@@.pink;$tanks[$i].slaveName@@ occupies this tank.
- <<if $geneticMappingUpgrade == 1>>
+ <<if $geneticMappingUpgrade >= 1>>
$He is a <<if $tanks[$i].genes == "XX">>female<<else>>male<</if>> of $tanks[$i].race descent with $tanks[$i].eyeColor eyes, $tanks[$i].hColor hair and $tanks[$i].skin skin. Given $his parentage, $he is considered $tanks[$i].nationality.
<<else>>
$He appears to be <<if $tanks[$i].genes == "XX">>a natural girl<<else>>a natural boy<</if>>, with $tanks[$i].hColor hair<<if $tanks[$i].eyes != -2>> and $tanks[$i].eyeColor eyes.<<else>>. $He most likely will be blind.<</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index e0e1cc4d70db9d1c4babc5029cc03befd9b718d5..9477c5c8bc445ee4e18a6ac579a703a8994d6146 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -3775,7 +3775,7 @@ Your slaves get dressed in a large wardrobe area adjacent to the dormitory, room
apparently bigger today than it was yesterday. Intensive female hormone regimens like $hers sometimes cause minor ass expansion.
<<elseif $activeSlave.buttImplantType == 1>>
apparently a little bigger today than it was yesterday. String implants like $hers steadily grow if not regularly drained.
-<<elseif $geneticMappingUpgrade == 1 && $activeSlave.geneticQuirks.rearLipedema == 2>>
+<<elseif $geneticMappingUpgrade >= 1 && $activeSlave.geneticQuirks.rearLipedema == 2>>
apparently a little bigger today than it was yesterday. $His body is constantly laying fat on $his ass and thighs, so this isn't really unexpected.
<<elseif $activeSlave.buttImplant/$activeSlave.butt >= .5>>
apparently a little bigger today than it was yesterday. Large implants like $hers normally cause some slight size fluctuations.
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 26e2e796e4ed79da19c7e30461bea640640a2488..0b0bcf35d947bb169a10557cafe173418c0e29a4 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -524,7 +524,7 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
<</if>>
<<if ($slaves[$i].geneticQuirks.fertility == 2 && $slaves[$i].geneticQuirks.hyperFertility == 2 && $slaves[$i].preg == 0 && ($slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1))>>
<br>
- <<if $geneticMappingUpgrade == 1>>
+ <<if $geneticMappingUpgrade >= 1>>
<i>Additional dietary supplements due to genetic hyper-fertility:</i> @@.yellowgreen;<<print cashFormat($foodCost/2)>>@@
<<else>>
<i>Adjustment for unusual deitary deficiencies:</i> @@.yellowgreen;<<print cashFormat($foodCost/2)>>@@
@@ -533,7 +533,7 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
<</if>>
<<if ($slaves[$i].geneticQuirks.rearLipedema == 2)>>
<br>
- <<if $geneticMappingUpgrade == 1>>
+ <<if $geneticMappingUpgrade >= 1>>
<i>Additional dietary supplements due to lipedema:</i> @@.yellowgreen;<<print cashFormat($foodCost/5)>>@@
<<else>>
<i>Adjustment for unusual deitary deficiencies:</i> @@.yellowgreen;<<print cashFormat($foodCost/5)>>@@
diff --git a/src/uncategorized/costsWidgets.tw b/src/uncategorized/costsWidgets.tw
index f410b561f366c8929364158121ac4ea35f125eca..ebcbad46848bbc996e142b3971a46309a173fdd1 100644
--- a/src/uncategorized/costsWidgets.tw
+++ b/src/uncategorized/costsWidgets.tw
@@ -107,13 +107,22 @@
<</if>>
<<if ($args[0].geneticQuirks.fertility == 2 && $args[0].geneticQuirks.hyperFertility == 2 && $args[0].preg == 0 && ($args[0].ovaries == 1 || $args[0].mpreg == 1))>>
<br>
- <<if $geneticMappingUpgrade == 1>>
+ <<if $geneticMappingUpgrade >= 1>>
<i>Additional dietary supplements due to genetic hyper-fertility:</i> @@.yellowgreen;<<print cashFormat($foodCost/2)>>@@
<<else>>
<i>Adjustment for unusual deitary deficiencies:</i> @@.yellowgreen;<<print cashFormat($foodCost/2)>>@@
<</if>>
<<set _individualCosts += $foodCost/2>>
<</if>>
+ <<if ($args[0].geneticQuirks.rearLipedema == 2)>>
+ <br>
+ <<if $geneticMappingUpgrade >= 1>>
+ <i>Additional dietary supplements due to lipedema:</i> @@.yellowgreen;<<print cashFormat($foodCost/5)>>@@
+ <<else>>
+ <i>Adjustment for unusual deitary deficiencies:</i> @@.yellowgreen;<<print cashFormat($foodCost/5)>>@@
+ <</if>>
+ <<set _individualCosts += $foodCost/5>>
+ <</if>>
<<if $args[0].drugs == "appetite suppressors">>
<br> <i>Food saved via suppressed appetite:</i> //reduced by// @@.yellowgreen;<<print cashFormat($foodCost)>>@@
<<set _individualCosts -= $foodCost>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 26b28ca8842e626b377ddc1e1c86fc7ab0f6b42e..9e49429cede9eca0c5923e1be1d17deedaafaafe 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1381,7 +1381,7 @@ $He has
<br><br>
-<<if $geneticMappingUpgrade == 1>>
+<<if $geneticMappingUpgrade >= 1>>
Apply a retro-virus treatment:
<br>
<<if ($activeSlave.indentureRestrictions >= 1)>>
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index 4192f96d9cdf21bd53e2c11713c0d1ab1eb57d33..55fd645ed31e9df66220261bba094666011f3053 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -294,7 +294,7 @@
<</if>>
<<if _rearQuirk != 0>>
<<set _growth += 3>>
- <<if $geneticMappingUpgrade == 1>>
+ <<if $geneticMappingUpgrade >= 1>>
$His rear lipedema amplifies the drug's effects on $his bottom.
<<else>>
The drugs seem to have an added effect on $him.
@@ -367,7 +367,7 @@
<</if>>
<<if _rearQuirk != 0>>
<<set _growth += 1>>
- <<if $geneticMappingUpgrade == 1>>
+ <<if $geneticMappingUpgrade >= 1>>
$His rear lipedema massively amplifies the drug's effects.
<<else>>
The drugs seem to have an added effect on $him.
@@ -1056,7 +1056,7 @@
<<set $slaves[$i].drugs = "no drugs">>
<<elseif _rearQuirk == 2>>
$His @@.orange;waistline swells slightly,@@ but @@.lime;$his butt barely loses any mass@@
- <<if $geneticMappingUpgrade == 1>>
+ <<if $geneticMappingUpgrade >= 1>>
due to $his rear lipedema putting it right back.
<<else>>
for an unknown reason.
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index d6ff92ba42cfa873c5c89208d54b31936a8e7a94..372214faf4defc6aec5aa506bc8f0b134ac1e5a6 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6722,7 +6722,7 @@
<</if>>
<<if $slaves[$i].geneticQuirks.rearLipedema == 2 && $slaves[$i].butt < 20 && $slaves[$i].weight >= -95>>
- <<if $geneticMappingUpgrade == 1>>
+ <<if $geneticMappingUpgrade >= 1>>
$His body @@.lime;continues to lay fat on $his rear@@ due to $his lipedema.
<</if>>
<<set $slaves[$i].butt += .1>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 2edeb5a310cb93ceeb07c0d86d6ce29d732ea698..ba81c8464d63f74dbdf872a6cd34f1ef71213806 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -84,7 +84,7 @@
<<widget "geneticQuirkAssessment">>
-<<if $geneticMappingUpgrade == 1>>
+<<if $geneticMappingUpgrade >= 1>>
<<if $activeSlave.geneticQuirks.albinism == 2>>
$He is an albino.
<</if>>