From: TheSaminator <thesaminator@users.noreply.github.com>
Date: Wed, 13 Jul 2022 15:10:14 +0000 (-0400)
Subject: Fix 2v1 battles' ship memorials (2)
X-Git-Url: https://gitweb.starshipfights.net/?a=commitdiff_plain;h=e3dac41c44b41ab847109c5f4133a690569950a6;p=starship-fights

Fix 2v1 battles' ship memorials (2)
---

diff --git a/src/jvmMain/kotlin/net/starshipfights/data/admiralty/battle_records.kt b/src/jvmMain/kotlin/net/starshipfights/data/admiralty/battle_records.kt
index 6b46719..fa9d739 100644
--- a/src/jvmMain/kotlin/net/starshipfights/data/admiralty/battle_records.kt
+++ b/src/jvmMain/kotlin/net/starshipfights/data/admiralty/battle_records.kt
@@ -33,7 +33,7 @@ data class BattleRecord(
 	
 	val winner: GlobalSide?,
 	val winMessage: String,
-	val was2v2: Boolean = false,
+	val was2v1: Boolean = false,
 ) : DataDocument<BattleRecord> {
 	fun getSide(admiral: Id<Admiral>) = when (admiral) {
 		hostAdmiral -> GlobalSide.HOST
@@ -49,7 +49,7 @@ data class BattleRecord(
 	
 	fun wasWinner(side: GlobalSide) = if (winner == null)
 		null
-	else if (was2v2)
+	else if (was2v1)
 		winner == GlobalSide.HOST
 	else
 		winner == side
diff --git a/src/jvmMain/kotlin/net/starshipfights/game/server_game.kt b/src/jvmMain/kotlin/net/starshipfights/game/server_game.kt
index 695a4e6..7141cc9 100644
--- a/src/jvmMain/kotlin/net/starshipfights/game/server_game.kt
+++ b/src/jvmMain/kotlin/net/starshipfights/game/server_game.kt
@@ -450,7 +450,8 @@ private suspend fun on2v1GameEnd(gameState: GameState, gameEnd: GameEvent.GameEn
 		guestEndingMessage = victoryTitle(GlobalShipController(GlobalSide.HOST, GlobalShipController.Player2Disambiguation), gameEnd.winner, gameEnd.subplotOutcomes),
 		
 		winner = gameEnd.winner,
-		winMessage = gameEnd.message
+		winMessage = gameEnd.message,
+		was2v1 = true,
 	)
 	
 	val destructions = shipWrecks.filterValues { !it.isEscape }
diff --git a/src/jvmMain/kotlin/net/starshipfights/info/views_user.kt b/src/jvmMain/kotlin/net/starshipfights/info/views_user.kt
index 2253f96..7482da2 100644
--- a/src/jvmMain/kotlin/net/starshipfights/info/views_user.kt
+++ b/src/jvmMain/kotlin/net/starshipfights/info/views_user.kt
@@ -505,7 +505,7 @@ suspend fun ApplicationCall.admiralPage(): HTML.() -> Unit {
 							val opponent = recordOpponents[ship.destroyedIn]
 							if (opponent == null)
 								i { +"(Deleted Admiral)" }
-							else if (records.singleOrNull { it.id == ship.destroyedIn }?.was2v2 == true)
+							else if (records.singleOrNull { it.id == ship.destroyedIn }?.was2v1 == true)
 								i { +"(Non-Player Admiral)" }
 							else
 								a(href = "/admiral/${opponent.id}") {