Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
58e6dec724 | ||
|
|
63dc5ff736 |
@@ -6,6 +6,28 @@ description: Chronological record of material decisions affecting the Spigot Tyr
|
||||
|
||||
# Spigot Tyrant Design Log
|
||||
|
||||
## 2026-08-14 — Administrative lifecycle completed
|
||||
|
||||
- Completed US-001 with permission-gated `/tyrantadmin` start, status, pause, resume, and confirmed reset operations.
|
||||
- Initial Vigilantes may be assigned explicitly or selected among eligible recently active players, with offline selections persisted as pending confirmations.
|
||||
- Pause/resume preserves progression and assignments, shifts every cooldown, participation, inactivity, and pending-selection deadline, and invokes managed effect suppression/restoration.
|
||||
- Added detailed operator status output and verified lifecycle, timer shifting, permissions, confirmation safety, candidate filtering, metadata, and effect hooks with the Gradle suite.
|
||||
|
||||
## 2026-08-14 — Administrative lifecycle implementation started
|
||||
|
||||
- US-001 begins with test-first game start, pause/resume deadline freezing, permission-gated administration, inspection, and confirmed reset behavior.
|
||||
|
||||
## 2026-08-14 — Tyrant class assignment completed
|
||||
|
||||
- Completed US-004 with `/tyrant assign <class> <player>`, purchased-class authorization, UUID state, one holder per class, and one Tyrant-side class per player.
|
||||
- Preserved dual alignment so Vigilantes and Followers can hold a Tyrant-side class, while rejecting the Tyrant and opted-out targets.
|
||||
- Added reassignment and reign cleanup for class cooldown/item state, online assignment/removal notices, and login control reminders.
|
||||
- Verified assignment constraints, dual alignment, cleanup, commands, notifications, and reminders with the Gradle test suite.
|
||||
|
||||
## 2026-08-14 — Tyrant class assignment implementation started
|
||||
|
||||
- US-004 begins with test-first purchased-class authorization, one-holder constraints, dual alignment, reassignment cleanup, and reign-wide removal.
|
||||
|
||||
## 2026-08-14 — Tyrant progression completed
|
||||
|
||||
- Completed US-003 with exact Tyrant-on-Vigilante kill attribution, level and choice rewards, pause guards, one-time purchases, and reign reset behavior.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
type: User Story
|
||||
title: "US-001: Start, pause, and administer the game"
|
||||
description: Give server operators safe control over the Tyrant game's lifecycle and state.
|
||||
status: backlog
|
||||
status: done
|
||||
---
|
||||
|
||||
# US-001: Start, pause, and administer the game
|
||||
@@ -11,14 +11,14 @@ As a **server operator**, I want to start, pause, resume, and inspect the game s
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [ ] An administrator can start the first game by assigning the initial Tyrant.
|
||||
- [ ] The administrator may assign the first Vigilante or allow random selection from eligible recently active players.
|
||||
- [ ] An administrator can pause and resume the game without deleting game state.
|
||||
- [ ] Pausing freezes progression, cooldowns, daily-use timers, inactivity checks, and pending-selection deadlines.
|
||||
- [ ] Role and class effects are suppressed while paused and restored when play resumes.
|
||||
- [ ] Administrative commands require the `spigottyrant.admin` permission, granted to server operators by default.
|
||||
- [ ] Administrators can inspect lifecycle state, roles, classes, Followers, purchases, levels, cooldowns, participation, and pending selections.
|
||||
- [ ] Destructive administrative operations require explicit confirmation.
|
||||
- [x] An administrator can start the first game by assigning the initial Tyrant.
|
||||
- [x] The administrator may assign the first Vigilante or allow random selection from eligible recently active players.
|
||||
- [x] An administrator can pause and resume the game without deleting game state.
|
||||
- [x] Pausing freezes progression, cooldowns, daily-use timers, inactivity checks, and pending-selection deadlines.
|
||||
- [x] Role and class effects are suppressed while paused and restored when play resumes.
|
||||
- [x] Administrative commands require the `spigottyrant.admin` permission, granted to server operators by default.
|
||||
- [x] Administrators can inspect lifecycle state, roles, classes, Followers, purchases, levels, cooldowns, participation, and pending selections.
|
||||
- [x] Destructive administrative operations require explicit confirmation.
|
||||
|
||||
## Related
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
type: User Story
|
||||
title: "US-004: Assign unlocked classes"
|
||||
description: Let the Tyrant assign each purchased class to one eligible participant.
|
||||
status: backlog
|
||||
status: done
|
||||
---
|
||||
|
||||
# US-004: Assign unlocked classes
|
||||
@@ -11,14 +11,14 @@ As the **Tyrant**, I want to assign unlocked specialist classes so that I can bu
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [ ] The Tyrant can assign only Assassin, Fixer, and Tamer classes purchased during the current reign.
|
||||
- [ ] Each class can be assigned to at most one player at a time, and a player can hold at most one Tyrant-side class.
|
||||
- [ ] Role alignment and Tyrant-side class are independent: the Vigilante or a Follower may simultaneously be the Assassin, Fixer, or Tamer.
|
||||
- [ ] The Tyrant cannot assign a class to the Tyrant, an opted-out player, or another ineligible player.
|
||||
- [ ] Reassignment removes the class and its bound items and effects from the previous holder before granting it to the new holder.
|
||||
- [ ] Assignment and removal are stored by UUID and communicated clearly to affected players.
|
||||
- [ ] A class holder is reminded of the assignment and its controls on login.
|
||||
- [ ] All class assignments end when the Tyrant's reign ends.
|
||||
- [x] The Tyrant can assign only Assassin, Fixer, and Tamer classes purchased during the current reign.
|
||||
- [x] Each class can be assigned to at most one player at a time, and a player can hold at most one Tyrant-side class.
|
||||
- [x] Role alignment and Tyrant-side class are independent: the Vigilante or a Follower may simultaneously be the Assassin, Fixer, or Tamer.
|
||||
- [x] The Tyrant cannot assign a class to the Tyrant, an opted-out player, or another ineligible player.
|
||||
- [x] Reassignment removes the class and its bound items and effects from the previous holder before granting it to the new holder.
|
||||
- [x] Assignment and removal are stored by UUID and communicated clearly to affected players.
|
||||
- [x] A class holder is reminded of the assignment and its controls on login.
|
||||
- [x] All class assignments end when the Tyrant's reign ends.
|
||||
|
||||
## Related
|
||||
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.util.UUID;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
public final class BukkitOnlinePlayerDirectory implements OnlinePlayerDirectory {
|
||||
@Override
|
||||
public Player findByName(String name) {
|
||||
return Bukkit.getPlayerExact(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Player findById(UUID playerId) {
|
||||
return Bukkit.getPlayer(playerId);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
public final class ClassAssignmentMessages {
|
||||
private ClassAssignmentMessages() {
|
||||
}
|
||||
|
||||
public static String loginReminder(PlayerState player) {
|
||||
return switch (player.tyrantClass()) {
|
||||
case ASSASSIN -> "Class: ASSASSIN. Use your Assassin Cloak; double-jump while "
|
||||
+ "airborne. Use /tyrant item to recover ready class items.";
|
||||
case FIXER -> "Class: FIXER. Use your Fixer's Wrench to activate your boost. "
|
||||
+ "Use /tyrant item to recover ready class items.";
|
||||
case TAMER -> "Class: TAMER. Use your Tamer's Lead to capture mobs. "
|
||||
+ "Use /tyrant item to recover ready class items.";
|
||||
case NONE -> "";
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
public record ClassAssignmentResult(
|
||||
Map<UUID, PlayerState> players,
|
||||
ClassAssignmentStatus status,
|
||||
Optional<UUID> previousHolderId
|
||||
) {
|
||||
public ClassAssignmentResult {
|
||||
players = Map.copyOf(players);
|
||||
previousHolderId = previousHolderId == null ? Optional.empty() : previousHolderId;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,129 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.EnumMap;
|
||||
import java.util.EnumSet;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
public final class ClassAssignmentService {
|
||||
public ClassAssignmentResult assign(
|
||||
GameState game,
|
||||
Map<UUID, PlayerState> players,
|
||||
UUID assignerId,
|
||||
UUID targetId,
|
||||
TyrantClass tyrantClass,
|
||||
Instant now
|
||||
) {
|
||||
ClassAssignmentStatus rejected = rejection(
|
||||
game, players, assignerId, targetId, tyrantClass, now
|
||||
);
|
||||
if (rejected != null) {
|
||||
return new ClassAssignmentResult(players, rejected, Optional.empty());
|
||||
}
|
||||
|
||||
Map<UUID, PlayerState> updated = new HashMap<>(players);
|
||||
Optional<UUID> previousHolder = players.values().stream()
|
||||
.filter(player -> player.tyrantClass() == tyrantClass)
|
||||
.map(PlayerState::playerId)
|
||||
.filter(playerId -> !playerId.equals(targetId))
|
||||
.findFirst();
|
||||
previousHolder.ifPresent(playerId -> updated.put(
|
||||
playerId,
|
||||
withClass(updated.get(playerId), TyrantClass.NONE)
|
||||
));
|
||||
updated.put(targetId, withClass(updated.get(targetId), tyrantClass));
|
||||
return new ClassAssignmentResult(
|
||||
updated,
|
||||
ClassAssignmentStatus.ASSIGNED,
|
||||
previousHolder
|
||||
);
|
||||
}
|
||||
|
||||
public Map<UUID, PlayerState> clearAll(Map<UUID, PlayerState> players) {
|
||||
Map<UUID, PlayerState> updated = new HashMap<>();
|
||||
for (PlayerState player : players.values()) {
|
||||
updated.put(player.playerId(), withClass(player, TyrantClass.NONE));
|
||||
}
|
||||
return Map.copyOf(updated);
|
||||
}
|
||||
|
||||
private static ClassAssignmentStatus rejection(
|
||||
GameState game,
|
||||
Map<UUID, PlayerState> players,
|
||||
UUID assignerId,
|
||||
UUID targetId,
|
||||
TyrantClass tyrantClass,
|
||||
Instant now
|
||||
) {
|
||||
if (game.lifecycle() != GameLifecycle.RUNNING) {
|
||||
return ClassAssignmentStatus.GAME_NOT_RUNNING;
|
||||
}
|
||||
if (game.tyrantId().isEmpty() || !game.tyrantId().orElseThrow().equals(assignerId)) {
|
||||
return ClassAssignmentStatus.NOT_TYRANT;
|
||||
}
|
||||
if (tyrantClass == null || tyrantClass == TyrantClass.NONE) {
|
||||
return ClassAssignmentStatus.INVALID_CLASS;
|
||||
}
|
||||
if (!game.purchases().contains(unlockFor(tyrantClass))) {
|
||||
return ClassAssignmentStatus.CLASS_NOT_UNLOCKED;
|
||||
}
|
||||
PlayerState target = players.get(targetId);
|
||||
if (target == null) {
|
||||
return ClassAssignmentStatus.UNKNOWN_PLAYER;
|
||||
}
|
||||
if (targetId.equals(assignerId)) {
|
||||
return ClassAssignmentStatus.TARGET_IS_TYRANT;
|
||||
}
|
||||
if (target.optedOutUntil().filter(until -> until.isAfter(now)).isPresent()) {
|
||||
return ClassAssignmentStatus.TARGET_OPTED_OUT;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static TyrantUnlock unlockFor(TyrantClass tyrantClass) {
|
||||
return switch (tyrantClass) {
|
||||
case ASSASSIN -> TyrantUnlock.ASSASSIN;
|
||||
case FIXER -> TyrantUnlock.FIXER;
|
||||
case TAMER -> TyrantUnlock.TAMER;
|
||||
case NONE -> throw new IllegalArgumentException("NONE is not assignable");
|
||||
};
|
||||
}
|
||||
|
||||
private static PlayerState withClass(PlayerState player, TyrantClass tyrantClass) {
|
||||
Map<Ability, Instant> cooldowns = new EnumMap<>(Ability.class);
|
||||
cooldowns.putAll(player.cooldownEnds());
|
||||
Set<Ability> readyItems = EnumSet.noneOf(Ability.class);
|
||||
readyItems.addAll(player.readyAbilityItems());
|
||||
for (Ability ability : abilitiesFor(player.tyrantClass())) {
|
||||
cooldowns.remove(ability);
|
||||
readyItems.remove(ability);
|
||||
}
|
||||
return new PlayerState(
|
||||
player.playerId(),
|
||||
player.latestName(),
|
||||
player.lastLogin(),
|
||||
player.optedOutUntil(),
|
||||
tyrantClass,
|
||||
player.followerOf(),
|
||||
cooldowns,
|
||||
readyItems,
|
||||
player.capturedMobs()
|
||||
);
|
||||
}
|
||||
|
||||
private static Set<Ability> abilitiesFor(TyrantClass tyrantClass) {
|
||||
return switch (tyrantClass) {
|
||||
case ASSASSIN -> Set.of(
|
||||
Ability.ASSASSIN_INVISIBILITY,
|
||||
Ability.ASSASSIN_DOUBLE_JUMP
|
||||
);
|
||||
case FIXER -> Set.of(Ability.FIXER_BOOST);
|
||||
case TAMER -> Set.of(Ability.TAMER_CAPTURE);
|
||||
case NONE -> Set.of();
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
public enum ClassAssignmentStatus {
|
||||
ASSIGNED,
|
||||
GAME_NOT_RUNNING,
|
||||
NOT_TYRANT,
|
||||
CLASS_NOT_UNLOCKED,
|
||||
INVALID_CLASS,
|
||||
UNKNOWN_PLAYER,
|
||||
TARGET_IS_TYRANT,
|
||||
TARGET_OPTED_OUT
|
||||
}
|
||||
@@ -0,0 +1,137 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.util.EnumMap;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
public final class GameLifecycleService {
|
||||
public LifecycleState start(
|
||||
PersistentState state,
|
||||
UUID tyrantId,
|
||||
Optional<UUID> vigilanteId,
|
||||
Instant now
|
||||
) {
|
||||
if (state.game().lifecycle() != GameLifecycle.UNSTARTED) {
|
||||
throw new IllegalStateException("game has already been started");
|
||||
}
|
||||
if (vigilanteId.filter(tyrantId::equals).isPresent()) {
|
||||
throw new IllegalArgumentException("Tyrant and Vigilante must be different players");
|
||||
}
|
||||
GameState game = new GameState(
|
||||
GameLifecycle.RUNNING,
|
||||
Optional.of(tyrantId),
|
||||
vigilanteId,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Duration.ZERO,
|
||||
0,
|
||||
1,
|
||||
Set.of()
|
||||
);
|
||||
return new LifecycleState(game, state.players());
|
||||
}
|
||||
|
||||
public LifecycleState pause(PersistentState state, Instant now) {
|
||||
if (state.game().lifecycle() != GameLifecycle.RUNNING) {
|
||||
throw new IllegalStateException("only a running game can be paused");
|
||||
}
|
||||
GameState current = state.game();
|
||||
GameState paused = new GameState(
|
||||
GameLifecycle.PAUSED,
|
||||
current.tyrantId(),
|
||||
current.vigilanteId(),
|
||||
current.pendingTyrant(),
|
||||
current.pendingVigilante(),
|
||||
Optional.of(now),
|
||||
current.accumulatedPausedTime(),
|
||||
current.tyrantLevel(),
|
||||
current.unspentChoices(),
|
||||
current.purchases()
|
||||
);
|
||||
return new LifecycleState(paused, state.players());
|
||||
}
|
||||
|
||||
public LifecycleState resume(PersistentState state, Instant now) {
|
||||
GameState current = state.game();
|
||||
if (current.lifecycle() != GameLifecycle.PAUSED || current.pausedAt().isEmpty()) {
|
||||
throw new IllegalStateException("only a paused game can be resumed");
|
||||
}
|
||||
Instant pausedAt = current.pausedAt().orElseThrow();
|
||||
Duration pausedFor = Duration.between(pausedAt, now);
|
||||
if (pausedFor.isNegative()) {
|
||||
throw new IllegalArgumentException("resume time must not precede pause time");
|
||||
}
|
||||
GameState resumed = new GameState(
|
||||
GameLifecycle.RUNNING,
|
||||
current.tyrantId(),
|
||||
current.vigilanteId(),
|
||||
shiftSelection(current.pendingTyrant(), pausedFor),
|
||||
shiftSelection(current.pendingVigilante(), pausedFor),
|
||||
Optional.empty(),
|
||||
current.accumulatedPausedTime().plus(pausedFor),
|
||||
current.tyrantLevel(),
|
||||
current.unspentChoices(),
|
||||
current.purchases()
|
||||
);
|
||||
Map<UUID, PlayerState> players = new HashMap<>();
|
||||
for (PlayerState player : state.players().values()) {
|
||||
players.put(player.playerId(), shift(player, pausedFor));
|
||||
}
|
||||
return new LifecycleState(resumed, players);
|
||||
}
|
||||
|
||||
public LifecycleState reset(PersistentState state) {
|
||||
Map<UUID, PlayerState> players = new HashMap<>();
|
||||
for (PlayerState player : state.players().values()) {
|
||||
players.put(player.playerId(), new PlayerState(
|
||||
player.playerId(),
|
||||
player.latestName(),
|
||||
player.lastLogin(),
|
||||
player.optedOutUntil(),
|
||||
TyrantClass.NONE,
|
||||
Optional.empty(),
|
||||
Map.of(),
|
||||
Set.of(),
|
||||
player.capturedMobs()
|
||||
));
|
||||
}
|
||||
return new LifecycleState(GameState.empty(), players);
|
||||
}
|
||||
|
||||
private static Optional<PendingSelection> shiftSelection(
|
||||
Optional<PendingSelection> selection,
|
||||
Duration pausedFor
|
||||
) {
|
||||
return selection.map(value -> new PendingSelection(
|
||||
value.candidateId(), value.expiresAt().plus(pausedFor)
|
||||
));
|
||||
}
|
||||
|
||||
private static PlayerState shift(PlayerState player, Duration pausedFor) {
|
||||
Map<Ability, Instant> cooldowns = new EnumMap<>(Ability.class);
|
||||
player.cooldownEnds().forEach((ability, deadline) ->
|
||||
cooldowns.put(ability, deadline.plus(pausedFor))
|
||||
);
|
||||
return new PlayerState(
|
||||
player.playerId(),
|
||||
player.latestName(),
|
||||
shiftInstant(player.lastLogin(), pausedFor),
|
||||
shiftInstant(player.optedOutUntil(), pausedFor),
|
||||
player.tyrantClass(),
|
||||
player.followerOf(),
|
||||
cooldowns,
|
||||
player.readyAbilityItems(),
|
||||
player.capturedMobs()
|
||||
);
|
||||
}
|
||||
|
||||
private static Optional<Instant> shiftInstant(Optional<Instant> value, Duration duration) {
|
||||
return value.map(instant -> instant.plus(duration));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
public record LifecycleState(GameState game, Map<UUID, PlayerState> players) {
|
||||
public LifecycleState {
|
||||
players = Map.copyOf(players);
|
||||
}
|
||||
|
||||
public PersistentState asPersistentState() {
|
||||
return new PersistentState(game, players);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
public interface ManagedRoleEffects {
|
||||
void suppressAll();
|
||||
|
||||
void restoreAll();
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
public final class NoopManagedRoleEffects implements ManagedRoleEffects {
|
||||
@Override
|
||||
public void suppressAll() {
|
||||
// No managed effects exist until their corresponding abilities are unlocked.
|
||||
}
|
||||
|
||||
@Override
|
||||
public void restoreAll() {
|
||||
// No managed effects exist until their corresponding abilities are unlocked.
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.util.UUID;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
public interface OnlinePlayerDirectory {
|
||||
Player findByName(String name);
|
||||
|
||||
Player findById(UUID playerId);
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.time.Clock;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerJoinEvent;
|
||||
|
||||
public final class PlayerJoinListener implements Listener {
|
||||
private final TyrantStateManager stateManager;
|
||||
private final Clock clock;
|
||||
|
||||
public PlayerJoinListener(TyrantStateManager stateManager, Clock clock) {
|
||||
this.stateManager = stateManager;
|
||||
this.clock = clock;
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onJoin(PlayerJoinEvent event) {
|
||||
PlayerState player = stateManager.updatePlayer(
|
||||
event.getPlayer().getUniqueId(),
|
||||
event.getPlayer().getName(),
|
||||
current -> new PlayerState(
|
||||
current.playerId(), current.latestName(), java.util.Optional.of(clock.instant()),
|
||||
current.optedOutUntil(), current.tyrantClass(), current.followerOf(),
|
||||
current.cooldownEnds(), current.readyAbilityItems(), current.capturedMobs()
|
||||
)
|
||||
);
|
||||
String reminder = ClassAssignmentMessages.loginReminder(player);
|
||||
if (!reminder.isEmpty()) {
|
||||
event.getPlayer().sendMessage(reminder);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.random.RandomGenerator;
|
||||
|
||||
public final class RoleCandidateSelector {
|
||||
public Optional<UUID> select(
|
||||
Map<UUID, PlayerState> players,
|
||||
Set<UUID> excluded,
|
||||
Optional<UUID> previousHolder,
|
||||
Instant now,
|
||||
Duration activityWindow,
|
||||
RandomGenerator random
|
||||
) {
|
||||
Instant cutoff = now.minus(activityWindow);
|
||||
List<UUID> eligible = new ArrayList<>();
|
||||
for (PlayerState player : players.values()) {
|
||||
if (excluded.contains(player.playerId())) {
|
||||
continue;
|
||||
}
|
||||
if (player.lastLogin().isEmpty()
|
||||
|| player.lastLogin().orElseThrow().isBefore(cutoff)) {
|
||||
continue;
|
||||
}
|
||||
if (player.optedOutUntil().filter(deadline -> deadline.isAfter(now)).isPresent()) {
|
||||
continue;
|
||||
}
|
||||
eligible.add(player.playerId());
|
||||
}
|
||||
if (eligible.size() > 1) {
|
||||
previousHolder.ifPresent(eligible::remove);
|
||||
}
|
||||
if (eligible.isEmpty()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
eligible.sort(Comparator.comparing(UUID::toString));
|
||||
return Optional.of(eligible.get(random.nextInt(eligible.size())));
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.time.Clock;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.logging.Level;
|
||||
@@ -28,6 +29,22 @@ public final class SpigotTyrantPlugin extends JavaPlugin {
|
||||
|
||||
Objects.requireNonNull(getCommand("tyrant"), "Missing tyrant command metadata")
|
||||
.setExecutor(new TyrantCommand(stateManager, new TyrantProgressionService()));
|
||||
Objects.requireNonNull(getCommand("tyrantadmin"), "Missing tyrantadmin metadata")
|
||||
.setExecutor(new TyrantAdminCommand(
|
||||
stateManager,
|
||||
new GameLifecycleService(),
|
||||
new BukkitOnlinePlayerDirectory(),
|
||||
new NoopManagedRoleEffects(),
|
||||
Clock.systemUTC(),
|
||||
new RoleCandidateSelector(),
|
||||
settings.candidateActivityWindow(),
|
||||
settings.pendingSelectionTimeout(),
|
||||
java.util.random.RandomGenerator.getDefault()
|
||||
));
|
||||
getServer().getPluginManager().registerEvents(
|
||||
new PlayerJoinListener(stateManager, Clock.systemUTC()),
|
||||
this
|
||||
);
|
||||
getServer().getScheduler().runTaskTimer(this, stateManager::saveIfDirty, 600L, 600L);
|
||||
getLogger().info("Spigot Tyrant enabled.");
|
||||
}
|
||||
|
||||
@@ -0,0 +1,209 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.time.Clock;
|
||||
import java.time.Duration;
|
||||
import java.util.Locale;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.random.RandomGenerator;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
public final class TyrantAdminCommand implements CommandExecutor {
|
||||
private static final String PERMISSION = "spigottyrant.admin";
|
||||
private final TyrantStateManager stateManager;
|
||||
private final GameLifecycleService lifecycle;
|
||||
private final OnlinePlayerDirectory onlinePlayers;
|
||||
private final ManagedRoleEffects effects;
|
||||
private final Clock clock;
|
||||
private final RoleCandidateSelector candidateSelector;
|
||||
private final Duration activityWindow;
|
||||
private final Duration pendingTimeout;
|
||||
private final RandomGenerator random;
|
||||
|
||||
public TyrantAdminCommand(
|
||||
TyrantStateManager stateManager,
|
||||
GameLifecycleService lifecycle,
|
||||
OnlinePlayerDirectory onlinePlayers,
|
||||
ManagedRoleEffects effects,
|
||||
Clock clock
|
||||
) {
|
||||
this(
|
||||
stateManager, lifecycle, onlinePlayers, effects, clock,
|
||||
new RoleCandidateSelector(), Duration.ofHours(24), Duration.ofHours(24),
|
||||
RandomGenerator.getDefault()
|
||||
);
|
||||
}
|
||||
|
||||
public TyrantAdminCommand(
|
||||
TyrantStateManager stateManager,
|
||||
GameLifecycleService lifecycle,
|
||||
OnlinePlayerDirectory onlinePlayers,
|
||||
ManagedRoleEffects effects,
|
||||
Clock clock,
|
||||
RoleCandidateSelector candidateSelector,
|
||||
Duration activityWindow,
|
||||
Duration pendingTimeout,
|
||||
RandomGenerator random
|
||||
) {
|
||||
this.stateManager = stateManager;
|
||||
this.lifecycle = lifecycle;
|
||||
this.onlinePlayers = onlinePlayers;
|
||||
this.effects = effects;
|
||||
this.clock = clock;
|
||||
this.candidateSelector = candidateSelector;
|
||||
this.activityWindow = activityWindow;
|
||||
this.pendingTimeout = pendingTimeout;
|
||||
this.random = random;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCommand(
|
||||
CommandSender sender,
|
||||
Command command,
|
||||
String label,
|
||||
String[] arguments
|
||||
) {
|
||||
if (!sender.hasPermission(PERMISSION)) {
|
||||
sender.sendMessage(ChatColor.RED + "You do not have permission to administer Tyrant.");
|
||||
return true;
|
||||
}
|
||||
if (arguments.length == 0 || arguments[0].equalsIgnoreCase("status")) {
|
||||
showStatus(sender);
|
||||
return true;
|
||||
}
|
||||
try {
|
||||
switch (arguments[0].toLowerCase(Locale.ROOT)) {
|
||||
case "start" -> start(sender, arguments);
|
||||
case "pause" -> pause(sender);
|
||||
case "resume" -> resume(sender);
|
||||
case "reset" -> reset(sender, arguments);
|
||||
default -> usage(sender);
|
||||
}
|
||||
} catch (IllegalArgumentException | IllegalStateException exception) {
|
||||
sender.sendMessage(ChatColor.RED + exception.getMessage());
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private void start(CommandSender sender, String[] arguments) {
|
||||
if (arguments.length < 2 || arguments.length > 3) {
|
||||
sender.sendMessage(ChatColor.YELLOW
|
||||
+ "Usage: /tyrantadmin start <tyrant> [vigilante]");
|
||||
return;
|
||||
}
|
||||
Player tyrant = onlinePlayers.findByName(arguments[1]);
|
||||
if (tyrant == null) {
|
||||
sender.sendMessage(ChatColor.RED + "The initial Tyrant must be online.");
|
||||
return;
|
||||
}
|
||||
Optional<Player> vigilante = Optional.empty();
|
||||
if (arguments.length == 3) {
|
||||
vigilante = Optional.ofNullable(onlinePlayers.findByName(arguments[2]));
|
||||
if (vigilante.isEmpty()) {
|
||||
sender.sendMessage(ChatColor.RED + "The initial Vigilante must be online.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
stateManager.player(tyrant.getUniqueId(), tyrant.getName());
|
||||
vigilante.ifPresent(player -> stateManager.player(player.getUniqueId(), player.getName()));
|
||||
InstantHolder now = new InstantHolder(clock.instant());
|
||||
Optional<UUID> randomCandidate = vigilante.isEmpty()
|
||||
? candidateSelector.select(
|
||||
stateManager.players(), Set.of(tyrant.getUniqueId()), Optional.empty(),
|
||||
now.value(), activityWindow, random
|
||||
)
|
||||
: Optional.empty();
|
||||
Optional<UUID> activeVigilante = vigilante.map(Player::getUniqueId);
|
||||
if (activeVigilante.isEmpty() && randomCandidate.isPresent()
|
||||
&& onlinePlayers.findById(randomCandidate.orElseThrow()) != null) {
|
||||
activeVigilante = randomCandidate;
|
||||
}
|
||||
LifecycleState started = lifecycle.start(
|
||||
stateManager.snapshot(), tyrant.getUniqueId(), activeVigilante, now.value()
|
||||
);
|
||||
if (activeVigilante.isEmpty() && randomCandidate.isPresent()) {
|
||||
GameState game = started.game();
|
||||
started = new LifecycleState(new GameState(
|
||||
game.lifecycle(), game.tyrantId(), game.vigilanteId(), game.pendingTyrant(),
|
||||
Optional.of(new PendingSelection(
|
||||
randomCandidate.orElseThrow(), now.value().plus(pendingTimeout)
|
||||
)),
|
||||
game.pausedAt(), game.accumulatedPausedTime(), game.tyrantLevel(),
|
||||
game.unspentChoices(), game.purchases()
|
||||
), started.players());
|
||||
}
|
||||
stateManager.replaceState(started);
|
||||
stateManager.saveIfDirty();
|
||||
effects.restoreAll();
|
||||
sender.sendMessage(ChatColor.GREEN + "Tyrant game started.");
|
||||
if (vigilante.isEmpty()) {
|
||||
sender.sendMessage(ChatColor.YELLOW
|
||||
+ "An eligible recently active Vigilante will be selected automatically.");
|
||||
}
|
||||
}
|
||||
|
||||
private void pause(CommandSender sender) {
|
||||
LifecycleState paused = lifecycle.pause(stateManager.snapshot(), clock.instant());
|
||||
stateManager.replaceState(paused);
|
||||
stateManager.saveIfDirty();
|
||||
effects.suppressAll();
|
||||
sender.sendMessage(ChatColor.GREEN + "Tyrant game paused.");
|
||||
}
|
||||
|
||||
private void resume(CommandSender sender) {
|
||||
LifecycleState resumed = lifecycle.resume(stateManager.snapshot(), clock.instant());
|
||||
stateManager.replaceState(resumed);
|
||||
stateManager.saveIfDirty();
|
||||
effects.restoreAll();
|
||||
sender.sendMessage(ChatColor.GREEN + "Tyrant game resumed.");
|
||||
}
|
||||
|
||||
private void reset(CommandSender sender, String[] arguments) {
|
||||
if (arguments.length != 2 || !arguments[1].equalsIgnoreCase("confirm")) {
|
||||
sender.sendMessage(ChatColor.RED
|
||||
+ "This clears the game. Use /tyrantadmin reset confirm.");
|
||||
return;
|
||||
}
|
||||
stateManager.replaceState(lifecycle.reset(stateManager.snapshot()));
|
||||
stateManager.saveIfDirty();
|
||||
effects.suppressAll();
|
||||
sender.sendMessage(ChatColor.GREEN + "Tyrant game reset.");
|
||||
}
|
||||
|
||||
private void showStatus(CommandSender sender) {
|
||||
GameState game = stateManager.game();
|
||||
sender.sendMessage(ChatColor.GOLD + "Lifecycle: " + game.lifecycle());
|
||||
sender.sendMessage("Tyrant: " + game.tyrantId().map(Object::toString).orElse("none"));
|
||||
sender.sendMessage("Vigilante: "
|
||||
+ game.vigilanteId().map(Object::toString).orElse("none"));
|
||||
sender.sendMessage("Level: " + game.tyrantLevel()
|
||||
+ ", choices: " + game.unspentChoices()
|
||||
+ ", purchases: " + game.purchases());
|
||||
sender.sendMessage("Pending Tyrant: " + game.pendingTyrant());
|
||||
sender.sendMessage("Pending Vigilante: " + game.pendingVigilante());
|
||||
for (PlayerState player : stateManager.players().values()) {
|
||||
boolean optedOut = player.optedOutUntil()
|
||||
.filter(deadline -> deadline.isAfter(clock.instant()))
|
||||
.isPresent();
|
||||
sender.sendMessage(
|
||||
player.latestName() + " (" + player.playerId() + "): class="
|
||||
+ player.tyrantClass() + ", followerOf="
|
||||
+ player.followerOf().map(Object::toString).orElse("none")
|
||||
+ ", optedOut=" + optedOut + ", cooldowns=" + player.cooldownEnds()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private record InstantHolder(java.time.Instant value) {
|
||||
}
|
||||
|
||||
private static void usage(CommandSender sender) {
|
||||
sender.sendMessage(ChatColor.YELLOW
|
||||
+ "Usage: /tyrantadmin <status|start|pause|resume|reset confirm>");
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.time.Clock;
|
||||
import java.util.Locale;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
@@ -10,13 +11,35 @@ import org.bukkit.entity.Player;
|
||||
public final class TyrantCommand implements CommandExecutor {
|
||||
private final TyrantStateManager stateManager;
|
||||
private final TyrantProgressionService progression;
|
||||
private final ClassAssignmentService assignments;
|
||||
private final OnlinePlayerDirectory onlinePlayers;
|
||||
private final Clock clock;
|
||||
|
||||
public TyrantCommand(
|
||||
TyrantStateManager stateManager,
|
||||
TyrantProgressionService progression
|
||||
) {
|
||||
this(
|
||||
stateManager,
|
||||
progression,
|
||||
new ClassAssignmentService(),
|
||||
new BukkitOnlinePlayerDirectory(),
|
||||
Clock.systemUTC()
|
||||
);
|
||||
}
|
||||
|
||||
TyrantCommand(
|
||||
TyrantStateManager stateManager,
|
||||
TyrantProgressionService progression,
|
||||
ClassAssignmentService assignments,
|
||||
OnlinePlayerDirectory onlinePlayers,
|
||||
Clock clock
|
||||
) {
|
||||
this.stateManager = stateManager;
|
||||
this.progression = progression;
|
||||
this.assignments = assignments;
|
||||
this.onlinePlayers = onlinePlayers;
|
||||
this.clock = clock;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -38,7 +61,15 @@ public final class TyrantCommand implements CommandExecutor {
|
||||
buy(player, arguments[1]);
|
||||
return true;
|
||||
}
|
||||
player.sendMessage(ChatColor.YELLOW + "Usage: /tyrant choices | /tyrant buy <unlock>");
|
||||
if (arguments.length == 3 && arguments[0].equalsIgnoreCase("assign")) {
|
||||
assign(player, arguments[1], arguments[2]);
|
||||
return true;
|
||||
}
|
||||
player.sendMessage(
|
||||
ChatColor.YELLOW
|
||||
+ "Usage: /tyrant choices | /tyrant buy <unlock> | "
|
||||
+ "/tyrant assign <class> <player>"
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -79,8 +110,53 @@ public final class TyrantCommand implements CommandExecutor {
|
||||
} else {
|
||||
player.sendMessage(
|
||||
ChatColor.RED + "Could not purchase " + unlock.name() + ": "
|
||||
+ result[0].status().name().toLowerCase(Locale.ROOT).replace('_', ' ')
|
||||
+ readable(result[0].status())
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private void assign(Player tyrant, String requestedClass, String targetName) {
|
||||
TyrantClass tyrantClass;
|
||||
try {
|
||||
tyrantClass = TyrantClass.valueOf(requestedClass.toUpperCase(Locale.ROOT));
|
||||
} catch (IllegalArgumentException exception) {
|
||||
tyrant.sendMessage(ChatColor.RED + "Unknown class. Use assassin, fixer, or tamer.");
|
||||
return;
|
||||
}
|
||||
Player target = onlinePlayers.findByName(targetName);
|
||||
if (target == null) {
|
||||
tyrant.sendMessage(ChatColor.RED + "That player must be online.");
|
||||
return;
|
||||
}
|
||||
stateManager.player(target.getUniqueId(), target.getName());
|
||||
ClassAssignmentResult result = assignments.assign(
|
||||
stateManager.game(),
|
||||
stateManager.players(),
|
||||
tyrant.getUniqueId(),
|
||||
target.getUniqueId(),
|
||||
tyrantClass,
|
||||
clock.instant()
|
||||
);
|
||||
if (result.status() != ClassAssignmentStatus.ASSIGNED) {
|
||||
tyrant.sendMessage(
|
||||
ChatColor.RED + "Could not assign " + tyrantClass.name() + ": "
|
||||
+ readable(result.status())
|
||||
);
|
||||
return;
|
||||
}
|
||||
stateManager.replacePlayers(result.players());
|
||||
stateManager.saveIfDirty();
|
||||
result.previousHolderId().map(onlinePlayers::findById).ifPresent(previous ->
|
||||
previous.sendMessage(ChatColor.YELLOW + "You are no longer the "
|
||||
+ tyrantClass.name() + ".")
|
||||
);
|
||||
target.sendMessage(ChatColor.GREEN + "You are now the " + tyrantClass.name() + ".");
|
||||
tyrant.sendMessage(
|
||||
ChatColor.GREEN + "Assigned " + tyrantClass.name() + " to " + target.getName() + "."
|
||||
);
|
||||
}
|
||||
|
||||
private static String readable(Enum<?> status) {
|
||||
return status.name().toLowerCase(Locale.ROOT).replace('_', ' ');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,12 +64,29 @@ public final class TyrantStateManager {
|
||||
return changed;
|
||||
}
|
||||
|
||||
public void replacePlayers(Map<UUID, PlayerState> replacement) {
|
||||
players.clear();
|
||||
players.putAll(replacement);
|
||||
dirty = true;
|
||||
}
|
||||
|
||||
public GameState updateGame(UnaryOperator<GameState> update) {
|
||||
game = update.apply(game);
|
||||
dirty = true;
|
||||
return game;
|
||||
}
|
||||
|
||||
public void replaceState(LifecycleState replacement) {
|
||||
game = replacement.game();
|
||||
players.clear();
|
||||
players.putAll(replacement.players());
|
||||
dirty = true;
|
||||
}
|
||||
|
||||
public PersistentState snapshot() {
|
||||
return new PersistentState(game, players);
|
||||
}
|
||||
|
||||
public boolean saveIfDirty() {
|
||||
if (!dirty) {
|
||||
return true;
|
||||
|
||||
@@ -7,4 +7,12 @@ author: dmg.games
|
||||
commands:
|
||||
tyrant:
|
||||
description: View and use Spigot Tyrant game features.
|
||||
usage: /tyrant [choices|buy <unlock>]
|
||||
usage: /tyrant [choices|buy <unlock>|assign <class> <player>]
|
||||
tyrantadmin:
|
||||
description: Administer the Spigot Tyrant game.
|
||||
usage: /tyrantadmin <status|start|pause|resume|reset confirm>
|
||||
permission: spigottyrant.admin
|
||||
permissions:
|
||||
spigottyrant.admin:
|
||||
description: Allows administration of Spigot Tyrant.
|
||||
default: op
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
import java.util.UUID;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
final class ClassAssignmentMessagesTest {
|
||||
@Test
|
||||
void loginReminderNamesClassAndControls() {
|
||||
PlayerState assassin = new PlayerState(
|
||||
UUID.fromString("11111111-1111-1111-1111-111111111111"),
|
||||
"Player",
|
||||
java.util.Optional.empty(),
|
||||
java.util.Optional.empty(),
|
||||
TyrantClass.ASSASSIN,
|
||||
java.util.Optional.empty(),
|
||||
java.util.Map.of(),
|
||||
java.util.Set.of(),
|
||||
java.util.List.of()
|
||||
);
|
||||
|
||||
assertEquals(
|
||||
"Class: ASSASSIN. Use your Assassin Cloak; double-jump while airborne. "
|
||||
+ "Use /tyrant item to recover ready class items.",
|
||||
ClassAssignmentMessages.loginReminder(assassin)
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,127 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
final class ClassAssignmentServiceTest {
|
||||
private static final UUID TYRANT = UUID.fromString("11111111-1111-1111-1111-111111111111");
|
||||
private static final UUID VIGILANTE = UUID.fromString("22222222-2222-2222-2222-222222222222");
|
||||
private static final UUID FOLLOWER = UUID.fromString("33333333-3333-3333-3333-333333333333");
|
||||
private static final Instant NOW = Instant.parse("2026-08-14T12:00:00Z");
|
||||
private final ClassAssignmentService service = new ClassAssignmentService();
|
||||
|
||||
@Test
|
||||
void purchasedClassCanBeAssignedToVigilanteOrFollower() {
|
||||
GameState game = gameWith(TyrantUnlock.ASSASSIN);
|
||||
PlayerState vigilante = PlayerState.newPlayer(VIGILANTE, "Vigilante");
|
||||
PlayerState follower = withFollower(
|
||||
PlayerState.newPlayer(FOLLOWER, "Follower"),
|
||||
VIGILANTE
|
||||
);
|
||||
|
||||
ClassAssignmentResult vigilanteResult = service.assign(
|
||||
game,
|
||||
Map.of(VIGILANTE, vigilante, FOLLOWER, follower),
|
||||
TYRANT,
|
||||
VIGILANTE,
|
||||
TyrantClass.ASSASSIN,
|
||||
NOW
|
||||
);
|
||||
ClassAssignmentResult followerResult = service.assign(
|
||||
game,
|
||||
vigilanteResult.players(),
|
||||
TYRANT,
|
||||
FOLLOWER,
|
||||
TyrantClass.ASSASSIN,
|
||||
NOW
|
||||
);
|
||||
|
||||
assertEquals(ClassAssignmentStatus.ASSIGNED, vigilanteResult.status());
|
||||
assertEquals(TyrantClass.ASSASSIN,
|
||||
vigilanteResult.players().get(VIGILANTE).tyrantClass());
|
||||
assertEquals(ClassAssignmentStatus.ASSIGNED, followerResult.status());
|
||||
assertEquals(TyrantClass.NONE,
|
||||
followerResult.players().get(VIGILANTE).tyrantClass());
|
||||
assertEquals(TyrantClass.ASSASSIN,
|
||||
followerResult.players().get(FOLLOWER).tyrantClass());
|
||||
assertEquals(Optional.of(VIGILANTE), followerResult.previousHolderId());
|
||||
}
|
||||
|
||||
@Test
|
||||
void rejectsLockedSelfAndOptedOutAssignments() {
|
||||
PlayerState target = PlayerState.newPlayer(FOLLOWER, "Target");
|
||||
PlayerState optedOut = new PlayerState(
|
||||
target.playerId(), target.latestName(), target.lastLogin(),
|
||||
Optional.of(NOW.plusSeconds(60)), target.tyrantClass(), target.followerOf(),
|
||||
target.cooldownEnds(), target.readyAbilityItems(), target.capturedMobs()
|
||||
);
|
||||
|
||||
assertEquals(ClassAssignmentStatus.CLASS_NOT_UNLOCKED, service.assign(
|
||||
gameWith(TyrantUnlock.FIXER), Map.of(FOLLOWER, target), TYRANT, FOLLOWER,
|
||||
TyrantClass.ASSASSIN, NOW
|
||||
).status());
|
||||
assertEquals(ClassAssignmentStatus.TARGET_IS_TYRANT, service.assign(
|
||||
gameWith(TyrantUnlock.ASSASSIN), Map.of(TYRANT,
|
||||
PlayerState.newPlayer(TYRANT, "Tyrant")), TYRANT, TYRANT,
|
||||
TyrantClass.ASSASSIN, NOW
|
||||
).status());
|
||||
assertEquals(ClassAssignmentStatus.TARGET_OPTED_OUT, service.assign(
|
||||
gameWith(TyrantUnlock.ASSASSIN), Map.of(FOLLOWER, optedOut), TYRANT,
|
||||
FOLLOWER, TyrantClass.ASSASSIN, NOW
|
||||
).status());
|
||||
}
|
||||
|
||||
@Test
|
||||
void reassignmentAndReignEndClearClassAbilityState() {
|
||||
Instant cooldown = NOW.plusSeconds(3600);
|
||||
PlayerState holder = new PlayerState(
|
||||
VIGILANTE, "Holder", Optional.empty(), Optional.empty(),
|
||||
TyrantClass.ASSASSIN, Optional.empty(),
|
||||
Map.of(Ability.ASSASSIN_INVISIBILITY, cooldown),
|
||||
Set.of(Ability.ASSASSIN_INVISIBILITY), java.util.List.of()
|
||||
);
|
||||
PlayerState replacement = PlayerState.newPlayer(FOLLOWER, "Replacement");
|
||||
|
||||
ClassAssignmentResult reassigned = service.assign(
|
||||
gameWith(TyrantUnlock.ASSASSIN),
|
||||
Map.of(VIGILANTE, holder, FOLLOWER, replacement),
|
||||
TYRANT, FOLLOWER, TyrantClass.ASSASSIN, NOW
|
||||
);
|
||||
PlayerState former = reassigned.players().get(VIGILANTE);
|
||||
Map<UUID, PlayerState> cleared = service.clearAll(reassigned.players());
|
||||
|
||||
assertEquals(Map.of(), former.cooldownEnds());
|
||||
assertEquals(Set.of(), former.readyAbilityItems());
|
||||
assertEquals(TyrantClass.NONE, cleared.get(FOLLOWER).tyrantClass());
|
||||
}
|
||||
|
||||
private static GameState gameWith(TyrantUnlock unlock) {
|
||||
return new GameState(
|
||||
GameLifecycle.RUNNING,
|
||||
Optional.of(TYRANT),
|
||||
Optional.of(VIGILANTE),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Duration.ZERO,
|
||||
1,
|
||||
0,
|
||||
Set.of(unlock)
|
||||
);
|
||||
}
|
||||
|
||||
private static PlayerState withFollower(PlayerState player, UUID vigilanteId) {
|
||||
return new PlayerState(
|
||||
player.playerId(), player.latestName(), player.lastLogin(), player.optedOutUntil(),
|
||||
player.tyrantClass(), Optional.of(vigilanteId), player.cooldownEnds(),
|
||||
player.readyAbilityItems(), player.capturedMobs()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
final class GameLifecycleServiceTest {
|
||||
private static final UUID TYRANT = UUID.fromString("11111111-1111-1111-1111-111111111111");
|
||||
private static final UUID VIGILANTE = UUID.fromString("22222222-2222-2222-2222-222222222222");
|
||||
private static final Instant START = Instant.parse("2026-08-14T12:00:00Z");
|
||||
private final GameLifecycleService service = new GameLifecycleService();
|
||||
|
||||
@Test
|
||||
void startsFirstGameWithInitialRolesAndChoice() {
|
||||
LifecycleState started = service.start(
|
||||
PersistentState.empty(), TYRANT, Optional.of(VIGILANTE), START
|
||||
);
|
||||
|
||||
assertEquals(GameLifecycle.RUNNING, started.game().lifecycle());
|
||||
assertEquals(Optional.of(TYRANT), started.game().tyrantId());
|
||||
assertEquals(Optional.of(VIGILANTE), started.game().vigilanteId());
|
||||
assertEquals(1, started.game().unspentChoices());
|
||||
}
|
||||
|
||||
@Test
|
||||
void pauseAndResumePreserveStateAndShiftEveryElapsedDeadline() {
|
||||
Instant cooldown = START.plusSeconds(600);
|
||||
PlayerState player = new PlayerState(
|
||||
TYRANT, "Tyrant", Optional.of(START.minusSeconds(60)),
|
||||
Optional.of(START.plusSeconds(1200)), TyrantClass.ASSASSIN,
|
||||
Optional.empty(), Map.of(Ability.ASSASSIN_INVISIBILITY, cooldown),
|
||||
Set.of(), java.util.List.of()
|
||||
);
|
||||
GameState running = new GameState(
|
||||
GameLifecycle.RUNNING, Optional.of(TYRANT), Optional.of(VIGILANTE),
|
||||
Optional.empty(), Optional.of(new PendingSelection(VIGILANTE, cooldown)),
|
||||
Optional.empty(), Duration.ofMinutes(2), 2, 1,
|
||||
Set.of(TyrantUnlock.ASSASSIN)
|
||||
);
|
||||
LifecycleState paused = service.pause(
|
||||
new PersistentState(running, Map.of(TYRANT, player)), START
|
||||
);
|
||||
Instant resumedAt = START.plusSeconds(300);
|
||||
|
||||
LifecycleState resumed = service.resume(paused.asPersistentState(), resumedAt);
|
||||
|
||||
assertEquals(GameLifecycle.RUNNING, resumed.game().lifecycle());
|
||||
assertEquals(Duration.ofMinutes(7), resumed.game().accumulatedPausedTime());
|
||||
assertEquals(cooldown.plusSeconds(300),
|
||||
resumed.game().pendingVigilante().orElseThrow().expiresAt());
|
||||
PlayerState shifted = resumed.players().get(TYRANT);
|
||||
assertEquals(cooldown.plusSeconds(300),
|
||||
shifted.cooldownEnds().get(Ability.ASSASSIN_INVISIBILITY));
|
||||
assertEquals(START.plusSeconds(1500), shifted.optedOutUntil().orElseThrow());
|
||||
assertEquals(START.plusSeconds(240), shifted.lastLogin().orElseThrow());
|
||||
assertTrue(shifted.tyrantClass() == TyrantClass.ASSASSIN);
|
||||
}
|
||||
}
|
||||
@@ -23,6 +23,11 @@ final class PluginMetadataTest {
|
||||
Map<?, ?> commands = (Map<?, ?>) plugin.get("commands");
|
||||
assertNotNull(commands);
|
||||
assertNotNull(commands.get("tyrant"));
|
||||
assertNotNull(commands.get("tyrantadmin"));
|
||||
Map<?, ?> permissions = (Map<?, ?>) plugin.get("permissions");
|
||||
assertNotNull(permissions);
|
||||
Map<?, ?> admin = (Map<?, ?>) permissions.get("spigottyrant.admin");
|
||||
assertEquals("op", admin.get("default"));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.random.RandomGenerator;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
final class RoleCandidateSelectorTest {
|
||||
@Test
|
||||
void selectsOnlyRecentlyActiveEligibleNonExcludedPlayer() {
|
||||
Instant now = Instant.parse("2026-08-14T12:00:00Z");
|
||||
UUID tyrant = UUID.fromString("11111111-1111-1111-1111-111111111111");
|
||||
UUID candidate = UUID.fromString("22222222-2222-2222-2222-222222222222");
|
||||
UUID stale = UUID.fromString("33333333-3333-3333-3333-333333333333");
|
||||
Map<UUID, PlayerState> players = Map.of(
|
||||
tyrant, withLogin(PlayerState.newPlayer(tyrant, "Tyrant"), now),
|
||||
candidate, withLogin(PlayerState.newPlayer(candidate, "Candidate"), now.minusSeconds(60)),
|
||||
stale, withLogin(PlayerState.newPlayer(stale, "Stale"), now.minus(Duration.ofHours(25)))
|
||||
);
|
||||
|
||||
Optional<UUID> selected = new RoleCandidateSelector().select(
|
||||
players,
|
||||
Set.of(tyrant),
|
||||
Optional.empty(),
|
||||
now,
|
||||
Duration.ofHours(24),
|
||||
RandomGenerator.of("L64X128MixRandom")
|
||||
);
|
||||
|
||||
assertEquals(Optional.of(candidate), selected);
|
||||
}
|
||||
|
||||
private static PlayerState withLogin(PlayerState player, Instant login) {
|
||||
return new PlayerState(
|
||||
player.playerId(), player.latestName(), Optional.of(login), player.optedOutUntil(),
|
||||
player.tyrantClass(), player.followerOf(), player.cooldownEnds(),
|
||||
player.readyAbilityItems(), player.capturedMobs()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.contains;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import java.time.Clock;
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.time.ZoneOffset;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
final class TyrantAdminCommandTest {
|
||||
@Test
|
||||
void rejectsSenderWithoutAdminPermission() {
|
||||
TyrantStateManager manager = mock(TyrantStateManager.class);
|
||||
CommandSender sender = mock(CommandSender.class);
|
||||
when(sender.hasPermission("spigottyrant.admin")).thenReturn(false);
|
||||
TyrantAdminCommand command = command(manager, mock(ManagedRoleEffects.class));
|
||||
|
||||
command.onCommand(sender, mock(Command.class), "tyrantadmin", new String[] {"pause"});
|
||||
|
||||
verify(sender).sendMessage(contains("permission"));
|
||||
verify(manager, never()).replaceState(org.mockito.ArgumentMatchers.any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void pausePreservesStateAndSuppressesManagedEffects() {
|
||||
UUID tyrant = UUID.fromString("11111111-1111-1111-1111-111111111111");
|
||||
GameState game = new GameState(
|
||||
GameLifecycle.RUNNING, Optional.of(tyrant), Optional.empty(),
|
||||
Optional.empty(), Optional.empty(), Optional.empty(), Duration.ZERO,
|
||||
2, 1, Set.of(TyrantUnlock.STRENGTH)
|
||||
);
|
||||
PersistentState snapshot = new PersistentState(
|
||||
game, Map.of(tyrant, PlayerState.newPlayer(tyrant, "Tyrant"))
|
||||
);
|
||||
TyrantStateManager manager = mock(TyrantStateManager.class);
|
||||
when(manager.snapshot()).thenReturn(snapshot);
|
||||
ManagedRoleEffects effects = mock(ManagedRoleEffects.class);
|
||||
CommandSender sender = mock(CommandSender.class);
|
||||
when(sender.hasPermission("spigottyrant.admin")).thenReturn(true);
|
||||
TyrantAdminCommand command = command(manager, effects);
|
||||
|
||||
command.onCommand(sender, mock(Command.class), "tyrantadmin", new String[] {"pause"});
|
||||
|
||||
verify(manager).replaceState(org.mockito.ArgumentMatchers.argThat(
|
||||
state -> state.game().lifecycle() == GameLifecycle.PAUSED
|
||||
&& state.game().tyrantLevel() == 2
|
||||
));
|
||||
verify(effects).suppressAll();
|
||||
}
|
||||
|
||||
@Test
|
||||
void resetRequiresExplicitConfirmation() {
|
||||
TyrantStateManager manager = mock(TyrantStateManager.class);
|
||||
CommandSender sender = mock(CommandSender.class);
|
||||
when(sender.hasPermission("spigottyrant.admin")).thenReturn(true);
|
||||
TyrantAdminCommand command = command(manager, mock(ManagedRoleEffects.class));
|
||||
|
||||
command.onCommand(sender, mock(Command.class), "tyrantadmin", new String[] {"reset"});
|
||||
|
||||
verify(sender).sendMessage(contains("reset confirm"));
|
||||
verify(manager, never()).replaceState(org.mockito.ArgumentMatchers.any());
|
||||
}
|
||||
|
||||
private static TyrantAdminCommand command(
|
||||
TyrantStateManager manager,
|
||||
ManagedRoleEffects effects
|
||||
) {
|
||||
return new TyrantAdminCommand(
|
||||
manager,
|
||||
new GameLifecycleService(),
|
||||
mock(OnlinePlayerDirectory.class),
|
||||
effects,
|
||||
Clock.fixed(Instant.parse("2026-08-14T12:00:00Z"), ZoneOffset.UTC)
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -2,10 +2,14 @@ package games.dmg.spigottyrant;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import java.time.Clock;
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.time.ZoneOffset;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
@@ -47,4 +51,45 @@ final class TyrantCommandTest {
|
||||
assertTrue(all.stream().anyMatch(message -> message.contains("AVAILABLE")
|
||||
&& message.contains("ASSASSIN")));
|
||||
}
|
||||
|
||||
@Test
|
||||
void assigningClassNotifiesTyrantAndNewHolder() {
|
||||
UUID tyrantId = UUID.fromString("11111111-1111-1111-1111-111111111111");
|
||||
UUID targetId = UUID.fromString("22222222-2222-2222-2222-222222222222");
|
||||
GameState game = new GameState(
|
||||
GameLifecycle.RUNNING, Optional.of(tyrantId), Optional.empty(),
|
||||
Optional.empty(), Optional.empty(), Optional.empty(), Duration.ZERO,
|
||||
0, 0, Set.of(TyrantUnlock.FIXER)
|
||||
);
|
||||
PlayerState targetState = PlayerState.newPlayer(targetId, "Target");
|
||||
TyrantStateManager manager = mock(TyrantStateManager.class);
|
||||
when(manager.game()).thenReturn(game);
|
||||
when(manager.player(targetId, "Target")).thenReturn(targetState);
|
||||
when(manager.players()).thenReturn(java.util.Map.of(targetId, targetState));
|
||||
Player tyrant = mock(Player.class);
|
||||
when(tyrant.getUniqueId()).thenReturn(tyrantId);
|
||||
Player target = mock(Player.class);
|
||||
when(target.getUniqueId()).thenReturn(targetId);
|
||||
when(target.getName()).thenReturn("Target");
|
||||
OnlinePlayerDirectory directory = mock(OnlinePlayerDirectory.class);
|
||||
when(directory.findByName("Target")).thenReturn(target);
|
||||
TyrantCommand command = new TyrantCommand(
|
||||
manager,
|
||||
new TyrantProgressionService(),
|
||||
new ClassAssignmentService(),
|
||||
directory,
|
||||
Clock.fixed(Instant.parse("2026-08-14T12:00:00Z"), ZoneOffset.UTC)
|
||||
);
|
||||
|
||||
command.onCommand(
|
||||
tyrant,
|
||||
mock(Command.class),
|
||||
"tyrant",
|
||||
new String[] {"assign", "fixer", "Target"}
|
||||
);
|
||||
|
||||
verify(manager).replacePlayers(any());
|
||||
verify(target).sendMessage(org.mockito.ArgumentMatchers.contains("now the FIXER"));
|
||||
verify(tyrant).sendMessage(org.mockito.ArgumentMatchers.contains("Assigned FIXER"));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user