From d3f53e3f59ac15cdb5e6a47e7f11a3c99f4a1161 Mon Sep 17 00:00:00 2001 From: TheSaminator Date: Thu, 9 Jun 2022 11:41:22 -0400 Subject: [PATCH] Intact ships now need no maintenance --- src/jvmMain/kotlin/net/starshipfights/game/server_game.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/jvmMain/kotlin/net/starshipfights/game/server_game.kt b/src/jvmMain/kotlin/net/starshipfights/game/server_game.kt index a73eab8..71600a2 100644 --- a/src/jvmMain/kotlin/net/starshipfights/game/server_game.kt +++ b/src/jvmMain/kotlin/net/starshipfights/game/server_game.kt @@ -210,7 +210,6 @@ private val BattleSize.acumenPerSubplotWon: Int private suspend fun onGameEnd(gameState: GameState, gameEnd: GameEvent.GameEnd, startedAt: Instant, endedAt: Instant) { val damagedShipReadyAt = endedAt.plus(6, ChronoUnit.HOURS) - val intactShipReadyAt = endedAt.plus(4, ChronoUnit.HOURS) val escapedShipReadyAt = endedAt.plus(4, ChronoUnit.HOURS) val shipWrecks = gameState.destroyedShips @@ -255,8 +254,7 @@ private suspend fun onGameEnd(gameState: GameState, gameEnd: GameEvent.GameEnd, } val escapedShips = shipWrecks.filterValues { it.isEscape }.keys.map { it.reinterpret() }.toSet() - val damagedShips = ships.filterValues { it.hullAmount < it.durability.maxHullPoints }.keys.map { it.reinterpret() }.toSet() - val intactShips = ships.keys.map { it.reinterpret() }.toSet() - damagedShips + val damagedShips = ships.filterValues { it.hullAmount < it.durability.maxHullPoints || it.troopsAmount < it.durability.troopsDefense }.keys.map { it.reinterpret() }.toSet() val battleSize = gameState.battleInfo.size @@ -280,9 +278,6 @@ private suspend fun onGameEnd(gameState: GameState, gameEnd: GameEvent.GameEnd, launch { ShipInDrydock.update(ShipInDrydock::id `in` damagedShips, setValue(ShipInDrydock::readyAt, damagedShipReadyAt)) } - launch { - ShipInDrydock.update(ShipInDrydock::id `in` intactShips, setValue(ShipInDrydock::readyAt, intactShipReadyAt)) - } launch { ShipInDrydock.update(ShipInDrydock::id `in` escapedShips, setValue(ShipInDrydock::readyAt, escapedShipReadyAt)) } -- 2.25.1