Bump version: 0.23.0 → 0.23.1

HISTORY.rst

@@ -2,6 +2,16 @@
 History
 =======
 
+0.23.0 (2020-11-26)
+-------------------
+* Added `Config.maverick` switch, to allow/deny automated fighting in non native divisions if the player has MaverickPack
+* Added `CitizenMedia.get_article(article_id:int)` method to get article data
+* Added `CitizenMedia.delete_article(article_id:int)` method to delete article
+* Fixed `CitizenTravel.travel_to_region(region_id:int)` method
+* Added `CitizenAnniversary.collect_map_quest_node(node_id:int, extra:bool=False)` to collect also extra rewards
+* Fixed `CitizenTasks.work()` when employer out of money - resign and find a new job
+* Fixed `CitizenEconomy.post_market_offer()`
+
 0.22.3 (2020-11-16)
 -------------------
 * Fixed round to even bug when doing wam and not enough raw.

erepublik/__init__.py

@@ -4,7 +4,7 @@
 
 __author__ = """Eriks Karls"""
 __email__ = 'eriks@72.lv'
-__version__ = '0.22.3'
+__version__ = '0.23.1'
 
 from erepublik import classes, utils, constants
 from erepublik.citizen import Citizen

erepublik/access_points.py

@@ -161,8 +161,10 @@ class ErepublikAnniversaryAPI(CitizenBaseAPI):
         data = {'nodeId': node_id, '_token': self.token, "currencyCost": currency_amount}
         return self.post(f"{self.url}/main/map-rewards-speedup", data=data)
 
-    def _post_map_rewards_claim(self, node_id: int) -> Response:
+    def _post_map_rewards_claim(self, node_id: int, extra: bool = False) -> Response:
         data = {'nodeId': node_id, '_token': self.token}
+        if extra:
+            data['claimExtra'] = 1
         return self.post(f"{self.url}/main/map-rewards-claim", data=data)
 
     def _post_main_wheel_of_fortune_spin(self, cost) -> Response:
@@ -176,6 +178,9 @@ class ErepublikArticleAPI(CitizenBaseAPI):
     def _get_main_article_json(self, article_id: int) -> Response:
         return self.get(f"{self.url}/main/articleJson/{article_id}")
 
+    def _get_main_delete_article(self, article_id: int) -> Response:
+        return self.get(f"{self.url}/main/delete-article/{article_id}/1")
+
     def _post_main_article_comments(self, article_id: int, page: int = 1) -> Response:
         data = dict(_token=self.token, articleId=article_id, page=page)
         if page:
@@ -383,6 +388,9 @@ class ErepublikLocationAPI(CitizenBaseAPI):
 
 
 class ErepublikMilitaryAPI(CitizenBaseAPI):
+    def _get_military_battle_stats(self, battle_id: int, division: int, division_id: int):
+        return self.get(f"{self.url}/military/battle-stats/{battle_id}/{division}/{division_id}")
+
     def _get_military_battlefield_choose_side(self, battle_id: int, side_id: int) -> Response:
         return self.get(f"{self.url}/military/battlefield-choose-side/{battle_id}/{side_id}")
 

erepublik/citizen.py

@@ -33,6 +33,7 @@ class BaseCitizen(access_points.CitizenAPI):
     maverick: bool = False
 
     eday: int = 0
+    wheel_of_fortune: bool
 
     config: classes.Config = None
     energy: classes.Energy = None
@@ -62,6 +63,7 @@ class BaseCitizen(access_points.CitizenAPI):
         self.config.password = password
         self.inventory = {}
         self.inventory_status = dict(used=0, total=0)
+        self.wheel_of_fortune = False
 
     def get_csrf_token(self):
         """
@@ -230,6 +232,9 @@ class BaseCitizen(access_points.CitizenAPI):
             self.politics.is_party_president = bool(party.get('is_party_president'))
             self.politics.party_slug = f"{party.get('stripped_title')}-{party.get('party_id')}"
 
+        self.wheel_of_fortune = bool(
+            re.search(r'<a id="launch_wof" class="powerspin_sidebar( show_free)?" href="javascript:">', html))
+
     def update_inventory(self):
         """
         Updates class properties and returns structured inventory.
@@ -731,31 +736,41 @@ class CitizenAnniversary(BaseCitizen):
     def start_unlocking_map_quest_node(self, node_id: int):
         return self._post_map_rewards_unlock(node_id)
 
