diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 7e161d83fac52c8e63b2aef3e8fe9a63775155d1..a27a2cfd97fa09f2c74d3ce7ac74febd4c6fbc33 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -1,6 +1,17 @@
Pregmod
-0.10.7.0/1
+0.10.7.1-0.1.x
+
+3/26/2018
+
+ 10
+ -added breeder's diet (boosts conception rates)
+
+3/26/2018
+
+ 9
+ -git resync, mostly typos on this end
+ -fixes to issues in facilities on the git end
3/25/2018
@@ -60,6 +71,8 @@
v1022 (0.10.7.1-0.1.0)
+0.10.7.0/1
+
3/22/2018
407
diff --git a/devNotes/twine JS b/devNotes/twine JS
index b0385276f99985329629199635113d9326629c25..85ec31e0ad2aae9a0f9ebfe103a09ea6d742c19f 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -1361,6 +1361,9 @@ window.setPregType = function(actor) {
fertilityStack++;
fertilityStack++;
}
+ if(State.variables.reproductionFormula == 1 && (State.variables.week-actor.weekAcquired > 0)) {
+ fertilityStack++;
+ }
if(actor.drugs == "super fertility drugs") {
ovum += jsEither([1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5]);
fertilityStack++;
diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index cc831191cdf59cfa1561f6725f9390ecee75ecb6..eb3c2889072f01974996b77858de0b95a01634df 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -23,7 +23,7 @@ $ArcologyNamesEugenics, $ArcologyNamesRepopulationist, $ArcologyNamesHedonisticD
$hare1, $hare2, $hare3, $hareSpeed, $hareSpeed1, $hareSpeed2, $hareSpeed3, $origin1, $origin2, $origin3, $LurcherSpeed
$$i
$activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor, $activeSlave.newGamePlus, $activeSlave.HasBeenAssignedToFacilitySupport, $activeSlave.nipplesAccessory
-$drugs
+$drugs, $harshCollars, $shoes, $bellyAccessories, $vaginalAccessories, $dickAccessories, $buttplugs
$PC.origRace, $PC.origSkin
$FacilitySupportCapacity
$modded, $XY, $XX, $old, $young, $pregYes, $pregNo, $implanted, $unmodded
diff --git a/src/js/pregJS.tw b/src/js/pregJS.tw
index c43af5c64ab68481d66a56a7610a0f467a0d7e7c..6d29f4404b67c8a6a58e12e81e9571fec5a6d59c 100644
--- a/src/js/pregJS.tw
+++ b/src/js/pregJS.tw
@@ -110,6 +110,9 @@ window.setPregType = function(actor) {
fertilityStack++;
fertilityStack++;
}
+ if(State.variables.reproductionFormula == 1 && (State.variables.week-actor.weekAcquired > 0)) {
+ fertilityStack++;
+ }
if(actor.drugs == "super fertility drugs") {
ovum += jsEither([1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5]);
fertilityStack++;
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index c2db50c99d71237cc9db000a4ea0a6c1b791e87c..2daeabc9e1f206558bfb03f7391fc0f0df292b6b 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -417,7 +417,7 @@ In order to be eligible to be bred, the potential breeding bitch must first sati
<br>She must be in good health.
<</if>>
<<if $arcologies[0].FSBodyPurist > 20>>
- <br>Her genome must be damage free.
+ <br>She must have low carcinogen levels.
<br>She must be implant free.
<</if>>
<<if $arcologies[0].FSMaturityPreferentialist > 20>>
@@ -477,9 +477,9 @@ $activeSlave.slaveName is up for review:
<<set $passing-->>
<</if>>
<<if $activeSlave.chem <= $activeStandard.chem>>
- <br>She @@.lime;PASSED@@ the genome damage test.
+ <br>She @@.lime;PASSED@@ the carcinogen test.
<<else>>
- <br>She @@.red;FAILED@@ the genome damage test.
+ <br>She @@.red;FAILED@@ the carcinogen test.
<<set $passing-->>
<</if>>
<<if $activeSlave.addict >= $activeStandard.addict>>
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index 16ca2bd77ea6daee1b05f2c80c433a57e49139b6..cf5c33eb47300532dbf88d52a341aa25941a0531 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -76,7 +76,7 @@ $clinicNameCaps
<br>
<<if $clinicUpgradeScanner == 1>>
- $clinicNameCaps's scanners have been upgraded with a sampling system that can estimate carcinogenic damage to a slave's genome.
+ $clinicNameCaps's scanners have been upgraded with a sampling system that can estimate carcinogenic damage to a slave's body.
<<else>>
<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology)>>
It mounts powerful medical scanning technology. [[Upgrade the scanners to help detect genomic damage|Clinic][$cash -= _Tmult1, $clinicUpgradeScanner = 1]] //Costs <<print cashFormat(_Tmult1)>>//
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index 75ade0bc5055f40c62b4c1aabb2376f13dcd9e10..6152e672196533a8366e9e7c0d02e9ab7ab60508 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -232,8 +232,8 @@ The hormone replacement therapies
//You lack the reputation to fund forced puberty drugs//
<br>
<<elseif ($pubertyHormones == 0) && ($rep > 4500*_PCSkillCheck)>>
- [[Fund research into powerful hormonal injections to jumpstart puberty|Dispensary][$cash -= 30000*$upgradeMultiplierMedicine, $pubertyHormones = 1]]
- //Costs <<print cashFormat(30000*$upgradeMultiplierMedicine)>>//
+ [[Fund research into powerful hormonal injections to jumpstart puberty|Dispensary][$cash -= 30000*_PCSkillCheck, $pubertyHormones = 1]]
+ //Costs <<print cashFormat(30000*_PCSkillCheck)>>//
<br> //Will allow the production of powerful hormonal drugs designed to force a slave through puberty without regard for side effects. //
<br>
<<elseif ($pubertyHormones == 1)>>
@@ -250,8 +250,8 @@ Dietary Upgrades
//You lack the reputation to fund research into hermaphrodite hormones//
<br>
<<elseif ($dietXXY == 0) && ($rep > 3500*_PCSkillCheck)>>
- [[Fund research into developing hermaphrodite hormone therapies|Dispensary][$cash -= 10000*$upgradeMultiplierMedicine, $dietXXY = 1]]
- //Costs <<print cashFormat(10000*$upgradeMultiplierMedicine)>>//
+ [[Fund research into developing hermaphrodite hormone therapies|Dispensary][$cash -= 10000*_PCSkillCheck, $dietXXY = 1]]
+ //Costs <<print cashFormat(10000*_PCSkillCheck)>>//
<br> //Will allow for specially balanced meals to be served in the cafeteria designed to promote both halves of a herm's sexuality. //
<br>
<<elseif ($dietXXY == 1)>>
@@ -263,6 +263,26 @@ Dietary Upgrades
<br>
<</if>>
+<<if $seePreg == 1>>
+<<if $feeder == 1>>
+ <<if ($reproductionFormula == 0) && ($rep <= 10000*_PCSkillCheck)>>
+ //You lack the reputation to access breeders' dietary blends//
+ <br>
+ <<elseif ($reproductionFormula == 0) && ($rep > 10000*_PCSkillCheck)>>
+ [[Purchase reputable breeders' dietary blends|Dispensary][$cash -= 25000*_PCSkillCheck, $reproductionFormula = 1]]
+ //Costs <<print cashFormat(25000*_PCSkillCheck)>>//
+ <br> //Will allow for specially refined meals to be served in the cafeteria designed to promote energetic sperm and robust pregnancies. Side effects may include an increased number of twins being conceived.//
+ <br>
+ <<elseif ($reproductionFormula == 1)>>
+ The fabricator is producing meals to be served in the cafeteria that promote energetic sperm and robust pregnancies.
+ <br>
+ <</if>>
+<<else>>
+ The feeders are incapable of modifying slave diets well enough to manage to enhance reproductive ability.
+ <br>
+<</if>>
+<</if>>
+
<<if $cumProDiet == 0>>
[[Purchase recipes to encourage cum production|Dispensary][$cash -= 5000*_PCSkillCheck, $cumProDiet = 1]]
//Costs <<print cashFormat(5000*_PCSkillCheck)>>//
@@ -286,7 +306,7 @@ Dietary Upgrades
<</if>>
<<if $dietCleanse == 0>>
- [[Purchase cleansing recipes to lessen genome damage|Dispensary][$cash -= 10000*_PCSkillCheck, $dietCleanse = 1]]
+ [[Purchase cleansing recipes to lessen carcinogen buildup|Dispensary][$cash -= 10000*_PCSkillCheck, $dietCleanse = 1]]
//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
<br> //Will allow for specially designed meals to be served in the cafeteria to counteract excessive drug use.//
<br>
@@ -341,8 +361,8 @@ Pharmacological Upgrades
<<if ($healthyDrugsUpgrade == 0)>>
<<if (($organFarmUpgrade >= 1) && ($injectionUpgrade != 0) && ($curativeUpgrade == 1) && ($aphrodisiacUpgrade == 1))>>
<<if ($rep >= 15000*_PCSkillCheck)>>
- [[Fund research into drug formulations without negative physical side effects|Dispensary][$cash -= 500000*$upgradeMultiplierMedicine,$healthyDrugsUpgrade = 1]]
- //Costs <<print cashFormat(500000*$upgradeMultiplierMedicine)>>//
+ [[Fund research into drug formulations without negative physical side effects|Dispensary][$cash -= 500000*_PCSkillCheck,$healthyDrugsUpgrade = 1]]
+ //Costs <<print cashFormat(500000*_PCSkillCheck)>>//
<br> //Will prevent the negative side effects of excessive drug usage on your slaves.//
<br>
<<else>>
@@ -370,8 +390,8 @@ Fertility Focused Pharmacology
<hr>
<<if $seeHyperPreg == 1>>
<<if $superFertilityDrugs == 1 && ($rep > 10000*_PCSkillCheck) && $pregSpeedControl != 1>>
- [[Fund research pregnancy speed control methods|Dispensary][$cash -= 200000*$upgradeMultiplierMedicine, $pregSpeedControl = 1, $clinicSpeedGestation = 0]]
- //Costs <<print cashFormat(200000*$upgradeMultiplierMedicine)>>//
+ [[Fund research pregnancy speed control methods|Dispensary][$cash -= 200000*_PCSkillCheck, $pregSpeedControl = 1, $clinicSpeedGestation = 0]]
+ //Costs <<print cashFormat(200000*_PCSkillCheck)>>//
<br> // Fund underground research labs to develop methods for controlling pregnancy progress. //
<br>
<<elseif ($rep <= 10000*_PCSkillCheck) && $pregSpeedControl != 1>>
@@ -383,8 +403,8 @@ Fertility Focused Pharmacology
<</if>>
<<elseif $birthsTotal > 10>>
<<if ($rep > 10000*_PCSkillCheck) && $pregSpeedControl != 1>>
- [[Fund research pregnancy speed control methods|Dispensary][$cash -= 200000*$upgradeMultiplierMedicine, $pregSpeedControl = 1, $clinicSpeedGestation = 0]]
- //Costs <<print cashFormat(200000*$upgradeMultiplierMedicine)>>//
+ [[Fund research pregnancy speed control methods|Dispensary][$cash -= 200000*_PCSkillCheck, $pregSpeedControl = 1, $clinicSpeedGestation = 0]]
+ //Costs <<print cashFormat(200000*_PCSkillCheck)>>//
<br> // Fund underground research labs to develop methods for controlling pregnancy progress. //
<br>
<<elseif ($rep <= 10000*_PCSkillCheck) && $pregSpeedControl != 1>>
@@ -513,7 +533,7 @@ Future Societies Research
<<if $arcologies[0].FSGenderRadicalistDecoration == 100 && $organFarmUpgrade > 0>>
<<if ($arcologies[0].FSGenderRadicalistResearch == 0)>>
<<if ($rep >= 10000*_PCSkillCheck)>>
- [[Fund research into developing male pregnancy methods|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine,$arcologies[0].FSGenderRadicalistResearch = 1]] //Costs <<print cashFormat(50000*$upgradeMultiplierMedicine)>>. Will allow cloning and production of anal uteri and ovaries.//
+ [[Fund research into developing male pregnancy methods|Dispensary][$cash -= 50000*_PCSkillCheck,$arcologies[0].FSGenderRadicalistResearch = 1]] //Costs <<print cashFormat(50000*_PCSkillCheck)>>. Will allow cloning and production of anal uteri and ovaries.//
<br>
<<else>>
// You lack the reputation to access the research necessary to develop anal uteri and ovaries. //
@@ -556,7 +576,7 @@ Future Societies Research
<<if $arcologies[0].FSAssetExpansionistDecoration == 100>>
<<if ($arcologies[0].FSAssetExpansionistResearch == 0)>>
<<if ($rep >= 5000*_PCSkillCheck)>>
- [[Fund research into drug formulations for growth without limit|Dispensary][$cash -= 30000*$upgradeMultiplierMedicine,$arcologies[0].FSAssetExpansionistResearch = 1]] //Costs <<print cashFormat(30000*$upgradeMultiplierMedicine)>>. Will allow creation of drugs to push assets to unthinkable sizes.//
+ [[Fund research into drug formulations for growth without limit|Dispensary][$cash -= 30000*_PCSkillCheck,$arcologies[0].FSAssetExpansionistResearch = 1]] //Costs <<print cashFormat(30000*_PCSkillCheck)>>. Will allow creation of drugs to push assets to unthinkable sizes.//
<br>
<<else>>
// You lack the reputation to access the research necessary to develop advanced growth drug formulations. //
@@ -577,7 +597,7 @@ Future Societies Research
<<if $arcologies[0].FSSlimnessEnthusiastDecoration == 100>>
<<if ($arcologies[0].FSSlimnessEnthusiastResearch == 0)>>
<<if ($rep >= 5000*_PCSkillCheck)>>
- [[Fund research into drug formulations for slimming slaves|Dispensary][$cash -= 30000*$upgradeMultiplierMedicine,$arcologies[0].FSSlimnessEnthusiastResearch = 1]] //Costs <<print cashFormat(30000*$upgradeMultiplierMedicine)>>. Will allow creation of drugs to shrink assets.//
+ [[Fund research into drug formulations for slimming slaves|Dispensary][$cash -= 30000*_PCSkillCheck,$arcologies[0].FSSlimnessEnthusiastResearch = 1]] //Costs <<print cashFormat(30000*_PCSkillCheck)>>. Will allow creation of drugs to shrink assets.//
<br>
<<else>>
// You lack the reputation to access the research necessary to develop asset reducing drug formulations. //
@@ -598,7 +618,7 @@ Future Societies Research
<<if $arcologies[0].FSYouthPreferentialistDecoration == 100>>
<<if ($arcologies[0].FSYouthPreferentialistResearch == 0)>>
<<if ($rep >= 5000*_PCSkillCheck)>>
- [[Fund research into skin care designed to reverse the effects of aging|Dispensary][$cash -= 30000*$upgradeMultiplierMedicine,$arcologies[0].FSYouthPreferentialistResearch = 1]] //Costs <<print cashFormat(30000*$upgradeMultiplierMedicine)>>. Will allow creation of beauty creams designed to make slaves look young again.//
+ [[Fund research into skin care designed to reverse the effects of aging|Dispensary][$cash -= 30000*_PCSkillCheck,$arcologies[0].FSYouthPreferentialistResearch = 1]] //Costs <<print cashFormat(30000*_PCSkillCheck)>>. Will allow creation of beauty creams designed to make slaves look young again.//
<br>
<<else>>
// You lack the reputation to access the research necessary to develop beauty creams designed to make slaves look young again. //
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 5335617d220472d1cb0d922c6dd9468b62a58c83..18ae457d54a8ad55142d0395d0ce333a5b251695 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -370,7 +370,7 @@ She comes to you for an inspection
<<if $clinic != 0>>
<<if $clinicUpgradeScanner == 1>>
<<if $activeSlave.chem > 15>>
- $clinicNameCaps's scanners score long term damage to $possessive genome at @@.cyan;<<print Math.ceil($activeSlave.chem/10)>>@@.
+ $clinicNameCaps's scanners score long term carcinogenic buildup in $possessive body at @@.cyan;<<print Math.ceil($activeSlave.chem/10)>>@@.
<<else>>
$clinicNameCaps's scanners confirm that $pronoun has good prospects for long term health.
<</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 13f76dfe9945373058203d46f15ffbf481757a48..48acd0552d80e58f698e67e81c232605d3aea3ea 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -4289,15 +4289,13 @@
<<set $slaves[$i].pregType = setPregType($slaves[$i])>>
<<set WombImpregnate($slaves[$i], $slaves[$i].pregType, $HeadGirl.ID, 1)>>
<<set $activeSlave = $slaves[$i]>><<if $slaves[$i].mpreg == 1>><<AnalVCheck 10>><<else>><<VaginalVCheck 10>><</if>><<set $slaves[$i] = $activeSlave>>
- <<for $j = 0; $j < $slaves.length; $j++>>
- <<if $HeadGirl.ID == $slaves[$j].ID>>
- <<set $slaves[$j] = $HeadGirl>>
- <<break>>
- <</if>>
- <</for>>
+ <<set _saLTE = $slaves.findIndex(function(s) { return s.ID == $HeadGirl.ID; })>>
+ <<if _saLTE != -1>>
+ <<set $slaves[_saLTE] = $HeadGirl>>
+ <</if>>
<</if>> /* closes HG impregnation */
-<<elseif (_conceptionSeed > 50)>>
+<<elseif _conceptionSeed > (50-($reproductionFormula*10))>>
<<switch $slaves[$i].assignment>>
<<case "rest" "stay confined" "be confined in the cellblock">>
/* these assignments are safe from random impregnation */
@@ -4953,18 +4951,16 @@
<</if>>
<<if $slaves[$i].pregKnown == 1>>
<<if $slaves[$i].pregSource > 0>>
- <<for $j = 0; $j < $slaves.length; $j++>>
- <<if $slaves[$i].pregSource == $slaves[$j].ID>>
- <<if $slaves[$i].race != $slaves[$j].race>>
- Society @@.red;strongly disapproves@@ of your allowing a pure $arcologies[0].FSSupremacistRace slave to be miscegenated by $slaves[$j].slaveName.
+ <<set _saLTE = $slaves.find(function(s) { return $slaves[$i].pregSource == s.ID; })>>
+ <<if def _saLTE>>
+ <<if $slaves[$i].race != _saLTE.race>>
+ Society @@.red;strongly disapproves@@ of your allowing a pure $arcologies[0].FSSupremacistRace slave to be miscegenated by _saLTE.slaveName.
<<FSChangePorn "Supremacist" -2>>
<<else>>
Society @@.green;strongly approves@@ of your using slave breeders like $slaves[$i].slaveName to propagate the $arcologies[0].FSSupremacistRace race.
<<FSChangePorn "Supremacist" 2>>
<</if>>
- <<break>>
<</if>>
- <</for>>
<</if>>
<</if>>
<<if $slaves[$i].fuckdoll > 0>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 4d092685b3a6e14a2da7e1082998d2716f9a7136..40781aa83d3959413c59421b3057aadc4f03fcd9 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -65,7 +65,7 @@
<<set $HGEnergy++>>
<</if>>
<<if canAchieveErection($HeadGirl)>>
- <<set $HGCum = 2+Math.trunc(($HeadGirl.balls/5)+($HeadGirl.energy/95)+($HeadGirl.health/95)+($HeadGirl.devotion/95))>>
+ <<set $HGCum = 2+Math.trunc(($HeadGirl.balls/5)+($HeadGirl.energy/95)+($HeadGirl.health/95)+($HeadGirl.devotion/95)+($reproductionFormula*5)>>
<</if>>
<<else>>
<<removeJob $slaves[$i] "be your Head Girl">>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index f3d898ba58618c8ec37eee4772a472d5026039c0..e40d07d090d4b6f675a3f385213f503df14e1af6 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -2433,7 +2433,7 @@ This experience
*/
<<widget "KnockMeUp">>
<<if $seePreg != 0>>
- <<if random(0,99) < $args[1]>>
+ <<if random(0,99) < ($args[1]+($reproductionFormula*(($args[0].pregSource <= 0) ? (($args[0].ID == -1) ? 0 : 10) : 20)))>>
<<if $args[0].mpreg === $args[2]>>
<<set $args[0].preg = 1>>
<<set $args[0].pregSource = $args[3] || 0>>