diff --git a/src/Corporation/manageCorporation.js b/src/Corporation/manageCorporation.js index fb4f7ba0e72091ccff835ef59984d3b6fa39ec2f..427c1ec27745592311e624bb578331915c02b577 100644 --- a/src/Corporation/manageCorporation.js +++ b/src/Corporation/manageCorporation.js @@ -8,7 +8,8 @@ App.Corporate.corpRaces = function() { r.push(capRace); if (!(V.arcologies[0].FSSubjugationist !== "unset" && V.arcologies[0].FSSubjugationistRace !== race)) { if (V.corp.SpecRaces.length > 1 && V.corp.SpecTimer === 0) { - if ((V.corp.SpecRaces.length === 4 || V.corp.SpecRaces.length === 8) && V.corp.SpecToken > 0) { + const needsToken = (V.corp.SpecRaces.length === 4 || V.corp.SpecRaces.length === 8); + if (needsToken && V.corp.SpecToken > 0) { r.push( App.UI.DOM.link( "Blacklist", @@ -20,7 +21,7 @@ App.Corporate.corpRaces = function() { }, ) ); - } else if ((V.corp.SpecRaces.length !== 4 || V.corp.SpecRaces.length !== 8)) { + } else if (!needsToken) { r.push( App.UI.DOM.link( "Blacklist", diff --git a/src/endWeek/economics/arcmgmt.js b/src/endWeek/economics/arcmgmt.js index daa8bb291e2b0c48333b28cde90accb90833a689..d9c550e87456ec8dcae279673128ff961bd6d53e 100644 --- a/src/endWeek/economics/arcmgmt.js +++ b/src/endWeek/economics/arcmgmt.js @@ -641,80 +641,81 @@ App.EndWeek.arcManagement = function() { r = []; if (isNaN(_AWeekGrowth)) { - r.push(App.UI.DOM.makeElement("div", `Error: AWeekGrowth is NaN`, "red")); + App.UI.DOM.appendElement("div", el, `Error: AWeekGrowth is NaN`, "red"); } else { V.arcologies[0].prosperity += _AWeekGrowth; } + } - if (_schools > 0) { - el.append(schools()); - } + if (_schools > 0) { + el.append(schools()); + } - if (V.assistant.market && V.assistant.market.limit > 0) { - let _popCap = menialPopCap(); - let _menialSlaveValue = menialSlaveCost(); - const {HeM, heM} = getPronouns(assistant.pronouns().market).appendSuffix('M'); - r.push(`Your <span class="bold">business assistant</span> manages the menial slave market.`); - if (_menialSlaveValue <= 900 + V.assistant.market.aggressiveness) { /* BUY */ - let _bulkMax = _popCap.value - V.menials - V.fuckdolls - V.menialBioreactors; - if (_bulkMax <= 0) { - r.push(`There is no room in the parts of your arcology you own for more menial slaves.`); - } else { - if (V.cash > V.assistant.market.limit + _menialSlaveValue) { - let _menialBulkPremium = Math.trunc(1 + Math.clamp((V.cash - V.assistant.market.limit) / _menialSlaveValue, 0, _bulkMax) / 400); - r.push(`${HeM} acquires more chattel, since it's a buyers' market.`); - if ((V.arcologies[0].FSPastoralist !== "unset") && (V.arcologies[0].FSPaternalist === "unset")) { - V.menialBioreactors += Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / (_menialSlaveValue + _menialBulkPremium - 100), 0, _bulkMax)); - V.menialSupplyFactor -= Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / (_menialSlaveValue + _menialBulkPremium - 100), 0, _bulkMax)); - cashX(forceNeg(Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / (_menialSlaveValue + _menialBulkPremium - 100), 0, _bulkMax)) * (_menialSlaveValue + _menialBulkPremium - 100)), "menialBioreactorsTransferA"); - } else if ((V.arcologies[0].FSDegradationist !== "unset")) { - V.fuckdolls += Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / ((_menialSlaveValue + _menialBulkPremium) * 2), 0, _bulkMax)); - V.menialSupplyFactor -= Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / ((_menialSlaveValue + _menialBulkPremium) * 2), 0, _bulkMax)); - cashX(forceNeg(Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / ((_menialSlaveValue + _menialBulkPremium) * 2), 0, _bulkMax)) * ((_menialSlaveValue + _menialBulkPremium) * 2)), "fuckdollsTransferA"); - } else { - V.menials += Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / (_menialSlaveValue + _menialBulkPremium), 0, _bulkMax)); - V.menialSupplyFactor -= Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / (_menialSlaveValue + _menialBulkPremium), 0, _bulkMax)); - cashX(forceNeg(Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / (_menialSlaveValue + _menialBulkPremium), 0, _bulkMax) * (_menialSlaveValue + _menialBulkPremium))), "menialTransferA"); - } + if (V.assistant.market && V.assistant.market.limit > 0) { + let _popCap = menialPopCap(); + let _menialSlaveValue = menialSlaveCost(); + const {HeM, heM} = getPronouns(assistant.pronouns().market).appendSuffix('M'); + r.push(`Your <span class="bold">business assistant</span> manages the menial slave market.`); + if (_menialSlaveValue <= 900 + V.assistant.market.aggressiveness) { /* BUY */ + let _bulkMax = _popCap.value - V.menials - V.fuckdolls - V.menialBioreactors; + if (_bulkMax <= 0) { + r.push(`There is no room in the parts of your arcology you own for more menial slaves.`); + } else { + if (V.cash > V.assistant.market.limit + _menialSlaveValue) { + let _menialBulkPremium = Math.trunc(1 + Math.clamp((V.cash - V.assistant.market.limit) / _menialSlaveValue, 0, _bulkMax) / 400); + r.push(`${HeM} acquires more chattel, since it's a buyers' market.`); + if ((V.arcologies[0].FSPastoralist !== "unset") && (V.arcologies[0].FSPaternalist === "unset")) { + V.menialBioreactors += Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / (_menialSlaveValue + _menialBulkPremium - 100), 0, _bulkMax)); + V.menialSupplyFactor -= Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / (_menialSlaveValue + _menialBulkPremium - 100), 0, _bulkMax)); + cashX(forceNeg(Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / (_menialSlaveValue + _menialBulkPremium - 100), 0, _bulkMax)) * (_menialSlaveValue + _menialBulkPremium - 100)), "menialBioreactorsTransferA"); + } else if ((V.arcologies[0].FSDegradationist !== "unset")) { + V.fuckdolls += Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / ((_menialSlaveValue + _menialBulkPremium) * 2), 0, _bulkMax)); + V.menialSupplyFactor -= Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / ((_menialSlaveValue + _menialBulkPremium) * 2), 0, _bulkMax)); + cashX(forceNeg(Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / ((_menialSlaveValue + _menialBulkPremium) * 2), 0, _bulkMax)) * ((_menialSlaveValue + _menialBulkPremium) * 2)), "fuckdollsTransferA"); + } else { + V.menials += Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / (_menialSlaveValue + _menialBulkPremium), 0, _bulkMax)); + V.menialSupplyFactor -= Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / (_menialSlaveValue + _menialBulkPremium), 0, _bulkMax)); + cashX(forceNeg(Math.trunc(Math.clamp((V.cash - V.assistant.market.limit) / (_menialSlaveValue + _menialBulkPremium), 0, _bulkMax) * (_menialSlaveValue + _menialBulkPremium))), "menialTransferA"); } } - } else if (_menialSlaveValue >= 1100 - V.assistant.market.aggressiveness) { /* SELL */ - if (V.menials + V.fuckdolls + V.menialBioreactors > 0) { - r.push(`${HeM} liquidates your chattel holdings, since it's a sellers' market.`); - } - let _cashX; - if (V.menials > 0) { - _cashX = V.menials * (menialSlaveCost(-V.menials)); - V.menialDemandFactor -= V.menials; - V.menials = 0; - cashX(_cashX, "menialTransferA"); - } - if (V.fuckdolls > 0) { - _cashX = V.fuckdolls * (menialSlaveCost(-V.fuckdolls) * 2); - V.menialDemandFactor -= V.fuckdolls; - V.fuckdolls = 0; - cashX(_cashX, "fuckdollsTransferA"); - } - if (V.menialBioreactors > 0) { - _cashX = V.menialBioreactors * (menialSlaveCost(-V.menialBioreactors) - 100); - V.menialDemandFactor -= V.menialBioreactors; - V.menialBioreactors = 0; - cashX(_cashX, "menialBioreactorsTransferA"); - } - } else { - r.push(`Prices are average, so ${heM} does not make any significant moves.`); } - App.Events.addParagraph(el, r); - r = []; + } else if (_menialSlaveValue >= 1100 - V.assistant.market.aggressiveness) { /* SELL */ + if (V.menials + V.fuckdolls + V.menialBioreactors > 0) { + r.push(`${HeM} liquidates your chattel holdings, since it's a sellers' market.`); + } + let _cashX; + if (V.menials > 0) { + _cashX = V.menials * (menialSlaveCost(-V.menials)); + V.menialDemandFactor -= V.menials; + V.menials = 0; + cashX(_cashX, "menialTransferA"); + } + if (V.fuckdolls > 0) { + _cashX = V.fuckdolls * (menialSlaveCost(-V.fuckdolls) * 2); + V.menialDemandFactor -= V.fuckdolls; + V.fuckdolls = 0; + cashX(_cashX, "fuckdollsTransferA"); + } + if (V.menialBioreactors > 0) { + _cashX = V.menialBioreactors * (menialSlaveCost(-V.menialBioreactors) - 100); + V.menialDemandFactor -= V.menialBioreactors; + V.menialBioreactors = 0; + cashX(_cashX, "menialBioreactorsTransferA"); + } + } else { + r.push(`Prices are average, so ${heM} does not make any significant moves.`); } + App.Events.addParagraph(el, r); + r = []; + } - const food = document.createElement("span"); - food.id = "food"; - if (V.foodMarket > 0) { - food.append(App.UI.DOM.renderPassage("Food Report")); - } - el.append(food); + const food = document.createElement("span"); + food.id = "food"; + if (V.foodMarket > 0) { + food.append(App.UI.DOM.renderPassage("Food Report")); } + el.append(food); + App.Events.addNode(el, r); return el;