Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
bff9a2bec9 | |||
973ea40e00 | |||
52c85fdf28 | |||
a889e9efa1 |
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
__author__ = """Eriks Karls"""
|
__author__ = """Eriks Karls"""
|
||||||
__email__ = 'eriks@72.lv'
|
__email__ = 'eriks@72.lv'
|
||||||
__version__ = '0.21.4.2'
|
__version__ = '0.21.4.4'
|
||||||
|
|
||||||
from erepublik import classes, utils, constants
|
from erepublik import classes, utils, constants
|
||||||
from erepublik.citizen import Citizen
|
from erepublik.citizen import Citizen
|
||||||
|
@ -1523,7 +1523,7 @@ class CitizenMilitary(CitizenTravel):
|
|||||||
if not division.terrain and is_start_ok and not division.div_end:
|
if not division.terrain and is_start_ok and not division.div_end:
|
||||||
if division.is_air and self.config.air:
|
if division.is_air and self.config.air:
|
||||||
division_medals = self.get_battle_round_data(division)
|
division_medals = self.get_battle_round_data(division)
|
||||||
medal = division_medals[self.details.citizenship == division.battle.is_defender.country]
|
medal = division_medals[self.details.citizenship == division.battle.defender.country]
|
||||||
if not medal:
|
if not medal:
|
||||||
air_divs.append((0, division))
|
air_divs.append((0, division))
|
||||||
else:
|
else:
|
||||||
@ -1532,7 +1532,7 @@ class CitizenMilitary(CitizenTravel):
|
|||||||
if not division.div == self.division and not self.maverick:
|
if not division.div == self.division and not self.maverick:
|
||||||
continue
|
continue
|
||||||
division_medals = self.get_battle_round_data(division)
|
division_medals = self.get_battle_round_data(division)
|
||||||
medal = division_medals[self.details.citizenship == division.battle.is_defender.country]
|
medal = division_medals[self.details.citizenship == division.battle.defender.country]
|
||||||
if not medal:
|
if not medal:
|
||||||
ground_divs.append((0, division))
|
ground_divs.append((0, division))
|
||||||
else:
|
else:
|
||||||
@ -1906,7 +1906,7 @@ class CitizenMilitary(CitizenTravel):
|
|||||||
battleZoneId=division.id, type="damage")
|
battleZoneId=division.id, type="damage")
|
||||||
r_json = r.json()
|
r_json = r.json()
|
||||||
return (r_json.get(str(battle.invader.id)).get("fighterData"),
|
return (r_json.get(str(battle.invader.id)).get("fighterData"),
|
||||||
r_json.get(str(battle.is_defender.id)).get("fighterData"))
|
r_json.get(str(battle.defender.id)).get("fighterData"))
|
||||||
|
|
||||||
def schedule_attack(self, war_id: int, region_id: int, region_name: str, at_time: datetime):
|
def schedule_attack(self, war_id: int, region_id: int, region_name: str, at_time: datetime):
|
||||||
if at_time:
|
if at_time:
|
||||||
|
@ -551,7 +551,7 @@ class Reporter:
|
|||||||
self.url = "https://api.erep.lv"
|
self.url = "https://api.erep.lv"
|
||||||
self._req.headers.update({"user-agent": "eRepublik Script Reporter v3",
|
self._req.headers.update({"user-agent": "eRepublik Script Reporter v3",
|
||||||
'erep-version': utils.__version__,
|
'erep-version': utils.__version__,
|
||||||
'erep-user-id': self.citizen_id,
|
'erep-user-id': str(self.citizen_id),
|
||||||
'erep-user-name': self.citizen.name})
|
'erep-user-name': self.citizen.name})
|
||||||
self.__to_update = []
|
self.__to_update = []
|
||||||
self.__registered: bool = False
|
self.__registered: bool = False
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[bumpversion]
|
[bumpversion]
|
||||||
current_version = 0.21.4.2
|
current_version = 0.21.4.4
|
||||||
commit = True
|
commit = True
|
||||||
tag = True
|
tag = True
|
||||||
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)?
|
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)?
|
||||||
|
2
setup.py
2
setup.py
@ -43,6 +43,6 @@ setup(
|
|||||||
test_suite='tests',
|
test_suite='tests',
|
||||||
tests_require=test_requirements,
|
tests_require=test_requirements,
|
||||||
url='https://github.com/eeriks/erepublik/',
|
url='https://github.com/eeriks/erepublik/',
|
||||||
version='0.21.4.2',
|
version='0.21.4.4',
|
||||||
zip_safe=False,
|
zip_safe=False,
|
||||||
)
|
)
|
||||||
|
Reference in New Issue
Block a user