From c22643d48e4d40543049d74b97117b8ed7c16218 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 20 May 2019 02:22:20 -0400
Subject: [PATCH] new genetic quirk initialization
---
slave variables documentation - Pregmod.txt | 5 +++++
src/js/SlaveState.js | 4 ++++
src/js/generateGenetics.js | 2 ++
src/pregmod/widgets/pregmodWidgets.tw | 4 ++--
src/uncategorized/BackwardsCompatibility.tw | 9 ++++++++-
5 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 46b341ef000..2f1bbe36da5 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -3005,6 +3005,11 @@ wGain - slave constantly gains weight unless dieting, easier to gain weight
wLoss - slave constantly loses weight unless gaining, easier to lose weight
wGain + wLoss - slave weight gain/loss fluctuates randomly
+
+mGain - slave constantly gains muscle mass, easier to gain muscle.
+mLoss - slave constantly loses muscle mass, easier to gain muscle.
+mGain + mLoss - slave muscle gain/loss aplified, passively lose muscle unless building
+
androgyny - slave's body attempts to normalize to an androgynous state
}
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 8d9c3286686..104fc58e8a1 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -1994,6 +1994,10 @@ App.Entity.SlaveState = class SlaveState {
wLoss: 0,
/** body attempts to normalize to an androgynous state */
androgyny: 0,
+ /** constantly gains muscle mass, easier to gain muscle. mGain + mLoss - muscle gain/loss aplified, passively lose muscle unless building */
+ mGain: 0,
+ /** constantly loses muscle mass, easier to gain muscle. mGain + mLoss - muscle gain/loss aplified, passively lose muscle unless building */
+ mLoss: 0,
/** slave can only ever birth girls */
girlsOnly: 0
};
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 21e6cf1255d..b7b818349fa 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -704,6 +704,8 @@ window.generateGenetics = (function() {
wellHung: 0,
wGain: 0,
wLoss: 0,
+ mGain: 0,
+ mLoss: 0,
androgyny: 0
};
let chance = 0;
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 738dd3d4ca4..f1229a97ba3 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1,7 +1,7 @@
:: pregmod widgets [nobr widget]
<<widget "initPC">>
- <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, genes: "XY", pronoun: "he", possessive: "him", object: "his", dick: 1, vagina: 0, preg: 0, pregType: 0, pregWeek: 0, pregKnown: 0, fertKnown: 0, fertPeak: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, lactation: 0, lactationDuration: 0, career: "capitalist", rumor: "wealth", birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, hacking: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", pupil: "circular", sclerae: "white", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, birthLab: 0, birthFutaSis: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 100, face: 100, faceShape: "normal", actualAge: 35, physicalAge: 35, visualAge: 35, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, reservedChildrenNursery: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35, eggType: "human", ballType: "human", storedCum: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", fetish: "none", pubicHStyle: "hairless", underArmHStyle: "hairless", geneticQuirks: {macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, heterochromia: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, androgyny: 0, girlsOnly: 0}}>>
+ <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, genes: "XY", pronoun: "he", possessive: "him", object: "his", dick: 1, vagina: 0, preg: 0, pregType: 0, pregWeek: 0, pregKnown: 0, fertKnown: 0, fertPeak: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, lactation: 0, lactationDuration: 0, career: "capitalist", rumor: "wealth", birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, hacking: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", pupil: "circular", sclerae: "white", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, birthLab: 0, birthFutaSis: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 100, face: 100, faceShape: "normal", actualAge: 35, physicalAge: 35, visualAge: 35, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, reservedChildrenNursery: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35, eggType: "human", ballType: "human", storedCum: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", fetish: "none", pubicHStyle: "hairless", underArmHStyle: "hairless", geneticQuirks: {macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, heterochromia: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, mGain: 0, mLoss: 0, androgyny: 0, girlsOnly: 0}}>>
<<set WombInit($PC)>>
@@ -9,7 +9,7 @@
<<widget "PMODinit">>
-<<set $args[0].geneticQuirks = Object.assign({macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, heterochromia: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, androgyny: 0, girlsOnly: 0}, $args[0].geneticQuirks)>>
+<<set $args[0].geneticQuirks = Object.assign({macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, heterochromia: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, mGain: 0, mLoss: 0, androgyny: 0, girlsOnly: 0}, $args[0].geneticQuirks)>>
<<set WombInit($args[0])>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 49ebb98f48f..7fce69a8e5d 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1,4 +1,5 @@
:: Backwards Compatibility [nobr]
+
/* no-usedOnce disabling checking for only used once instances in this file*/
<<set $nextButton = "Continue", $nextLink = "Main", $returnTo = "Main">>
@@ -387,7 +388,7 @@
<<set $PC.ballType = "human">>
<</if>>
<<if ndef $PC.geneticQuirks>>
- <<set $PC.geneticQuirks = {macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, heterochromia: 0, rearLipedema: 0, wellHung: 1, wGain: 0, wLoss: 0, androgyny: 0}>>
+ <<set $PC.geneticQuirks = {macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, heterochromia: 0, rearLipedema: 0, wellHung: 1, wGain: 0, wLoss: 0, mGain: 0, mLoss: 0, androgyny: 0, girlsOnly: 0}>>
<<if $PC.birthMaster > 0>>
<<set $PC.geneticQuirks.fertility = 2>>
<<elseif $PC.career == "servant">>
@@ -400,6 +401,12 @@
<<if ndef $PC.geneticQuirks.girlsOnly>>
<<set $PC.geneticQuirks.girlsOnly = 0>>
<</if>>
+ <<if ndef $PC.geneticQuirks.mGain>>
+ <<set $PC.geneticQuirks.mGain = 0>>
+ <</if>>
+ <<if ndef $PC.geneticQuirks.mLoss>>
+ <<set $PC.geneticQuirks.mLoss = 0>>
+ <</if>>
<</if>>
<<if $releaseID < 1032>>
<<if $PC.pregSource == -1>>
--
GitLab