From ff861f1c935c54ef2765ae546202faddb9190d40 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 1 Jul 2018 15:11:06 -0400
Subject: [PATCH] fixes, cleanup, and a little less unsanctioned rape
---
devNotes/twine JS.txt | 10 +++++-----
src/js/rulesAssistantOptions.tw | 2 +-
src/uncategorized/saLongTermEffects.tw | 2 +-
src/utility/extendedFamilyWidgets.tw | 2 +-
src/utility/slaveCreationWidgets.tw | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index c72735db34e..c9fed88557d 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 e482233bd90..3a503be0878 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 6dd8123f2bb..8c7b9b67c20 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 679a7dd2130..2e37686f41f 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 3838a830311..e2149e49376 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">>
--
GitLab