Bump version: 0.20.2 → 0.20.2.1

erepublik/__init__.py

@@ -4,8 +4,8 @@
 
 __author__ = """Eriks Karls"""
 __email__ = 'eriks@72.lv'
-__version__ = '0.20.1.7'
-__commit_id__ = "d1e078e"
+__version__ = '0.20.2.1'
+__commit_id__ = "6c8dbcd"
 
 from erepublik import classes, utils
 from erepublik.citizen import Citizen

erepublik/citizen.py

@@ -12,8 +12,8 @@ from requests import HTTPError, RequestException, Response
 
 from erepublik import utils
 from erepublik.access_points import CitizenAPI
-from erepublik.classes import Battle, BattleDivision, Config, Details, Energy, \
-    ErepublikException, MyCompanies, MyJSONEncoder, OfferItem, Politics, Reporter, TelegramBot
+from erepublik.classes import Battle, Config, Details, Energy, \
+    ErepublikException, MyCompanies, MyJSONEncoder, OfferItem, Politics, Reporter, TelegramBot, BattleDivision
 
 
 class BaseCitizen(CitizenAPI):
@@ -1388,75 +1388,73 @@ class CitizenMilitary(CitizenTravel):
     def get_available_weapons(self, battle_id: int):
         return self._get_military_show_weapons(battle_id).json()
 
-    def set_default_weapon(self, battle_id: int) -> int:
+    def set_default_weapon(self, battle_id: int, battle_zone: int) -> int:
         battle = self.all_battles.get(battle_id)
         available_weapons = self._get_military_show_weapons(battle_id).json()
         while not isinstance(available_weapons, list):
             available_weapons = self._get_military_show_weapons(battle_id).json()
         weapon_quality = -1
         weapon_damage = 0
-        if not battle.is_air:
+        if not battle.div[battle_zone].is_air:
             for weapon in available_weapons:
                 try:
                     if weapon['weaponQuantity'] > 30 and weapon['weaponInfluence'] > weapon_damage:
                         weapon_quality = int(weapon['weaponId'])
                 except ValueError:
                     pass
-        return self.change_weapon(battle_id, weapon_quality)
+        return self.change_weapon(battle_id, weapon_quality, battle_zone)
 
-    def change_weapon(self, battle_id: int, quality: int) -> int:
-        battle = self.all_battles.get(battle_id)
-        battle_zone = battle.div[11 if battle.is_air else self.division].battle_zone_id
+    def change_weapon(self, battle_id: int, quality: int, battle_zone: int) -> int:
         r = self._post_military_change_weapon(battle_id, battle_zone, quality)
         influence = r.json().get('weaponInfluence')
         self._report_action("MILITARY_WEAPON", f"Switched to q{quality} weapon,"
                                                f" new influence {influence}", kwargs=r.json())
         return influence
 
