From f5837bc4b8bb476ef189d0f9d26d9e971639f1fc Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Fri, 31 May 2019 19:49:25 +0200
Subject: [PATCH] sanity fixes
---
src/init/dummy.tw | 1 +
src/init/storyInit.tw | 1 -
src/js/slaveListing.js | 18 +-----------------
src/uncategorized/nextWeek.tw | 2 +-
4 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index 27a28746513..aa7643dcfcf 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -143,6 +143,7 @@ $linkHandlers
$caption
$op
$unborn
+$currentEmployee
/* ...foo variables - maybe fixed later */
$otherChoices
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 397e81e949b..a391dac1bd5 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1113,7 +1113,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $trinkets = []>>
<<set $SPcost = 1000>>
-<<set $preOwnedViewed = 0>>
<<set $debtWarned = 0>>
<<set $internationalTrade = 1>>
<<set $internationalVariety = 0>>
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 94a2d17a1fb..32497f81e45 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -168,7 +168,7 @@ App.UI.SlaveList.render = function() {
* <<print 'pass/count/indexed/flag::[' + passageName + '/' + _Count + '/' + _indexed + '/' + $SlaveSummaryFiler + ']'>>
*/
- if (((indices.length > 1) && ((passageName === "Main") && ((V.useSlaveSummaryTabs === 0) || (V.slaveAssignmentTab === "all"))))) {
+ if (indices.length > 1 && passageName === "Main" && V.useSlaveSummaryTabs === 0) {
const _buttons = [];
let _offset = -50;
if (/Select/i.test(passageName)) {
@@ -298,22 +298,6 @@ App.UI.SlaveList.SlaveInteract.penthouseInteract = (slave, index) => {
App.UI.SlaveList.SlaveInteract.personalAttention = (slave) =>
App.UI.passageLink(SlaveFullName(slave), undefined, `App.UI.selectSlaveForPersonalAttention(${slave.ID});`);
-/**
- * @param {App.Entity.SlaveState} slave
- * @param {number} index
- * @returns {string}
- */
-App.UI.SlaveList.SlaveInteract.assign = (slave, index) =>
- App.UI.passageLink(SlaveFullName(slave), "Assign", `$i = ${index}`);
-
-/**
- * @param {App.Entity.SlaveState} slave
- * @param {number} index
- * @returns {string}
- */
-App.UI.SlaveList.SlaveInteract.retrieve = (slave, index) =>
- App.UI.passageLink(SlaveFullName(slave), "Retrieve", `$i = ${index}`);
-
/**
* Adds/removes a slave with the given id to/from the personal attention array
* @param {number} id slave id
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 440f80c79f8..d8fbda4e88e 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -425,7 +425,7 @@
<<set $thisWeeksIllegalWares = $merchantIllegalWares.randomMany(1)>>
<<set $prisonCircuitIndex++>><<if $prisonCircuitIndex >= $prisonCircuit.length>><<set $prisonCircuitIndex = 0>><</if>>
-<<set $coursed = 0, $eventDescription = 0, $pitFought = 0, $preOwnedViewed = 0, $prestigeAuctioned = 0, $eliteAuctioned = 0, $shelterSlave = 0, $shelterSlaveBought = 0, $slaveMarketLimit = 10 + ($rep / 1000), $slavesSeen = 0, $slavesSacrificedThisWeek = 0, $subSlaves = 0>>
+<<set $coursed = 0, $eventDescription = 0, $pitFought = 0, $prestigeAuctioned = 0, $eliteAuctioned = 0, $shelterSlave = 0, $shelterSlaveBought = 0, $slaveMarketLimit = 10 + ($rep / 1000), $slavesSeen = 0, $slavesSacrificedThisWeek = 0, $subSlaves = 0>>
/* Not sure where to put this one, so here is where it goes for now. slaveJobValues() also adds .sexAmount and .sexQuality to slave objects, perhaps those too should get zeroed somewhere around here? */
<<set $slaveJobValues = {}>>
--
GitLab