diff --git a/src/endWeek/economics/persBusiness.js b/src/endWeek/economics/persBusiness.js index 32f71e4c5872f0506a07173941b8f672143d892d..6695d7f84930e7005412669a493260d4387c303e 100644 --- a/src/endWeek/economics/persBusiness.js +++ b/src/endWeek/economics/persBusiness.js @@ -47,7 +47,7 @@ App.EndWeek.personalBusiness = function() { } } if (V.foodMarket) { - if (V.food < App.Facilities.Farmyard.foodConsumption() && V.cash < App.Facilities.Farmyard.foodConsumption() * V.foodCost) { + if (V.food < App.Facilities.Farmyard.foodConsumption() && V.cash < (App.Facilities.Farmyard.foodConsumption() * V.foodCost)) { r.push(`<span class="red">WARNING: your arcology will starve in the coming week unless action is taken.</span>`); if (V.foodWarned) { V.gameover = "starving citizens"; diff --git a/src/facilities/farmyard/farmyard.js b/src/facilities/farmyard/farmyard.js index 99f831d25f959ba136e7033c19781d4ad40db551..ffe025ec518e6522ef3092d22ed41b811d1dacba 100644 --- a/src/facilities/farmyard/farmyard.js +++ b/src/facilities/farmyard/farmyard.js @@ -484,7 +484,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit let canines = ''; if (CL === 1) { - dogs = `${V.canine[0]}s`; + dogs = `${V.canine[0].name}s`; if (V.canine[0].species === "dog") { canines = V.canine[0].name; @@ -545,7 +545,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit const HL = V.hooved.length; const hooved = HL === 1 - ? `${V.hooved[0]}s` : HL < 3 + ? `${V.hooved[0].name}s` : HL < 3 ? `several different types of hooved animals` : `all kinds of hooved animals`; @@ -592,7 +592,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit let felines = ''; if (FL === 1) { - cats = `${V.feline[0]}s`; + cats = `${V.feline[0].name}s`; if (V.feline[0].species === "cat") { felines = V.feline[0].name; diff --git a/src/facilities/farmyard/food/food.js b/src/facilities/farmyard/food/food.js index e155534a0788bc930b57701bc0f969f45e641add..a413fe998130a8d5a3c1e023f7b49b490ddab5e0 100644 --- a/src/facilities/farmyard/food/food.js +++ b/src/facilities/farmyard/food/food.js @@ -121,8 +121,12 @@ App.Facilities.Farmyard.foodProduction = function() { /** The total amount of food consumed in a given week. */ App.Facilities.Farmyard.foodConsumption = function() { function citizenConsumption() { - return ((V.lowerClass * V.foodRate.lower) + (V.middleClass * V.foodRate.middle) + - (V.upperClass * V.foodRate.upper) + (V.topClass * V.foodRate.top)); + return ( + (V.lowerClass * V.foodRate.lower) + + (V.middleClass * V.foodRate.middle) + + (V.upperClass * V.foodRate.upper) + + (V.topClass * V.foodRate.top) + ); } function slaveConsumption() {