Compare commits

..

5 Commits

Author SHA1 Message Date
36c7fefdf7 Bump version: 0.21.5.5 → 0.21.5.6 2020-09-30 08:40:14 +03:00
d9fa30b06e bugfix in default weapon switch 2020-09-30 08:35:35 +03:00
b53dc447f4 switch to deploy 2020-09-30 08:13:36 +03:00
233d8d83f8 Bump version: 0.21.5.4 → 0.21.5.5 2020-09-29 18:02:52 +03:00
ec62d90aa2 wheeloffortune bugfix 2020-09-29 18:02:52 +03:00
4 changed files with 5 additions and 5 deletions

View File

@ -4,7 +4,7 @@
__author__ = """Eriks Karls"""
__email__ = 'eriks@72.lv'
__version__ = '0.21.5.4'
__version__ = '0.21.5.6'
from erepublik import classes, utils, constants
from erepublik.citizen import Citizen

View File

@ -684,7 +684,6 @@ class CitizenAnniversary(BaseCitizen):
base.get('prizes').get('prizes').get(str(r.get('result'))).get('tooltip'))
else:
while max_cost >= current_cost if max_cost else spin_count >= current_count if spin_count else False:
return
r = self._spin_wheel_of_loosing(current_cost)
current_count += 1
current_cost = r.get('cost')
@ -1388,6 +1387,7 @@ class CitizenMilitary(CitizenTravel):
try:
if weapon['weaponQuantity'] > 30 and weapon['weaponInfluence'] > weapon_damage:
weapon_quality = int(weapon['weaponId'])
weapon_damage = weapon['weaponInfluence']
except ValueError:
pass
return self.change_weapon(battle, weapon_quality, division)
@ -1693,7 +1693,7 @@ class CitizenMilitary(CitizenTravel):
elif r_json.get("message") == "Cannot activate a zone with a non-native division":
self.write_log("Wrong division!!")
return 0, 10, 0
elif r_json.get("message") == "FIGHT_DISABLED":
elif r_json.get("message") in ["FIGHT_DISABLED","DEPLOYMENT_MODE"]:
self._post_main_profile_update('options',
params='{"optionName":"enable_web_deploy","optionValue":"off"}')
self.set_default_weapon(battle, division)

View File

@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.21.5.4
current_version = 0.21.5.6
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)?

View File

@ -43,6 +43,6 @@ setup(
test_suite='tests',
tests_require=test_requirements,
url='https://github.com/eeriks/erepublik/',
version='0.21.5.4',
version='0.21.5.6',
zip_safe=False,
)