-    def collect_map_quest_node(self, node_id: int):
-        return self._post_map_rewards_claim(node_id)
+    def collect_map_quest_node(self, node_id: int, extra: bool = False):
+        return self._post_map_rewards_claim(node_id, extra)
 
     def speedup_map_quest_node(self, node_id: int):
         node = self.get_anniversary_quest_data().get('cities', {}).get(str(node_id), {})
         return self._post_map_rewards_speedup(node_id, node.get("skipCost", 0))
 
     def spin_wheel_of_fortune(self, max_cost=0, spin_count=0):
-        def _write_spin_data(cost, cc, prize):
-            self._report_action("WHEEL_SPIN", f"Cost: {cost:4d} | Currency left: {cc:,} | Prize: {prize}")
+        if not self.config.spin_wheel_of_fortune:
+            self.write_log("Unable to spin wheel of fortune because 'config.spin_wheel_of_fortune' is False")
+            return
 
+        def _write_spin_data(cost: int, prize: str):
+            self._report_action("WHEEL_SPIN", f"Cost: {cost:4d} | Currency left: {self.details.cc:,} | Prize: {prize}")
+
+        if not self.wheel_of_fortune:
+            self.update_citizen_info()
         base = self._post_main_wheel_of_fortune_build().json()
         current_cost = 0 if base.get('progress').get('free_spin') else base.get('cost')
         current_count = base.get('progress').get('spins')
+        prizes = base.get('prizes')
         if not max_cost and not spin_count:
             r = self._post_main_wheel_of_fortune_spin(current_cost).json()
-            _write_spin_data(current_cost, r.get('account'),
-                             base.get('prizes').get('prizes').get(str(r.get('result'))).get('tooltip'))
+            _write_spin_data(current_cost, prizes.get('prizes').get(str(r.get('result'))).get('tooltip'))
         else:
             while max_cost >= current_cost if max_cost else spin_count >= current_count if spin_count else False:
                 r = self._spin_wheel_of_loosing(current_cost)
                 current_count += 1
+                prize_name = prizes.get('prizes').get(str(r.get('result'))).get('tooltip')
+                if r.get('result') == 7:
+                    prize_name += f" - {prizes.get('jackpot').get(str(r.get('jackpot'))).get('tooltip')}"
+                _write_spin_data(current_cost, prize_name)
                 current_cost = r.get('cost')
-                _write_spin_data(current_cost, r.get('account'),
-                                 base.get('prizes').get('prizes').get(str(r.get('result'))).get('tooltip'))
+                if r.get('jackpot', 0) == 3:
+                    return
 
     def _spin_wheel_of_loosing(self, current_cost: int) -> Dict[str, Any]:
         r = self._post_main_wheel_of_fortune_spin(current_cost).json()
@@ -808,7 +823,14 @@ class CitizenTravel(BaseCitizen):
         if data.get('alreadyInRegion'):
             return True
         else:
-            country = constants.COUNTRIES[data.get('preselectCountryId')]
+            country = None
+            for country_data in data.get('countries').values():
+                if region_id in country_data.get('regions'):
+                    country = constants.COUNTRIES[country_data.get('id')]
+                    break
+
+            if country is None:
+                raise classes.ErepublikException('Region not found!')
 
             if self._travel(country, region_id):
                 self._report_action("TRAVEL", "Traveled to region")
@@ -1120,14 +1142,16 @@ class CitizenEconomy(CitizenTravel):
         if not constants.INDUSTRIES[industry]:
             self.write_log(f"Trying to sell unsupported industry {industry}")
 
-        final = industry in [1, 2, 4, 23]
-        items = self.inventory['final' if final else 'raw'][constants.INDUSTRIES[industry]]
-        if items[quality if final else 0]['amount'] < amount:
-            self.update_inventory()
-            items = self.inventory['final' if final else 'raw'][constants.INDUSTRIES[industry]]
-            if items[quality if final else 0]['amount'] < amount:
+        _inv_qlt = quality if industry in [1, 2, 3, 4, 23] else 0
+        _kind = 'final' if industry in [1, 2, 4, 4, 23] else 'raw'
+        inventory = self.get_inventory()
+        items = inventory[_kind].get(constants.INDUSTRIES[industry], {_inv_qlt: {'amount': 0}})
+        if items[_inv_qlt]['amount'] < amount:
+            inventory = self.get_inventory(True)
+            items = inventory[_kind].get(constants.INDUSTRIES[industry], {_inv_qlt: {'amount': 0}})
+            if items[_inv_qlt]['amount'] < amount:
                 self._report_action("ECONOMY_SELL_PRODUCTS", "Unable to sell! Not enough items in storage!",
-                                    kwargs=dict(inventory=items[quality if final else 0], amount=amount))
+                                    kwargs=dict(inventory=items[_inv_qlt], amount=amount))
                 return False
 
         data = {
@@ -1435,6 +1459,19 @@ class CitizenMedia(BaseCitizen):
                 "\n".join(["{}: {}".format(k, v) for k, v in kinds.items()]), kind
             ))
 
