diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 1342cedb0711246cff669bd194e61d60fad566b8..5c5d732dc7fefbcd19014c6805dc37e944006e40 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,10 @@ Pregmod 0.10.7.1-2.2.x + -player medicine and trading skill now more useful + -fixes + -code cleaning + 03/15/2019 5 diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt index eaa0c078f9caaa47a06d4b98aade759af919f19b..e838f56558a9774e4a59bd8a70b09108dcb478ab 100644 --- a/player variables documentation - Pregmod.txt +++ b/player variables documentation - Pregmod.txt @@ -102,6 +102,7 @@ who knocked you up -6 - Societal Elite -7 - designer baby -8 - an animal +-9 - futanari sister pregMood: diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt index 31a49b369bdef74bc727f41511d4a99313199b2f..2032d4c979679ee401a6bb6da7b429c676976109 100644 --- a/slave variables documentation - Pregmod.txt +++ b/slave variables documentation - Pregmod.txt @@ -1864,6 +1864,7 @@ Who sired her pregnancy -6 - Societal Elite -7 - designer baby -8 - an animal +-9 - futanari sister pregType: diff --git a/src/cheats/PCCheatMenu.tw b/src/cheats/PCCheatMenu.tw index b8a6182d3c2778933c977b4d7b1b3f99a4294e92..06ca28ae58cd9f190cb0193a67e101fb83f74cef 100644 --- a/src/cheats/PCCheatMenu.tw +++ b/src/cheats/PCCheatMenu.tw @@ -89,7 +89,7 @@ Sex: ''$tempSlave.genes'' __pregnancy__ <br>''Pregnancy length'': <<textbox "$tempSlave.preg" $tempSlave.preg>> //how far along your pregnancy is (pregMood kicks in at 24+ weeks) - -2: infertile, -1: contraceptives, 0: not pregnant, 1 - 42: pregnant, 43+: giving birth// <br>''Fetus Count'': <<textbox "$tempSlave.pregType" $tempSlave.pregType>> //how many you're having (1-8)// - <br>''PregSource'': <<textbox "$tempSlave.pregSource" $tempSlave.pregSource>> //who knocked you up - 0: unknown, -1: self-impreg, -2: citizen, -3: former master, -4: male arc owner, -5: client, -6: Societal Elite, -7: designer baby// + <br>''PregSource'': <<textbox "$tempSlave.pregSource" $tempSlave.pregSource>> //who knocked you up - 0: unknown, -1: self-impreg, -2: citizen, -3: former master, -4: male arc owner, -5: client, -6: Societal Elite, -7: designer baby, -9: Futanari Sister// <br>''PregMood'': <<textbox "$tempSlave.pregMood" $tempSlave.pregMood>> //how you act when heavily pregnant - 0: no change, 1: submissive and motherly, 2: aggressive and dominant// <</if>> diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js index 78828d789378216eb62bf4bfb40872a100623970..cb6e8e09b3fb572cc7cfc24b18904c5e75ff2a47 100644 --- a/src/js/SlaveState.js +++ b/src/js/SlaveState.js @@ -792,6 +792,7 @@ App.Entity.SlaveState = class SlaveState { * accepts ID See Pregnancy Control section for more. * * Who sired her pregnancy + * * -9: a futanari sister * * -8: an animal * * -7: designer baby * * -2: Citizen of your arcology diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js index 338f3c5a6a5303be509d558af32bddcd2cab11c5..78275bcd539bdd8b12cefd3711a596afecd5f214 100644 --- a/src/js/datatypeCleanupJS.js +++ b/src/js/datatypeCleanupJS.js @@ -1239,6 +1239,7 @@ window.PCDatatypeCleanup = function PCDatatypeCleanup() { PC.birthCitizen = Math.max(+PC.birthCitizen, 0) || 0; PC.birthSelf = Math.max(+PC.birthSelf, 0) || 0; PC.birthLab = Math.max(+PC.birthLab, 0) || 0; + PC.birthFutaSis = Math.max(+PC.birthFutaSis, 0) || 0; PC.slavesFathered = Math.max(+PC.slavesFathered, 0) || 0; PC.slavesKnockedUp = Math.max(+PC.slavesKnockedUp, 0) || 0; PC.intelligence = 100; diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js index c76f15559a38cf3b21d6e4107396a5c411be60b7..ab2ecd182805213af0243f19ec857293ff5d809f 100644 --- a/src/js/generateGenetics.js +++ b/src/js/generateGenetics.js @@ -25,7 +25,7 @@ window.generateGenetics = (function() { mother = V.PC; } if (actor2 > 0) { - father = V.genePool.find(function(s) { return s.ID === actor2.ID; }); + father = V.genePool.find(function(s) { return s.ID === actor2; }); activeFather = V.slaves[V.slaveIndices[actor2]]; if (father === undefined) { father = V.slaves[V.slaveIndices[actor2]]; @@ -33,13 +33,13 @@ window.generateGenetics = (function() { } if (father === undefined) { if (V.incubator > 0) { - father = V.tanks.find(function(s) { return s.ID === actor2.ID; }); + father = V.tanks.find(function(s) { return s.ID === actor2; }); activeFather = 0; // activeFather = father? } } if (father === undefined) { if (V.nursery > 0) { - father = V.cribs.find(function(s) { return s.ID === actor2.ID; }); + father = V.cribs.find(function(s) { return s.ID === actor2; }); activeFather = 0; // activeFather = father? } } diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw index 7e79a4668ad092d66b39f6d719209a06cdc81e83..dd0461a40fec31fd1f46e0294eee7a74b4e1af39 100644 --- a/src/npc/fFeelings.tw +++ b/src/npc/fFeelings.tw @@ -380,6 +380,10 @@ My favorite part of my body i<<s>> my fa<<c>>e, <<if ($activeSlave.face > 10)>>it'<<s>> ni<<c>>e to be pretty<<else>>I gue<<ss>><</if>>. <</if>> +<<if $activeSlave.pregSource == -9 && $activeSlave.bellyPreg >= 5000 && $activeSlave.devotion > 0>> + My little <<s>>i<<s>>ter i<<s>> getting big; do you think <<sh>>e'll be a good little futa like me <<s>>omeday? +<</if>> + <<if $activeSlave.need>> <<if $activeSlave.amp != 1>> <<if _lisping == 0>> diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw index e5eed600f20d38d65be85b15dd0157b9cc54ecbb..55126b69c4934e02adcee0af52bc0a3db49a1171 100644 --- a/src/pregmod/csec.tw +++ b/src/pregmod/csec.tw @@ -40,6 +40,9 @@ <<elseif $activeSlave.curBabies[_cb].fatherID == -7>> <<set _lab++>> <<set _fathers.push("the gene lab's")>> + <<elseif $activeSlave.curBabies[_cb].fatherID == -9>> + <<set _lab++>> + <<set _fathers.push("a Futanari Sister's")>> <<else>> <<set _babyDaddy = findFather($activeSlave.curBabies[_cb].fatherID)>> <<if def _babyDaddy>> diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw index 59293799e98762c02a25595ceadcfea251567a82..e7c6c9938d78791d3c3499a23cdf557b02715ded 100644 --- a/src/pregmod/managePersonalAffairs.tw +++ b/src/pregmod/managePersonalAffairs.tw @@ -553,6 +553,9 @@ In total, you have given birth to: <<if $PC.birthCitizen > 0>> <br><<print commaNum($PC.birthCitizen)>> bab<<if $PC.birthCitizen > 1>>ies<<else>>y<</if>> from sex with arcology citizens. <</if>> + <<if $PC.birthFutaSis > 0>> + <br><<print commaNum($PC.birthFutaSis)>> bab<<if $PC.birthFutaSis > 1>>ies<<else>>y<</if>> conceived during orgies with the Futanari Sisters. + <</if>> <<if $PC.birthOther > 0>> <br><<print commaNum($PC.birthOther)>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from sources you can't quite recall. <</if>> diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index 7c89e472c537972ca8a473bad9e941be9f3fc629..4ea78f894917a27eaa762c1a8b672b58e0b86f7c 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, 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, 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}}>> + <<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, 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}}>> <<set WombInit($PC)>> diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index 0ba79c5e55a442ef9e74175d4611cfdb283edf13..fc445c9fda38d31ac0608564f74dee09da139bbc 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -3735,6 +3735,7 @@ <<set $activeSlave.pregType = 1>> <</if>> <<set $activeSlave.pregWeek = $activeSlave.preg>> + <<set $activeSlave.pregSource = -9>> <</if>> <</if>> <<run SetBellySize($activeSlave)>>