From 5832ef280f03da9272d1169776ec744245db2a9a Mon Sep 17 00:00:00 2001
From: Erzangel <ertche@hotmail.fr>
Date: Tue, 14 May 2024 23:57:55 +0200
Subject: [PATCH 1/2] feat: end turn warning

---
 components/SelfView.vue | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/components/SelfView.vue b/components/SelfView.vue
index 85d1d0b..aaf0fea 100644
--- a/components/SelfView.vue
+++ b/components/SelfView.vue
@@ -4,6 +4,27 @@ import { CardEffects } from '@/netcode/Effect'
 
 const isTurn = computed(() => goStore.self?.team == goStore.current_game?.current_turn)
 
+let warning = ref(false)
+
+function checkEndTurn() {
+    // TODO: Add a confirmation dialog if resources are left
+  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()
+  }
+    
+}
+
+
 </script>
 
 <template>
@@ -13,7 +34,8 @@ const isTurn = computed(() => goStore.self?.team == goStore.current_game?.curren
             :disabled="!goStore.self.turn.find_effect(CardEffects.MAKE_DISCARD)">
             make Discard</button>
         <div id="turn_data">
-            <button id="end_turn" v-if="isTurn" @click="endTurn">END TURN</button>
+            <div class="warning" v-if="warning">ATTENTION: il reste des ressources!</div>
+            <button id="end_turn" v-if="isTurn" @click="">END TURN</button>
             <PlayerStats v-if="goStore.self" :player='goStore.self'></PlayerStats>
         </div>
 
@@ -61,6 +83,13 @@ const isTurn = computed(() => goStore.self?.team == goStore.current_game?.curren
     z-index: 9;
 }
 
+.warning {
+    background-color: red;
+    color: white;
+    padding: 5px;
+    border-radius: 5px;
+}
+
 #end_turn {
     z-index: 10;
 }

From aa2d2e17d4521d66af5132ae0a49cb90bd2e588c Mon Sep 17 00:00:00 2001
From: Erzangel <ertche@hotmail.fr>
Date: Wed, 15 May 2024 21:27:22 +0200
Subject: [PATCH 2/2] fix: warn properly on end turn

---
 components/SelfView.vue | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/components/SelfView.vue b/components/SelfView.vue
index aaf0fea..1a4429d 100644
--- a/components/SelfView.vue
+++ b/components/SelfView.vue
@@ -8,11 +8,14 @@ let warning = ref(false)
 
 function checkEndTurn() {
     // TODO: Add a confirmation dialog if resources are left
-  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)) {
+    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
@@ -21,7 +24,6 @@ function checkEndTurn() {
     warning.value = false
     endTurn()
   }
-    
 }
 
 
@@ -34,8 +36,8 @@ function checkEndTurn() {
             :disabled="!goStore.self.turn.find_effect(CardEffects.MAKE_DISCARD)">
             make Discard</button>
         <div id="turn_data">
-            <div class="warning" v-if="warning">ATTENTION: il reste des ressources!</div>
-            <button id="end_turn" v-if="isTurn" @click="">END TURN</button>
+            <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>
 
@@ -84,10 +86,12 @@ function checkEndTurn() {
 }
 
 .warning {
-    background-color: red;
+    background-color: rgba(255, 0, 0, 0.7);
     color: white;
     padding: 5px;
     border-radius: 5px;
+    width: 60px;
+    font-size: 0.9em;
 }
 
 #end_turn {