diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 1ceb069520c5fbecc5c8c3e6f17e421bd6fed117..c7f8bd1a09793d9c2b8f0b1d8053bfdf295e98ee 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -7846,6 +7846,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; }; @@ -15077,6 +15078,7 @@ window.rulesAssistantOptions = (function() { class SmartEnergyList extends List { constructor() { const pairs = [ + ["No default setting", "no default setting"], ["Nympho", 100], ["Sex Addict", 85], ["Powerful", 65], @@ -17635,6 +17637,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); @@ -17703,7 +17706,7 @@ window.SlaveSummaryUncached = (function(){ long_behavior_quirk(slave); long_sex_quirk(slave); } - if (slave.customLabel !== "") + if (slave.customLabel != "") r += `<strong><span class="yellow">${slave.customLabel}</span></strong>`; if ((slave.relationship !== 0) || (slave.relation !== 0) || (V.abbreviateClothes === 2) || (V.abbreviateRulesets === 2)) { r += `<br>`; @@ -19678,7 +19681,7 @@ window.SlaveSummaryUncached = (function(){ if (slave.brand !== 0) { r += `Br`; } - r += `</span> `; + r += " "; } function long_age(slave) { diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw index 76303be830a69013e8af655f18fe2034769f3463..0a1a30e2d2fdddd4fccdcbdeedffa38844b3aed3 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 e42f161bc1d53ce764ca5babe06b2181558da7d1..06f2f42da16b8f3b5a0ce8122bcfef77f8b084e4 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 bd421f076f289582a65ff9c392e034135e653f98..1610af155566a38141952e5a2a06f16b5cdd671a 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); @@ -169,7 +170,7 @@ window.SlaveSummaryUncached = (function(){ long_behavior_quirk(slave); long_sex_quirk(slave); } - if (slave.customLabel !== "") + if (slave.customLabel != "") r += `<strong><span class="yellow">${slave.customLabel}</span></strong>`; if ((slave.relationship !== 0) || (slave.relation !== 0) || (V.abbreviateClothes === 2) || (V.abbreviateRulesets === 2)) { r += `<br>`; @@ -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 af245756fe09a2d9692ee9035af692e3d739d132..59083430724b64d50fc60b79da002ae9e66a66fb 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>>