Break: distinguish the victory points seized vs earned

This commit is contained in:
Pavel Perestoronin committed 2022-12-03 21:05:52 +01:00
1 parent 96e63f81f4
commit 899456eaf7
6 files changed
+24 -10

No files matched your search

+1 -1
View File
@@ -18,7 +18,7 @@ use wotbreplay_parser::Replay;
use wotbreplay_parser::models::TeamNumber;
fn main() -> Result<()> {
let battle_results = Replay::open(File::open("tests/replays/battle_results_ok.wotbreplay")?)?
let battle_results = Replay::open(File::open("tests/replays/battle_results.wotbreplay")?)?
.read_battle_results()?;
assert_eq!(battle_results.timestamp, 1670018359);
+2 -4
View File
@@ -128,13 +128,11 @@ pub struct PlayerResultsInfo {
#[prost(uint32, tag = "18")]
pub n_enemies_destroyed: u32,
/// TODO: distinguish earned vs seized.
#[prost(uint32, tag = "32")]
pub victory_points_1: u32,
pub victory_points_earned: u32,
/// TODO: distinguish earned vs seized.
#[prost(uint32, tag = "33")]
pub victory_points_2: u32,
pub victory_points_seized: u32,
/// Player's account ID.
#[prost(uint32, tag = "101")]
+21 -5
View File
@@ -1,12 +1,11 @@
use std::fs::File;
use anyhow::Result;
use wotbreplay_parser::models::TeamNumber;
use wotbreplay_parser::Replay;
#[test]
fn player_results_ok() -> Result<()> {
let battle_results = Replay::open(File::open("tests/replays/player_results_ok.wotbreplay")?)?
let battle_results = Replay::open(File::open("tests/replays/player_results.wotbreplay")?)?
.read_battle_results()?;
let snak_the_ripper_info = &battle_results.player_results[3].info;
@@ -35,8 +34,8 @@ fn player_results_ok() -> Result<()> {
assert_eq!(zeekrab_info.n_hits_received, 3);
assert_eq!(zeekrab_info.n_penetrations_received, 3);
assert_eq!(zeekrab_info.n_non_penetrating_hits_received, 0);
assert_eq!(zeekrab_info.victory_points_1, 40);
assert_eq!(zeekrab_info.victory_points_2, 40);
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.n_enemies_damaged, 2);
@@ -69,7 +68,7 @@ fn player_results_ok() -> Result<()> {
#[test]
fn clan_tags_ok() -> Result<()> {
let battle_results = Replay::open(File::open("tests/replays/player_results_ok.wotbreplay")?)?
let battle_results = Replay::open(File::open("tests/replays/player_results.wotbreplay")?)?
.read_battle_results()?;
assert_eq!(battle_results.players[1].info.clan_tag.as_deref(), Some("AN0NY"));
@@ -78,3 +77,20 @@ fn clan_tags_ok() -> Result<()> {
Ok(())
}
#[test]
fn victory_points_ok() -> Result<()> {
let battle_results = Replay::open(File::open("tests/replays/victory_points.wotbreplay")?)?
.read_battle_results()?;
assert_eq!(battle_results.player_results[1].info.victory_points_seized, 40);
assert_eq!(battle_results.player_results[1].info.victory_points_earned, 40);
assert_eq!(battle_results.player_results[3].info.victory_points_seized, 0);
assert_eq!(battle_results.player_results[3].info.victory_points_earned, 112);
assert_eq!(battle_results.player_results[5].info.victory_points_earned, 280);
assert_eq!(battle_results.player_results[5].info.victory_points_seized, 0);
Ok(())
}
Binary file not shown.