From 4cb2677f453e0b61738a1d645d380c8da707f592 Mon Sep 17 00:00:00 2001
From: Emmy D'Anello <emmy@luemy.eu>
Date: Fri, 13 Dec 2024 00:02:58 +0100
Subject: [PATCH] =?UTF-8?q?P=C3=A9nalit=C3=A9=20lorsqu'on=20=C3=A9choue=20?=
 =?UTF-8?q?un=20d=C3=A9fi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/app/(tabs)/challenges.tsx        |  2 +-
 client/components/ChallengeCard.tsx     |  2 +-
 client/components/GameProvider.tsx      | 19 ++++++++++++++++---
 client/components/PenalyBanner.tsx      |  2 +-
 client/hooks/useGame.ts                 |  6 +++++-
 client/utils/features/game/gameSlice.ts | 12 ++++++++++--
 6 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/client/app/(tabs)/challenges.tsx b/client/app/(tabs)/challenges.tsx
index 127f0c1..f6db360 100644
--- a/client/app/(tabs)/challenges.tsx
+++ b/client/app/(tabs)/challenges.tsx
@@ -70,7 +70,7 @@ function ChallengeScreenBody() {
           challenge={currentChallenge}
           onSuccess={() => { setLoading(true); endChallenge.mutate({ success: true }) }}
           onFail={() => endChallenge.mutate({ success: false })} />}
