From 64dbc7d159fcdd0d3378657c7a073ab26b3f583e Mon Sep 17 00:00:00 2001
From: Blank <blank@national.shitposting.agency>
Date: Tue, 30 Jun 2020 20:54:03 +1200
Subject: [PATCH] Pass III
---
src/Mods/SpecialForce/Firebase.tw | 6 ++++--
src/Mods/SpecialForce/FirebaseTour.tw | 2 +-
src/Mods/SpecialForce/SpecialForce.js | 25 +++++++++++--------------
src/uncategorized/seIndependenceDay.tw | 10 +++++++---
4 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/src/Mods/SpecialForce/Firebase.tw b/src/Mods/SpecialForce/Firebase.tw
index f8c381a265c..fdeaf6fcf28 100644
--- a/src/Mods/SpecialForce/Firebase.tw
+++ b/src/Mods/SpecialForce/Firebase.tw
@@ -63,14 +63,16 @@
<br>[[Request she remain on site|Firebase][$SF.MercCon.CanAttend = -1]]<br>
<</if>>
+ <span id="result0">
<<if $SF.MercCon.History >= 1>>
<<link "Mercenary meetup report">>
<<replace "#result0">>
- <br><br>While at the recent merc meetup, The Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print num($SF.MercCon.Menials)>> menial slaves were won in a poker game, and <<print num($SF.MercCon.Mercs)>> mercenaries were persuaded to join $SF.Lower.
- <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print num($SF.MercCon.TotalMenials)>> menial slaves and <<print num($SF.MercCon.TotalMercs)>> mercenaries joined across $SF.MercCon.History meetups.
+ While at the recent merc meetup, The Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print num($SF.MercCon.Menials)>> menial slaves were won in a poker game, and <<print num($SF.MercCon.Mercs)>> mercenaries were persuaded to join $SF.Lower.
+ <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print num($SF.MercCon.TotalMenials)>> menial slaves and <<print num($SF.MercCon.TotalMercs)>> mercenaries joined across $SF.MercCon.History meetups. <<link "Back" "Firebase">> <</link>>
<</replace>>
<</link>>
<</if>>
+ </span>
<<if $SF.UC.Lock < 1>> <br>
<<switch $SF.UC.Assign>>
diff --git a/src/Mods/SpecialForce/FirebaseTour.tw b/src/Mods/SpecialForce/FirebaseTour.tw
index 36f16104a55..c84ff49270d 100644
--- a/src/Mods/SpecialForce/FirebaseTour.tw
+++ b/src/Mods/SpecialForce/FirebaseTour.tw
@@ -1,4 +1,4 @@
-:: FirebaseTour
+:: FirebaseTour [nobr]
<<set $nextButton = "Return to Operations", $nextLink = "Firebase">>
diff --git a/src/Mods/SpecialForce/SpecialForce.js b/src/Mods/SpecialForce/SpecialForce.js
index 0e02c58f997..957f0e59288 100644
--- a/src/Mods/SpecialForce/SpecialForce.js
+++ b/src/Mods/SpecialForce/SpecialForce.js
@@ -457,7 +457,9 @@ App.SF.fsIntegration = function(input = 'Menu', textDisplay = 100) {
function OptionsMenu(selectedFS, fsIncrease = 5, cost = 150000) {
let InputText1 = ``,
- InputText0 = ``;
+ InputText0 = ``,
+ tension = 15,
+ gift = 0;
if (fsIncrease > 0) {
if (V.SF.FS[selectedFS].lv === 0) {
@@ -499,6 +501,10 @@ App.SF.fsIntegration = function(input = 'Menu', textDisplay = 100) {
} else if (V.SF.FS[selectedFS].lv === 90) {
InputText1 += `Talk The Colonel into Compliance`;
}
+ } else {
+ InputText1 += `Buy The Colonel a personal gift `;
+ tension = -15;
+ gift = 1;
}
if (V.SF.FS[selectedFS].lv === 90) {
@@ -631,23 +637,16 @@ App.SF.fsIntegration = function(input = 'Menu', textDisplay = 100) {
break;
}
- let var0 = 15,
- var1 = 0;
if (V.SF.FS[selectedFS].gift > 0) {
- var1 = 1;
+ gift = 1;
}
if (fsIncrease > 0) {
InputText0 += `\n Smuggle in FS-optimized (${V.SF.FS[selectedFS].lv}%): `;
- } else {
- var0 = -15;
- var1 = 1;
- InputText1 += `Buy The Colonel a personal gift `;
}
if (V.SF.FS[selectedFS].gift < 1 || (V.SF.FS[selectedFS].lv < 100 && V.SF.FS[selectedFS].vaildOption > 0)) {
- const InputText2 = ` [[${InputText1}|Firebase][cashX(-${cost}, "specialForces"), $SF.FS.Tension += ${var0}, $SF.FS.${[selectedFS]}.gift = ${var1}, $SF.FS.${[selectedFS]}.lv += ${fsIncrease}, $SF.FS.upgrade = 1]]`;
- InputText0 += InputText2;
+ InputText0 += ` [[${InputText1}|Firebase][cashX(-${cost}, "specialForces"), $SF.FS.Tension += ${tension}, $SF.FS.${[selectedFS]}.gift = ${gift}, $SF.FS.${[selectedFS]}.lv += ${fsIncrease}]]`;
if (fsIncrease > 0) {
InputText0 += ` (FS acceptance:<span class='green'>+${fsIncrease}%,</span>`;
}
@@ -658,15 +657,13 @@ App.SF.fsIntegration = function(input = 'Menu', textDisplay = 100) {
InputText0 += ` (`;
}
}
- InputText0 += `<span class='red'>${cashFormat(cost)},</span> `;
- InputText0 += `tension:`;
+ InputText0 += `<span class='red'>${cashFormat(cost)},</span> tension:`;
if (fsIncrease > 0) {
InputText0 += `<span class='red'>+`;
} else {
InputText0 += `<span class='green'>-`;
}
- InputText0 += `15%</span>)`;
- text += InputText0;
+ text += InputText0 + `15%</span>)`;
}
}
diff --git a/src/uncategorized/seIndependenceDay.tw b/src/uncategorized/seIndependenceDay.tw
index 9fbed5a3e43..0945b714de1 100644
--- a/src/uncategorized/seIndependenceDay.tw
+++ b/src/uncategorized/seIndependenceDay.tw
@@ -374,8 +374,9 @@ In the Free Cities, Independence Day falls on the day when the Free City achieve
<</replace>>
<</link>> //Costs @@.yellowgreen;<<print cashFormat(Math.trunc(10000*$upgradeMultiplierTrade))>>@@// </span>
-<<if $SF.Toggle && $SF.Active >= 1>> <span id="result3">
-<br><<link "Host a parade">>
+<<if $SF.Toggle && $SF.Active >= 1>> <br>
+<span id="result3">
+<<link "Host a parade">>
<<replace "#result3">><br><br>
<<if $SF.ArmySize < 100>>
The tiny size of $SF.Lower does not inspire confidence in your citizens.
@@ -448,4 +449,7 @@ In the Free Cities, Independence Day falls on the day when the Free City achieve
<</if>>
/* Maybe a random chance attack by the Daughters of Liberty if they haven't been already defeated or if they have a cell that managed to survive. The size of the attack could depend the time since their last encounter. The amount of damage inflicted would depend primarily on whether hacker's support was acquired, $bodyguard's combat skill, the player's combat skill, SF upgrades and finally some RNG. If a low amount of damage is inflicted then there will be a low hit to rep and some criminals can be acquired or dealt with in the usual manner. Higher amounts of damage leads to higher hits to rep and a chance that fewer attackers will survive. Without a bodyguard there is a chance that PC may die or be held hostage with a chance of being killed if the rescue attempt is botched. */
/* I was thinking providing an option (potentially #result3) of giving a speech with it being a duplicate of the above speech just for completeness' sake however it would be redundant except for a line or two about the outcome of attack if it fired (i.e. listing the number of dead/captured attackers (potentially #result4) and dead soldiers with a couple of potential options (potentially #result5); to erect a statute or such acknowledge them and if one is already present to add them on to it, to provide support for their families. Also the amount of monetary damage, did $bodyguard die or just get wounded and if so how severely. Finally a closing message with how the PC wishes to react to it (potentially #result6); e.g. be vigilant, it's a one-off, act of war, 'we will not give into terrorist attacks', etc. */
- <</replace>> <</link>> </span> <</if>>
+ <</replace>>
+<</link>>
+</span>
+<</if>>
--
GitLab