From aae6325b9f25a1eccb823d739dfedac6ee4d6b89 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Sat, 17 Nov 2018 12:13:55 -0500
Subject: [PATCH] Giving in to sanityCheck's demands
---
src/art/vector/Generate_Stylesheet.tw | 2 +-
src/init/setupVars.tw | 2 +-
src/pregmod/widgets/economyWidgets.tw | 8 ++++----
src/pregmod/widgets/marketWidgets.tw | 2 +-
src/pregmod/widgets/pregmodWidgets.tw | 6 +++---
src/uncategorized/main.tw | 4 ++--
src/uncategorized/saLongTermEffects.tw | 2 +-
src/uncategorized/slaveSummary.tw | 6 ------
8 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/src/art/vector/Generate_Stylesheet.tw b/src/art/vector/Generate_Stylesheet.tw
index 1d3f7bb50f4..77c8b874c91 100644
--- a/src/art/vector/Generate_Stylesheet.tw
+++ b/src/art/vector/Generate_Stylesheet.tw
@@ -8,7 +8,7 @@
<</if>>
<<set _art_display_class = "ad"+_art_display_id >>
-<<print "<style>."+_art_display_class+" {
+<<print "<style>."+_art_display_class+" { /*>> for sanityCheck*/
position: absolute;
height: 100%;
margin-left: auto;
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index c3de2c1f883..505d0f79091 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -1241,7 +1241,7 @@
/*
Name pool selector based on nationality and race. Use as follows, given some slave _slave:
-<<set _namePool =
+<<set _namePool = /* >> this comment is just here for sanity check *//*
(setup.namePoolSelector[_slave.nationality + "." + _slave.race]
|| setup.namePoolSelector[_slave.nationality]
|| setup.whiteAmericanSlaveNames)>>
diff --git a/src/pregmod/widgets/economyWidgets.tw b/src/pregmod/widgets/economyWidgets.tw
index f1268eb8be7..47e66354009 100644
--- a/src/pregmod/widgets/economyWidgets.tw
+++ b/src/pregmod/widgets/economyWidgets.tw
@@ -7,7 +7,7 @@
<<else>>
<<set _details = $args[0]>>
<<set _b = $facility.brothel>>
- <<run
+ <<run /*>> for sanityCheck*/
_b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0;
_b.rep = (def _b.rep) ? _b.rep : 0;
_b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0;
@@ -113,7 +113,7 @@
<<else>>
<<set _details = $args[0]>>
<<set _b = $facility.club>>
- <<run
+ <<run /*>> for sanityCheck*/
_b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0;
_b.rep = (def _b.rep) ? _b.rep : 0;
_b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0;
@@ -219,7 +219,7 @@
<<else>>
<<set _details = $args[0]>>
<<set _b = $facility.dairy>>
- <<run
+ <<run /*>> for sanityCheck*/
_b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0;
_b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0;
_b.maintenance = (def _b.maintenance) ? _b.maintenance : 0;
@@ -304,7 +304,7 @@
<<else>>
<<set _details = $args[0]>>
<<set _b = $facility.arcade>>
- <<run
+ <<run /*>> for sanityCheck*/
_b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0;
_b.rep = (def _b.rep) ? _b.rep : 0;
_b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0;
diff --git a/src/pregmod/widgets/marketWidgets.tw b/src/pregmod/widgets/marketWidgets.tw
index 77d4bd31c77..134ebb8ae5c 100644
--- a/src/pregmod/widgets/marketWidgets.tw
+++ b/src/pregmod/widgets/marketWidgets.tw
@@ -10,7 +10,7 @@
<<widget "AddMarketOrigins">>
<<if _.isString($args[0]) && _.isArray($args[1])>>
- <<set _widgets = _(Story.widgets)
+ <<set _widgets = _(Story.widgets) /*>> for sanityCheck*/
.filter(function(wp) { return wp.tags.includes('market:' + $args[0]); })
.flatMap(function(wp) {
var re = RegExp('<<widget\\s+"([^"]+Populate)"\\s*>>', 'g');
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index b0bfbacb983..6b6dc1fdd8e 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1072,20 +1072,20 @@ extremely pale -5
<<widget "ParentNames">>
<<set _currentSlaveNames = $slaves.map(s => s.slaveName)>>
-<<set $args[1].slaveName =
+<<set $args[1].slaveName = /*>> for sanityCheck*/
generateName($args[0].nationality, $args[1].race, $args[1].genes === "XY", sn => !_currentSlaveNames.includes(sn))>>
<<if !$args[1].slaveName>>
/* we ran out of names ... How? */
<<set _maxTries = 10>>
<<for _maxTries > 0 && !$args[1].slaveName>>
<<set _continentNationality = hashChoice($nationalities)>>
- <<set $args[1].slaveName =
+ <<set $args[1].slaveName = /*>> for sanityCheck*/
generateName(_continentNationality, $args[1].race, $args[1].genes === "XY", sn => !_currentSlaveNames.includes(sn))>>
<</for>>
<</if>>
<<if !$args[1].slaveName>>
/* give up, duplicate name is fine I guess */
- <<set $args[1].slaveName =
+ <<set $args[1].slaveName = /*>> for sanityCheck*/
generateName($args[0].nationality, $args[1].race, $args[1].genes === "XY")>>
<</if>>
<<unset _currentSlaveNames, _maxTries, _continentNationality>>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index eceeb378dcf..ba2c67f5717 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -51,7 +51,7 @@
<<set _duplicateSlaves = _($slaves).countBy(s => s.ID).pickBy(v => v > 1).keys().map(v => Number(v)).value()>>
<<foreach _i of _duplicateSlaves>>
<br><br>@@.red;Duplicate slave ID _i at indices
- <<= _($slaves)
+ <<= _($slaves) /*>> for sanityCheck*/
.map((s, idx) => ({ID: s.ID, idx: idx, name: s.slaveName, assignment: s.assignment}))
.filter(s => s.ID === _i).map(s => s.idx + ' - ' + s.name + ' (' + s.assignment + ')').join(', ')>>@@
<</foreach>>
@@ -71,7 +71,7 @@
<<set $nextButton = "END WEEK", $nextLink = "End Week", $showEncyclopedia = 1, $encyclopedia = "How to Play">>
<<set $costs = getCost($slaves)>>
-<<set
+<<set /*>> for sanityCheck*/
$arcologies[0].name = $arcologies[0].name || "Arcology X-4",
$brothelName = $brothelName || "the Brothel",
$brothelNameCaps = $brothelNameCaps || "The Brothel",
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index dd9f4df4f1f..f471df4e1e1 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -113,7 +113,7 @@
<</if>>
<<if $slaves[$i].assignmentVisible == 1>> /* OPENS AUTOSURGERY, CLOTHES, AND ACCESSORIES */
- <<if hasSurgeryRule($slaves[$i], $defaultRules) &&
+ <<if hasSurgeryRule($slaves[$i], $defaultRules) && /*>> for sanityCheck*/
$slaves[$i].useRulesAssistant == 1 &&
$slaves[$i].indentureRestrictions < 2 &&
$cash > 0>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 7d06050c284..3273c8faff9 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -192,12 +192,6 @@
<<if (_Slave.assignment != "work a glory hole")>><<continue>><</if>>
<<elseif $slaveAssignmentTab == "be a subordinate slave">>
<<if (_Slave.assignment != "be a subordinate slave")>><<continue>><</if>>
- <<elseif $slaveAssignmentTab == "all">>
- <<if $useSlaveSummaryOverviewTab == 1>>
- <<if (_Slave.assignment == "be your Head Girl")
- || (_Slave.assignment == "recruit girls")
- || (_Slave.assignment == "guard you")>><<continue>><</if>>
- <</if>>
<</if>>
<</if>>
--
GitLab