Revert "Travel for fighting"

This reverts commit 07c88810923b7051e997db746076a9e18656c0f5.

erepublik/citizen.py

@@ -579,11 +579,13 @@ class Citizen(classes.CitizenAPI):
                         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, side)
+                            self.travel_to_battle(battle.id, allies)
 
                         else:
                             if self.details.current_country in inv_allies:
@@ -719,12 +721,17 @@ class Citizen(classes.CitizenAPI):
                     self.sleep(utils.get_sleep_seconds(battle.start))
 
                 if travel_needed:
-                    if self.details.current_country in battle.invader.allies:
+                    if battle.is_rw:
+                        country_ids_to_travel = [battle.defender.id]
+                    elif self.details.current_country in battle.invader.allies:
+                        country_ids_to_travel = battle.invader.deployed + [battle.invader.id]
                         side_id = battle.invader.id
                     else:
+                        country_ids_to_travel = battle.defender.deployed + [battle.defender.id]
                         side_id = battle.defender.id
 
-                    self.travel_to_battle(battle_id, side_id)
+                    if not self.travel_to_battle(battle_id, country_ids_to_travel):
+                        break
                 self.fight(battle_id, side_id, battle.is_air)
                 self.travel_to_residence()
                 self.collect_weekly_reward()
@@ -1086,13 +1093,23 @@ class Citizen(classes.CitizenAPI):
                 return True
             return False
 
-    def travel_to_battle(self, battle_id: int, side_id: int):
+    def travel_to_battle(self, battle_id: int, *allowed_countries: List[int]) -> bool:
         data = self.get_travel_regions(battle_id=battle_id)
 