-    def check_epic_battles(self):
-        active_fs = False
-        for battle_id in self.sorted_battles(self.config.sort_battles_time):
-            battle = self.all_battles.get(battle_id)
-            if not battle.is_air:
-                my_div: BattleDivision = battle.div.get(self.division)
-                if my_div.epic and my_div.end > self.now:
-                    if self.energy.food_fights > 50:
-                        inv_allies = battle.invader.deployed + [battle.invader.id]
-                        def_allies = battle.defender.deployed + [battle.defender.id]
-                        all_allies = inv_allies + def_allies
-                        if self.details.current_country not in all_allies:
-                            if self.details.current_country in battle.invader.allies:
-                                allies = battle.invader.deployed
-                                side = battle.invader.id
-                            else:
-                                allies = battle.defender.deployed
-                                side = battle.defender.id
-
-                            self.travel_to_battle(battle.id, allies)
-
-                        else:
-                            if self.details.current_country in inv_allies:
-                                side = battle.invader.id
-                            elif self.details.current_country in def_allies:
-                                side = battle.defender.id
-                            else:
-                                self.write_log(
-                                    f"Country {self.details.current_country} not in all allies list ({all_allies}) and "
-                                    f"also not in inv allies ({inv_allies}) nor def allies ({def_allies})")
-                                break
-                        error_count = 0
-                        while self.energy.food_fights > 5 and error_count < 20:
-                            errors = self.fight(battle_id, side_id=side, count=self.energy.food_fights - 5)
-                            if errors:
-                                error_count += errors
-                            if self.config.epic_hunt_ebs:
-                                self._eat('orange')
-                        self.travel_to_residence()
-                        break
-                elif bool(my_div.epic):
-                    active_fs = True
-
-        self.active_fs = active_fs
+    # def check_epic_battles(self):
+    #     active_fs = False
+    #     for battle_id in self.sorted_battles(self.config.sort_battles_time):
+    #         battle = self.all_battles.get(battle_id)
+    #         if not battle.is_air:
+    #             my_div: BattleDivision = battle.div.get(self.division)
+    #             if my_div.epic and my_div.end > self.now:
+    #                 if self.energy.food_fights > 50:
+    #                     inv_allies = battle.invader.deployed + [battle.invader.id]
+    #                     def_allies = battle.defender.deployed + [battle.defender.id]
+    #                     all_allies = inv_allies + def_allies
+    #                     if self.details.current_country not in all_allies:
+    #                         if self.details.current_country in battle.invader.allies:
+    #                             allies = battle.invader.deployed
+    #                             side = battle.invader.id
+    #                         else:
+    #                             allies = battle.defender.deployed
+    #                             side = battle.defender.id
+    #
+    #                         self.travel_to_battle(battle.id, allies)
+    #
+    #                     else:
+    #                         if self.details.current_country in inv_allies:
+    #                             side = battle.invader.id
+    #                         elif self.details.current_country in def_allies:
+    #                             side = battle.defender.id
+    #                         else:
+    #                             self.write_log(
+    #                                 f"Country {self.details.current_country} not in all allies list ({all_allies}) and "
+    #                                 f"also not in inv allies ({inv_allies}) nor def allies ({def_allies})")
+    #                             break
+    #                     error_count = 0
+    #                     while self.energy.food_fights > 5 and error_count < 20:
+    #                         errors = self.fight(battle_id, side_id=side, count=self.energy.food_fights - 5)
+    #                         if errors:
+    #                             error_count += errors
+    #                         if self.config.epic_hunt_ebs:
+    #                             self._eat('orange')
+    #                     self.travel_to_residence()
+    #                     break
+    #             elif bool(my_div.epic):
+    #                 active_fs = True
+    #
+    #     self.active_fs = active_fs
 
     def sorted_battles(self, sort_by_time: bool = True) -> List[int]:
         cs_battles_priority_air: List[int] = []
@@ -1488,7 +1486,7 @@ class CitizenMilitary(CitizenTravel):
                 continue
             # CS Battles
             elif self.details.citizenship in battle_sides:
-                if battle.is_air:
+                if battle.has_air:
                     if battle.defender.id == self.details.citizenship:
                         cs_battles_priority_air.append(battle.id)
                     else:
@@ -1501,7 +1499,7 @@ class CitizenMilitary(CitizenTravel):
 
             # Current location battles:
             elif self.details.current_country in battle_sides:
-                if battle.is_air:
+                if battle.has_air:
                     deployed_battles_air.append(battle.id)
                 else:
                     deployed_battles_ground.append(battle.id)
@@ -1509,18 +1507,18 @@ class CitizenMilitary(CitizenTravel):
             # Deployed battles and allied battles:
             elif self.details.current_country in battle.invader.allies + battle.defender.allies + battle_sides:
                 if self.details.current_country in battle.invader.deployed + battle.defender.deployed:
-                    if battle.is_air:
+                    if battle.has_air:
                         deployed_battles_air.append(battle.id)
                     else:
                         deployed_battles_ground.append(battle.id)
                 # Allied battles:
                 else:
-                    if battle.is_air:
+                    if battle.has_air:
                         ally_battles_air.append(battle.id)
                     else:
                         ally_battles_ground.append(battle.id)
             else:
