Skip to content

Commit 27df611

Browse files
committed
🐛 (viewer) fix board, special action display for finished games
1 parent f3ac241 commit 27df611

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

viewer/src/logic/commands.ts

+10-9
Original file line numberDiff line numberDiff line change
@@ -495,13 +495,14 @@ function resourceSymbol(type: Resource) {
495495

496496
function newConversion(cost: Reward[], income: Reward[], player?: Player) {
497497
return {
498-
from: cost.map(
499-
(r) =>
500-
new Reward(
501-
r.type == Resource.ChargePower ? Math.ceil(r.count / player?.data?.tokenModifier ?? 1) : r.count,
502-
resourceSymbol(r.type)
503-
)
504-
),
498+
from: cost.map((r) => {
499+
return new Reward(
500+
r.type == Resource.ChargePower
501+
? Math.ceil(r.count / (player != null ? player?.data?.tokenModifier : 1))
502+
: r.count,
503+
resourceSymbol(r.type)
504+
);
505+
}),
505506
to: income.map((r) => new Reward(r.count, r.type)),
506507
};
507508
}
@@ -549,13 +550,13 @@ export function boardActionsButton(data: AvailableBoardActionData, player: Playe
549550
};
550551
}
551552

552-
export function specialActionButton(income: string, player: Player): ButtonData {
553+
export function specialActionButton(income: string, player: Player | null): ButtonData {
553554
const rewards = Reward.parse(income);
554555
return symbolButton({
555556
label: translateResources(rewards),
556557
command: income,
557558
specialAction: income,
558-
warning: specialActionWarning(player, income),
559+
warning: player ? specialActionWarning(player, income) : null,
559560
shortcuts: [resourceNames.find((r) => r.type === rewards[0].type).shortcut],
560561
});
561562
}

0 commit comments

Comments
 (0)