From daa071f0f5d16805f70f7a284e583ab913edd22d Mon Sep 17 00:00:00 2001 From: Eriks Karls Date: Tue, 8 Oct 2019 09:31:09 +0300 Subject: [PATCH] RTD build image url fixed, setup.py typo --- HISTORY.rst | 4 ++++ erepublik/citizen.py | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index b2af395..fd17adc 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,10 @@ History ======= +* WC end fighting energy bugfix +* More strict fighting limiting before week change +* Improved and fixed ground damage booster usage + 0.16.0 (2019-09-29) ------------------- diff --git a/erepublik/citizen.py b/erepublik/citizen.py index ba88ddb..24d0339 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -1423,8 +1423,7 @@ class Citizen(classes.CitizenAPI): max_count = (int(self.time_till_week_change.total_seconds()) // 360 * self.energy.interval) // 10 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 + count = count if max_count > count else max_count if not silent: self.write_log(log_msg, False)