diff --git a/sanityCheck b/sanityCheck
index 7e6d1711b1bd4d8dc910a9acbff9a25e8252cd85..a7ad1576db3c08e6dfb89972522a538e35afb5ed 100755
--- a/sanityCheck
+++ b/sanityCheck
@@ -50,7 +50,7 @@ $GREP "<<[^<>]*[<>]\?[^<>]*>>>" -- "src/*.tw" | myprint "TooManyAngleBrackets"
# Check for too many <<<. e.g.: <<</if>>
$GREP "<<<[^<>]*[<>]\?[^<>]*>>" -- "src/*.tw" | myprint "TooManyAngleBrackets"
# Check for wrong capitalization on 'activeslave' and other common typos
-$GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\|setBellySize\|SetbellySize\|setbellySize\)" -- "src/*" | myprint "WrongCapitilization"
+$GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\|setBellySize\|SetbellySize\|setbellySize\|bellypreg\|bellyimplant\|bellyfluid\)" -- "src/*" | myprint "WrongCapitilization"
$GREP "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\)" -- 'src/*' | myprint "SpellCheck"
$GREP "\$slave\[" -- 'src/*' | myprint "ShouldBeSlaves"
# Check for strange spaces e.g. $slaves[$i]. lips
diff --git a/src/uncategorized/pMercenaries.tw b/src/uncategorized/pMercenaries.tw
index b9c09ffc7cba8d42bc97fbb6b312530854c5ad34..0a483bcbc0de96886477158419a0728ed1d1558f 100644
--- a/src/uncategorized/pMercenaries.tw
+++ b/src/uncategorized/pMercenaries.tw
@@ -19,18 +19,32 @@ The budgetary difficulty many old world countries are in has resulted in unemplo
<<replace "#result">>
You hire some reputable mercenaries, kit them in excellent gear, and quarter them in $arcologies[0].name. The sight of armed men on patrol has @@.red;offended some of the more free-spirited citizens@@ of $arcologies[0].name.
<<set $rep -= 500>>
- <<set $cash -= 5000>>
+ <<if ($PC.warfare >= 100)>>
+ <<set _price = 2500>>
+ <<elseif ($PC.warfare >= 50)>>
+ <<set _price = 3500>>
+ <<else>>
+ <<set _price = 5000>>
+ <</if>>
+ <<set $cash -= _price>>
<<set $mercenaries = 1>>
<</replace>>
-<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤5000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤5000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 50) || ($PC.career == "arcology owner")>>//This will cost ¤_price and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤5000 and incur significant upkeep costs//<</if>>
<br><<link "Install a full platoon">>
<<replace "#result">>
- You hire a full platoon of reputable mercenaries and a veteran officer to command them, kit them in excellent gear, and quarter them in $arcologies[0].name. The sight of many armed men on patrol has @@.red;deeply offended some of the more free-spirited citizens@@ of $arcologies[0].name.
+ You hire a full platoon of reputable mercenaries with a veteran officer to command them, kit them in excellent gear, and quarter them in $arcologies[0].name. The sight of many armed men on patrol has @@.red;deeply offended some of the more free-spirited citizens@@ of $arcologies[0].name.
<<set $rep -= 1000>>
- <<set $cash -= 10000>>
+ <<if ($PC.warfare >= 100)>>
+ <<set _price = 5000>>
+ <<elseif ($PC.warfare >= 50)>>
+ <<set _price = 7500>>
+ <<else>>
+ <<set _price = 10000>>
+ <</if>>
+ <<set $cash -= _price>>
<<set $mercenaries = 3>>
<</replace>>
-<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤10000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤10000 and incur significant upkeep costs//<</if>>
+<</link>> <<if ($PC.warfare >= 50) || ($PC.career == "arcology owner")>>//This will cost ¤_price and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤10000 and incur significant upkeep costs//<</if>>
<br><<link "Do not quarter troops in your arcology">>
<<replace "#result">>
Having armed men on permanent watch is a step too far. $arcologies[0].name's security systems are formidable and will have to serve.
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index 31b6f1d38ed1a28657f38689372ff2c1920d3338..4d3f909cb37ef17b64cffd819bac156689be6b58 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -303,7 +303,7 @@ but look what I have here! I just acquired her recently. Lovely, isn't she? I kn
<<set $activeSlave.boobs = 800>>
<<set $activeSlave.weight = -20>>
<<case "Physical Idealism">>
- She's going to learn to enjoy youself. I'm going to force her face full of food, her cunt full of dicks and discover her deepest, darkest desires. Wouldn't you like that, <<SlaveFullName $activeSlave>>?" The slave begins to sob. To start, how about a weigh in? Sixty three and a half kilograms, such a pity, but don't worry, I'll have her nice and plump soon enough.
+ She's going to learn to enjoy youself. I'm going to force her face full of food, her cunt full of dicks and discover her deepest, darkest desires. Wouldn't you like that, <<SlaveFullName $activeSlave>>?" The slave begins to sob. "To start, how about a weigh in? Sixty three and a half kilograms, such a pity, but don't worry, I'll have her nice and plump soon enough."
<<set $activeSlave.boobs = 200>>
<<set $activeSlave.butt = 1>>
<<set $activeSlave.weight = -20>>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index e25e9a0fd30dc01ecae6f464806f9cc6fe6d4b15..27657f623659b1d073338c1ef010aa783ebfcb7d 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -42,6 +42,7 @@
<</if>>
<<if $slaves[$i].anus != 0 && canDoAnal($slaves[$i])>>
<<if $slaves[$i].vagina != 0 && canDoVaginal($slaves[$i])>>
+ <<if $slaves[$i].belly < 2000>>
<<if $slaves[$i].combatSkill == 0>>
<<if $slaves[$i].muscles <= 30>>
<<set $RESimpleAssaultIDs.push($slaves[$i].ID)>>
@@ -49,6 +50,7 @@
<</if>>
<</if>>
<</if>>
+ <</if>>
<<else>>
<<if $slaves[$i].boobs > 3000>>
<<set $REBoobCollisionSubIDs.push($slaves[$i].ID)>>
@@ -94,12 +96,14 @@
<<if $slaves[$i].assignment == "work in the dairy" || $slaves[$i].assignment == "get milked">>
<<if $slaves[$i].balls>>
<<if $slaves[$i].dick>>
+ <<if $slaves[$i].vasectomy == 0 && $slaves[$i].ballType == "human">>
<<if canDoAnal($slaves[$i])>>
<<set $RECockmilkInterceptionIDs.push($slaves[$i].ID)>>
<</if>>
<</if>>
<</if>>
<</if>>
+ <</if>>
<</if>>
<</for>>
@@ -129,7 +133,8 @@
<<if $universalRulesConsent == 1>>
<<if $eventSlave.devotion > 20>>
<<if $eventSlave.energy > 40>>
-<<if canAchieveErection($eventSlave)>>
+<<if canPenetrate($eventSlave)>>
+<<if canSee($eventSlave)>>
<<if $eventSlave.releaseRules != "restrictive">>
<<set $RETSevent.push("interslave begging")>>
<</if>>
@@ -138,6 +143,7 @@
<</if>>
<</if>>
<</if>>
+<</if>>
<<if $familyTesting == 0>>
<<if $eventSlave.devotion > 20>>
@@ -152,7 +158,7 @@
<</if>>
<</if>>
<<else>>
- <<if $eventSlave.devotion > 20 && ($eventSlave.sexualQuirk == "perverted" || $eventSlave.energy > 80) && $eventSlave.lactation > 0 && $eventSlave.releaseRules != "restrictive" && $eventSlave.daughters > 0>>
+ <<if $eventSlave.devotion > 20 && ($eventSlave.sexualQuirk == "perverted" || $eventSlave.energy > 80) && $eventSlave.belly < 100000 && $eventSlave.lactation > 0 && $eventSlave.releaseRules != "restrictive" && $eventSlave.daughters > 0>>
<<set $RETSevent.push("incestuous nursing")>>
<</if>>
<</if>>
@@ -555,7 +561,7 @@
<<set $RETSevent.push("if you enjoy it")>>
<</if>>
<<if $RESimpleAssaultIDs.length > 0>>
- <<if canAchieveErection($eventSlave)>>
+ <<if canPenetrate($eventSlave)>>
<<set $RETSevent.push("simple assault")>>
<</if>>
<</if>>
diff --git a/src/uncategorized/reFullBed.tw b/src/uncategorized/reFullBed.tw
index 2b604c421f74fe0174ce5ba22e8ecd3796b8ad5d..9e717e4a80ced7a3cc2c941e6a0e5f7dd2b7e34d 100644
--- a/src/uncategorized/reFullBed.tw
+++ b/src/uncategorized/reFullBed.tw
@@ -102,22 +102,22 @@ Today was an unusually relaxing day, and you aren't particularly tired.
<<set $vaginalTotal += 2>>
<<set $slaves[_bedSlaveOne].analCount++>>
<<set $analTotal++>>
- <<KnockMeUp $slaves[_bedSlaveOne] 10 2 -1>>
+ <<KnockMeUp $slaves[_bedSlaveOne] 10 2 -1 1>>
<<else>>
<<set $slaves[_bedSlaveOne].analCount += 3>>
<<set $analTotal += 3>>
- <<KnockMeUp $slaves[_bedSlaveOne] 15 1 -1>>
+ <<KnockMeUp $slaves[_bedSlaveOne] 15 1 -1 1>>
<</if>>
<<if canDoVaginal(_bedSlaveTwo)>>
<<set $slaves[_bedSlaveTwo].vaginalCount += 2>>
<<set $vaginalTotal += 2>>
<<set $slaves[_bedSlaveTwo].analCount++>>
<<set $analTotal++>>
- <<KnockMeUp $slaves[_bedSlaveTwo] 10 2 -1>>
+ <<KnockMeUp $slaves[_bedSlaveTwo] 10 2 -1 1>>
<<else>>
<<set $slaves[_bedSlaveTwo].analCount += 3>>
<<set $analTotal += 3>>
- <<KnockMeUp $slaves[_bedSlaveTwo] 15 1 -1>>
+ <<KnockMeUp $slaves[_bedSlaveTwo] 15 1 -1 1>>
<</if>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/securityForceProposal.tw b/src/uncategorized/securityForceProposal.tw
index d7a85a2e2aef85d852b909bdd5d935d9a88ead6e..088f3deeb3e1068cd362bc52cd727fa2296a5720 100644
--- a/src/uncategorized/securityForceProposal.tw
+++ b/src/uncategorized/securityForceProposal.tw
@@ -22,10 +22,17 @@ Such a force would solve many problems. More soldiers would mean more control, w
<<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>>
- <<set $cash -= 20000>>
+ <<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>>
-<</link>> //Initial costs are ¤20000, and upon establishment force will have significant support costs until it is self-sufficient.//
+<</link>> //Initial costs are ¤_price, and upon establishment force will have significant support costs until it is self-sufficient.//
<<link "The mercenaries are enough">>
<<replace "#result">>
On second thought, such a force is not needed. Your methods have served well so far - why should there be any change going forward?
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 7c9d7fb7d9fc990e11956520f37c815d22028f44..913676d2833952fc1cfaada92a11078eb57d1d74 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -246,7 +246,11 @@
beating a rebellious slave across the buttocks.
<</if>>
<<case "live with your Head Girl">>
- is getting the Head Girl's suite cleaned up while $HeadGirl.slaveName is out working.
+ <<if $HeadGirl != 0>>
+ is getting the Head Girl's suite cleaned up while $HeadGirl.slaveName is out working.
+ <<else>>
+ is making sure the Head Girl's suite is in order for your next Head Girl.
+ <</if>>
<<case "be the Stewardess">>
is managing the house servants in $servantsQuartersName: she overseeing the laboring house slaves and punishing any that step out of line.
<<case "be the Schoolteacher">>