diff --git a/src/Mods/SecExp/js/secExpBC.js b/src/Mods/SecExp/js/secExpBC.js
index 3a3c9fe42afc42e01769a8ade2c3870cbf6af8e5..46d090fd112fa47a735368f41e087ea971092e0c 100644
--- a/src/Mods/SecExp/js/secExpBC.js
+++ b/src/Mods/SecExp/js/secExpBC.js
@@ -106,11 +106,11 @@ App.SecExp.generalBC = function() {
V.SecExp.units.mercs.free = 30;
}
}
-
+
for (const squad of App.SecExp.unit.humanSquads()) {
App.SecExp.unit.fixBroken(squad);
}
-
+
if (V.SecExp.defaultNames) {
V.SecExp.units.slaves.defaultName = V.SecExp.defaultNames.slaves;
V.SecExp.units.mercs.defaultName = V.SecExp.defaultNames.mercs;
diff --git a/src/endWeek/reports/brothelReport.js b/src/endWeek/reports/brothelReport.js
index cf79c57d336cd6dae081c13879a78750954e9229..f22c8e70c04629c803d0bf26f350852aa042d5ec 100644
--- a/src/endWeek/reports/brothelReport.js
+++ b/src/endWeek/reports/brothelReport.js
@@ -48,6 +48,7 @@ App.EndWeek.brothelReport = function() {
FLsFetish = 1;
S.Madam.fetishKnown = 1;
S.Madam.fetish = "dom";
+ S.Madam.fetishStrength = 10;
}
} else if (S.Madam.fetishKnown === 0) {
FLsFetish = 1;
diff --git a/src/endWeek/reports/cellblockReport.js b/src/endWeek/reports/cellblockReport.js
index 59cb643ca983ff9bd89c214f37f78c67ad1b7bc6..344449e1a79ebfbf151da80bfde3b644d7f78959 100644
--- a/src/endWeek/reports/cellblockReport.js
+++ b/src/endWeek/reports/cellblockReport.js
@@ -48,6 +48,7 @@ App.EndWeek.cellblockReport = function() {
FLsFetish = 1;
S.Wardeness.fetishKnown = 1;
S.Wardeness.fetish = "sadist";
+ S.Wardeness.fetishStrength = 10;
}
} else if (S.Wardeness.fetishKnown === 0) {
FLsFetish = 1;
diff --git a/src/endWeek/reports/clinicReport.js b/src/endWeek/reports/clinicReport.js
index 1073e82bd91a11b3d3d83b25b25235fdbf49a94e..9366fb523ede2bf98ee03d5ea15d2e63ca9956b7 100644
--- a/src/endWeek/reports/clinicReport.js
+++ b/src/endWeek/reports/clinicReport.js
@@ -36,6 +36,7 @@ App.EndWeek.clinicReport = function() {
FLsFetish = 1;
S.Nurse.fetishKnown = 1;
S.Nurse.fetish = "dom";
+ S.Nurse.fetishStrength = 10;
}
} else if (S.Nurse.fetishKnown === 0) {
FLsFetish = 1;
diff --git a/src/endWeek/reports/clubReport.js b/src/endWeek/reports/clubReport.js
index 65f83a2e2a94bd4fbbdd018cb73b9b0e7f861364..20230974547efcf4c18b711374ac24cbfb11b640 100644
--- a/src/endWeek/reports/clubReport.js
+++ b/src/endWeek/reports/clubReport.js
@@ -39,6 +39,7 @@ App.EndWeek.clubReport = function() {
FLsFetish = 1;
S.DJ.fetishKnown = 1;
S.DJ.fetish = "humiliation";
+ S.DJ.fetishStrength = 10;
}
} else if (S.DJ.fetishKnown === 0) {
FLsFetish = 1;
diff --git a/src/endWeek/reports/dairyReport.js b/src/endWeek/reports/dairyReport.js
index c6a0bbb2c4d51483ea5c318c66a7707770a27b71..6c67054e3d8079ba0b358a3989270abe2c22d193 100644
--- a/src/endWeek/reports/dairyReport.js
+++ b/src/endWeek/reports/dairyReport.js
@@ -138,6 +138,7 @@ App.EndWeek.dairyReport = function() {
FLsFetish = 1;
S.Milkmaid.fetishKnown = 1;
S.Milkmaid.fetish = "boobs";
+ S.Milkmaid.fetishStrength = 10;
}
} else if (S.Milkmaid.fetishKnown === 0) {
FLsFetish = 1;
@@ -152,6 +153,7 @@ App.EndWeek.dairyReport = function() {
FLsFetish = 3;
S.Milkmaid.fetishKnown = 1;
S.Milkmaid.fetish = "cumslut";
+ S.Milkmaid.fetishStrength = 10;
}
} else if (S.Milkmaid.fetishKnown === 0) {
FLsFetish = 3;
@@ -166,6 +168,7 @@ App.EndWeek.dairyReport = function() {
FLsFetish = 5;
S.Milkmaid.fetishKnown = 1;
S.Milkmaid.fetish = "pregnancy";
+ S.Milkmaid.fetishStrength = 10;
}
} else if (S.Milkmaid.fetishKnown === 0) {
FLsFetish = 5;
diff --git a/src/endWeek/reports/farmyardReport.js b/src/endWeek/reports/farmyardReport.js
index 10b7d475f9df6da16eb4d6e515ab7acfcab0321a..5f9d59c893af2354942d32591a0a819d98103729 100644
--- a/src/endWeek/reports/farmyardReport.js
+++ b/src/endWeek/reports/farmyardReport.js
@@ -109,6 +109,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
if (fetishChangeChance(slave) > jsRandom(0, 100)) {
slave.fetishKnown = 1;
slave.fetish = 'dom';
+ slave.fetishStrength = 10;
return 1;
}
} else if (!slave.fetishKnown) {
diff --git a/src/endWeek/reports/schoolroomReport.js b/src/endWeek/reports/schoolroomReport.js
index e6854c231a8798b2399dfb0a54523d9c40e24ab6..0ab52049ad6c993797135a5b446f028dec7d73ed 100644
--- a/src/endWeek/reports/schoolroomReport.js
+++ b/src/endWeek/reports/schoolroomReport.js
@@ -39,6 +39,7 @@ App.EndWeek.schoolroomReport = function() {
FLsFetish = 1;
S.Schoolteacher.fetishKnown = 1;
S.Schoolteacher.fetish = "dom";
+ S.Schoolteacher.fetishStrength = 10;
}
} else if (S.Schoolteacher.fetishKnown === 0) {
FLsFetish = 1;
diff --git a/src/endWeek/reports/servantsQuartersReport.js b/src/endWeek/reports/servantsQuartersReport.js
index 3e09cb8b1a2139fb4d3e355003cbc49cd8185f7b..a429906ac1e9c76fcf0be0f4e383a4925508bd72 100644
--- a/src/endWeek/reports/servantsQuartersReport.js
+++ b/src/endWeek/reports/servantsQuartersReport.js
@@ -33,6 +33,7 @@ App.EndWeek.servantsQuartersReport = function() {
FLsFetish = 1;
S.Stewardess.fetishKnown = 1;
S.Stewardess.fetish = "dom";
+ S.Stewardess.fetishStrength = 10;
}
} else if (S.Stewardess.fetishKnown === 0) {
FLsFetish = 1;
diff --git a/src/endWeek/reports/spaReport.js b/src/endWeek/reports/spaReport.js
index 2e70f4714f460f9e08203710701e3c58f457cb3d..d0d4f0770c1b3f351f57f31453f46ce16c9829fb 100644
--- a/src/endWeek/reports/spaReport.js
+++ b/src/endWeek/reports/spaReport.js
@@ -35,6 +35,7 @@ App.EndWeek.spaReport = function() {
FLsFetish = 1;
S.Attendant.fetishKnown = 1;
S.Attendant.fetish = "submissive";
+ S.Attendant.fetishStrength = 10;
}
} else if (S.Attendant.fetishKnown === 0) {
FLsFetish = 1;
diff --git a/src/events/RETS/reTopExhaustion.js b/src/events/RETS/reTopExhaustion.js
index ffdbb142994ac96e8933c3420f52ab14804b298c..4db34abde09ced7cc20d6439fb803f3a20ac8125 100644
--- a/src/events/RETS/reTopExhaustion.js
+++ b/src/events/RETS/reTopExhaustion.js
@@ -62,7 +62,7 @@ App.Events.RETSTopExhaustion = class RETSTopExhaustion extends App.Events.BaseEv
let t = [];
t.push(`As you stroll past the best part of the slave living area one evening, you hear a lewd slap, slap, slap coming from the room`);
- t.push(App.UI.DOM.combineNodes(App.UI.DOM.slaveDescriptionDialog(subSlave)));
+ t.push(App.UI.DOM.slaveDescriptionDialog(subSlave));
t.push(`and`);
t.push(contextualIntro(subSlave, domSlave, "DOM"));
t.push(`share. It's quite obvious what they're up to, but you look in anyway. ${subSlave.slaveName} has clearly had a long day, and is tired, but ${he}'s being a good ${subSlave.relationship > 4 ? `${wife}` : `lover`} and letting ${domSlave.slaveName} use ${his} body. ${subSlave.slaveName} is lying`);
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 4816d267ae70ba14cfe9c7895d26fd7e133aae45..090b370b6f348fb6a98031cdcc37531dd6abcc24 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -620,7 +620,7 @@ globalThis.calculateCosts = (function() {
// security expansion
function getSecurityExpansionCost() {
- let secExpCost = 0, soldierMod = 1.5; // V.SecExp.edicts.defense.soldierWages === 1
+ let secExpCost = 0;
if (V.secExpEnabled > 0) {
const unitModifier = function(x) {
if (x === 'slaves') {
@@ -629,16 +629,12 @@ globalThis.calculateCosts = (function() {
return 1.5;
}
return 1;
- }
-
+ };
+
secExpCost += App.SecExp.upkeep.edictsCash();
secExpCost += App.SecExp.upkeep.SF();
secExpCost += App.SecExp.upkeep.buildings();
- if (V.SecExp.edicts.defense.soldierWages === 0) {
- soldierMod = 1;
- } else if (V.SecExp.edicts.defense.soldierWages === 2) {
- soldierMod = 2;
- }
+ const soldierMod = 1 + V.SecExp.edicts.defense.soldierWages * 0.5; // 1.0, 1.5, 2.0
for (const unit of App.SecExp.unit.list().slice(1)) {
for (const squad of V.SecExp.units[unit].squads) {