diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index c72735db34e66b720d411c66980df146a6c373b6..c9fed88557d9105b803993de168b1747715bb2e0 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -2343,7 +2343,7 @@ Number.prototype.toFixedHTML = function() { return commaNum(Number.prototype.toFixed.apply(this, arguments)).replace(/\.0+$/, '<span style="opacity: 0.3">$&</span>'); } -//:: rulesAssistant [script] +/*:: rulesAssistant [script]*/ window.hasSurgeryRule = function(slave, rules) { return rules.some( @@ -9906,7 +9906,7 @@ window.sortIncubatorPossiblesByPreviousSort = function () { } }; -//:: DefaultRules [script] +/*:: DefaultRules [script]*/ // this code applies RA rules onto slaves window.DefaultRules = (function() { @@ -11987,7 +11987,7 @@ window.DefaultRules = (function() { return DefaultRules; })(); -//:: Rules Assistant Options [script] +/*:: Rules Assistant Options [script]*/ // rewrite of the rules assistant options page in javascript // uses an object-oriented widget pattern // wrapped in a closure so as not to polute the global namespace @@ -12444,7 +12444,7 @@ window.rulesAssistantOptions = (function() { this.appendChild(new OptionsItem("New Rule", () => newRule(root))); this.appendChild(new OptionsItem("Remove Rule", () => removeRule(root))); this.appendChild(new OptionsItem("Apply rules", () => this.appendChild(new ApplicationLog()))); - this.appendChild(new OptionsItem("Lower Priotity", () => lowerPriority(root))); + this.appendChild(new OptionsItem("Lower Priority", () => lowerPriority(root))); this.appendChild(new OptionsItem("Higher Priority", () => higherPriority(root))); this.appendChild(new OptionsItem("Rename", () => this.appendChild(new RenameField(root)))); this.appendChild(new OptionsItem("Export this rule", () => this.appendChild(new ExportField(current_rule)))); @@ -15081,7 +15081,7 @@ window.rulesAssistantOptions = (function() { return rulesAssistantOptions; })(); -//:: rules autosurgery js [script] +/*:: rules autosurgery js [script]*/ window.rulesAutosurgery = (function() { "use strict"; diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw index e482233bd900685eb6a86a73524c9fd220df3885..3a503be0878dbbead4fb19f121126693ce26c35d 100644 --- a/src/js/rulesAssistantOptions.tw +++ b/src/js/rulesAssistantOptions.tw @@ -455,7 +455,7 @@ window.rulesAssistantOptions = (function() { this.appendChild(new OptionsItem("New Rule", () => newRule(root))); this.appendChild(new OptionsItem("Remove Rule", () => removeRule(root))); this.appendChild(new OptionsItem("Apply rules", () => this.appendChild(new ApplicationLog()))); - this.appendChild(new OptionsItem("Lower Priotity", () => lowerPriority(root))); + this.appendChild(new OptionsItem("Lower Priority", () => lowerPriority(root))); this.appendChild(new OptionsItem("Higher Priority", () => higherPriority(root))); this.appendChild(new OptionsItem("Rename", () => this.appendChild(new RenameField(root)))); this.appendChild(new OptionsItem("Export this rule", () => this.appendChild(new ExportField(current_rule)))); diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 6dd8123f2bbc866e25c7257f154efb5d5f96db6e..8c7b9b67c2083a3c123fc604ea5ea77dda7053b4 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -6150,7 +6150,7 @@ <</if>> /* There really is no good place for this since saRules is too early and saRivals/saRelationships is too late */ -<<if $slaves[$i].rivalry > 1>> +<<if $slaves[$i].rivalry > 1 && $universalRulesConsent == 0>> <<set _j = $slaveIndices[$slaves[$i].rivalryTarget]>> <<if def _j && isSlaveAvailable($slaves[$i]) && isSlaveAvailable($slaves[_j])>> /* rape time */ <<set _fuckCount = random(1,(Math.ceil($slaves[$i].energy/10)+1))>> diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw index 679a7dd213048c5dc9aa4cea864c51b7ca342b7f..2e37686f41f97dd3b50dc13afc4937201c7a7cd6 100644 --- a/src/utility/extendedFamilyWidgets.tw +++ b/src/utility/extendedFamilyWidgets.tw @@ -605,7 +605,7 @@ <<if _twins.length > 2>> @@.lightgreen;shared a cramped womb with <<print _twins.reduce(function(res, ch, i, arr) { return (res.slaveName || res) + (i == arr.length - 1 ? ' and ' : ', ') + ch.slaveName; })>>.@@ <<elseif _twins.length > 1>> - is a @@.lightgreen;one of a set of triplets; _twins[0].slaveName and _twins[1].slaveName@@ complete the trio. + is @@.lightgreen;one of a set of triplets; _twins[0].slaveName and _twins[1].slaveName@@ complete the trio. <<else>> is @@.lightgreen;twins with _twins[0].slaveName.@@ <</if>> diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index 3838a83031131c8248b75e2bd6c2af77730452ca..e2149e49376985ed397f68f5122ab6d6895fd938 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -3687,7 +3687,7 @@ <<set $activeSlave.fetish = "none">> <<set $activeSlave.chem = 10 * random(1,3)>> <<set $activeSlave.butt = random(2,4)>> - <<set $activeSlave.boobs = random(30,60) * 10>> + <<set $activeSlave.boobs = random(3,6) * 100>> <<set $activeSlave.preg = 0>> <<run SetBellySize($activeSlave)>> <<set $activeSlave.teeth = "normal">>