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

Don't allow to fight before WeekChange even if force_fight (levelup, 75pp etc)

Browse Source
This commit is contained in:
Eriks Karls 2019-10-01 09:58:37 +03:00
parent bf971972bf
commit c298d66086
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
erepublik/citizen.py
View File

@ -1358,7 +1358,7 @@ class Citizen(classes.CitizenAPI):
if self.is_levelup_reachable: if self.is_levelup_reachable:
log_msg = "Level up" log_msg = "Level up"
if self.should_do_levelup: if self.should_do_levelup:
count = (self.energy.available + self.energy.limit) // 10 count = (self.energy.limit * 3) // 10
force_fight = True force_fight = True
else: else:
self.write_log("Waiting for fully recovered energy before leveling up.", False) self.write_log("Waiting for fully recovered energy before leveling up.", False)
@ -1409,13 +1409,12 @@ class Citizen(classes.CitizenAPI):
count = 0 count = 0
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 - max_count = (int(self.time_till_week_change.total_seconds()) // 360 * self.energy.interval) // 10
self.time_till_full_ff).total_seconds()) // 360 * self.energy.interval log_msg = "End for Weekly challenge is near (Recoverable until WC end {}hp | want to do {}hits)".format(
log_msg = "End for Weekly challenge is near (Recoverable until WC end {}hp | want to do {}hits)".format( max_count, count)
max_count, count) max_usable_energy = max_count - self.energy.limit * 2
max_usable_energy = max_count - self.energy.limit * 2 count = count if max_usable_energy > count * 10 else max_usable_energy // 10
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)

4
tests/test_erepublik_script.py
View File

@ -79,9 +79,9 @@ class TestErepublik(unittest.TestCase):
self.citizen.energy.recovered = 3000 self.citizen.energy.recovered = 3000
self.citizen.energy.recoverable = 2950 self.citizen.energy.recoverable = 2950
self.citizen.energy.interval = 30 self.citizen.energy.interval = 30
self.assertEqual(self.citizen.should_fight(), 895) self.assertEqual(self.citizen.should_fight(), 900)
self.citizen.my_companies.ff_lockdown = 160 self.citizen.my_companies.ff_lockdown = 160
self.assertEqual(self.citizen.should_fight(), 895) self.assertEqual(self.citizen.should_fight(), 900)
self.citizen.my_companies.ff_lockdown = 0 self.citizen.my_companies.ff_lockdown = 0
# Level up reachable # Level up reachable