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

WeeklyChallange end energy saver tweaks

Browse Source
This commit is contained in:
Eriks Karls 2019-08-05 10:20:19 +03:00
parent 7e56f01a38
commit 2343a6c6c8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erepublik/citizen.py
View File

@ -1356,7 +1356,7 @@ class Citizen(classes.CitizenAPI):
if count > 0 and not force_fight: if count > 0 and not force_fight:
if self.my_companies.ff_lockdown and self.details.pp > 75: if self.my_companies.ff_lockdown and self.details.pp > 75:
if count - self.my_companies.ff_lockdown > 0: if self.energy.food_fights - self.my_companies.ff_lockdown < count:
log_msg = ("Fight count modified (old count: {} | FF: {} | " log_msg = ("Fight count modified (old count: {} | FF: {} | "
"WAM ff_lockdown: {} | New count: {})").format( "WAM ff_lockdown: {} | New count: {})").format(
count, self.energy.food_fights, self.my_companies.ff_lockdown, count, self.energy.food_fights, self.my_companies.ff_lockdown,
@ -1368,9 +1368,12 @@ class Citizen(classes.CitizenAPI):
log_msg = "Not fighting because WAM needs {} food fights".format(self.my_companies.ff_lockdown) log_msg = "Not fighting because WAM needs {} food fights".format(self.my_companies.ff_lockdown)
if self.max_time_till_full_ff > self.time_till_week_change: if self.max_time_till_full_ff > self.time_till_week_change:
max_count = int((self.time_till_week_change - self.time_till_full_ff).total_seconds()) // 60 max_count = int((self.time_till_week_change -
log_msg = "End for Weekly challenge is near ({} | {})".format(max_count, count) self.time_till_full_ff).total_seconds()) // 360 * self.energy.interval
count = count if max_count > count else max_count log_msg = "End for Weekly challenge is near (Recoverable until WC end {}hp | want to do {}hits)".format(
max_count, count)
max_usable_energy = max_count - self.energy.limit * 2
count = count if max_usable_energy > count * 10 else max_usable_energy // 10
if not silent: if not silent:
self.write_log(log_msg, False) self.write_log(log_msg, False)