jonah/wizard
1
0
Fork 0
Code Issues Pull Requests Releases Activity

added sync at start of round and trick

Browse Source
This commit is contained in:
jbb01
2021-12-14 17:34:20 +01:00
parent 62b6c3fd81
commit 2d3477ffc5
13 changed files with 138 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/GameState.java
View File

@@ -28,6 +28,11 @@ public abstract class GameState implements TimeoutState<GameState, Game> {
return Optional.empty();
}
protected final Optional<GameState> syncTimeout(Game game) {
game.timeout(this, getSyncTimeout(game, false));
return Optional.empty();
}
protected final Optional<GameState> transition(GameState state) {
return Optional.of(state);
}
@@ -35,6 +40,10 @@ public abstract class GameState implements TimeoutState<GameState, Game> {
protected final long getTimeout(Game game, boolean absolute) {
return (absolute ? System.currentTimeMillis() : 0) + game.getConfig().timeout();
}
protected final long getSyncTimeout(Game game, boolean absolute) {
return (absolute ? System.currentTimeMillis() : 0) + game.getConfig().syncTimeout();
}
//</editor-fold>
public Optional<GameState> onMessage(Game game, UUID player, PlayerMessage message) {

38
wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/round/StartingRound.java
View File

@@ -1,18 +1,52 @@
package eu.jonahbauer.wizard.core.machine.states.round;
import eu.jonahbauer.wizard.core.machine.states.GameData;
import eu.jonahbauer.wizard.common.messages.observer.TimeoutMessage;
import eu.jonahbauer.wizard.common.messages.observer.UserInputMessage;
import eu.jonahbauer.wizard.common.messages.player.ContinueMessage;
import eu.jonahbauer.wizard.common.messages.player.PlayerMessage;
import eu.jonahbauer.wizard.core.machine.Game;
import eu.jonahbauer.wizard.core.machine.GameState;
import eu.jonahbauer.wizard.core.machine.states.GameData;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import static eu.jonahbauer.wizard.common.messages.observer.UserInputMessage.Action.SYNC;
import static eu.jonahbauer.wizard.core.machine.states.GameData.PLAYERS;
public final class StartingRound extends RoundState {
private final transient Set<UUID> ready = new HashSet<>();
public StartingRound(GameData data) {
super(data);
}
@Override
public Optional<GameState> onEnter(Game game) {
return transition(new Dealing(getData()));
game.notify(new UserInputMessage(null, SYNC, getSyncTimeout(game, true)));
return syncTimeout(game);
}
@Override
public Optional<GameState> onMessage(Game game, UUID player, PlayerMessage message) {
if (message instanceof ContinueMessage) {
ready.add(player);
if (ready.size() == get(PLAYERS).size()) {
return Optional.of(new Dealing(getData()));
} else {
return Optional.empty();
}
} else {
return super.onMessage(game, player, message);
}
}
@Override
public Optional<GameState> onTimeout(Game game) {
game.notify(new TimeoutMessage());
return Optional.of(new Dealing(getData()));
}
}

36
wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/trick/StartingTrick.java
View File

@@ -1,18 +1,52 @@
package eu.jonahbauer.wizard.core.machine.states.trick;
import eu.jonahbauer.wizard.common.messages.observer.TimeoutMessage;
import eu.jonahbauer.wizard.common.messages.observer.UserInputMessage;
import eu.jonahbauer.wizard.common.messages.player.ContinueMessage;
import eu.jonahbauer.wizard.common.messages.player.PlayerMessage;
import eu.jonahbauer.wizard.core.machine.Game;
import eu.jonahbauer.wizard.core.machine.states.GameData;
import eu.jonahbauer.wizard.core.machine.GameState;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import static eu.jonahbauer.wizard.common.messages.observer.UserInputMessage.Action.SYNC;
import static eu.jonahbauer.wizard.core.machine.states.GameData.PLAYERS;
public final class StartingTrick extends TrickState {
private final transient Set<UUID> ready = new HashSet<>();
public StartingTrick(GameData data) {
super(data);
}
@Override
public Optional<GameState> onEnter(Game game) {
return transition(new PlayingCard(getData()));
game.notify(new UserInputMessage(null, SYNC, getSyncTimeout(game, true)));
return syncTimeout(game);
}
@Override
public Optional<GameState> onMessage(Game game, UUID player, PlayerMessage message) {
if (message instanceof ContinueMessage) {
ready.add(player);
if (ready.size() == get(PLAYERS).size()) {
return Optional.of(new PlayingCard(getData()));
} else {
return Optional.empty();
}
} else {
return super.onMessage(game, player, message);
}
}
@Override
public Optional<GameState> onTimeout(Game game) {
game.notify(new TimeoutMessage());
return Optional.of(new PlayingCard(getData()));
}
}

5
wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/GameConfiguration.java
View File

@@ -16,4 +16,9 @@ public class GameConfiguration {
Set<Card> cards;
boolean allowExactPredictions;
@With long timeout;
@With long syncTimeout;
public GameConfiguration(Set<Card> cards, boolean allowExactPredictions, long timeout) {
this(cards, allowExactPredictions, timeout, 10_000);
}
}