Skip to content
Snippets Groups Projects
Commit 9b696f98 authored by Blank_Alt's avatar Blank_Alt Committed by Pregmodder
Browse files

SF Tension Fix

parent 65e5ab12
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
src/Mods/SpecialForce/ColonelSexDec.tw
+ 2
− 2
View file @ 9b696f98
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<<switch $SF.Colonel.Core>> <<switch $SF.Colonel.Core>>
<<case "shell shocked">> <<case "shell shocked">>
<span id="result7"> <span id="result7">
The entire time it is obvious that The Colonel is reliving a horrible event. <br>The entire time it is obvious that The Colonel is reliving a horrible event.
<br><<link "Try to bring her back">> <br><<link "Try to bring her back">>
<<replace "#result7">> <<replace "#result7">>
"You made an attempt to try to bring her back to the present." "You made an attempt to try to bring her back to the present."
...@@ -18,5 +18,5 @@ ...@@ -18,5 +18,5 @@
</span> </span>
<<default>> <<default>>
Inset sex noises here. <br>Inset sex noises here.
<</switch>> <</switch>>
\ No newline at end of file
src/Mods/SpecialForce/Firebase.tw
+ 2
− 2
View file @ 9b696f98
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
, 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." , 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."
<</if>> <</if>>
<br>[[Grant leave|Firebase][$SF.MercCon.CanAttend = 1]] <br>[[Grant leave|Firebase][$SF.MercCon.CanAttend = 1]]
<br>[[Request she remain on site|Firebase][$SF.MercCon.CanAttend = -2]]<br> <br>[[Request she remain on site|Firebase][$SF.MercCon.CanAttend = -2]]
<</if>> <</if>>
<span id="result0"> <span id="result0">
...@@ -109,4 +109,4 @@ ...@@ -109,4 +109,4 @@
<div id="FS" class="tabcontent"> <div id="FS" class="tabcontent">
<div class="content"> <<= App.SF.fsIntegration()>> </div> <div class="content"> <<= App.SF.fsIntegration()>> </div>
</div> </div>
<</if>> <</if>>
\ No newline at end of file
src/Mods/SpecialForce/Upgrades.tw
+ 17
− 17
View file @ 9b696f98
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<<if $SF.Squad.Firebase < App.SF.upgrades.currentUnitMax('Firebase')>> <<if $SF.Squad.Firebase < App.SF.upgrades.currentUnitMax('Firebase')>>
<<set _cF = App.SF.UpgradeCost(125000/_upgradeDiv,$SF.Squad.Firebase)>> <<set _cF = App.SF.UpgradeCost(125000/_upgradeDiv,$SF.Squad.Firebase)>>
<<if $cash >= _cF>> <br> <<if $cash >= _cF>> <br>
[[Upgrade Firebase|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.Firebase++, $SF.CreditsInvested += (_cF), cashX(forceNeg(_cF), "specialForcesCap")]] [[Upgrade Firebase|Firebase][$SF.Upgrade = 1, $SF.Squad.Firebase++, $SF.CreditsInvested += (_cF), cashX(forceNeg(_cF), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade the Firebase.// //Cannot afford to upgrade the Firebase.//
<</if>> <</if>>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<<if $SF.Squad.Armoury < App.SF.upgrades.currentUnitMax('Armoury')>> <<if $SF.Squad.Armoury < App.SF.upgrades.currentUnitMax('Armoury')>>
<<set _cA = App.SF.UpgradeCost(40000/_upgradeDiv,$SF.Squad.Armoury)>> <<set _cA = App.SF.UpgradeCost(40000/_upgradeDiv,$SF.Squad.Armoury)>>
<<if $cash >= _cA>> <<if $cash >= _cA>>
[[Upgrade Armory|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.Armoury++, $SF.CreditsInvested += (_cA), cashX(forceNeg(_cA), "specialForcesCap")]] [[Upgrade Armory|Firebase][$SF.Upgrade = 1, $SF.Squad.Armoury++, $SF.CreditsInvested += (_cA), cashX(forceNeg(_cA), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade the Armory.// //Cannot afford to upgrade the Armory.//
<</if>> <</if>>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<<if $SF.Squad.Drugs < App.SF.upgrades.currentUnitMax('Drugs')>> <<if $SF.Squad.Drugs < App.SF.upgrades.currentUnitMax('Drugs')>>
<<set _cDrugs = App.SF.UpgradeCost(40000/_upgradeDiv,$SF.Squad.Drugs)>> <<set _cDrugs = App.SF.UpgradeCost(40000/_upgradeDiv,$SF.Squad.Drugs)>>
<<if $cash >= _cDrugs>> <<if $cash >= _cDrugs>>
[[Upgrade Drug Lab|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.Drugs++, $SF.CreditsInvested += (_cDrugs), cashX(forceNeg(_cDrugs), "specialForcesCap")]] [[Upgrade Drug Lab|Firebase][$SF.Upgrade = 1, $SF.Squad.Drugs++, $SF.CreditsInvested += (_cDrugs), cashX(forceNeg(_cDrugs), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade the Drug Lab.// //Cannot afford to upgrade the Drug Lab.//
<</if>> <</if>>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<<if $SF.Squad.Firebase >= 2 && $SF.Squad.Drones < App.SF.upgrades.currentUnitMax('Drones')>> <<if $SF.Squad.Firebase >= 2 && $SF.Squad.Drones < App.SF.upgrades.currentUnitMax('Drones')>>
<<set _cDrones = App.SF.UpgradeCost(45000/_upgradeDiv,$SF.Squad.Drones)>> <<set _cDrones = App.SF.UpgradeCost(45000/_upgradeDiv,$SF.Squad.Drones)>>
<<if $cash >= _cDrones>> <<if $cash >= _cDrones>>
[[Upgrade Drone Bay|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.Drones++, $SF.CreditsInvested += (_cDrones), cashX(forceNeg(_cDrones), "specialForcesCap")]] [[Upgrade Drone Bay|Firebase][$SF.Upgrade = 1, $SF.Squad.Drones++, $SF.CreditsInvested += (_cDrones), cashX(forceNeg(_cDrones), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade the Drone Bay.// //Cannot afford to upgrade the Drone Bay.//
<</if>> <</if>>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<<if $SF.Squad.AV < App.SF.upgrades.currentUnitMax('AV')>> <<if $SF.Squad.AV < App.SF.upgrades.currentUnitMax('AV')>>
<<set _cAV = App.SF.UpgradeCost(60000/_upgradeDiv,$SF.Squad.AV)>> <<set _cAV = App.SF.UpgradeCost(60000/_upgradeDiv,$SF.Squad.AV)>>
<<if $cash >= _cAV>> <<if $cash >= _cAV>>
[[Upgrade Attack Vehicle Fleet|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.AV++, $SF.CreditsInvested += (_cAV), cashX(forceNeg(_cAV), "specialForcesCap")]] [[Upgrade Attack Vehicle Fleet|Firebase][$SF.Upgrade = 1, $SF.Squad.AV++, $SF.CreditsInvested += (_cAV), cashX(forceNeg(_cAV), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade the Attack Vehicle Fleet.// //Cannot afford to upgrade the Attack Vehicle Fleet.//
<</if>> <</if>>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<<if $SF.Squad.TV < App.SF.upgrades.currentUnitMax('TV')>> <<if $SF.Squad.TV < App.SF.upgrades.currentUnitMax('TV')>>
<<set _cTV = App.SF.UpgradeCost(60000/_upgradeDiv,$SF.Squad.TV)>> <<set _cTV = App.SF.UpgradeCost(60000/_upgradeDiv,$SF.Squad.TV)>>
<<if $cash >= _cTV>> <<if $cash >= _cTV>>
[[Upgrade Transport Vehicle Fleet|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.TV++, $SF.CreditsInvested += (_cTV), cashX(forceNeg(_cTV), "specialForcesCap")]] [[Upgrade Transport Vehicle Fleet|Firebase][$SF.Upgrade = 1, $SF.Squad.TV++, $SF.CreditsInvested += (_cTV), cashX(forceNeg(_cTV), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade Transport Vehicle Fleet.// //Cannot afford to upgrade Transport Vehicle Fleet.//
<</if>> <</if>>
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<<if $SF.Squad.PGT < _PGTU>> <<if $SF.Squad.PGT < _PGTU>>
<<set _cPGT = App.SF.UpgradeCost(735000/_upgradeDiv,$SF.Squad.PGT)>> <<set _cPGT = App.SF.UpgradeCost(735000/_upgradeDiv,$SF.Squad.PGT)>>
<<if $cash >= _cPGT>> <<if $cash >= _cPGT>>
[[Upgrade Prototype Goliath tank|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.PGT++, $SF.CreditsInvested += (_cPGT), cashX(forceNeg(_cPGT), "specialForcesCap")]] [[Upgrade Prototype Goliath tank|Firebase][$SF.Upgrade = 1, $SF.Squad.PGT++, $SF.CreditsInvested += (_cPGT), cashX(forceNeg(_cPGT), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade Prototype Goliath Tank.// //Cannot afford to upgrade Prototype Goliath Tank.//
<</if>> <</if>>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<<if $SF.Squad.AA < App.SF.upgrades.currentUnitMax('AA')>> <<if $SF.Squad.AA < App.SF.upgrades.currentUnitMax('AA')>>
<<set _cAA = App.SF.UpgradeCost(70000/_upgradeDiv,$SF.Squad.AA)>> <<set _cAA = App.SF.UpgradeCost(70000/_upgradeDiv,$SF.Squad.AA)>>
<<if $cash >= _cAA>> <<if $cash >= _cAA>>
[[Upgrade Attack Aircraft Fleet|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.AA++, $SF.CreditsInvested += (_cAA), cashX(forceNeg(_cAA), "specialForcesCap")]] [[Upgrade Attack Aircraft Fleet|Firebase][$SF.Upgrade = 1, $SF.Squad.AA++, $SF.CreditsInvested += (_cAA), cashX(forceNeg(_cAA), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade Attack Aircraft Fleet.// //Cannot afford to upgrade Attack Aircraft Fleet.//
<</if>> <</if>>
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<<if $SF.Squad.TA < App.SF.upgrades.currentUnitMax('TA')>> <<if $SF.Squad.TA < App.SF.upgrades.currentUnitMax('TA')>>
<<set _cTA = App.SF.UpgradeCost(70000/_upgradeDiv,$SF.Squad.TA)>> <<set _cTA = App.SF.UpgradeCost(70000/_upgradeDiv,$SF.Squad.TA)>>
<<if $cash >= _cTA>> <<if $cash >= _cTA>>
[[Upgrade Transport Aircraft Fleet|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.TA++, $SF.CreditsInvested += (_cTA), cashX(forceNeg(_cTA), "specialForcesCap")]] [[Upgrade Transport Aircraft Fleet|Firebase][$SF.Upgrade = 1, $SF.Squad.TA++, $SF.CreditsInvested += (_cTA), cashX(forceNeg(_cTA), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade the Transport Aircraft Fleet.// //Cannot afford to upgrade the Transport Aircraft Fleet.//
<</if>> <</if>>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<<if $SF.Squad.SpacePlane < _SPU>> <<if $SF.Squad.SpacePlane < _SPU>>
<<set _cSP = App.SF.UpgradeCost(250000/_upgradeDiv,$SF.Squad.SpacePlane)>> <<set _cSP = App.SF.UpgradeCost(250000/_upgradeDiv,$SF.Squad.SpacePlane)>>
<<if $cash >= _cSP>> <<if $cash >= _cSP>>
[[Upgrade Spaceplane|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.SpacePlane++, $SF.CreditsInvested += (_cSP), cashX(forceNeg(_cSP), "specialForcesCap")]] [[Upgrade Spaceplane|Firebase][$SF.Upgrade = 1, $SF.Squad.SpacePlane++, $SF.CreditsInvested += (_cSP), cashX(forceNeg(_cSP), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade the Spaceplane.// //Cannot afford to upgrade the Spaceplane.//
<</if>> <</if>>
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
<<if $SF.Squad.GunS < _GunSU>> <<if $SF.Squad.GunS < _GunSU>>
<<set _cGunS = App.SF.UpgradeCost(350000/_upgradeDiv,$SF.Squad.GunS)>> <<set _cGunS = App.SF.UpgradeCost(350000/_upgradeDiv,$SF.Squad.GunS)>>
<<if $cash >= _cGunS>> <<if $cash >= _cGunS>>
[[Upgrade Gunship|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.GunS++, $SF.CreditsInvested += (_cGunS), cashX(forceNeg(_cGunS), "specialForcesCap")]] [[Upgrade Gunship|Firebase][$SF.Upgrade = 1, $SF.Squad.GunS++, $SF.CreditsInvested += (_cGunS), cashX(forceNeg(_cGunS), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade Gunship.// //Cannot afford to upgrade Gunship.//
<</if>> <</if>>
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
<<if $SF.Squad.Satellite < _SatU && $SF.SatLaunched < 1>> <<if $SF.Squad.Satellite < _SatU && $SF.SatLaunched < 1>>
<<set _cSat = App.SF.UpgradeCost(525000/_upgradeDiv,$SF.Squad.Satellite)>> <<set _cSat = App.SF.UpgradeCost(525000/_upgradeDiv,$SF.Squad.Satellite)>>
<<if $cash >= _cSat>> <<if $cash >= _cSat>>
[[Upgrade Satellite|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.Satellite++, $SF.CreditsInvested += (_cSat), cashX(forceNeg(_cSat), "specialForcesCap")]] [[Upgrade Satellite|Firebase][$SF.Upgrade = 1, $SF.Squad.Satellite++, $SF.CreditsInvested += (_cSat), cashX(forceNeg(_cSat), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade Satellite.// //Cannot afford to upgrade Satellite.//
<</if>> <</if>>
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
<<if $SF.Squad.GiantRobot < _GRU>> <<if $SF.Squad.GiantRobot < _GRU>>
<<set _cGR = App.SF.UpgradeCost(550000/_upgradeDiv,$SF.Squad.GiantRobot)>> <<set _cGR = App.SF.UpgradeCost(550000/_upgradeDiv,$SF.Squad.GiantRobot)>>
<<if $cash >= _cGR>> <<if $cash >= _cGR>>
[[Upgrade Giant Robot|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.GiantRobot++, $SF.CreditsInvested += (_cGR), cashX(forceNeg(_cGR), "specialForcesCap")]] [[Upgrade Giant Robot|Firebase][$SF.Upgrade = 1, $SF.Squad.GiantRobot++, $SF.CreditsInvested += (_cGR), cashX(forceNeg(_cGR), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade the Giant Robot.// //Cannot afford to upgrade the Giant Robot.//
<</if>> <</if>>
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
<<if $SF.Squad.MissileSilo < _MSU>> <<if $SF.Squad.MissileSilo < _MSU>>
<<set _cMS = App.SF.UpgradeCost(565000/_upgradeDiv,$SF.Squad.MissileSilo)>> <<set _cMS = App.SF.UpgradeCost(565000/_upgradeDiv,$SF.Squad.MissileSilo)>>
<<if $cash >= _cMS>> <<if $cash >= _cMS>>
[[Upgrade Cruise Missile|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.MissileSilo++, $SF.CreditsInvested += (_cMS), cashX(forceNeg(_cMS), "specialForcesCap")]] [[Upgrade Cruise Missile|Firebase][$SF.Upgrade = 1, $SF.Squad.MissileSilo++, $SF.CreditsInvested += (_cMS), cashX(forceNeg(_cMS), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade Cruise Missile.// //Cannot afford to upgrade Cruise Missile.//
<</if>> <</if>>
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
<<if $SF.Squad.AircraftCarrier < _ACU>> <<if $SF.Squad.AircraftCarrier < _ACU>>
<<set _cAC = App.SF.UpgradeCost(650000/_upgradeDiv,$SF.Squad.AircraftCarrier)>> <<set _cAC = App.SF.UpgradeCost(650000/_upgradeDiv,$SF.Squad.AircraftCarrier)>>
<<if $cash >= _cAC>> <<if $cash >= _cAC>>
[[Upgrade Aircraft Carrier|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.AircraftCarrier++, $SF.CreditsInvested += (_cAC), cashX(forceNeg(_cAC), "specialForcesCap")]] [[Upgrade Aircraft Carrier|Firebase][$SF.Upgrade = 1, $SF.Squad.AircraftCarrier++, $SF.CreditsInvested += (_cAC), cashX(forceNeg(_cAC), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade Aircraft Carrier.// //Cannot afford to upgrade Aircraft Carrier.//
<</if>> <</if>>
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
<<if $SF.Squad.Sub < _SubU>> <<if $SF.Squad.Sub < _SubU>>
<<set _cSub = App.SF.UpgradeCost(700000/_upgradeDiv,$SF.Squad.Sub)>> <<set _cSub = App.SF.UpgradeCost(700000/_upgradeDiv,$SF.Squad.Sub)>>
<<if $cash >= _cSub>> <<if $cash >= _cSub>>
[[Upgrade Submarine|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.Sub++, $SF.CreditsInvested += (_cSub), cashX(forceNeg(_cSub), "specialForcesCap")]] [[Upgrade Submarine|Firebase][$SF.Upgrade = 1, $SF.Squad.Sub++, $SF.CreditsInvested += (_cSub), cashX(forceNeg(_cSub), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade Submarine// //Cannot afford to upgrade Submarine//
<</if>> <</if>>
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
<<if $SF.Squad.HAT < _HATU>> <<if $SF.Squad.HAT < _HATU>>
<<set _cHAT = App.SF.UpgradeCost(665000/_upgradeDiv,$SF.Squad.HAT)>> <<set _cHAT = App.SF.UpgradeCost(665000/_upgradeDiv,$SF.Squad.HAT)>>
<<if $cash >= _cHAT>> <<if $cash >= _cHAT>>
[[Upgrade Amphibious Transport|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.HAT++, $SF.CreditsInvested += (_cHAT), cashX(forceNeg(_cHAT), "specialForcesCap")]] [[Upgrade Amphibious Transport|Firebase][$SF.Upgrade = 1, $SF.Squad.HAT++, $SF.CreditsInvested += (_cHAT), cashX(forceNeg(_cHAT), "specialForcesCap")]]
<<else>> <<else>>
//Cannot afford to upgrade Amphibious Transport.// //Cannot afford to upgrade Amphibious Transport.//
<</if>> <</if>>
......
src/Mods/SpecialForce/WeeklyChoices.tw
+ 210
− 212
View file @ 9b696f98
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment