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

Bugfix

Browse Source
This commit is contained in:
Eriks K 2022-02-01 22:35:12 +02:00
parent 75996779e1
commit 2c1cf2fc66
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erepublik/__init__.py
View File

@ -4,7 +4,7 @@
__author__ = """Eriks Karls""" __author__ = """Eriks Karls"""
__email__ = "eriks@72.lv" __email__ = "eriks@72.lv"
__version__ = "0.29.0" __version__ = "0.29.0.4"
from erepublik.citizen import Citizen from erepublik.citizen import Citizen

12
erepublik/classes.py
View File

@ -382,18 +382,20 @@ class MyCompanies:
return raw_factories.pop(-1) return raw_factories.pop(-1)
else: else:
if raw: if raw:
raw += inv_raw.get(constants.INDUSTRIES[ids[1]], {}).get(0, {}).get("amount", 0.0) raw += Decimal(
inv_raw.get(constants.INDUSTRIES[ids[1]], {}).get(0, {}).get("amount", Decimal("0.0"))
)
if raw > 0: if raw > 0:
to_remove = sorted(raw_factories, key=lambda c: (c.industry not in ids, c.raw_usage)) to_remove = sorted(raw_factories, key=lambda c: (c.industry not in ids, c.raw_usage))
if to_remove: if to_remove:
return raw_factories.remove(to_remove[0]) return raw_factories.pop(raw_factories.idex(to_remove[0]))
else: else:
to_remove = sorted(final_factories, key=lambda c: (c.industry != ids[0], c.raw_usage)) to_remove = sorted(final_factories, key=lambda c: (c.industry != ids[0], c.raw_usage))
if to_remove: if to_remove:
return final_factories.remove(to_remove[0]) return final_factories.pop(final_factories.idex(to_remove[0]))
def get_raw_usage_for_companies(self, *companies: Company) -> Tuple[float, float, float, float]: def get_raw_usage_for_companies(self, *companies: Company) -> Tuple[Decimal, Decimal, Decimal, Decimal]:
frm = wrm = hrm = arm = 0.0 frm = wrm = hrm = arm = Decimal("0.00")
for company in companies: for company in companies:
if company.industry in self._frm_fab_ids: if company.industry in self._frm_fab_ids:
frm += company.raw_usage frm += company.raw_usage

2
setup.cfg
View File

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

2
setup.py
View File

@ -49,6 +49,6 @@ setup(
test_suite="tests", test_suite="tests",
tests_require=test_requirements, tests_require=test_requirements,
url="https://github.com/eeriks/erepublik/", url="https://github.com/eeriks/erepublik/",
version="0.29.0", version="0.29.0.4",
zip_safe=False, zip_safe=False,
) )

9
tests/test_erepublik_script.py
View File

@ -102,7 +102,8 @@ class TestErepublik(unittest.TestCase):
# self.citizen.my_companies.ff_lockdown = 160 # self.citizen.my_companies.ff_lockdown = 160
# self.assertEqual( # self.assertEqual(
# self.citizen.should_fight(), # self.citizen.should_fight(),
# (435, "Fight count modified (old count: 595 | FF: 595 | WAM ff_lockdown: 160 | New count: 435)", False), # (435, "Fight count modified (old count: 595 | FF: 595
# | WAM ff_lockdown: 160 | New count: 435)", False),
# ) # )
# self.citizen.my_companies.ff_lockdown = 0 # self.citizen.my_companies.ff_lockdown = 0
# #
@ -112,7 +113,8 @@ class TestErepublik(unittest.TestCase):
# self.citizen.my_companies.ff_lockdown = 160 # self.citizen.my_companies.ff_lockdown = 160
# self.assertEqual( # self.assertEqual(
# self.citizen.should_fight(), # self.citizen.should_fight(),
# (240, "Fight count modified (old count: 400 | FF: 400 | WAM ff_lockdown: 160 | New count: 240)", False), # (240, "Fight count modified (old count: 400 | FF: 400
# | WAM ff_lockdown: 160 | New count: 240)", False),
# ) # )
# self.citizen.my_companies.ff_lockdown = 0 # self.citizen.my_companies.ff_lockdown = 0
# self.citizen.config.all_in = False # self.citizen.config.all_in = False
@ -124,7 +126,8 @@ class TestErepublik(unittest.TestCase):
# self.citizen.my_companies.ff_lockdown = 160 # self.citizen.my_companies.ff_lockdown = 160
# self.assertEqual( # self.assertEqual(
# self.citizen.should_fight(), # self.citizen.should_fight(),
# (160, "Fight count modified (old count: 320 | FF: 400 | WAM ff_lockdown: 160 | New count: 160)", False), # (160, "Fight count modified (old count: 320 | FF: 400
# | WAM ff_lockdown: 160 | New count: 160)", False),
# ) # )
# self.citizen.my_companies.ff_lockdown = 0 # self.citizen.my_companies.ff_lockdown = 0
# self.citizen.energy.limit = 3000 # self.citizen.energy.limit = 3000