Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
d8614b7ac2 | ||
![]() |
a9df7da3cb |
@ -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
|
||||||
|
|
||||||
|
@ -382,7 +382,9 @@ 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:
|
||||||
@ -392,8 +394,8 @@ class MyCompanies:
|
|||||||
if to_remove:
|
if to_remove:
|
||||||
return final_factories.remove(to_remove[0])
|
return final_factories.remove(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
|
||||||
|
@ -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
2
setup.py
@ -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,
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user