From 398fa1e73d73c5f9d225df82db23119b70dfb68c Mon Sep 17 00:00:00 2001 From: Khopa Date: Sat, 21 Nov 2020 18:31:12 +0100 Subject: [PATCH] Fixed warehouse building not generating any rewards --- game/db.py | 2 +- qt_ui/windows/groundobject/QGroundObjectMenu.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/game/db.py b/game/db.py index 05eaad06..3a8b084a 100644 --- a/game/db.py +++ b/game/db.py @@ -1119,7 +1119,7 @@ TIME_PERIODS = { } REWARDS = { - "power": 4, "warehouse": 2, "fuel": 2, "ammo": 2, + "power": 4, "warehouse": 2, "ware": 2, "fuel": 2, "ammo": 2, "farp": 1, "fob": 1, "factory": 10, "comms": 10, "oil": 10, "derrick": 8 } diff --git a/qt_ui/windows/groundobject/QGroundObjectMenu.py b/qt_ui/windows/groundobject/QGroundObjectMenu.py index abbf5c8c..7f6c934f 100644 --- a/qt_ui/windows/groundobject/QGroundObjectMenu.py +++ b/qt_ui/windows/groundobject/QGroundObjectMenu.py @@ -130,6 +130,8 @@ class QGroundObjectMenu(QDialog): total_income = total_income + REWARDS[building.category] if not building.is_dead: received_income = received_income + REWARDS[building.category] + else: + logging.warning(building.category + " not in REWARDS") self.financesBox = QGroupBox("Finances: ") self.financesBoxLayout = QGridLayout() @@ -315,9 +317,9 @@ class QBuyGroupForGroundObjectDialog(QDialog): self.buyArmorButton.setText("Buy [$" + str(db.PRICES[self.buyArmorCombo.itemData(self.buyArmorCombo.currentIndex())] * self.amount.value()) + "M][-$" + str(self.current_group_value) + "M]") def buyArmor(self): - print("Buy Armor ") + logging.info("Buying Armor ") utype = self.buyArmorCombo.itemData(self.buyArmorCombo.currentIndex()) - print(utype) + logging.info(utype) price = db.PRICES[utype] * self.amount.value() - self.current_group_value if price > self.game.budget: self.error_money()