From 65ce28e6db6fe64a5999eecfaa9b1198eff6c01a Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Wed, 18 Jul 2018 02:25:18 -0400
Subject: [PATCH] Fixes
---
devNotes/twine JS.txt | 2 ++
src/js/assayJS.tw | 1 +
src/js/rulesAssistantOptions.tw | 1 +
src/js/slaveSummaryWidgets.tw | 3 ++-
src/utility/miscWidgets.tw | 2 --
5 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index c71ca5ca4f1..435ba18c211 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -7776,6 +7776,7 @@ window.MenialPopCap = function MenialPopCap () {
r += "You don't have enough room for all your menial bioreactors and are obliged to sell some.";
}
}
+ V.PopCap = popCap;
return r;
};
@@ -14988,6 +14989,7 @@ window.rulesAssistantOptions = (function() {
class SmartEnergyList extends List {
constructor() {
const pairs = [
+ ["No default setting", "no default setting"],
["Nympho", 100],
["Sex Addict", 85],
["Powerful", 65],
diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw
index 76303be830a..0a1a30e2d2f 100644
--- a/src/js/assayJS.tw
+++ b/src/js/assayJS.tw
@@ -1416,5 +1416,6 @@ window.MenialPopCap = function MenialPopCap () {
r += "You don't have enough room for all your menial bioreactors and are obliged to sell some.";
}
}
+ V.PopCap = popCap;
return r;
};
diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index e42f161bc1d..06f2f42da16 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -1876,6 +1876,7 @@ window.rulesAssistantOptions = (function() {
class SmartEnergyList extends List {
constructor() {
const pairs = [
+ ["No default setting", "no default setting"],
["Nympho", 100],
["Sex Addict", 85],
["Powerful", 65],
diff --git a/src/js/slaveSummaryWidgets.tw b/src/js/slaveSummaryWidgets.tw
index d8d0b158f06..cca08a6b281 100644
--- a/src/js/slaveSummaryWidgets.tw
+++ b/src/js/slaveSummaryWidgets.tw
@@ -101,6 +101,7 @@ window.SlaveSummaryUncached = (function(){
short_implants(slave);
short_lactation(slave);
short_mods(slave);
+ r += `</span>`;
} else if (V.abbreviatePhysicals === 2) {
long_age(slave);
long_face(slave);
@@ -2144,7 +2145,7 @@ window.SlaveSummaryUncached = (function(){
if (slave.brand !== 0) {
r += `Br`;
}
- r += `</span> `;
+ r += " ";
}
function long_age(slave) {
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index af245756fe0..59083430724 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -1246,9 +1246,7 @@
$args[0]: Slave.
%/
<<widget "AddSlave">>
-<<silently>> /* making absolutely sure the call to DefaultRules() doesn't print anything */
<<run newSlave($args[0])>>
-<</silently>>
<</widget>>
<<widget "Master">><<if def $args[0]>><<run Enunciate($args[0])>><<elseif ndef $titleEnunciate>><<run Enunciate($activeSlave)>><</if>>$titleEnunciate<</widget>>
--
GitLab