From d6fbaa7945aee5981142acfc85a37139d5c6dbe8 Mon Sep 17 00:00:00 2001 From: Eriks K Date: Thu, 26 Nov 2020 16:16:15 +0200 Subject: [PATCH] Maverick fighting should be explicitly enabled through Citizen.config --- erepublik/citizen.py | 3 ++- erepublik/classes.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erepublik/citizen.py b/erepublik/citizen.py index a554631..911d3f5 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -1615,6 +1615,7 @@ class CitizenMilitary(CitizenTravel): def get_cheap_tp_divisions(self) -> Dict[str, List[Tuple[int, classes.BattleDivision]]]: air_divs: List[Tuple[int, classes.BattleDivision]] = [] ground_divs: List[Tuple[int, classes.BattleDivision]] = [] + check_maverick = self.maverick and self.config.maverick for battle in reversed(self.sorted_battles(True, True)): for division in battle.div.values(): is_start_ok = utils.good_timedelta(division.battle.start, timedelta(minutes=-1)) < self.now @@ -1627,7 +1628,7 @@ class CitizenMilitary(CitizenTravel): else: air_divs.append((medal.get('1').get('raw_value'), division)) elif not division.is_air and self.config.ground: - if not division.div == self.division and not self.maverick: + if not division.div == self.division and not check_maverick: continue division_medals = self.get_battle_round_data(division) medal = division_medals[self.details.citizenship == division.battle.defender.country] diff --git a/erepublik/classes.py b/erepublik/classes.py index a552cf3..8859ea3 100644 --- a/erepublik/classes.py +++ b/erepublik/classes.py @@ -357,6 +357,7 @@ class Config: telegram = True telegram_chat_id = 0 telegram_token = "" + maverick = False def __init__(self): self.auto_sell = [] @@ -389,6 +390,7 @@ class Config: self.telegram = True self.telegram_chat_id = 0 self.telegram_token = "" + self.maverick = False @property def as_dict(self): @@ -397,7 +399,7 @@ class Config: fight=self.fight, air=self.air, ground=self.ground, all_in=self.all_in, next_energy=self.next_energy, boosters=self.boosters, travel_to_fight=self.travel_to_fight, always_travel=self.always_travel, epic_hunt=self.epic_hunt, epic_hunt_ebs=self.epic_hunt_ebs, - rw_def_side=self.rw_def_side, interactive=self.interactive, + rw_def_side=self.rw_def_side, interactive=self.interactive, maverick=self.maverick, continuous_fighting=self.continuous_fighting, auto_buy_raw=self.auto_buy_raw, force_wam=self.force_wam, sort_battles_time=self.sort_battles_time, force_travel=self.force_travel, telegram=self.telegram, telegram_chat_id=self.telegram_chat_id, telegram_token=self.telegram_token)