From 3588b97b83b7fa3b6ea1485c6ebb5969d5a3f671 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 17 Apr 2025 18:57:14 +0200 Subject: [PATCH 1/5] Added arma 3 --- GAMES.md | 1 + crates/lib/src/games/definitions.rs | 1 + crates/lib/src/games/valve.rs | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/GAMES.md b/GAMES.md index aae8e5d..de88490 100644 --- a/GAMES.md +++ b/GAMES.md @@ -32,6 +32,7 @@ requirements/information. | Rust | RUST | Valve | | | Counter-Strike | COUNTERSTRIKE | Valve GoldSrc | | | Arma 2: Operation Arrowhead | A2OA | Valve | Query port offset: 1. | +| Arma 3 | ARMA3 | Valve | | | Day of Infamy | DOI | Valve | | | Half-Life Deathmatch: Source | HLDS | Valve | | | Risk of Rain 2 | ROR2 | Valve | Query port offset: 1. | diff --git a/crates/lib/src/games/definitions.rs b/crates/lib/src/games/definitions.rs index 1f57d0d..efd44c8 100644 --- a/crates/lib/src/games/definitions.rs +++ b/crates/lib/src/games/definitions.rs @@ -48,6 +48,7 @@ pub static GAMES: Map<&'static str, Game> = phf_map! { "alienswarm" => game!("Alien Swarm", 27015, Protocol::Valve(Engine::new(630))), "aoc" => game!("Age of Chivalry", 27015, Protocol::Valve(Engine::new(17510))), "a2oa" => game!("ARMA 2: Operation Arrowhead", 2304, Protocol::Valve(Engine::new(33930))), + "arma3" => game!("ARMA 3", 2303, Protocol::Valve(Engine::new(107_410))), "ase" => game!("ARK: Survival Evolved", 27015, Protocol::Valve(Engine::new(346_110))), "asrd" => game!("Alien Swarm: Reactive Drop", 2304, Protocol::Valve(Engine::new(563_560))), "armareforger" => game!("Arma Reforger", 17777, Protocol::Valve(Engine::new(1_874_880)), GatheringSettings { diff --git a/crates/lib/src/games/valve.rs b/crates/lib/src/games/valve.rs index 5059549..0b38562 100644 --- a/crates/lib/src/games/valve.rs +++ b/crates/lib/src/games/valve.rs @@ -9,6 +9,12 @@ game_query_mod!( Engine::new(33930), 2304 ); +game_query_mod!( + arma3, + "ARMA 3", + Engine::new(33930), + 2303 +); game_query_mod!(basedefense, "Base Defense", Engine::new(632_730), 27015); game_query_mod!(alienswarm, "Alien Swarm", Engine::new(630), 27015); game_query_mod!(aoc, "Age of Chivalry", Engine::new(17510), 27015); From 6953840af99793de03144240eb7f794d312bcf66 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 17 Apr 2025 19:00:53 +0200 Subject: [PATCH 2/5] Fix wrong app id in Valve game query modules --- crates/lib/src/games/valve.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/lib/src/games/valve.rs b/crates/lib/src/games/valve.rs index 0b38562..9565c39 100644 --- a/crates/lib/src/games/valve.rs +++ b/crates/lib/src/games/valve.rs @@ -12,7 +12,7 @@ game_query_mod!( game_query_mod!( arma3, "ARMA 3", - Engine::new(33930), + Engine::new(107_410), 2303 ); game_query_mod!(basedefense, "Base Defense", Engine::new(632_730), 27015); From b3ae7b7fb190467dd884f161ad75ff276fed5c8a Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 18 Apr 2025 09:03:54 +0200 Subject: [PATCH 3/5] Applied formatting to valve.rs --- crates/lib/src/games/valve.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/crates/lib/src/games/valve.rs b/crates/lib/src/games/valve.rs index 9565c39..497700a 100644 --- a/crates/lib/src/games/valve.rs +++ b/crates/lib/src/games/valve.rs @@ -9,12 +9,7 @@ game_query_mod!( Engine::new(33930), 2304 ); -game_query_mod!( - arma3, - "ARMA 3", - Engine::new(107_410), - 2303 -); +game_query_mod!(arma3, "ARMA 3", Engine::new(107_410), 2303); game_query_mod!(basedefense, "Base Defense", Engine::new(632_730), 27015); game_query_mod!(alienswarm, "Alien Swarm", Engine::new(630), 27015); game_query_mod!(aoc, "Age of Chivalry", Engine::new(17510), 27015); From 13814ee6e3ff13aa6cbfc252fdacd8ee779df80b Mon Sep 17 00:00:00 2001 From: Cain <75994858+cainthebest@users.noreply.github.com> Date: Sun, 20 Apr 2025 22:27:27 +0100 Subject: [PATCH 4/5] chore(changelog): add arma 3 --- crates/lib/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/crates/lib/CHANGELOG.md b/crates/lib/CHANGELOG.md index f4121fe..78bbd49 100644 --- a/crates/lib/CHANGELOG.md +++ b/crates/lib/CHANGELOG.md @@ -2,6 +2,10 @@ Who knows what the future holds... # X.Y.Z - DD/MM/YYYY +# 0.6.2 - DD/MM/YYYY + +- Added `Arma 3` support (by @Perondas). + # 0.6.1 - 05/12/2024 Games: From 8ebb685b334194cba05bd1bf2289ad9b04bffd95 Mon Sep 17 00:00:00 2001 From: Cain <75994858+cainthebest@users.noreply.github.com> Date: Sun, 20 Apr 2025 22:30:40 +0100 Subject: [PATCH 5/5] chore(changelog): follow format for arma 3 change --- crates/lib/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crates/lib/CHANGELOG.md b/crates/lib/CHANGELOG.md index 78bbd49..2a1d292 100644 --- a/crates/lib/CHANGELOG.md +++ b/crates/lib/CHANGELOG.md @@ -4,6 +4,8 @@ Who knows what the future holds... # 0.6.2 - DD/MM/YYYY +Games: + - Added `Arma 3` support (by @Perondas). # 0.6.1 - 05/12/2024