.editorconfig

@@ -21,7 +21,7 @@ insert_final_newline = false
 indent_style = tab
 
 [*.py]
-max_line_length = 120
+max_line_length = 240
 line_length=120
 multi_line_output=0
 balanced_wrapping=True

erepublik/__init__.py

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

erepublik/citizen.py

@@ -327,7 +327,7 @@ class BaseCitizen(access_points.CitizenAPI):
                 r"((?P<amount>\d+) item\(s\) )?[eE]xpires? on Day (?P<eday>\d,\d{3}), (?P<time>\d\d:\d\d)",
                 _expire_value,
             ).groupdict()
-            eday = utils.date_from_eday(int(_data["eday"].replace(",", ""))).date()
+            eday = utils.date_from_eday(int(_data["eday"].replace(",", "")))
             dt = constants.erep_tz.localize(datetime.combine(eday, time(*[int(_) for _ in _data["time"].split(":")])))
             return {"amount": _data.get("amount"), "expiration": dt}
 
@@ -1961,7 +1961,7 @@ class CitizenTasks(CitizenEconomy):
             else:
                 self.reporter.report_action("WORK", json_val=js)
         else:
-            seconds = 360 - self.now.timestamp() % 360
+            seconds = self.now.timestamp() % 360
             self.write_warning(f"I don't have energy to work. Will sleep for {seconds}s")
             self.sleep(seconds)
             self.work()
@@ -2007,7 +2007,7 @@ class CitizenTasks(CitizenEconomy):
                     self.buy_food(120)
                 self.reporter.report_action("WORK_OT", r.json())
         elif self.energy.food_fights < 1 and self.ot_points >= 24:
-            seconds = 360 - self.now.timestamp() % 360
+            seconds = self.now.timestamp() % 360
             self.write_warning(f"I don't have energy to work OT. Will sleep for {seconds}s")
             self.sleep(seconds)
             self.work_ot()
@@ -2281,9 +2281,9 @@ class _Citizen(
                     if data and kind in self.config.auto_sell:
                         if kind in ["food", "weapon", "house", "airplane"]:
                             for quality, amount in data.items():
-                                self.sell_produced_product(kind, quality, int(data))
+                                self.sell_produced_product(kind, quality)
                         elif kind.endswith("Raw"):
-                            self.sell_produced_product(kind, 1, int(data))
+                            self.sell_produced_product(kind, 1)
                         else:
                             raise classes.ErepublikException(f"Unknown kind produced '{kind}'")
         elif self.config.auto_buy_raw and re.search(r"not_enough_[^_]*_raw", response.get("message")):
@@ -2340,7 +2340,7 @@ class _Citizen(
     def work_as_manager(self) -> bool:
         """Does Work as Manager in all holdings with wam. If employees assigned - work them also
 
-        :return: if there is more wam work to do
+        :return: if has more wam work to do
         :rtype: bool
         """
         if self.restricted_ip:
@@ -2348,23 +2348,17 @@ class _Citizen(
             return False
         self.update_citizen_info()
         self.update_companies()
-        wam_holdings: List[classes.Holding] = [
+        regions: Dict[int, classes.Holding] = {}
-            holding for holding in self.my_companies.get_wam_holdings() if holding.wam_count
+        for holding in self.my_companies.holdings.values():
-        ]
+            if holding.wam_count:
+                regions.update({holding.region: holding})
 
         # Check for current region
-        for holding in wam_holdings:
+        if self.details.current_region in regions:
-            if holding.region == self.details.current_region:
+            self._wam(regions.pop(self.details.current_region))
-                self._wam(holding)
+            self.update_companies()
-                self.update_companies()
-        wam_holdings: List[classes.Holding] = [
-            holding for holding in wam_holdings if not holding.region == self.details.current_region
-        ]
 
-        for holding in wam_holdings:
+        for holding in regions.values():
-            # Don't travel if not enough energy (either work in all holding factories or 2h energy worth)
-            if self.energy.energy < 2 * self.energy.interval * 10 < holding.wam_count * 10:
-                break
             raw_usage = holding.get_wam_raw_usage()
             free_storage = self.inventory.total - self.inventory.used
             if (raw_usage["frm"] + raw_usage["wrm"]) * 100 > free_storage:
@@ -2375,6 +2369,9 @@ class _Citizen(
             self.update_companies()
 
         wam_count = self.my_companies.get_total_wam_count()
+        # if wam_count:
+        #     self.logger.debug(f"Wam ff lockdown is now {wam_count}, was {self.my_companies.ff_lockdown}")
+        # self.my_companies.ff_lockdown = wam_count
         self.travel_to_residence()
         return bool(wam_count)
 

erepublik/classes.py

@@ -411,12 +411,6 @@ class MyCompanies:
     def companies(self) -> Generator[Company, None, None]:
         return (c for c in self._companies)
 
-    def get_wam_holdings(self) -> Generator[Holding, None, None]:
-        for holding in sorted(
-            self.holdings.values(), key=lambda h: (-len(h.get_wam_companies(False)), -len(h.get_wam_companies()))
-        ):
-            yield holding
-
     def __str__(self):
         return f"MyCompanies: {sum(1 for _ in self.companies)} companies in {len(self.holdings)} holdings"
 

erepublik/constants.py

@@ -121,6 +121,7 @@ class Industries:
         14: "WRM q3",
         15: "WRM q4",
         16: "WRM q5",
+        17: "houseRaw",
         18: "houseRaw",
         19: "HRM q2",
         20: "HRM q3",

erepublik/utils.py

@@ -93,7 +93,7 @@ def eday_from_date(date: Union[datetime.date, datetime.datetime] = None) -> int:
     return (date - datetime.datetime(2007, 11, 20, 0, 0, 0)).days
 
 
-def date_from_eday(eday: int) -> datetime.datetime:
+def date_from_eday(eday: int) -> datetime.date:
     return localize_dt(datetime.date(2007, 11, 20)) + datetime.timedelta(days=eday)
 
 

requirements-dev.txt

@@ -1,16 +1,16 @@
 -r requirements.txt
 -r requirements-tests.txt
 bump2version==1.0.1
-coverage==6.3.2
+coverage==6.3
 edx-sphinx-theme==3.0.0
 flake8==4.0.1
-ipython>=8.1.1
+ipython>=8.0.1
 jedi!=0.18.0
 isort==5.10.1
 pre-commit==2.17.0
 pur==6.0.1
-responses==0.18.0
+responses==0.17.0
 Sphinx==4.4.0
-twine==3.8.0
+twine==3.7.1
 wheel==0.37.1
 black==22.1.0

requirements-tests.txt

@@ -1,2 +1,2 @@
 -r requirements.txt
-pytest==7.0.1
+pytest==6.2.5

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.29.2.3
+current_version = 0.29.0.6
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)?
@@ -19,8 +19,8 @@ universal = 1
 
 [flake8]
 exclude = docs,.git,log,debug,venv
-line_length = 120
+line_length = 140
-max-line-length = 120
+max-line-length = 140
 ignore = D100,D101,D102,D103,E203
 
 [pycodestyle]
@@ -38,4 +38,4 @@ warn_unused_configs = True
 
 [isort]
 multi_line_output = 2
-line_length = 120
+line_length = 140

setup.py

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