-                if battle.is_air:
+                if battle.has_air:
                     other_battles_air.append(battle.id)
                 else:
                     other_battles_ground.append(battle.id)
@@ -1542,8 +1540,21 @@ class CitizenMilitary(CitizenTravel):
                 battle = self.all_battles.get(battle_id)
                 if not isinstance(battle, Battle):
                     continue
-                div = 11 if battle.is_air else self.division
-
+                battle_zone: Optional[BattleDivision] = None
+                for div in battle.div.values():
+                    if div.terrain == 0:
+                        if div.div_end:
+                            continue
+                        if self.config.air and div.is_air:
+                            battle_zone = div
+                            break
+                        elif self.config.ground and not div.is_air and div.div == self.division:
+                            battle_zone = div
+                            break
+                        else:
+                            continue
+                if not battle_zone:
+                    continue
                 allies = battle.invader.deployed + battle.defender.deployed + [battle.invader.id, battle.defender.id]
 
                 travel_needed = self.details.current_country not in allies
@@ -1553,20 +1564,13 @@ class CitizenMilitary(CitizenTravel):
                 else:
                     side = self.details.current_country in battle.defender.allies + [battle.defender.id, ]
                     side_id = battle.defender.id if side else battle.invader.id
-                try:
-                    def_points = battle.div.get(div).dom_pts.get('def')
-                    inv_points = battle.div.get(div).dom_pts.get('inv')
-                except KeyError:
-                    self.report_error(f"Division {div} not available for battle {battle.id}!")
-                    def_points = inv_points = 3600
+
                 self.write_log(battle)
 
-                points = def_points <= 1700 and inv_points <= 1700
-                b_type = battle.is_air and self.config.air or not battle.is_air and self.config.ground
                 travel = (self.config.travel_to_fight and self.should_travel_to_fight() or self.config.force_travel) \
                     if travel_needed else True
 
-                if not (points and b_type and travel):
+                if not travel:
                     continue
 
                 if battle.start > self.now:
@@ -1584,12 +1588,13 @@ class CitizenMilitary(CitizenTravel):
 
                     if not self.travel_to_battle(battle_id, country_ids_to_travel):
                         break
-                self.set_default_weapon(battle_id)
-                self.fight(battle_id, side_id)
+                self.change_division(battle_id, battle_zone.id)
+                self.set_default_weapon(battle_id, battle_zone.id)
+                self.fight(battle_id, battle_zone.id, side_id)
                 self.travel_to_residence()
                 break
 
-    def fight(self, battle_id: int, side_id: int = None, count: int = None, division: int = None) -> int:
+    def fight(self, battle_id: int, battle_zone: int, side_id: int = None, count: int = None) -> int:
         """Fight in a battle.
 
         Will auto activate booster and travel if allowed to do it.
@@ -1600,8 +1605,8 @@ class CitizenMilitary(CitizenTravel):
         :type side_id: int
         :param count: How many hits to do, if not specified self.should_fight() is called.
         :type count: int
-        :param division: int Division number to fight in available choices 1,2,3,4,11
-        :type division: int
+        :param battle_zone: int Division number to fight in available choices
+        :type battle_zone: int
         :return: None if no errors while fighting, otherwise error count.
         :rtype: int
         """
@@ -1614,9 +1619,7 @@ class CitizenMilitary(CitizenTravel):
         if battle_id not in self.all_battles:
             self.update_war_info()
         battle = self.all_battles.get(battle_id)
-        division = self.division if division is None else division
-        zone_id = battle.div[11 if battle.is_air else division].battle_zone_id
-        if not battle.is_air and self.config.boosters:
+        if not battle.div[battle_zone].is_air and self.config.boosters:
             self.activate_dmg_booster()
         error_count = 0
         ok_to_fight = True
@@ -1628,7 +1631,7 @@ class CitizenMilitary(CitizenTravel):
         side = battle.invader.id == side_id or side_id in battle.invader.deployed
         while ok_to_fight and error_count < 10 and count > 0:
             while all((count > 0, error_count < 10, self.energy.recovered >= 50)):
