diff --git a/src/markets/theMarket/tradeMenials.js b/src/markets/theMarket/tradeMenials.js
index f29ed0017c2359338a57e34000f5591b4a1d0ef2..38b8b481abe9ab917a9d0f09ded56040303632cf 100644
--- a/src/markets/theMarket/tradeMenials.js
+++ b/src/markets/theMarket/tradeMenials.js
@@ -2,7 +2,7 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
const el = new DocumentFragment();
const menialPrice = menialSlaveCost();
const popCap = menialPopCap();
- let bulkMax;
+ const bulkMax = popCap.value - V.menials - V.fuckdolls - V.menialBioreactors;
let linkArray;
if (!menialWorkersOnly) {
@@ -12,9 +12,6 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
el.append(slaveSupply());
App.UI.DOM.appendNewElement("div", el, popCap.text);
- }
- bulkMax = popCap.value - V.menials - V.fuckdolls - V.menialBioreactors;
- if (!menialWorkersOnly) {
App.UI.DOM.appendNewElement("div", el, `The parts of your arcology you own can house a total of ${num(popCap.value)} menial slaves.`);
}
@@ -34,8 +31,7 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
function slaveDemand() {
const el = new DocumentFragment();
- let div = document.createElement("div");
- let span;
+ const div = document.createElement("div");
div.append(`Slave demand is `);
if (V.menialDemandFactor <= -35000) {
App.UI.DOM.appendNewElement("span", div, `extremely low`, ["red", "bold"]);
@@ -65,13 +61,13 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
if (V.cheatMode && V.cheatModeM) {
const menDemand = function() {
const el = new DocumentFragment();
+ el.append(" ");
App.UI.DOM.appendNewElement("span", el, `Slave Demand`, ["yellowgreen"]);
- el.append(`| ${V.menialDemandFactor}`);
+ el.append(` | ${V.menialDemandFactor}`);
return el;
};
- span = document.createElement("span");
- span.id = "menial-demand-factor";
+ const span = document.createElement("span");
span.append(menDemand());
App.UI.DOM.makeTextBox(
@@ -79,7 +75,7 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
v => {
V.menialDemandFactor = Math.clamp(Math.trunc(Number(v)), -50000, 50000) || V.menialDemandFactor;
V.cheater = 1;
- jQuery("#menial-demand-factor").empty().append(menDemand());
+ $(span).empty().append(menDemand());
}
);
div.append(span);
@@ -90,8 +86,7 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
function slaveSupply() {
const el = new DocumentFragment();
- let span;
- let div = document.createElement("div");
+ const div = document.createElement("div");
div.append(`Slave supply is `);
if (V.menialSupplyFactor <= -35000) {
@@ -123,13 +118,13 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
if (V.cheatMode && V.cheatModeM) {
const menSupply = function() {
const el = new DocumentFragment();
+ el.append(" ");
App.UI.DOM.appendNewElement("span", el, `Slave Supply`, `yellowgreen`);
- el.append(`| ${V.menialSupplyFactor}`);
+ el.append(` | ${V.menialSupplyFactor}`);
return el;
};
- span = document.createElement("span");
- span.id = "menial-supply-factor";
+ const span = document.createElement("span");
span.append(menSupply());
App.UI.DOM.makeTextBox(
@@ -137,7 +132,7 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
v => {
V.menialSupplyFactor = Math.clamp(Math.trunc(Number(v)), -50000, 50000) || V.menialSupplyFactor;
V.cheater = 1;
- jQuery("#menial-supply-factor").empty().append(menSupply());
+ $(span).empty().append(menSupply());
}
);
div.append(span);
@@ -149,29 +144,30 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
function menialTrading() {
const el = document.createElement("div");
- let div = document.createElement("div");
if (!menialWorkersOnly) {
+ const r = [];
if (V.menials > 1) {
- el.append(`You own ${num(Math.trunc(V.menials))} menial slaves.`);
+ r.push(`You own ${num(Math.trunc(V.menials))} menial slaves.`);
} else if (V.menials > 0) {
- el.append(`You own one menial slave.`);
+ r.push(`You own one menial slave.`);
} else {
- el.append(`You do not own any menial slaves.`);
+ r.push(`You do not own any menial slaves.`);
}
- el.append(` The market price of menials is ${cashFormat(menialPrice)}.`);
+ r.push(`The market price of menials is <span class='cash'>${cashFormat(menialPrice)}.</span>`);
+ App.Events.addNode(el, r);
}
if (bulkMax > 0 && V.cash > menialPrice) {
- div = document.createElement("div");
linkArray = [];
const buySomeMenials = function(number = 1) {
const value = forceNeg(menialSlaveCost(number) * number);
V.menials += number;
V.menialSupplyFactor -= number;
cashX(value, "menialTransfer");
- jQuery("#menial-transaction-result").empty().append(App.UI.DOM.cashFormat(value));
if (menialWorkersOnly) {
Engine.play(passage());
+ } else {
+ jQuery("#menial-transaction-result").empty().append(App.UI.DOM.cashFormat(value));
}
};
@@ -194,7 +190,7 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
makeLink(100, buySomeMenials);
}
if (V.cash > (menialPrice + 1) * 2) {
- let menialBulkPremium = Math.trunc(1 + Math.clamp(V.cash / menialPrice, 0, bulkMax) / 400);
+ const menialBulkPremium = Math.trunc(1 + Math.clamp(V.cash / menialPrice, 0, bulkMax) / 400);
linkArray.push(
App.UI.DOM.link(
"max",
@@ -207,6 +203,8 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
)
);
}
+ const div = document.createElement("div");
+ div.classList.add("indent");
div.append(App.UI.DOM.generateLinksStrip(linkArray));
App.UI.DOM.appendNewElement("span", div, " Bulk transactions may require offering a premium.", "note");
el.append(div);
@@ -250,18 +248,17 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
},
)
);
- App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(linkArray));
+ App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(linkArray), ["indent"]);
}
return el;
}
function fuckDollConversion() {
const el = document.createElement("div");
- let div = document.createElement("div");
- let convertCost;
+ const div = document.createElement("div");
if (V.menials > 0) {
if (V.arcadeUpgradeFuckdolls > 0) {
- convertCost = 100;
+ const convertCost = 100;
const convertSomeMenialsToFuckdolls = function(number) {
const value = forceNeg(number * convertCost);
V.menials -= number;
@@ -298,11 +295,11 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
);
div.append(App.UI.DOM.generateLinksStrip(linkArray));
- App.UI.DOM.appendNewElement("span", div, `Conversion costs ${cashFormat(convertCost)} each`, "note");
+ App.Events.addNode(div, [`Conversion costs ${cashFormatColor(convertCost)} each`], "span", "note");
el.append(div);
}
if (V.dairyFeedersUpgrade > 0) {
- convertCost = 500;
+ const convertCost = 500;
const convertSomeMenialsToBioreactors = function(number) {
const value = forceNeg(number * convertCost);
V.menials -= number;
@@ -337,9 +334,9 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
},
)
);
- div = document.createElement("div");
+ const div = document.createElement("div");
div.append(App.UI.DOM.generateLinksStrip(linkArray));
- App.UI.DOM.appendNewElement("span", div, `Conversion costs ${cashFormat(convertCost)} each`, "note");
+ App.Events.addNode(div, [`Conversion costs ${cashFormatColor(convertCost)} each`], "span", "note");
el.append(div);
}
}
@@ -348,7 +345,6 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
function fuckDollTrading() {
const el = document.createElement("div");
- let div = document.createElement("div");
if (V.fuckdolls > 1) {
el.append(`You own ${num(Math.trunc(V.fuckdolls))} standard Fuckdolls. `);
} else if (V.fuckdolls > 0) {
@@ -356,12 +352,10 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
} else if (V.arcologies[0].FSPaternalist === "unset") {
el.append(`You do not own any standard Fuckdolls. `);
}
- el.append(div);
if ((V.fuckdolls > 0) || (V.arcologies[0].FSPaternalist === "unset")) {
- el.append(`The market price of standard Fuckdolls is ${cashFormat(menialPrice)}.`);
+ App.Events.addNode(el, [`The market price of standard Fuckdolls is <span class="cash">${cashFormat(menialPrice)}.</span>`]);
if (bulkMax > 0) {
if (V.arcologies[0].FSPaternalist === "unset" && V.cash > menialPrice) {
- div = document.createElement("div");
linkArray = [];
const buySomeFuckdolls = function(number = 1) {
const value = forceNeg(menialSlaveCost(number) * number);
@@ -387,7 +381,7 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
makeLink(100, buySomeFuckdolls);
}
if (V.cash > (menialPrice + 1) * 2) {
- let menialBulkPremium = Math.trunc(1 + Math.clamp(V.cash / menialPrice, 0, bulkMax) / 400);
+ const menialBulkPremium = Math.trunc(1 + Math.clamp(V.cash / menialPrice, 0, bulkMax) / 400);
linkArray.push(
App.UI.DOM.link(
"max",
@@ -400,6 +394,8 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
)
);
}
+ const div = document.createElement("div");
+ div.classList.add("indent");
div.append(App.UI.DOM.generateLinksStrip(linkArray));
App.UI.DOM.appendNewElement("span", div, " Bulk transactions may require offering a premium.", "note");
el.append(div);
@@ -440,7 +436,7 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
},
)
);
- App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(linkArray));
+ App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(linkArray), ["indent"]);
}
}
@@ -449,7 +445,6 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
function bioreactorTrading() {
const el = document.createElement("div");
- let div = document.createElement("div");
if (V.menialBioreactors > 1) {
el.append(`You own ${num(Math.trunc(V.menialBioreactors))} standard bioreactors. `);
} else if (V.menialBioreactors > 0) {
@@ -458,10 +453,9 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
el.append(`You do not own any standard bioreactors. `);
}
if ((V.menialBioreactors > 0) || (V.arcologies[0].FSPaternalist === "unset")) {
- el.append(`The market price of standard bioreactors is ${cashFormat(menialPrice - 100)}.`);
+ App.Events.addNode(el, [`The market price of standard bioreactors is <span class='cash'>${cashFormat(menialPrice - 100)}.</span>`]);
if (bulkMax > 0) {
if (V.arcologies[0].FSPaternalist === "unset" && V.cash > menialPrice) {
- div = document.createElement("div");
linkArray = [];
const buySomeBioreactors = function(number = 1) {
const value = forceNeg(menialSlaveCost(number - 100) * number);
@@ -487,7 +481,7 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
makeLink(100, buySomeBioreactors);
}
if (V.cash > (menialPrice - 99) * 2) {
- let bioreactorBulkPremium = Math.trunc(1 + Math.clamp(V.cash / (menialPrice - 99), 0, bulkMax) / 400);
+ const bioreactorBulkPremium = Math.trunc(1 + Math.clamp(V.cash / (menialPrice - 99), 0, bulkMax) / 400);
linkArray.push(
App.UI.DOM.link(
"max",
@@ -500,6 +494,8 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
)
);
}
+ const div = document.createElement("div");
+ div.classList.add("indent");
div.append(App.UI.DOM.generateLinksStrip(linkArray));
App.UI.DOM.appendNewElement("span", div, " Bulk transactions may require offering a premium.", "note");
el.append(div);
@@ -540,7 +536,8 @@ App.UI.tradeMenials = function(menialWorkersOnly) {
},
)
);
- div = document.createElement("div");
+ const div = document.createElement("div");
+ div.classList.add("indent");
div.append(App.UI.DOM.generateLinksStrip(linkArray));
el.append(div);
}