-        travel_data = data.get('battleInfo', {}).get(str(side_id))
+        regs = []
-        if not travel_data:
+        if data:
-            post_data = dict(battleId=battle_id, sideCountryId=side_id, **travel_data)
+            for region in data.values():
-            r = self._post_main_battlefield_travel(**post_data).json()
+                if region['countryId'] in allowed_countries:  # Is not occupied by other country
+                    regs.append((region['distanceInKm'], region['id'], region['countryId']))
+        if regs:
+            reg = min(regs, key=lambda _: int(_[0]))
+            region_id = reg[1]
+            country_id = reg[2]
+            r = self._travel(country_id, region_id).json()
+            if r.get('message', '') == 'success':
+                self._update_citizen_location(country_id, region_id)
+                return True
+        return False
 
     def _travel(self, country_id: int, region_id: int = 0) -> Response:
         data = {
@@ -1334,7 +1351,7 @@ class Citizen(classes.CitizenAPI):
         elif self.next_reachable_energy and self.config.next_energy:
             ret = True
         # 1h worth of energy
-        elif self.energy.is_energy_full:
+        elif self.energy.available + self.energy.interval * 3 >= self.energy.limit * 2:
             ret = True
         return ret
 
@@ -1910,11 +1927,40 @@ class Citizen(classes.CitizenAPI):
 
         return {"gold": 0, "cc": 0, 'ok': False}
 
-    def get_ground_hit_dmg_value(self, booster: int, tp: bool = True, ne: bool = False) -> float:
+    def get_ground_hit_dmg_value(self, rang: int = None, strength: float = None, elite: bool = None, ne: bool = False,
-        return utils.ground_hit_dmg_value(self.details.citizen_id, ne, tp, booster)
+                                 booster_50: bool = False, booster_100: bool = False, tp: bool = True) -> float:
+        if not rang or strength or elite is None:
+            r = self._get_main_citizen_profile_json(self.details.citizen_id).json()
+            if not rang:
+                rang = r['military']['militaryData']['ground']['rankNumber']
+            if not strength:
+                strength = r['military']['militaryData']['ground']['strength']
+            if elite is None:
+                elite = r['citizenAttributes']['level'] > 100
+        if ne:
+            tp = True
 
-    def get_air_hit_dmg_value(self, booster: int, tp: bool = True, ne: bool = False) -> float:
+        dmg = int(10 * (1 + strength / 400) * (1 + rang / 5) * 3)
-        return utils.air_hit_dmg_value(self.details.citizen_id, ne, tp, booster, 0)
+        booster = 1.5 if booster_50 else 2 if booster_100 else 1
+        elite = 1.1 if elite else 1
+        dmg = int(dmg * booster * elite)
+        legend = 1 if (not tp or rang < 70) else 1 + (rang - 69) / 10
+        dmg = int(dmg * legend)
+        return dmg * (1.1 if ne else 1)
+
+    def get_air_hit_dmg_value(self, rang: int = None, elite: bool = None, ne: bool = False,
+                              weapon: bool = False) -> float:
+        if not rang or elite is None:
+            r = self._get_main_citizen_profile_json(self.details.citizen_id).json()
+            if not rang:
+                rang = r['military']['militaryData']['air']['rankNumber']
+            if elite is None:
+                elite = r['citizenAttributes']['level'] > 100
+
+        dmg = int(10 * (1 + rang / 5) * (1.2 if weapon else 1))
+        elite = 1.1 if elite else 1
+        dmg = int(dmg * elite)
+        return dmg * (1.1 if ne else 1.)
 
     def endorse_article(self, article_id: int, amount: int) -> bool:
         if amount in (5, 50, 100):

erepublik/classes.py

@@ -585,8 +585,8 @@ Class for unifying eRepublik known endpoints and their required/optional paramet
             data.update({"parentId": parent})
         return self.post("{}/main/articleComments/create".format(self.url), data=data)
 
-    def _post_main_battlefield_travel(self, **kwargs) -> Response:
+    def _post_main_battlefield_travel(self, side_id: int, battle_id: int) -> Response:
-        data = dict(_token=self.token, **kwargs)
+        data = dict(_token=self.token, sideCountryId=side_id, battleId=battle_id)
         return self.post("{}/main/battlefieldTravel".format(self.url), data=data)
 
     def _post_main_buy_gold_items(self, currency: str, item: str, amount: int) -> Response:

erepublik/utils.py

@@ -332,34 +332,3 @@ def slugify(value, allow_unicode=False) -> str:
         value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore').decode('ascii')
     value = re.sub(r'[^\w\s-]', '_', value).strip().lower()
     return re.sub(r'[-\s]+', '-', value)
-
-
-def calculate_hit(strength: float, rang: int, tp: bool, elite: bool, ne: bool, booster: int = 0,
-                  weapon: int = 200) -> float:
-    dmg = int(10 * (1 + strength / 400) * (1 + rang / 5) * (1 + weapon / 100))
-    elite = 1.1 if elite else 1
-    booster_multiplier = (100 + booster) / 100
-    dmg = int(dmg * booster_multiplier * elite)
-    legend = 1 if (not tp or rang < 70) else 1 + (rang - 69) / 10
-    dmg = int(dmg * legend)
-    return dmg * (1.1 if ne else 1)
-
-
-def ground_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False,
-                         booster: int = 0, weapon_power: int = 200) -> float:
-    r = requests.get(f"https://www.erepublik.com/en/main/citizen-profile-json/{citizen_id}").json()
-    rang = r['military']['militaryData']['ground']['rankNumber']
-    strength = r['military']['militaryData']['ground']['strength']
-    elite = r['citizenAttributes']['level'] > 100
-    if natural_enemy:
-        true_patriot = True
-
-    return calculate_hit(strength, rang, true_patriot, elite, natural_enemy, booster, weapon_power)
-
-
-def air_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False, booster: int = 0,
-                      weapon_power: int = 0) -> float:
-    r = requests.get(f"https://www.erepublik.com/en/main/citizen-profile-json/{citizen_id}").json()
-    rang = r['military']['militaryData']['air']['rankNumber']
-    elite = r['citizenAttributes']['level'] > 100
-    return calculate_hit(0, rang, true_patriot, elite, natural_enemy, booster, weapon_power)