+    def get_article(self, article_id: int) -> Dict[str, Any]:
+        return self._get_main_article_json(article_id).json()
+
+    def delete_article(self, article_id: int) -> NoReturn:
+        article_data = self.get_article(article_id)
+        if article_data and article_data['articleData']['canDelete']:
+            self._report_action("ARTICLE_DELETE",
+                                f"Attempting to delete article '{article_data['article']['title']}' (#{article_id})",
+                                kwargs=article_data)
+            self._get_main_delete_article(article_id)
+        else:
+            self.write_log(f"Unable to delete article (#{article_id})!")
+
 
 class CitizenMilitary(CitizenTravel):
     all_battles: Dict[int, classes.Battle] = None
@@ -1606,6 +1643,7 @@ class CitizenMilitary(CitizenTravel):
     def get_cheap_tp_divisions(self) -> Dict[str, List[Tuple[int, classes.BattleDivision]]]:
         air_divs: List[Tuple[int, classes.BattleDivision]] = []
         ground_divs: List[Tuple[int, classes.BattleDivision]] = []
+        check_maverick = self.maverick and self.config.maverick
         for battle in reversed(self.sorted_battles(True, True)):
             for division in battle.div.values():
                 is_start_ok = utils.good_timedelta(division.battle.start, timedelta(minutes=-1)) < self.now
@@ -1618,7 +1656,7 @@ class CitizenMilitary(CitizenTravel):
                         else:
                             air_divs.append((medal.get('1').get('raw_value'), division))
                     elif not division.is_air and self.config.ground:
-                        if not division.div == self.division and not self.maverick:
+                        if not division.div == self.division and not check_maverick:
                             continue
                         division_medals = self.get_battle_round_data(division)
                         medal = division_medals[self.details.citizenship == division.battle.defender.country]
@@ -1972,13 +2010,8 @@ class CitizenMilitary(CitizenTravel):
             count = self.energy.food_fights
             msg = "Fighting all-in. Doing %i hits" % count
 
-        # All-in for AIR battles
-        elif all([self.config.air, self.config.all_in, self.energy.available >= self.energy.limit]):
-            count = self.energy.food_fights
-            msg = "Fighting all-in in AIR. Doing %i hits" % count
-
         # Get to next Energy +1
-        elif self.next_reachable_energy and self.config.next_energy:
+        elif self.config.next_energy and self.next_reachable_energy:
             count = self.next_reachable_energy
             msg = "Fighting for +1 energy. Doing %i hits" % count
 
@@ -2000,6 +2033,21 @@ class CitizenMilitary(CitizenTravel):
         return (r_json.get(str(battle.invader.id)).get("fighterData"),
                 r_json.get(str(battle.defender.id)).get("fighterData"))
 
+    def get_battle_division_stats(self, division: classes.BattleDivision) -> Dict[str, Any]:
+        battle = division.battle
+        r = self._get_military_battle_stats(battle.id, division.div, division.id)
+        return r.json()
+
+    def get_division_max_hit(self, division: classes.BattleDivision) -> int:
+        """ Returns max hit in division for current side (if not on either side returns 0)
+
+        :param division: BattleDivision for which to get max hit value
+        :type division: classes.BattleDivision
+        :return: max hit value
+        :rtype: int
+        """
+        return self.get_battle_division_stats(division).get('maxHit', -1)
+
     def schedule_attack(self, war_id: int, region_id: int, region_name: str, at_time: datetime):
         if at_time:
             self.sleep(utils.get_sleep_seconds(at_time))
@@ -2219,7 +2267,8 @@ class CitizenTasks(BaseCitizen):
             js = response.json()
             good_msg = ["already_worked", "captcha"]
             if not js.get("status") and not js.get("message") in good_msg:
-                if js.get('message') == 'employee':
+                if js.get('message') in ['employee', 'money']:
+                    self.resign_from_employer()
                     self.find_new_job()
                 self.update_citizen_info()
                 self.work()
