eriks/erepublik-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Maverick fighting should be explicitly enabled through Citizen.config

Browse Source
This commit is contained in:
Eriks K 2020-11-26 16:16:15 +02:00
parent eb740c60c7
commit d6fbaa7945
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erepublik/citizen.py
View File

@ -1615,6 +1615,7 @@ class CitizenMilitary(CitizenTravel):
def get_cheap_tp_divisions(self) -> Dict[str, List[Tuple[int, classes.BattleDivision]]]: def get_cheap_tp_divisions(self) -> Dict[str, List[Tuple[int, classes.BattleDivision]]]:
air_divs: List[Tuple[int, classes.BattleDivision]] = [] air_divs: List[Tuple[int, classes.BattleDivision]] = []
ground_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 battle in reversed(self.sorted_battles(True, True)):
for division in battle.div.values(): for division in battle.div.values():
is_start_ok = utils.good_timedelta(division.battle.start, timedelta(minutes=-1)) < self.now is_start_ok = utils.good_timedelta(division.battle.start, timedelta(minutes=-1)) < self.now
@ -1627,7 +1628,7 @@ class CitizenMilitary(CitizenTravel):
else: else:
air_divs.append((medal.get('1').get('raw_value'), division)) air_divs.append((medal.get('1').get('raw_value'), division))
elif not division.is_air and self.config.ground: 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 continue
division_medals = self.get_battle_round_data(division) division_medals = self.get_battle_round_data(division)
medal = division_medals[self.details.citizenship == division.battle.defender.country] medal = division_medals[self.details.citizenship == division.battle.defender.country]

4
erepublik/classes.py
View File

@ -357,6 +357,7 @@ class Config:
telegram = True telegram = True
telegram_chat_id = 0 telegram_chat_id = 0
telegram_token = "" telegram_token = ""
maverick = False
def __init__(self): def __init__(self):
self.auto_sell = [] self.auto_sell = []
@ -389,6 +390,7 @@ class Config:
self.telegram = True self.telegram = True
self.telegram_chat_id = 0 self.telegram_chat_id = 0
self.telegram_token = "" self.telegram_token = ""
self.maverick = False
@property @property
def as_dict(self): def as_dict(self):
@ -397,7 +399,7 @@ class Config:
fight=self.fight, air=self.air, ground=self.ground, all_in=self.all_in, 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, 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, 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, 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, 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) telegram=self.telegram, telegram_chat_id=self.telegram_chat_id, telegram_token=self.telegram_token)