diff --git a/src/interaction/budgets/recordTemplates.js b/src/interaction/budgets/recordTemplates.js index aad5b49f8ce5ac9b85a9bff65d013474e8df796d..13e329cbb9863c6c61400b00dbafffa13bede821 100644 --- a/src/interaction/budgets/recordTemplates.js +++ b/src/interaction/budgets/recordTemplates.js @@ -65,17 +65,18 @@ App.Data.Records.LastWeeksCash = function() { this.fuckdolls = 0, this.menialBioreactors = 0, // Misc Slaves + this.labScientists = 0, + this.labMenials = 0, this.slaveTransfer = 0, - this.fuckdollsTransfer = 0, this.menialTransfer = 0, + this.fuckdollsTransfer = 0, this.menialBioreactorsTransfer = 0, + this.menialTransferA = 0, + this.fuckdollsTransferA = 0, + this.menialBioreactorsTransferA = 0, + this.labScientistsTransfer = 0, this.babyTransfer = 0, this.menialRetirement = 0, - // Reworked Misc Slaves - this.labScientists = 0, - this.labMenials = 0, - this.labScientistsTransfer = 0, - // Buildings this.masterSuite = 0, diff --git a/src/js/economyJS.js b/src/js/economyJS.js index 48d222413d179f9f8f4ae1861068ac92f00c5653..47038af02f44cae0d2aeb8fe5df80517f4676b2a 100644 --- a/src/js/economyJS.js +++ b/src/js/economyJS.js @@ -179,10 +179,14 @@ window.CategoryAssociatedGroup = Object.freeze({ ], FLIPPING: [ 'slaveTransfer', - 'labScientistsTransfer', 'menialTransfer', 'fuckdollsTransfer', 'menialBioreactorsTransfer', + 'menialTransferA', + 'fuckdollsTransferA', + 'menialBioreactorsTransferA', + 'menialRetirement', + 'labScientistsTransfer', 'babyTransfer' ], FINANCIALS: [ diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index f13f4b351b83e2fd57c96eb97b66f8cb9c81f358..6f45e6c80571de87840f5f35ea25e54632de96d9 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -1748,11 +1748,11 @@ Your ''business assistant'' manages the menial slave market. <<set _menialBulkPremium = Math.trunc(1+Math.clamp(($cash-$assistant.market.limit)/_menialSlaveValue,0,_bulkMax)/400)>> _HeM acquires more chattel, since it's a buyers' market. <<if ($arcologies[0].FSPastoralist != "unset") && ($arcologies[0].FSPaternalist == "unset")>> - <<set $menialBioreactors += Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax))*(_menialSlaveValue+_menialBulkPremium-100)), "menialBioreactorsTransfer")>> + <<set $menialBioreactors += Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax))*(_menialSlaveValue+_menialBulkPremium-100)), "menialBioreactorsTransferA")>> <<elseif ($arcologies[0].FSDegradationist != "unset")>> - <<set $fuckdolls += Math.trunc(Math.clamp(($cash-$assistant.market.limit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$assistant.market.limit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$assistant.market.limit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax))*((_menialSlaveValue+_menialBulkPremium)*2)), "fuckdollsTransfer")>> + <<set $fuckdolls += Math.trunc(Math.clamp(($cash-$assistant.market.limit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$assistant.market.limit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$assistant.market.limit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax))*((_menialSlaveValue+_menialBulkPremium)*2)), "fuckdollsTransferA")>> <<else>> - <<set $menials += Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)*(_menialSlaveValue+_menialBulkPremium))), "menialTransfer")>> + <<set $menials += Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)*(_menialSlaveValue+_menialBulkPremium))), "menialTransferA")>> <</if>> <</if>> <</if>> @@ -1762,15 +1762,15 @@ Your ''business assistant'' manages the menial slave market. <</if>> <<if $menials > 0>> <<set _cashX = $menials*(menialSlaveCost(-$menials)), $menialDemandFactor -= $menials, $menials = 0>> - <<run cashX(_cashX, "menialTransfer")>> + <<run cashX(_cashX, "menialTransferA")>> <</if>> <<if $fuckdolls > 0>> <<set _cashX = $fuckdolls*(menialSlaveCost(-$fuckdolls)*2), $menialDemandFactor -= $fuckdolls, $fuckdolls = 0>> - <<run cashX(_cashX, "fuckdollsTransfer")>> + <<run cashX(_cashX, "fuckdollsTransferA")>> <</if>> <<if $menialBioreactors > 0>> <<set _cashX = $menialBioreactors*(menialSlaveCost(-$menialBioreactors)-100), $menialDemandFactor -= $menialBioreactors, $menialBioreactors = 0>> - <<run cashX(_cashX, "menialBioreactorsTransfer")>> + <<run cashX(_cashX, "menialBioreactorsTransferA")>> <</if>> <<else>> Prices are average, so _heM does not make any significant moves. diff --git a/src/uncategorized/costsBudget.js b/src/uncategorized/costsBudget.js index e71a2af9274d4b90aaec32b5f410042404a3dd8f..606fc5ea5fdb3e34d41981d5194d7c28f311b0c4 100644 --- a/src/uncategorized/costsBudget.js +++ b/src/uncategorized/costsBudget.js @@ -710,7 +710,6 @@ App.UI.Budget.Cost = function() { generateRowCategory("Slave Birhting", "birth"); // MENIAL LABOR - // TODO: Differentiate between selling and weekly income for menial slaves. generateRowGroup("Menial Labor", "LABOR"); generateRowCategory("Menials: Slaves", "menialTrades"); generateRowCategory("Menials: Fuckdolls", "fuckdolls"); @@ -719,13 +718,14 @@ App.UI.Budget.Cost = function() { // FLIPPING generateRowGroup("Flipping", "FLIPPING"); generateRowCategory("Slave Transfer", "slaveTransfer"); - // Menial Transfer - // Fuckdoll Transfer - // Bioreactor transfer + generateRowCategory("Menials", "menialTransfer"); + generateRowCategory("Fuckdolls", "fuckdollsTransfer"); + generateRowCategory("Bioreactors", "menialBioreactorsTransfer"); + generateRowCategory("Assistant: Menials", "menialTransferA"); + generateRowCategory("Assistant: Fuckdolls", "fuckdollsTransferA"); + generateRowCategory("Assistant: Bioreactors", "menialBioreactorsTransferA"); + generateRowCategory("Menial Retirement", "menialRetirement"); generateRowCategory("Scientist Transfer", "labScientistsTransfer"); - generateRowCategory("Assistant: Menials", "menialTransfer"); - generateRowCategory("Assistant: Fuckdolls", "fuckdollsTransfer"); - generateRowCategory("Assistant: Bioreactors", "menialBioreactorsTransfer"); generateRowCategory("Slave Babies", "babyTransfer"); // FINANCIALS