From 048cfe13979bcfecdebf8da85b089caed6e44ec9 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Fri, 18 Jan 2019 23:56:38 -0500
Subject: [PATCH] FIx menialTransfer
---
src/SecExp/attackReport.tw | 2 +-
src/uncategorized/arcmgmt.tw | 2 +-
src/uncategorized/costsBudget.tw | 8 ++++----
src/uncategorized/costsWidgets.tw | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 3198500509b..524e0e2d304 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -1567,7 +1567,7 @@
<br>
<span id="captOptions">
<<link "sell them all immediately">>
- <<run cashX((_menialPrice * _captives), "menialTradesTransfer")>>
+ <<run cashX((_menialPrice * _captives), "menialTransfer")>>
<<replace "#captOptions">>Captives sold<</replace>>
<</link>>
|
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 7237a899cac..fd45dc1eefc 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1562,7 +1562,7 @@ Your ''business assistant'' manages the menial slave market.
<</if>>
<<if $menials > 0>>
<<set _cashX = $menials*(menialSlaveCost(-$menials)), $menialDemandFactor -= $menials, $menials = 0>>
- <<run cashX(_cashX, "menialTradesTransfer")>>
+ <<run cashX(_cashX, "menialTransfer")>>
<</if>>
<<if $fuckdolls > 0>>
<<set _cashX = $fuckdolls*(menialSlaveCost(-$fuckdolls)*2), $menialDemandFactor -= $fuckdolls, $fuckdolls = 0>>
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index b4f671a172d..6a2f30fe6ad 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -498,11 +498,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $marketAssistantLimit>>
<tr>
<td>Menials: [[Assistant's|Personal assistant options][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] flipping</td>
- <td><<= cashNumFormat($lastWeeksCashIncome.menialTradesTransfer)>></td>
- <td><<= cashNumFormat($lastWeeksCashExpenses.menialTradesTransfer)>></td>
+ <td>$lastWeeksCashIncome.menialTransfer</td>
+ <td>$lastWeeksCashExpenses.menialTransfer</td>
<td>
- <<set $lastWeeksCashProfits.menialTradesTransfer = ($lastWeeksCashIncome.menialTradesTransfer + $lastWeeksCashExpenses.menialTradesTransfer)>>
- <<= cashNumFormat($lastWeeksCashProfits.menialTradesTransfer)>>
+ <<set $lastWeeksCashProfits.menialTransfer = ($lastWeeksCashIncome.menialTransfer + $lastWeeksCashExpenses.menialTransfer)>>
+ $lastWeeksCashProfits.menialTransfer
</td>
</tr>
<</if>>
diff --git a/src/uncategorized/costsWidgets.tw b/src/uncategorized/costsWidgets.tw
index f77792e8657..24888e8d065 100644
--- a/src/uncategorized/costsWidgets.tw
+++ b/src/uncategorized/costsWidgets.tw
@@ -479,7 +479,7 @@ menialBioreactors: 0,
slaveTransfer:0,
fuckdollsTransfer:0,
-menialTradesTransfer:0,
+menialTransfer:0,
menialBioreactorsTransfer: 0,
babyTransfer: 0,
menialRetirement: 0,
--
GitLab