From 41759ec71e6ed291372dac0a193d0c8d6a014b9a Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Fri, 18 Jan 2019 23:35:17 -0500
Subject: [PATCH] Sanity Check
---
src/SecExp/attackReport.tw | 2 +-
src/uncategorized/costsBudget.tw | 16 +++++++---------
src/uncategorized/peHeadgirlConcubine.tw | 2 +-
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index d3d7db1c491..3198500509b 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -632,7 +632,7 @@
<br>
The surrender allows the arcology to survive @@.red;mostly intact,@@ however reports of @@.red;mass looting and killing of citizens@@ flood your office for a few days.
<<set $PC.engineering += .1>>
- <<run cashX(forceNeg(1000 * _majorBattleMod, "war"))>>
+ <<run cashX(forceNeg(1000 * _majorBattleMod), "war")>>
<<if $week <= 30>>
<<set $lowerClass -= random(80) * _majorBattleMod>>
<<set _lostSlaves = random(120) * _majorBattleMod,
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 4baf9758086..35a60eb2681 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -333,14 +333,13 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
$lastWeeksCashProfits.lab
</td>
</tr>
+
+ //
<<if $researchLab.hired != 0>>
<tr>
<td>[[Research Lab][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]]: ($researchLab.hired scientists)</td>
<td></td>
- <td>
- <<set $lastWeeksCashExpenses.lab += (300*$researchLab.hired)>>
- <<print (300*$researchLab.hired)>>
- </td>
+ <td><<print (300*$researchLab.hired)>></td>
<td><<print (300*$researchLab.hired)>></td>
</tr>
<</if>>
@@ -348,14 +347,13 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<tr>
<td>[[Research Lab][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]]: ($researchLab.menials menial Slaves)</td>
<td></td>
- <td>
- <<set $lastWeeksCashExpenses.lab += (100*$researchLab.menials)>>
- <<print (100*$researchLab.menials)>>
- </td>
+ <td><<print (100*$researchLab.menials)>></td>
<td><<print (100*$researchLab.menials)>></td>
</tr>
<</if>>
+ //
<</if>>
+
<<if $lastWeeksCashIncome.cyberMod || $lastWeeksCashExpenses.cyberMod>>
<tr>
@@ -407,7 +405,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $pit>>
<tr>
- <td>[[$pitName|Pit][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($pitSlaves slaves)</td>
+ <td>[[$pitName|Pit][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($fighterIDs.length slaves)</td>
<td>$lastWeeksCashIncome.pit</td>
<td>$lastWeeksCashExpenses.pit</td>
<td>
diff --git a/src/uncategorized/peHeadgirlConcubine.tw b/src/uncategorized/peHeadgirlConcubine.tw
index 4a23a8688e3..210d59063dd 100644
--- a/src/uncategorized/peHeadgirlConcubine.tw
+++ b/src/uncategorized/peHeadgirlConcubine.tw
@@ -394,7 +394,7 @@ and it's also obvious that they've been filling the few minutes they've been wai
<</if>>
<</if>>
<<set $slaves[_headGirl].devotion += 4, $slaves[_concubine].devotion += 4>>
- /* sex count cleanup for $headGirl since the above block is not pretty */
+ /* sex count cleanup for $HeadGirl since the above block is not pretty */
<<if (canDoVaginal($HeadGirl) && $HeadGirl.vagina > 0)>>
<<if canImpreg($slaves[_headGirl], $PC)>>
<<= knockMeUp($slaves[_headGirl], 10, 0, -1, 1)>>
--
GitLab