From 436725b38e043d93e7b885aa0dcb8c32192e7854 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Sun, 27 Dec 2020 19:52:42 -0800 Subject: [PATCH] Don't award base capture bonuses. If anything we should be granting the loser extra income so they can recover. For now just remove. --- game/event/event.py | 8 -------- game/game.py | 2 -- 2 files changed, 10 deletions(-) diff --git a/game/event/event.py b/game/event/event.py index 79b68430..836a0984 100644 --- a/game/event/event.py +++ b/game/event/event.py @@ -21,10 +21,6 @@ if TYPE_CHECKING: from ..game import Game -DIFFICULTY_LOG_BASE = 1.1 -EVENT_DEPARTURE_MAX_DISTANCE = 340000 - - MINOR_DEFEAT_INFLUENCE = 0.1 DEFEAT_INFLUENCE = 0.3 STRONG_DEFEAT_INFLUENCE = 0.5 @@ -39,7 +35,6 @@ class Event: from_cp = None # type: ControlPoint to_cp = None # type: ControlPoint difficulty = 1 # type: int - BONUS_BASE = 5 def __init__(self, game, from_cp: ControlPoint, target_cp: ControlPoint, location: Point, attacker_name: str, defender_name: str): self.game = game @@ -57,9 +52,6 @@ class Event: def tasks(self) -> List[Type[Task]]: return [] - def bonus(self) -> int: - return int(math.log(self.to_cp.importance + 1, DIFFICULTY_LOG_BASE) * self.BONUS_BASE) - def generate(self) -> UnitMap: Operation.prepare(self.game) unit_map = Operation.generate() diff --git a/game/game.py b/game/game.py index 4c59611e..069f22db 100644 --- a/game/game.py +++ b/game/game.py @@ -215,8 +215,6 @@ class Game: def finish_event(self, event: Event, debriefing: Debriefing): logging.info("Finishing event {}".format(event)) event.commit(debriefing) - self.budget += int(event.bonus() * - self.settings.player_income_multiplier) if event in self.events: self.events.remove(event)