From 76a570add2dc128ac4b25e240fdc1e7700b7a62a Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 8 Jan 2019 12:05:03 -0500 Subject: [PATCH] fixes --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 5 ++++ devNotes/twine JS.txt | 7 +++-- src/js/utilJS.tw | 30 +++++++++++--------- src/pregmod/organFarm.tw | 4 +-- 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index b34c5fa3acc..361c8df7434 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,11 @@ 0.10.7.1-1.5.x +01/08/2019 + + 4 + -more fixes and cleaning + 01/05/2019 3 diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 6e728ee983a..4af98e2d717 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -4323,17 +4323,18 @@ window.induceLactation = function induceLactation(slave) { }; window.ResearchLabStockPile = function() { + V = State.variables; return `__Stockpile__ - Prosthetics interfaces: ${commaNum($stockpile.basicPLimbInterface + $stockpile.advPLimbInterface)} + Prosthetics interfaces: ${commaNum(V.stockpile.basicPLimbInterface + V.stockpile.advPLimbInterface)} Basic : $stockpile.basicPLimbInterface Advanced: $stockpile.advPLimbInterface - Limbs: ${commaNum($stockpile.basicPLimb + $stockpile.advSexPLimb + $stockpile.advGracePLimb + $stockpile.advCombatPLimb + $stockpile.cyberneticPLimb)} + Limbs: ${commaNum(V.stockpile.basicPLimb + V.stockpile.advSexPLimb + V.stockpile.advGracePLimb + V.stockpile.advCombatPLimb + V.stockpile.cyberneticPLimb)} Basic: $stockpile.basicPLimb Sex: $stockpile.advSexPLimb Beauty: $stockpile.advGracePLimb Combat: $stockpile.advCombatPLimb Cybernetic: $stockpile.cyberneticPLimb - Implants: ${commaNum($stockpile.ocularImplant + $stockpile.cochlearImplant + $stockpile.erectileImplant)} + Implants: ${commaNum(V.stockpile.ocularImplant + V.stockpile.cochlearImplant + V.stockpile.erectileImplant)} Ocular: $stockpile.ocularImplant Cochlear: $stockpile.cochlearImplant // Erectile: $stockpile.erectileImplant// diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw index dbad455c2d1..7b00d5a4839 100644 --- a/src/js/utilJS.tw +++ b/src/js/utilJS.tw @@ -1126,19 +1126,23 @@ window.removeDuplicates = function removeDuplicates(array) { return [...new Set(array)]; }; -window.induceLactation = function induceLactation(slave) { - let pronouns = getPronouns(slave); - let His = capFirstChar(pronouns.possessive); - let r = ``; - if (slave.induceLactation >= 10) { - if (jsRandom(1,100) < slave.induceLactation) { - r += `${His} breasts have been stimulated often enough to @@.lime;induce lactation.@@` - slave.induceLactation = 0; - slave.lactationDuration = 2; - slave.lactation = 1; - } - } - return r; +window.ResearchLabStockPile = function() { + V = State.variables; + return `__Stockpile__ + Prosthetics interfaces: ${commaNum(V.stockpile.basicPLimbInterface + V.stockpile.advPLimbInterface)} + Basic : $stockpile.basicPLimbInterface + Advanced: $stockpile.advPLimbInterface + Limbs: ${commaNum(V.stockpile.basicPLimb + V.stockpile.advSexPLimb + V.stockpile.advGracePLimb + V.stockpile.advCombatPLimb + V.stockpile.cyberneticPLimb)} + Basic: $stockpile.basicPLimb + Sex: $stockpile.advSexPLimb + Beauty: $stockpile.advGracePLimb + Combat: $stockpile.advCombatPLimb + Cybernetic: $stockpile.cyberneticPLimb + Implants: ${commaNum(V.stockpile.ocularImplant + V.stockpile.cochlearImplant + V.stockpile.erectileImplant)} + Ocular: $stockpile.ocularImplant + Cochlear: $stockpile.cochlearImplant + // Erectile: $stockpile.erectileImplant// + Electrolarynx: $stockpile.electrolarynx`; }; window.ResearchLabStockPile = function() { diff --git a/src/pregmod/organFarm.tw b/src/pregmod/organFarm.tw index 177ee4e970c..c0c2fada1e0 100644 --- a/src/pregmod/organFarm.tw +++ b/src/pregmod/organFarm.tw @@ -39,8 +39,8 @@ The Organ Farm <br> //Will allow the organ farm to rapidly grow organs without risk to the implantee's health.// <br> <<elseif ($organFarmUpgrade == 1) && ($rep > 10000*_PCSkillCheck)>> - [[Upgrade the organ farm with an experimental growth accelerator|Organ Farm][$cash -= 100000*_PCSkillCheck, $organFarmUpgrade = 2]] - //Costs <<print cashFormat(50000*_PCSkillCheck)>>// + [[Upgrade the organ farm with an experimental growth accelerator|Organ Farm][$cash -= 75000*_PCSkillCheck, $organFarmUpgrade = 2]] + //Costs <<print cashFormat(75000*_PCSkillCheck)>>// <br> //Will allow the organ farm to quickly grow organs. Implanted organs may cause health issues.// <br> <</if>> -- GitLab