Auto-assign fix: prioritize count when one team is empty

TeamHypersomnia · Jun 26, 2024 · 9ab1eea · 9ab1eea
1 parent aa82dc0
commit 9ab1eea
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/cmake/web_shell.html b/cmake/web_shell.html
@@ -9,7 +9,7 @@
   <meta name="description" content="Free and open-source competitive 2D shooter on the Web.">
   <meta property="og:type" content="website">
   <meta property="og:url" content="https://hypersomnia.io/">
-  <meta property="og:title" content="Hypersomnia">
+  <meta property="og:title" content="Hypersomnia.io">
   <meta property="og:description" content="Free and open-source competitive 2D shooter on the Web.">
   <meta property="og:image" content="https://raw.githubusercontent.com/TeamHypersomnia/PressKit/main/assets/logos/github_card.png">
   <link rel="icon" type="image/x-icon" href="/favicon.ico">

diff --git a/src/augs/string/typesafe_sscanf.cpp b/src/augs/string/typesafe_sscanf.cpp
@@ -254,6 +254,9 @@ TEST_CASE("TypesafeSscanf", "TypesafeSscanfSeveralTests") {
 		REQUIRE(3 == id);
 		REQUIRE(2 == test_scanf("[US] arena-us.hypersomnia.xyz #1", "%x#%x", rest, id));
 		REQUIRE(1 == id);
+
+		REQUIRE(2 == test_scanf("[CH] Switzerland #8 R", "%x#%x", rest, id));
+		REQUIRE(8 == id);
 	}
 }
 

diff --git a/src/game/modes/arena_mode.cpp b/src/game/modes/arena_mode.cpp
@@ -133,7 +133,7 @@ faction_type arena_mode::calc_weakest_faction(const const_input_type in) const {
 		std::size_t count;
 
 		bool operator<(const weak_faction& b) const {
-			if (score == b.score) {
+			if (score == b.score || count == 0 || b.count == 0) {
 				return count < b.count;
 			}
 

diff --git a/src/work.cpp b/src/work.cpp
@@ -709,6 +709,8 @@ work_result work(
 	(void)change_with_save;
 
 #if PLATFORM_WEB
+	LOG_NVPS(config.client.nickname);
+
 	if (config.client.nickname.empty() || config.client.nickname == "web_user") {
 		const auto rng_name = ::make_random_nickname(netcode_rng);
 		const auto final_nickname =