-    {!loading && !currentChallenge && game.currentRunner && <>
+    {!loading && !game.penaltyEnd && !currentChallenge && game.currentRunner && <>
       <Banner
           visible={!currentChallenge && game.currentRunner && !loading}
           icon='cancel'
diff --git a/client/components/ChallengeCard.tsx b/client/components/ChallengeCard.tsx
index 70725f5..6d951be 100644
--- a/client/components/ChallengeCard.tsx
+++ b/client/components/ChallengeCard.tsx
@@ -29,7 +29,7 @@ export default function ChallengeCard({ challenge, onSuccess, onFail, onDelete,
       </View>
       <View style={{ flexWrap: 'wrap', flexDirection: 'row', justifyContent: 'space-around', padding: 15 }}>
         {onFail && <Button key='failBtn' mode='outlined' icon='cancel' onPress={() => onFail()}>
-          Passer
+          Échouer
         </Button>}
         {onSuccess && <Button key='successBtn' mode='contained' icon='check' onPress={() => onSuccess()}>
           Terminer
diff --git a/client/components/GameProvider.tsx b/client/components/GameProvider.tsx
index 67ba2f4..d063a52 100644
--- a/client/components/GameProvider.tsx
+++ b/client/components/GameProvider.tsx
@@ -1,10 +1,10 @@
 import { useAuth } from '@/hooks/useAuth'
-import { useDownloadChallengeActions } from '@/hooks/useChallengeActions'
+import { useChallengeActions, useDownloadChallengeActions } from '@/hooks/useChallengeActions'
 import { useDownloadChallenges } from '@/hooks/useChallenges'
-import { useGame, useUpdateActiveChallengeId, useUpdateGameState, useUpdateMoney } from '@/hooks/useGame'
+import { useGame, useUpdateActiveChallengeId, useUpdateGameState, useUpdateMoney, useUpdatePenalty } from '@/hooks/useGame'
 import { useDownloadTrains } from '@/hooks/useTrain'
 import { isAuthValid } from '@/utils/features/auth/authSlice'
-import { ChallengeActionPayload } from '@/utils/features/challengeActions/challengeActionsSlice'
+import { ChallengeAction, ChallengeActionPayload } from '@/utils/features/challengeActions/challengeActionsSlice'
 import { Challenge } from '@/utils/features/challenges/challengesSlice'
 import { useQuery } from '@tanstack/react-query'
 import { ReactNode, useEffect } from 'react'
@@ -12,7 +12,9 @@ import { ReactNode, useEffect } from 'react'
 export default function GameProvider({ children }: { children: ReactNode }) {
   const auth = useAuth()
   const game = useGame()
+  const challengeActions = useChallengeActions()
   const updateGameState = useUpdateGameState()
+  const updatePenalty = useUpdatePenalty()
   const updateMoney = useUpdateMoney()
   const updateActiveChallengeId = useUpdateActiveChallengeId()
   const downloadTrains = useDownloadTrains()
@@ -77,6 +79,17 @@ export default function GameProvider({ children }: { children: ReactNode }) {
     }
   }, [challengesQuery.status, challengesQuery.dataUpdatedAt])
 
+  useEffect(() => {
+    const now = new Date().getTime()
+    const activeChallenge: ChallengeAction | undefined = challengeActions.challengeActions
+      .find(challengeAction => challengeAction.penaltyStart && challengeAction.penaltyEnd
+        && challengeAction.penaltyStart <= now && now <= challengeAction.penaltyEnd)
+    if (!activeChallenge || !game.currentRunner)
+      updatePenalty({ penaltyStart: null, penaltyEnd: null })
+    else if (activeChallenge && (activeChallenge.penaltyStart !== game.penaltyStart || activeChallenge.penaltyEnd))
+      updatePenalty({ penaltyStart: activeChallenge.penaltyStart, penaltyEnd: activeChallenge.penaltyEnd })
+  }, [game.currentRunner, challengeActions])
+
   return <>
     {children}
   </>
diff --git a/client/components/PenalyBanner.tsx b/client/components/PenalyBanner.tsx
index 079f2b6..2fe08d8 100644
--- a/client/components/PenalyBanner.tsx
+++ b/client/components/PenalyBanner.tsx
@@ -41,7 +41,7 @@ export default function PenaltyBanner() {
       </Banner>
       <ProgressBar
           visible={hasPenalty}
-          animatedValue={1 - remainingTime / (3 * 60)}
+          animatedValue={1 - remainingTime / (30 * 60)}
           color={MD3Colors.error40}
           style={{ height: 6 }} />
     </View>
diff --git a/client/hooks/useGame.ts b/client/hooks/useGame.ts
index 2e746ea..eb44269 100644
--- a/client/hooks/useGame.ts
+++ b/client/hooks/useGame.ts
@@ -1,5 +1,5 @@
 import { useAppDispatch, useAppSelector } from "./useStore"
-import { GamePayload, setPlayerId, updateActiveChallengeId, updateGameState, updateMoney } from "@/utils/features/game/gameSlice"
+import { GamePayload, PenaltyPayload, setPlayerId, updateActiveChallengeId, updateGameState, updateMoney, updatePenalty } from "@/utils/features/game/gameSlice"
 
 export const useGame = () => useAppSelector((state) => state.game)
 export const useSetPlayerId = () => {
@@ -18,3 +18,7 @@ export const useUpdateGameState = () => {
     const dispatch = useAppDispatch()
     return (game: GamePayload) => dispatch(updateGameState(game))
 }
+export const useUpdatePenalty = () => {
+    const dispatch = useAppDispatch()
+    return (penalty: PenaltyPayload) => dispatch(updatePenalty(penalty))
+}
diff --git a/client/utils/features/game/gameSlice.ts b/client/utils/features/game/gameSlice.ts
index 39711a6..7c6cf5c 100644
--- a/client/utils/features/game/gameSlice.ts
+++ b/client/utils/features/game/gameSlice.ts
@@ -1,5 +1,4 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
-import { ChallengeAction } from '../challengeActions/challengeActionsSlice'
 
 export interface RunPayload {
   id: number
@@ -16,6 +15,11 @@ export interface GamePayload {
   currentRun: RunPayload | null
 }
 
+export interface PenaltyPayload {
+  penaltyStart: number | null
+  penaltyEnd: number | null
+}
+
 export interface GameState {
   playerId: number | null
   gameStarted: boolean
@@ -59,10 +63,14 @@ export const gameSlice = createSlice({
         state.chaseFreeTime = null
       else if (game.currentRun)
         state.chaseFreeTime = new Date(game.currentRun?.start).getTime() + 45 * 60 * 1000
+    },
+    updatePenalty: (state, action: PayloadAction<PenaltyPayload>) => {
+      state.penaltyStart = action.payload.penaltyStart
+      state.penaltyEnd = action.payload.penaltyEnd
     }
   },
 })
 
-export const { setPlayerId, updateMoney, updateActiveChallengeId, updateGameState } = gameSlice.actions
+export const { setPlayerId, updateMoney, updateActiveChallengeId, updateGameState, updatePenalty } = gameSlice.actions
 
 export default gameSlice.reducer