From 7467607e62e8742abe5e06c1a94ad40dc3e1e1dd Mon Sep 17 00:00:00 2001 From: TheSaminator Date: Sat, 28 May 2022 13:35:18 -0400 Subject: [PATCH] Fix some issues with initiative calculation & chat scrolling --- .../kotlin/starshipfights/game/game_initiative.kt | 7 +++++-- src/jsMain/kotlin/starshipfights/game/game_ui.kt | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/commonMain/kotlin/starshipfights/game/game_initiative.kt b/src/commonMain/kotlin/starshipfights/game/game_initiative.kt index b8cab00..7d8e4d4 100644 --- a/src/commonMain/kotlin/starshipfights/game/game_initiative.kt +++ b/src/commonMain/kotlin/starshipfights/game/game_initiative.kt @@ -47,8 +47,11 @@ fun GameState.calculateAttackPhaseInitiative(): InitiativePair = InitiativePair( .filterValues { weaponInstance -> when (val weapon = weaponInstance.weapon) { is AreaWeapon -> true - else -> ships.values.any { target -> - target.position.location in ship.getWeaponPickRequest(weapon).boundary + else -> { + val pickRequest = ship.getWeaponPickRequest(weapon) + ships.values.any { target -> + target.owner in (pickRequest.type as PickType.Ship).allowSides && target.position.location in pickRequest.boundary + } } } } diff --git a/src/jsMain/kotlin/starshipfights/game/game_ui.kt b/src/jsMain/kotlin/starshipfights/game/game_ui.kt index 197d24e..0a6d723 100644 --- a/src/jsMain/kotlin/starshipfights/game/game_ui.kt +++ b/src/jsMain/kotlin/starshipfights/game/game_ui.kt @@ -364,7 +364,7 @@ object GameUI { } } } - } + }.last().scrollIntoView() val abilities = state.getPossibleAbilities(mySide) -- 2.25.1