diff --git a/erepublik/__init__.py b/erepublik/__init__.py index 51ce329..9e37897 100644 --- a/erepublik/__init__.py +++ b/erepublik/__init__.py @@ -4,7 +4,7 @@ __author__ = """Eriks Karls""" __email__ = "eriks@72.lv" -__version__ = "0.29.0" +__version__ = "0.29.0.4" from erepublik.citizen import Citizen diff --git a/erepublik/classes.py b/erepublik/classes.py index d12dc31..e972f75 100644 --- a/erepublik/classes.py +++ b/erepublik/classes.py @@ -382,18 +382,20 @@ class MyCompanies: return raw_factories.pop(-1) else: 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: to_remove = sorted(raw_factories, key=lambda c: (c.industry not in ids, c.raw_usage)) if to_remove: - return raw_factories.remove(to_remove[0]) + return raw_factories.pop(raw_factories.idex(to_remove[0])) else: to_remove = sorted(final_factories, key=lambda c: (c.industry != ids[0], c.raw_usage)) 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]: - frm = wrm = hrm = arm = 0.0 + def get_raw_usage_for_companies(self, *companies: Company) -> Tuple[Decimal, Decimal, Decimal, Decimal]: + frm = wrm = hrm = arm = Decimal("0.00") for company in companies: if company.industry in self._frm_fab_ids: frm += company.raw_usage diff --git a/setup.cfg b/setup.cfg index dac338a..465959a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.29.0 +current_version = 0.29.0.4 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\.?(?P\d+)? diff --git a/setup.py b/setup.py index bce33bb..7c4a457 100644 --- a/setup.py +++ b/setup.py @@ -49,6 +49,6 @@ setup( test_suite="tests", tests_require=test_requirements, url="https://github.com/eeriks/erepublik/", - version="0.29.0", + version="0.29.0.4", zip_safe=False, ) diff --git a/tests/test_erepublik_script.py b/tests/test_erepublik_script.py index 476e07d..5d7a408 100644 --- a/tests/test_erepublik_script.py +++ b/tests/test_erepublik_script.py @@ -102,7 +102,8 @@ class TestErepublik(unittest.TestCase): # self.citizen.my_companies.ff_lockdown = 160 # self.assertEqual( # 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 # @@ -112,7 +113,8 @@ class TestErepublik(unittest.TestCase): # self.citizen.my_companies.ff_lockdown = 160 # self.assertEqual( # 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.config.all_in = False @@ -124,7 +126,8 @@ class TestErepublik(unittest.TestCase): # self.citizen.my_companies.ff_lockdown = 160 # self.assertEqual( # 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.energy.limit = 3000