diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ff968cd5905f3d966ad7b01bd1737a342168ea58..a48e89fb947d18afb693f4b3413ef6c187e04c64 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,7 +26,7 @@ To effectively work on the project the following tools are required:
2. Run `npm install`
3. Open the directory in your preferred IDE
-4. Configure your IDE to use ESLint and the type checking capabilities of the TypeScript compiler.
+4. Configure your IDE to use ESLint.
5. It might also be worth installing the following extensions if using VS Code:
[Code Spell Checker](https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker) and [GitLens — Git supercharged](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens).
diff --git a/devNotes/gitSetup.md b/devNotes/gitSetup.md
index bebe7eeab083de08fa7e925d11dce8138b4f8a43..0cceb0942d335e3382aa39f14c8bebfc9bf1d04d 100644
--- a/devNotes/gitSetup.md
+++ b/devNotes/gitSetup.md
@@ -22,7 +22,7 @@
## Typical cycle with Git:
0. Switch to the pregmod-master branch, then check for and merge any upstream updates
- before updating your remote if any updates were avabile
+ before updating your remote if any updates are present
* Via terminal: `git checkout -q pregmod-master && git fetch upstream && git merge upstream/pregmod-master && git push -q`
1. Checkout a new branch for your work
@@ -39,7 +39,7 @@
* You can ignore errors that already existed
6. Push result into your forked repository
* Via terminal:
- * Initially: git push -u origin `git rev-parse --abbrev-ref HEAD`
+ * Initially: `git push -u origin $(git rev-parse --abbrev-ref HEAD)`
* Afterwards `git push` will suffice.
7. Create merge request through gitgud interface.
diff --git a/devTools/javaSanityCheck/ignoredVariables b/devTools/javaSanityCheck/ignoredVariables
index 5ccfc99acfb72aecd2fa97cd9260444883982b32..97d2d75fdbe4e012e9c12b93f4d9b38527a4991c 100644
--- a/devTools/javaSanityCheck/ignoredVariables
+++ b/devTools/javaSanityCheck/ignoredVariables
@@ -8,7 +8,14 @@ enemyMod
acquire
############################
totalMerc
-securityHQ
dickSize
dinnerParty
-seed
\ No newline at end of file
+seed
+# Only used within src/pregmod/widgets/pregmodWidgets.tw
+Hers
+Himself
+Daughter
+Sister
+Loli
+Wife
+Wives
diff --git a/src/Mods/SecExp/buildings/buildingsBC.js b/src/Mods/SecExp/buildings/buildingsBC.js
index c3c98b47099091aaa5d634fde4fab1a4ff0a2460..c8ec1f0b516df926cd567440dc2cbfcfb7d77482 100644
--- a/src/Mods/SecExp/buildings/buildingsBC.js
+++ b/src/Mods/SecExp/buildings/buildingsBC.js
@@ -1,5 +1,5 @@
App.SecExp.BC = (function() {
- return {
+ return {
propHub,
riotCenter,
barracks,
@@ -8,7 +8,7 @@ App.SecExp.BC = (function() {
secHub
};
- function propHub() {
+ function propHub() {
if (V.SecExp.buildings.pr === null) {
delete V.SecExp.buildings.pr;
}
@@ -56,8 +56,8 @@ App.SecExp.BC = (function() {
}
}
- function riotCenter() {
- if (V.riotCenter || (V.SecExp.buildings.riotCenter && Object.entries(V.SecExp.buildings.riotCenter).length > 0)) {
+ function riotCenter() {
+ if (V.riotCenter || (V.SecExp.buildings.riotCenter && Object.entries(V.SecExp.buildings.riotCenter).length > 0)) {
V.SecExp.buildings.riotCenter = V.SecExp.buildings.riotCenter || {};
V.SecExp.buildings.riotCenter.upgrades = V.SecExp.buildings.riotCenter.upgrades || V.riotUpgrades || {};
V.SecExp.buildings.riotCenter.fort = V.SecExp.buildings.riotCenter.fort || V.fort || {};
@@ -78,7 +78,7 @@ App.SecExp.BC = (function() {
}
V.SecExp.buildings.riotCenter.brainImplantProject = V.SecExp.buildings.riotCenter.brainImplantProject || V.brainImplantProject || 0;
}
- }
+ }
function barracks() {
if (V.SecExp.buildings.barracks) {
diff --git a/src/Mods/SecExp/buildings/propagandaHub.js b/src/Mods/SecExp/buildings/propagandaHub.js
index 9896faacff11dc10e5f1572220ca2f28fe061c7a..84ef7356bfd684fed95bbf80a21c14b68d77b4e2 100644
--- a/src/Mods/SecExp/buildings/propagandaHub.js
+++ b/src/Mods/SecExp/buildings/propagandaHub.js
@@ -20,11 +20,11 @@ App.SecExp.propHub = (function() {
};
}
- function GUI() {
+ function GUI() {
const node = new DocumentFragment();
V.nextButton = "Back";
V.nextLink = "Main";
- let r = [];
+ let r = [];
node.append("The propaganda hub is a surprisingly inconspicuous building, dimly lit from the outside. You are well aware however of its role and its importance. You confidently enter its unassuming doorway and calmly review the work being done here.");
if (V.RecruiterID !== 0) {
@@ -259,5 +259,5 @@ App.SecExp.propHub = (function() {
App.UI.DOM.appendNewElement("div", r, `Costs ${cashFormat(getCost(price, type, applyHacking))}. ${note}`, "note");
return r;
}
- }
+ }
})();
diff --git a/src/Mods/SecExp/buildings/riotControlCenter.js b/src/Mods/SecExp/buildings/riotControlCenter.js
index e2fe0621a04208241bf132e73005c1b9c90b371a..5c44d0e135251c692d0aaa9e9524a45b5be2c424 100644
--- a/src/Mods/SecExp/buildings/riotControlCenter.js
+++ b/src/Mods/SecExp/buildings/riotControlCenter.js
@@ -241,7 +241,7 @@ App.SecExp.riotCenter = (function() {
`Deploy the unit against ${type} rebel leaders`,
() => {
const price = forceNeg(1000 + 50 * V.SecExp.buildings.riotCenter.upgrades.rapidUnit);
- (function() { cost === "reputation" ? repX(price, "war") : App.SecExp.authorityX(-price) })();
+ (function() { cost === "reputation" ? repX(price, "war") : App.SecExp.authorityX(-price); })();
const change = random(15) + random(1, 2) * V.SecExp.buildings.riotCenter.upgrades.rapidUnit;
V.SecExp.rebellions[type + "Progress"] = Math.clamp(V.SecExp.rebellions[type + "Progress"] - change, 0, 100);
V.SecExp.buildings.riotCenter.sentUnitCooldown = 3 - V.SecExp.buildings.riotCenter.upgrades.rapidUnitSpeed;
diff --git a/src/Mods/SecExp/buildings/secBarracks.js b/src/Mods/SecExp/buildings/secBarracks.js
index 094fac7a491b077119ba3543bb9a04c4447e207e..2f49520acb4da95a2c639a7d276b4d68452c71e4 100644
--- a/src/Mods/SecExp/buildings/secBarracks.js
+++ b/src/Mods/SecExp/buildings/secBarracks.js
@@ -149,8 +149,8 @@ App.SecExp.barracks = (function() {
text = "Add a training facility to the barracks";
break;
case 1:
- cost = "Improve the training facility with modern equipment and skilled personnel";
- text = 20000 * V.upgradeMultiplierTrade;
+ cost = 20000 * V.upgradeMultiplierTrade;
+ text = "Improve the training facility with modern equipment and skilled personnel";
}
App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(text, () => {
diff --git a/src/Mods/SecExp/buildings/securityHQ.js b/src/Mods/SecExp/buildings/securityHQ.js
index 07ab9f3f8b662397d50c8eaa6888b3d56adc4f70..dac67a2547d21c0ed311d1c6efe2a113998e4a26 100644
--- a/src/Mods/SecExp/buildings/securityHQ.js
+++ b/src/Mods/SecExp/buildings/securityHQ.js
@@ -35,23 +35,23 @@ App.SecExp.secHub = (function() {
}
};
}
- function GUI() {
+ function GUI() {
const node = new DocumentFragment();
- V.nextButton = "Back";
+ V.nextButton = "Back";
V.nextLink = "Main";
- let r = [];
+ let r = [];
- r.push("The security headquarters stand in front of you. Innumerable screens flood with light the great central room.");
- if (V.SecExp.buildings.secHub.menials > 0) {
- r.push("Some slaves see you enter and interrupt their work to greet you.");
- }
- r.push("From here you can build a safe and prosperous arcology.");
- node.append(r.join(" "));
- if (V.SecExp.core.authority < 10000 || V.SecExp.core.authority < 12000) {
- App.UI.DOM.appendNewElement("div", node, "You lack the authority to access more advanced upgrades.", "red");
- }
+ r.push("The security headquarters stand in front of you. Innumerable screens flood with light the great central room.");
+ if (V.SecExp.buildings.secHub.menials > 0) {
+ r.push("Some slaves see you enter and interrupt their work to greet you.");
+ }
+ r.push("From here you can build a safe and prosperous arcology.");
+ node.append(r.join(" "));
+ if (V.SecExp.core.authority < 10000 || V.SecExp.core.authority < 12000) {
+ App.UI.DOM.appendNewElement("div", node, "You lack the authority to access more advanced upgrades.", "red");
+ }
- App.UI.DOM.appendNewElement("div", node, `You have ${num(V.SecExp.buildings.secHub.menials)} slaves working in the HQ. ${App.SecExp.Check.reqMenials()} are required and you have ${num(V.menials)} free menial slaves.`);
+ App.UI.DOM.appendNewElement("div", node, `You have ${num(V.SecExp.buildings.secHub.menials)} slaves working in the HQ. ${App.SecExp.Check.reqMenials()} are required and you have ${num(V.menials)} free menial slaves.`);
if (V.SecExp.buildings.secHub.menials < App.SecExp.Check.reqMenials()) {
App.UI.DOM.appendNewElement("div", node, "You do not have enough slaves here. You will not receive the full benefit of the installed upgrades.");
} else {
@@ -107,7 +107,7 @@ App.SecExp.secHub = (function() {
)
);
}
-
+
App.Events.addParagraph(node, []);
switch(App.SecExp.battle.recon()) {
case 0:
@@ -116,7 +116,7 @@ App.SecExp.secHub = (function() {
case 1:
App.UI.DOM.appendNewElement("div", node, "You have limited reconnaissance capabilities. You'll have limited intel available in case of an attack.");
break;
- case 2:
+ case 2:
App.UI.DOM.appendNewElement("div", node, "You have good reconnaissance capabilities. Good, reliable intel will be available if the arcology is attacked.");
break;
case 3:
@@ -199,28 +199,28 @@ App.SecExp.secHub = (function() {
tabBar.addTab("Reconnaissance and readiness", "ReconReadiness", ReconReadiness());
node.append(tabBar.render());
- return node;
+ return node;
function SecurityCrime() {
const z = new DocumentFragment();
App.UI.DOM.appendNewElement("h2", z, `Security`);
if (V.SecExp.buildings.secHub.upgrades.security.nanoCams === 0) {
z.append(
- makeLink("Install a nano-camera system",
- 5000,
- "Will raise rest point of security by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
- "nanoCams")
+ makeLink("Install a nano-camera system",
+ 5000,
+ "Will raise rest point of security by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
+ "nanoCams")
);
} else {
z.append("You have installed all across the arcology closed circuit nano-cameras to keep the arcology under your watchful eye.");
}
if (V.SecExp.buildings.secHub.upgrades.security.cyberBots === 0) {
- App.UI.DOM.appendNewElement("div", z,
- makeLink("Buy cybersecurity algorithms",
- 7500,
- "Will raise rest point of security by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
- "cyberBots")
+ App.UI.DOM.appendNewElement("div", z,
+ makeLink("Buy cybersecurity algorithms",
+ 7500,
+ "Will raise rest point of security by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
+ "cyberBots")
);
} else {
App.UI.DOM.appendNewElement("div", z, "You have bought advanced cybersecurity algorithms that will defend your arcology against hack attempts or cyber frauds.");
@@ -228,22 +228,22 @@ App.SecExp.secHub = (function() {
if (V.SecExp.core.authority > 10000) {
if (V.SecExp.buildings.secHub.upgrades.security.eyeScan === 0) {
- App.UI.DOM.appendNewElement("div", z,
+ App.UI.DOM.appendNewElement("div", z,
makeLink("Install invisible eye scanners",
- 10000,
- "Will raise rest point of security by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
- "eyeScan")
+ 10000,
+ "Will raise rest point of security by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
+ "eyeScan")
);
} else {
App.UI.DOM.appendNewElement("div", z, "You have installed numerous hidden eye scanners that accurately register the movements of everyone inside the arcology.");
}
if (V.SecExp.buildings.secHub.upgrades.security.cryptoAnalyzer === 0) {
- App.UI.DOM.appendNewElement("div", z,
+ App.UI.DOM.appendNewElement("div", z,
makeLink("Buy and install crypto analyzers",
- 15000,
- "Will raise rest point of security by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
- "cryptoAnalyzer")
+ 15000,
+ "Will raise rest point of security by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
+ "cryptoAnalyzer")
);
} else {
App.UI.DOM.appendNewElement("div", z, "You have bought and employed sophisticated crypto analyzing software to accurately track and archive every financial movement or transaction made inside the walls of your arcology.");
@@ -252,21 +252,21 @@ App.SecExp.secHub = (function() {
App.UI.DOM.appendNewElement("h2", z, `Crime`);
if (V.SecExp.buildings.secHub.upgrades.crime.advForensic === 0) {
- App.UI.DOM.appendNewElement("div", z,
+ App.UI.DOM.appendNewElement("div", z,
makeLink("Install advanced forensic equipment",
- 5000,
- "Will bring down the crime level cap by 10 points, but will require 10 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
- "advForensic")
+ 5000,
+ "Will bring down the crime level cap by 10 points, but will require 10 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
+ "advForensic")
);
} else {
App.UI.DOM.appendNewElement("div", z, "You have installed advanced forensic equipment, able to extract every bit of precious information from any clue.");
}
if (V.SecExp.buildings.secHub.upgrades.crime.autoArchive === 0) {
- App.UI.DOM.appendNewElement("div", z,
+ App.UI.DOM.appendNewElement("div", z,
makeLink("Install auto-curating archiver",
- 7500,
- "Will bring down the crime level cap by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
- "autoArchive")
+ 7500,
+ "Will bring down the crime level cap by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
+ "autoArchive")
);
} else {
App.UI.DOM.appendNewElement("div", z, "You have installed auto-curating archiver software, which will update in real time your data archives with any new relevant information on criminals residing in your arcology.");
@@ -274,22 +274,22 @@ App.SecExp.secHub = (function() {
if (V.SecExp.core.authority > 10000) {
if (V.SecExp.buildings.secHub.upgrades.crime.autoTrial === 0) {
- App.UI.DOM.appendNewElement("div", z,
+ App.UI.DOM.appendNewElement("div", z,
makeLink("Install automated trials software",
- 10000,
- "Will bring down the crime level cap by 15 points, but will require 5 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
- "autoTrial")
+ 10000,
+ "Will bring down the crime level cap by 15 points, but will require 5 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
+ "autoTrial")
);
} else {
App.UI.DOM.appendNewElement("div", z, "You have installed advanced legal algorithms that allows the handling of legal matters much quicker and much more accurately.");
}
if (V.SecExp.buildings.secHub.upgrades.crime.worldProfiler === 0) {
- App.UI.DOM.appendNewElement("div", z,
+ App.UI.DOM.appendNewElement("div", z,
makeLink("Install worldwide profilers",
- 15000,
- "Will bring down the crime level cap by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
- "worldProfiler")
+ 15000,
+ "Will bring down the crime level cap by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
+ "worldProfiler")
);
} else {
App.UI.DOM.appendNewElement("div", z, "You have installed advanced profiler software, which will constantly scour every known data archive on the globe (legally or not) to gather as much information as possible on dangerous criminals.");
@@ -301,21 +301,21 @@ App.SecExp.secHub = (function() {
const z = new DocumentFragment();
App.UI.DOM.appendNewElement("h2", z, `Reconnaissance`);
if (V.SecExp.buildings.secHub.upgrades.intel.sensors === 0) {
- App.UI.DOM.appendNewElement("div", z,
+ App.UI.DOM.appendNewElement("div", z,
makeLink("Install perimeter sensors",
- 5000,
- "Will increase recon capabilities, but will require 5 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
- "sensors")
+ 5000,
+ "Will increase recon capabilities, but will require 5 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
+ "sensors")
);
} else {
App.UI.DOM.appendNewElement("div", z, "You have installed perimeter seismic sensors able to detect movement with high accuracy.");
}
if (V.SecExp.buildings.secHub.upgrades.intel.signalIntercept === 0) {
- App.UI.DOM.appendNewElement("div", z,
+ App.UI.DOM.appendNewElement("div", z,
makeLink("Create signal interception hub",
- 10000,
- "Will increase recon capabilities, but will require 5 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
- "signalIntercept")
+ 10000,
+ "Will increase recon capabilities, but will require 5 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
+ "signalIntercept")
);
} else {
App.UI.DOM.appendNewElement("div", z, "You have installed advanced signal interception equipment.");
@@ -323,11 +323,11 @@ App.SecExp.secHub = (function() {
if (V.SecExp.core.authority > 10000) {
if (V.SecExp.buildings.secHub.upgrades.intel.radar === 0) {
- App.UI.DOM.appendNewElement("div", z,
+ App.UI.DOM.appendNewElement("div", z,
makeLink("Install advanced radar equipment",
- 15000,
- "Will increase recon capabilities, but will require 10 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
- "radar")
+ 15000,
+ "Will increase recon capabilities, but will require 10 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
+ "radar")
);
} else {
App.UI.DOM.appendNewElement("div", z, "You have installed sophisticated radar equipment.");
@@ -336,21 +336,21 @@ App.SecExp.secHub = (function() {
App.UI.DOM.appendNewElement("h2", z, `Readiness`);
if (V.SecExp.buildings.secHub.upgrades.readiness.pathways === 0) {
- App.UI.DOM.appendNewElement("div", z,
+ App.UI.DOM.appendNewElement("div", z,
makeLink("Build specialized pathways in the arcology",
- 5000,
- "Will increase readiness by 1, but will require 5 extra slaves in the headquarters and increase upkeep. The remaining slaves will be more efficient in dealing with crime.",
- "pathways")
+ 5000,
+ "Will increase readiness by 1, but will require 5 extra slaves in the headquarters and increase upkeep. The remaining slaves will be more efficient in dealing with crime.",
+ "pathways")
);
} else {
App.UI.DOM.appendNewElement("div", z, "You have built specialized pathways inside the arcology to quickly move troops around the structure.");
}
if (V.SecExp.buildings.secHub.upgrades.readiness.rapidVehicles === 0) {
- App.UI.DOM.appendNewElement("div", z,
+ App.UI.DOM.appendNewElement("div", z,
makeLink("Buy rapid armored transport vehicles",
- 7500,
- "Will increase readiness by 2, but will require 5 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
- "rapidVehicles")
+ 7500,
+ "Will increase readiness by 2, but will require 5 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
+ "rapidVehicles")
);
} else {
App.UI.DOM.appendNewElement("div", z, "You have bought rapid armored transport vehicles able to bring your troops to battle much quicker than before.");
@@ -358,23 +358,23 @@ App.SecExp.secHub = (function() {
if (V.SecExp.core.authority > 10000) {
if (V.SecExp.buildings.secHub.upgrades.readiness.rapidPlatforms === 0) {
- App.UI.DOM.appendNewElement("div", z,
+ App.UI.DOM.appendNewElement("div", z,
makeLink("Build rapid deployment platforms",
- 10000,
- "Will increase readiness by 2, but will require 10 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
- "rapidPlatforms",
- false)
+ 10000,
+ "Will increase readiness by 2, but will require 10 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
+ "rapidPlatforms",
+ false)
);
} else {
App.UI.DOM.appendNewElement("div", z, "You have built rapid deployment platforms able to equip and deploy units within very limited time windows.");
}
if (V.SecExp.buildings.secHub.upgrades.readiness.earlyWarn === 0) {
- App.UI.DOM.appendNewElement("div", z,
+ App.UI.DOM.appendNewElement("div", z,
makeLink("Institute early warning systems",
- 15000,
- "Will increase readiness by 2, but will require 10 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
- "earlyWarn",
- false)
+ 15000,
+ "Will increase readiness by 2, but will require 10 extra slaves in the headquarters and increases upkeep. The remaining slaves will be more efficient in dealing with crime.",
+ "earlyWarn",
+ false)
);
} else {
App.UI.DOM.appendNewElement("div", z, "You have created early warning systems that constantly analyze in real time data to determine the likeness of an attack.");
@@ -431,7 +431,7 @@ App.SecExp.secHub = (function() {
V.PC.skill.hacking++;
}
switch(type) {
- case "coldstorage":
+ case "coldstorage":
V.SecExp.buildings.secHub.coldstorage++;
break;
case "nanoCams":
@@ -464,5 +464,5 @@ App.SecExp.secHub = (function() {
r.append(App.UI.DOM.makeElement("div", `Costs ${cashFormat(getCost(price))}. ${note}`, "note"));
return r;
}
- }
+ }
})();
diff --git a/src/Mods/SecExp/buildings/weaponsManufacturing.js b/src/Mods/SecExp/buildings/weaponsManufacturing.js
index aebcdfafe37af9d1648ad8c752076f67f9dc4210..5fa73929b3a237bef8a2f59989d3559d9d94a101 100644
--- a/src/Mods/SecExp/buildings/weaponsManufacturing.js
+++ b/src/Mods/SecExp/buildings/weaponsManufacturing.js
@@ -110,7 +110,7 @@ App.SecExp.weapManu = (function() {
}
/** Checks if the class of unit is fully upgraded.
- * @returns {Boolean}
+ * @returns {boolean}
*/
function completed(check = "all") {
let human = [0, 1, 2, 3, 4, 5];
diff --git a/src/Mods/SecExp/events/conflictOptions.js b/src/Mods/SecExp/events/conflictOptions.js
index 73a32eb0287ca140ca1396252fdd14595466e7e8..51d5ae0fcb4fd05a4beda37e213864dd84bda6cd 100644
--- a/src/Mods/SecExp/events/conflictOptions.js
+++ b/src/Mods/SecExp/events/conflictOptions.js
@@ -1,5 +1,5 @@
App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent {
- eventPrerequisites() {
+ eventPrerequisites() {
return [
() => V.secExpEnabled > 0,
() => V.SecExp.war.foughtThisWeek === 0,
@@ -7,482 +7,482 @@ App.Events.conflictOptions = class conflictOptions extends App.Events.BaseEvent
];
}
- execute(node) {
- V.nextButton = " ";
- V.encyclopedia = "Battles";
- const isBattle = V.SecExp.war.type.includes("Attack");
- let r = [];
- let options;
- let option;
+ execute(node) {
+ V.nextButton = " ";
+ V.encyclopedia = "Battles";
+ const isBattle = V.SecExp.war.type.includes("Attack");
+ let r = [];
+ let options;
+ let option;
- App.UI.DOM.appendNewElement("h1", node, `${V.SecExp.war.type}${isBattle ? 'Imminent' : '!'}`, ["monospace", "red"]);
- if (isBattle) {
- if (typeof V.SecExp.settings.unitDescriptions === "undefined") {
- V.SecExp.settings.unitDescriptions = 0;
- }
- if (!V.SecExp.war.type.includes("Major")) {
- if (V.SecExp.battles.victories + V.SecExp.battles.losses > 0) {
- r.push(`The ominous message dominates the screens of your office, and ${V.assistant.name} quickly gathers all information available to prepare for battle.`);
- if (V.SecExp.war.attacker.type === "raiders") {
- if (App.SecExp.battle.recon() >= 1) {
- r.push(`A disorganized horde of raiders is coming to your city. To such jackals your arcology surely looks like an appetizing morsel.`);
- r.push(`Fortunately you knew of their coming, thanks to your recon systems.`);
- } else {
- r.push(`Some of your citizens saw the disorganized horde of raiders coming towards the city and quickly reported it. To such jackals your arcology surely looks like an appetizing morsel.`);
- }
- const div = document.createElement("div");
- App.UI.DOM.makeElement("span", `Raiders`, "strong");
- App.UI.DOM.makeElement("span", `are roaming gangs of bandits, preying on the vulnerable supply lines of Free Cities and old world nations. They are rarely equipped with decent armaments and even more rarely have any formal military training, but they make up for that with high mobility and numbers.`);
- r.push(div);
- } else if (V.SecExp.war.attacker.type === "free city") {
- if (App.SecExp.battle.recon() >= 1) {
- r.push(`A menacing column of slavers and hired mercenaries is coming to your city. Another free city is ready to use their best tools to hit a dangerous competitor where it hurts.`);
- r.push(`Fortunately you knew of their coming, thanks to your recon systems.`);
- } else {
- r.push(`Some of your citizens saw the menacing column of slavers and hired mercenaries and rushed to your office to bring the grim news. Another free city is ready to use their best tools to bring down a dangerous competitor.`);
- }
- const div = document.createElement("div");
- App.UI.DOM.makeElement("span", `Free City expeditions`, "strong");
- App.UI.DOM.makeElement("span", `are usually composed of mercenaries hired to take down sensible supplies or infrastructure in order to damage the enemies of their contractor. They have on average good equipment and training, together with decent mobility, making them a formidable force. Their biggest weakness however is their relatively low numbers.`);
- r.push(div);
- } else if (V.SecExp.war.attacker.type === "freedom fighters") {
- if (App.SecExp.battle.recon() >= 1) {
- r.push(`A dangerous looking army of guerrillas is gathering just outside the arcology. Fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire.`);
- r.push(`Fortunately you knew of their coming, thanks to your recon systems.`);
- } else {
- r.push(`Some of your citizens saw the dangerous looking army of guerrillas is gathering just outside the arcology. Fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire.`);
- }
- const div = document.createElement("div");
- App.UI.DOM.makeElement("span", `Freedom Fighters`, "strong");
- App.UI.DOM.makeElement("span", `are groups of individuals fighting to rid the planet of "evils" such as the Free Cities and their way of life. Lacking the strength to assault one directly they fight guerrilla style slowly starving to death their enemies. They are rarely well equipped, but with good training and mobility they are not a threat that can be taken lightly.`);
- r.push(div);
- } else if (V.SecExp.war.attacker.type === "old world") {
- if (App.SecExp.battle.recon() >= 1) {
- r.push(`A disciplined yet dusty, scruffy old world army is approaching the confines of your arcology. There's nothing better than a good war to unite the electorate and your arcology is just the perfect target.`);
- r.push(`Fortunately you knew of their coming, thanks to your recon systems.`);
- } else {
- r.push(`Some of your citizens saw the disciplined yet dusty, scruffy old world army is approaching the confines of your arcology. There's nothing better than a good war to unite the electorate and your arcology is just the perfect target.`);
- }
- const div = document.createElement("div");
- App.UI.DOM.makeElement("span", `Old world expeditions`, "strong");
- App.UI.DOM.makeElement("span", `are usually sent to secure resources and trade routes for their nation or, more often, to provide their citizens with a bogeyman to be scared of. They are usually decently equipped and trained, which together with their generous numbers make them a tough nut to crack. However, they often lack in mobility.`);
- r.push(div);
- }
- } else {
- r.push(`Your assistant interrupted your rest to bring the grim news. You quickly rush to your console, where you can see one of the convoys supplying your arcology has been attacked and looted. It seems a group of desperate looking bandits decided it was a good idea to steal from you.`);
- r.push(`Due to their great wealth, Free Cities inevitably become tasty morsels for anyone able to field armed men. Considering the particular needs of arcologies their supply lines tend to be delicate lifelines, often preyed upon by those who stand to gain from the free city downfall.`);
- }
- } else {
- if (V.SecExp.battles.major > 0) {
- r.push(`The ominous message dominates the screens of your office, and ${V.assistant.name} quickly gathers all information available to prepare for the major battle ahead.`);
- } else {
- r.push(`Your assistant interrupted your rest to bring the grim news. You quickly rush to your console, where you can see the satellite images coming in of the force about to crash against your arcology. It's not the first time your armies fought for the survival of your empire, but this time it seems it will be a fight for life or death.`);
- }
- if (V.SecExp.war.attacker.type === "raiders") {
- if (App.SecExp.battle.recon() >= 1) {
- r.push(`A massive, disorganized horde of raiders is coming to your city. It seems a warlord of the wastelands amassed enough men to try and obtain a slice of territory of his own; if he's not defeated there won't be a tomorrow for the arcology.`);
- r.push(`Fortunately you knew of their coming, thanks to your recon systems.`);
- } else {
- r.push(`Some of your citizens saw the massive, disorganized horde of raiders coming towards the city and quickly reported it. It seems a warlord of the wastelands amassed enough men to try and obtain a slice of territory of his own; if he's not defeated there won't be a tomorrow for the arcology.`);
- }
- r.push(App.UI.DOM.makeElement("div", `Raiders are roaming gangs of bandits, preying on the vulnerable supply lines of Free Cities and old world nations. They are rarely equipped with decent armaments and even more rarely have any formal military training, but they make up for that with high mobility and numbers.`));
- } else if (V.SecExp.war.attacker.type === "free city") {
- if (App.SecExp.battle.recon() >= 1) {
- r.push(`A massive, menacing column of slavers and hired mercenaries is coming to your city. The quantity of money invested in this assault is staggering; it seems you made some very powerful enemies. If they're not defeated your story will end this day.`);
- r.push(`Fortunately you knew of their coming, thanks to your recon systems.`);
- } else {
- r.push(`Some of your citizens saw the massive, menacing column of slavers and hired mercenaries and rushed to your office to bring the grim news. The quantity of money invested in this assault is staggering; it seems you made some very powerful enemies. If they're not defeated your story will end this day.`);
- }
- r.push(App.UI.DOM.makeElement("div", `Free City expeditions are usually composed of mercenaries hired to take down sensible supplies or infrastructure in order to damage the enemies of their contractor. They have, on average, good equipment and training, together with decent mobility, making them a formidable force. Their biggest weakness, however, is their relatively low numbers.`));
- } else if (V.SecExp.war.attacker.type === "freedom fighters") {
- if (App.SecExp.battle.recon() >= 1) {
- r.push(`A massive, dangerous army of guerrillas is gathering just outside the arcology. A huge ocean of fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire once and for all. And this time they won't stop until your body is burnt to a crisp.`);
- r.push(`Fortunately you knew of their coming, thanks to your recon systems.`);
- } else {
- r.push(`Some of your citizens saw the massive, dangerous army of guerrillas is gathering just outside the arcology. A huge ocean of fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire once and for all. And this time they won't stop until your body is burnt to a crisp.`);
- }
- r.push(App.UI.DOM.makeElement("div", `Freedom Fighters are groups of individuals fighting to rid the planet of "evils" such as the Free Cities and their way of life. Lacking the strength to assault one directly, they fight guerrilla style, slowly starving to death their enemies. They are rarely well equipped, but with good training and mobility they are not a threat that can be taken lightly.`));
- } else if (V.SecExp.war.attacker.type === "old world") {
- if (App.SecExp.battle.recon() >= 1) {
- r.push(`A massive, disciplined old world army is approaching the confines of your arcology. It seems one of the nations of the old world is determined to put your arcology to rest once and for all or die trying.`);
- r.push(`Fortunately you knew of their coming, thanks to your recon systems.`);
- } else {
- r.push(`Some of your citizens saw the massive, disciplined old world army is approaching the confines of your arcology. It seems one of the nations of the old world is determined to put your arcology to rest once and for all or die trying.`);
- }
- r.push(App.UI.DOM.makeElement("div", `Old world expeditions are usually sent to secure resources and trade routes for their nation or, more often, to provide their citizens with a bogeyman to be scared of. They are usually decently equipped and trained, which together with their generous numbers make them a tough nut to crack. However, they often lack in mobility.`));
- }
- }
- App.Events.addParagraph(node, r);
- r = [];
+ App.UI.DOM.appendNewElement("h1", node, `${V.SecExp.war.type}${isBattle ? 'Imminent' : '!'}`, ["monospace", "red"]);
+ if (isBattle) {
+ if (typeof V.SecExp.settings.unitDescriptions === "undefined") {
+ V.SecExp.settings.unitDescriptions = 0;
+ }
+ if (!V.SecExp.war.type.includes("Major")) {
+ if (V.SecExp.battles.victories + V.SecExp.battles.losses > 0) {
+ r.push(`The ominous message dominates the screens of your office, and ${V.assistant.name} quickly gathers all information available to prepare for battle.`);
+ if (V.SecExp.war.attacker.type === "raiders") {
+ if (App.SecExp.battle.recon() >= 1) {
+ r.push(`A disorganized horde of raiders is coming to your city. To such jackals your arcology surely looks like an appetizing morsel.`);
+ r.push(`Fortunately you knew of their coming, thanks to your recon systems.`);
+ } else {
+ r.push(`Some of your citizens saw the disorganized horde of raiders coming towards the city and quickly reported it. To such jackals your arcology surely looks like an appetizing morsel.`);
+ }
+ const div = document.createElement("div");
+ App.UI.DOM.makeElement("span", `Raiders`, "strong");
+ App.UI.DOM.makeElement("span", `are roaming gangs of bandits, preying on the vulnerable supply lines of Free Cities and old world nations. They are rarely equipped with decent armaments and even more rarely have any formal military training, but they make up for that with high mobility and numbers.`);
+ r.push(div);
+ } else if (V.SecExp.war.attacker.type === "free city") {
+ if (App.SecExp.battle.recon() >= 1) {
+ r.push(`A menacing column of slavers and hired mercenaries is coming to your city. Another free city is ready to use their best tools to hit a dangerous competitor where it hurts.`);
+ r.push(`Fortunately you knew of their coming, thanks to your recon systems.`);
+ } else {
+ r.push(`Some of your citizens saw the menacing column of slavers and hired mercenaries and rushed to your office to bring the grim news. Another free city is ready to use their best tools to bring down a dangerous competitor.`);
+ }
+ const div = document.createElement("div");
+ App.UI.DOM.makeElement("span", `Free City expeditions`, "strong");
+ App.UI.DOM.makeElement("span", `are usually composed of mercenaries hired to take down sensible supplies or infrastructure in order to damage the enemies of their contractor. They have on average good equipment and training, together with decent mobility, making them a formidable force. Their biggest weakness however is their relatively low numbers.`);
+ r.push(div);
+ } else if (V.SecExp.war.attacker.type === "freedom fighters") {
+ if (App.SecExp.battle.recon() >= 1) {
+ r.push(`A dangerous looking army of guerrillas is gathering just outside the arcology. Fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire.`);
+ r.push(`Fortunately you knew of their coming, thanks to your recon systems.`);
+ } else {
+ r.push(`Some of your citizens saw the dangerous looking army of guerrillas is gathering just outside the arcology. Fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire.`);
+ }
+ const div = document.createElement("div");
+ App.UI.DOM.makeElement("span", `Freedom Fighters`, "strong");
+ App.UI.DOM.makeElement("span", `are groups of individuals fighting to rid the planet of "evils" such as the Free Cities and their way of life. Lacking the strength to assault one directly they fight guerrilla style slowly starving to death their enemies. They are rarely well equipped, but with good training and mobility they are not a threat that can be taken lightly.`);
+ r.push(div);
+ } else if (V.SecExp.war.attacker.type === "old world") {
+ if (App.SecExp.battle.recon() >= 1) {
+ r.push(`A disciplined yet dusty, scruffy old world army is approaching the confines of your arcology. There's nothing better than a good war to unite the electorate and your arcology is just the perfect target.`);
+ r.push(`Fortunately you knew of their coming, thanks to your recon systems.`);
+ } else {
+ r.push(`Some of your citizens saw the disciplined yet dusty, scruffy old world army is approaching the confines of your arcology. There's nothing better than a good war to unite the electorate and your arcology is just the perfect target.`);
+ }
+ const div = document.createElement("div");
+ App.UI.DOM.makeElement("span", `Old world expeditions`, "strong");
+ App.UI.DOM.makeElement("span", `are usually sent to secure resources and trade routes for their nation or, more often, to provide their citizens with a bogeyman to be scared of. They are usually decently equipped and trained, which together with their generous numbers make them a tough nut to crack. However, they often lack in mobility.`);
+ r.push(div);
+ }
+ } else {
+ r.push(`Your assistant interrupted your rest to bring the grim news. You quickly rush to your console, where you can see one of the convoys supplying your arcology has been attacked and looted. It seems a group of desperate looking bandits decided it was a good idea to steal from you.`);
+ r.push(`Due to their great wealth, Free Cities inevitably become tasty morsels for anyone able to field armed men. Considering the particular needs of arcologies their supply lines tend to be delicate lifelines, often preyed upon by those who stand to gain from the free city downfall.`);
+ }
+ } else {
+ if (V.SecExp.battles.major > 0) {
+ r.push(`The ominous message dominates the screens of your office, and ${V.assistant.name} quickly gathers all information available to prepare for the major battle ahead.`);
+ } else {
+ r.push(`Your assistant interrupted your rest to bring the grim news. You quickly rush to your console, where you can see the satellite images coming in of the force about to crash against your arcology. It's not the first time your armies fought for the survival of your empire, but this time it seems it will be a fight for life or death.`);
+ }
+ if (V.SecExp.war.attacker.type === "raiders") {
+ if (App.SecExp.battle.recon() >= 1) {
+ r.push(`A massive, disorganized horde of raiders is coming to your city. It seems a warlord of the wastelands amassed enough men to try and obtain a slice of territory of his own; if he's not defeated there won't be a tomorrow for the arcology.`);
+ r.push(`Fortunately you knew of their coming, thanks to your recon systems.`);
+ } else {
+ r.push(`Some of your citizens saw the massive, disorganized horde of raiders coming towards the city and quickly reported it. It seems a warlord of the wastelands amassed enough men to try and obtain a slice of territory of his own; if he's not defeated there won't be a tomorrow for the arcology.`);
+ }
+ r.push(App.UI.DOM.makeElement("div", `Raiders are roaming gangs of bandits, preying on the vulnerable supply lines of Free Cities and old world nations. They are rarely equipped with decent armaments and even more rarely have any formal military training, but they make up for that with high mobility and numbers.`));
+ } else if (V.SecExp.war.attacker.type === "free city") {
+ if (App.SecExp.battle.recon() >= 1) {
+ r.push(`A massive, menacing column of slavers and hired mercenaries is coming to your city. The quantity of money invested in this assault is staggering; it seems you made some very powerful enemies. If they're not defeated your story will end this day.`);
+ r.push(`Fortunately you knew of their coming, thanks to your recon systems.`);
+ } else {
+ r.push(`Some of your citizens saw the massive, menacing column of slavers and hired mercenaries and rushed to your office to bring the grim news. The quantity of money invested in this assault is staggering; it seems you made some very powerful enemies. If they're not defeated your story will end this day.`);
+ }
+ r.push(App.UI.DOM.makeElement("div", `Free City expeditions are usually composed of mercenaries hired to take down sensible supplies or infrastructure in order to damage the enemies of their contractor. They have, on average, good equipment and training, together with decent mobility, making them a formidable force. Their biggest weakness, however, is their relatively low numbers.`));
+ } else if (V.SecExp.war.attacker.type === "freedom fighters") {
+ if (App.SecExp.battle.recon() >= 1) {
+ r.push(`A massive, dangerous army of guerrillas is gathering just outside the arcology. A huge ocean of fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire once and for all. And this time they won't stop until your body is burnt to a crisp.`);
+ r.push(`Fortunately you knew of their coming, thanks to your recon systems.`);
+ } else {
+ r.push(`Some of your citizens saw the massive, dangerous army of guerrillas is gathering just outside the arcology. A huge ocean of fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire once and for all. And this time they won't stop until your body is burnt to a crisp.`);
+ }
+ r.push(App.UI.DOM.makeElement("div", `Freedom Fighters are groups of individuals fighting to rid the planet of "evils" such as the Free Cities and their way of life. Lacking the strength to assault one directly, they fight guerrilla style, slowly starving to death their enemies. They are rarely well equipped, but with good training and mobility they are not a threat that can be taken lightly.`));
+ } else if (V.SecExp.war.attacker.type === "old world") {
+ if (App.SecExp.battle.recon() >= 1) {
+ r.push(`A massive, disciplined old world army is approaching the confines of your arcology. It seems one of the nations of the old world is determined to put your arcology to rest once and for all or die trying.`);
+ r.push(`Fortunately you knew of their coming, thanks to your recon systems.`);
+ } else {
+ r.push(`Some of your citizens saw the massive, disciplined old world army is approaching the confines of your arcology. It seems one of the nations of the old world is determined to put your arcology to rest once and for all or die trying.`);
+ }
+ r.push(App.UI.DOM.makeElement("div", `Old world expeditions are usually sent to secure resources and trade routes for their nation or, more often, to provide their citizens with a bogeyman to be scared of. They are usually decently equipped and trained, which together with their generous numbers make them a tough nut to crack. However, they often lack in mobility.`));
+ }
+ }
+ App.Events.addParagraph(node, r);
+ r = [];
- App.UI.DOM.appendNewElement("h3", node, `Recon: (AO: ${V.terrain})`);
- const estimatedMen = V.SecExp.war.estimatedMen;
- const expectedEquip = V.SecExp.war.expectedEquip;
- const isOceanic = V.terrain === "oceanic";
- r.push(`It seems your troops and your adversary will fight`);
- if (V.SecExp.war.terrain === "rural") {
- r.push(`in`, App.UI.DOM.makeElement("span", `the rural land`, "strong"), `surrounding the free city.`);
- } else if (V.SecExp.war.terrain === "urban") {
- r.push(`in the old`, App.UI.DOM.makeElement("span", `abandoned city`, "strong"), `surrounding the free city.`);
- } else if (V.SecExp.war.terrain === "hills") {
- r.push(`on`, App.UI.DOM.makeElement("span", `the hills`, "strong"), `around the free city.`);
- } else if (V.SecExp.war.terrain === "coast") {
- r.push(`along`, App.UI.DOM.makeElement("span", `the coast`, "strong"), `just outside the free city.`);
- } else if (V.SecExp.war.terrain === "outskirts") {
- r.push(`right against`, App.UI.DOM.makeElement("span", `the walls of the arcology.`, "strong"));
- } else if (V.SecExp.war.terrain === "mountains") {
- r.push(`in`, App.UI.DOM.makeElement("span", `the mountains`, "strong"), `overlooking the arcology.`);
- } else if (V.SecExp.war.terrain === "wasteland") {
- r.push(`in`, App.UI.DOM.makeElement("span", `the wastelands`, "strong"), `outside the free city territory.`);
- } else if (V.SecExp.war.terrain === "international waters") {
- r.push(`in`, App.UI.DOM.makeElement("span", `the water surrounding`, "strong"), `the free city.`);
- } else if (["a sunken ship", "an underwater cave"].includes(V.SecExp.war.terrain)) {
- r.push(`in`, App.UI.DOM.makeElement("span", `${V.SecExp.war.terrain}`, "strong"), `near the free city.`);
- } else if (V.SecExp.war.terrain === "error") {
- r.push(App.UI.DOM.makeElement("span", `Error: failed to assign terrain.`, "red"), `${V.SecExp.war.terrain} reads: ${V.SecExp.war.terrain}.`);
- } else {
- r.push(App.UI.DOM.makeElement("span", `Error: failed to read terrain.`, "red"), `${V.SecExp.war.terrain} reads: ${V.SecExp.war.terrain}.`);
- }
- if (App.SecExp.battle.recon() === 3) {
- r.push(`Your recon capabilities are top notch. The information collected will be most likely correct or very close to be so:`);
- } else if (App.SecExp.battle.recon() === 2) {
- r.push(`Your recon capabilities are decent. The information collected will be mostly close to the truth:`);
- } else if (App.SecExp.battle.recon() === 1) {
- r.push(`Your recon capabilities are fairly low. The information collected will be quite inaccurate:`);
- } else {
- r.push(`Your recon capabilities are almost non-existent. The information collected will be wild guesses at best:`);
- }
- r.push(`approximately`);
- r.push(App.UI.DOM.makeElement("span", `${estimatedMen} men`, "strong"));
- r.push(`are coming, they seem to be`);
- if (expectedEquip <= 0) {
- r.push(App.UI.DOM.makeElement("span", `poorly armed.`, "strong"));
- r.push(`Old rusty small arms are the norm with just a few barely working civilian ${isOceanic ? 'boats' : 'vehicles'}.`);
- } else if (expectedEquip === 1) {
- r.push(App.UI.DOM.makeElement("span", `lightly armed,`, "strong"));
- r.push(`mostly with small arms and some repurposed civilian ${isOceanic ? 'boats' : 'vehicles'} with scattered machine gun support. There's no sign of heavy ${isOceanic ? 'boats' : 'vehicles'}, ${isOceanic ? 'submarines' : 'artillery'} or aircraft.`);
- } else if (expectedEquip === 2) {
- r.push(App.UI.DOM.makeElement("span", `decently armed`, "strong"));
- r.push(`with good quality small arms, machine guns and a few mortars. There appear to be some heavy military ${isOceanic ? 'boats' : 'vehicles'} coming as well.`);
- } else if (expectedEquip === 3) {
- r.push(App.UI.DOM.makeElement("span", `well armed`, "strong"));
- r.push(`with high quality small arms, ${isOceanic ? 'spear men' : 'snipers'}, demolitions teams, heavy duty machine guns and mortars. Heavy military ${isOceanic ? 'boats' : 'vehicles'} are numerous and a few ${isOceanic ? 'submarines' : 'artillery pieces'} are accompanying the detachment.`);
- } else if (expectedEquip >= 4) {
- r.push(App.UI.DOM.makeElement("span", `extremely well armed`, "strong"));
- r.push(`with excellent small arms and specialized teams with heavy duty infantry support weapons. Heavy presence of armored military ${isOceanic ? 'boats' : 'vehicles'}, ${isOceanic ? 'submarines' : 'artillery pieces'} and even some attack helicopters.`);
- }
- App.Events.addParagraph(node, r);
- r = [];
+ App.UI.DOM.appendNewElement("h3", node, `Recon: (AO: ${V.terrain})`);
+ const estimatedMen = V.SecExp.war.estimatedMen;
+ const expectedEquip = V.SecExp.war.expectedEquip;
+ const isOceanic = V.terrain === "oceanic";
+ r.push(`It seems your troops and your adversary will fight`);
+ if (V.SecExp.war.terrain === "rural") {
+ r.push(`in`, App.UI.DOM.makeElement("span", `the rural land`, "strong"), `surrounding the free city.`);
+ } else if (V.SecExp.war.terrain === "urban") {
+ r.push(`in the old`, App.UI.DOM.makeElement("span", `abandoned city`, "strong"), `surrounding the free city.`);
+ } else if (V.SecExp.war.terrain === "hills") {
+ r.push(`on`, App.UI.DOM.makeElement("span", `the hills`, "strong"), `around the free city.`);
+ } else if (V.SecExp.war.terrain === "coast") {
+ r.push(`along`, App.UI.DOM.makeElement("span", `the coast`, "strong"), `just outside the free city.`);
+ } else if (V.SecExp.war.terrain === "outskirts") {
+ r.push(`right against`, App.UI.DOM.makeElement("span", `the walls of the arcology.`, "strong"));
+ } else if (V.SecExp.war.terrain === "mountains") {
+ r.push(`in`, App.UI.DOM.makeElement("span", `the mountains`, "strong"), `overlooking the arcology.`);
+ } else if (V.SecExp.war.terrain === "wasteland") {
+ r.push(`in`, App.UI.DOM.makeElement("span", `the wastelands`, "strong"), `outside the free city territory.`);
+ } else if (V.SecExp.war.terrain === "international waters") {
+ r.push(`in`, App.UI.DOM.makeElement("span", `the water surrounding`, "strong"), `the free city.`);
+ } else if (["a sunken ship", "an underwater cave"].includes(V.SecExp.war.terrain)) {
+ r.push(`in`, App.UI.DOM.makeElement("span", `${V.SecExp.war.terrain}`, "strong"), `near the free city.`);
+ } else if (V.SecExp.war.terrain === "error") {
+ r.push(App.UI.DOM.makeElement("span", `Error: failed to assign terrain.`, "red"), `${V.SecExp.war.terrain} reads: ${V.SecExp.war.terrain}.`);
+ } else {
+ r.push(App.UI.DOM.makeElement("span", `Error: failed to read terrain.`, "red"), `${V.SecExp.war.terrain} reads: ${V.SecExp.war.terrain}.`);
+ }
+ if (App.SecExp.battle.recon() === 3) {
+ r.push(`Your recon capabilities are top notch. The information collected will be most likely correct or very close to be so:`);
+ } else if (App.SecExp.battle.recon() === 2) {
+ r.push(`Your recon capabilities are decent. The information collected will be mostly close to the truth:`);
+ } else if (App.SecExp.battle.recon() === 1) {
+ r.push(`Your recon capabilities are fairly low. The information collected will be quite inaccurate:`);
+ } else {
+ r.push(`Your recon capabilities are almost non-existent. The information collected will be wild guesses at best:`);
+ }
+ r.push(`approximately`);
+ r.push(App.UI.DOM.makeElement("span", `${estimatedMen} men`, "strong"));
+ r.push(`are coming, they seem to be`);
+ if (expectedEquip <= 0) {
+ r.push(App.UI.DOM.makeElement("span", `poorly armed.`, "strong"));
+ r.push(`Old rusty small arms are the norm with just a few barely working civilian ${isOceanic ? 'boats' : 'vehicles'}.`);
+ } else if (expectedEquip === 1) {
+ r.push(App.UI.DOM.makeElement("span", `lightly armed,`, "strong"));
+ r.push(`mostly with small arms and some repurposed civilian ${isOceanic ? 'boats' : 'vehicles'} with scattered machine gun support. There's no sign of heavy ${isOceanic ? 'boats' : 'vehicles'}, ${isOceanic ? 'submarines' : 'artillery'} or aircraft.`);
+ } else if (expectedEquip === 2) {
+ r.push(App.UI.DOM.makeElement("span", `decently armed`, "strong"));
+ r.push(`with good quality small arms, machine guns and a few mortars. There appear to be some heavy military ${isOceanic ? 'boats' : 'vehicles'} coming as well.`);
+ } else if (expectedEquip === 3) {
+ r.push(App.UI.DOM.makeElement("span", `well armed`, "strong"));
+ r.push(`with high quality small arms, ${isOceanic ? 'spear men' : 'snipers'}, demolitions teams, heavy duty machine guns and mortars. Heavy military ${isOceanic ? 'boats' : 'vehicles'} are numerous and a few ${isOceanic ? 'submarines' : 'artillery pieces'} are accompanying the detachment.`);
+ } else if (expectedEquip >= 4) {
+ r.push(App.UI.DOM.makeElement("span", `extremely well armed`, "strong"));
+ r.push(`with excellent small arms and specialized teams with heavy duty infantry support weapons. Heavy presence of armored military ${isOceanic ? 'boats' : 'vehicles'}, ${isOceanic ? 'submarines' : 'artillery pieces'} and even some attack helicopters.`);
+ }
+ App.Events.addParagraph(node, r);
+ r = [];
- App.UI.DOM.appendNewElement("h2", node, `Battle plan`);
- if (V.SecExp.war.commander === "bodyguard" && V.BodyguardID === 0 || V.SecExp.war.commander === "headGirl" && V.HeadGirlID === 0) {
- App.UI.DOM.makeElement("span", `Chosen leader ${V.SecExp.war.commander} cannot be found, please select another.`, "warning");
- V.SecExp.war.commander = "PC";
- }
- options = new App.UI.OptionsGroup(); // leader assignment
- option = options.addOption("Leader of the troops", "commander", V.SecExp.war)
- .addValueList([["You", "PC"], [V.assistant.name, "assistant"]]);
+ App.UI.DOM.appendNewElement("h2", node, `Battle plan`);
+ if (V.SecExp.war.commander === "bodyguard" && V.BodyguardID === 0 || V.SecExp.war.commander === "headGirl" && V.HeadGirlID === 0) {
+ App.UI.DOM.makeElement("span", `Chosen leader ${V.SecExp.war.commander} cannot be found, please select another.`, "warning");
+ V.SecExp.war.commander = "PC";
+ }
+ options = new App.UI.OptionsGroup(); // leader assignment
+ option = options.addOption("Leader of the troops", "commander", V.SecExp.war)
+ .addValueList([["You", "PC"], [V.assistant.name, "assistant"]]);
- if (V.BodyguardID !== 0 && V.SecExp.edicts.defense.slavesOfficers === 1) {
- option.addValue("Bodyguard", "bodyguard");
- }
- if (V.HeadGirlID !== 0 && V.SecExp.edicts.defense.slavesOfficers === 1) {
- option.addValue("Head Girl", "headGirl");
- }
- if (V.SecExp.edicts.defense.militia >= 1) {
- option.addValue("Citizens' militia officers", "citizen");
- }
- if (V.mercenaries > 0) {
- option.addValue("Mercenary officers", "mercenary");
- }
- if (V.SF.Toggle && V.SF.Active >= 1 && V.SF.MercCon.CanAttend === -2) {
- option.addValue("Colonel", "colonel");
- }
- node.append(options.render());
+ if (V.BodyguardID !== 0 && V.SecExp.edicts.defense.slavesOfficers === 1) {
+ option.addValue("Bodyguard", "bodyguard");
+ }
+ if (V.HeadGirlID !== 0 && V.SecExp.edicts.defense.slavesOfficers === 1) {
+ option.addValue("Head Girl", "headGirl");
+ }
+ if (V.SecExp.edicts.defense.militia >= 1) {
+ option.addValue("Citizens' militia officers", "citizen");
+ }
+ if (V.mercenaries > 0) {
+ option.addValue("Mercenary officers", "mercenary");
+ }
+ if (V.SF.Toggle && V.SF.Active >= 1 && V.SF.MercCon.CanAttend === -2) {
+ option.addValue("Colonel", "colonel");
+ }
+ node.append(options.render());
- options = new App.UI.OptionsGroup();
- const tacticsDesc = new Map([
- ["Bait and Bleed", `Combines bait and switch tactics with guerrilla style assaults, with the objective of slowly bleed the enemy.`],
- [`Guerrilla`, `Involves using terrain knowledge and small fast attacks to hinder and weaken the enemy.`],
- [`Choke Points`, `Involves using terrain knowledge and strong fortifications in order to stop the enemy on its track`],
- [`Interior Lines`, `Involves exploiting a defender's shorter logistics lines and redeployment times in order to keep the enemy pressured.`],
- [`Pincer Maneuver`, `Involves letting the enemy push back the center in order to envelop their formation.`],
- [`Defense In Depth`, `Involves letting the enemy gain terrain to gain tactical superiority by alternating between delaying actions and small counterattacks.`],
- [`Blitzkrieg`, `Involves breaking the front of the enemy with a fast armored force concentrated into a small area.`],
- [`Human Wave`, `Involves assaulting the enemy with large numbers of infantry to overwhelm their lines.`],
- ]);
+ options = new App.UI.OptionsGroup();
+ const tacticsDesc = new Map([
+ ["Bait and Bleed", `Combines bait and switch tactics with guerrilla style assaults, with the objective of slowly bleed the enemy.`],
+ [`Guerrilla`, `Involves using terrain knowledge and small fast attacks to hinder and weaken the enemy.`],
+ [`Choke Points`, `Involves using terrain knowledge and strong fortifications in order to stop the enemy on its track`],
+ [`Interior Lines`, `Involves exploiting a defender's shorter logistics lines and redeployment times in order to keep the enemy pressured.`],
+ [`Pincer Maneuver`, `Involves letting the enemy push back the center in order to envelop their formation.`],
+ [`Defense In Depth`, `Involves letting the enemy gain terrain to gain tactical superiority by alternating between delaying actions and small counterattacks.`],
+ [`Blitzkrieg`, `Involves breaking the front of the enemy with a fast armored force concentrated into a small area.`],
+ [`Human Wave`, `Involves assaulting the enemy with large numbers of infantry to overwhelm their lines.`],
+ ]);
- App.UI.DOM.appendNewElement("h3", node, `Tactics`);
- const tactics = App.Data.SecExp.TerrainAndTactics.get(V.SecExp.war.terrain);
- for (const tactic in tactics) {
- option = options.addOption(tactic, "chosenTactic", V.SecExp.war).addValue("Select", tactic);
- const comment = document.createElement("span");
- if (tactics[tactic].atkMod > 0.1) {
- App.UI.DOM.appendNewElement("span", comment, "Atk+, ", "green");
- } else if (tactics[tactic].atkMod < 0.1) {
- App.UI.DOM.appendNewElement("span", comment, "Atk-, ", "red");
- }
- if (tactics[tactic].defMod > 0.1) {
- App.UI.DOM.appendNewElement("span", comment, "Def+, ", "green");
- } else if (tactics[tactic].defMod < 0.1) {
- App.UI.DOM.appendNewElement("span", comment, "Def-, ", "red");
- }
- comment.append(tacticsDesc.get(tactic));
- option.addComment(comment);
- }
- node.append(options.render());
+ App.UI.DOM.appendNewElement("h3", node, `Tactics`);
+ const tactics = App.Data.SecExp.TerrainAndTactics.get(V.SecExp.war.terrain);
+ for (const tactic in tactics) {
+ option = options.addOption(tactic, "chosenTactic", V.SecExp.war).addValue("Select", tactic);
+ const comment = document.createElement("span");
+ if (tactics[tactic].atkMod > 0.1) {
+ App.UI.DOM.appendNewElement("span", comment, "Atk+, ", "green");
+ } else if (tactics[tactic].atkMod < 0.1) {
+ App.UI.DOM.appendNewElement("span", comment, "Atk-, ", "red");
+ }
+ if (tactics[tactic].defMod > 0.1) {
+ App.UI.DOM.appendNewElement("span", comment, "Def+, ", "green");
+ } else if (tactics[tactic].defMod < 0.1) {
+ App.UI.DOM.appendNewElement("span", comment, "Def-, ", "red");
+ }
+ comment.append(tacticsDesc.get(tactic));
+ option.addComment(comment);
+ }
+ node.append(options.render());
- App.UI.DOM.appendNewElement("h3", node, `Troops`);
- if (V.SF.Toggle && V.SF.Active >= 1 && V.SecExp.war.type.includes("Major")) {
- options = new App.UI.OptionsGroup();
- options.addOption("The incoming attack's scale warrants deploying the special force.", "deploySF", V.SecExp.war)
- .addValue("Green light", 1).on().addValue("Red light", 0).off()
- .addComment("Some upgrades will be able to support your troops even if the special force is not deployed in the fight.");
- node.append(options.render());
- }
+ App.UI.DOM.appendNewElement("h3", node, `Troops`);
+ if (V.SF.Toggle && V.SF.Active >= 1 && V.SecExp.war.type.includes("Major")) {
+ options = new App.UI.OptionsGroup();
+ options.addOption("The incoming attack's scale warrants deploying the special force.", "deploySF", V.SecExp.war)
+ .addValue("Green light", 1).on().addValue("Red light", 0).off()
+ .addComment("Some upgrades will be able to support your troops even if the special force is not deployed in the fight.");
+ node.append(options.render());
+ }
- let linkArray = [];
- if (V.SecExp.battles.lastSelection.length > 0) {
- linkArray.push(
- App.UI.DOM.link(
- `Restore saved`,
- () => {
- V.SecExp.war.deployed = V.SecExp.battles.lastSelection;
- V.SecExp.war.saveValid = 1;
- V.SecExp.war.commander = V.SecExp.battles.saved.commander;
- V.SecExp.war.deploySF = V.SecExp.battles.saved.sfSupport;
- App.UI.reload();
- }
- )
- );
- } else {
- r.push(`Restore saved`);
- }
- if (V.SecExp.war.saveValid !== 1) {
- linkArray.push(
- App.UI.DOM.link(
- `Save current`,
- () => {
- V.SecExp.battles.lastSelection = V.SecExp.war.deployed;
- V.SecExp.war.saveValid = 1;
- V.SecExp.battles.saved.commander = V.SecExp.war.commander;
- V.SecExp.battles.saved.sfSupport = V.SecExp.war.deploySF;
- App.UI.reload();
- }
- )
- );
- } else {
- r.push(`Save current`);
- }
- if (App.SecExp.battle.deployedUnits() > 0) {
- linkArray.push(
- App.UI.DOM.link(
- `Clear current`,
- () => {
- V.SecExp.war.deployed = [];
- V.SecExp.war.saveValid = 0;
- App.UI.reload();
- }
- )
- );
- } else {
- r.push(`Clear current`);
- }
- if (V.SecExp.battles.lastSelection.length > 0) {
- linkArray.push(
- App.UI.DOM.link(
- `Clear saved`,
- () => {
- V.SecExp.battles.lastSelection = [];
- V.SecExp.war.saveValid = 0;
- App.UI.reload();
- }
- )
- );
- } else {
- r.push(`Clear saved`);
- }
- node.append("Roster: ", App.UI.DOM.generateLinksStrip(linkArray));
+ let linkArray = [];
+ if (V.SecExp.battles.lastSelection.length > 0) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Restore saved`,
+ () => {
+ V.SecExp.war.deployed = V.SecExp.battles.lastSelection;
+ V.SecExp.war.saveValid = 1;
+ V.SecExp.war.commander = V.SecExp.battles.saved.commander;
+ V.SecExp.war.deploySF = V.SecExp.battles.saved.sfSupport;
+ App.UI.reload();
+ }
+ )
+ );
+ } else {
+ r.push(`Restore saved`);
+ }
+ if (V.SecExp.war.saveValid !== 1) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Save current`,
+ () => {
+ V.SecExp.battles.lastSelection = V.SecExp.war.deployed;
+ V.SecExp.war.saveValid = 1;
+ V.SecExp.battles.saved.commander = V.SecExp.war.commander;
+ V.SecExp.battles.saved.sfSupport = V.SecExp.war.deploySF;
+ App.UI.reload();
+ }
+ )
+ );
+ } else {
+ r.push(`Save current`);
+ }
+ if (App.SecExp.battle.deployedUnits() > 0) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Clear current`,
+ () => {
+ V.SecExp.war.deployed = [];
+ V.SecExp.war.saveValid = 0;
+ App.UI.reload();
+ }
+ )
+ );
+ } else {
+ r.push(`Clear current`);
+ }
+ if (V.SecExp.battles.lastSelection.length > 0) {
+ linkArray.push(
+ App.UI.DOM.link(
+ `Clear saved`,
+ () => {
+ V.SecExp.battles.lastSelection = [];
+ V.SecExp.war.saveValid = 0;
+ App.UI.reload();
+ }
+ )
+ );
+ } else {
+ r.push(`Clear saved`);
+ }
+ node.append("Roster: ", App.UI.DOM.generateLinksStrip(linkArray));
- // troop deployment
- if (App.SecExp.battle.deployableUnits() > 0) {
- r.push(`With your current readiness level you can send an additional`);
- r.push(App.UI.DOM.makeElement("span", String(App.SecExp.battle.deployableUnits()), "strong"));
- r.push(`units.`);
- }
- } else {
- const isSlaveRebellion = V.SecExp.war.type.includes("Slave");
- r.push(`In the end it happened, the ${isSlaveRebellion ? "slaves" : "citizens"}`);
- r.push(`of your arcology dared took up arms and rose up against their betters. Your penthouse is flooded with reports from all over the arcology of small skirmishes between the rioting slaves and the security forces. It appears <strong>${num(Math.trunc(V.SecExp.war.attacker.troops))}</strong> rebels are in the streets right now, building barricades and`);
- if (isSlaveRebellion) {
- r.push(`freeing their peers.`);
- } else {
- r.push(`destroying your property.`);
- }
- if (V.SecExp.war.attacker.equip <= 0) {
- r.push(`They are <strong>poorly armed</strong>.`);
- } else if (V.SecExp.war.attacker.equip === 1) {
- r.push(`They are <strong>lightly armed</strong>.`);
- } else if (V.SecExp.war.attacker.equip === 2) {
- r.push(`They are <strong>decently armed</strong>.`);
- } else if (V.SecExp.war.attacker.equip === 3) {
- r.push(`They are <strong>well armed</strong>.`);
- } else if (V.SecExp.war.attacker.equip >= 4) {
- r.push(`They are <strong>extremely well armed</strong>.`);
- }
- if (V.SecExp.war.irregulars > 0) {
- r.push(`${num(Math.trunc(V.SecExp.war.irregulars))} of your citizens took up arms to defend their arcology owner.`);
- }
- if (V.SecExp.war.rebellingID.length > 0) {
- App.Events.addParagraph(node, r);
- r = [];
- let rebelling = [];
- for (const squad of App.SecExp.unit.squads("human")) {
- if (squad.active === 1 && (V.SecExp.war.rebellingID.includes(squad.ID))) {
- rebelling.push(squad.platoonName);
- }
- }
- r.push(`${toSentence(rebelling)} betrayed you and joined the insurrection.`);
- }
- let defending = [];
- if (V.arcologyUpgrade.drones === 1) {
- defending.push(`Your security drones`);
- }
- for (const squad of App.SecExp.unit.squads("human")) {
- if (squad.active === 1 && (!V.SecExp.war.rebellingID.includes(squad.ID))) {
- defending.push(squad.platoonName);
- }
- }
- if (V.SF.Toggle && V.SF.Active >= 1) {
- let SFname = defending.length > 0 ? V.SF.Lower : capFirstChar(V.SF.Lower);
- defending.push(`${SFname}, ${num(V.SF.ArmySize)} strong`);
- }
- if (defending.length > 0) {
- App.Events.addParagraph(node, r);
- r = [];
- r.push(`${toSentence(defending)} are called to defend the arcology from this menace.`);
- }
- App.Events.addParagraph(node, r);
- r = [];
- r.push(`The confined spaces of the arcology and the number of vital yet delicate systems within its walls do not allow a lot of tactical flexibility. This will be a long and strenuous fight, street after street, barricade after barricade. In order to preserve the structural integrity of the building and the lives of our civilians, we will have to limit our firepower.`);
- App.Events.addParagraph(node, r);
+ // troop deployment
+ if (App.SecExp.battle.deployableUnits() > 0) {
+ r.push(`With your current readiness level you can send an additional`);
+ r.push(App.UI.DOM.makeElement("span", String(App.SecExp.battle.deployableUnits()), "strong"));
+ r.push(`units.`);
+ }
+ } else {
+ const isSlaveRebellion = V.SecExp.war.type.includes("Slave");
+ r.push(`In the end it happened, the ${isSlaveRebellion ? "slaves" : "citizens"}`);
+ r.push(`of your arcology dared took up arms and rose up against their betters. Your penthouse is flooded with reports from all over the arcology of small skirmishes between the rioting slaves and the security forces. It appears <strong>${num(Math.trunc(V.SecExp.war.attacker.troops))}</strong> rebels are in the streets right now, building barricades and`);
+ if (isSlaveRebellion) {
+ r.push(`freeing their peers.`);
+ } else {
+ r.push(`destroying your property.`);
+ }
+ if (V.SecExp.war.attacker.equip <= 0) {
+ r.push(`They are <strong>poorly armed</strong>.`);
+ } else if (V.SecExp.war.attacker.equip === 1) {
+ r.push(`They are <strong>lightly armed</strong>.`);
+ } else if (V.SecExp.war.attacker.equip === 2) {
+ r.push(`They are <strong>decently armed</strong>.`);
+ } else if (V.SecExp.war.attacker.equip === 3) {
+ r.push(`They are <strong>well armed</strong>.`);
+ } else if (V.SecExp.war.attacker.equip >= 4) {
+ r.push(`They are <strong>extremely well armed</strong>.`);
+ }
+ if (V.SecExp.war.irregulars > 0) {
+ r.push(`${num(Math.trunc(V.SecExp.war.irregulars))} of your citizens took up arms to defend their arcology owner.`);
+ }
+ if (V.SecExp.war.rebellingID.length > 0) {
+ App.Events.addParagraph(node, r);
+ r = [];
+ let rebelling = [];
+ for (const squad of App.SecExp.unit.squads("human")) {
+ if (squad.active === 1 && (V.SecExp.war.rebellingID.includes(squad.ID))) {
+ rebelling.push(squad.platoonName);
+ }
+ }
+ r.push(`${toSentence(rebelling)} betrayed you and joined the insurrection.`);
+ }
+ let defending = [];
+ if (V.arcologyUpgrade.drones === 1) {
+ defending.push(`Your security drones`);
+ }
+ for (const squad of App.SecExp.unit.squads("human")) {
+ if (squad.active === 1 && (!V.SecExp.war.rebellingID.includes(squad.ID))) {
+ defending.push(squad.platoonName);
+ }
+ }
+ if (V.SF.Toggle && V.SF.Active >= 1) {
+ let SFname = defending.length > 0 ? V.SF.Lower : capFirstChar(V.SF.Lower);
+ defending.push(`${SFname}, ${num(V.SF.ArmySize)} strong`);
+ }
+ if (defending.length > 0) {
+ App.Events.addParagraph(node, r);
+ r = [];
+ r.push(`${toSentence(defending)} are called to defend the arcology from this menace.`);
+ }
+ App.Events.addParagraph(node, r);
+ r = [];
+ r.push(`The confined spaces of the arcology and the number of vital yet delicate systems within its walls do not allow a lot of tactical flexibility. This will be a long and strenuous fight, street after street, barricade after barricade. In order to preserve the structural integrity of the building and the lives of our civilians, we will have to limit our firepower.`);
+ App.Events.addParagraph(node, r);
- let text;
- if (V.SecExp.war.engageRule === 0) {
- text = `Your troops will use only nonlethal weapons or light firearms to limit to the maximum the collateral damage. This will however weaken our troops considerably.`;
- } else if (V.SecExp.war.engageRule === 1) {
- text = `Your troops will limit the use of explosives and heavy weapons to limit considerably the collateral damage. This will however weaken our troops.`;
- } else if (V.SecExp.war.engageRule === 2) {
- text = `Your troops will not limit their arsenal. This will put the structure and your citizens at risk, but our troops will be at full capacity.`;
- } else if (V.SecExp.war.engageRule === 3) {
- text = `Your troops will make use of the special weaponry, equipment and infrastructure developed by the riot control center to surgically eliminate rebels and dissidents with little to no collateral damage.`;
- }
- if (text) {
- App.UI.DOM.appendNewElement("div", node, text, "note");
- }
+ let text;
+ if (V.SecExp.war.engageRule === 0) {
+ text = `Your troops will use only nonlethal weapons or light firearms to limit to the maximum the collateral damage. This will however weaken our troops considerably.`;
+ } else if (V.SecExp.war.engageRule === 1) {
+ text = `Your troops will limit the use of explosives and heavy weapons to limit considerably the collateral damage. This will however weaken our troops.`;
+ } else if (V.SecExp.war.engageRule === 2) {
+ text = `Your troops will not limit their arsenal. This will put the structure and your citizens at risk, but our troops will be at full capacity.`;
+ } else if (V.SecExp.war.engageRule === 3) {
+ text = `Your troops will make use of the special weaponry, equipment and infrastructure developed by the riot control center to surgically eliminate rebels and dissidents with little to no collateral damage.`;
+ }
+ if (text) {
+ App.UI.DOM.appendNewElement("div", node, text, "note");
+ }
- const engageRules = new Map([
- [0, `Only light firearms and nonlethal weapons`],
- [1, `No heavy ordnance`],
- [2, `Normal engagement rules`],
- ]);
- if (V.SecExp.buildings.riotCenter && V.SecExp.buildings.riotCenter.advancedRiotEquip === 1) {
- engageRules.set(3, `Advanced riot protocol`);
- }
+ const engageRules = new Map([
+ [0, `Only light firearms and nonlethal weapons`],
+ [1, `No heavy ordnance`],
+ [2, `Normal engagement rules`],
+ ]);
+ if (V.SecExp.buildings.riotCenter && V.SecExp.buildings.riotCenter.advancedRiotEquip === 1) {
+ engageRules.set(3, `Advanced riot protocol`);
+ }
- for (const [value, text] of engageRules) {
- App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
- text,
- () => {
- V.SecExp.war.engageRule = value;
- App.UI.reload();
- }
- ));
- }
+ for (const [value, text] of engageRules) {
+ App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
+ text,
+ () => {
+ V.SecExp.war.engageRule = value;
+ App.UI.reload();
+ }
+ ));
+ }
- App.Events.addParagraph(node, [`We can dedicate some of our forces to the protection of the vital parts of the arcology, doing so will prevent the failure of said systems, but will also take away strength from our assault.`]);
- const locations = new Map([
- ["penthouseDefense", `penthouse`],
- ["reactorDefense", `reactors`],
- ["assistantDefense", `assistant's central CPU`],
- ["waterwayDefense", `waterways`],
- ]);
- const activeDefenses = Array.from(locations.keys()).filter(loc => V.SecExp.war[loc] === 1);
- if (activeDefenses.length > 0) {
- App.UI.DOM.appendNewElement("div", node, `Your troops will garrison the ${toSentence(activeDefenses.map(loc => locations.get(loc)))}.`, "note");
- }
- for (const [loc, text] of locations) {
- const choices = [];
- choices.push(App.UI.DOM.link(
- `Garrison the ${text}`,
- () => {
- V.SecExp.war[loc] = 1;
- App.UI.reload();
- }
- ));
- choices.push(App.UI.DOM.link(
- `Discard the order`,
- () => {
- delete V.SecExp.war[loc];
- App.UI.reload();
- }
- ));
- App.UI.DOM.appendNewElement("div", node, App.UI.DOM.generateLinksStrip(choices));
- }
- }
+ App.Events.addParagraph(node, [`We can dedicate some of our forces to the protection of the vital parts of the arcology, doing so will prevent the failure of said systems, but will also take away strength from our assault.`]);
+ const locations = new Map([
+ ["penthouseDefense", `penthouse`],
+ ["reactorDefense", `reactors`],
+ ["assistantDefense", `assistant's central CPU`],
+ ["waterwayDefense", `waterways`],
+ ]);
+ const activeDefenses = Array.from(locations.keys()).filter(loc => V.SecExp.war[loc] === 1);
+ if (activeDefenses.length > 0) {
+ App.UI.DOM.appendNewElement("div", node, `Your troops will garrison the ${toSentence(activeDefenses.map(loc => locations.get(loc)))}.`, "note");
+ }
+ for (const [loc, text] of locations) {
+ const choices = [];
+ choices.push(App.UI.DOM.link(
+ `Garrison the ${text}`,
+ () => {
+ V.SecExp.war[loc] = 1;
+ App.UI.reload();
+ }
+ ));
+ choices.push(App.UI.DOM.link(
+ `Discard the order`,
+ () => {
+ delete V.SecExp.war[loc];
+ App.UI.reload();
+ }
+ ));
+ App.UI.DOM.appendNewElement("div", node, App.UI.DOM.generateLinksStrip(choices));
+ }
+ }
- node.append(App.SecExp.unit.replenishAll());
- if (isBattle) {
- if (App.SecExp.battle.deployableUnits() === 0) {
- App.UI.DOM.appendNewElement("div", node, `Unit roster full.`, "strong");
- }
- options = new App.UI.OptionsGroup();
- options.addOption("Unit descriptions are", "unitDescriptions", V.SecExp.settings)
- .addValueList([["Abbreviated", 1], ["Summarized", 0]]);
- node.append(options.render());
+ node.append(App.SecExp.unit.replenishAll());
+ if (isBattle) {
+ if (App.SecExp.battle.deployableUnits() === 0) {
+ App.UI.DOM.appendNewElement("div", node, `Unit roster full.`, "strong");
+ }
+ options = new App.UI.OptionsGroup();
+ options.addOption("Unit descriptions are", "unitDescriptions", V.SecExp.settings)
+ .addValueList([["Abbreviated", 1], ["Summarized", 0]]);
+ node.append(options.render());
- const tabBar = new App.UI.Tabs.TabBar("SecExpAttackOptions");
- for (const [u] of App.SecExp.unit.list()) {
- if (V.SecExp.units[u].squads.length > 0) {
- tabBar.addTab(capFirstChar(u), u, unitTab(u));
- }
- }
- node.append(tabBar.render());
- }
+ const tabBar = new App.UI.Tabs.TabBar("SecExpAttackOptions");
+ for (const [u] of App.SecExp.unit.list()) {
+ if (V.SecExp.units[u].squads.length > 0) {
+ tabBar.addTab(capFirstChar(u), u, unitTab(u));
+ }
+ }
+ node.append(tabBar.render());
+ }
- options = new App.UI.OptionsGroup();
- option = options.addCustomOption(isBattle ? "Send your orders" : "Actions");
- if (isBattle && App.SecExp.battle.deployedUnits() > 0 || !isBattle) {
- option.addButton(isBattle ? `Deploy troops` : `Proceed`, () => {
- V.SecExp.war.result = 4; // Sets to a value outside accepted range (-3, 3) to avoid evaluation problems
- V.SecExp.war.foughtThisWeek = 1;
- }, `conflictHandler`);
- } else if (isBattle && App.SecExp.battle.deployedUnits() === 0) {
- App.UI.DOM.appendNewElement("div", node, `You need at least a unit in your roster to proceed to battle.`, "red");
- }
- if (isBattle) {
- option.addButton(`Attempt to bribe (approximately ${cashFormat(Math.round(App.SecExp.battle.bribeCost() * (1 + either(-1, 1) * random(2) * 0.1)))})`, () => {
- V.SecExp.war.result = 1;
- V.SecExp.war.foughtThisWeek = 1;
- }, `conflictHandler`);
- }
- option.addButton(`Surrender`, () => {
- V.SecExp.war.result = -1;
- V.SecExp.war.foughtThisWeek = 1;
- }, "conflictReport");
- node.append(options.render());
- return node;
+ options = new App.UI.OptionsGroup();
+ option = options.addCustomOption(isBattle ? "Send your orders" : "Actions");
+ if (isBattle && App.SecExp.battle.deployedUnits() > 0 || !isBattle) {
+ option.addButton(isBattle ? `Deploy troops` : `Proceed`, () => {
+ V.SecExp.war.result = 4; // Sets to a value outside accepted range (-3, 3) to avoid evaluation problems
+ V.SecExp.war.foughtThisWeek = 1;
+ }, `conflictHandler`);
+ } else if (isBattle && App.SecExp.battle.deployedUnits() === 0) {
+ App.UI.DOM.appendNewElement("div", node, `You need at least a unit in your roster to proceed to battle.`, "red");
+ }
+ if (isBattle) {
+ option.addButton(`Attempt to bribe (approximately ${cashFormat(Math.round(App.SecExp.battle.bribeCost() * (1 + either(-1, 1) * random(2) * 0.1)))})`, () => {
+ V.SecExp.war.result = 1;
+ V.SecExp.war.foughtThisWeek = 1;
+ }, `conflictHandler`);
+ }
+ option.addButton(`Surrender`, () => {
+ V.SecExp.war.result = -1;
+ V.SecExp.war.foughtThisWeek = 1;
+ }, "conflictReport");
+ node.append(options.render());
+ return node;
- // Battles
- /** Generates the deploy menu for the unit.
- * @param {FC.SecExp.PlayerHumanUnitTypeMod} [type] the class of unit to be checked.
- */
- function unitTab(type) {
- const frag = new DocumentFragment();
- for (const u of V.SecExp.units[type].squads.filter(s => s.active === 1 && s.troops > 0)) {
- App.UI.DOM.appendNewElement("div", frag, App.SecExp.unit.describe(u, true));
- }
- return frag;
- };
- };
+ // Battles
+ /** Generates the deploy menu for the unit.
+ * @param {FC.SecExp.PlayerHumanUnitTypeMod} [type] the class of unit to be checked.
+ */
+ function unitTab(type) {
+ const frag = new DocumentFragment();
+ for (const u of V.SecExp.units[type].squads.filter(s => s.active === 1 && s.troops > 0)) {
+ App.UI.DOM.appendNewElement("div", frag, App.SecExp.unit.describe(u, true));
+ }
+ return frag;
+ }
+ }
};
diff --git a/src/Mods/SecExp/events/conflictReport.js b/src/Mods/SecExp/events/conflictReport.js
index e346eb941deaa673aa49d6ae1bb5c6295de97e39..5413dd57ac87008446586ef9c74b9a619ce19f51 100644
--- a/src/Mods/SecExp/events/conflictReport.js
+++ b/src/Mods/SecExp/events/conflictReport.js
@@ -3,11 +3,12 @@ App.Events.conflictReport = function() {
* @param {string} [type]
* @param {number} [loss]
* @param {Object} [squad=null]
- * @returns {string}
+ * @returns {DocumentFragment}
*/
const casualtiesReport = function(type, loss, squad=null) {
const isSpecial = squad && Array.from(App.SecExp.unit.list().keys()).slice(1).includes(type);
- let r = [];
+ const frag = new DocumentFragment();
+ const r = new SpacedTextAccumulator(frag);
if (loss <= 0) {
r.push(`No`);
} else if (loss <= (isSpecial ? (squad.troops * 0.2) : 10)) {
@@ -33,7 +34,8 @@ App.Events.conflictReport = function() {
r.push(`The unit has very few operatives left, it risks complete annihilation if deployed again.`);
}
}
- return r.join(" ");
+ r.toNode("span", (loss <= 0 ? "green" : "red"));
+ return frag;
};
let r = [];
const allKilled = V.SecExp.war.attacker.losses === V.SecExp.war.attacker.troops;
@@ -751,7 +753,7 @@ App.Events.conflictReport = function() {
} else {
r.push(`The garrison assigned to the reactor protected it from the multiple sabotage attempts carried out by the rebels.`);
}
- App.UI.DOM.appendNewElement("div", node, r.join(" "));
+ App.Events.addParagraph(node, r);
r = [];
if (!V.SecExp.war.waterwayDefense) {
@@ -765,7 +767,7 @@ App.Events.conflictReport = function() {
} else {
r.push(`The garrison assigned to the water management complex protected it from the sabotage attempt of the rebels.`);
}
- App.UI.DOM.appendNewElement("div", node, r.join(" "));
+ App.Events.addParagraph(node, r);
r = [];
if (!V.SecExp.war.assistantDefense) {
@@ -779,7 +781,7 @@ App.Events.conflictReport = function() {
} else {
r.push(`The garrison assigned to the facility housing ${V.assistant.name}'s mainframe prevented any sabotage attempt.`);
}
- App.UI.DOM.appendNewElement("div", node, r.join(" "));
+ App.Events.addParagraph(node, r);
r = [];
if (V.SecExp.war.penthouseDefense && V.BodyguardID !== 0) {
@@ -806,7 +808,7 @@ App.Events.conflictReport = function() {
}
}
}
- App.UI.DOM.appendNewElement("div", node, r.join(" "));
+ App.Events.addParagraph(node, r);
r = [];
}
V.lowerClass = Math.max(V.lowerClass, 0);
@@ -1163,7 +1165,9 @@ App.Events.conflictReport = function() {
loss = Math.trunc(V.ACitizens * 0.95);
}
}
- App.UI.DOM.appendNewElement("div", node, `The volunteering citizens were quickly organized into an irregular militia unit and deployed in the arcology: ${casualtiesReport('irregulars', loss)}`);
+ r = ["The volunteering citizens were quickly organized into an irregular militia unit and deployed in the arcology:", casualtiesReport('irregulars', loss)];
+ App.Events.addNode(node, r, "div");
+ r = [];
if (hasLosses) {
if (loss > V.lowerClass * 0.95) { // I suspect only lower class ever get to fight/die, but being safe
V.lowerClass = Math.trunc(V.lowerClass * 0.05);
@@ -1196,9 +1200,11 @@ App.Events.conflictReport = function() {
loss = Math.clamp(loss, 0, V.SF.ArmySize);
V.SF.ArmySize -= loss;
}
- App.UI.DOM.appendNewElement("div", node, `${capFirstChar(V.SF.Lower)}, ${num(V.SF.ArmySize)} strong, is called to arms: ${casualtiesReport('SF', loss)}`);
+ r = [`${capFirstChar(V.SF.Lower)}, ${num(V.SF.ArmySize)} strong, is called to arms:`, casualtiesReport('SF', loss)];
+ App.Events.addNode(node, r, "div");
+ r = [];
}
- for (const type of App.SecExp.unit.list()) {
+ for (const type of App.SecExp.unit.list().keys()) {
if (App.SecExp.battle.deployedUnits(type) >= 1) {
for (const unit of V.SecExp.units[type].squads) {
if (App.SecExp.unit.isDeployed(unit)) {
@@ -1210,13 +1216,14 @@ App.Events.conflictReport = function() {
if (inRebellion) {
if (type === "bots") {
- r.push(`Security drones: ${casualtiesReport(type, loss, unit)}`);
+ r.push(`Security drones:`);
} else {
- r.push(`${unit.platoonName} participated in the battle. They remained loyal to you. ${casualtiesReport(type, loss, unit)}`);
+ r.push(`${unit.platoonName} participated in the battle. They remained loyal to you.`);
}
} else {
- r.push(`${type !== "bots" ? `${unit.platoonName}` : "Security drones"}: ${casualtiesReport(type, loss, unit)}`);
+ r.push(`${type !== "bots" ? `${unit.platoonName}` : "Security drones"}:`);
}
+ r.push(casualtiesReport(type, loss, unit));
if (type !== "bots") {
unit.battlesFought++;
if (loss > 0) {
diff --git a/src/Mods/SecExp/js/Unit.js b/src/Mods/SecExp/js/Unit.js
index 06ed89666f93c20bc68d048ac251f0c0c7659341..6a345792e30348b5db0da0b8488945f477612628 100644
--- a/src/Mods/SecExp/js/Unit.js
+++ b/src/Mods/SecExp/js/Unit.js
@@ -173,7 +173,7 @@ App.SecExp.unit = (function() {
let unit = V.SecExp.units[type].squads[i];
linkArray = [];
- App.UI.DOM.appendNewElement("div", unitDetail, describe(unit, type));
+ App.UI.DOM.appendNewElement("div", unitDetail, describe(unit, false));
linkArray.push(App.UI.DOM.makeTextBox(unit.platoonName, str => { unit.platoonName = str; App.UI.reload(); }));
linkArray.push(App.UI.DOM.link(`Disband the unit`, () => {
unitFree(type).add(unit.troops);
@@ -400,7 +400,7 @@ App.SecExp.unit = (function() {
* @returns {boolean}
*/
function isDeployed(unit) {
- return V.SecExp.war && (V.SecExp.war.type.includes("Attack") && V.SecExp.war.deployed.includes(unit.ID)) || (V.SecExp.war.type.includes("Rebellion") && unit.active === 1 && !V.SecExp.war.rebellingID.includes(unit.ID));
+ return V.SecExp.war.type.includes("Attack") && V.SecExp.war.deployed.includes(unit.ID) || V.SecExp.war.type.includes("Rebellion") && unit.active === 1 && !V.SecExp.war.rebellingID.includes(unit.ID);
}
/**
@@ -408,7 +408,7 @@ App.SecExp.unit = (function() {
* @param {boolean} inBattle - if true appends a deploy/recall link to the description, allowing for [input] to be deployed/recalled.
* @returns {HTMLDivElement}
*/
- function describe(input, inBattle = false) {
+ function describe(input, inBattle) {
const brief = V.SecExp.settings.unitDescriptions;
const unitType = App.SecExp.unit.checkID(input.ID);
let el = new DocumentFragment();
@@ -426,8 +426,6 @@ App.SecExp.unit = (function() {
}
));
}
- App.UI.DOM.appendNewElement("span", el, `${input.platoonName}`, "bold");
- App.UI.DOM.appendNewElement("span", el, `${!brief ? ``:`. `} `);
App.UI.DOM.appendNewElement("span", el, `${input.platoonName}`, "bold");
App.UI.DOM.appendNewElement("span", el, `${!brief ? ``:`. `} `);
diff --git a/src/Mods/SecExp/js/reportingRelatedFunctions.js b/src/Mods/SecExp/js/reportingRelatedFunctions.js
index 765b1aa55a249fa873163ca8ebfad66097e05f32..ade3cb6f57e3f91d7166a32fc45c5e503cf64ce1 100644
--- a/src/Mods/SecExp/js/reportingRelatedFunctions.js
+++ b/src/Mods/SecExp/js/reportingRelatedFunctions.js
@@ -128,6 +128,9 @@ App.SecExp.updateFacilityDamage = function(facility) {
};
};
+/** Returns the how effective the selected commander is.
+ * @param {string} passage if "handler" only numbers are returned else a string.
+ */
App.SecExp.commanderEffectiveness = function(passage) {
const r = [];
const oldRep = V.rep;
@@ -158,6 +161,10 @@ App.SecExp.commanderEffectiveness = function(passage) {
slave = S.Bodyguard;
isBodyguard = true;
}
+ if (slave) {
+ const CareerGivesBonus = App.Data.Careers.Leader.bodyguard.includes(slave.career) || App.Data.Careers.Leader.HG.includes(slave.career) || setup.secExCombatPrestige.includes(slave.prestigeDesc);
+ const TotalIntelligence = slave.intelligence + slave.intelligenceImplant;
+ }
switch(commander) {
case "PC":
@@ -454,9 +461,6 @@ App.SecExp.commanderEffectiveness = function(passage) {
break;
case "bodyguard":
case "HeadGirl":
- const CareerGivesBonus = App.Data.Careers.Leader.bodyguard.includes(slave.career) || App.Data.Careers.Leader.HG.includes(slave.career) || setup.secExCombatPrestige.includes(slave.prestigeDesc);
- const TotalIntelligence = slave.intelligence + slave.intelligenceImplant;
-
if (inHandler) {
if (slave.devotion < -20) {
slaveMod -= 0.15;