This commit is contained in:
@@ -146,23 +146,23 @@ function discardCardClick(card: Card) {
|
|||||||
}, [] as number[])" :noEffects="noEffects" :discardable="discardable">
|
}, [] as number[])" :noEffects="noEffects" :discardable="discardable">
|
||||||
<template v-for="t in tokens">
|
<template v-for="t in tokens">
|
||||||
<GameToken :token="t" @useToken="tokenClick(t, c)" v-if="
|
<GameToken :token="t" @useToken="tokenClick(t, c)" v-if="
|
||||||
(t.effect == CardEffects.SACRIFICE &&
|
((t.effect == CardEffects.SACRIFICE &&
|
||||||
playingTurn &&
|
playingTurn &&
|
||||||
!playingTurn?.cardsLocked.includes(c._id.toString())) ||
|
!playingTurn?.cardsLocked.includes(c._id.toString())) ||
|
||||||
(t.effect == CardEffects.PREPARE &&
|
(t.effect == CardEffects.PREPARE &&
|
||||||
c.cardType == CardType.CHAMPION) ||
|
c.cardType == CardType.CHAMPION) ||
|
||||||
(t.effect == CardEffects.STACK_NEXT_ACTION_BOUGHT &&
|
(t.effect == CardEffects.STACK_NEXT_ACTION_BOUGHT &&
|
||||||
c.cardType == CardType.ACTION) ||
|
c.cardType == CardType.ACTION) ||
|
||||||
(t.effect == CardEffects.STUN &&
|
(t.effect == CardEffects.STUN &&
|
||||||
c.cardType == CardType.CHAMPION &&
|
c.cardType == CardType.CHAMPION &&
|
||||||
championsKillable) ||
|
championsKillable) ||
|
||||||
t.effect == CardEffects.PLAY_NEXT_CARD_BOUGHT ||
|
t.effect == CardEffects.PLAY_NEXT_CARD_BOUGHT ||
|
||||||
t.effect == CardEffects.STACK_NEXT_CARD_BOUGHT ||
|
t.effect == CardEffects.STACK_NEXT_CARD_BOUGHT ||
|
||||||
t.effect == CardEffects.RESTACK_DISCARDED_CARD ||
|
t.effect == CardEffects.RESTACK_DISCARDED_CARD ||
|
||||||
(t.effect == CardEffects.RESTACK_DISCARDED_ACTION &&
|
(t.effect == CardEffects.RESTACK_DISCARDED_ACTION &&
|
||||||
c.cardType == CardType.ACTION) ||
|
c.cardType == CardType.ACTION) ||
|
||||||
(t.effect == CardEffects.RESTACK_DISCARDED_CHAMPION &&
|
(t.effect == CardEffects.RESTACK_DISCARDED_CHAMPION &&
|
||||||
c.cardType == CardType.CHAMPION)
|
c.cardType == CardType.CHAMPION)) && ((wrapped && i == (cards.length - 1)) || !wrapped)
|
||||||
"></GameToken>
|
"></GameToken>
|
||||||
</template>
|
</template>
|
||||||
<button v-if="championsKillable && c.cardType == CardType.CHAMPION" @click.stop="damageChampionClick(c)"
|
<button v-if="championsKillable && c.cardType == CardType.CHAMPION" @click.stop="damageChampionClick(c)"
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ const discardTokens = computed(() => {
|
|||||||
].includes(t.effect)
|
].includes(t.effect)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
return []
|
||||||
}
|
}
|
||||||
|
|
||||||
);
|
);
|
||||||
|
|||||||
+4
-5
@@ -10,7 +10,6 @@ import {
|
|||||||
leaveGame,
|
leaveGame,
|
||||||
surrender,
|
surrender,
|
||||||
} from "~/netcode";
|
} from "~/netcode";
|
||||||
import { delay } from "~/netcode/events";
|
|
||||||
import {
|
import {
|
||||||
type Container,
|
type Container,
|
||||||
type Effect,
|
type Effect,
|
||||||
@@ -28,7 +27,6 @@ const gameId = route.query.id;
|
|||||||
|
|
||||||
const {
|
const {
|
||||||
data: game,
|
data: game,
|
||||||
pending,
|
|
||||||
error,
|
error,
|
||||||
refresh,
|
refresh,
|
||||||
execute,
|
execute,
|
||||||
@@ -235,8 +233,8 @@ onUnmounted(() => {
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ClientOnly>
|
<ClientOnly v-if="game">
|
||||||
<div id="turn_buttons" v-if="game">
|
<div id="turn_buttons">
|
||||||
<template v-if="game.started">
|
<template v-if="game.started">
|
||||||
<button id="end_turn" class="end_turn_button turn_icon" :class="{ hidden: !isTurn }"
|
<button id="end_turn" class="end_turn_button turn_icon" :class="{ hidden: !isTurn }"
|
||||||
@click="endTurn(game._id)" v-if="isTurn">
|
@click="endTurn(game._id)" v-if="isTurn">
|
||||||
@@ -257,7 +255,8 @@ onUnmounted(() => {
|
|||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<button v-if="game && game.started && selfPlayer" class="red" @click="surrender(game._id)">
|
<button v-if="game.started && selfPlayer && game.owner._id != selfPlayer.user._id" class="red"
|
||||||
|
@click="surrender(game._id)">
|
||||||
Surrender
|
Surrender
|
||||||
</button>
|
</button>
|
||||||
<button @click="navigateTo('/lobby')">Return to lobby</button>
|
<button @click="navigateTo('/lobby')">Return to lobby</button>
|
||||||
|
|||||||
Reference in New Issue
Block a user