From 5a9538861a3018879747b80c1951a97b13dc3e3e Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Thu, 22 Oct 2020 12:30:04 -0400 Subject: [PATCH] simplify more --- src/markets/bulkSlave/bulkSlaveIntro.js | 8 ++------ src/markets/theMarket/buySlaves.js | 4 ++-- src/uncategorized/bulkSlaveGenerate.tw | 3 --- 3 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 src/uncategorized/bulkSlaveGenerate.tw diff --git a/src/markets/bulkSlave/bulkSlaveIntro.js b/src/markets/bulkSlave/bulkSlaveIntro.js index 71816b6d258..478010e09e4 100644 --- a/src/markets/bulkSlave/bulkSlaveIntro.js +++ b/src/markets/bulkSlave/bulkSlaveIntro.js @@ -1,8 +1,4 @@ -/** - * - * @param {boolean} [generateNeeded=false] - */ -App.Markets.bulkSlaveIntro = function(generateNeeded = false) { +App.Markets.bulkSlaveIntro = function() { const el = new DocumentFragment(); const r = []; const discount = getDiscount(); @@ -10,7 +6,7 @@ App.Markets.bulkSlaveIntro = function(generateNeeded = false) { let p; let spent; - if (generateNeeded) { + if (V.market.newSlaves.length === 0) { bulkSlaveGenerate(); } diff --git a/src/markets/theMarket/buySlaves.js b/src/markets/theMarket/buySlaves.js index b224e3918d7..707e6052026 100644 --- a/src/markets/theMarket/buySlaves.js +++ b/src/markets/theMarket/buySlaves.js @@ -162,7 +162,7 @@ App.UI.buySlaves = function() { V.market.numSlaves = 5; }, [], - `Bulk Slave Generate` + `Bulk Slave Intro` ) ); } @@ -177,7 +177,7 @@ App.UI.buySlaves = function() { V.market.numSlaves = 10; }, [], - `Bulk Slave Generate` + `Bulk Slave Intro` ) ); } diff --git a/src/uncategorized/bulkSlaveGenerate.tw b/src/uncategorized/bulkSlaveGenerate.tw deleted file mode 100644 index 1c8448aa514..00000000000 --- a/src/uncategorized/bulkSlaveGenerate.tw +++ /dev/null @@ -1,3 +0,0 @@ -:: Bulk Slave Generate [nobr] - -<<includeDOM App.Markets.bulkSlaveIntro(true)>> -- GitLab