diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw index d3d7db1c491780ac51133c23773842ac9bd6c76b..3198500509b544781e4cee1ef4e79ecaaae759ca 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 7afc7ed5ba99036d0d762021c6dffbeb5588b252..16b8d2741fdc727058c01e4eb974c6889d69805e 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>