diff --git a/src/Mods/SpecialForce/SpecialForce.js b/src/Mods/SpecialForce/SpecialForce.js index 5fbf0e8254d1a599eaf78a23fa1fd70698416a23..a1065f6e724059142de128822cdd975b0c3d6354 100644 --- a/src/Mods/SpecialForce/SpecialForce.js +++ b/src/Mods/SpecialForce/SpecialForce.js @@ -482,8 +482,6 @@ App.SF.fsIntegration = function(input = 'Menu', textDisplay = 100) { if (input === 'Menu') { if (V.SF.FS.Tension === -1) { - text += `<span id="result1">`; - text += `<<link "Talk to The Colonel about Future Society integration">> <<replace "#result1">>`; text += `You bring up the topic of cultural development with The Colonel, and in doing so, you share your hopes that she might be willing to help you better acquaint the troops with your cultural mores. Her response was less than positive: `; switch (V.SF.Colonel.Core) { case "kind": @@ -502,8 +500,7 @@ App.SF.fsIntegration = function(input = 'Menu', textDisplay = 100) { text += `"Seriously? Why? Your society stuff is stupid. There is a reason that I asked you not to bring that sort of thing down here. We run a tight ship. Its not always the most fun, but it works. Why wear ourselves out playing dress up? That's stupid. Leave us alone."`; break; } - text += ` [[Fine|Firebase][$SF.FS.Tension = 0]]\n <</replace>> <</link>>`; - text += `</span>`; + text += ` [[Fine|passage()][$SF.FS.Tension = 0]]\n`; } else if (V.SF.FS.Tension < 100) { text += `You walk past The Colonel and move towards the common area to meet with an exclusive group of her very influential officers that are currently relaxing at their favorite table. These men and women are known for their competence, popularity, and authority within in their respective divisions of the ${V.SF.Lower}, they are hard to replace, and they are always looking to earn more coin; they are the perfect weak link for trickling your Future Society influences down into the Firebase. As the officers make room at their table for you to sit and join them for discussion, you spot The Colonel staring at you from afar, and she does not look happy with you. As you are her employer, she cannot stop you from speaking with her soldiers or moving around as you please, but she can tell that you are up to no good.`; validityTester(); @@ -2018,9 +2015,7 @@ App.SF.fsIntegration = function(input = 'Menu', textDisplay = 100) { cashX(-V.cash * 0.25, "specialForces"); let r = ``, BadOutcome = ''; - if (V.rep > 17500) { - V.rep = 17500; - } + Math.clamp(V.rep, 0, 17500); switch (V.SF.Colonel.Core) { case "kind": BadOutcome += 'MIGRATION'; @@ -2126,9 +2121,7 @@ App.SF.AAR = function(endWeekCall = 1) { } else { r += `This week your arcology lost a bit of prosperity and large amount of reputation, due to the looming threat that The Colonel and her forces may resurface.`; V.arcologies[0].prosperity -= 25; - if (V.rep > 17500) { - V.rep = 17500; - } + Math.clamp(V.rep, 0, 17500); } } else if (V.SF.FS.Tension < 100) { let Multiplier = { @@ -2145,9 +2138,7 @@ App.SF.AAR = function(endWeekCall = 1) { N1 = 1 + (0.01 * (size / 3)); let SFD = V.SF.Depravity; - if (V.SF.ArmySize > unitCap) { - V.SF.ArmySize = unitCap; - } + Math.clamp(V.SF.ArmySize, 0, unitCap); if (endWeekCall > 0) { if (V.SF.ArmySize < 100) { V.SF.ArmySize += Math.ceil(jsRandom(2, 5)); @@ -2169,7 +2160,7 @@ App.SF.AAR = function(endWeekCall = 1) { if (V.secExpEnabled > 0 && endWeekCall > 0) { V.SecExp.core.authority += 25 * (Math.ceil(V.SF.ArmySize / 200)); V.SecExp.core.authority += size * 10; - V.SecExp.core.authority = Math.clamp(V.SecExp.core.authority, 0, 20000); + Math.clamp(V.SecExp.core.authority, 0, 20000); } } @@ -2391,12 +2382,8 @@ App.SF.AAR = function(endWeekCall = 1) { cashX(income, "specialForces"); // We run this in economyJS.js now. // cashX(forceNeg(upkeep), "specialForces"); - if (V.SF.ArmySize > unitCap) { - V.SF.ArmySize = unitCap; - } - if (V.arcologies[0].prosperity > V.AProsperityCap) { - V.arcologies[0].prosperity = V.AProsperityCap; - } + Math.clamp(V.SF.ArmySize, 0, unitCap); + Math.clamp(V.arcologies[0].prosperity, 0, V.AProsperityCap); if (V.SF.UC.Assign === 1 && V.SF.UC.Lock < 1) { V.SF.UC.Assign = 0;