@@ -2607,7 +2656,8 @@ class Citizen(CitizenAnniversary, CitizenCompanies, CitizenEconomy, CitizenLeade
 
                     if not best_offer.country == self.details.current_country:
                         self.travel_to_country(best_offer.country)
-                    self._report_action("ECONOMY_BUY", f"Attempting to buy {amount} {raw_kind} for {best_offer.price*amount}cc")
+                    self._report_action("ECONOMY_BUY",
+                                        f"Attempting to buy {amount} {raw_kind} for {best_offer.price * amount}cc")
                     rj = self.buy_from_market(amount=amount, offer=best_offer.offer_id)
                     if not rj.get('error'):
                         amount_needed -= amount

erepublik/classes.py

@@ -357,6 +357,8 @@ class Config:
     telegram = True
     telegram_chat_id = 0
     telegram_token = ""
+    maverick = False
+    spin_wheel_of_fortune = False
 
     def __init__(self):
         self.auto_sell = []
@@ -389,6 +391,8 @@ class Config:
         self.telegram = True
         self.telegram_chat_id = 0
         self.telegram_token = ""
+        self.maverick = False
+        self.spin_wheel_of_fortune = False
 
     @property
     def as_dict(self):
@@ -397,10 +401,11 @@ class Config:
                     fight=self.fight, air=self.air, ground=self.ground, all_in=self.all_in,
                     next_energy=self.next_energy, boosters=self.boosters, travel_to_fight=self.travel_to_fight,
                     always_travel=self.always_travel, epic_hunt=self.epic_hunt, epic_hunt_ebs=self.epic_hunt_ebs,
-                    rw_def_side=self.rw_def_side, interactive=self.interactive,
+                    rw_def_side=self.rw_def_side, interactive=self.interactive, maverick=self.maverick,
                     continuous_fighting=self.continuous_fighting, auto_buy_raw=self.auto_buy_raw,
                     force_wam=self.force_wam, sort_battles_time=self.sort_battles_time, force_travel=self.force_travel,
-                    telegram=self.telegram, telegram_chat_id=self.telegram_chat_id, telegram_token=self.telegram_token)
+                    telegram=self.telegram, telegram_chat_id=self.telegram_chat_id, telegram_token=self.telegram_token,
+                    spin_wheel_of_fortune=self.spin_wheel_of_fortune)
 
 
 class Energy:

erepublik/constants.py

@@ -53,7 +53,7 @@ class Country:
 
 
 class Industries:
-    __by_name = {'food': 1, 'weapon': 2, 'ticket':3, 'house': 4, 'aircraft': 23,
+    __by_name = {'food': 1, 'weapon': 2, 'ticket': 3, 'house': 4, 'aircraft': 23,
                  'foodraw': 7, 'weaponraw': 12, 'houseraw': 18, 'aircraftraw': 24, 'airplaneraw': 24,
                  'frm': 7, 'wrm': 12, 'hrm': 18, 'arm': 24,
                  'frm q1': 7, 'frm q2': 8, 'frm q3': 9, 'frm q4': 10, 'frm q5': 11,

requirements_dev.txt

@@ -4,16 +4,16 @@ edx-sphinx-theme==1.5.0
 flake8==3.8.4
 ipython>=7.19.0
 isort==5.6.4
-pip==20.2.4
-PyInstaller==4.0
+pip==20.3
+PyInstaller==4.1
 pytz==2020.4
 pytest==6.1.2
-responses==0.12.0
+responses==0.12.1
 setuptools==50.3.2
-Sphinx==3.3.0
-requests==2.24.0
+Sphinx==3.3.1
+requests==2.25.0
 PySocks==1.7.1
 tox==3.20.1
 twine==3.2.0
-watchdog==0.10.3
+watchdog==0.10.4
 wheel==0.35.1

setup.cfg

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

setup.py

@@ -13,7 +13,7 @@ with open('HISTORY.rst') as history_file:
 
 requirements = [
     'pytz==2020.4',
-    'requests==2.24.0',
+    'requests==2.25.0',
     'PySocks==1.7.1'
 ]
 
@@ -21,7 +21,7 @@ setup_requirements = []
 
 test_requirements = [
     "pytest==6.1.2",
-    "responses==0.12.0"
+    "responses==0.12.1"
 ]
 
 setup(
@@ -50,6 +50,6 @@ setup(
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/eeriks/erepublik/',
-    version='0.22.3',
+    version='0.23.1',
     zip_safe=False,
 )