diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 47a5bbe57824cb5bbaf768dfcb85fc5031ec9033..88433ae4c7fcf6b2df2f776b4696d656db9771f4 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -12,7 +12,7 @@ App.Data.defaultGameStateVariables = {
releaseID: 0,
// Slaves
- slaveIndices: [],
+ slaveIndices: {},
genePool: [],
geneMods: {NCS: 0, rapidCellGrowth: 0},
missingTable: {},
diff --git a/src/interaction/budgets/recordTemplates.js b/src/interaction/budgets/recordTemplates.js
index aad5b49f8ce5ac9b85a9bff65d013474e8df796d..69553ce253c9acc4987acf5707f32ef567b75544 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,
@@ -89,6 +90,7 @@ App.Data.Records.LastWeeksCash = function() {
this.dairy = 0,
this.farmyard = 0,
this.incubator = 0,
+ this.incubatorSlaves = 0,
this.nursery = 0,
this.pit = 0,
this.lab = 0,
@@ -139,7 +141,7 @@ App.Data.Records.LastWeeksRep = function() {
this.publicServant = 0,
this.gloryholeArcade = 0,
this.gloryhole = 0,
-
+ this.disobedience = 0,
this.concubine = 0,
this.headGirl = 0,
this.bodyguard = 0,
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 48d222413d179f9f8f4ae1861068ac92f00c5653..57f3a9380e4e414bd334c913cfab0f33fbca52c7 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -133,7 +133,8 @@ window.CategoryAssociatedGroup = Object.freeze({
'slaveAssignmentFarmyardVign',
],
INCUBATOR: [
- 'incubator'
+ 'incubator',
+ 'incubatorSlaves'
],
NURSERY: [
'nursery',
@@ -179,10 +180,14 @@ window.CategoryAssociatedGroup = Object.freeze({
],
FLIPPING: [
'slaveTransfer',
- 'labScientistsTransfer',
'menialTransfer',
'fuckdollsTransfer',
'menialBioreactorsTransfer',
+ 'menialTransferA',
+ 'fuckdollsTransferA',
+ 'menialBioreactorsTransferA',
+ 'menialRetirement',
+ 'labScientistsTransfer',
'babyTransfer'
],
FINANCIALS: [
@@ -236,6 +241,7 @@ window.calculateCosts = (function() {
getClubAdsCosts() +
getDairyCosts() +
getIncubatorCosts() +
+ getIncubatorSlavesCosts() +
getServantsQuartersCosts() +
getMasterSuiteCosts() +
getNurseryCosts() +
@@ -285,6 +291,7 @@ window.calculateCosts = (function() {
cashX(forceNeg(getClubAdsCosts()), "clubAds");
cashX(forceNeg(getDairyCosts()), "dairy");
cashX(forceNeg(getIncubatorCosts()), "incubator");
+ cashX(forceNeg(getIncubatorSlavesCosts()), "incubatorSlaves");
cashX(forceNeg(getServantsQuartersCosts()), "servantsQuarters");
cashX(forceNeg(getMasterSuiteCosts()), "masterSuite");
cashX(forceNeg(getNurseryCosts()), "nursery");
@@ -556,14 +563,19 @@ window.calculateCosts = (function() {
}
function getIncubatorCosts() {
+ let costs = 0;
+ if (V.incubator > 0) {
+ costs += ((V.incubatorWeightSetting + V.incubatorMusclesSetting + V.incubatorReproductionSetting + V.incubatorGrowthStimsSetting) * 500);
+ }
+ return costs;
+ }
+
+ function getIncubatorSlavesCosts() {
const facIncMultiplier = V.facilityCost * V.incubator;
let costs = (facIncMultiplier * 10);
costs += (0.2 * V.incubatorUpgradeWeight + 0.2 * V.incubatorUpgradeMuscles +
0.2 * V.incubatorUpgradeReproduction + 0.2 * V.incubatorUpgradeGrowthStims +
0.5 * V.incubatorUpgradeSpeed) * facIncMultiplier;
- if (V.incubator > 0) {
- costs += ((V.incubatorWeightSetting + V.incubatorMusclesSetting + V.incubatorReproductionSetting + V.incubatorGrowthStimsSetting) * 500);
- }
return costs;
}
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..65592d6d9d08d7121dc80f47333f75f3db2545ae 100644
--- a/src/uncategorized/costsBudget.js
+++ b/src/uncategorized/costsBudget.js
@@ -658,9 +658,9 @@ App.UI.Budget.Cost = function() {
generateRowCategory("Farmyard FarmhandsVign", "slaveAssignmentFarmyardVign");
// INCUBATOR
- // TODO: Differentiate between standard upkeep, and slaves in incubator cost.
generateRowGroup(V.incubatorNameCaps, "INCUBATOR", V.incubator, "Incubator", V.incubatorSlaves);
generateRowCategory("Incubator Maintenance", "incubator");
+ generateRowCategory("Incubator Babies", "incubatorSlaves");
// NURSERY
generateRowGroup(V.nurseryNameCaps, "NURSERY", V.nursery, "Nursery", V.NurseryiIDs.length);
@@ -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