diff --git a/game/game.py b/game/game.py index 776d26e6..fcbca5e1 100644 --- a/game/game.py +++ b/game/game.py @@ -128,24 +128,25 @@ class Game: reward = PLAYER_BUDGET_BASE * len(self.theater.player_points()) for cp in self.theater.player_points(): for g in cp.ground_objects: + # (Reward is per building) if g.category == "power": - reward = reward + 10 + reward = reward + 4 elif g.category == "warehouse": - reward = reward + 8 + reward = reward + 2 elif g.category == "fuel": - reward = reward + 10 + reward = reward + 2 elif g.category == "ammo": - reward = reward + 6 + reward = reward + 2 elif g.category == "farp": - reward = reward + 4 + reward = reward + 1 elif g.category == "fob": - reward = reward + 4 + reward = reward + 1 elif g.category == "factory": - reward = reward + 25 + reward = reward + 10 elif g.category == "comms": - reward = reward + 25 + reward = reward + 10 elif g.category == "oil": - reward = reward + 45 + reward = reward + 10 return reward else: return reward diff --git a/qt_ui/uiconstants.py b/qt_ui/uiconstants.py index 7c493eb0..6ffb1ffc 100644 --- a/qt_ui/uiconstants.py +++ b/qt_ui/uiconstants.py @@ -68,7 +68,8 @@ def load_icons(): ICONS["cleared"] = QPixmap("./resources/ui/ground_assets/cleared.png") for category in CATEGORY_MAP.keys(): ICONS[category] = QPixmap("./resources/ui/ground_assets/" + category + ".png") - ICONS["aa_blue"] = QPixmap("./resources/ui/ground_assets/aa_blue.png") + ICONS[category + "_blue"] = QPixmap("./resources/ui/ground_assets/" + category + "_blue.png") + ICONS["destroyed"] = QPixmap("./resources/ui/ground_assets/destroyed.png") ICONS["Generator"] = QPixmap("./resources/ui/misc/generator.png") ICONS["Missile"] = QPixmap("./resources/ui/misc/missile.png") diff --git a/qt_ui/widgets/map/QMapGroundObject.py b/qt_ui/widgets/map/QMapGroundObject.py index 6c08bd06..aca20ea6 100644 --- a/qt_ui/widgets/map/QMapGroundObject.py +++ b/qt_ui/widgets/map/QMapGroundObject.py @@ -42,7 +42,7 @@ class QMapGroundObject(QGraphicsRectItem): if not self.model.is_dead and not self.cp.captured: painter.drawPixmap(option.rect, CONST.ICONS[self.model.category]) elif not self.model.is_dead and self.model.category == "aa": - painter.drawPixmap(option.rect, CONST.ICONS["aa_blue"]) + painter.drawPixmap(option.rect, CONST.ICONS[self.model.category + "_blue"]) else: - painter.drawPixmap(option.rect, CONST.ICONS["cleared"]) + painter.drawPixmap(option.rect, CONST.ICONS["destroyed"]) painter.restore()