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/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw
index 163a3c30b1f507bdbec683456a24f7eca2eda1a6..e44c77edaf368deb9d331bf11507af1744a7928b 100644
--- a/src/pregmod/widgets/slaveSummaryWidgets.tw
+++ b/src/pregmod/widgets/slaveSummaryWidgets.tw
@@ -2407,7 +2407,7 @@ _Slave.faceShape face.
<<set _relationshipHandled = 1>>
<</if>>
<</if>>
- <<elseif _Slave.father == -1>>
+ <<elseif _Slave.father == -1 && _Slave.mother != -1>>
Your daughter
<<if _Slave.relationship == -3>>
& wife
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index b9b1c81578506b44b220d98078336229da9ab793..a21480a636264a3a227169bbd85b5a6b58814f80 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -169,7 +169,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</replace>>
<</link>> // Purchasing the goods and hiring the VTOLs will cost about ¤35000.//
<<else>>
- //You lack the necessary funds to enslave a crown prince.//
+ <br>//You lack the necessary funds to enslave a crown prince.//
<</if>>
<<if $securityForceActive > 1>>
<br><<link "Dispatch $securityForceName on a night time raid to acquire the crown prince. You will despised for this action and trade will be greatly damaged.">>
@@ -325,7 +325,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</replace>>
<</link>> // You will need to utilize a sizable portion of your reputation and ¤100000 to enslave them.//
<<else>>
- //You lack the necessary funds and reputation to enslave both the crown prince and princess.//
+ <br>//You lack the necessary funds and reputation to enslave both the crown prince and princess.//
<</if>>
<<if $securityForceActive > 1>>
<br><<link "Dispatch $securityForceName on a night time raid to acquire both the prince and princess. You will despised for this action and trade will be greatly damaged.">>
@@ -482,7 +482,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</replace>>
<</link>> // It will cost about ¤25000 to enslave them.//
<<else>>
- //You lack the necessary funds to enslave a handful of court ladies.//
+ <br>//You lack the necessary funds to enslave a handful of court ladies.//
<</if>>
<<if $securityForceActive > 1>>
<br><<link "Dispatch $securityForceName on a night time raid to acquire a handful of court ladies. You will disliked for this action and trade will be damaged".>>
@@ -588,7 +588,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</replace>>
<</link>> // It will cost about ¤15000 to enslave her.//
<<else>>
- //You lack the necessary funds to enslave a queen.//
+ <br>//You lack the necessary funds to enslave a queen.//
<</if>>
<<if $cash >= 500000>>
@@ -638,7 +638,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.father = $missingParentID>>
<<set $missingParentID-->>
<<else>>
- <<set $activeSlave.relation = "mother">>
+ <<set $activeSlave.relation = "daughter">>
<<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
<</if>>
<<set _princess = clone($activeSlave)>>
@@ -681,14 +681,15 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.mother = 0>>
<<set $activeSlave.father = 0>>
<<else>>
- <<set $activeSlave.relation = "daughter">>
+ <<set $activeSlave.relation = "mother">>
<<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
<</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.//
+<<else>>
+ <br>//You lack the necessary funds and reputation to enslave both the crown prince and princess.//
<</if>>
<<if $securityForceActive > 1>>
<br><<link "Dispatch $securityForceName on a night time raid to acquire both the Princess and Queen. You will despised for this action and trade will be greatly damaged.">>
@@ -738,7 +739,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.father = $missingParentID>>
<<set $missingParentID-->>
<<else>>
- <<set $activeSlave.relation = "mother">>
+ <<set $activeSlave.relation = "daughter">>
<<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
<</if>>
<<set _princess = clone($activeSlave)>>
@@ -781,7 +782,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.mother = 0>>
<<set $activeSlave.father = 0>>
<<else>>
- <<set $activeSlave.relation = "daughter">>
+ <<set $activeSlave.relation = "mother">>
<<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
<</if>>
<<set _queen = clone($activeSlave)>>
@@ -1217,7 +1218,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</for>>
<</replace>>
<</link>> // It will cost about ¤2500000 to enslave the entire court.//
-<<else>>
- //You lack the necessary funds to enslave the entire court.//
+<<elseif $familyTesting == 1>>
+ <br>//You lack the necessary funds to enslave the entire court.//
<</if>>
</span>
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index 06f46504f29136df5ecff3db475956eec978a6f1..52cd39e6f7ab7658d75aa85b5aa866cbd8789418 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' an 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>
diff --git a/src/uncategorized/securityForceProposal.tw b/src/uncategorized/securityForceProposal.tw
index 088f3deeb3e1068cd362bc52cd727fa2296a5720..c0dc66b3898f1bedab5e144226c408bb60da2544 100644
--- a/src/uncategorized/securityForceProposal.tw
+++ b/src/uncategorized/securityForceProposal.tw
@@ -17,18 +17,18 @@ Such a force would solve many problems. More soldiers would mean more control, w
''This is a unique and very important opportunity'', and is possible only because of your recent victory over the Daughters. If you do not seize it, the memories and fears of your citizens will fade, and you will not be able to raise the matter again.
--------------------
<<set $securityForceEventSeen = 1>>
+<<if ($PC.warfare >= 100)>>
+ <<set _price = 10000>>
+<<elseif ($PC.warfare >= 50) || ($PC.career == "arcology owner")>>
+ <<set _price = 15000>>
+<<else>>
+ <<set _price = 20000>>
+<</if>>
<span id="result">
<<link "Prepare for an announcement">>
<<replace "#result">>
You instruct $assistantName to announce to the arcology's citizenry that you will be making an important announcement in the near future regarding the security situation. Given the damage still present from the Daughters' attack, everyone will be turning in. You also instruct your assistant to begin quietly investigating potential leadership figures for the force itself.
<<set $securityForceCreate = 1>>
- <<if ($PC.warfare >= 100)>>
- <<set _price = 10000>>
- <<elseif ($PC.warfare >= 50) || ($PC.career == "arcology owner")>>
- <<set _price = 15000>>
- <<else>>
- <<set _price = 20000>>
- <</if>>
<<set $cash -= _price>>
<<set $nextButton = "Continue">>
<</replace>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 4b58082949f4e8e1f1bcf67464c3d5fff2ded517..f7ec8980069f264c32bd27966d8383c7daeacf0b 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -4182,7 +4182,7 @@ $pronounCap has
<<elseif $activeSlave.muscles > 30>>
and $possessive fit body barely allows $object to manage $possessive gigantic belly.
<<else>>
- and $possessive is dwarfed by $possessive pregnancy. While $pronoun can keep barely $possessive gigantic belly off the floor, it takes a considerable amount of effort to do so.<<if $activeSlave.amp == 0>> $pronounCap requires assistance to get to $possessive feet<<if $saleDescription == 0>>, and uses a wheeled stand to support $possessive pregnancy when $pronoun must walk anywhere<</if>>.<</if>>
+ and $pronoun is dwarfed by $possessive pregnancy. While $pronoun can keep barely $possessive gigantic belly off the floor, it takes a considerable amount of effort to do so.<<if $activeSlave.amp == 0>> $pronounCap requires assistance to get to $possessive feet<<if $saleDescription == 0>>, and uses a wheeled stand to support $possessive pregnancy when $pronoun must walk anywhere<</if>>.<</if>>
<</if>>
<<if $activeSlave.weight > 190>>
$possessiveCap massively fat belly is stretched to the limit, so much so $possessive folds are pulled flat. $possessiveCap pregnancy is covered in an ever thinning layer of fat, save for the bulging upper portion where $possessive fat is thinnest. In that, rather large, area, you can just make out the many babies bulging $possessive stomach.
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index c718f3f8f951f83875ffa45255a49cc3311f17be..6f1ca22b881f5da327e21088d0f49e19c69aacf7 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -1624,7 +1624,7 @@
<<set $SEnunciate = "S">>
<<set $ssEnunciate = "ss">>
<<set $cEnunciate = "c">>
- <<set $cEnunciate = "cc">>
+ <<set $ccEnunciate = "cc">>
<<set $zEnunciate = "z">>
<</if>>
<</widget>>