Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Player turn aura #171

Merged
merged 11 commits into from
Mar 6, 2025
Merged

Player turn aura #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bfe1f55
create initial player aura
Trys2Hard Mar 1, 2025
348c0f3
Add opponent and resources auras
Trys2Hard Mar 1, 2025
62a3b45
Merge branch 'main' into player-turn-aura
Trys2Hard Mar 2, 2025
4687aa7
Redo aura animation
Trys2Hard Mar 2, 2025
2610e8e
Remove useEffect and add transition
Trys2Hard Mar 2, 2025
caffbcb
Fix refresh error crashing game
Trys2Hard Mar 2, 2025
8fc7ca6
Merge branch 'main' into player-turn-aura
Trys2Hard Mar 2, 2025
cce9a7d
Merge branch 'main' into player-turn-aura
Trys2Hard Mar 4, 2025
9445885
Misc. aura improvements
Trys2Hard Mar 4, 2025
fc029a3
Aura responsive to sidebar
Trys2Hard Mar 5, 2025
bbd4fb9
Merge branch 'main' into player-turn-aura
danbastin Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/app/GameBoard/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ const GameBoard = () => {
const [sidebarOpen, setSidebarOpen] = useState(sidebarState);
const [isPreferenceOpen, setPreferenceOpen] = useState(false);


useEffect(() => {
if(lobbyState && !lobbyState.gameOngoing && lobbyState.gameType !== MatchType.Quick) {
router.push('/lobby');
Expand Down Expand Up @@ -113,7 +112,7 @@ const GameBoard = () => {
<PlayerCardTray
trayPlayer={connectedPlayer}
toggleSidebar={toggleSidebar}
/>
/>
</Box>


Expand Down
17 changes: 17 additions & 0 deletions src/app/_components/Gameboard/OpponentCardTray/OpponentCardTray.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ const OpponentCardTray: React.FC<IOpponentCardTrayProps> = ({ trayPlayer, prefer

const hasInitiative = gameState.players[connectedPlayer].hasInitiative;
const initiativeClaimed = gameState.initiativeClaimed;
const activePlayer = gameState.players[connectedPlayer].isActionPhaseActivePlayer;
const phase = gameState.phase;

// ---------------Styles------------------- //
const styles = {
Expand All @@ -45,6 +47,7 @@ const OpponentCardTray: React.FC<IOpponentCardTrayProps> = ({ trayPlayer, prefer
width: '100%',
height: '100%',
transform: 'translateY(-2rem)',
zIndex: '1',
},
rightColumn: {
display: 'flex',
Expand Down Expand Up @@ -105,6 +108,18 @@ const OpponentCardTray: React.FC<IOpponentCardTrayProps> = ({ trayPlayer, prefer
userSelect: 'none',
color: 'black',
}
},
opponentTurnAura: {
height: '100px',
width: '90%',
position: 'absolute',
top: '-100px',
boxShadow: activePlayer === false ? '0px 20px 35px var(--initiative-red)' : phase === 'regroup' || phase === 'setup' ? '0px 15px 35px rgba(216,174,24,255)' : 'none',
transition: 'box-shadow .5s',
borderRadius: '50%',
left: '0',
right: '0',
marginInline: 'auto',
}
};

Expand All @@ -116,6 +131,7 @@ const OpponentCardTray: React.FC<IOpponentCardTrayProps> = ({ trayPlayer, prefer
display: 'flex',
flexWrap: 'nowrap',
columnGap: '2rem', // 2rem gap between columns
position: 'relative'
}}
>
{/* Left column (fixed 360px) */}
Expand All @@ -137,6 +153,7 @@ const OpponentCardTray: React.FC<IOpponentCardTrayProps> = ({ trayPlayer, prefer
<Box sx={styles.opponentHandWrapper}>
<PlayerHand clickDisabled={true} cards={gameState?.players[getOpponent(connectedPlayer)].cardPiles['hand'] || []} />
</Box>
<Box sx={ styles.opponentTurnAura} />
</Grid>

{/* Right column (fixed 360px) */}
Expand Down
18 changes: 18 additions & 0 deletions src/app/_components/Gameboard/PlayerCardTray/PlayerCardTray.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ import { useGame } from '@/app/_contexts/Game.context';
const PlayerCardTray: React.FC<IPlayerCardTrayProps> = ({ trayPlayer, toggleSidebar }) => {
const { gameState, connectedPlayer } = useGame();

const activePlayer = gameState.players[connectedPlayer].isActionPhaseActivePlayer;
const phase = gameState.phase;

const styles = {
leftColumnStyle: {
display: 'flex',
Expand All @@ -38,13 +41,26 @@ const PlayerCardTray: React.FC<IPlayerCardTrayProps> = ({ trayPlayer, toggleSide
display: 'flex',
alignItems: 'flex-end',
transform: 'translateY(1.6rem)',
zIndex: '1',
},
chatColumn: {
display: 'flex',
alignItems: 'center',
height: '5.5rem',
margin: '0',
},
playerTurnAura: {
height: '100px',
width: '90%',
position: 'absolute',
bottom: '-120px',
boxShadow: activePlayer === true ? '0px -20px 35px var(--initiative-blue)' : phase === 'regroup' || phase === 'setup' ? '0px -15px 35px rgba(216,174,24,255)' : 'none',
transition: 'box-shadow .5s',
borderRadius: '50%',
left: '0',
right: '0',
marginInline: 'auto',
}
};

return (
Expand All @@ -55,6 +71,7 @@ const PlayerCardTray: React.FC<IPlayerCardTrayProps> = ({ trayPlayer, toggleSide
display: 'flex',
flexWrap: 'nowrap',
columnGap: '2rem', // 2rem gap between columns
position: 'relative'
}}
className="playerCardTrayWrapper"
>
Expand All @@ -81,6 +98,7 @@ const PlayerCardTray: React.FC<IPlayerCardTrayProps> = ({ trayPlayer, toggleSide
cards={gameState?.players[connectedPlayer].cardPiles['hand'] || []}
/>
</Box>
<Box sx={styles.playerTurnAura} />
</Grid>

{/* Right column: fixed 360px width */}
Expand Down