New: initial author_results

README.md

@@ -26,11 +26,11 @@ fn main() -> Result<()> {
 
     assert_eq!(battle_results.players[0].account_id, 520886428);
     assert_eq!(battle_results.players[0].info.nickname, "77mmmr");
-    assert_eq!(battle_results.players[0].info.team_number(), TeamNumber::Two);
+    assert_eq!(battle_results.players[0].info.team(), TeamNumber::Two);
     assert_eq!(battle_results.players[0].info.platoon_id, None);
 
     assert_eq!(battle_results.players[1].info.nickname, "SNAK_THE_RIPPER");
-    assert_eq!(battle_results.players[1].info.team_number(), TeamNumber::One);
+    assert_eq!(battle_results.players[1].info.team(), TeamNumber::One);
     assert_eq!(battle_results.players[1].info.platoon_id, Some(547466834));
 
     Ok(())

src/models/battle_results.rs

@@ -21,6 +21,17 @@ pub struct BattleResults {
     #[prost(int64, tag = "2")]
     pub timestamp: i64,
 
+    #[prost(enumeration = "TeamNumber", tag = "3")]
+    pub winning_team: i32,
+
+    /// Replay's author results.
+    #[prost(message, required, tag = "8")]
+    pub author_results: AuthorResults,
+
+    /// Author's free XP, including premium.
+    #[prost(uint32, tag = "137")]
+    pub free_xp: u32,
+
     /// Players in the battle.
     #[prost(message, repeated, tag = "201")]
     pub players: Vec<Player>,
@@ -57,7 +68,7 @@ pub struct PlayerInfo {
 
     /// Player's team assignment.
     #[prost(enumeration = "TeamNumber", tag = "3")]
-    pub team_number: i32,
+    pub team: i32,
 
     #[prost(string, optional, tag = "5")]
     pub clan_tag: Option<String>,
@@ -90,7 +101,7 @@ pub struct PlayerResults {
 pub struct PlayerResultsInfo {
     /// Credits earned – without special awards and medals and premium account excluded.
     #[prost(uint32, tag = "2")]
-    pub credits: u32,
+    pub credits_earned: u32,
 
     /// Base XP (the total without multipliers).
     #[prost(uint32, tag = "3")]
@@ -163,3 +174,17 @@ impl PlayerResultsInfo {
             .map(|mm_rating| (mm_rating * 10.0 + 3000.0) as u32)
     }
 }
+
+#[derive(Message, Serialize)]
+pub struct AuthorResults {
+    /// Earned credits, including premium and special awards and medals.
+    #[prost(uint32, tag = "2")]
+    pub credits_earned: u32,
+
+    /// Combat XP, including premium.
+    #[prost(uint32, tag = "3")]
+    pub combat_xp: u32,
+
+    #[prost(uint32, tag = "8")]
+    pub damage_dealt: u32,
+}

tests/battle_results.rs

@@ -1,6 +1,7 @@
 use std::fs::File;
 
 use anyhow::Result;
+use wotbreplay_parser::models::TeamNumber;
 use wotbreplay_parser::Replay;
 
 #[test]
@@ -37,7 +38,7 @@ fn player_results_ok() -> Result<()> {
     assert_eq!(zeekrab_info.victory_points_earned, 40);
     assert_eq!(zeekrab_info.victory_points_seized, 40);
     assert_eq!(zeekrab_info.tank_id, 26657);
-    assert_eq!(zeekrab_info.credits, 37679);
+    assert_eq!(zeekrab_info.credits_earned, 37679);
     assert_eq!(zeekrab_info.n_enemies_damaged, 2);
     assert_eq!(zeekrab_info.n_enemies_destroyed, 1);
 
@@ -94,3 +95,26 @@ fn victory_points_ok() -> Result<()> {
 
     Ok(())
 }
+
+#[test]
+fn winning_team_ok() -> Result<()> {
+    let battle_results = Replay::open(File::open("tests/replays/winning_team.wotbreplay")?)?
+        .read_battle_results()?;
+
+    assert_eq!(battle_results.winning_team(), TeamNumber::One);
+
+    Ok(())
+}
+
+#[test]
+fn author_results_ok() -> Result<()> {
+    let battle_results = Replay::open(File::open("tests/replays/author_results.wotbreplay")?)?
+        .read_battle_results()?;
+
+    assert_eq!(battle_results.author_results.credits_earned, 53623);
+    assert_eq!(battle_results.author_results.combat_xp, 2370);
+    assert_eq!(battle_results.author_results.damage_dealt, 1738);
+    assert_eq!(battle_results.free_xp, 116);
+
+    Ok(())
+}

tests/replays/.gitattributes

@@ -0,0 +1 @@
+*.wotbreplay linguist-generated