diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 579ba6ae6c235153c6a1bfdc7ed4eb98b9da19bd..1342cedb0711246cff669bd194e61d60fad566b8 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,13 @@ Pregmod
0.10.7.1-2.2.x
+03/15/2019
+
+ 5
+ -fixes
+ -code cleaning
+ -CSS tweaks to intro summary
+
03/13/2019
4
diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw
index fa1ea2cb75d41e53694e63fd5b91c38ab5e39897..fa8f160352cdc1947a9315b08861cb499b8cedb1 100644
--- a/src/SecExp/securityReport.tw
+++ b/src/SecExp/securityReport.tw
@@ -14,6 +14,7 @@
<<set _crimeCap = 0>>
<<set _newCrime = 0>>
<<set _recruits = 0>>
+<<set _recruitsMultiplier = 1>>
<<set _newMercs = 0>>
<<if $useTabs == 0>> <br>__Security__<</if>>
@@ -286,127 +287,113 @@
<strong> Military</strong>: /* militia */
<<if $SF.Toggle && $SF.Active >= 1 && $SF.Size > 10>>
Having a powerful special force attracts a lot of citizens, hopeful that they may be able to fight along side it.
- <<set _recruits += random(0,(Math.round($SF.Size/10)))>>
+ <<set _recruitsMultiplier *= 1 + (random(0, (Math.round($SF.Size / 10))) / 20)>> /* not sure how high $SF.Size goes, so I hope this makes sense */
<</if>>
<<if $propCampaign >= 1 && $propFocus == "recruitment">>
<<if $RecuriterOffice == 0 || $Recruiter == 0>>
<<if $propCampaignBoost == 1>>
- <<set _recruits += 2>>
+ <<set _recruitsMultiplier *= 1.1>>
<<else>>
- <<set _recruits += 1>>
+ <<set _recruitsMultiplier *= 1.05>>
<</if>>
<<else>>
<<setLocalPronouns $Recruiter>>
''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is able to further boost your militia recruitment campaign from $his PR hub office.
<<if $propCampaignBoost == 1>>
- <<set _recruits += 4+Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/32)>>
+ <<set _recruitsMultiplier *= 1.2+Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/650)>>
<<else>>
- <<set _recruits += 3+Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/32)>>
+ <<set _recruitsMultiplier *= 1.15+Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/650)>>
<</if>>
<</if>>
<</if>>
<<if $recruitVolunteers == 1>>
Your militia accepts only volunteering citizens, ready to defend their arcology.
- <<set _recruits = random(1,2)>>
+ <<set _recruitLimit = 0.02>>
<<if $rep >= 10000>>
Many citizens volunteer just to fight for someone of your renown.
- <<set _recruits += 1>>
+ <<set _recruitLimit += 0.0025>>
<</if>>
<<if $authority >= 10000>>
Many citizens feel it is their duty to fight for you, boosting volunteer enrollment.
- <<set _recruits += 1>>
+ <<set _recruitLimit += 0.0025>>
<</if>>
<<if $lowerRquirements == 1>>
Your lax physical requirements to enter the militia allows for a greater number of citizens to join.
- <<set _recruits += 1>>
- <</if>>
- <<if $militiaTotalManpower - $militiaTotalCasualties + _recruits <= 0.02 * $ACitizens>>
- <<set $militiaTotalManpower += _recruits>>
- <<set $militiaFreeManpower += _recruits>>
- This week <<print _recruits>> citizens joined the militia.
- <<else>>
- There are not many more citizens willing to join the arcology armed forces. You'll need to enact higher recruitment edicts if you need more manpower.
+ <<set _recruitLimit += 0.0025>>
<</if>>
<<elseif $conscription == 1>>
Adult citizens are required to join the militia for a period of time.
- <<set _recruits = random(3,5)>>
+ <<set _recruitLimit = 0.05>>
<<if $militaryExemption == 1>>
Some citizens prefer to contribute to the arcology's defense through financial support rather than military service, making you @@.yellowgreen;a small sum@@.
- <<set _recruits -= random(1,2)>>
+ <<set _recruitLimit -= 0.005>>
<<run cashX(250, "securityExpansion")>>
<</if>>
<<if $lowerRquirements == 1>>
Your lax physical requirements to enter the militia allows for a greater number of citizens to join.
- <<set _recruits += 1>>
+ <<set _recruitLimit += 0.005>>
<</if>>
<<if $noSubhumansInArmy == 1>>
Guaranteeing the purity of your armed forces comes with a small loss of potential recruits.
- <<set _recruits -= random(0,1)>>
+ <<set _recruitLimit -= 0.005>>
<</if>>
<<if $pregExemption == 1>>
Many pregnant citizens prefer to avoid military service not to endanger themselves and their children.
- <<set _recruits -= 1>>
- <</if>>
- <<if $militiaTotalManpower - $militiaTotalCasualties + _recruits <= 0.05 * $ACitizens>>
- <<set $militiaTotalManpower += _recruits>>
- <<set $militiaFreeManpower += _recruits>>
- This week <<print _recruits>> citizens joined the militia.
- <<else>>
- There are not many more citizens able to join the arcology armed forces. You'll need to enact higher recruitment edicts if you need more manpower.
+ <<set _recruitLimit -= 0.005>>
<</if>>
<<elseif $militaryService == 1>>
Adult citizens are required to register and serve in the militia whenever necessary.
- <<set _recruits = random(5,7)>>
+ <<set _recruitLimit = 0.1>>
<<if $militaryExemption == 1>>
Some citizens prefer to contribute to the arcology's defense through financial support rather than military service, making you @@.yellowgreen;a small sum@@.
- <<set _recruits -= random(1,2)>>
+ <<set _recruitLimit -= 0.01>>
<<run cashX(250, "securityExpansion")>>
<</if>>
<<if $lowerRquirements == 1>>
Your lax physical requirements to enter the militia allows for a greater number of citizens to join.
- <<set _recruits += 1>>
+ <<set _recruitLimit += 0.01>>
<</if>>
<<if $noSubhumansInArmy == 1>>
Guaranteeing the purity of your armed forces comes with a small loss of potential recruits.
- <<set _recruits -= random(0,1)>>
+ <<set _recruitLimit -= 0.01>>
<</if>>
<<if $pregExemption == 1>>
Many pregnant citizens prefer to avoid military service not to endanger themselves and their children.
- <<set _recruits -= 1>>
- <</if>>
- <<if $militiaTotalManpower - $militiaTotalCasualties + _recruits <= 0.10 * $ACitizens>>
- <<set $militiaTotalManpower += _recruits>>
- <<set $militiaFreeManpower += _recruits>>
- This week <<print _recruits>> citizens joined the militia.
- <<else>>
- There are not many more citizens able to join the arcology armed forces. You'll need to enact higher recruitment edicts if you need more manpower.
+ <<set _recruitLimit -= 0.01>>
<</if>>
<<elseif $militarizedSociety == 1>>
Every citizen is required to train and participate in the military activities of the arcology.
- <<set _recruits = random(7,9)>>
+ <<set _recruitLimit = 0.2>>
<<if $militaryExemption == 1>>
Some citizens prefer to contribute to the arcology's defense through financial support rather than military service, making you @@.yellowgreen;a small sum@@.
- <<set _recruits -= random(1,2)>>
+ <<set _recruitLimit -= 0.02>>
<<run cashX(250, "securityExpansion")>>
<</if>>
<<if $lowerRquirements == 1>>
Your lax physical requirements to enter the militia allows for a greater number of citizens to join.
- <<set _recruits += 1>>
+ <<set _recruitLimit += 0.02>>
<</if>>
<<if $noSubhumansInArmy == 1>>
Guaranteeing the purity of your armed forces comes with a small loss of potential recruits.
- <<set _recruits -= random(0,1)>>
+ <<set _recruitLimit -= 0.02>>
<</if>>
<<if $pregExemption == 1>>
Many pregnant citizens prefer to avoid military service not to endanger themselves and their children.
- <<set _recruits -= 1>>
+ <<set _recruitLimit -= 0.02>>
<</if>>
- <<if $militiaTotalManpower - $militiaTotalCasualties + _recruits <= 0.20 * $ACitizens>>
+ <</if>>
+ <<if $militiaFounded == 1>>
+ <<set _recruits = Math.trunc((_recruitLimit * $ACitizens - ($militiaTotalManpower - $militiaTotalCasualties)) / 20 * _recruitsMultiplier)>>
+ <<if _recruits > 0>>
<<set $militiaTotalManpower += _recruits>>
<<set $militiaFreeManpower += _recruits>>
This week <<print _recruits>> citizens joined the militia.
+ <<elseif $militarizedSociety == 1>>
+ No citizens joined your militia this week because your society is as militarized as it can get.
+ <<elseif $recruitVolunteers == 1>>
+ There are no more citizens willing to join the arcology armed forces. You'll need to enact higher recruitment edicts if you need more manpower.
<<else>>
- There are not many more citizens able to join the arcology armed forces. You'll need to enact higher recruitment edicts if you need more manpower.
+ No more citizens could be drafted into your militia. You'll need to enact higher recruitment edicts if you need more manpower.
<</if>>
<br>
<</if>>
diff --git a/src/npc/newSlaveIncestSex.tw b/src/npc/newSlaveIncestSex.tw
index 122276c759b7b549971a4822f2837970adfbdfbb..d8e7d90ee98c17682cb6af8f5271878d04ea0209 100644
--- a/src/npc/newSlaveIncestSex.tw
+++ b/src/npc/newSlaveIncestSex.tw
@@ -2,6 +2,26 @@
<br><br>
+
+<<set _clothesTemp = $relative.clothes, $relative.clothes = "no clothing">>
+<<set _clothesTemp2 = $relative2.clothes, $relative2.clothes = "no clothing">>
+<span id="artFrame">
+/* 000-250-006 */
+<<if $seeImages == 1>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $relative 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $relative2 2 0>>
+ </div>
+ </div>
+<</if>>
+/* 000-250-006 */
+</span>
+<<set $relative.clothes = _clothesTemp>>
+<<set $relative2.clothes = _clothesTemp2>>
+
/* setup pronouns (switch on vagina for sisters and herms regardless of genes) */
<<set _oneshe = "she" >>
<<set _oneher = "her" >>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 7b6c2e8570ff9e1dcef99c0d75c2c060a1374a43..1782a92a1dbba2c2c71632f71532950206700a66 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -6710,7 +6710,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<set $activeSlave.trust -= 5>>
<<= AnalVCheck()>>
<</replace>>
-<</link>><<if ($activeSlave.anus == 0)>> //This option will take virginity//<</if>>
+<</link>><<if ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>>
<<case "spa boobs">>
@@ -6739,7 +6739,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<= AnalVCheck(2)>>
<<set $activeSlave.devotion += 4>>
<</replace>>
-<</link>><<if ($activeSlave.anus == 0)>> //This option will take virginity//<</if>>
+<</link>><<if ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>>
<br><<link "Fuck $him under the water">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 807bd8fe6217a903557543553a87063360f2c19e..da831561c4af5a8a87153eeef9478a93da6ce54b 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1580,5 +1580,7 @@ Your ''business assistant'' manages the menial slave market.
<br>
<span id="food">
- <<include "Food Report">>
+ <<if $foodMarket > 0>>
+ <<include "Food Report">>
+ <</if>>
</span>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 4fdb66d998953489ff483d327c1a5addaf550239..ccea849c4b07599ca5e75600094a737fa2591f33 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -510,17 +510,33 @@ Work on $his chest:
<<elseif ($activeSlave.amp == 1)>><<print $activeSlave.boobs>>cc <<print either("breasts", "mammaries", "tits", "udders")>> fill out an enormous custom bra; $his tits dominate $his entire frame.
<<else>><<print $activeSlave.boobs>>cc <<print either("breasts", "mammaries", "tits", "udders")>> fill out an enormous custom bra; $his tits dominate $his entire frame.
<</if>>
+
+
+
+<br>
+$He has
+<<if $activeSlave.boobsImplant > 0>>
<<if $activeSlave.boobsImplant > 600>>
- $He has <<print $activeSlave.boobsImplant>>cc fillable breast implants.
+ <<print $activeSlave.boobsImplant>>cc
<<elseif $activeSlave.boobsImplant > 400>>
- $He has large, <<print $activeSlave.boobsImplant>>cc breast implants.
+ large, <<print $activeSlave.boobsImplant>>cc
<<elseif $activeSlave.boobsImplant > 200>>
- $He has moderate, <<print $activeSlave.boobsImplant>>cc breast implants.
+ moderate, <<print $activeSlave.boobsImplant>>cc
<<elseif $activeSlave.boobsImplant > 0>>
- $He has small, <<print $activeSlave.boobsImplant>>cc breast implants.
+ small, <<print $activeSlave.boobsImplant>>cc
<</if>>
-
-<br>
+ <<if $activeSlave.boobsImplantType == 1>>
+ string
+ <<else>>
+ fillable
+ <</if>>
+ breast implants.
+ <<if $activeSlave.boobsImplant > 8000 && $activeSlave.boobsImplantType == 1>>
+ @@.yellow;Large string based implants are a risk to a slave's health.@@
+ <</if>>
+<<else>>
+ no implants.
+<</if>>
<<if $activeSlave.boobs > 50000>>
//$His breasts are as large as $he can physically support//
<<elseif $activeSlave.boobsImplant > 10000 && $arcologies[0].FSTransformationFetishistResearch != 1 && $activeSlave.boobsImplantType != 1>>
@@ -556,6 +572,7 @@ Work on $his chest:
<<elseif $activeSlave.boobsImplant > 0 && $activeSlave.boobsImplantType != 1>>
[[Standard implants|Surgery Degradation][$activeSlave.boobsImplant = 400,$activeSlave.boobs += 200,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "boobs"]] | [[Large implants|Surgery Degradation][$activeSlave.boobsImplant = 600,$activeSlave.boobs += 400,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "boobs"]]
<</if>>
+
<<if $activeSlave.boobsImplant != 0>>
<<if $activeSlave.boobsImplantType == 1 && $activeSlave.boobsImplant > 400>>
<<if $activeSlave.boobsImplant > 8000>>
@@ -888,16 +905,32 @@ $He's got a
<<else>>ridiculous ass. It's so big it jiggles as $he walks.
<</if>>
-<<if $activeSlave.buttImplant == 1>>
- $He has moderate butt implants.
-<<elseif $activeSlave.buttImplant == 2>>
- $He has enormous butt implants.
-<<elseif $activeSlave.buttImplant > 2>>
+<<if $activeSlave.buttImplant > 0>>
$He has
+ <<if $activeSlave.buttImplant == 1>>
+ moderate
+ <<elseif $activeSlave.buttImplant == 2>>
+ enormous
+ <<elseif $activeSlave.buttImplant > 2>>
+ <<if $activeSlave.buttImplantType == 1>>
+ massively engorged
+ <<else>>
+ <<if $activeSlave.buttImplant > 8>>
+ hyper
+ <<elseif $activeSlave.buttImplant > 4>>
+ advanced
+ <</if>>
+ <</if>>
+ <</if>>
+ butt
<<if $activeSlave.buttImplantType == 1>>
- massively engorged butt implants
+ string
<<else>>
- <<if $activeSlave.buttImplant > 8>>hyper <<elseif $activeSlave.buttImplant > 4>>advanced <</if>>fillable butt implants.
+ fillable
+ <</if>>
+ implants.
+ <<if $activeSlave.buttImplant > 3 && $activeSlave.buttImplantType == 1>>
+ @@.yellow;Large string based implants are a risk to a slave's health.@@
<</if>>
<</if>>
diff --git a/src/uncategorized/wardrobe.tw b/src/uncategorized/wardrobe.tw
index 71f666c603b1092a0187e650d936867d766ae003..80c2c5509a98c0688fd2c6e2a2c96c3ca137a9e4 100644
--- a/src/uncategorized/wardrobe.tw
+++ b/src/uncategorized/wardrobe.tw
@@ -276,8 +276,8 @@ The room containing all the clothes and accessories you have available to dress
<</if>>
<br>
-<<if $toysBoughtVaginalAccessories == 0>>
- [[Order a shipment of bullet vibes and vibrating dildos|Wardrobe][cashX(-10000, "capEx"), $toysBoughtVaginalAccessories = 1]]
+<<if $toysBoughtVaginalAttachments == 0>>
+ [[Order a shipment of bullet vibes and vibrating dildos|Wardrobe][cashX(-10000, "capEx"), $toysBoughtVaginalAttachments = 1]]
//Costs <<print cashFormat(10000)>>//
<<else>>
You are well stocked with bullet vibrators and vibrating dildos.