diff --git a/sanityCheck b/sanityCheck
index 20311ec27392eac84f387089a32461f989f2bcf6..07d94b78d3a737bfb834e74ef34abdf0d4b99582 100755
--- a/sanityCheck
+++ b/sanityCheck
@@ -86,6 +86,8 @@ $GREP -i -E "\Wa (a|e|i|o|u)." -- src/*.tw | grep -i -vE "\Wa (un|eu|us|ut|on|ur
$GREP -i -E "\Wan (b|c|d|f|g|j|k|l|m|n|p|q|r|s|t|v|w|x|y|z)\w." -- src/*.tw | grep -i -vE "[A-Z]{3}" | myprint "IncorrectArticle"
# Check for $ sign mid-word
$GREP -i "\w$\w" -- src/*.tw | myprint "VarSignMidWord"
+# check for $ sign at beginning of macro
+$GREP '<<\s*\$' -- 'src/*' | myprint "VarSignAtMacroStart"
# Check that we do not have any variables that we use only once. e.g. $onlyUsedOnce
# Ignore *Nationalities
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index b9b1c81578506b44b220d98078336229da9ab793..a3cd4177097343cbbc132baa9ccd8ccbc179c809 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -686,7 +686,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</if>>
<<set _queen = clone($activeSlave)>>
<<AddSlave _queen>> /* skip New Slave Intro */
- <</for>>
<</replace>>
<</link>> // It will cost about ¤500000 to enslave both the Princess and Queen.//
<</if>>
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index 06f46504f29136df5ecff3db475956eec978a6f1..aa33692dc9e3d7b3ea8ba6adbdfe620e27d8ba4d 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -121,7 +121,7 @@ Increase crew comfort and life support systems to increase operational time.
<</if>><</nobr>></div>
/* 11 upgrades */
<div style="margin-left:1em"><<nobr>><<if $securityForceSatalitePower == 1>>
- 'Borrow' an old world satalite.
+ 'Borrowed' an old world satalite.
<<elseif $securityForceSatalitePower == 2>>
A basic satalite 'borrowed' from the old world.
<<elseif $securityForceSatalitePower == 3>>
@@ -155,7 +155,7 @@ Increase crew comfort and life support systems to increase operational time.
<<elseif $securityForceDronePower == 4>>
The drone bay has acted to upgrade both the standard and support models of drones to carry basic electromagnetic weaponry, improving their overall combat effectiveness.
<<elseif $securityForceDronePower == 5>>
- The drone bay has improved the electromagnetic armament of the drones, mounting both miniaturized and heavy railguns on them, and has further sourced numerous other models of drones for uses as diverse as reconnaissance, independent slave capture, and combat swarming tactics.
+ The drone bay has improved the electromagnetic armament of it's drones by mounting both miniaturized and heavy railguns on them. In addition further sourcing numerous models of drones for roles as diverse as reconnaissance, independent slave capture and swarming tactics.
<<elseif $securityForceDronePower == 6>>The drone bay has acquired even lighter advanced armoured combat Drones with electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry, and specialized Drones for reconnaissance, capture, and swarm tactics.
<</if>><</nobr>></div>
/* 7 upgrades */
@@ -177,22 +177,22 @@ Increase crew comfort and life support systems to increase operational time.
The stimulant lab has maximally refined the formulas of higher purity methamphetamine-based stimulants, phenylcyclidine-based dissociatives, and tryptamine-based psychedelics, increasing their effectiveness in all aspects and ensuring that the soldiers of the $securityForceName go into combat wired, aggressive, and euphoric (if needed).
<</if>><</nobr>></div>
/* 7 upgrades */
-<div style="margin-left:1em"><<nobr>><<if $securityForceGiantRobot == 1>>
- 'Borrow' an old world GiantRobot.
+<div style="margin-left:1em"><<nobr>><<if $securityForceGiantRobot == 1 && $terrain != "oceanic" >>
+ 'Borrowed' an old world GiantRobot.
<<elseif $securityForceGiantRobot == 1>>
- Upgrade the GiantRobot's wiring and circuitry.
+ Upgraded the GiantRobot's wiring and circuitry.
<<elseif $securityForceGiantRobot == 2>>
- Upgrade the GiantRobot's power efficency.
+ Upgraded the GiantRobot's power efficency.
<<elseif $securityForceGiantRobot == 3>>
- Reduce the GiantRobot's weight.
+ Reduced the GiantRobot's weight.
<<elseif $securityForceGiantRobot == 4>>
- Upgrade the GiantRobot's battery capacity.
+ Upgraded the GiantRobot's battery capacity.
<<elseif $securityForceGiantRobot == 5>>
- Upgrade the GiantRobot's armour.
+ Upgraded the GiantRobot's armour.
<<elseif $securityForceGiantRobot == 6>>
- Upgrade the GiantRobot's weapons to add heat seeking missiles and a massive long sword in addition to quad 140 inch electromagnetic cannons.
+ Upgraded the GiantRobot's weapons to add heat seeking missiles and a massive long sword in addition to quad 140 inch electromagnetic cannons.
<<elseif $securityForceGiantRobot == 7>>
- Upgrade the GiantRobot to support two pilot's via a synced neural link.
+ Upgraded the GiantRobot to support two pilot's via a synced neural link.
<</if>><</nobr>></div>
//You continue towards the common area, the soldiers you pass nodding respectfully, saluting, or giving slight bows, as they please, to you. You pass the briefing areas, and can see the officers and sergeants of the force conferring over planning tables and display screens regarding their upcoming deployments.//
@@ -525,7 +525,7 @@ Increase crew comfort and life support systems to increase operational time.
<<if $securityForceVehiclePower == 7 && $securityForceInfantryPower == 12 && $securityForceSpacePlanePower == 9 && $securityForceSatalitePower == 11 && $securityForceDronePower == 6 && $securityForceAircraftPower == 7 && $securityForceStimulantPower == 7 && $securityForceArcologyUpgrades == 8>>
- <<if $securityForceGiantRobot < 1 && $securityForceUpgradeToken == 0>>
+ <<if $securityForceGiantRobot < 1 && $securityForceUpgradeToken == 0 && $terrain != "oceanic">>
<<link "Ask The Colonel to 'borrow' a Giant Robot">>
<<replace "#result2">>
"Sure, boss." she says, nodding. "A Giant Robot 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."
@@ -546,6 +546,51 @@ Increase crew comfort and life support systems to increase operational time.
<<elseif $securityForceGiantRobot == 7>>
//The $securityForceName has fully upgraded the GiantRobot to support its activities.//<br>
<</if>>
+
+ <<if $securityForceAircraftCarrier < 1 && $securityForceUpgradeToken == 0 && $terrain == "oceanic">>
+ <<link "Ask The Colonel to 'borrow' a aircraft carrier">>
+ <<replace "#result2">>
+ "Sure, boss." she says, nodding. "A aircraft carrier 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>>
+ <<set $securityForceAircraftCarrier += 1>>
+ <<set $cash -= 1500000>>
+ <</replace>>
+ <</link>> // Costs ¤50000000 //<br>
+ <<elseif $securityForceAircraftCarrier < 5 && $securityForceUpgradeToken == 0>>
+ <<link "Ask The Colonel to upgrade the Aircraft Carrier">>
+ <<replace "#result2">>
+ "Sure, boss." she says, nodding. "Upgrading the aircraft carrier, 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>>
+ <<set $securityForceAircraftCarrier += 1>>
+ <<set $cash -= 25000000>>
+ <</replace>>
+ <</link>> // Costs ¤25000000 //<br>
+ <<elseif $securityForceAircraftCarrier == 5>>
+ //The $securityForceName has fully upgraded the aircraft carrier to support its activities.//<br>
+ <</if>>
+
+ <<if $securityForceSubmarine < 1 && $securityForceUpgradeToken == 0 && $terrain == "oceanic">>
+ <<link "Ask The Colonel to 'borrow' a Submarine">>
+ <<replace "#result2">>
+ "Sure, boss." she says, nodding. "A Submarine 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>>
+ <<set $securityForceSubmarine += 1>>
+ <<set $cash -= 1500000>>
+ <</replace>>
+ <</link>> // Costs ¤50000000 //<br>
+ <<elseif $securityForceSubmarine < 5 && $securityForceUpgradeToken == 0>>
+ <<link "Ask The Colonel to upgrade the Submarine">>
+ <<replace "#result2">>
+ "Sure, boss." she says, nodding. "Upgrading the aircraft carrier, 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>>
+ <<set $securityForceSubmarine += 1>>
+ <<set $cash -= 25000000>>
+ <</replace>>
+ <</link>> // Costs ¤25000000 //<br>
+ <<elseif $securityForceSubmarine == 5>>
+ //The $securityForceName has fully upgraded the Submarine to support its activities.//<br>
+ <</if>>
+
<</if>>
</span>