From c6ee42a32e7d14da66a3cca192b40fa0e4230c5a Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Sun, 20 Jan 2019 00:33:27 -0500
Subject: [PATCH] re-add support for what assistant is buying
---
src/uncategorized/arcmgmt.tw | 4 +--
src/uncategorized/costsBudget.tw | 56 ++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 2bcfc01e24e..6b1f4d6d233 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1547,9 +1547,9 @@ Your ''business assistant'' manages the menial slave market.
<<set _menialBulkPremium = Math.trunc(1+Math.clamp(($cash-$marketAssistantLimit)/_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-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax))*(_menialSlaveValue+_menialBulkPremium-100)), "menialTransfer")>>
+ <<set $menialBioreactors += Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax))*(_menialSlaveValue+_menialBulkPremium-100)), "menialBioreactorsTransfer")>>
<<elseif ($arcologies[0].FSDegradationist != "unset")>>
- <<set $fuckdolls += Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax))*((_menialSlaveValue+_menialBulkPremium)*2)), "menialTransfer")>>
+ <<set $fuckdolls += Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax))*((_menialSlaveValue+_menialBulkPremium)*2)), "fuckdollsTransfer")>>
<<else>>
<<set $menials += Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+100),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)*(_menialSlaveValue+_menialBulkPremium))), "menialTransfer")>>
<</if>>
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index c1229d1bfe4..b744d9e7ee5 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -1126,6 +1126,62 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<</if>>
</td>
</tr>
+
+ <tr>
+ <td>Fuckdolls: [[Assistant's|Personal assistant options][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] flipping</td>
+ <td>
+ <<if Math.trunc($lastWeeksCashIncome.fuckdollsTransfer) > 0>>
+ @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.fuckdollsTransfer))>>@@
+ <<else>>
+ <<print cashFormat(Math.trunc($lastWeeksCashIncome.fuckdollsTransfer))>>
+ <</if>>
+ </td>
+ <td>
+ <<if Math.trunc($lastWeeksCashExpenses.fuckdollsTransfer) < 0>>
+ @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.fuckdollsTransfer)))>>@@
+ <<else>>
+ <<print cashFormat(Math.trunc($lastWeeksCashExpenses.fuckdollsTransfer))>>
+ <</if>>
+ </td>
+ <td>
+ <<set $lastWeeksCashProfits.fuckdollsTransfer = ($lastWeeksCashIncome.fuckdollsTransfer + $lastWeeksCashExpenses.fuckdollsTransfer)>>
+ <<if $lastWeeksCashProfits.fuckdollsTransfer > 0>>
+ @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.fuckdollsTransfer))>>@@
+ <<elseif Math.trunc($lastWeeksCashProfits.fuckdollsTransfer) == 0>>
+ <<print cashFormat(Math.trunc($lastWeeksCashProfits.fuckdollsTransfer))>>
+ <<else>>
+ @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.fuckdollsTransfer)))>>@@
+ <</if>>
+ </td>
+ </tr>
+
+ <tr>
+ <td>Bioreactors: [[Assistant's|Personal assistant options][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] flipping</td>
+ <td>
+ <<if Math.trunc($lastWeeksCashIncome.menialBioreactorsTransfer) > 0>>
+ @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.menialBioreactorsTransfer))>>@@
+ <<else>>
+ <<print cashFormat(Math.trunc($lastWeeksCashIncome.menialBioreactorsTransfer))>>
+ <</if>>
+ </td>
+ <td>
+ <<if Math.trunc($lastWeeksCashExpenses.menialBioreactorsTransfer) < 0>>
+ @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.menialBioreactorsTransfer)))>>@@
+ <<else>>
+ <<print cashFormat(Math.trunc($lastWeeksCashExpenses.menialBioreactorsTransfer))>>
+ <</if>>
+ </td>
+ <td>
+ <<set $lastWeeksCashProfits.menialBioreactorsTransfer = ($lastWeeksCashIncome.menialBioreactorsTransfer + $lastWeeksCashExpenses.menialBioreactorsTransfer)>>
+ <<if $lastWeeksCashProfits.menialBioreactorsTransfer > 0>>
+ @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.menialBioreactorsTransfer))>>@@
+ <<elseif Math.trunc($lastWeeksCashProfits.menialBioreactorsTransfer) == 0>>
+ <<print cashFormat(Math.trunc($lastWeeksCashProfits.menialBioreactorsTransfer))>>
+ <<else>>
+ @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.menialBioreactorsTransfer)))>>@@
+ <</if>>
+ </td>
+ </tr>
<</if>>
<<if ($lastWeeksCashIncome.menialTrades) || ($lastWeeksCashExpenses.menialTrades)>>
--
GitLab