Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
d8614b7ac2 | |||
a9df7da3cb |
@ -4,7 +4,7 @@
|
||||
|
||||
__author__ = """Eriks Karls"""
|
||||
__email__ = "eriks@72.lv"
|
||||
__version__ = "0.29.0.5"
|
||||
__version__ = "0.29.0.4"
|
||||
|
||||
from erepublik.citizen import Citizen
|
||||
|
||||
|
@ -388,11 +388,11 @@ class MyCompanies:
|
||||
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.pop(raw_factories.idex(to_remove[0]))
|
||||
return raw_factories.remove(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.pop(final_factories.idex(to_remove[0]))
|
||||
return final_factories.remove(to_remove[0])
|
||||
|
||||
def get_raw_usage_for_companies(self, *companies: Company) -> Tuple[Decimal, Decimal, Decimal, Decimal]:
|
||||
frm = wrm = hrm = arm = Decimal("0.00")
|
||||
|
@ -1,5 +1,5 @@
|
||||
[bumpversion]
|
||||
current_version = 0.29.0.5
|
||||
current_version = 0.29.0.4
|
||||
commit = True
|
||||
tag = True
|
||||
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",
|
||||
tests_require=test_requirements,
|
||||
url="https://github.com/eeriks/erepublik/",
|
||||
version="0.29.0.5",
|
||||
version="0.29.0.4",
|
||||
zip_safe=False,
|
||||
)
|
||||
|
@ -102,8 +102,7 @@ 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
|
||||
#
|
||||
@ -113,8 +112,7 @@ 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
|
||||
@ -126,8 +124,7 @@ 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
|
||||
|
Reference in New Issue
Block a user