From 4776f816f955679541c5961cf3ae678509882867 Mon Sep 17 00:00:00 2001
From: TheSaminator <TheSaminator@users.noreply.github.com>
Date: Tue, 7 Jun 2022 15:17:18 -0400
Subject: [PATCH] Rework table

---
 src/jvmMain/kotlin/starshipfights/game/game_start_jvm.kt | 8 ++++----
 src/jvmMain/kotlin/starshipfights/game/server_game.kt    | 6 ++++--
 src/jvmMain/kotlin/starshipfights/info/views_user.kt     | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/jvmMain/kotlin/starshipfights/game/game_start_jvm.kt b/src/jvmMain/kotlin/starshipfights/game/game_start_jvm.kt
index 921f752..ee61855 100644
--- a/src/jvmMain/kotlin/starshipfights/game/game_start_jvm.kt
+++ b/src/jvmMain/kotlin/starshipfights/game/game_start_jvm.kt
@@ -49,7 +49,7 @@ suspend fun generateTrainingInitialState(playerInfo: InGameAdmiral, enemyFaction
 	val aiAdmiral = genAI(enemyFaction, battleInfo.size)
 	
 	return GameState(
-		GameStart(
+		start = GameStart(
 			battleWidth, battleLength,
 			
 			PlayerStart(
@@ -71,8 +71,8 @@ suspend fun generateTrainingInitialState(playerInfo: InGameAdmiral, enemyFaction
 					.filterValues { it.shipType.weightClass.tier <= battleInfo.size.maxWeightClass.tier }
 			)
 		),
-		playerInfo,
-		InGameAdmiral(
+		hostInfo = playerInfo,
+		guestInfo = InGameAdmiral(
 			id = aiAdmiral.id.reinterpret(),
 			user = InGameUser(
 				id = aiAdmiral.owningUser.reinterpret(),
@@ -83,6 +83,6 @@ suspend fun generateTrainingInitialState(playerInfo: InGameAdmiral, enemyFaction
 			faction = aiAdmiral.faction,
 			rank = aiAdmiral.rank
 		),
-		battleInfo
+		battleInfo = battleInfo
 	)
 }
diff --git a/src/jvmMain/kotlin/starshipfights/game/server_game.kt b/src/jvmMain/kotlin/starshipfights/game/server_game.kt
index 9d651c7..ff96b3f 100644
--- a/src/jvmMain/kotlin/starshipfights/game/server_game.kt
+++ b/src/jvmMain/kotlin/starshipfights/game/server_game.kt
@@ -29,8 +29,10 @@ object GameManager {
 	
 	suspend fun initGame(hostInfo: InGameAdmiral, guestInfo: InGameAdmiral, battleInfo: BattleInfo): GameToken {
 		val gameState = GameState(
-			generateGameStart(hostInfo, guestInfo, battleInfo),
-			hostInfo, guestInfo, battleInfo
+			start = generateGameStart(hostInfo, guestInfo, battleInfo),
+			hostInfo = hostInfo,
+			guestInfo = guestInfo,
+			battleInfo = battleInfo
 		)
 		
 		val session = GameSession(gameState)
diff --git a/src/jvmMain/kotlin/starshipfights/info/views_user.kt b/src/jvmMain/kotlin/starshipfights/info/views_user.kt
index 1f6c565..d943a4b 100644
--- a/src/jvmMain/kotlin/starshipfights/info/views_user.kt
+++ b/src/jvmMain/kotlin/starshipfights/info/views_user.kt
@@ -540,7 +540,7 @@ suspend fun ApplicationCall.admiralPage(): HTML.() -> Unit {
 					}
 				}
 			}
-			
+			h2 { +"Lost Ships' Memorial" }
 			p {
 				+"The following ships were lost under "
 				+(if (admiral.isFemale) "her" else "his")
@@ -550,7 +550,7 @@ suspend fun ApplicationCall.admiralPage(): HTML.() -> Unit {
 				tr {
 					th { +"Ship Name" }
 					th { +"Ship Class" }
-					th { +"Destruction" }
+					th { +Entities.nbsp }
 				}
 				
 				for (ship in graveyard.sortedBy { it.name }.sortedBy { it.shipType.weightClass.tier }) {
-- 
2.25.1