-                hits, error, damage = self._shoot(battle_id, side, zone_id)
+                hits, error, damage = self._shoot(battle_id, side, battle_zone)
                 count -= hits
                 total_hits += hits
                 total_damage += damage
@@ -1640,13 +1643,13 @@ class CitizenMilitary(CitizenTravel):
                     ok_to_fight = False
                     if total_damage:
                         self.reporter.report_action("FIGHT", dict(battle=battle_id, side=side_id, dmg=total_damage,
-                                                                  air=battle.is_air, hits=total_hits))
+                                                                  air=battle.has_air, hits=total_hits))
         return error_count
 
     def _shoot(self, battle_id: int, inv_side: bool, zone_id: int):
         battle = self.all_battles.get(battle_id)
         side_id = battle.invader.id if inv_side else battle.defender.id
-        if battle.is_air:
+        if battle.div[zone_id].is_air:
             response = self._post_military_fight_air(battle_id, side_id, zone_id)
         else:
             response = self._post_military_fight_ground(battle_id, side_id, zone_id)
@@ -1665,7 +1668,7 @@ class CitizenMilitary(CitizenTravel):
             if r_json.get("message") == "SHOOT_LOCKOUT" or r_json.get("message") == "ZONE_INACTIVE":
                 pass
             elif r_json.get("message") == "NOT_ENOUGH_WEAPONS":
-                self.set_default_weapon(battle_id)
+                self.set_default_weapon(battle_id, zone_id)
             else:
                 if r_json.get("message") == "UNKNOWN_SIDE":
                     self._rw_choose_side(battle_id, side_id)
@@ -1736,8 +1739,9 @@ class CitizenMilitary(CitizenTravel):
         :return:
         """
         battle = self.all_battles.get(battle_id)
-        self._post_main_battlefield_change_division(battle_id, battle.div[division_to].battle_zone_id)
-        self._report_action("MILITARY_DIV_SWITCH", f"Switched to d{division_to} in battle {battle_id}")
+        division = battle.div[division_to]
+        self._post_main_battlefield_change_division(battle_id, division_to)
+        self._report_action("MILITARY_DIV_SWITCH", f"Switched to d{division.div} in battle {battle_id}")
 
     def get_ground_hit_dmg_value(self, rang: int = None, strength: float = None, elite: bool = None, ne: bool = False,
                                  booster_50: bool = False, booster_100: bool = False, tp: bool = True) -> Decimal:

erepublik/classes.py

@@ -621,8 +621,10 @@ class BattleSide:
     points: int
     deployed: List[int] = None
     allies: List[int] = None
+    battle: "Battle"
 
-    def __init__(self, country_id: int, points: int, allies: List[int], deployed: List[int]):
+    def __init__(self, battle: "Battle", country_id: int, points: int, allies: List[int], deployed: List[int]):
+        self.battle = battle
         self.id = country_id
         self.points = points
         self.allies = [int(ally) for ally in allies]
@@ -637,33 +639,37 @@ class BattleDivision:
     battle_zone_id: int
     def_medal: Dict[str, int]
     inv_medal: Dict[str, int]
+    terrain: int
+    div: int
+    battle: "Battle"
+
+    @property
+    def is_air(self):
+        return self.div == 11
 
     @property
     def div_end(self) -> bool:
         return utils.now() >= self.end
 
-    def __init__(self, div_id: int, end: datetime.datetime, epic: bool, inv_pts: int, def_pts: int,
-                 wall_for: int, wall_dom: float, def_medal: Tuple[int, int], inv_medal: Tuple[int, int]):
+    def __init__(self, battle: "Battle", div_id: int, end: datetime.datetime, epic: bool, div: int, wall_for: int, wall_dom: float,
+                 terrain_id: int = 0):
         """Battle division helper class
 
         :type div_id: int
         :type end: datetime.datetime
         :type epic: bool
