From fcfbff033880e61e757cc9b6415c4d9d1b16137c Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Fri, 22 Jan 2021 21:24:08 -0800
Subject: [PATCH] SF-fix
---
src/Mods/SpecialForce/SpecialForce.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Mods/SpecialForce/SpecialForce.js b/src/Mods/SpecialForce/SpecialForce.js
index b17a2401da4..95000f94ee4 100644
--- a/src/Mods/SpecialForce/SpecialForce.js
+++ b/src/Mods/SpecialForce/SpecialForce.js
@@ -106,13 +106,13 @@ App.SF.upgrades = (function() {
function currentUnitMax(input) {
const T1 = App.SF.unlocked.secondTier();
- if (T1 === false) {
+ if (!T1) {
if (['Armoury', 'Firebase', 'Drugs', 'Drones', 'AV', 'TV', 'AA', 'TA'].includes(input)) {
return 5;
} else {
return 0;
}
- } else if (T1 === true) {
+ } else {
if (!['SpacePlane', 'GunS', 'Satellite', 'GiantRobot', 'MissileSilo', 'AircraftCarrier', 'Sub', 'HAT'].includes(input)) {
return 10;
} else {
@@ -1451,13 +1451,13 @@ App.SF.AAR = function(endWeekCall = 1) {
}
} else {
r += `<span class='red'>barely enough to cover expenses.</span> More growth will be needed to ensure profitability, <span class='yellow'>hopefully purchasing more upgrades will help.</span>`;
- r += ` Per the estimates that ${App.SF.SFC()} provides, an additional <span class='yellowgreen'>${cashFormat(profit)}</span> is required for sufficient cover.`;
+ r += ` Per estimates provided, an additional <span class='yellowgreen'>${cashFormat(Math.abs(profit))}</span> is required for sufficient cover.`;
}
- r += `An difference of ${(profit/V.SF.lastWeeksProfit)*100}% since last week`;
+ r += `A difference of ${num(Math.abs(((profit/V.SF.lastWeeksProfit)*100).toFixed(2)))}% since last week.`;
V.SF.lastWeeksProfit = profit;
- r += ` ${capSF} managed to recruit ${FNG} new soldiers this week, and your reputation has <span class='green'>increased through the improvement of trade security.</span>`;
- r += `<h3>Your instructions to ${App.SF.SFC()}:</h3>`;
+ r += `<br>${FNG} new soldiers were recruited this week, and your reputation has <span class='green'>increased through the improvement of trade security.</span>`;
+ r += `<h3>Operational choices:</h3>`;
r += ` Deployment focus: `;
r += `<span id="focus"> <<if $SF.Target == "recruit">> <b>Recruiting and Training</b> <<elseif $SF.Target == "secure">> <b>Securing Trade Routes</b> <<else>> <b>Raiding and Slaving</b> <</if>></span> `;
--
GitLab