From d9931782ca84eb4199f14935d8e03ba77d3bcd92 Mon Sep 17 00:00:00 2001 From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io> Date: Sat, 18 Jan 2020 13:14:19 -0800 Subject: [PATCH] SF-Caps-catches --- src/Mods/SpecialForce/WeeklyChoices.tw | 2 +- src/SecExp/attackOptions.tw | 4 ++-- src/SecExp/edicts.tw | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Mods/SpecialForce/WeeklyChoices.tw b/src/Mods/SpecialForce/WeeklyChoices.tw index f8b5da01c03..cc8a75c3388 100644 --- a/src/Mods/SpecialForce/WeeklyChoices.tw +++ b/src/Mods/SpecialForce/WeeklyChoices.tw @@ -33,7 +33,7 @@ <</if>> <<elseif $SF.Gift == 0 && ($SF.MercCon.CanAttend > -1 || ($SF.Colonel.Talk + $SF.Colonel.Fun > 0))>> <br>He looks down a list on his tablet. "<<= properTitle()>>, how can $SF.Lower help you this week? - <br>$SF.Caps can spare some profits from our recent operations. | <<link "Request cash" "Firebase">> + <br> <<= App.SF.Caps()>> can spare some profits from our recent operations. | <<link "Request cash" "Firebase">> <<set $CashGift = 25000*($SF.Size/10)*_Env,$SF.Gift = 1,$choice = 1>> <<set $CashGift = ($CashGift > 5000 ? $CashGift : 5000)>> <<run cashX(Math.ceil($CashGift * 0.8), "specialForces")>> diff --git a/src/SecExp/attackOptions.tw b/src/SecExp/attackOptions.tw index ea6d2579946..fed7e7cfa35 100644 --- a/src/SecExp/attackOptions.tw +++ b/src/SecExp/attackOptions.tw @@ -208,7 +208,7 @@ __Battle Plan__: <<case "mercenary">> <<set _leader = "The mercenary commander will">> <<case "colonel">> - <<set _leader = $SF.Caps +"'s Colonel will">> + <<set _leader = App.SF.Caps() +"'s Colonel will">> <</switch>> /* leader assignment */ @@ -261,7 +261,7 @@ __Battle Plan__: | <<link "Let The Colonel lead the troops">> <<set $leadingTroops = "colonel">> - <<set _leader = $SF.Caps +"'s Colonel will">> + <<set _leader = App.SF.Caps() +"'s Colonel will">> <<replace "#leader">><strong><<print _leader>></strong><</replace>> <</link>> <</if>> diff --git a/src/SecExp/edicts.tw b/src/SecExp/edicts.tw index 38574894047..7c20e4ab86b 100644 --- a/src/SecExp/edicts.tw +++ b/src/SecExp/edicts.tw @@ -47,19 +47,19 @@ <<if $SF.Toggle && $SF.Active >= 1 && $SFSupportLevel > 0>> <br><br>__Special Force:__ <<if $SFSupportLevel === 1>> - <br>''Equipment provision:'' $SF.Caps is providing the security HQ with advanced equipment, boosting its efficiency. + <br>''Equipment provision:'' <<= App.SF.Caps()>> is providing the security HQ with advanced equipment, boosting its efficiency. [[Repeal|edicts][$SFSupportLevel--]] <<elseif $SFSupportLevel === 2>> - <br>''Personnel training:'' $SF.Caps is currently providing advanced equipment and training to security HQ personnel. + <br>''Personnel training:'' <<= App.SF.Caps()>> is currently providing advanced equipment and training to security HQ personnel. [[Repeal|edicts][$SFSupportLevel--]] <<elseif $SFSupportLevel === 3>> - <br>''Troops detachment:'' $SF.Caps has currently transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel. + <br>''Troops detachment:'' <<= App.SF.Caps()>> has currently transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel. [[Repeal|edicts][$SFSupportLevel--]] <<elseif $SFSupportLevel === 4>> - <br>''Full support:''$SF.Caps is currently providing its full support to the security department, while transferring troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel. + <br>''Full support:''<<= App.SF.Caps()>> is currently providing its full support to the security department, while transferring troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel. [[Repeal|edicts][$SFSupportLevel--]] <<elseif $SFSupportLevel === 5>> - <br>''Network assistance:''$SF.Caps is currently assisting with a local install of its custom network full support and has transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel. + <br>''Network assistance:''<<= App.SF.Caps()>> is currently assisting with a local install of its custom network full support and has transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel. [[Repeal|edicts][$SFSupportLevel--]] <</if>> <</if>> @@ -309,7 +309,7 @@ <<if $SF.Toggle && $SF.Active >= 1 && $SFSupportLevel < 5>> <br><br>__Special Force:__ <<if !$SFSupportLevel && App.SecExp.Check.reqMenials() > 5>> - <br>''Equipment provision:'' $SF.Caps will provide the security HQ with advanced equipment. + <br>''Equipment provision:'' <<= App.SF.Caps()>> will provide the security HQ with advanced equipment. <<if $SecExp.core.authority >= 1000>> [[Implement|edicts][$SFSupportLevel++, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]] <<else>> @@ -317,7 +317,7 @@ <</if>> <br> //Will lower the amount of personnel necessary to man the security HQ by 5, but will incur upkeep costs.// <<elseif $SFSupportLevel && $SF.Squad.Firebase >= 4 && App.SecExp.Check.reqMenials() > 5>> - <br>''Personnel training:'' $SF.Caps will provide the security HQ personnel with advanced training. + <br>''Personnel training:'' <<= App.SF.Caps()>> will provide the security HQ personnel with advanced training. <<if $SecExp.core.authority >= 1000>> [[Implement|edicts][$SFSupportLevel++, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]] <<else>> @@ -325,7 +325,7 @@ <</if>> <br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.// <<elseif $SFSupportLevel === 2 && $SF.Squad.Firebase >= 6 && App.SecExp.Check.reqMenials() > 5>> - <br>''Troops detachment:'' $SF.Caps will provide troops to the security department. + <br>''Troops detachment:'' <<= App.SF.Caps()>> will provide troops to the security department. <<if $SecExp.core.authority >= 1000>> [[Implement|edicts][$SFSupportLevel++, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]] <<else>> @@ -333,7 +333,7 @@ <</if>> <br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.// <<elseif $SFSupportLevel === 3 && $SF.Squad.Firebase >= 6 && App.SecExp.Check.reqMenials() > 5>> - <br>''Full Support:'' $SF.Caps will give the security department its full support. + <br>''Full Support:'' <<= App.SF.Caps()>> will give the security department its full support. <<if $SecExp.core.authority >= 1000>> [[Implement|edicts][$SFSupportLevel++, cashX(-5000, "edicts"), $SecExp.core.authority -= 1000]] <<else>> @@ -341,7 +341,7 @@ <</if>> <br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.// <<elseif $SFSupportLevel === 4 && $SF.Squad.Firebase === 10 && App.SecExp.Check.reqMenials() > 5>> - <br>''Network assistance:'' $SF.Caps will assist the security department with installing a local version of their custom network. + <br>''Network assistance:'' <<= App.SF.Caps()>> will assist the security department with installing a local version of their custom network. <<if $SecExp.core.authority >= 1000>> [[Implement|edicts][$SFSupportLevel++, cashX(-50000, "edicts"), $SecExp.core.authority -= 1000]] <<else>> -- GitLab