diff --git a/devNotes/twine JS b/devNotes/twine JS
index 0096138c994100f65b3c5b8b510780891c4dcfc5..e0330415f3b2c009596d449b8feae7bea60fb48c 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -293,7 +293,7 @@ window.canImpreg = function(slave1, slave2) {
window.isFertile = function(slave) {
if (!slave) {
return null;
- } else if (slave.womb.length > 0 || slave.broodmother > 0) { /* currently pregnant or broodmother */
+ } else if (slave.preg > 0 || slave.broodmother > 0) { /* currently pregnant or broodmother */
return false;
} else if (slave.preg < -1) { /* sterile */
return false;
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index b98205536d1e182870175d3d160de9ffd006c312..d45c47bda36842c52fc8a3fd940e97404772c200 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -291,7 +291,6 @@ window.canImpreg = function(slave1, slave2) {
/* contraceptives (.preg == -1) do not negate this function */
window.isFertile = function(slave) {
-
if (!slave) {
return null;
}
diff --git a/src/pregmod/SecForceEX/SpecialForceBarracksCheatEdit.tw b/src/pregmod/SecForceEX/SpecialForceBarracksCheatEdit.tw
index bdcbca4e6286dbf9fcb70b0d9bc4c3c30849f9fd..854c2049ac16706a3b29ed0c635de9a951786499 100644
--- a/src/pregmod/SecForceEX/SpecialForceBarracksCheatEdit.tw
+++ b/src/pregmod/SecForceEX/SpecialForceBarracksCheatEdit.tw
@@ -5,60 +5,60 @@
__Values__
Upgrades: $SFAO/_max
-''Barracks:'' <<textbox "$securityForceArcologyUpgrades" $securityForceArcologyUpgrades "SFMSpecialForceBarracksCheatEditBarracks">>
+''Barracks:'' <<textbox "$securityForceArcologyUpgrades" $securityForceArcologyUpgrades "SpecialForceBarracksCheatEdit">>
<br>Max: _BarracksMax
-''FacilitySupport:'' <<textbox "$FacilitySupport" $FacilitySupport "SFMSpecialForceBarracksCheatEditBarracks">>
+''FacilitySupport:'' <<textbox "$FacilitySupport" $FacilitySupport "SpecialForceBarracksCheatEdit">>
-''Armory:'' <<textbox "$securityForceInfantryPower" $securityForceInfantryPower "SFMSpecialForceBarracksCheatEditBarracks">>
+''Armory:'' <<textbox "$securityForceInfantryPower" $securityForceInfantryPower "SpecialForceBarracksCheatEdit">>
<br>Max: _ArmouryMax
-''Stimulant Lab:'' <<textbox "$securityForceStimulantPower" $securityForceStimulantPower "SFMSpecialForceBarracksCheatEditBarracks">>
+''Stimulant Lab:'' <<textbox "$securityForceStimulantPower" $securityForceStimulantPower "SpecialForceBarracksCheatEdit">>
<br>Max: _StimulantLabMax
<<if _Garage > 0 && $securityForceArcologyUpgrades >= 1>>
''Garage:''
- ''LightAndMedium:'' <<textbox "$securityForceVehiclePower" $securityForceVehiclePower "SFMSpecialForceBarracksCheatEditBarracks">>
+ ''LightAndMedium:'' <<textbox "$securityForceVehiclePower" $securityForceVehiclePower "SpecialForceBarracksCheatEdit">>
<br>Max: _LightAndMediumVehiclesMax
- ''HeavyBattleTank:'' <<textbox "$securityForceHeavyBattleTank" $securityForceHeavyBattleTank "SFMSpecialForceBarracksCheatEditBarracks">>
+ ''HeavyBattleTank:'' <<textbox "$securityForceHeavyBattleTank" $securityForceHeavyBattleTank "SpecialForceBarracksCheatEdit">>
<br>Max: _HeavyBattleTankMax
<</if>>
<<if $securityForceArcologyUpgrades >= 4>>
''Hangar:''
- ''Aircraft:'' <<textbox "$securityForceAircraftPower" $securityForceAircraftPower "SFMSpecialForceBarracksCheatEditBarracks">>
+ ''Aircraft:'' <<textbox "$securityForceAircraftPower" $securityForceAircraftPower "SpecialForceBarracksCheatEdit">>
<br>Max: _AircraftMax
- 'Space Plane'': <<textbox "$securityForceSpacePlanePower" $securityForceSpacePlanePower "SFMSpecialForceBarracksCheatEditBarracks">>
+ ''Space Plane'': <<textbox "$securityForceSpacePlanePower" $securityForceSpacePlanePower "SpecialForceBarracksCheatEdit">>
<br>Max: _SpacePlaneMax
- ''Fortress Zeppelin:'' <<textbox "$securityForceFortressZeppelin" $securityForceFortressZeppelin "SFMSpecialForceBarracksCheatEditBarracks">>
+ ''Fortress Zeppelin:'' <<textbox "$securityForceFortressZeppelin" $securityForceFortressZeppelin "SpecialForceBarracksCheatEdit">>
<br>Max: _FortressZeppelinMax
- ''AC130:'' <<textbox "$securityForceAC130" $securityForceAC130 "SFMSpecialForceBarracksCheatEditBarracks">>
+ ''AC130:'' <<textbox "$securityForceAC130" $securityForceAC130 "SpecialForceBarracksCheatEdit">>
<br>Max: _AC130Max
- ''Heavy Transport:'' <<textbox "$securityForceHeavyTransport" $securityForceHeavyTransport "SFMSpecialForceBarracksCheatEditBarracks">>
+ ''Heavy Transport:'' <<textbox "$securityForceHeavyTransport" $securityForceHeavyTransport "SpecialForceBarracksCheatEdit">>
<br>Max: _heavyTransportMax
<</if>>
- ''DroneBay:'' <<textbox "$securityForceDronePower" $securityForceDronePower "SFMSpecialForceBarracksCheatEditBarracks">>
+ ''DroneBay:'' <<textbox "$securityForceDronePower" $securityForceDronePower "SpecialForceBarracksCheatEdit">>
<br>Max: _DroneBayMax
<<if (_LaunchBayNO > 0 || _LaunchBayO > 0) && $securityForceArcologyUpgrades >= 4>>
''LauchBay:''
<<if $terrain != "oceanic" && $terrain != "marine">>
- ''Satellite:'' <<textbox "$securityForceSatellitePower" $securityForceSatellitePower "SFMSpecialForceBarracksCheatEditBarracks">>
+ ''Satellite:'' <<textbox "$securityForceSatellitePower" $securityForceSatellitePower "SpecialForceBarracksCheatEdit">>
<br>Max: _SatelliteMax
- ''GiantRobot:'' <<textbox "$securityForceGiantRobot" $securityForceGiantRobot "SFMSpecialForceBarracksCheatEditBarracks">>
+ ''GiantRobot:'' <<textbox "$securityForceGiantRobot" $securityForceGiantRobot "SpecialForceBarracksCheatEdit">>
<br>Max: _GiantRobotMax
- ''MissileSilo:'' <<textbox "$securityForceMissileSilo" $securityForceMissileSilo "SFMSpecialForceBarracksCheatEditBarracks">>
+ ''MissileSilo:'' <<textbox "$securityForceMissileSilo" $securityForceMissileSilo "SpecialForceBarracksCheatEdit">>
<br>Max: _MissileSiloMax
<<elseif $terrain == "oceanic" || $terrain == "marine">>
- ''Satellite:'' <<textbox "$securityForceSatellitePower" $securityForceSatellitePower "SFMSpecialForceBarracksCheatEditBarracks">>
+ ''Satellite:'' <<textbox "$securityForceSatellitePower" $securityForceSatellitePower "SpecialForceBarracksCheatEdit">>
<br>Max: _SatelliteMax
<</if>>
<</if>>
@@ -66,12 +66,12 @@ Upgrades: $SFAO/_max
<<if $terrain == "oceanic" || $terrain == "marine">>
''Naval Yard:''
- ''AircraftCarrier:'' <<textbox "$securityForceAircraftCarrier" $securityForceAircraftCarrier "SFMSpecialForceBarracksCheatEditBarracks">>
+ ''AircraftCarrier:'' <<textbox "$securityForceAircraftCarrier" $securityForceAircraftCarrier "SpecialForceBarracksCheatEdit">>
<br>Max: _AircraftCarrierMax
- ''Submarine:'' <<textbox "$securityForceSubmarine" $securityForceSubmarine "SFMSpecialForceBarracksCheatEditBarracks">>
+ ''Submarine:'' <<textbox "$securityForceSubmarine" $securityForceSubmarine "SpecialForceBarracksCheatEdit">>
<br>Max: _SubmarineMax
- ''Amphibious Transport:'' <<textbox "$securityForceHeavyAmphibiousTransport" $securityForceHeavyAmphibiousTransport "SFMSpecialForceBarracksCheatEditBarracks">>
+ ''Amphibious Transport:'' <<textbox "$securityForceHeavyAmphibiousTransport" $securityForceHeavyAmphibiousTransport "SpecialForceBarracksCheatEdit">>
<br>Max: _HeavyAmphibiousTransportMax
<</if>>
\ No newline at end of file
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
index d3409f3d6664d7a94870a6a6cd9e34ec9c05ff01..c6b18ddafd3379ab948f8956b626a1c1ff7de4be 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
@@ -1,9 +1,9 @@
:: SpecialForceUpgradeOptions [nobr]
-<<set _costDebuff = .25>>
+<<set _costDebuff = 1>>
<<HSM>>
<<if ($SFAO < _max) && $securityForceUpgradeToken == 0>>
<span id="resultX">
- Which facility or equipment do you wish _Name to upgrade this week?
+ <br>Which facility or equipment do you wish _Name to upgrade this week?
<<if _Barracks < 1 || _Barracks < 2 || _Barracks < 4>><br> More barracks upgrades are required to unlock further options.<</if>>
<<if $securityForceUpgradeToken == 0 && _Barracks < 5>>
@@ -16,27 +16,27 @@
<<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades < _BarracksMax && $TierTwoUnlock == 1>>
<<switch _Barracks>>
<<case 5>>
- <<set _arcCost = 15000000>>
+ <<set _arcCost = 1500000>>
<<case 6>>
- <<set _arcCost = 20000000>>
+ <<set _arcCost = 2000000>>
<<case 7>>
- <<set _arcCost = 35000000>>
+ <<set _arcCost = 3500000>>
<<case 8>>
- <<set _arcCost = 55000000>>
+ <<set _arcCost = 5500000>>
<<case 9>>
- <<set _arcCost = 125000000>>
+ <<set _arcCost = 1250000>>
<<case 10>>
- <<set _arcCost = 350000000>>
+ <<set _arcCost = 3500000>>
<<case 11>>
- <<set _arcCost = 600000000>>
+ <<set _arcCost = 6000000>>
<<case 12>>
- <<set _arcCost = 2500000000>>
+ <<set _arcCost = 25000000>>
<<case 13>>
- <<set _arcCost = 5000000000>>
+ <<set _arcCost = 50000000>>
<<case 14>>
- <<set _arcCost = 6000000000>>
+ <<set _arcCost = 60000000>>
<<case 15>>
- <<set _arcCost = 16000000000>>
+ <<set _arcCost = 95000000>>
<</switch>>
<br><<link "Barracks">>
<<replace "#resultX">><br>
@@ -68,9 +68,9 @@
<br><<link "Facility Support">>
<<replace "#resultX">><br>
"Sure, boss." she says, nodding. "Creating a specialised area for any slaves you send to assist us will benefical to everyone."
- <<set $securityForceUpgradeToken = 1, $FacilitySupport++, $cash -= Math.trunc(150000000*(Math.max(0.99,$SFAO)/10)*$Env*_costDebuff)>>
+ <<set $securityForceUpgradeToken = 1, $FacilitySupport++, $cash -= Math.trunc(15000000*(Math.max(0.99,$SFAO)/10)*$Env*_costDebuff)>>
<</replace>>
- <</link>> // Costs <<print cashFormat(Math.trunc(150000000*(Math.max(0.99,$SFAO)/10)*$Env)*_costDebuff)>> //
+ <</link>> // Costs <<print cashFormat(Math.trunc(15000000*(Math.max(0.99,$SFAO)/10)*$Env)*_costDebuff)>> //
<</if>>
*/
@@ -85,9 +85,9 @@
<br><<link "Armoury">>
<<replace "#resultX">><br>
"Sure, boss." she says, nodding. "The boys'll like having some new guns and armour to help them out there." She laughs. "Don't think the poor bastards they'll be shooting will thank you though." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceInfantryPower++, $cash -= 4500000*$Env*_costDebuff>>
+ <<set $securityForceUpgradeToken = 1, $securityForceInfantryPower++, $cash -= 450000*$Env*_costDebuff>>
<</replace>>
- <</link>> // Costs <<print cashFormat(4500000*$Env*_costDebuff)>> //
+ <</link>> // Costs <<print cashFormat(450000*$Env*_costDebuff)>> //
<</if>>
<<if _Armoury == _ArmouryMax>>
<br>//$securityForceName has fully upgraded the armoury to support it's activities.//
@@ -103,22 +103,22 @@
<<elseif $securityForceUpgradeToken == 0 && _StimulantLab < _StimulantLabMax && $TierTwoUnlock == 1>>
<<switch _StimulantLab>>
<<case 5>>
- <<set _drugCost = 1265000>>
+ <<set _drugCost = 126500>>
<<case 6>>
- <<set _drugCost = 2265000>>
+ <<set _drugCost = 226500>>
<<case 7>>
- <<set _drugCost = 200000000000>>
+ <<set _drugCost = 20000000>>
<<case 8>>
- <<set _drugCost = 250000000000>>
+ <<set _drugCost = 25000000>>
<<case 9>>
- <<set _drugCost = 350000000000>>
+ <<set _drugCost = 35000000>>
<</switch>>
<br><<link "Stimulant Lab">>
<<replace "#resultX">><br>
"Sure, boss." she says, nodding. "The boys are going to like hearing that they'll be getting new stims. Some of them can't get enough." She laughs, sweeping her arm at a corner of the throne, where dozens of empty stimulant injectors are piled. "I might be one of them. Either way, the fucks out there aren't going to like us once we're on the new juice." She picks up a tablet and taps a few commands on it. "I'll get right on it."
<<set $securityForceUpgradeToken = 1, $securityForceStimulantPower++, $cash -= _drugCost*$Env*_costDebuff>>
<</replace>>
- <</link>> // Costs <<print cashFormat(_drugCost*$Env)>> //
+ <</link>> // Costs <<print cashFormat(_drugCost*$Env*_costDebuff)>> //
<<elseif $securityForceUpgradeToken == 0 && _StimulantLab == 7 && _Armoury >= 11 && $securityForceVehiclePower >= 7 && $securityForceAircraftPower >= 8 && $securityForceSpacePlanePower >= 11 && $securityForceFortressZeppelin >= 3 && $securityForceAC130 >= 5 && _DroneBay >= 6 && $securityForceSatellitePower >= 16 && _Barracks >= 13>>
<br><<link "Stimulant Lab">>
<<replace "#resultX">><br>
@@ -135,7 +135,7 @@
<br><<link "Garage">>
<<replace "#resultX">>
<span id="resultB">
- "Which unit do you wish to upgrade or 'borrow'?"
+ <br>"Which unit do you wish to upgrade or 'borrow'?"
<<link "Go back">>
<<goto "SFM Barracks">>
<</link>>
@@ -149,11 +149,11 @@
<</link>>// Costs <<print cashFormat(60000*$Env*_costDebuff)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceVehiclePower < _LightAndMediumVehiclesMax && $TierTwoUnlock == 1>>
<<if $securityForceVehiclePower < 6>>
- <<set _vehCost = 2500000>>
+ <<set _vehCost = 250000>>
<<elseif $securityForceVehiclePower == 6>>
- <<set _vehCost = 3000000>>
+ <<set _vehCost = 300000>>
<<elseif $securityForceVehiclePower == 7>>
- <<set _vehCost = 4900000>>
+ <<set _vehCost = 490000>>
<</if>>
<br><<link "Light and medium vehicles">>
<<replace "#resultB">><br>
@@ -170,14 +170,14 @@
<br><<link "A heavy battle tank">>
<<replace "#resultB">><br>
"Sure, boss." she says, nodding. "A heavy battle tank should help a lot." She laughs. "The scum out there don't seem to like it when we roll up on them in something better than their piece of shit junkers." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceHeavyBattleTank++, $cash -= 60000000*$Env*_costDebuff>>
+ <<set $securityForceUpgradeToken = 1, $securityForceHeavyBattleTank++, $cash -= 6000000*$Env*_costDebuff>>
<</replace>>
- <</link>>// Costs <<print cashFormat(60000000*$Env*_costDebuff)>> //
+ <</link>>// Costs <<print cashFormat(6000000*$Env*_costDebuff)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceHeavyBattleTank >= 1 && $securityForceHeavyBattleTank < _HeavyBattleTankMax>>
<<if $securityForceHeavyBattleTank < 2>>
- <<set _hbtCost = 75000000>>
+ <<set _hbtCost = 7500000>>
<<elseif $securityForceHeavyBattleTank == 2>>
- <<set _hbtCost = 8500000>>
+ <<set _hbtCost = 850000>>
<</if>>
<br><<link "heavy battle tank">>
<<replace "#resultB">><br>
@@ -200,7 +200,7 @@
<br><<link "Hangar">>
<<replace "#resultX">>
<span id="resultY">
- "Which unit do you wish to upgrade or 'borrow'?"
+ <br>"Which unit do you wish to upgrade or 'borrow'?"
<<link "Go back">>
<<goto "SFM Barracks">>
<</link>>
@@ -215,15 +215,15 @@
<<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftPower < _AircraftMax && $TierTwoUnlock == 1>>
<<switch $securityForceAircraftPower>>
<<case 5>>
- <<set _airCost = 2750000>>
+ <<set _airCost = 275000>>
<<case 6>>
- <<set _airCost = 3250000>>
+ <<set _airCost = 325000>>
<<case 7>>
- <<set _airCost = 5750000>>
+ <<set _airCost = 575000>>
<<case 8>>
- <<set _airCost = 6750000>>
+ <<set _airCost = 675000>>
<<case 9>>
- <<set _airCost = 7750000>>
+ <<set _airCost = 775000>>
<</switch>>
<br><<link "Light and medium aircraft">>
<<replace "#resultY">><br>
@@ -240,30 +240,30 @@
<br><<link "A space plane">>
<<replace "#resultY">><br>
"Sure, boss." she says, nodding. "A orbital plane should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= 4750000*$Env*$HackingSkillMultiplier*_costDebuff>>
+ <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= 475000*$Env*$HackingSkillMultiplier*_costDebuff>>
<</replace>>
- <</link>> // Costs <<print cashFormat(4750000*$Env*$HackingSkillMultiplier*_costDebuff)>> //
+ <</link>> // Costs <<print cashFormat(475000*$Env*$HackingSkillMultiplier*_costDebuff)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceSpacePlanePower >= 1 && $securityForceSpacePlanePower < _SpacePlaneMax>>
<<if $securityForceSpacePlanePower < 4>>
- <<set _spCost = 50000000>>
+ <<set _spCost = 5000000>>
<<elseif $securityForceSpacePlanePower == 4>>
- <<set _spCost = 75000000>>
+ <<set _spCost = 7500000>>
<<elseif $securityForceSpacePlanePower == 5>>
- <<set _spCost = 85000000>>
+ <<set _spCost = 8500000>>
<<elseif $securityForceSpacePlanePower == 6>>
- <<set _spCost = 95000000>>
+ <<set _spCost = 9500000>>
<<elseif $securityForceSpacePlanePower == 7>>
- <<set _spCost = 125000000>>
+ <<set _spCost = 1250000>>
<<elseif $securityForceSpacePlanePower == 8>>
- <<set _spCost = 175000000>>
+ <<set _spCost = 1750000>>
<<elseif $securityForceSpacePlanePower == 9 && $securityForceInfantryPower >= 10>>
- <<set _spCost = 250000000>>
+ <<set _spCost = 2500000>>
<<elseif $securityForceSpacePlanePower == 10>>
- <<set _spCost = 350000000>>
+ <<set _spCost = 3500000>>
<<elseif $securityForceSpacePlanePower == 10>>
- <<set _spCost = 650000000>>
+ <<set _spCost = 6500000>>
<<elseif $securityForceSpacePlanePower == 11>>
- <<set _spCost = 950000000>>
+ <<set _spCost = 9500000>>
<</if>>
<br><<link "Space plane">>
<<replace "#resultY">><br>
@@ -280,15 +280,15 @@
<br><<link "A fortress zeppelin">>
<<replace "#resultY">><br>
"Sure, boss." she says, nodding. "A fortress zeppelin would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceFortressZeppelin++, $cash -= 30000000*$Env*_costDebuff>>
- <</replace>><</link>> // Costs <<print cashFormat(30000000*$Env*_costDebuff)>> //
+ <<set $securityForceUpgradeToken = 1, $securityForceFortressZeppelin++, $cash -= 3000000*$Env*_costDebuff>>
+ <</replace>><</link>> // Costs <<print cashFormat(3000000*$Env*_costDebuff)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceFortressZeppelin >= 1 && $securityForceFortressZeppelin < _FortressZeppelinMax>>
<br><<link "Fortress zeppelin">>
<<replace "#resultY">><br>
"Sure, boss." she says, nodding. "Upgrading the Fortress Zeppelin, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceFortressZeppelin++, $cash -= 20000000*$Env*_costDebuff>>
+ <<set $securityForceUpgradeToken = 1, $securityForceFortressZeppelin++, $cash -= 2000000*$Env*_costDebuff>>
<</replace>>
- <</link>> // Costs <<print cashFormat( 20000000*$Env*_costDebuff)>> //
+ <</link>> // Costs <<print cashFormat( 2000000*$Env*_costDebuff)>> //
<</if>>
<<if $securityForceFortressZeppelin == _FortressZeppelinMax>>
<br>//$securityForceName has fully upgraded the fortress zeppelin to support it's activities.//
@@ -298,16 +298,16 @@
<br><<link "An AC-130">>
<<replace "#resultY">><br>
"Sure, boss." she says, nodding. "An AC-130 would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 35000000*$Env*$HackingSkillMultiplier*_costDebuff>>
+ <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 3500000*$Env*$HackingSkillMultiplier*_costDebuff>>
<</replace>>
- <</link>> // Costs <<print cashFormat(35000000*$Env*$HackingSkillMultiplier*_costDebuff)>> //
+ <</link>> // Costs <<print cashFormat(3500000*$Env*$HackingSkillMultiplier*_costDebuff)>> //
<<elseif $securityForceAC130 >= 1 && $securityForceAC130 < _AC130Max>>
<br><<link "AC-130">>
<<replace "#resultY">><br>
"Sure, boss." she says, nodding. "Upgrading the AC-130, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 25000000*$Env*$HackingSkillMultiplier*_costDebuff>>
+ <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 2500000*$Env*$HackingSkillMultiplier*_costDebuff>>
<</replace>>
- <</link>> // Costs <<print cashFormat(25000000*$Env*$HackingSkillMultiplier*_costDebuff)>> //
+ <</link>> // Costs <<print cashFormat(2500000*$Env*$HackingSkillMultiplier*_costDebuff)>> //
<</if>>
<<if $securityForceAC130 == _AC130Max>>
<br>//$securityForceName has fully upgraded the AC-130 to support it's activities.//
@@ -317,15 +317,15 @@
<br><<link "A heavy transport">>
<<replace "#resultY">><br>
"Sure, boss." she says, nodding. "A heavy transport would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceHeavyTransport++, $cash -= 40000000*$Env*_costDebuff>>
- <</replace>><</link>> // Costs <<print cashFormat(40000000*$Env*_costDebuff)>> //
+ <<set $securityForceUpgradeToken = 1, $securityForceHeavyTransport++, $cash -= 4000000*$Env*_costDebuff>>
+ <</replace>><</link>> // Costs <<print cashFormat(4000000*$Env*_costDebuff)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceHeavyTransport >= 1 && $securityForceHeavyTransport < _heavyTransportMax>>
<br><<link "Heavy transport">>
<<replace "#resultY">><br>
"Sure, boss." she says, nodding. "Upgrading the heavy transport, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceHeavyTransport++, $cash -= 30000000*$Env*_costDebuff>>
+ <<set $securityForceUpgradeToken = 1, $securityForceHeavyTransport++, $cash -= 3000000*$Env*_costDebuff>>
<</replace>>
- <</link>> // Costs <<print cashFormat( 30000000*$Env*_costDebuff)>> //
+ <</link>> // Costs <<print cashFormat( 3000000*$Env*_costDebuff)>> //
<</if>>
<<if $securityForceHeavyTransport == _heavyTransportMax>>
<br>//$securityForceName has fully upgraded the heavy transport to support it's activities.//
@@ -360,7 +360,7 @@
<br><<link "Launch Bay">>
<<replace "#resultX">>
<span id="resultZ">
- "Which unit do you wish to upgrade or 'borrow'?"
+ <br>"Which unit do you wish to upgrade or 'borrow'?"
<<link "Go back">>
<<goto "SFM Barracks">>
<</link>>
@@ -375,25 +375,25 @@
<<elseif $securityForceUpgradeToken == 0 && $securityForceSatellitePower >= 1 && $securityForceSatellitePower < _SatelliteMax>>
<<switch $securityForceSatellitePower>>
<<case 11>>
- <<set _satCost = 150000000>>
+ <<set _satCost = 1500000>>
<<case 12>>
- <<set _satCost = 160000000>>
+ <<set _satCost = 1600000>>
<<case 13>>
- <<set _satCost = 170000000>>
+ <<set _satCost = 1700000>>
<<case 14>>
- <<set _satCost = 180000000>>
+ <<set _satCost = 1800000>>
<<case 15>>
- <<set _satCost = 190000000>>
+ <<set _satCost = 1900000>>
<<case 16>>
- <<set _satCost = 250000000000>>
+ <<set _satCost = 25000000>>
<<case 17>>
- <<set _satCost = 250000000000>>
+ <<set _satCost = 25000000>>
<<case 18>>
- <<set _satCost = 300000000000>>
+ <<set _satCost = 30000000>>
<<case 19>>
- <<set _satCost = 450000000000>>
+ <<set _satCost = 45000000>>
<<case 20 && $PC.hacking >= 75>>
- <<set _satCost = 550000000000>>
+ <<set _satCost = 55000000>>
<<default>>
<<set _satCost = 2350000>>
<</switch>>
@@ -425,36 +425,34 @@
<<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot >= 1 && $securityForceGiantRobot < _GiantRobotMax>>
<<if $securityForceGiantRobot < 3>>
<<set _robCost = 25000000>>
- <<elseif $securityForceGiantRobot == 9 && $securityForceInfantryPower >= 10>>
- <<set _robCost = 2750000000>>
<</if>>
<<switch $securityForceGiantRobot>>
<<case 3>>
- <<set _robCost = 45000000>>
+ <<set _robCost = 4500000>>
<<case 4>>
- <<set _robCost = 45000000>>
+ <<set _robCost = 4500000>>
<<case 5>>
- <<set _robCost = 65000000>>
+ <<set _robCost = 6500000>>
<<case 6>>
- <<set _robCost = 85000000>>
+ <<set _robCost = 8500000>>
<<case 7>>
- <<set _robCost = 95000000>>
+ <<set _robCost = 9500000>>
<<case 8>>
- <<set _robCost = 105000000>>
+ <<set _robCost = 1050000>>
<<case 9 && $securityForceInfantryPower >= 10>>
- <<set _robCost = 255000000>>
+ <<set _robCost = 27500000>>
<<case 10>>
- <<set _robCost = 3150000000>>
+ <<set _robCost = 3150000>>
<<case 11>>
- <<set _robCost = 3200000000>>
+ <<set _robCost = 3200000>>
<<case 12>>
- <<set _robCost = 4550000000>>
+ <<set _robCost = 4550000>>
<<case 13>>
- <<set _robCost = 6550000000>>
+ <<set _robCost = 6550000>>
<<case 14>>
- <<set _robCost = 8550000000>>
+ <<set _robCost = 8550000>>
<<case 15 $PC.hacking >= 75>>
- <<set _robCost = 9550000000>>
+ <<set _robCost = 9550000>>
<</switch>>
<br><<link "Giant robot">>
<<replace "#resultZ">><br>
@@ -478,14 +476,14 @@
<br><<link "A missile silo">>
<<replace "#resultZ">><br>
"Sure, boss." she says, nodding. "A missile silo would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= 200000000*$Env*$HackingSkillMultiplier*_costDebuff>>
+ <<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= 20000000*$Env*$HackingSkillMultiplier*_costDebuff>>
<</replace>>
- <</link>> // Costs <<print cashFormat(200000000*$Env*$HackingSkillMultiplier*_costDebuff)>> //
+ <</link>> // Costs <<print cashFormat(20000000*$Env*$HackingSkillMultiplier*_costDebuff)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceMissileSilo >= 1 && $securityForceMissileSilo < _MissileSiloMax>>
<<if $securityForceMissileSilo == 1>>
- <<set _msCost = 250000000>>
+ <<set _msCost = 2500000>>
<<elseif $securityForceMissileSilo == 2>>
- <<set _msCost = 295000000>>
+ <<set _msCost = 2950000>>
<</if>>
<br><<link "Missile silo">>
<<replace "#resultZ">><br>
@@ -506,7 +504,7 @@
<br><<link "Naval Yard">>
<<replace "#resultX">>
<span id="resultA">
- "Which unit do you wish to upgrade or 'borrow'?"
+ <br>"Which unit do you wish to upgrade or 'borrow'?"
<<link "Go back">>
<<goto "SFM Barracks">>
<</link>>
@@ -539,13 +537,13 @@
<</link>> // Costs <<print cashFormat(1500000*$Env*$HackingSkillMultiplier*_costDebuff)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceSubmarine >= 1 && $securityForceSubmarine < _SubmarineMax>>
<<if $securityForceSubmarine < 4>>
- <<set _subCost = 25000000>>
+ <<set _subCost = 2500000>>
<<elseif $securityForceSubmarine == 4>>
- <<set _subCost = 85000000>>
+ <<set _subCost = 8500000>>
<<elseif $securityForceSubmarine == 5>>
- <<set _subCost = 86500000>>
+ <<set _subCost = 8650000>>
<<elseif $securityForceSubmarine == 6 && $PC.hacking >= 75>>
- <<set _subCost = 87800000>>
+ <<set _subCost = 8780000>>
<</if>>
<br><<link "Submarine">>
<<replace "#resultA">><br>
@@ -573,15 +571,15 @@
<<elseif $securityForceUpgradeToken == 0&& $securityForceHeavyAmphibiousTransport >= 1 && $securityForceHeavyAmphibiousTransport < _HeavyAmphibiousTransportMax>>
<<switch $securityForceHeavyAmphibiousTransport>>
<<case 1>>
- <<set _hatCost = 150000000>>
+ <<set _hatCost = 1500000>>
<<case 2>>
- <<set _hatCost = 250000000>>
+ <<set _hatCost = 2500000>>
<<case 3>>
- <<set _hatCost = 300000000>>
+ <<set _hatCost = 3000000>>
<<case 4>>
- <<set _hatCost = 350000000>>
+ <<set _hatCost = 3500000>>
<<case 5>>
- <<set _hatCost = 400000000>>
+ <<set _hatCost = 4000000>>
<</switch>>
<br><<link "Heavy amphibious transport">>
<<replace "#resultA">><br>
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index 4fdaf78ec3c64263282f646805879aee9343045f..2eaaa3d8e240ba21552b54e40ef5990c3a43068b 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -162,7 +162,7 @@
<</link>> <br>It will cost 5% of your currently displayed cash, which is <<print cashFormat(Math.trunc(_securityForceUpgradeResetTokenCurrentCost))>>.
<</if>>
<<if $securityForceUpgradeTokenReset >= 1>>
- <br>Total multi week $securityForceName upgrades: $securityForceUpgradeTokenReset <br><br>
+ <br>Total multi week $securityForceName upgrades: $securityForceUpgradeTokenReset <br>
<</if>>
<<include "SpecialForceUpgradeOptions">>