Skip to content

WIP rainbow mode #240

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

Open
nicklemmon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

WIP rainbow mode #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@ export function App() {
return <AppPreloader />
}

if (value === 'ModeSelection') {
return (
<div>
<button onClick={() => send({ type: 'STANDARD_MODE_SELECTION' })}>Standard mode</button>

<button onClick={() => send({ type: 'RAINBOW_MODE_SELECTION' })}>Rainbow mode</button>
</div>
)
}

if (value === 'CharacterCreation') {
return (
<CharacterCreation
Expand All @@ -46,6 +56,7 @@ export function App() {
return (
<div className={css['play-area']}>
<div className={css['play-area-wrapper']}>
CURRENT MODE = {context.game.mode}
<div className={css['play-area-banner']}>
<Inline>
<StatsRow>
Expand Down Expand Up @@ -80,7 +91,6 @@ export function App() {
</AnimatePresence>
</Inline>
</div>

<div className={css['combat-zone']}>
<AnimatePresence>
{context.game.player.characterPortrait ? (
Expand Down Expand Up @@ -197,7 +207,6 @@ export function App() {
</AnimatePresence>
</Stack>
</div>

<Stack className={css['current-hand']}>
<Stack spacing="100">
<div className={css['current-hand-wrapper']}>
Expand Down Expand Up @@ -228,7 +237,6 @@ export function App() {
Current hand with {context.game.currentHand.length} cards
</Stack>
</Stack>

<Stack className={css['discard-pile']}>
<Deck>
{context.game.discardPile.map((card, index) => {
Expand All @@ -243,7 +251,6 @@ export function App() {
</Deck>
<div>Discard pile with {context.game.discardPile.length} cards</div>
</Stack>

<AnimatePresence
onExitComplete={() => send({ type: 'DISCARD_CARD_ANIMATION_COMPLETE' })}
mode="popLayout"
Expand All @@ -267,7 +274,6 @@ export function App() {
</motion.div>
) : null}
</AnimatePresence>

<Stack className={css['draw-pile']}>
<Deck>
{context.game.drawPile.map((card, index) => {
Expand Down
32 changes: 31 additions & 1 deletion src/machines/app-machine/app-machine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ export type AppMachineContext = {
cards: Array<Card>
}
game: {
mode: 'standard' | 'rainbow'
player: {
characterClass: CharacterClass | undefined
characterClassDeck: Array<Card>
Expand Down Expand Up @@ -152,6 +153,8 @@ export type AppMachineContext = {
}

type AppMachineEvent =
| { type: 'STANDARD_MODE_SELECTION' }
| { type: 'RAINBOW_MODE_SELECTION' }
| {
type: 'CREATE_CHARACTER'
data: { characterClass: string; characterName: string; characterPortrait: string }
Expand Down Expand Up @@ -438,6 +441,7 @@ export const appMachine = setup({
cards: CARDS,
},
game: {
mode: 'standard',
player: {
characterClass: undefined,
characterClassDeck: [],
Expand Down Expand Up @@ -476,11 +480,37 @@ export const appMachine = setup({
LoadingAssets: {
invoke: {
src: 'loadAllAssets',
onDone: 'CharacterCreation',
onDone: 'ModeSelection',
onError: 'LoadingAssetsError',
},
},
LoadingAssetsError: {},
ModeSelection: {
on: {
STANDARD_MODE_SELECTION: {
actions: assign({
game: ({ context }) => {
return {
...context.game,
mode: 'standard',
}
},
}),
target: 'CharacterCreation',
},
RAINBOW_MODE_SELECTION: {
actions: assign({
game: ({ context }) => {
return {
...context.game,
mode: 'rainbow',
}
},
}),
target: 'CharacterCreation',
},
},
},
CharacterCreation: {
on: {
CREATE_CHARACTER: {
Expand Down