From 952bd4701bd39d555faf09cd2241e514b313af33 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Mon, 13 May 2019 22:46:33 -0400 Subject: [PATCH] gene lab upgrade + genetic quirk inducing --- Changelog.txt | 2 + src/init/storyInit.tw | 1 + src/pregmod/geneLab.tw | 22 ++++++- src/uncategorized/BackwardsCompatibility.tw | 3 + src/uncategorized/remoteSurgery.tw | 64 ++++++++++++++++++++- src/utility/descriptionWidgets.tw | 34 +++++++++++ 6 files changed, 123 insertions(+), 3 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 8164570f79a..8e9b2a4095a 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -11,6 +11,8 @@ Pregmod -aphrodisiacs counter erectile dysfunction -added birth tracking tattoo -added event to revive FCNN + -added upgrade to gene lab allowing further genetic quirk detection and control + -dwarfism genetic quirk added -breast implants now impact milk production based on % implant -many new names added to lacking name pools -restored chem summary to the clinic diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 000471db9ae..68f9a95aca4 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1092,6 +1092,7 @@ You should have received a copy of the GNU General Public License along with thi <<set $geneticMappingUpgrade = 0>> <<set $pregnancyMonitoringUpgrade = 0>> <<set $cloningSystem = 0>> +<<set $geneticFlawLibrary = 0>> <<set $surgeryUpgrade = 0>> diff --git a/src/pregmod/geneLab.tw b/src/pregmod/geneLab.tw index 632badb17e8..5084f806e5e 100644 --- a/src/pregmod/geneLab.tw +++ b/src/pregmod/geneLab.tw @@ -6,7 +6,16 @@ The Gene Lab <hr> -//The gene lab is fully operational. It is capable of mapping a slave's genes, identifying genetic traits and abnormalities. It can be used to modify a slave's genome should you obtain the data necessary to adjust it.// + + +<<if $geneticMappingUpgrade == 1>> + //The gene lab is fully operational. It is capable of mapping a slave's genes, identifying genetic traits and abnormalities. It can be used to modify a slave's genome should you obtain the data necessary to adjust it.// + <br> + [[Upgrade the genome mapper|Gene Lab][cashX(forceNeg(Math.trunc(500000*$upgradeMultiplierArcology)), "capEx"), $geneticMappingUpgrade = 2]] + //Costs <<print cashFormat(Math.trunc(500000*$upgradeMultiplierArcology))>>// +<<elseif $geneticMappingUpgrade == 2>> + //The gene lab is fully operational. It is capable of fully mapping a slave's genes, identifying genetic traits and abnormalities. It can be used to correct (or flaw) a slave's genome, as well as modify it should you obtain the data necessary to adjust it.// +<</if>> <br><br> Genetic Modification @@ -26,6 +35,17 @@ Genetic Modification The fabricator is capable of producing treatments to accelerate cellular reproduction. <br> <</if>> + <<if $geneticMappingUpgrade >= 2>> + <<if $geneticFlawLibrary != 1>> + [[Purchase designs for inducing genetic anomalies|Gene Lab][cashX(forceNeg(100000*_PCSkillCheck), "capEx"), $geneticFlawLibrary = 1]] + //Costs <<print cashFormat(100000*_PCSkillCheck)>>// + <br> //Will allow genetic flaws and quirks to be injected into a slave's genome// + <br> + <<else>> + The fabricator is capable of producing treatments to induce various genetic anomalies. + <br> + <</if>> + <</if>> <</if>> <br><br> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 00cb66f48fe..5d8726a4b9e 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -2047,6 +2047,9 @@ Setting missing global variables: <<if ndef $cloningSystem>> <<set $cloningSystem = 0>> <</if>> +<<if ndef $geneticFlawLibrary>> + <<set $geneticFlawLibrary = 0>> +<</if>> <<if ndef $pregInventor>> <<set $pregInventor = 0>> diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 50bdc8a4c0d..2806cc33d3c 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -1408,7 +1408,7 @@ $He has <<if $arcologies[0].childhoodFertilityInducedNCSResearch == 1>> <br> <<if $activeSlave.geneMods.NCS == 0>> - [[Induced NCS Treatment|Surgery Degradation][$activeSlave.geneMods.NCS = 1,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave) * 4, $activeSlave.health -= 80, $activeSlave.chem += 40,$surgeryType = "retrograde virus injection NCS"]] //This will induce @@.orange;NCS@@ in $his genetic code// + [[Induced NCS treatment|Surgery Degradation][$activeSlave.geneMods.NCS = 1,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 80, $activeSlave.chem += 40,$surgeryType = "retrograde virus injection NCS"]] //This will induce @@.orange;NCS@@ in $his genetic code// <<else>> //$He already has Induced @@.orange;NCS@@// <</if>> @@ -1416,7 +1416,7 @@ $He has <<if $RapidCellGrowthFormula == 1>> <br> <<if $activeSlave.geneMods.rapidCellGrowth == 0>> - [[Increased Elasticity Treatment|Surgery Degradation][$activeSlave.geneMods.rapidCellGrowth = 1,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave) * 4, $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "elasticity treatment"]] //This will alter $his genetic code to encourage $his body to stretch// + [[Increased elasticity treatment|Surgery Degradation][$activeSlave.geneMods.rapidCellGrowth = 1,cashX(forceNeg($surgeryCost * 4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "elasticity treatment"]] //This will alter $his genetic code to encourage $his body to stretch// <<else>> //$He already has received the plasticity increasing elasticity treatment// <</if>> @@ -1424,14 +1424,32 @@ $He has <<if $activeSlave.geneticQuirks.albinism == 2>> <br> [[Albinism prevention treatment|Surgery Degradation][$activeSlave.geneticQuirks.albinism = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $activeSlave.geneticQuirks.albinism == 1 && $geneticMappingUpgrade >= 2>> + <br> + [[Albinism activation treatment|Surgery Degradation][$activeSlave.geneticQuirks.albinism = 2,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] //Will not have an active effect// + <<elseif $geneticFlawLibrary == 1>> + <br> + [[Induced albinism treatment|Surgery Degradation][$activeSlave.geneticQuirks.albinism = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;albinism@@ in $his genetic code// <</if>> <<if $activeSlave.geneticQuirks.dwarfism == 2>> <br> [[Dwarfism correction treatment|Surgery Degradation][$activeSlave.geneticQuirks.dwarfism = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $activeSlave.geneticQuirks.dwarfism == 1 && $geneticMappingUpgrade >= 2>> + <br> + [[Dwarfism activation treatment|Surgery Degradation][$activeSlave.geneticQuirks.dwarfism = 2,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $geneticFlawLibrary == 1>> + <br> + [[Induced dwarfism treatment|Surgery Degradation][$activeSlave.geneticQuirks.dwarfism = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;dwarfism@@ in $his genetic code// <</if>> <<if $activeSlave.geneticQuirks.gigantism == 2>> <br> [[Gigantism correction treatment|Surgery Degradation][$activeSlave.geneticQuirks.gigantism = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $activeSlave.geneticQuirks.gigantism == 1 && $geneticMappingUpgrade >= 2>> + <br> + [[Gigantism activation treatment|Surgery Degradation][$activeSlave.geneticQuirks.gigantism = 2,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $geneticFlawLibrary == 1>> + <br> + /*[[Induced gigantism treatment|Surgery Degradation][$activeSlave.geneticQuirks.gigantism = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]]*/ //This will induce @@.orange;gigantism@@ in $his genetic code// // Offline pending growth charting // <</if>> <<if $activeSlave.geneticQuirks.pFace == 2>> <br> @@ -1444,30 +1462,72 @@ $He has <<if $activeSlave.geneticQuirks.hyperFertility == 2>> <br> [[Correct genetic hyper fertility|Surgery Degradation][$activeSlave.geneticQuirks.hyperFertility = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $activeSlave.geneticQuirks.hyperFertility == 1 && $geneticMappingUpgrade >= 2>> + <br> + [[Hyper fertility activation treatment|Surgery Degradation][$activeSlave.geneticQuirks.hyperFertility = 2,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $geneticFlawLibrary == 1>> + <br> + [[Induced hyper fertility treatment|Surgery Degradation][$activeSlave.geneticQuirks.hyperFertility = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;inhumanly high fertility@@ in $his genetic code// <</if>> <<if $activeSlave.geneticQuirks.fertility == 2>> <br> [[Correct heightened fertility|Surgery Degradation][$activeSlave.geneticQuirks.fertility = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $activeSlave.geneticQuirks.fertility == 1 && $geneticMappingUpgrade >= 2>> + <br> + [[Heightened fertility activation treatment|Surgery Degradation][$activeSlave.geneticQuirks.fertility = 2,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $geneticFlawLibrary == 1>> + <br> + [[Induced heightened fertility treatment|Surgery Degradation][$activeSlave.geneticQuirks.fertility = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;heightened fertility@@ in $his genetic code// <</if>> <<if $activeSlave.geneticQuirks.superfetation == 2>> <br> [[Correct ova release during pregnancy|Surgery Degradation][$activeSlave.geneticQuirks.superfetation = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $activeSlave.geneticQuirks.superfetation == 1 && $geneticMappingUpgrade >= 2>> + <br> + [[Superfetation activation treatment|Surgery Degradation][$activeSlave.geneticQuirks.superfetation = 2,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $geneticFlawLibrary == 1>> + <br> + [[Induced superfetation treatment|Surgery Degradation][$activeSlave.geneticQuirks.superfetation = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;superfetation@@ in $his genetic code// <</if>> <<if $activeSlave.geneticQuirks.gigantomastia >= 2>> <br> [[Correct gigantomastia|Surgery Degradation][$activeSlave.geneticQuirks.gigantomastia = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $activeSlave.geneticQuirks.gigantomastia == 1 && $geneticMappingUpgrade >= 2>> + <br> + [[Gigantomastia activation treatment|Surgery Degradation][$activeSlave.geneticQuirks.gigantomastia = 2,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $activeSlave.geneticQuirks.gigantomastia == 0 && $geneticFlawLibrary == 1>> + <br> + [[Induced gigantomastia treatment|Surgery Degradation][$activeSlave.geneticQuirks.gigantomastia = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;gigantomastia@@ in $his genetic code// <</if>> <<if $activeSlave.geneticQuirks.macromastia >= 2>> <br> [[Correct macromastia|Surgery Degradation][$activeSlave.geneticQuirks.macromastia = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $activeSlave.geneticQuirks.macromastia == 1 && $geneticMappingUpgrade >= 2>> + <br> + [[Macromastia activation treatment|Surgery Degradation][$activeSlave.geneticQuirks.macromastia = 2,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $activeSlave.geneticQuirks.macromastia == 0 && $geneticFlawLibrary == 1>> + <br> + [[Induced macromastia treatment|Surgery Degradation][$activeSlave.geneticQuirks.macromastia = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;macromastia@@ in $his genetic code// <</if>> <<if $activeSlave.geneticQuirks.rearLipedema == 2>> <br> [[Correct lipedema|Surgery Degradation][$activeSlave.geneticQuirks.rearLipedema = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $activeSlave.geneticQuirks.rearLipedema == 1 && $geneticMappingUpgrade >= 2>> + <br> + [[Lipedema activation treatment|Surgery Degradation][$activeSlave.geneticQuirks.rearLipedema = 2,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $geneticFlawLibrary == 1>> + <br> + [[Induced lipedema treatment|Surgery Degradation][$activeSlave.geneticQuirks.rearLipedema = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;lipedema@@ in $his genetic code// <</if>> <<if $activeSlave.geneticQuirks.wellHung == 2>> <br> [[Correct genetic predisposition for large genitals|Surgery Degradation][$activeSlave.geneticQuirks.wellHung = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $activeSlave.geneticQuirks.wellHung == 1 && $geneticMappingUpgrade >= 2>> + <br> + [[Enhanced penile development activation treatment|Surgery Degradation][$activeSlave.geneticQuirks.wellHung = 2,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]] + <<elseif $geneticFlawLibrary == 1>> + <br> + [[Induced penile development treatment|Surgery Degradation][$activeSlave.geneticQuirks.wellHung = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;penile development@@ in $his genetic code// <</if>> <</if>> <br><br> diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw index 3ee5db23bfe..2831b02664e 100644 --- a/src/utility/descriptionWidgets.tw +++ b/src/utility/descriptionWidgets.tw @@ -87,6 +87,8 @@ <<if $geneticMappingUpgrade >= 1>> <<if $activeSlave.geneticQuirks.albinism == 2>> $He is an albino. + <<elseif $activeSlave.geneticQuirks.albinism == 1 && $geneticMappingUpgrade >= 2>> + $He is a carrier of the albinism gene. <</if>> <<if $activeSlave.geneticQuirks.dwarfism == 2 && $activeSlave.geneticQuirks.gigantism == 2>> $He has both dwarfism and gigantism. @@ -95,8 +97,16 @@ <<elseif $activeSlave.geneticQuirks.gigantism == 2>> $He has gigantism. <</if>> + <<if $activeSlave.geneticQuirks.dwarfism == 1 && $geneticMappingUpgrade >= 2>> + $He is a carrier of the dwarfism gene. + <</if>> + <<if $activeSlave.geneticQuirks.gigantism == 1 && $geneticMappingUpgrade >= 2>> + $He is a carrier of the gigantism gene. + <</if>> <<if $activeSlave.geneticQuirks.heterochromia == 2>> $He carries a gene that allows $his eyes to be two different colors. + <<elseif $activeSlave.geneticQuirks.heterochromia == 1 && $geneticMappingUpgrade >= 2>> + $He is a carrier of the heterochromia gene. <</if>> <<if $activeSlave.geneticQuirks.pFace == 2>> $He has an exceedingly rare trait associated with perfect facial beauty. @@ -106,6 +116,12 @@ <<elseif $activeSlave.geneticQuirks.uFace == 2>> $He has an exceedingly rare trait associated with some of the ugliest mugs in history. <</if>> + <<if $activeSlave.geneticQuirks.pFace == 1 && $geneticMappingUpgrade >= 2>> + $He is a carrier of a combination of triats that can result in perfect facial beauty. + <</if>> + <<if $activeSlave.geneticQuirks.uFace == 1 && $geneticMappingUpgrade >= 2>> + $He is a carrier of a combination of triats that can result in raw ugliness. + <</if>> <<if $activeSlave.geneticQuirks.fertility == 2 && $activeSlave.geneticQuirks.hyperFertility == 2>> $He has a unique genetic condition resulting in inhumanly high <<if $activeSlave.ovaries == 1 || $activeSlave.mpreg == 1>> @@ -128,12 +144,20 @@ fertile. <</if>> <</if>> + <<if $activeSlave.geneticQuirks.hyperFertility == 1 && $geneticMappingUpgrade >= 2>> + $He is a carrier of a genetic condition resulting in hyper-fertility. + <</if>> + <<if $activeSlave.geneticQuirks.fertility == 1 && $geneticMappingUpgrade >= 2>> + $He is a carrier of a genetic condition resulting in increased fertility. + <</if>> <<if $activeSlave.geneticQuirks.superfetation == 2>> <<if isFertile($activeSlave)>> $He posses a rare genetic flaw that causes pregnancy to not block ovulation. $He is fully capable of getting pregnant while already pregnant. <<else>> $He posses a rare genetic flaw that causes pregnancy to not block ovulation; not that it matters when $he can't get pregnant. <</if>> + <<elseif $activeSlave.geneticQuirks.superfetation == 1 && $geneticMappingUpgrade >= 2>> + $He is a carrier of a genetic flaw that causes superfetation. <</if>> <<if $activeSlave.geneticQuirks.macromastia == 2 && $activeSlave.geneticQuirks.gigantomastia == 2>> $He has an abnormal strain of gigantomastia and will experience constant excessive breast growth. @@ -152,6 +176,12 @@ macromastia and will experience excess development of breast tissue. <</if>> <</if>> + <<if $activeSlave.geneticQuirks.gigantomastia == 1 && $geneticMappingUpgrade >= 2>> + $He is a carrier of a genetic flaw that causes gigantomastia. + <</if>> + <<if $activeSlave.geneticQuirks.macromastia == 1 && $geneticMappingUpgrade >= 2>> + $He is a carrier of a genetic flaw that causes macromastia. + <</if>> <<if $activeSlave.geneticQuirks.wellHung == 2>> <<if $activeSlave.physicalAge <= 16 && $activeSlave.hormoneBalance < 100 && $activeSlave.dick > 0>> $He is likely to experience an inordinate amount of penile growth during $his physical development. @@ -160,9 +190,13 @@ <<else>> $He is predisposed to having an enormous dick, or would, if $he had one. <</if>> + <<elseif $activeSlave.geneticQuirks.wellHung == 1 && $geneticMappingUpgrade >= 2>> + $He is a carrier of a gene that causes enhanced penile development. <</if>> <<if $activeSlave.geneticQuirks.rearLipedema == 2>> $His body uncontrollably builds fat on $his rear resulting in constant growth. + <<elseif $activeSlave.geneticQuirks.rearLipedema == 1 && $geneticMappingUpgrade >= 2>> + $He is a carrier of a genetic flaw that causes lipedema. <</if>> <</if>> -- GitLab