heronfief/front
3
1
Fork 0
Code Issues 44 Pull Requests 1 Actions Packages Projects Releases 1 Activity

FIX : button click activating card

Browse Source
This commit is contained in:
legonzaur
2024-05-07 17:38:05 +02:00
parent 38b992b7a5
commit 8a27c425e0
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/MarketCards.vue
+9 -7
View File
@@ -13,16 +13,18 @@ const isTurn = computed(() => goStore.self && goStore.game?.started && (goStore.
<div class="separator"></div> <div class="separator"></div>
<CardPreview :data="c" v-for="c in goStore.game?.market" @click="c && buy(c)"> <CardPreview :data="c" v-for="c in goStore.game?.market" @click="c && buy(c)">
<template v-if="isTurn && c && c.cost && (goStore.self?.turn.gold_reserve ?? 0) >= c.cost"> <template v-if="isTurn && c && c.cost && (goStore.self?.turn.gold_reserve ?? 0) >= c.cost">
<button @click="buy(c)">BUY</button> <button @click.stop="buy(c)">BUY</button>
<button @click="useEffect(goStore.self!.turn.find_effect(CardEffects.PLAY_NEXT_CARD_BOUGHT).value!, c)" <button
@click.stop="useEffect(goStore.self!.turn.find_effect(CardEffects.PLAY_NEXT_CARD_BOUGHT).value!, c)"
v-if="goStore.self?.turn.find_effect(CardEffects.PLAY_NEXT_CARD_BOUGHT).value"> v-if="goStore.self?.turn.find_effect(CardEffects.PLAY_NEXT_CARD_BOUGHT).value">
BUY IN HAND</button> BUY IN HAND</button>
<button @click="useEffect(goStore.self!.turn.find_effect(CardEffects.STACK_NEXT_CARD_BOUGHT).value!, c)" <button
@click.stop="useEffect(goStore.self!.turn.find_effect(CardEffects.STACK_NEXT_CARD_BOUGHT).value!, c)"
v-if="goStore.self?.turn.find_effect(CardEffects.STACK_NEXT_CARD_BOUGHT).value"> v-if="goStore.self?.turn.find_effect(CardEffects.STACK_NEXT_CARD_BOUGHT).value">
BUY IN STACK (generic)</button> BUY IN STACK (generic)</button>
<button <button
@click="useEffect(goStore.self!.turn.find_effect(CardEffects.STACK_NEXT_ACTION_BOUGHT).value!, c)" @click.stop="useEffect(goStore.self!.turn.find_effect(CardEffects.STACK_NEXT_ACTION_BOUGHT).value!, c)"
v-if="c.card_type == CardType.ACTION && goStore.self?.turn.find_effect(CardEffects.STACK_NEXT_ACTION_BOUGHT).value"> v-if="c.card_type == CardType.ACTION && goStore.self?.turn.find_effect(CardEffects.STACK_NEXT_ACTION_BOUGHT).value">
BUY IN STACK (actions)</button> BUY IN STACK (actions)</button>
</template> </template>
@@ -31,15 +33,15 @@ const isTurn = computed(() => goStore.self && goStore.game?.started && (goStore.
<CardPreview :data="goStore.game?.gem_stack.at(-1)" @click="buy(goStore.game?.gem_stack.at(-1)!)"> <CardPreview :data="goStore.game?.gem_stack.at(-1)" @click="buy(goStore.game?.gem_stack.at(-1)!)">
<template <template
v-if="isTurn && goStore.game?.gem_stack.length && goStore.game?.gem_stack.length > 0 && (goStore.self?.turn.gold_reserve ?? 0) >= (goStore.game?.gem_stack.at(-1)?.cost ?? Infinity)"> v-if="isTurn && goStore.game?.gem_stack.length && goStore.game?.gem_stack.length > 0 && (goStore.self?.turn.gold_reserve ?? 0) >= (goStore.game?.gem_stack.at(-1)?.cost ?? Infinity)">
<button @click="buy(goStore.game.gem_stack.at(-1)!)"> <button @click.stop="buy(goStore.game.gem_stack.at(-1)!)">
BUY BUY
</button> </button>
<button <button
@click="useEffect(goStore.self!.turn.find_effect(CardEffects.PLAY_NEXT_CARD_BOUGHT).value!, goStore.game.gem_stack.at(-1))" @click.stop="useEffect(goStore.self!.turn.find_effect(CardEffects.PLAY_NEXT_CARD_BOUGHT).value!, goStore.game.gem_stack.at(-1))"
v-if="goStore.self?.turn.find_effect(CardEffects.PLAY_NEXT_CARD_BOUGHT).value"> v-if="goStore.self?.turn.find_effect(CardEffects.PLAY_NEXT_CARD_BOUGHT).value">
BUY IN HAND</button> BUY IN HAND</button>
<button <button
@click="useEffect(goStore.self!.turn.find_effect(CardEffects.STACK_NEXT_CARD_BOUGHT).value!, goStore.game.gem_stack.at(-1))" @click.stop="useEffect(goStore.self!.turn.find_effect(CardEffects.STACK_NEXT_CARD_BOUGHT).value!, goStore.game.gem_stack.at(-1))"
v-if="goStore.self?.turn.find_effect(CardEffects.STACK_NEXT_CARD_BOUGHT).value"> v-if="goStore.self?.turn.find_effect(CardEffects.STACK_NEXT_CARD_BOUGHT).value">
BUY IN STACK(generic) BUY IN STACK(generic)
</button> </button>
components/PlayerSlot.vue
+13 -12
View File
@@ -66,15 +66,15 @@ const restack_discarded_card = (target: Card) => run_effect(CardEffects.RESTACK_
<template v-if="c && isSelf && isPlayerTurn"> <template v-if="c && isSelf && isPlayerTurn">
<button v-if="goStore.self?.turn.find_effect(CardEffects.SACRIFICE).value" <button v-if="goStore.self?.turn.find_effect(CardEffects.SACRIFICE).value"
@click="sacrifice(c)"> @click.stop="sacrifice(c)">
SACRIFICE SACRIFICE
</button> </button>
<button v-if="goStore.self?.turn.find_effect(CardEffects.RESTACK_DISCARDED_CHAMPION).value" <button v-if="goStore.self?.turn.find_effect(CardEffects.RESTACK_DISCARDED_CHAMPION).value"
@click="restack_discarded_champion(c)"> @click.stop="restack_discarded_champion(c)">
RESTACK_DISCARDED_CHAMPION RESTACK_DISCARDED_CHAMPION
</button> </button>
<button v-if="goStore.self?.turn.find_effect(CardEffects.RESTACK_DISCARDED_CARD).value" <button v-if="goStore.self?.turn.find_effect(CardEffects.RESTACK_DISCARDED_CARD).value"
@click="restack_discarded_card(c)"> @click.stop="restack_discarded_card(c)">
RESTACK_DISCARDED_CARD RESTACK_DISCARDED_CARD
</button> </button>
@@ -87,11 +87,11 @@ const restack_discarded_card = (target: Card) => run_effect(CardEffects.RESTACK_
<b>{{ props.player.username }}</b> <b>{{ props.player.username }}</b>
</div> </div>
<div id="current_player_board"> <div id="current_player_board">
<button @click="damage_team(props.player.team)" v-if="isSelfTurn && isPlayerEnemy" <button @click.stop="damage_team(props.player.team)" v-if="isSelfTurn && isPlayerEnemy"
:disabled="(goStore.self?.turn.damage_reserve ?? 0) <= 0"> :disabled="(goStore.self?.turn.damage_reserve ?? 0) <= 0">
Damage Damage
</button> </button>
<button v-if="isSelfTurn && isPlayerEnemy" @click="make_discard(props.player)" <button v-if="isSelfTurn && isPlayerEnemy" @click.stop="make_discard(props.player)"
:disabled="!goStore.self?.turn.find_effect(CardEffects.MAKE_DISCARD).value"> :disabled="!goStore.self?.turn.find_effect(CardEffects.MAKE_DISCARD).value">
make Discard make Discard
</button> </button>
@@ -100,7 +100,7 @@ const restack_discarded_card = (target: Card) => run_effect(CardEffects.RESTACK_
<div class="cards_container"> <div class="cards_container">
<!-- HAND --> <!-- HAND -->
<CardPreview :data="c" v-for="c in props.player.hand" @click="c && playCard(c)"> <CardPreview :data="c" v-for="c in props.player.hand" @click="c && playCard(c)">
<button v-if="c && isSelf && props.player.turn.discard_markers > 0" @click="discard(c)"> <button v-if="c && isSelf && props.player.turn.discard_markers > 0" @click.stop="discard(c)">
DISCARD DISCARD
</button> </button>
</CardPreview> </CardPreview>
@@ -111,30 +111,31 @@ const restack_discarded_card = (target: Card) => run_effect(CardEffects.RESTACK_
<template v-if="c && isSelf && isPlayerTurn"> <template v-if="c && isSelf && isPlayerTurn">
<template v-if="c.uuid in props.player.turn.cards_locked" <template v-if="c.uuid in props.player.turn.cards_locked"
v-for="e in props.player.turn.effects_availables"> v-for="e in props.player.turn.effects_availables">
<button v-if="e.card == c" @click="useEffect(e)" :disabled="!e.usable"> <button v-if="e.card == c" @click.stop="useEffect(e)" :disabled="!e.usable">
EFFECT<br> EFFECT<br>
{{ e.effect + " " + (e.effect_type ?? '') }} {{ e.effect + " " + (e.effect_type ?? '') }}
</button> </button>
</template> </template>
<template v-if="!(c.uuid in props.player.turn.cards_locked)"> <template v-if="!(c.uuid in props.player.turn.cards_locked)">
<button v-if="props.player.turn.discard_markers > 0" @click="discard(c)"> <button v-if="props.player.turn.discard_markers > 0" @click.stop="discard(c)">
DISCARD DISCARD
</button> </button>
<button v-if="goStore.self?.turn.find_effect(CardEffects.SACRIFICE).value" <button v-if="goStore.self?.turn.find_effect(CardEffects.SACRIFICE).value"
@click="sacrifice(c)"> @click.stop="sacrifice(c)">
SACRIFICE SACRIFICE
</button> </button>
<button @click="lockCard(c)" <button @click.stop="lockCard(c)"
:disabled="(props.player.turn.discard_markers > 0 && c !== props.player.turn.discard_marker_card) || props.player.turn.fuck_u_markers > 0"> :disabled="(props.player.turn.discard_markers > 0 && c !== props.player.turn.discard_marker_card) || props.player.turn.fuck_u_markers > 0">
LOCK LOCK
</button> </button>
</template> </template>
</template> </template>
<template v-if="isPlayerEnemy && isSelfTurn && (c.health_as_champion ?? 0) > 0"> <template v-if="isPlayerEnemy && isSelfTurn && (c.health_as_champion ?? 0) > 0">
<button :disabled="(goStore.self?.turn.damage_reserve ?? 0) <= 0" @click="damage_champion(c)"> <button :disabled="(goStore.self?.turn.damage_reserve ?? 0) <= 0"
@click.stop="damage_champion(c)">
DAMAGE DAMAGE
</button> </button>
<button v-if="goStore.self?.turn.find_effect(CardEffects.STUN).value" @click="stun(c)"> <button v-if="goStore.self?.turn.find_effect(CardEffects.STUN).value" @click.stop="stun(c)">
STUN STUN
</button> </button>
</template> </template>