ynerant/traintrape-moi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pénalité lorsqu'on échoue un défi

Browse Source
This commit is contained in:
Emmy D'Anello 2024-12-13 00:02:58 +01:00
parent 63ad84eb8c
commit 4cb2677f45
Signed by: ynerant
GPG Key ID: 3A75C55819C8CF85
6 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/app/(tabs)/challenges.tsx
View File

@ -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'

2
client/components/ChallengeCard.tsx
View File

@ -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

19
client/components/GameProvider.tsx
View File

@ -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}
</>

2
client/components/PenalyBanner.tsx
View File

@ -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>

6
client/hooks/useGame.ts
View File

@ -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))
}

12
client/utils/features/game/gameSlice.ts
View File

@ -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