-        :type inv_pts: int
-        :type def_pts: int
+        :type div: int
+        :type terrain_id: int
         :type wall_for: int
         :type wall_dom: float
-        :type def_medal: Tuple[int, int]
-        :type inv_medal: Tuple[int, int]
         """
-
+        self.battle = battle
         self.battle_zone_id = div_id
         self.end = end
         self.epic = epic
-        self.dom_pts = dict({"inv": inv_pts, "def": def_pts})
         self.wall = dict({"for": wall_for, "dom": wall_dom})
-        self.def_medal = {"id": def_medal[0], "dmg": def_medal[1]}
-        self.inv_medal = {"id": inv_medal[0], "dmg": inv_medal[1]}
+        self.terrain = terrain_id
+        self.div = div
 
     @property
     def id(self):
@@ -682,9 +688,19 @@ class Battle:
     div: Dict[int, BattleDivision]
 
     @property
-    def is_air(self) -> bool:
+    def has_air(self) -> bool:
+        for div in self.div.values():
+            if div.div == 11:
+                return True
         return not bool(self.zone_id % 4)
 
+    @property
+    def has_ground(self) -> bool:
+        for div in self.div.values():
+            if div.div != 11:
+                return True
+        return bool(self.zone_id % 4)
+
     def __init__(self, battle: Dict[str, Any]):
         """Object representing eRepublik battle.
 
@@ -700,12 +716,14 @@ class Battle:
         self.start = datetime.datetime.fromtimestamp(int(battle.get('start', 0)), tz=utils.erep_tz)
 
         self.invader = BattleSide(
+            self,
             battle.get('inv', {}).get('id'), battle.get('inv', {}).get('points'),
             [row.get('id') for row in battle.get('inv', {}).get('ally_list')],
             [row.get('id') for row in battle.get('inv', {}).get('ally_list') if row['deployed']]
         )
 
         self.defender = BattleSide(
+            self,
             battle.get('def', {}).get('id'), battle.get('def', {}).get('points'),
             [row.get('id') for row in battle.get('def', {}).get('ally_list')],
             [row.get('id') for row in battle.get('def', {}).get('ally_list') if row['deployed']]
@@ -713,24 +731,17 @@ class Battle:
 
         self.div = {}
         for div, data in battle.get('div', {}).items():
-            div = int(data.get('div'))
+            div = int(div)
             if data.get('end'):
                 end = datetime.datetime.fromtimestamp(data.get('end'), tz=utils.erep_tz)
             else:
                 end = utils.localize_dt(datetime.datetime.max - datetime.timedelta(days=1))
 
-            if not data.get('stats',{}).get('def'):
-                def_medal = (0, 0)
-            else:
-                def_medal = (data['stats']['def']['citizenId'], data['stats']['def']['damage'])
-            if not data.get('stats').get('inv'):
-                inv_medal = (0, 0)
-            else:
-                inv_medal = (data['stats']['inv']['citizenId'], data['stats']['inv']['damage'])
-            battle_div = BattleDivision(div_id=data.get('id'), end=end, epic=data.get('epic_type') in [1, 5],
-                                        inv_pts=data.get('dom_pts').get("inv"), def_pts=data.get('dom_pts').get("def"),
-                                        wall_for=data.get('wall').get("for"), wall_dom=data.get('wall').get("dom"),
-                                        def_medal=def_medal, inv_medal=inv_medal)
+            battle_div = BattleDivision(self, div_id=data.get('id'), div=data.get('div'), end=end,
+                                        epic=data.get('epic_type') in [1, 5],
+                                        wall_for=data.get('wall').get("for"),
+                                        wall_dom=data.get('wall').get("dom"),
+                                        terrain_id=data.get('terrain', 0))
 
             self.div.update({div: battle_div})
 

setup.cfg

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

setup.py

@@ -43,6 +43,6 @@ setup(
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/eeriks/erepublik/',
-    version='0.20.1.7',
+    version='0.20.2.1',
     zip_safe=False,
 )