diff --git a/erepublik/citizen.py b/erepublik/citizen.py index f930212..192fd0d 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -1662,10 +1662,11 @@ class CitizenMilitary(CitizenTravel): self.write_log("Hits: {:>4} | Damage: {}".format(total_hits, total_damage)) ok_to_fight = False if total_damage: - self.reporter.report_action('FIGHT', dict(battle_id=battle.id, side=side, dmg=total_damage, - air=battle.has_air, hits=total_hits, - round=battle.zone_id, - extra=dict(battle=battle, side=side))) + self.reporter.report_fighting(battle, not side.is_defender, division, total_damage, total_hits) + # self.reporter.report_action('FIGHT', dict(battle_id=battle.id, side=side, dmg=total_damage, + # air=battle.has_air, hits=total_hits, + # round=battle.zone_id, + # extra=dict(battle=battle, side=side))) return error_count def _shoot(self, battle: classes.Battle, division: classes.BattleDivision, side: classes.BattleSide): diff --git a/erepublik/classes.py b/erepublik/classes.py index 4ff6a07..ff91ed2 100644 --- a/erepublik/classes.py +++ b/erepublik/classes.py @@ -618,6 +618,12 @@ class Reporter: else: self.__to_update.append(json_data) + def report_fighting(self, battle: "Battle", invader: bool, division: "BattleDivision", damage: float, hits: int): + side = battle.invader if invader else battle.defender + self.report_action('FIGHT', dict(battle_id=battle.id, side=side, dmg=damage, + air=battle.has_air, hits=hits, + round=battle.zone_id, extra=dict(battle=battle, side=side, division=division))) + def report_promo(self, kind: str, time_until: datetime.datetime): self._req.post(f"{self.url}/promos/add/", data=dict(kind=kind, time_untill=time_until))