Compare commits

...
Author SHA1 Message Date
eigenein 5786253cd5 New: set up sponsorship 2022-12-03 20:36:28 +01:00
Pavel Perestoronin e1f38014b8 New: add clan_tag 2022-12-03 20:34:44 +01:00
Pavel Perestoronin 7376cfc97e New: add n_enemies_damaged, n_enemies_destroyed, and credits 2022-12-03 20:28:18 +01:00
Pavel Perestoronin bc3b39e764 New: add tank_id 2022-12-03 20:11:49 +01:00
3 changed files with 48 additions and 0 deletions

No files matched your search

+5
View File
@@ -0,0 +1,5 @@
github: [eigenein]
custom:
- 'https://www.paypal.me/eigenein'
- 'https://bunq.me/eigenein'
- 'https://money.yandex.ru/to/410011693851843'
+19
View File
@@ -57,6 +57,9 @@ pub struct PlayerInfo {
/// Player's team assignment.
#[prost(enumeration = "TeamNumber", tag = "3")]
pub team_number: i32,
#[prost(string, optional, tag = "5")]
pub clan_tag: Option<String>,
}
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, prost::Enumeration)]
@@ -82,6 +85,10 @@ pub struct PlayerResults {
/// Extended player's results information.
#[derive(Message)]
pub struct PlayerResultsInfo {
/// Credits earned – without special awards and medals and premium account excluded.
#[prost(uint32, tag = "2")]
pub credits: u32,
/// Base XP (the total without multipliers).
#[prost(uint32, tag = "3")]
pub base_xp: u32,
@@ -98,9 +105,11 @@ pub struct PlayerResultsInfo {
#[prost(uint32, tag = "8")]
pub damage_dealt: u32,
/// TODO: distinguish the kinds of assisted damage.
#[prost(uint32, tag = "9")]
pub damage_assisted_1: u32,
/// TODO: distinguish the kinds of assisted damage.
#[prost(uint32, tag = "10")]
pub damage_assisted_2: u32,
@@ -113,6 +122,12 @@ pub struct PlayerResultsInfo {
#[prost(uint32, tag = "15")]
pub n_penetrations_received: u32,
#[prost(uint32, tag = "17")]
pub n_enemies_damaged: u32,
#[prost(uint32, tag = "18")]
pub n_enemies_destroyed: u32,
/// TODO: distinguish earned vs seized.
#[prost(uint32, tag = "32")]
pub victory_points_1: u32,
@@ -125,6 +140,10 @@ pub struct PlayerResultsInfo {
#[prost(uint32, tag = "101")]
pub account_id: u32,
/// Player's tank ID as per Wargaming.net API.
#[prost(uint32, tag = "103")]
pub tank_id: u32,
/// Rating for the Rating Battles.
///
/// Note, that this is **not** the game client's displayed rating.
+24
View File
@@ -38,6 +38,9 @@ fn player_results_ok() -> Result<()> {
assert_eq!(snak_the_ripper_info.n_shots, 6);
assert_eq!(snak_the_ripper_info.n_hits_dealt, 5);
assert_eq!(snak_the_ripper_info.n_penetrations_dealt, 5);
assert_eq!(snak_the_ripper_info.tank_id, 5233);
assert_eq!(snak_the_ripper_info.n_enemies_damaged, 3);
assert_eq!(snak_the_ripper_info.n_enemies_destroyed, 2);
let zeekrab_info = &battle_results.player_results[10].info;
assert_eq!(zeekrab_info.base_xp, 701);
@@ -54,6 +57,10 @@ fn player_results_ok() -> Result<()> {
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.tank_id, 26657);
assert_eq!(zeekrab_info.credits, 37679);
assert_eq!(zeekrab_info.n_enemies_damaged, 2);
assert_eq!(zeekrab_info.n_enemies_destroyed, 1);
let balls_soup_info = &battle_results.player_results[8].info;
assert_eq!(balls_soup_info.damage_dealt, 2064);
@@ -64,6 +71,9 @@ fn player_results_ok() -> Result<()> {
assert_eq!(balls_soup_info.n_hits_received, 6);
assert_eq!(balls_soup_info.n_penetrations_received, 4);
assert_eq!(balls_soup_info.n_non_penetrating_hits_received, 2);
assert_eq!(balls_soup_info.tank_id, 4737);
assert_eq!(balls_soup_info.n_enemies_damaged, 4);
assert_eq!(balls_soup_info.n_enemies_destroyed, 1);
let ceaser_info = &battle_results.player_results[0].info;
assert_eq!(ceaser_info.damage_dealt, 919);
@@ -71,6 +81,20 @@ fn player_results_ok() -> Result<()> {
assert_eq!(ceaser_info.n_shots, 9);
assert_eq!(ceaser_info.n_hits_dealt, 6);
assert_eq!(ceaser_info.n_penetrations_dealt, 5);
assert_eq!(ceaser_info.n_enemies_damaged, 3);
assert_eq!(ceaser_info.n_enemies_destroyed, 0);
Ok(())
}
#[test]
fn clan_tags_ok() -> Result<()> {
let battle_results = Replay::open(File::open("tests/replays/player_results_ok.wotbreplay")?)?
.read_battle_results()?;
assert_eq!(battle_results.players[1].info.clan_tag.as_deref(), Some("AN0NY"));
assert_eq!(battle_results.players[10].info.clan_tag.as_deref(), Some("BBS"));
assert_eq!(battle_results.players[11].info.clan_tag, None);
Ok(())
}