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

[Feat] : move end turn button, remove self statistics overlay
release-tag / release-image (push) Successful in 29s
Details

Browse Source 
Closes #18
This commit is contained in:
legonzaur
2024-05-16 11:43:59 +02:00
parent 12589f1fb4
commit 6d3a11577b
3 changed files with 30 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/GameBoard.vue
-1
View File
@@ -19,7 +19,6 @@ const discard_unwrapped = ref<boolean>(false)
<div id="current_player">
<PlayerSlot v-for="p in current_players" :player="p"></PlayerSlot>
</div>
<SelfView></SelfView>
</div>
</template>
components/PlayerSlot.vue
+7 -3
View File
@@ -92,14 +92,18 @@ const prepare_champion = (target: Card) => run_effect(CardEffects.PREPARE, targe
</div>
</template>
<div id="player_banner">
<div class="ready-bubble not-ready" v-if="!props.player.ready && !goStore.current_game?.started">Pas encore prêt...</div>
<div class="ready-bubble not-ready" v-if="!props.player.ready && !goStore.current_game?.started">Pas encore
prêt...
</div>
<div class="ready-bubble ready" v-if="props.player.ready && !goStore.current_game?.started">Prêt!</div>
<div id="player_info">
<PlayerIcon :player="props.player"></PlayerIcon>
</div>
<div id="player_stats">
<PlayerStats v-if="goStore.current_game?.started" :player="props.player"></PlayerStats>
<template v-if="goStore.current_game?.started">
<PlayerStats v-if="props.player != goStore.self" :player="props.player"></PlayerStats>
<SelfView v-if="props.player === goStore.self" :player="props.player"></SelfView>
</template>
</div>
</div>
<div id="current_player_board">
components/SelfView.vue
+23 -40
View File
@@ -10,44 +10,37 @@ function checkEndTurn() {
// TODO: Add a confirmation dialog if resources are left
console.log("Checking end turn")
if (
(!warning.value)
&& (
(goStore.self?.turn?.damage_reserve ? goStore.self?.turn?.damage_reserve > 0 : false)
|| (goStore.self?.turn?.gold_reserve ? goStore.self?.turn?.gold_reserve > 0 : false)
|| (goStore.self?.turn?.fuck_u_markers ? goStore.self?.turn?.fuck_u_markers > 0 : false)
)) {
// Set a warning flag to true
// Display an alert somehow using this warning flag
warning.value = true
}
else {
warning.value = false
endTurn()
}
(!warning.value)
&& (
(goStore.self?.turn?.damage_reserve ? goStore.self?.turn?.damage_reserve > 0 : false)
|| (goStore.self?.turn?.gold_reserve ? goStore.self?.turn?.gold_reserve > 0 : false)
|| (goStore.self?.turn?.fuck_u_markers ? goStore.self?.turn?.fuck_u_markers > 0 : false)
)) {
// Set a warning flag to true
// Display an alert somehow using this warning flag
warning.value = true
}
else {
warning.value = false
endTurn()
}
}
</script>
<template>
<div :class="'player ' + (isTurn ? 'turn' : '')">
<button v-if="goStore.self && goStore.self!.turn && goStore.self?.team != goStore.self?.team" id="end_turn"
@click="useEffect(goStore.self.turn.find_effect(CardEffects.MAKE_DISCARD)!, goStore.self)"
:disabled="!goStore.self.turn.find_effect(CardEffects.MAKE_DISCARD)">
make Discard</button>
<div id="turn_data">
<div class="warning" v-if="warning">/!\<br> Effets restants!<br> /!\</div>
<button id="end_turn" v-if="isTurn" @click="checkEndTurn">END TURN</button>
<PlayerStats v-if="goStore.self" :player='goStore.self'></PlayerStats>
</div>
<div class="cards_container" id="self_hand">
<CardPreview :card_id="c?.card_id" v-for=" c in goStore.self?.hand " @click="c && playCard(c)">
<button v-if="c && isTurn && goStore.self?.turn && (goStore.self.turn.discard_markers ?? 0) > 0"
@click="discard(c!)">DISCARD</button>
</CardPreview>
</div>
<PlayerStats v-if="goStore.self" :player='goStore.self'></PlayerStats>
<button id="end_turn" v-if="isTurn" @click="checkEndTurn">END TURN</button>
<div class="warning" v-if="warning">/!\<br> Effets restants!<br> /!\</div>
<div class="cards_container" id="self_hand">
<CardPreview :card_id="c?.card_id" v-for=" c in goStore.self?.hand " @click="c && playCard(c)">
<button v-if="c && isTurn && goStore.self?.turn && (goStore.self.turn.discard_markers ?? 0) > 0"
@click="discard(c!)">DISCARD</button>
</CardPreview>
</div>
</template>
<style scoped>
@@ -64,10 +57,6 @@ function checkEndTurn() {
}
.player {
border-top: 5px solid black;
}
#play_all {
display: flex;
flex-direction: row;
@@ -124,10 +113,6 @@ function checkEndTurn() {
</style>
<style>
#turn_data * {
margin: 2.5px 0 2.5px 0;
}
#self_hand .card {
transition: 0.5s all cubic-bezier(0.075, 0.82, 0.165, 1);
overflow: visible;
@@ -139,8 +124,6 @@ function checkEndTurn() {
}
.cards_container {
min-width: 250px;
}