From ab640ce40e4f18cf481f3fc0b2dc401d8ee0f6a1 Mon Sep 17 00:00:00 2001
From: Blank <blank@national.shitposting.agency>
Date: Wed, 1 Jul 2020 07:40:07 +1200
Subject: [PATCH] minor tweaking
---
src/Mods/SecExp/attackOptions.tw | 2 +-
src/Mods/SpecialForce/Firebase.tw | 6 +++---
src/Mods/SpecialForce/SpecialForce.js | 7 +++++--
src/pregmod/eliteTakeOverResult.tw | 2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/Mods/SecExp/attackOptions.tw b/src/Mods/SecExp/attackOptions.tw
index 3f9cf5ba9d1..15b05eaa485 100644
--- a/src/Mods/SecExp/attackOptions.tw
+++ b/src/Mods/SecExp/attackOptions.tw
@@ -259,7 +259,7 @@ __Battle Plan__:
<<replace "#leader">><strong><<print _leader>></strong><</replace>>
<</link>>
<</if>>
- <<if $SF.Toggle && $SF.Active >= 1 && $SF.MercCon.CanAttend === -1>>
+ <<if $SF.Toggle && $SF.Active >= 1 && $SF.MercCon.CanAttend === -2>>
|
<<link "Let The Colonel lead the troops">>
<<set $leadingTroops = "colonel">>
diff --git a/src/Mods/SpecialForce/Firebase.tw b/src/Mods/SpecialForce/Firebase.tw
index fdeaf6fcf28..c07c21fde9b 100644
--- a/src/Mods/SpecialForce/Firebase.tw
+++ b/src/Mods/SpecialForce/Firebase.tw
@@ -53,14 +53,14 @@
<div id="Actions" class="tabcontent">
<div class="content">
- <<if $SF.MercCon.CanAttend === -2>>
+ <<if $SF.MercCon.CanAttend === 0>>
<br><br>Her expression changes as something jogs her memory. "Before we begin <<if $SF.Colonel.Core == "brazen">><<= properTitle()>><<else>>boss<</if>>, back when I was a merc me and a couple of my old friends would have a meetup every several months. Drinking, fucking, drugs... a little poker. It eventually grew into a whole thing, and now we bring our latest and greatest toys to show off, maybe make some money off selling the schematics. I'd like to continue going, for old times' sake."
<br>[[Grant leave|Firebase][$SF.MercCon.CanAttend = 1]]
- <br>[[Request she remain on base|Firebase][$SF.MercCon.CanAttend = -1]]<br>
+ <br>[[Request she remain on base|Firebase][$SF.MercCon.CanAttend = -2]]<br>
<<elseif $SF.MercCon.History >= 1 && ((Math.trunc($week/24) === ($week/24)) && $SF.MercCon.CanAttend === -1)>>
<br><br>Her expression changes as something jogs her memory. "Before we begin <<if $SF.Colonel.Core == "brazen">><<= properTitle()>><<else>>boss<</if>>, that biannual merc meetup has come around again. You've already gave me leave to attend, but I just wanted to be sure I'm still clear to go."
<br>[[Grant leave|Firebase][$SF.MercCon.CanAttend = 1]]
- <br>[[Request she remain on site|Firebase][$SF.MercCon.CanAttend = -1]]<br>
+ <br>[[Request she remain on site|Firebase][$SF.MercCon.CanAttend = -2]]<br>
<</if>>
<span id="result0">
diff --git a/src/Mods/SpecialForce/SpecialForce.js b/src/Mods/SpecialForce/SpecialForce.js
index c4680b1eb46..f47ec5531bf 100644
--- a/src/Mods/SpecialForce/SpecialForce.js
+++ b/src/Mods/SpecialForce/SpecialForce.js
@@ -52,7 +52,7 @@ App.SF.Init = function() {
},
MercCon: {
History: 0,
- CanAttend: -2,
+ CanAttend: 0,
Income: 0,
Revenue: 0,
Mercs: 0,
@@ -303,7 +303,10 @@ App.SF.BC = function() {
V.SF.MercCon = V.SF.MercCon || {};
V.SF.MercCon.History = V.SF.MercCon.History || 0;
- V.SF.MercCon.CanAttend = V.SF.MercCon.CanAttend || -2;
+ V.SF.MercCon.CanAttend = V.SF.MercCon.CanAttend || 0;
+ if (V.SF.MercCon.History >= 1) {
+ V.SF.MercCon.CanAttend = -1;
+ }
V.SF.MercCon.Income = V.SF.MercCon.Income || 0;
V.SF.MercCon.Revenue = V.SF.MercCon.Revenue || 0;
V.SF.MercCon.Mercs = V.SF.MercCon.Mercs || 0;
diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
index 2c0534278c1..dfd398604c6 100644
--- a/src/pregmod/eliteTakeOverResult.tw
+++ b/src/pregmod/eliteTakeOverResult.tw
@@ -93,7 +93,7 @@
<</replace>>
<</link>>
</span>
- <<if $SF.MercCon.CanAttend === -1>>
+ <<if $SF.MercCon.CanAttend === -2>>
<<switch $SF.Colonel.Core>>
<<case "kind">>
The Colonel is shocked that you would allow her troops to do this but understands that it comes with the territory.<<if _SFHappyEverAfter == 1>> "Thanks for being kind to one of my soldiers."<</if>>
--
GitLab