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

Fix for null last move if the move changed the stage #701

Merged
merged 16 commits into from
May 22, 2020
Merged

Fix for null last move if the move changed the stage #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0f8b20b
Fix for null last move if changed the stage
JGrzybowski May 18, 2020
682f84e
Added reducer test with using stages
JGrzybowski May 19, 2020
97e77f0
ESlint fixes and test logic fixes
JGrzybowski May 19, 2020
6b9da86
Merge branch 'master' into JGrzybowski/null-last-move
JGrzybowski May 19, 2020
a310f87
Fixed playerID in reducer undo/redo test
JGrzybowski May 20, 2020
73616a0
feat(core): Mark numPlayers as optional in InitializeGame
delucis May 21, 2020
5488104
test(core): Convert reducer tests to TS & break up undo/redo tests
delucis May 21, 2020
69ad803
test(core): Fix makeMove call in undo/redo test
delucis May 22, 2020
522f8cd
test(core): Improve test labelling
delucis May 22, 2020
04dc73b
feat(core): Move undo/redo stack update after event processing
delucis May 22, 2020
c7a3587
test(core): Remove unnecessary seed in test setup
delucis May 22, 2020
81fee5f
fix(core): Lookup undoable move from restore state not last state
delucis May 22, 2020
0944185
fix(core): Use playerID instead of currentPlayer in undoable move lookup
delucis May 22, 2020
1216b4f
test(core): Add low-level tests for undo/redo stacks
delucis May 22, 2020
2d992f6
feat(core): Don’t add move to update stack if turn was ended
delucis May 22, 2020
b55e3b4
Merge branch 'master' into JGrzybowski/null-last-move
delucis May 22, 2020
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
10 changes: 0 additions & 10 deletions src/core/flow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,16 +699,6 @@ export function Flow({
const G = conf.turn.wrapped.onMove(state);
state = { ...state, G };

// Update undo / redo state.
const undo = state._undo || [];
const moveType = action.type;

state = {
...state,
_undo: [...undo, { G: state.G, ctx: state.ctx, moveType }],
_redo: [],
};

let events = [{ fn: OnMove }];

return Process(state, events);
Expand Down
2 changes: 1 addition & 1 deletion src/core/initialize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function InitializeGame({
setupData,
}: {
game: Game;
numPlayers: number;
numPlayers?: number;
setupData?: any;
}) {
game = ProcessGameConfig(game);
Expand Down
Loading