From f518ee8dec16b25cf03a870e184cad1b420e5472 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Wed, 10 Apr 2019 15:16:50 -0400 Subject: [PATCH] Updated variable for future expansion --- src/init/storyInit.tw | 4 ++-- src/pregmod/analyzePlayerPregnancy.tw | 2 +- src/pregmod/analyzePregnancy.tw | 2 +- src/pregmod/incubator.tw | 2 +- src/uncategorized/RESS.tw | 2 +- src/uncategorized/costsReport.tw | 4 ++-- src/uncategorized/costsWidgets.tw | 11 ++++++++++- src/uncategorized/remoteSurgery.tw | 2 +- src/uncategorized/saDrugs.tw | 6 +++--- src/uncategorized/saLongTermEffects.tw | 2 +- src/utility/descriptionWidgets.tw | 2 +- 11 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 2677f273813..47cd7488a7f 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", $pmodVer = "2.2.X", $releaseID = 1043>> -<<if ndef $pmodVer>><<set $pmodVer = "2.2.X">><</if>> +<<set $ver = "0.10.7", $pmodVer = "2.3.X", $releaseID = 1043>> +<<if ndef $pmodVer>><<set $pmodVer = "2.3.X">><</if>> /* This needs to be broken down into individual files that can be added to StoryInit instead. */ diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw index fe588df8d51..70961bb38aa 100644 --- a/src/pregmod/analyzePlayerPregnancy.tw +++ b/src/pregmod/analyzePlayerPregnancy.tw @@ -69,7 +69,7 @@ <br> Ova: $PC.womb[_ap].genetics.name - <<if $geneticMappingUpgrade == 1>> + <<if $geneticMappingUpgrade >= 1>> <br> Gender: $PC.womb[_ap].genetics.gender <br> diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw index 364e7b2b8d4..23f05afee63 100644 --- a/src/pregmod/analyzePregnancy.tw +++ b/src/pregmod/analyzePregnancy.tw @@ -75,7 +75,7 @@ <br> Age: $activeSlave.womb[_ap].age - <<if $geneticMappingUpgrade == 1>> + <<if $geneticMappingUpgrade >= 1>> <br> Gender: $activeSlave.womb[_ap].genetics.gender <br> diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw index 4ff23b3d2a8..c41e4525217 100644 --- a/src/pregmod/incubator.tw +++ b/src/pregmod/incubator.tw @@ -320,7 +320,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu <<capture $i>> <<setLocalPronouns $tanks[$i]>> <br><br>@@.pink;$tanks[$i].slaveName@@ occupies this tank. - <<if $geneticMappingUpgrade == 1>> + <<if $geneticMappingUpgrade >= 1>> $He is a <<if $tanks[$i].genes == "XX">>female<<else>>male<</if>> of $tanks[$i].race descent with $tanks[$i].eyeColor eyes, $tanks[$i].hColor hair and $tanks[$i].skin skin. Given $his parentage, $he is considered $tanks[$i].nationality. <<else>> $He appears to be <<if $tanks[$i].genes == "XX">>a natural girl<<else>>a natural boy<</if>>, with $tanks[$i].hColor hair<<if $tanks[$i].eyes != -2>> and $tanks[$i].eyeColor eyes.<<else>>. $He most likely will be blind.<</if>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index e0e1cc4d70d..9477c5c8bc4 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -3775,7 +3775,7 @@ Your slaves get dressed in a large wardrobe area adjacent to the dormitory, room apparently bigger today than it was yesterday. Intensive female hormone regimens like $hers sometimes cause minor ass expansion. <<elseif $activeSlave.buttImplantType == 1>> apparently a little bigger today than it was yesterday. String implants like $hers steadily grow if not regularly drained. -<<elseif $geneticMappingUpgrade == 1 && $activeSlave.geneticQuirks.rearLipedema == 2>> +<<elseif $geneticMappingUpgrade >= 1 && $activeSlave.geneticQuirks.rearLipedema == 2>> apparently a little bigger today than it was yesterday. $His body is constantly laying fat on $his ass and thighs, so this isn't really unexpected. <<elseif $activeSlave.buttImplant/$activeSlave.butt >= .5>> apparently a little bigger today than it was yesterday. Large implants like $hers normally cause some slight size fluctuations. diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw index 26e2e796e4e..0b0bcf35d94 100644 --- a/src/uncategorized/costsReport.tw +++ b/src/uncategorized/costsReport.tw @@ -524,7 +524,7 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 || <</if>> <<if ($slaves[$i].geneticQuirks.fertility == 2 && $slaves[$i].geneticQuirks.hyperFertility == 2 && $slaves[$i].preg == 0 && ($slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1))>> <br> - <<if $geneticMappingUpgrade == 1>> + <<if $geneticMappingUpgrade >= 1>> <i>Additional dietary supplements due to genetic hyper-fertility:</i> @@.yellowgreen;<<print cashFormat($foodCost/2)>>@@ <<else>> <i>Adjustment for unusual deitary deficiencies:</i> @@.yellowgreen;<<print cashFormat($foodCost/2)>>@@ @@ -533,7 +533,7 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 || <</if>> <<if ($slaves[$i].geneticQuirks.rearLipedema == 2)>> <br> - <<if $geneticMappingUpgrade == 1>> + <<if $geneticMappingUpgrade >= 1>> <i>Additional dietary supplements due to lipedema:</i> @@.yellowgreen;<<print cashFormat($foodCost/5)>>@@ <<else>> <i>Adjustment for unusual deitary deficiencies:</i> @@.yellowgreen;<<print cashFormat($foodCost/5)>>@@ diff --git a/src/uncategorized/costsWidgets.tw b/src/uncategorized/costsWidgets.tw index f410b561f36..ebcbad46848 100644 --- a/src/uncategorized/costsWidgets.tw +++ b/src/uncategorized/costsWidgets.tw @@ -107,13 +107,22 @@ <</if>> <<if ($args[0].geneticQuirks.fertility == 2 && $args[0].geneticQuirks.hyperFertility == 2 && $args[0].preg == 0 && ($args[0].ovaries == 1 || $args[0].mpreg == 1))>> <br> - <<if $geneticMappingUpgrade == 1>> + <<if $geneticMappingUpgrade >= 1>> <i>Additional dietary supplements due to genetic hyper-fertility:</i> @@.yellowgreen;<<print cashFormat($foodCost/2)>>@@ <<else>> <i>Adjustment for unusual deitary deficiencies:</i> @@.yellowgreen;<<print cashFormat($foodCost/2)>>@@ <</if>> <<set _individualCosts += $foodCost/2>> <</if>> + <<if ($args[0].geneticQuirks.rearLipedema == 2)>> + <br> + <<if $geneticMappingUpgrade >= 1>> + <i>Additional dietary supplements due to lipedema:</i> @@.yellowgreen;<<print cashFormat($foodCost/5)>>@@ + <<else>> + <i>Adjustment for unusual deitary deficiencies:</i> @@.yellowgreen;<<print cashFormat($foodCost/5)>>@@ + <</if>> + <<set _individualCosts += $foodCost/5>> + <</if>> <<if $args[0].drugs == "appetite suppressors">> <br> <i>Food saved via suppressed appetite:</i> //reduced by// @@.yellowgreen;<<print cashFormat($foodCost)>>@@ <<set _individualCosts -= $foodCost>> diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 26b28ca8842..9e49429cede 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -1381,7 +1381,7 @@ $He has <br><br> -<<if $geneticMappingUpgrade == 1>> +<<if $geneticMappingUpgrade >= 1>> Apply a retro-virus treatment: <br> <<if ($activeSlave.indentureRestrictions >= 1)>> diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index 4192f96d9cd..55fd645ed31 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -294,7 +294,7 @@ <</if>> <<if _rearQuirk != 0>> <<set _growth += 3>> - <<if $geneticMappingUpgrade == 1>> + <<if $geneticMappingUpgrade >= 1>> $His rear lipedema amplifies the drug's effects on $his bottom. <<else>> The drugs seem to have an added effect on $him. @@ -367,7 +367,7 @@ <</if>> <<if _rearQuirk != 0>> <<set _growth += 1>> - <<if $geneticMappingUpgrade == 1>> + <<if $geneticMappingUpgrade >= 1>> $His rear lipedema massively amplifies the drug's effects. <<else>> The drugs seem to have an added effect on $him. @@ -1056,7 +1056,7 @@ <<set $slaves[$i].drugs = "no drugs">> <<elseif _rearQuirk == 2>> $His @@.orange;waistline swells slightly,@@ but @@.lime;$his butt barely loses any mass@@ - <<if $geneticMappingUpgrade == 1>> + <<if $geneticMappingUpgrade >= 1>> due to $his rear lipedema putting it right back. <<else>> for an unknown reason. diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index d6ff92ba42c..372214faf4d 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -6722,7 +6722,7 @@ <</if>> <<if $slaves[$i].geneticQuirks.rearLipedema == 2 && $slaves[$i].butt < 20 && $slaves[$i].weight >= -95>> - <<if $geneticMappingUpgrade == 1>> + <<if $geneticMappingUpgrade >= 1>> $His body @@.lime;continues to lay fat on $his rear@@ due to $his lipedema. <</if>> <<set $slaves[$i].butt += .1>> diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw index 2edeb5a310c..ba81c8464d6 100644 --- a/src/utility/descriptionWidgets.tw +++ b/src/utility/descriptionWidgets.tw @@ -84,7 +84,7 @@ <<widget "geneticQuirkAssessment">> -<<if $geneticMappingUpgrade == 1>> +<<if $geneticMappingUpgrade >= 1>> <<if $activeSlave.geneticQuirks.albinism == 2>> $He is an albino. <</if>> -- GitLab