diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index ae302be629018b9d55a8619630cf56f3cd2526b5..214f9cd9a7933d41d478fd84b3ead68446e5f3fc 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -15387,7 +15387,7 @@ window.DefaultRules = (function() { } else if ((rule.growth_boobs == "no default setting" && rule.growth_butt == "no default setting" && rule.growth_lips == "no default setting" && rule.growth_dick == "no default setting" && rule.growth_dick == "no default setting" && rule.growth_balls == "no default setting")) { return; } - if (slave.assignmentVisible) { // More resource intensive version with prioritizing. Possible to give this a toggle rather than basing it on visibility. + if (!rule.hyper_drugs) { // More resource intensive version with prioritizing. let _priorities = []; if (rule.growth_boobs != "no default setting") { let _priority; @@ -15484,15 +15484,10 @@ window.DefaultRules = (function() { return; } } else { - let _hyper; - if (V.arcologies[0].FSAssetExpansionistResearch == 1) - _hyper = "hyper "; - else - _hyper = ""; if (rule.growth_boobs != "no default setting") { if (slave.boobs < rule.growth_boobs) { - if (slave.drugs != _hyper + "breast injections") { - slave.drugs = _hyper + "breast injections"; + if (slave.drugs != "hyper breast injections") { + slave.drugs = "hyper breast injections"; r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`; } return; @@ -15500,8 +15495,8 @@ window.DefaultRules = (function() { } if (rule.growth_butt != "no default setting") { if (slave.butt < rule.growth_butt) { - if (slave.drugs != _hyper + "butt injections") { - slave.drugs = _hyper + "butt injections"; + if (slave.drugs != "hyper butt injections") { + slave.drugs = "hyper butt injections"; r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`; } return; @@ -15518,8 +15513,8 @@ window.DefaultRules = (function() { } if (rule.growth_dick != "no default setting" && slave.dick) { if (slave.dick < rule.growth_dick) { - if (slave.drugs != _hyper + "penis enhancement") { - slave.drugs = _hyper + "penis enhancement"; + if (slave.drugs != "hyper penis enhancement") { + slave.drugs = "hyper penis enhancement"; r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`; } return; @@ -15527,8 +15522,8 @@ window.DefaultRules = (function() { } if (rule.growth_balls != "no default setting" && slave.balls) { if (slave.balls < rule.growth_balls) { - if (slave.drugs != _hyper + "testicle enhancement") { - slave.drugs = _hyper + "testicle enhancement"; + if (slave.drugs != "hyper testicle enhancement") { + slave.drugs = "hyper testicle enhancement"; r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`; } return; @@ -17794,6 +17789,8 @@ window.rulesAssistantOptions = (function() { class RegimenSection extends Section { constructor() { super("Physical Regimen Settings"); + if (V.arcologies[0].FSAssetExpansionistResearch === 1) + this.appendChild(new HyperGrowthSwitch()); this.appendChild(new GrowthList()); this.appendChild(new CurrativesList()); this.appendChild(new AphrodisiacList()); @@ -18288,6 +18285,18 @@ window.rulesAssistantOptions = (function() { } } + class HyperGrowthSwitch extends List { + constructor() { + const pairs = [ + ["No", 0], + ["Yes", 1], + ]; + super("Use hyper growth drugs", pairs, true); + this.setValue(current_rule.set.hyper_drugs); + this.onchange = (value) => current_rule.set.hyper_drugs = value; + } + } + class GrowthList extends Options { constructor() { super(); diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw index 2f60d4ab562a07b290d344bc05ae9826d67e7546..d9bc69af428db1d5e4a9eac96255e04ec002eabc 100644 --- a/src/js/DefaultRules.tw +++ b/src/js/DefaultRules.tw @@ -1007,7 +1007,7 @@ window.DefaultRules = (function() { } else if ((rule.growth_boobs == "no default setting" && rule.growth_butt == "no default setting" && rule.growth_lips == "no default setting" && rule.growth_dick == "no default setting" && rule.growth_dick == "no default setting" && rule.growth_balls == "no default setting")) { return; } - if (slave.assignmentVisible) { // More resource intensive version with prioritizing. Possible to give this a toggle rather than basing it on visibility. + if (!rule.hyper_drugs) { // More resource intensive version with prioritizing. let _priorities = []; if (rule.growth_boobs != "no default setting") { let _priority; @@ -1104,15 +1104,10 @@ window.DefaultRules = (function() { return; } } else { - let _hyper; - if (V.arcologies[0].FSAssetExpansionistResearch == 1) - _hyper = "hyper "; - else - _hyper = ""; if (rule.growth_boobs != "no default setting") { if (slave.boobs < rule.growth_boobs) { - if (slave.drugs != _hyper + "breast injections") { - slave.drugs = _hyper + "breast injections"; + if (slave.drugs != "hyper breast injections") { + slave.drugs = "hyper breast injections"; r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`; } return; @@ -1120,8 +1115,8 @@ window.DefaultRules = (function() { } if (rule.growth_butt != "no default setting") { if (slave.butt < rule.growth_butt) { - if (slave.drugs != _hyper + "butt injections") { - slave.drugs = _hyper + "butt injections"; + if (slave.drugs != "hyper butt injections") { + slave.drugs = "hyper butt injections"; r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`; } return; @@ -1138,8 +1133,8 @@ window.DefaultRules = (function() { } if (rule.growth_dick != "no default setting" && slave.dick) { if (slave.dick < rule.growth_dick) { - if (slave.drugs != _hyper + "penis enhancement") { - slave.drugs = _hyper + "penis enhancement"; + if (slave.drugs != "hyper penis enhancement") { + slave.drugs = "hyper penis enhancement"; r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`; } return; @@ -1147,8 +1142,8 @@ window.DefaultRules = (function() { } if (rule.growth_balls != "no default setting" && slave.balls) { if (slave.balls < rule.growth_balls) { - if (slave.drugs != _hyper + "testicle enhancement") { - slave.drugs = _hyper + "testicle enhancement"; + if (slave.drugs != "hyper testicle enhancement") { + slave.drugs = "hyper testicle enhancement"; r += `<br>${slave.slaveName} has been put on ${slave.drugs}.`; } return; diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw index 2e8f49cbe35dac54a05f4bbacf34589668e23771..1c09c07fcac69e692e6d6b104cacc515346a97b6 100644 --- a/src/js/rulesAssistantOptions.tw +++ b/src/js/rulesAssistantOptions.tw @@ -933,6 +933,8 @@ window.rulesAssistantOptions = (function() { class RegimenSection extends Section { constructor() { super("Physical Regimen Settings"); + if (V.arcologies[0].FSAssetExpansionistResearch === 1) + this.appendChild(new HyperGrowthSwitch()); this.appendChild(new GrowthList()); this.appendChild(new CurrativesList()); this.appendChild(new AphrodisiacList()); @@ -1427,6 +1429,18 @@ window.rulesAssistantOptions = (function() { } } + class HyperGrowthSwitch extends List { + constructor() { + const pairs = [ + ["No", 0], + ["Yes", 1], + ]; + super("Use hyper growth drugs", pairs, true); + this.setValue(current_rule.set.hyper_drugs); + this.onchange = (value) => current_rule.set.hyper_drugs = value; + } + } + class GrowthList extends Options { constructor() { super(); diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 569718416feeca7a28b17a9d64dc537caa141165..bff4ca5e155e9c112d711409b5744ff4d1678d14 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -3689,6 +3689,9 @@ Done! <<if ndef _rule.legAccessory>> <<set _rule.legAccessory = "no default setting">> <</if>> + <<if ndef _rule.hyper_drugs>> + <<set _rule.hyper_drugs = 0>> + <</if>> <</for>> <<if $releaseID < 1032>>