diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index c37dbb159f37bedf8819f6da8b92fd9ed31fa8c7..dd35aad3fbb9be3e8157f750a42a397bb3f8092f 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -1,5 +1,25 @@
Pregmod
+0.10.7.1-1.1.x
+
+11/28/2018
+
+ 2
+ -fixed bad string pass
+
+ 1
+ -fixes
+
+11/27/2018
+
+ 0
+ -fixes
+ -more SF tweaking
+ -major changes to population tracking + tourism
+ -chaste release rule added
+ -added gapped teeth
+ -added ability to rename incubating children
+
0.10.7.1-1.0.x
11/26/2018
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index d6f3ec035339e40c3abb33882bb57edf59be3105..ef41ccc177c39aec59acb6eff9985ae03950cce4 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -37176,7 +37176,11 @@ window.Beauty = (function() {
beauty -= 3;
break;
case "gapped":
- beauty -= 1;
+ if (slave.faceShape == "cute") {
+ beauty += 1;
+ } else {
+ beauty -= 1;
+ }
break;
case "braces":
case "cosmetic braces":
diff --git a/src/SecExp/secExpOptions.tw b/src/SecExp/secExpOptions.tw
index 122cc3d12702e3572ec949082fa58f2de91019b9..5824456e48a0d02d9a75edd4b2952d4ad3dbbe98 100644
--- a/src/SecExp/secExpOptions.tw
+++ b/src/SecExp/secExpOptions.tw
@@ -506,7 +506,7 @@ __Debug/cheats:__
<<set $NPCSlaves += 200>>
<</link>> | <<link "Remove slaves" "secExpOptions">> /*Will work to a limited degree*/
<<set $NPCSlaves -= 200>>
- <<if $NPCSLaves < 0>>
+ <<if $NPCSlaves < 0>>
<<set $NPCSlaves = 0>>
<</if>>
<</link>>
diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index e8dbcbe00b86fff78913432be58769b9aeeafe7d..881644c598df9fb64b02b81efceeec0ea5ba47d4 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -249,10 +249,12 @@
<<set $activeSlave.faceShape = "cute">>
<<set $activeSlave.boobShape = "perky">>
<<set $activeSlave.nipples = "cute">>
+ <<set $activeSlave.boobs = 450>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.ovaries = 1>>
<<else>>
<<include "Generate XY Slave">>
+ <<set $activeSlave.boobs = 250>>
<<set $activeSlave.faceShape = "androgynous">>
<<set $activeSlave.boobShape = "perky">>
<</if>>
@@ -268,9 +270,6 @@
<<set $activeSlave.face = random(10,50)>>
<<set $activeSlave.health = 70>>
<<set $activeSlave.teeth = "normal">>
- <<set $activeSlave.faceShape = "cute">>
- <<set $activeSlave.boobShape = "perky">>
- <<set $activeSlave.boobs = 450>>
<<set $activeSlave.nipples = "cute">>
<<set $activeSlave.areolae = 0>>
<<set $activeSlave.anus = 0>>
diff --git a/src/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw
index 5eb9d5fa9a20b456575071b9543d2fe4ef5904a1..fcfd8526f33ff436135bd429c02e1526e38bfbc3 100644
--- a/src/cheats/mod_EditChildCheatNew.tw
+++ b/src/cheats/mod_EditChildCheatNew.tw
@@ -1335,6 +1335,7 @@
<</if>>
<<radiobutton "$tempSlave.teeth" "pointy">> Pointy
<<radiobutton "$tempSlave.teeth" "crooked">> Crooked
+ <<radiobutton "$tempSlave.teeth" "gapped">> Gapped
<<radiobutton "$tempSlave.teeth" "straightening braces">> Straightening Braces
<<radiobutton "$tempSlave.teeth" "cosmetic braces">> Cosmetic Braces
<<radiobutton "$tempSlave.teeth" "removable">> Removable
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index bf0d33ac8e559a90f5eda0231809cab153d34b9a..a26d979325a4d913990dd8e7fab7a8fca076e006 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -492,6 +492,7 @@ Unskilled.
<</if>>
<<radiobutton "$tempSlave.teeth" "pointy">> Pointy
<<radiobutton "$tempSlave.teeth" "crooked">> Crooked
+<<radiobutton "$tempSlave.teeth" "gapped">> Gapped
<<radiobutton "$tempSlave.teeth" "straightening braces">> Straightening Braces
<<radiobutton "$tempSlave.teeth" "cosmetic braces">> Cosmetic Braces
<<radiobutton "$tempSlave.teeth" "removable">> Removable
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 9d660ac0d4db9461692b4116785f3731c1b3e30a..95fe116efb9828d5c6491ea30803f0a42b3f5cd1 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -1928,6 +1928,7 @@
<</if>>
<<radiobutton "$tempSlave.teeth" "pointy">> Pointy
<<radiobutton "$tempSlave.teeth" "crooked">> Crooked
+ <<radiobutton "$tempSlave.teeth" "gapped">> Gapped
<<radiobutton "$tempSlave.teeth" "straightening braces">> Straightening Braces
<<radiobutton "$tempSlave.teeth" "cosmetic braces">> Cosmetic Braces
<<radiobutton "$tempSlave.teeth" "removable">> Removable
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index cf139d5d63b1420c15e730beb591d81fc38499ca..664a7bb55e73121f6a146bc4159e28c52a58d7ab 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -27,6 +27,7 @@ You may review your settings before clicking "Continue" to begin.
__''World Settings''__
<br>Economic climate:
+<<set $localEcon = $economy>>
<<if $economy > 125>>
''not truly dire. Not yet.'' //Very Easy//
<br>[[Harder|Intro Summary][$economy = 125]]
@@ -43,7 +44,7 @@ __''World Settings''__
''this is the last dance.'' //Very Hard//
<br>[[Easier|Intro Summary][$economy = 80]]
<</if>>
-<<if $difficultySwitch == 1>><<set $econAdvantage = -2, $localEcon = $economy>><</if>>
+<<if $difficultySwitch == 1>><<set $econAdvantage = -2>><</if>>
<br>Economic forecast:
<<if $difficultySwitch == 0>>
''no change.'' //Vanilla//
diff --git a/src/gui/mainMenu/AlphaDisclaimer.tw b/src/gui/mainMenu/AlphaDisclaimer.tw
index 42df6073ea9d380b99241aca1c7a28205ad085ad..7ff010c8b27fbfa770446baeceafd4efeca36c20 100644
--- a/src/gui/mainMenu/AlphaDisclaimer.tw
+++ b/src/gui/mainMenu/AlphaDisclaimer.tw
@@ -1,7 +1,7 @@
:: Alpha disclaimer
<<set $ui = "start">>\
-//version $ver build $releaseID//
+//version $ver mod version $pmodVer build $releaseID//
@@.green;//Mod: expanded age ranges and other tweaks 2016-08-30//@@ @@.darkred;+SV@@
@@.green;//Mod: extra preg content and other crap//@@
diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index 3f8c617aee60f8c7cb731b893e0eb18b007eccea..f820ed1211b4159563bf6fc6ebe45c798b882b85 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -3,7 +3,7 @@
This is special passage to avoid false positive error in sanityCheck build script.
Do not uncomment anything!
-$nurseryUpgrade
+$nurseryUpgrade, $childToSlave
$ageMode
$youngCareers, $educatedCareers, $uneducatedCareers, $gratefulCareers, $menialCareers, $entertainmentCareers, $whoreCareers, $HGCareers, $madamCareers, $DJCareers, $bodyguardCareers, $wardenessCareers, $nurseCareers, $attendantCareers, $matronCareers, $milkmaidCareers, $farmerCareers, $stewardessCareers, $schoolteacherCareers
$whiteAmericanSlaveNames, $africanAmericanSlaveNames, $asianAmericanSlaveNames, $latinaSlaveNames, $russianSlaveNames, $egyptianSlaveNames, $brazilianSlaveNames, $chineseSlaveNames, $koreanSlaveNames, $indianSlaveNames, $indonesianSlaveNames, $bangladeshiSlaveNames, $japaneseSlaveNames, $nigerianSlaveNames, $pakistaniSlaveNames, $mexicanSlaveNames, $filipinaSlaveNames, $ethiopianSlaveNames, $germanSlaveNames, $saudiSlaveNames, $turkishSlaveNames, $colombianSlaveNames, $argentinianSlaveNames, $vietnameseSlaveNames, $iranianSlaveNames, $congoleseSlaveNames, $frenchSlaveNames, $thaiSlaveNames, $britishSlaveNames, $italianSlaveNames, $spanishSlaveNames, $kenyanSlaveNames, $ukrainianSlaveNames, $canadianSlaveNames, $peruvianSlaveNames, $venezuelanSlaveNames, $irishSlaveNames, $icelandicSlaveNames, $finnishSlaveNames, $newZealanderSlaveNames, $polishSlaveNames, $greekSlaveNames, $israeliSlaveNames, $armenianSlaveNames, $moroccanSlaveNames, $romanianSlaveNames, $swedishSlaveNames, $lithuanianSlaveNames, $bolivianSlaveNames, $haitianSlaveNames, $cubanSlaveNames, $whiteSouthAfricanSlaveNames, $blackSouthAfricanSlaveNames, $chileanSlaveNames, $belgianSlaveNames, $danishSlaveNames, $norwegianSlaveNames, $hungarianSlaveNames, $estonianSlaveNames, $slovakSlaveNames, $kazakhSlaveNames, $zimbabweanSlaveNames, $ugandanSlaveNames, $tanzanianSlaveNames, $dutchSlaveNames, $austrianSlaveNames, $swissSlaveNames, $puertoRicanSlaveNames, $czechSlaveNames, $portugueseSlaveNames, $jamaicanSlaveNames, $malaysianSlaveNames, $guatemalanSlaveNames, $ghananSlaveNames, $serbianSlaveNames, $australianSlaveNames, $burmeseSlaveNames, $algerianSlaveNames, $sudaneseSlaveNames, $iraqiSlaveNames, $uzbekSlaveNames, $nepaleseSlaveNames, $afghanSlaveNames, $yemeniSlaveNames, $lebaneseSlaveNames, $tunisianSlaveNames, $emiratiSlaveNames, $libyanSlaveNames, $jordanianSlaveNames, $omaniSlaveNames, $malianSlaveNames, $sammarineseSlaveNames, $marshalleseSlaveNames, $syrianSlaveNames, $bermudianSlaveNames, $uruguayanSlaveNames, $monegasqueSlaveNames, $montenegrinSlaveNames, $cambodianSlaveNames, $cameroonianSlaveNames, $gaboneseSlaveNames, $djiboutianSlaveNames, $greenlandicSlaveNames, $tuvaluanSlaveNames, $zambianSlaveNames, $albanianSlaveNames, $bruneianSlaveNames, $singaporeanSlaveNames
@@ -17,7 +17,7 @@ $belarusianSlaveNames, $dominicanSlaveNames, $scottishSlaveNames
$ArcologyNamesEugenics, $ArcologyNamesRepopulationist, $ArcologyNamesHedonisticDecadence
$LurcherSpeed
$$i
-$activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor, $activeSlave.newGamePlus, $activeSlave.nipplesAccessory, $activeSlave.ovaImplant, $activeSlave.premature, $activeSlave.superfetation
+$activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor, $activeSlave.newGamePlus, $activeSlave.nipplesAccessory
$drugs, $harshCollars, $shoes, $bellyAccessories, $vaginalAccessories, $dickAccessories, $buttplugs
$PC.origRace, $PC.origSkin
$isReady, $fatherID,
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index b31f740bfcb4ccbcbb249d0063935e45035bb4c9..dde5f8948af3d0b737969e187958f2e4fd563c5a 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with thi
<<set $returnTo = "init", $nextButton = "Continue", $nextLink = "Alpha disclaimer">>
<<unset $releaseID>>
-<<set $ver = "0.10.7", $releaseID = 1032>>
-<<if ndef $releaseID>><<set $releaseID = 1032>><</if>>
+<<set $ver = "0.10.7", $pmodVer = "1.1.X", $releaseID = 1033>>
+<<if ndef $pmodVer>><<set $pmodVer = "1.1.X">><</if>>
/* This needs to be broken down into individual files that can be added to StoryInit instead. */
@@ -306,7 +306,6 @@ You should have received a copy of the GNU General Public License along with thi
/* Pregmod specific */
<<set $economy = 100>>
- <<set $econRate = 2>>
<<set $antiWeatherFreeze = 0>>
<<set $difficultySwitch = 0>>
<<set $econWeatherDamage = 0>>
@@ -568,8 +567,6 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $nurseryNameCaps = "The Nursery">>
<<set $reservedChildrenNursery = 0>>
<<set $cribs = []>> /*array of children in the nursery*/
-/*<<set $childIndices = cribs2indices()>>*/
-<<set $minimumChildAge = 0>>
<<set $childToSlave = -1>>
<<set $farmyard = 0>>
diff --git a/src/js/generateNewSlaveJS.tw b/src/js/generateNewSlaveJS.tw
index 554fa42f449715da965a66529db29b2d6af6d825..df902983bc928aa3c9837b45f13c3c5dc603eeb0 100644
--- a/src/js/generateNewSlaveJS.tw
+++ b/src/js/generateNewSlaveJS.tw
@@ -925,7 +925,7 @@ window.GenerateNewSlave = (function(){
}
if (jsRandom(0, femaleCrookedTeethGen) <= 15 && slave.physicalAge >= 12) {
- slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked"]); // , "gapped"
+ slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "gapped"]);
}
if (slave.physicalAge < 6) {
@@ -946,7 +946,7 @@ window.GenerateNewSlave = (function(){
}
if (jsRandom(0, maleCrookedTeethGen) <= 15 && slave.physicalAge >= 12) {
- slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked"]); // , "gapped"
+ slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "gapped"]);
}
if (slave.physicalAge < 6) {
diff --git a/src/js/slaveCostJS.tw b/src/js/slaveCostJS.tw
index 0089e34745a4ecba2a63b3336d0fc4d4ed82d80e..dee86baf67e76a848fb2bf70ff86084038799e7f 100644
--- a/src/js/slaveCostJS.tw
+++ b/src/js/slaveCostJS.tw
@@ -119,7 +119,11 @@ window.Beauty = (function() {
beauty -= 3;
break;
case "gapped":
- beauty -= 1;
+ if (slave.faceShape == "cute") {
+ beauty += 1;
+ } else {
+ beauty -= 1;
+ }
break;
case "braces":
case "cosmetic braces":
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index d97bee573442fe7190bf3fa1c4e5396413ca33b2..db359a96d01eb6323b305326f3f47b7c149dea44 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -771,6 +771,7 @@ Her nationality is $activeSlave.nationality.
''Teeth:''
<span id="teeth">
<<if $activeSlave.teeth == "crooked">>Crooked.
+<<elseif $activeSlave.teeth == "gapped">>Gapped.
<<elseif $activeSlave.teeth == "straightening braces">>Braces.
<<elseif $activeSlave.teeth == "baby">>Baby.
<<elseif $activeSlave.teeth == "mixed">>Mixed.
@@ -786,6 +787,7 @@ Her nationality is $activeSlave.nationality.
<<link "Baby">><<set $activeSlave.teeth = "baby">><<replace "#teeth">>Baby.<</replace>><<StartingGirlsCost>><</link>> |
<</if>>
<<link "Crooked">><<set $activeSlave.teeth = "crooked">><<replace "#teeth">>Crooked.<</replace>><<StartingGirlsCost>><</link>> |
+<<link "Gapped">><<set $activeSlave.teeth = "gapped">><<replace "#teeth">>Gapped.<</replace>><<StartingGirlsCost>><</link>> |
<<link "Braces">><<set $activeSlave.teeth = "straightening braces">><<replace "#teeth">>Braces.<</replace>><<StartingGirlsCost>><</link>>
<br>''Vision:''
diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw
index 158e5492f5bcaf50c38e87c85b367bcd7b81c776..a51f5d76ba6b411b10c24dbab00d7a8077daae65 100644
--- a/src/pregmod/csec.tw
+++ b/src/pregmod/csec.tw
@@ -63,7 +63,7 @@
<</for>>
<</if>>
<<set _adjust = _babyDaddy.slavesFathered++>>
- <<set adjustFatherProperty(_babyDaddy, slavesFathered, _adjust)>>
+ <<set adjustFatherProperty(_babyDaddy, "slavesFathered", _adjust)>>
<<else>>
<<set _others++>>
<<set _fathers.push("some man's")>>
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index be75a3969eec4491a842010d148263c83f7b6892..abacfbfe92e9beac87df175a741aa00c5773645e 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -444,6 +444,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
Reproduction management systems are offline; $he will undergo normal puberty.
<</if>>
<</if>>
+ <br>Rename $him: <<textbox "_tempName" _tempName >> [[Apply | incubator][$tanks[$i].slaveName = _tempName]] // Given name only //
<<if $cheatMode == 1>>
<br>''Cheatmode:''
<<link "Retrieve immediately">>
diff --git a/src/pregmod/manageEconomy.tw b/src/pregmod/manageEconomy.tw
index 2b223974a781e7d9857894056d224b2728863a49..28186b76929fddeec391cdddd0c641c38618689d 100644
--- a/src/pregmod/manageEconomy.tw
+++ b/src/pregmod/manageEconomy.tw
@@ -8,9 +8,9 @@ __Economy__<br>
</span>
<<if ($cheatMode) && ($cheatModeM)>>
<<set _Teconomy = $economy>>
- <<textbox "$economy" $economy>>
+ <<textbox "_Teconomy" _Teconomy>>
<<link "Apply">>
- <<set $economy = Math.trunc(Number($economy)) || _Teconomy, $cheater = 1>>
+ <<set $economy = Math.trunc(Number(_Teconomy)) || $economy, $cheater = 1>>
<<replace "#economy">>
@@.yellowgreen;Global Economy@@
| <<print $economy>>
@@ -25,9 +25,9 @@ __Economy__<br>
</span>
<<if ($cheatMode) && ($cheatModeM)>>
<<set _TlocalEcon = $localEcon>>
- <<textbox "$localEcon" $localEcon>>
+ <<textbox "_TlocalEcon" _TlocalEcon>>
<<link "Apply">>
- <<set $localEcon = Math.trunc(Number($localEcon)) || _TlocalEcon, $cheater = 1>>
+ <<set $localEcon = Math.trunc(Number(_TlocalEcon)) || $localEcon, $cheater = 1>>
<<replace "#localEcon">>
@@.yellowgreen;Local Economy@@
| <<print $localEcon>>
@@ -91,9 +91,9 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
<<elseif $MCRent > 25>>
//Average// | [[Increase|Manage Economy][$MCRent = 75, $rentEffectM = 0.94]] | [[Decrease|Manage Economy][$MCRent = 25, $rentEffectM = 1.04]]
<<elseif $MCRent > 0>>
- //Low// | [[Increase|Manage Economy][$MCRent = 20, $rentEffectM = 1]] | [[Free Rent|Manage Economy][$MCRent = 0, $rentEffectM = 1.1]]
+ //Low// | [[Increase|Manage Economy][$MCRent = 50, $rentEffectM = 1]] | [[Free Rent|Manage Economy][$MCRent = 0, $rentEffectM = 1.1]]
<<else>>
- //Free// | [[Increase|Manage Economy][$LCRent = 10, $rentEffectL = 1.04]]
+ //Free// | [[Increase|Manage Economy][$MCRent = 25, $rentEffectM = 1.04]]
<</if>>
<br>Upper Class Citizens | $upperClass | <<print _percUpperClass>>% | Rent @@.yellowgreen;<<print cashFormat($UCRent)>>@@
<<if $UCRent > 270>>
@@ -167,9 +167,9 @@ Slave demand is
| <<print $menialDemandFactor>>
</span>
<<set _TmenialDemandFactor = $menialDemandFactor>>
- <<textbox "$menialDemandFactor" $menialDemandFactor>>
+ <<textbox "_TmenialDemandFactor" _TmenialDemandFactor>>
<<link "Apply">>
- <<set $menialDemandFactor = Math.clamp(Math.trunc(Number($menialDemandFactor)),-50000,50000) || _TmenialDemandFactor, $cheater = 1>>
+ <<set $menialDemandFactor = Math.clamp(Math.trunc(Number(_TmenialDemandFactor)),-50000,50000) || $menialDemandFactor, $cheater = 1>>
<<replace "#menialDemandFactor">>
@@.yellowgreen; Slave Demand@@
| <<print $menialDemandFactor>>
@@ -207,9 +207,9 @@ Slave supply is
| <<print $menialSupplyFactor>>
</span>
<<set _TmenialSupplyFactor = $menialSupplyFactor>>
- <<textbox "$menialSupplyFactor" $menialSupplyFactor>>
+ <<textbox "_TmenialSupplyFactor" _TmenialSupplyFactor>>
<<link "Apply">>
- <<set $menialSupplyFactor = Math.clamp(Math.trunc(Number($menialSupplyFactor)),-50000,50000) || _TmenialSupplyFactor, $cheater = 1>>
+ <<set $menialSupplyFactor = Math.clamp(Math.trunc(Number(_TmenialSupplyFactor)),-50000,50000) || $menialSupplyFactor, $cheater = 1>>
<<replace "#menialSupplyFactor">>
@@.yellowgreen; Slave Supply@@
| <<print $menialSupplyFactor>>
diff --git a/src/pregmod/organFarmOptions.tw b/src/pregmod/organFarmOptions.tw
index 6c7aa7534715f586ed774acfa0225eabb676c26c..5be1a2981126cc1d4fe3b37cba7417a5a4295346 100644
--- a/src/pregmod/organFarmOptions.tw
+++ b/src/pregmod/organFarmOptions.tw
@@ -331,8 +331,8 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<<goto "Remote Surgery">>
<</link>> //Costs <<print cashFormat(20000)>> and the slave must not have female reproductive organs for successful implantation//
<</if>>
- */
<</if>>
+ */
<</if>>
<<if $organs.length > 0>>
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 53d2ae9d8d359a5373501210c2885976c6ed449d..b80b3f57553a20a776535e60482989a34e6ace89 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -80,7 +80,7 @@ PC.pregSource documentation
<</for>>
<<set _babiesReduced = removeDuplicates(_babies)>>
-<<if _elite > 0>> /* for simplicity's sake, not going to allow other embryos to be added during a elite pregnancy */
+<<if _elite > 0>> /* for simplicity's sake, not going to allow other embryos to be added during an elite pregnancy */
Since you are heavily pregnant with a child of the Societal Elite, you are quickly taken to the finest clinic the arcology has to offer. After a quick sedation, you awake to find your belly no longer round with child; that and a note stating your next breeding partner and a notice that <<print cashFormat(50000)>> has been added to your account. The Societal Elite are @@.green;very pleased@@ at their new addition to the ranks. You just wish you could have seen your <<if _curBabies == 1>>little <<if _gender == "XX">>girl<<else>>boy<</if>> before they took <<if _gender == "XX">>her<<else>>him<</if>><<else>>babies before they took them<</if>> away to be raised into a proper member of the future world.
<<set $PC.birthElite += _elite>>
<<if $PC.ovaryAge >= 55 && $playerAging != 0>>
diff --git a/src/pregmod/widgets/economyWidgets.tw b/src/pregmod/widgets/economyWidgets.tw
index d0c79be5509bfe73291f5c7d4b2e948f264a6c73..d87830603b3ef793995e34e9f8c005f6f5465fb1 100644
--- a/src/pregmod/widgets/economyWidgets.tw
+++ b/src/pregmod/widgets/economyWidgets.tw
@@ -298,14 +298,12 @@
<<else>>
<<set _details = $args[0]>>
<<set _b = $facility.farmyard>>
- <<run
- _b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0;
- _b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0;
- _b.maintenance = (def _b.maintenance) ? _b.maintenance : 0;
- _b.totalIncome = (def _b.totalIncome) ? _b.totalIncome : 0;
- _b.totalExpenses = (def _b.totalExpenses) ? _b.totalExpenses : 0;
- _b.profit = (def _b.profit) ? _b.profit : 0;
- >>
+ <<set _b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0>>
+ <<set _b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0>>
+ <<set _b.maintenance = (def _b.maintenance) ? _b.maintenance : 0>>
+ <<set _b.totalIncome = (def _b.totalIncome) ? _b.totalIncome : 0>>
+ <<set _b.totalExpenses = (def _b.totalExpenses) ? _b.totalExpenses : 0>>
+ <<set _b.profit = (def _b.profit) ? _b.profit : 0>>
<table border="1" style="width: 100%; padding-left: 20px; padding-right: 20px;">
<tr style="border-bottom: 2px solid white;">
<th>Items</th>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 3dcea780f014834686fefbf4dcfd51e6f8a9f484..de2bec8f2ed23898707212fee2f6dc45c87a13b3 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -317,7 +317,7 @@
<<set _babyDaddy = findFather($slaves[$i].curBabies[_cb].fatherID)>>
<<if def _babyDaddy>>
<<set _adjust = _babyDaddy.slavesFathered++>>
- <<set adjustFatherProperty(_babyDaddy, slavesFathered, _adjust)>>
+ <<set adjustFatherProperty(_babyDaddy, "slavesFathered", _adjust)>>
<</if>>
<</if>>
<</for>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 3c70f1940e2a8199f1e409820f53d982b93d6fa1..733cf1c03c6b30e2a2effc163e5c2a1a2d1e2d95 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -209,6 +209,9 @@
<<if def $limbsComplete>>
<<unset $limbsComplete>>
<</if>>
+<<if def $minimumChildAge>>
+ <<unset $minimumChildAge>>
+<</if>>
/* pregmod stuff */
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 97a4e0f9e90d3c71ff066c6d7768d9a161b14dbe..3196954d6e842fc737a82fa9b49bcc1a4b9c689b 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -12686,6 +12686,8 @@ You tell her kindly that you understand, and that $he'll be trained to address t
$He runs $his tongue over her frightening teeth carefully, and then opens her jaws wide, getting ready to keep her fangs well clear of your shaft.
<<elseif ($activeSlave.teeth == "straightening braces") || ($activeSlave.teeth == "cosmetic braces")>>
$He runs $his tongue over her braces, and then opens wide, mindful of keeping her orthodontia clear of your shaft.
+ <<elseif ($activeSlave.teeth == "gapped")>>
+ $He runs $his tongue across the gap in $his front teeth and opens wide.
<</if>>
$He takes you into $his mouth without hesitation, and keeps $his eyes closed. $He visibly concentrates all her attention on your dick, ignoring the breasts that are starting to bounce right over her head as you begin rocking your hips with enjoyment.
<br><br>
@@ -16328,6 +16330,8 @@ You tell her kindly that you understand, and that $he'll be trained to address t
You can feel the extreme care $he has to take to keep her sharklike teeth clear of you.
<<elseif $activeSlave.lips > 40>>
$His huge lips are soft and pillowy against you.
+ <<elseif $activeSlave.teeth == "gapped">>
+ You can feel the slight hesitations as $he takes care to not pinch you between $his front teeth.
<<elseif ($activeSlave.teeth == "straightening braces") || ($activeSlave.teeth == "cosmetic braces")>>
You can feel the slight hesitations as $he takes care to keep her braces off you.
<</if>>
@@ -19419,6 +19423,8 @@ You tell her kindly that you understand, and that $he'll be trained to address t
Although most of your attention is focused on the intriguing drama unfolding on your wallscreen, you still feel the extreme care $he has to take to keep her sharklike teeth clear of you.
<<elseif $activeSlave.lips > 40>>
$His huge lips are soft and pillowy against you.
+ <<elseif $activeSlave.teeth == "gapped">>
+ Although most of your attention is focused on the intriguing drama unfolding on your wallscreen, you can feel the slight hesitations as $he takes care to not pinch you between $his front teeth.
<<elseif ($activeSlave.teeth == "straightening braces") || ($activeSlave.teeth == "cosmetic braces")>>
Although most of your attention is focused on the intriguing drama unfolding on your wallscreen, you can feel the slight hesitations as $he takes care to keep her braces off you.
<</if>>
@@ -19531,6 +19537,8 @@ You tell her kindly that you understand, and that $he'll be trained to address t
$He quickly pulls her removable teeth out, setting them aside as $he looks up at your <<if $PC.dick == 0>>phallus<<else>>cock<</if>>.
<<elseif ($activeSlave.teeth == "pointy")>>
$He opens $his mouth wide, revealing her sharp fangs even as $he reminds $himself diligently to not let her sharp teeth scrape against your shaft.
+ <<elseif $activeSlave.teeth == "gapped">>
+ $He opens $his mouth wide, revealing the gap between $his front teeth.
<<elseif ($activeSlave.teeth == "straightening braces") || ($activeSlave.teeth == "cosmetic braces")>>
$He opens $his mouth wide, revealing a mouthful of braces even as $he reminds $himself diligently to not let her orthodontia scrape against your shaft.
<</if>>
@@ -19937,6 +19945,8 @@ You tell her kindly that you understand, and that $he'll be trained to address t
Though your attention is largely sapped by her tender oral ministrations, you note that $he takes care not to rake you with her sharklike teeth.
<<elseif $activeSlave.lips > 40>>
Though your attention is largely sapped by her tender oral ministrations, you note that her huge lips are soft and pillowy against you.
+ <<elseif $activeSlave.teeth == "gapped">>
+ Though your attention is largely sapped by her tender oral ministrations, you note that $he takes care to let you get snagged between $his front teeth.
<<elseif ($activeSlave.teeth == "straightening braces") || ($activeSlave.teeth == "cosmetic braces")>>
Though your attention is largely sapped by her tender oral ministrations, you note that $he takes care to keep her braces off you.
<</if>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index ab2983e786b526d4f2da5b611445b6080ee47b31..4d74b8f8857a880d032a48ab2c2b85365c75beb7 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -724,9 +724,9 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass *
<<set _enslavedPC = Math.trunc(_enslaved / 4),
_enslavedNPC = _enslaved - _enslavedPC>>
<</if>>
+ <<set $helots += _enslavedPC,
+ $NPCSlaves += _enslavedNPC>>
<</if>>
-<<set $helots += _enslavedPC,
-$NPCSlaves += _enslavedNPC>>
<<if _enslaved > 1>>
<br>In total @@.green;<<print _enslaved>> Lower class citizens@@ were enslaved for failing to pay their debts.
<br> @@.green;You enslaved <<print _enslavedPC>>@@ of them while other debtholders in the arcology enslaved the remaining <<print _enslavedNPC>>.
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 7d97a9c8807e9f36ddcdb81cf111ea02b0b26fa1..c196de514a02444a3ee5a7ccf44e041136bf8496 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -376,8 +376,8 @@
<<set $slaves[$i].livingRules = "normal">>
<</switch>>
<<if $dairyPregSetting > 0>>
- <<set WombCleanGenericReserve($slaves[_i], "incubator", 9999)>>
- <<set WombCleanGenericReserve($slaves[_i], "nursery", 9999)>>
+ <<set WombCleanGenericReserve($slaves[$i], "incubator", 9999)>>
+ <<set WombCleanGenericReserve($slaves[$i], "nursery", 9999)>>
<</if>>
/* General End of Week effects */
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index e705fe2f1deb969ab03c76625b3a36d82e50b8e2..4b5bee8d6b3f25e4a22c195b7d70556bc04cb657 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -31,7 +31,7 @@
<<else>>
<<silently>>
/* initialize event lists as arrays [], not objects {} */
- <<set $events = [], $RecETSevent = [], $REFIevent = [], $PESSevent = [], $PETSevent = [], $REFSevent = [], $activeSlave = 0, $groomSlave = 0, $brideSlave = 0, $recruiterSlave = 0>>
+ <<set $events = [], $RecETSevent = [], $REFIevent = [], $PESSevent = [], $PETSevent = [], $REFSevent = [], $activeSlave = 0, $groomSlave = 0, $brideSlave = 0, $recruiterSlave = 0, _recruitEvents = []>>
<<set $seed = 0>>
@@ -60,7 +60,7 @@
<</if>> /* CLOSES FUCKDOLL CHECK */
- <<if $week >= 10>>
+ <<if $week >= 10>>
<<set $events.push("P associates public slut")>>
<</if>>
<<set $legendaryFacility = 1>>
@@ -520,23 +520,23 @@
/* Acquisition Events */
- <<set $events.push("RE recruit")>>
+ <<set $events.push("RE recruit")>> /* one generic recruit event guaranteed to always be possible */
<<if random(1,100) < $rep/200>>
- <<set $events.push("RE recruit")>>
+ <<set _recruitEvents.push("RE recruit")>>
<</if>>
<<if $ProRecruitment == 1>>
<<if random(1,100) < $rep/200>>
- <<set $events.push("RE recruit")>>
+ <<set _recruitEvents.push("RE recruit")>>
<</if>>
<</if>>
<<if $AntiEnslavementRep == 0>>
<<if random(1,100) < $rep/300>>
- <<set $events.push("RE recruit")>>
+ <<set _recruitEvents.push("RE recruit")>>
<</if>>
<</if>>
<<if $AntiEnslavementCash == 0>>
<<if random(1,100) < $rep/300>>
- <<set $events.push("RE recruit")>>
+ <<set _recruitEvents.push("RE recruit")>>
<</if>>
<</if>>
<<set $recruit = []>>
@@ -614,7 +614,7 @@
<<set $recruit.push("rogue cyborg")>>
<</if>>
<<if $arcologyUpgrade.drones == 1>>
- <<set $events.push("RE malefactor")>>
+ <<set _recruitEvents.push("RE malefactor")>>
<<set $malefactor = ["liberator", "whore", "businesswoman", "addict"]>>
<<if $seePreg != 0>>
<<set $malefactor.push("anchorBaby")>>
@@ -633,7 +633,7 @@
<</if>>
<<set $malefactor = $malefactor.random()>>
<<if ($rep/150) > random(1,100)>>
- <<set $events.push("RE malefactor")>>
+ <<set _recruitEvents.push("RE malefactor")>>
<</if>>
<</if>>
<<if $rep > 16000 && random(1,100) < $rep/1000 && $cash >= 100000>>
@@ -811,176 +811,176 @@
<<set $FSAcquisitionEvents = []>>
<<if $arcologies[0].FSSupremacist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Supremacist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSSubjugationist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Subjugationist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSGenderRadicalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Gender Radicalist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSRepopulationFocus > random(1,100)>>
<<set $FSAcquisitionEvents.push("Repopulation Efforts")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSRestart > random(1,100)>>
<<set $FSAcquisitionEvents.push("Eugenics")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $seePreg != 0>>
<<if $arcologies[0].FSGenderFundamentalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Gender Fundamentalist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<</if>>
<<if $arcologies[0].FSPaternalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Paternalist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSDegradationist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Degradationist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSBodyPurist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Body Purist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSTransformationFetishist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Transformation Fetishist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSYouthPreferentialist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Youth Preferentialist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSMaturityPreferentialist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Maturity Preferentialist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSSlimnessEnthusiast > random(1,100)>>
<<set $FSAcquisitionEvents.push("Slimness Enthusiast")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSAssetExpansionist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Asset Expansionist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $seePreg != 0>>
<<if $arcologies[0].FSPastoralist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Pastoralist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<</if>>
<<if $arcologies[0].FSPhysicalIdealist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Physical Idealist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSHedonisticDecadence > random(1,100)>>
<<set $FSAcquisitionEvents.push("Hedonistic Decadence")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSChattelReligionist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Chattel Religionist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSSupremacist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Supremacist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSSubjugationist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Subjugationist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSGenderRadicalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Gender Radicalist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $seePreg != 0>>
<<if $arcologies[0].FSGenderFundamentalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Gender Fundamentalist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<</if>>
<<if $arcologies[0].FSPaternalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Paternalist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSDegradationist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Degradationist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSBodyPurist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Body Purist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSTransformationFetishist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Transformation Fetishist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSYouthPreferentialist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Youth Preferentialist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSMaturityPreferentialist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Maturity Preferentialist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSSlimnessEnthusiast > random(1,100)>>
<<set $FSAcquisitionEvents.push("Slimness Enthusiast Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSAssetExpansionist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Asset Expansionist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSPastoralist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Pastoralist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSPhysicalIdealist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Physical Idealist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSHedonisticDecadence > random(1,100)>>
<<set $FSAcquisitionEvents.push("Hedonistic Decadence Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSChattelReligionist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Chattel Religionist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSRepopulationFocus > random(1,100)>>
<<set $FSAcquisitionEvents.push("Repopulation Efforts Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSRestart > random(1,100)>>
<<set $FSAcquisitionEvents.push("Eugenics Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSRomanRevivalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Roman Revivalist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSAztecRevivalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Aztec Revivalist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSEdoRevivalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Edo Revivalist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSArabianRevivalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Arabian Revivalist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSChineseRevivalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Chinese Revivalist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSEgyptianRevivalist > random(1,100)>>
- <<set $events.push("RE FSEgyptianRevivalist acquisition")>>
+ <<set _recruitEvents.push("RE FSEgyptianRevivalist acquisition")>>
<</if>>
<<if $arcologies[0].FSPaternalistDecoration == 100 && $minimumSlaveAge <= 14 && $week >= 100 && (ndef $swanSong || $swanSong == 0)>>
<<set $recruit.push("paternalist swan song")>>
@@ -1305,7 +1305,7 @@
<</if>>
<</if>>
- <<if $minimumSlaveCost > 3000>>
+ <<if $minimumSlaveCost > 3000 && random(1,2) == 1>>
<<set $events.push("RE shipping container")>>
<</if>>
@@ -1318,8 +1318,11 @@
<</if>>
<<if $mercenaries > 0>>
- <<set $events.push("RE AWOL")>>
- <<set $events.push("RE Poker Night")>>
+ <<if random(1,2) == 1>>
+ <<set $events.push("RE AWOL")>>
+ <<else>>
+ <<set $events.push("RE Poker Night")>>
+ <</if>>
<</if>>
<<if $arcologies[0].prosperity >= 100 && ($rep > random(1,30000))>>
@@ -1392,7 +1395,7 @@
/* EVENT RANDOMIZATION */
<<for $i = 0; $i < $RecETSevent.length; $i++>>
- <<set $events.push("RecETS")>>
+ <<set _recruitEvents.push("RecETS")>>
<</for>>
<<for $i = 0; $i < $REFIevent.length; $i++>>
<<set $events.push("REFI")>>
@@ -1406,6 +1409,12 @@
<<for $i = 0; $i < $REFSevent.length; $i++>>
<<set $events.push("REFS")>>
<</for>>
+ <<set _maxRecruitNumber = Math.min(10, Math.ceil($events.length/4))>>
+ <<if _maxRecruitNumber < _recruitEvents.length>>
+ <<set _recruitEvents.shuffle()>>
+ <<set _recruitEvents.length = _maxRecruitNumber>>
+ <</if>>
+ <<set $events = $events.concat(_recruitEvents)>>
<<if $cheatMode == 1>>
<<goto "random event select">>
<<else>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index a867084f1cd8c5dcbab4a250ec7aea1094cbab7f..79d470862fd1873bf1a178fbeab3c690a8876ec5 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -241,6 +241,12 @@ $He has
<<if ($seeExtreme == 1) && ($activeSlave.indentureRestrictions < 1)>>
| [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "sharp"]]
<</if>>
+<<case "gapped">>
+ $He has a noticeable gap in $his front teeth.
+ [[Apply braces|Surgery Degradation][$activeSlave.teeth = "straightening braces",$cash -= $surgeryCost,$surgeryType = "braces"]]
+ <<if ($seeExtreme == 1) && ($activeSlave.indentureRestrictions < 1)>>
+ | [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "sharp"]]
+ <</if>>
<<case "straightening braces">>
$His crooked teeth are in braces.
[[Remove braces|Remote Surgery][$activeSlave.teeth = "crooked",$surgeryType = "removeBraces"]]
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index a809641a9778ff80abd51bc7815e9cad94915d63..c94f9db3b8be48999a80fe60c51e9506e803395d 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -2925,7 +2925,7 @@
<<set _babyDaddy = findFather($slaves[$i].pregSource)>>
<<if def _babyDaddy>>
<<set _adjust = _babyDaddy.slavesKnockedUp++>>
- <<set adjustFatherProperty(_babyDaddy, slavesKnockedUp, _adjust)>>
+ <<set adjustFatherProperty(_babyDaddy, "slavesKnockedUp", _adjust)>>
<</if>>
<</if>>
<</if>>
@@ -5146,8 +5146,15 @@
$He lost the last of $his baby teeth this week.
<<set _crookedTeethGen = ((($slaves[$i].face-$slaves[$i].faceImplant)+100)/10)>>
<<if random(0,_crookedTeethGen) < 5>>
- <<set $slaves[$i].teeth = "crooked">>
- Unfortunately, $his teeth ended up @@.yellow;crooked@@ and will require braces to correct.
+ Unfortunately,
+ <<if random(0,5) < 1>>
+ <<set $slaves[$i].teeth = "gapped">>
+ $he has a large @@.yellow;gap@@ between $his front teeth that
+ <<else>>
+ <<set $slaves[$i].teeth = "crooked">>
+ $his teeth ended up @@.yellow;crooked@@ and
+ <</if>>
+ will require braces to correct.
<<else>>
<<set $slaves[$i].teeth = "normal">>
<</if>>
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index f01a74070b7193509af64dc25cec7829a6f0fcc3..e2d61721c48020a716a5b8ca627b34e3b17e448c 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -664,7 +664,7 @@
<<case "be a subordinate slave">>
<<set _bw = $slaveIndices[$slaves[$i].subTarget]>>
- <<if _bw != -1
+ <<if _bw != -1>>
<<setLocalPronouns $slaves[_bw] 2>>
<</if>>
<<if $slaves[$i].fetish == "mindbroken">>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 48a381cc54d0167a992adec9103c1a34df4fad1e..8653fc15ed31d2c135feb64eb256946f14f4002d 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -5563,6 +5563,11 @@ $He has
<<else>>
just for appearances.
<</if>>
+ <<elseif $activeSlave.teeth == "gapped">>
+ $He has a prominent gap between $his front teeth<<if $activeSlave.faceShape == "cute">> that suits $his cute face surprisingly well<</if>>.
+ <<if canTalk($activeSlave)>>
+ It also leaves $him with a slight lisp.
+ <</if>>
<<elseif $activeSlave.teeth == "removable">>
$His teeth have been removed and replaced with high-quality dentures. It's difficult to tell anything's unusual until you take them out for gummy oral sex.
<<elseif $activeSlave.teeth == "pointy">>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 3a5aadde9c917a28b7b75f9a4fc32281f342e58d..0fc7cc8fa1620468f10cfd50a757cc1834db24cf 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -164,6 +164,7 @@
<<replace "#teeth">>
<<if $activeSlave.teeth == "crooked">>Crooked.
+ <<elseif $activeSlave.teeth == "gapped">>Gapped.
<<elseif $activeSlave.teeth == "straightening braces">>Braces.
<<elseif $activeSlave.teeth == "baby">>Baby.
<<elseif $activeSlave.teeth == "mixed">>Mixed.