diff --git a/src/Mods/SecExp/js/Unit.js b/src/Mods/SecExp/js/Unit.js index 4796eff75d3cbea54eb6b55f4baf8814bfe09209..fc260d1845aea941be88b26ef935437eb3c2b0f1 100644 --- a/src/Mods/SecExp/js/Unit.js +++ b/src/Mods/SecExp/js/Unit.js @@ -399,11 +399,11 @@ App.SecExp.unit = (function() { return el; } - + function isDeployed(unit) { return (V.citizenRebellion === 0 && V.slaveRebellion === 0 && unit.isDeployed === 1) || ((V.citizenRebellion > 0 || V.slaveRebellion > 0) && unit.active === 1 && !V.SecExp.war.rebellingID.includes(unit.ID)); } - + function humanSquads() { let array = []; for (const unit of list().slice(1)) { diff --git a/src/Mods/SecExp/js/secExpBC.js b/src/Mods/SecExp/js/secExpBC.js index 46d090fd112fa47a735368f41e087ea971092e0c..7573dbd32b2c13fc73bef7325087e160b9bbf868 100644 --- a/src/Mods/SecExp/js/secExpBC.js +++ b/src/Mods/SecExp/js/secExpBC.js @@ -90,14 +90,18 @@ App.SecExp.generalBC = function() { App.SecExp.unit.gen('slaves', {count: V.createdSlavesUnits, killed: V.slavesTotalCasualties, squads: V.slaveUnits}); V.SecExp.units.slaves.defaultName = V.SecExp.units.slaves.defaultName || "slave platoon"; - App.SecExp.unit.gen('militia', {count: V.createdMilitiaUnits, killed: V.militiaTotalCasualties, squads: V.militiaUnits, free: V.militiaFreeManpower}); + App.SecExp.unit.gen('militia', { + count: V.createdMilitiaUnits, killed: V.militiaTotalCasualties, squads: V.militiaUnits, free: V.militiaFreeManpower + }); V.SecExp.units.militia.defaultName = V.SecExp.units.militia.defaultName || "citizens' platoon"; if (jsDef(V.SecExp.defaultNames) && (V.SecExp.defaultNames.milita || V.SecExp.defaultNames.militia)) { V.SecExp.units.militia.defaultName = V.SecExp.defaultNames.milita || V.SecExp.defaultNames.militia; delete V.SecExp.defaultNames.milita; delete V.SecExp.defaultNames.militia; } - App.SecExp.unit.gen('mercs', {count: V.createdMercUnits, killed: V.mercTotalCasualties, squads: V.mercUnits, free: V.mercFreeManpower}); + App.SecExp.unit.gen('mercs', { + count: V.createdMercUnits, killed: V.mercTotalCasualties, squads: V.mercUnits, free: V.mercFreeManpower + }); V.SecExp.units.mercs.defaultName = V.SecExp.units.mercs.defaultName || "mercenary platoon"; if (V.SecExp.units.mercs.free === 0) { if (V.mercenaries === 1) { diff --git a/src/endWeek/reports/farmyardReport.js b/src/endWeek/reports/farmyardReport.js index b1374a9499573cad1eb7e07e4f9638c43e0fdfbd..4a6124453eafb9fc7c65fc5c78eac217837ff2f5 100644 --- a/src/endWeek/reports/farmyardReport.js +++ b/src/endWeek/reports/farmyardReport.js @@ -168,7 +168,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { } function farmerTiredness(slave) { - const {he, his, him, He} = getPronouns(slave); + const {he, his} = getPronouns(slave); if (slaveResting(slave)) { return `To avoid exhaustion, ${he} has to take breaks to maintain ${his} strength, limiting how much ${he} can work.`; diff --git a/src/events/intro/initNationalities.js b/src/events/intro/initNationalities.js index ea2f76c796b3ba5aa1a6a7e65adcd4d48bb1b661..cc2e72d61a1692e0bb90c99d1191c76ad8348a0a 100644 --- a/src/events/intro/initNationalities.js +++ b/src/events/intro/initNationalities.js @@ -75,6 +75,7 @@ App.Intro.initNationalities = function() { if (V.secExpEnabled > 0) { V.SecExp.units.bots = App.SecExp.unit.gen("bots"); } + break; case "worksite helper": V.trinkets.push("the hardhat you used to wear around worksites"); break;