diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 32e6e1dec9f4a04e23ad553030857740a604e39d..03949a93f0cb8ea4b2aeccf48d3b157a1fd40b89 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,12 @@
0.10.7.1-0.10.x
+10/24/2018
+
+ 31
+ -fixes
+ -tweaks to how geneModing is obtained via dispensary (prices not final)
+
10/23/2018
30
diff --git a/src/events/intro/economyIntro.tw b/src/events/intro/economyIntro.tw
index 4a1899d6ca0e27747703c3257f1129f0cbc29ce3..dc6052982e96bd792f6a88f3caff9f34c54e835c 100644
--- a/src/events/intro/economyIntro.tw
+++ b/src/events/intro/economyIntro.tw
@@ -32,7 +32,7 @@
<br>[[Harder|Economy Intro][$econRate = 2]] | [[Easier|Economy Intro][$difficultySwitch = 0]]
<<elseif $econRate == 2>>
<br>''It's visibly deteriorating before your eyes.'' //Default Difficulty//
- <br>[[Easier|Economy Intro][$econRate = 1]] | [[Harder|Economy Intro][$econRate = 4]]
+ <br>[[Harder|Economy Intro][$econRate = 4]] | [[Easier|Economy Intro][$econRate = 1]]
<<else>>
<br>''It's going to hell in a handbasket.'' //Hard//
<br>[[Easier|Economy Intro][$econRate = 2]]
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 94bc6a6f5b1e4195c52086b7898fefba96bc2a00..62bc14578f8ab690824517a63f29d8768dc5399f 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1066,6 +1066,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $prostateImplants = 0>>
<<set $youngerOvaries = 0>>
<<set $prostheticsUpgrade = 0>>
+<<set $geneticMappingUpgrade = 0>>
<<set $surgeryUpgrade = 0>>
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index 9f0915caffeda2aa524a5131ec6107c473c6b47e..99d507d4fb89689c06dc65fddedc92719b64042d 100644
--- a/src/pregmod/theBlackMarket.tw
+++ b/src/pregmod/theBlackMarket.tw
@@ -161,18 +161,22 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<<else>>
<<set _toydolls = "This might be a little too shady or perverted for you. But, if you want your slaves to last longer, you know, look younger for longer, well this treatment can help. However it comes at a price, this treatment will eventually turn your slave girls younger and younger looking, until the point you might not want to use them as sex slaves because they'll appear as teenagers or even younger. I'm serious, your slaves treated with this treatment will eventually look like children! They won't be, really, but this is no fountain of perpetual youth, and to be fair, maybe none of this will be up your alley. If that's the case, I guess you could just sell them once they get too young looking, and possibly for a higher price than if they looked older. It's, at best, for possibly more discerning or eclectic tastes then you might have. I picked it up from an exotics dealer, who picked it up from some old world government research center.", _norefunds = "Remember, though, no money back on this. Technology like this doesn't exist anywhere else, your treated slaves will stay and become younger looking forever, and your older ones will slowly begin to regress towards a disturbingly young mid-childhood state. All those caveats aside, if this sounds like something you'd want, then buy now!">>
<</if>>
- <<if $arcologies[0].childhoodFertilityInducedNCSResearch == 0>>
- <<if $cash >= 135000>>
- "_toydolls _match _norefunds"<br>
- [[Purchase childhood fertility induced NCS|The Black Market][$cash -= 135000, $arcologies[0].childhoodFertilityInducedNCSResearch = 1, _dump = $merchantFSWares.delete("childFertilityInducedSyndromeX")]] //@@.yellowgreen;<<print cashFormat(135000)>>.@@//<br>
+ <<if $geneticMappingUpgrade == 0>>
+ You lack the facilities required for such a treatment to be effective on specific individuals.
+ <<else>>
+ <<if $arcologies[0].childhoodFertilityInducedNCSResearch == 0>>
+ <<if $cash >= 135000>>
+ "_toydolls _match _norefunds"<br>
+ [[Purchase childhood fertility induced NCS|The Black Market][$cash -= 135000, $arcologies[0].childhoodFertilityInducedNCSResearch = 1, _dump = $merchantFSWares.delete("childFertilityInducedSyndromeX")]] //@@.yellowgreen;<<print cashFormat(135000)>>.@@//<br>
+ <<else>>
+ "_toydolls _match _norefunds Or, you know, come back with money."<br>
+ You cannot afford the asking price of @@.red;<<print cashFormat(135000)>>@@ for the Childhood Fertility @@.orange;Induced NCS@@ (genetic engineering and hormonal blend) research recipe.<br>
+ <</if>>
+ He notices your interest and lets you read the information [[Childhood Fertility Induced NCS|Encyclopedia][$encyclopedia = "Childhood Fertility Induced NCS"]].
<<else>>
- "_toydolls _match _norefunds Or, you know, come back with money."<br>
- You cannot afford the asking price of @@.red;<<print cashFormat(135000)>>@@ for the Childhood Fertility @@.orange;Induced NCS@@ (genetic engineering and hormonal blend) research recipe.<br>
+ You already possess the Childhood Fertility @@.orange;Induced NCS@@ (genetic engineering and hormonal blend) research recipe.<br>
+ <<set _dump = $merchantIllegalWares.delete("childhoodFertilityInducedNCS")>>
<</if>>
- He notices your interest and lets you read the information [[Childhood Fertility Induced NCS|Encyclopedia][$encyclopedia = "Childhood Fertility Induced NCS"]].
- <<else>>
- You already possess the Childhood Fertility @@.orange;Induced NCS@@ (genetic engineering and hormonal blend) research recipe.<br>
- <<set _dump = $merchantIllegalWares.delete("childhoodFertilityInducedNCS")>>
<</if>>
<</if>>
<<else>>
@@ -209,16 +213,20 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<</if>>
<<if $thisWeeksIllegalWares[_bim] == "RapidCellGrowthFormula">>
<br>
- <<if $RapidCellGrowthFormula == 0>>
- <<if $cash >= 70000>>
- [[Purchase formulas for elasticity increasing injections|The Black Market][$cash -= 70000, $RapidCellGrowthFormula = 1, _dump = $merchantIllegalWares.delete("RapidCellGrowthFormula")]] //@@.yellowgreen;<<print cashFormat(70000)>>.@@//
+ <<if $geneticMappingUpgrade == 0>>
+ You lack the facilities required for such a treatment to be effective on specific individuals.
+ <<else>>
+ <<if $RapidCellGrowthFormula == 0>>
+ <<if $cash >= 70000>>
+ [[Purchase formulas for elasticity increasing injections|The Black Market][$cash -= 70000, $RapidCellGrowthFormula = 1, _dump = $merchantIllegalWares.delete("RapidCellGrowthFormula")]] //@@.yellowgreen;<<print cashFormat(70000)>>.@@//
+ <<else>>
+ You cannot afford the asking price of @@.red;<<print cashFormat(70000)>>@@ for elasticity increasing injections.
+ <</if>>
+ "These injections will loosen up any skin, muscle, organ or whatever living flesh you inject them in to. I'm not entirely sure how they work, something about increased cell growth or something. Probably not the safest thing to use, what with it pretty much being cancer in a vial. From what I've gathered, they were originally being developed to use with fillable breast implants. Some rich investor got his rocks off from BE and decided to make his dream a reality. Worked great too, save for the fact that the breasts didn't shrink down when the implant was emptied. Yep, she was left with a big ol' pair of floppy tits after being stretched so much. My take is, if you want to get big, fast, this is the drug for you, but only if you don't care about ever going back."
<<else>>
- You cannot afford the asking price of @@.red;<<print cashFormat(70000)>>@@ for elasticity increasing injections.
+ You already possess formulas for elasticity increasing injections.
+ <<set _dump = $merchantIllegalWares.delete("RapidCellGrowthFormula")>>
<</if>>
- "These injections will loosen up any skin, muscle, organ or whatever living flesh you inject them in to. I'm not entirely sure how they work, something about increased cell growth or something. Probably not the safest thing to use, what with it pretty much being cancer in a vial. From what I've gathered, they were originally being developed to use with fillable breast implants. Some rich investor got his rocks off from BE and decided to make his dream a reality. Worked great too, save for the fact that the breasts didn't shrink down when the implant was emptied. Yep, she was left with a big ol' pair of floppy tits after being stretched so much. My take is, if you want to get big, fast, this is the drug for you, but only if you don't care about ever going back."
- <<else>>
- You already possess formulas for elasticity increasing injections.
- <<set _dump = $merchantIllegalWares.delete("RapidCellGrowthFormula")>>
<</if>>
<</if>>
<</for>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 6a67672c1fe175de02d829e3ee3ed868e29df402..112fbd7d8779eaa660cd34a120d1ff07634dbb94 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1539,5 +1539,15 @@ extremely pale -5
s.noun = "girl";
}
}
+ if(s.geneMods === undefined) {
+ s.geneMods = {NCS: 0, rapidCellGrowth: 0};
+ } else {
+ if(s.geneMods.NCS === undefined) {
+ s.geneMods.NCS = 0;
+ }
+ if(s.geneMods.rapidCellGrowth === undefined) {
+ s.geneMods.rapidCellGrowth = 0;
+ }
+ }
})>>
<</widget>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 09ca2996ef57177314adbc30d12952221d7c883e..64717192d39faf9c8e2fb112593c55ac365dbd41 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2147,6 +2147,9 @@ Setting missing global variables:
<<if ndef $ImplantProductionUpgrade>>
<<set $ImplantProductionUpgrade = 0>>
<</if>>
+<<if ndef $geneticMappingUpgrade>>
+ <<set $geneticMappingUpgrade = 0>>
+<</if>>
<<if ndef $permaPregImplant>>
<<set $permaPregImplant = 0>>
<</if>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 16b8a0565b96bcae4a01f3cc3d89357fc181c126..80e5ede35f5d20d4dbfe00f035625d69e9679325 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -866,7 +866,7 @@ _His2 objections sound a bit feigned, and _he2's obviously in no hurry to put an
<<elseif $activeSlave.face > 40>>
having a <<if $activeSlave.face > 95>>perfect<<else>>really very pretty<</if>> $desc beg _him2 for sex.
<<else>>
- having somebody beg _him2 for sex. _He's a sex slave, and _he doesn't always have the luxury of feeling so wanted.
+ having somebody beg _him2 for sex. _He2's a sex slave, and _he2 doesn't always have the luxury of feeling so wanted.
<</if>>
<br><br>
<<run Enunciate($activeSlave)>>
@@ -1461,7 +1461,7 @@ $he adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
<<link "$He's not wrong">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You ask $activeSlave.slaveName what $he said in a neutral tone. $He gives you a quick glance, not sure whether to be aroused or afraid, but takes a breath to steady $himself and begins. For _his2 part, $subSlave.slaveName vainly tries to stop crying in front of you. When $activeSlave.slaveName reaches "<<= lispReplace(SlaveTitle(_HeP))>>'<<s>> going to hold you down and <<sh>>ove <<= lispReplace(SlaveTitle(_hisP))>> <<if $PC.dick == 1>>huge cockhead<<else>>bigge<<s>>t <<s>>trap-on<</if>> right up again<<s>>t thi<<s>> tight little hole," you hold up a hand to get $him to pause. $He does, and you suddenly shove $subSlave.slaveName towards the couch. _He crashes face-down into the cushions, already sobbing in terror. You place a hand on _his2 $activeSlave.skin back to hold _him2 down and then use the other to apply some lube to your <<if $PC.dick == 1>>penis<<else>>strap-on<</if>> before pressing it against the quivering slave's virgin anus. _He2 shakes with anguish, causing <<if $PC.dick == 1>>your cock to rub deliciously<<else>>the strap-on to slide amusingly<</if>> up and down _his2 asscrack. You make a come-on gesture to $activeSlave.slaveName, and $he continues, "You're going to do your be<<s>>t to relax like a good little _girl2."
+ You ask $activeSlave.slaveName what $he said in a neutral tone. $He gives you a quick glance, not sure whether to be aroused or afraid, but takes a breath to steady $himself and begins. For _his2 part, $subSlave.slaveName vainly tries to stop crying in front of you. When $activeSlave.slaveName reaches "<<= lispReplace(SlaveTitle(_HeP))>>'<<s>> going to hold you down and <<sh>>ove <<= lispReplace(SlaveTitle(_hisP))>> <<if $PC.dick == 1>>huge cockhead<<else>>bigge<<s>>t <<s>>trap-on<</if>> right up again<<s>>t thi<<s>> tight little hole," you hold up a hand to get $him to pause. $He does, and you suddenly shove $subSlave.slaveName towards the couch. _He2 crashes face-down into the cushions, already sobbing in terror. You place a hand on _his2 $activeSlave.skin back to hold _him2 down and then use the other to apply some lube to your <<if $PC.dick == 1>>penis<<else>>strap-on<</if>> before pressing it against the quivering slave's virgin anus. _He2 shakes with anguish, causing <<if $PC.dick == 1>>your cock to rub deliciously<<else>>the strap-on to slide amusingly<</if>> up and down _his2 asscrack. You make a come-on gesture to $activeSlave.slaveName, and $he continues, "You're going to do your be<<s>>t to relax like a good little _girl2."
$subSlave.slaveName desperately takes in a huge breath. $activeSlave.slaveName, who has gotten the idea (and to go by $his furious masturbation, clearly likes it), gasps out, "But it'<<s>> going to be <<s>>o big! It'<<s>> going to burn!" Here you begin to apply inexorable pressure. $subSlave.slaveName manages one more deep breath, but it becomes a squeal of anguish and _he2 tries frantically to burrow into the couch, away from the penetrating <<if $PC.dick == 1>>cock<<else>>strap-on<</if>>. "You're going to panic, and <<s>>truggle, and <<= lispReplace(SlaveTitle(_heP))>>'<<s>> going to hold you down and rape your butt while you <<s>>cream and cry..."
$activeSlave.slaveName trails off as $he shakes with orgasm; $he doesn't say any more, but the @@.hotpink;wild satisfaction@@ <<if canSee($activeSlave)>>in $his $activeSlave.eyeColor eyes<<else>>on $his face<</if>> says it for $him. $subSlave.slaveName, meanwhile, is a mess, but hurries @@.gold;fearfully@@ to obey your instructions to go clean _himself2, and hides _his2 @@.mediumorchid;hatred@@ as _he2 gingerly applies an enema to _his2 @@.lime;loosened butt.@@
<<set $activeSlave.devotion += 5>>
@@ -1987,7 +1987,7 @@ $he adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
<<case "dom">>tired doms.
<<case "sadist">>tired sadists.
<<case "masochist">>silly masochists.
- <<default>>vanilla _girl2s.
+ <<default>>vanilla <<print _girl2>>s.
<</switch>>
<<set $activeSlave.trust += 5, $activeSlave.penetrativeCount++, $penetrativeTotal++>>
<<if _vaginal>>
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index a6e84cd99cb2bd0b9457bba8d2d9a1635a408095..f03b897884edeb7d4962d3f20dc19ebf33336cd7 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -39,7 +39,7 @@ The Organ Farm
//The organ farm cannot be upgraded while it is use//
<br>
<<elseif ($organFarmUpgrade == 2) && ($rep > 10000*_PCSkillCheck)>>
- [[Upgrade to the organ farm to the cutting edge model|Dispensary][$cash -= 150000*_PCSkillCheck, $organFarmUpgrade = 3]]
+ [[Upgrade the organ farm to the cutting edge model|Dispensary][$cash -= 150000*_PCSkillCheck, $organFarmUpgrade = 3]]
//Costs <<print cashFormat(150000*_PCSkillCheck)>>//
<br> //Will allow the organ farm to rapidly grow organs without risk to the implantee's health.//
<br>
@@ -532,11 +532,23 @@ Implant Production
<</if>>
-<<if $arcologies[0].childhoodFertilityInducedNCSResearch == 1 || $RapidCellGrowthFormula == 1>>
+<br>
+Gene Mods
+<hr>
+
+<<if $dispensaryUpgrade == 0>>
+ //The fabricator must upgraded before it can be fitted with genetic sequencers//
+ <br>
+<<elseif ($rep <= 14000*_PCSkillCheck)>>
+ //You lack the reputation to purchase a cutting edge genetic sequencer//
+<<elseif $geneticMappingUpgrade == 0>>
+ [[Upgrade the fabricator with a genetic sequencer|Dispensary][$cash -= 120000, $geneticMappingUpgrade = 1]]
+ //Costs <<print cashFormat(120000)>>//
+ <br> //Will allow for the identification of genetic abnormalities and production of specialized treatments.//
+ <br>
+<<else>>
+ The fabricator is capable of mapping a slave's genes and identifying abnormalities.
<br>
- Gene Mods
- <hr>
-
<<if $arcologies[0].childhoodFertilityInducedNCSResearch == 1>>
The fabricator is capable of producing treatments to induce NCS.
<br>
@@ -545,7 +557,6 @@ Implant Production
The fabricator is capable of producing treatments to accelerate cellular reproduction.
<br>
<</if>>
-
<</if>>
<br>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index f62d2dd1faaea25cc1c62696827852c5dc2d5044..41b211b585b13a3b7d9446e157a048e6fcaf0708 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -24,6 +24,8 @@
<<set $activeSlave.canRecruit = 0>>
<<if $activeSlave.voice < 2>><<set $activeSlave.voice = 2>><</if>>
<<if $activeSlave.faceShape == "masculine">><<set $activeSlave.faceShape = "cute">><</if>>
+<<set $activeSlave.geneMods.NCS = 0, $activeSlave.geneMods.rapidCellGrowth = 0>>
+<<set $activeSlave.NCSyouthening = 0>>
<<set $activeSlave.slaveName = $activeSlave.birthName>>
<<set $activeSlave.slaveSurname = $activeSlave.birthSurname>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index f3ed49b6ea23eba86d08cc0b0cb4a398cd19a201..bd7fe5979081a43fb110dec6972849b0217b4ca0 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -1045,6 +1045,52 @@ She waits anxiously for your decision.
<<if $activeSlave.nipples == "fuckable">>
<<set $activeSlave.nipples = either("cute", "puffy", "inverted", "partially inverted")>>
<</if>>
+<<set $activeSlave.prestige = 0>>
+<<set $activeSlave.pornFame = 0>>
+<<set $activeSlave.pornFameSpending = 0>>
+<<set $activeSlave.pornFeed = 0>>
+<<set $activeSlave.pornPrestige = 0>>
+<<set $activeSlave.pornPrestigeDesc = 0>>
+<<set $activeSlave.pornFameType = "none">>
+<<set $activeSlave.pornFocus = "none">>
+<<set $activeSlave.pornTypeGeneral = 0>>
+<<set $activeSlave.pornTypeFuckdoll = 0>>
+<<set $activeSlave.pornTypeRape = 0>>
+<<set $activeSlave.pornTypePreggo = 0>>
+<<set $activeSlave.pornTypeBBW = 0>>
+<<set $activeSlave.pornTypeGainer = 0>>
+<<set $activeSlave.pornTypeStud = 0>>
+<<set $activeSlave.pornTypeLoli = 0>>
+<<set $activeSlave.pornTypeDeepThroat = 0>>
+<<set $activeSlave.pornTypeStruggleFuck = 0>>
+<<set $activeSlave.pornTypePainal = 0>>
+<<set $activeSlave.pornTypeTease = 0>>
+<<set $activeSlave.pornTypeRomantic = 0>>
+<<set $activeSlave.pornTypePervert = 0>>
+<<set $activeSlave.pornTypeCaring = 0>>
+<<set $activeSlave.pornTypeUnflinching = 0>>
+<<set $activeSlave.pornTypeSizeQueen = 0>>
+<<set $activeSlave.pornTypeNeglectful = 0>>
+<<set $activeSlave.pornTypeCumAddict = 0>>
+<<set $activeSlave.pornTypeAnalAddict = 0>>
+<<set $activeSlave.pornTypeAttentionWhore = 0>>
+<<set $activeSlave.pornTypeBreastGrowth = 0>>
+<<set $activeSlave.pornTypeAbusive = 0>>
+<<set $activeSlave.pornTypeMalicious = 0>>
+<<set $activeSlave.pornTypeSelfHating = 0>>
+<<set $activeSlave.pornTypeBreeder = 0>>
+<<set $activeSlave.pornTypeSub = 0>>
+<<set $activeSlave.pornTypeCumSlut = 0>>
+<<set $activeSlave.pornTypeAnal = 0>>
+<<set $activeSlave.pornTypeHumiliation = 0>>
+<<set $activeSlave.pornTypeBoobs = 0>>
+<<set $activeSlave.pornTypeDom = 0>>
+<<set $activeSlave.pornTypeSadist = 0>>
+<<set $activeSlave.pornTypeMasochist = 0>>
+<<set $activeSlave.pornTypePregnancy = 0>>
+<<set $activeSlave.prestigeDesc = "">>
+<<set $activeSlave.geneMods.NCS = 0, $activeSlave.geneMods.rapidCellGrowth = 0>>
+<<set $activeSlave.NCSyouthening = 0>>
<<slaveCost $activeSlave>>