Skip to content
Snippets Groups Projects
Commit f7dcc5cc authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'pregmod-master' into 'pregmod-master' 

Fix budget errors

Closes #1479

See merge request !6267
parents 9bc3a271 aebcc6fb
No related branches found
No related tags found
1 merge request!6267Fix budget errors
Hide whitespace changes
Inline Side-by-side
src/004-base/arcologyBuilding.js
+ 1
− 1
View file @ f7dcc5cc
...@@ -88,7 +88,7 @@ App.Arcology.Cell.BaseCell = class extends App.Entity.Serializable { ...@@ -88,7 +88,7 @@ App.Arcology.Cell.BaseCell = class extends App.Entity.Serializable {
buySpan.classList.add("clear-formatting"); buySpan.classList.add("clear-formatting");
buySpan.append(App.UI.DOM.passageLink("Buy", "Main", buySpan.append(App.UI.DOM.passageLink("Buy", "Main",
() => { () => {
cashX(-(price + 10000)); cashX(-(price + 10000), "capEx");
A.demandFactor += 20; A.demandFactor += 20;
App.Arcology.updateOwnership(); App.Arcology.updateOwnership();
cell.owner = 1; cell.owner = 1;
......
src/uncategorized/costsBudget.tw
+ 2
− 2
View file @ f7dcc5cc
...@@ -428,6 +428,6 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){ ...@@ -428,6 +428,6 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashErrors !== "Errors: ">> <<if $lastWeeksCashErrors !== "Errors: ">>
<<link "Reset">> <<link "Reset">>
<<set $lastWeeksCashErrors = "Errors: ">> <<set $lastWeeksCashErrors = "Errors: ">>
<</link>> <</link>><br>
<<print cashFormatColor($lastWeeksCashErrors)>> @@.red;<<print $lastWeeksCashErrors>>@@
<</if>> <</if>>
src/uncategorized/repBudget.tw
+ 1
− 1
View file @ f7dcc5cc
...@@ -233,6 +233,6 @@ for (var i = 0; i < State.variables.lastWeeksRepIncome.length; i++){ ...@@ -233,6 +233,6 @@ for (var i = 0; i < State.variables.lastWeeksRepIncome.length; i++){
<<if $lastWeeksRepErrors !== "Errors: ">> <<if $lastWeeksRepErrors !== "Errors: ">>
<<link "Reset">> <<link "Reset">>
<<set $lastWeeksRepErrors = "Errors: ">> <<set $lastWeeksRepErrors = "Errors: ">>
<</link>> <</link>><br>
@@.red;<<print $lastWeeksRepErrors>>@@ @@.red;<<print $lastWeeksRepErrors>>@@
<</if>> <</if>>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment