Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a195658be4 | ||
|
|
ddd256802b |
@@ -6,6 +6,28 @@ description: Chronological record of material decisions affecting the Spigot Tyr
|
|||||||
|
|
||||||
# Spigot Tyrant Design Log
|
# Spigot Tyrant Design Log
|
||||||
|
|
||||||
|
## 2026-08-14 — Role maintenance completed
|
||||||
|
|
||||||
|
- Completed US-010 with configurable periodic role maintenance, exact 48-hour inactivity handling, and 24-hour recently-active candidate filtering.
|
||||||
|
- Added online confirmation for pending roles, 24-hour expiry and reroll, former-holder fallback rules, vacant-role retries, opt-out filtering, and Tyrant/Vigilante conflict prevention.
|
||||||
|
- Tyrant inactivity uses full reign succession cleanup; Vigilante inactivity clears only that role's Followers before replacement.
|
||||||
|
- Verified confirmation, expiry reroll, Follower cleanup, exact inactivity boundary, full Tyrant succession, and pause-safe scheduler integration with the Gradle suite.
|
||||||
|
|
||||||
|
## 2026-08-14 — Role maintenance implementation started
|
||||||
|
|
||||||
|
- US-010 begins with test-first inactivity replacement, pending confirmation and expiry, conflict-safe candidate retries, and pause awareness.
|
||||||
|
|
||||||
|
## 2026-08-14 — Tyrant succession completed
|
||||||
|
|
||||||
|
- Completed US-002 with player-killer transfer, recent-player environmental succession, former-holder avoidance, pending offline confirmation, and distinct replacement Vigilante selection.
|
||||||
|
- Tyrant death clears all classes, Followers, cooldowns, item readiness, purchases, levels, and choices before granting the successor one starting choice.
|
||||||
|
- Added death-event integration, server announcements, and a scoreboard-team-backed red Tyrant name and glowing outline that is restored on login and removed on pause or shutdown.
|
||||||
|
- Verified succession attribution, random exclusion, reign cleanup, role separation, death integration, and red presentation with the Gradle suite.
|
||||||
|
|
||||||
|
## 2026-08-14 — Tyrant succession implementation started
|
||||||
|
|
||||||
|
- US-002 begins with test-first killer and environmental succession, reign-wide cleanup, replacement Vigilante selection, and red Tyrant presentation.
|
||||||
|
|
||||||
## 2026-08-14 — Administrative lifecycle completed
|
## 2026-08-14 — Administrative lifecycle completed
|
||||||
|
|
||||||
- Completed US-001 with permission-gated `/tyrantadmin` start, status, pause, resume, and confirmed reset operations.
|
- Completed US-001 with permission-gated `/tyrantadmin` start, status, pause, resume, and confirmed reset operations.
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
type: User Story
|
type: User Story
|
||||||
title: "US-002: Transfer and reset the Tyrant role"
|
title: "US-002: Transfer and reset the Tyrant role"
|
||||||
description: End a Tyrant's reign cleanly and establish a valid successor after death.
|
description: End a Tyrant's reign cleanly and establish a valid successor after death.
|
||||||
status: backlog
|
status: done
|
||||||
---
|
---
|
||||||
|
|
||||||
# US-002: Transfer and reset the Tyrant role
|
# US-002: Transfer and reset the Tyrant role
|
||||||
@@ -11,15 +11,15 @@ As a **player**, I want defeating the Tyrant to transfer power predictably so th
|
|||||||
|
|
||||||
## Acceptance criteria
|
## Acceptance criteria
|
||||||
|
|
||||||
- [ ] A player directly credited with killing the Tyrant becomes the new Tyrant.
|
- [x] A player directly credited with killing the Tyrant becomes the new Tyrant.
|
||||||
- [ ] A Tyrant death without a player killer selects an eligible opted-in player active within the preceding 24 hours at random.
|
- [x] A Tyrant death without a player killer selects an eligible opted-in player active within the preceding 24 hours at random.
|
||||||
- [ ] The former Tyrant is excluded from random succession when another eligible candidate exists.
|
- [x] The former Tyrant is excluded from random succession when another eligible candidate exists.
|
||||||
- [ ] The former Tyrant's level, unlocks, unspent choices, and Tyrant ability cooldowns reset when the reign ends.
|
- [x] The former Tyrant's level, unlocks, unspent choices, and Tyrant ability cooldowns reset when the reign ends.
|
||||||
- [ ] Every Assassin, Fixer, Tamer, Vigilante, and Follower assignment is cleared when the Tyrant dies.
|
- [x] Every Assassin, Fixer, Tamer, Vigilante, and Follower assignment is cleared when the Tyrant dies.
|
||||||
- [ ] A new Vigilante is selected under the normal candidate rules after succession.
|
- [x] A new Vigilante is selected under the normal candidate rules after succession.
|
||||||
- [ ] The new Tyrant receives exactly one starting unlock choice.
|
- [x] The new Tyrant receives exactly one starting unlock choice.
|
||||||
- [ ] The Tyrant's displayed name is red and the Tyrant has a red glowing outline while the game is running.
|
- [x] The Tyrant's displayed name is red and the Tyrant has a red glowing outline while the game is running.
|
||||||
- [ ] Succession cannot assign the same player as both Tyrant and Vigilante.
|
- [x] Succession cannot assign the same player as both Tyrant and Vigilante.
|
||||||
|
|
||||||
## Related
|
## Related
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
type: User Story
|
type: User Story
|
||||||
title: "US-010: Handle inactivity and pending selections"
|
title: "US-010: Handle inactivity and pending selections"
|
||||||
description: Replace absent or unconfirmed role holders using recently active eligible players.
|
description: Replace absent or unconfirmed role holders using recently active eligible players.
|
||||||
status: backlog
|
status: done
|
||||||
---
|
---
|
||||||
|
|
||||||
# US-010: Handle inactivity and pending selections
|
# US-010: Handle inactivity and pending selections
|
||||||
@@ -11,16 +11,16 @@ As a **participant**, I want inactive central roles to be replaced fairly so tha
|
|||||||
|
|
||||||
## Acceptance criteria
|
## Acceptance criteria
|
||||||
|
|
||||||
- [ ] A Tyrant or Vigilante who has not logged in for 48 unpaused hours loses the position.
|
- [x] A Tyrant or Vigilante who has not logged in for 48 unpaused hours loses the position.
|
||||||
- [ ] Random candidates are drawn from eligible opted-in players who logged in during the preceding 24 hours.
|
- [x] Random candidates are drawn from eligible opted-in players who logged in during the preceding 24 hours.
|
||||||
- [ ] The Tyrant is always excluded from Vigilante selection.
|
- [x] The Tyrant is always excluded from Vigilante selection.
|
||||||
- [ ] A previous role holder is excluded when another eligible candidate exists and may be reused only as a fallback.
|
- [x] A previous role holder is excluded when another eligible candidate exists and may be reused only as a fallback.
|
||||||
- [ ] Tyrant inactivity ends the reign, clears all assignments, and invokes normal random Tyrant succession followed by Vigilante selection.
|
- [x] Tyrant inactivity ends the reign, clears all assignments, and invokes normal random Tyrant succession followed by Vigilante selection.
|
||||||
- [ ] Vigilante inactivity clears Followers and rerolls only the Vigilante position.
|
- [x] Vigilante inactivity clears Followers and rerolls only the Vigilante position.
|
||||||
- [ ] An offline randomly selected candidate must log in within 24 unpaused hours to confirm the assignment.
|
- [x] An offline randomly selected candidate must log in within 24 unpaused hours to confirm the assignment.
|
||||||
- [ ] An unconfirmed selection expires and rerolls automatically under the same eligibility rules.
|
- [x] An unconfirmed selection expires and rerolls automatically under the same eligibility rules.
|
||||||
- [ ] Selection remains vacant and retries periodically when no valid candidate exists.
|
- [x] Selection remains vacant and retries periodically when no valid candidate exists.
|
||||||
- [ ] Candidate selection cannot assign conflicting roles or choose an opted-out player, including during concurrent joins and deaths.
|
- [x] Candidate selection cannot assign conflicting roles or choose an opted-out player, including during concurrent joins and deaths.
|
||||||
|
|
||||||
## Related
|
## Related
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package games.dmg.spigottyrant;
|
||||||
|
|
||||||
|
public final class BukkitManagedRoleEffects implements ManagedRoleEffects {
|
||||||
|
private final TyrantStateManager stateManager;
|
||||||
|
private final TyrantPresentation presentation;
|
||||||
|
|
||||||
|
public BukkitManagedRoleEffects(
|
||||||
|
TyrantStateManager stateManager,
|
||||||
|
TyrantPresentation presentation
|
||||||
|
) {
|
||||||
|
this.stateManager = stateManager;
|
||||||
|
this.presentation = presentation;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void suppressAll() {
|
||||||
|
presentation.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void restoreAll() {
|
||||||
|
if (stateManager.game().lifecycle() == GameLifecycle.RUNNING) {
|
||||||
|
presentation.reconcile(stateManager.game().tyrantId());
|
||||||
|
} else {
|
||||||
|
presentation.clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
package games.dmg.spigottyrant;
|
||||||
|
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.UUID;
|
||||||
|
import org.bukkit.ChatColor;
|
||||||
|
import org.bukkit.Server;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.scoreboard.Scoreboard;
|
||||||
|
import org.bukkit.scoreboard.ScoreboardManager;
|
||||||
|
import org.bukkit.scoreboard.Team;
|
||||||
|
|
||||||
|
public final class BukkitTyrantPresentation implements TyrantPresentation {
|
||||||
|
private static final String TEAM_NAME = "tyrant-red";
|
||||||
|
private final Server server;
|
||||||
|
private final Team team;
|
||||||
|
private Optional<UUID> presentedTyrant = Optional.empty();
|
||||||
|
|
||||||
|
public BukkitTyrantPresentation(Server server) {
|
||||||
|
this.server = server;
|
||||||
|
ScoreboardManager manager = Objects.requireNonNull(
|
||||||
|
server.getScoreboardManager(), "Scoreboard manager is unavailable"
|
||||||
|
);
|
||||||
|
Scoreboard scoreboard = manager.getMainScoreboard();
|
||||||
|
Team existing = scoreboard.getTeam(TEAM_NAME);
|
||||||
|
team = existing == null ? scoreboard.registerNewTeam(TEAM_NAME) : existing;
|
||||||
|
team.setColor(ChatColor.RED);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void reconcile(Optional<UUID> tyrantId) {
|
||||||
|
clear();
|
||||||
|
presentedTyrant = tyrantId;
|
||||||
|
tyrantId.map(server::getPlayer).ifPresent(player -> {
|
||||||
|
team.addEntry(player.getName());
|
||||||
|
player.setGlowing(true);
|
||||||
|
player.setPlayerListName(ChatColor.RED + player.getName());
|
||||||
|
player.setDisplayName(ChatColor.RED + player.getName());
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void clear() {
|
||||||
|
presentedTyrant.map(server::getPlayer).ifPresent(player -> {
|
||||||
|
player.setGlowing(false);
|
||||||
|
player.setPlayerListName(player.getName());
|
||||||
|
player.setDisplayName(player.getName());
|
||||||
|
});
|
||||||
|
for (String entry : new HashSet<>(team.getEntries())) {
|
||||||
|
team.removeEntry(entry);
|
||||||
|
}
|
||||||
|
presentedTyrant = Optional.empty();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,10 +8,20 @@ import org.bukkit.event.player.PlayerJoinEvent;
|
|||||||
public final class PlayerJoinListener implements Listener {
|
public final class PlayerJoinListener implements Listener {
|
||||||
private final TyrantStateManager stateManager;
|
private final TyrantStateManager stateManager;
|
||||||
private final Clock clock;
|
private final Clock clock;
|
||||||
|
private final TyrantPresentation presentation;
|
||||||
|
|
||||||
public PlayerJoinListener(TyrantStateManager stateManager, Clock clock) {
|
public PlayerJoinListener(TyrantStateManager stateManager, Clock clock) {
|
||||||
|
this(stateManager, clock, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public PlayerJoinListener(
|
||||||
|
TyrantStateManager stateManager,
|
||||||
|
Clock clock,
|
||||||
|
TyrantPresentation presentation
|
||||||
|
) {
|
||||||
this.stateManager = stateManager;
|
this.stateManager = stateManager;
|
||||||
this.clock = clock;
|
this.clock = clock;
|
||||||
|
this.presentation = presentation;
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
@@ -29,5 +39,11 @@ public final class PlayerJoinListener implements Listener {
|
|||||||
if (!reminder.isEmpty()) {
|
if (!reminder.isEmpty()) {
|
||||||
event.getPlayer().sendMessage(reminder);
|
event.getPlayer().sendMessage(reminder);
|
||||||
}
|
}
|
||||||
|
if (presentation != null
|
||||||
|
&& stateManager.game().lifecycle() == GameLifecycle.RUNNING
|
||||||
|
&& stateManager.game().tyrantId()
|
||||||
|
.filter(event.getPlayer().getUniqueId()::equals).isPresent()) {
|
||||||
|
presentation.reconcile(stateManager.game().tyrantId());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,235 @@
|
|||||||
|
package games.dmg.spigottyrant;
|
||||||
|
|
||||||
|
import java.time.Duration;
|
||||||
|
import java.time.Instant;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.random.RandomGenerator;
|
||||||
|
|
||||||
|
public final class RoleMaintenanceService {
|
||||||
|
private final RoleCandidateSelector candidates;
|
||||||
|
private final TyrantSuccessionService succession;
|
||||||
|
private final Duration inactivity;
|
||||||
|
private final Duration activityWindow;
|
||||||
|
private final Duration pendingTimeout;
|
||||||
|
private final RandomGenerator random;
|
||||||
|
|
||||||
|
public RoleMaintenanceService(
|
||||||
|
RoleCandidateSelector candidates,
|
||||||
|
TyrantSuccessionService succession,
|
||||||
|
Duration inactivity,
|
||||||
|
Duration activityWindow,
|
||||||
|
Duration pendingTimeout,
|
||||||
|
RandomGenerator random
|
||||||
|
) {
|
||||||
|
this.candidates = candidates;
|
||||||
|
this.succession = succession;
|
||||||
|
this.inactivity = inactivity;
|
||||||
|
this.activityWindow = activityWindow;
|
||||||
|
this.pendingTimeout = pendingTimeout;
|
||||||
|
this.random = random;
|
||||||
|
}
|
||||||
|
|
||||||
|
public LifecycleState maintain(
|
||||||
|
PersistentState state,
|
||||||
|
Set<UUID> onlinePlayerIds,
|
||||||
|
Instant now
|
||||||
|
) {
|
||||||
|
if (state.game().lifecycle() != GameLifecycle.RUNNING) {
|
||||||
|
return new LifecycleState(state.game(), state.players());
|
||||||
|
}
|
||||||
|
LifecycleState current = confirmPending(state, onlinePlayerIds, now);
|
||||||
|
if (isInactive(current.game().tyrantId(), current.players(), now)) {
|
||||||
|
return succession.succeed(
|
||||||
|
current.asPersistentState(), Optional.empty(), onlinePlayerIds, now
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (isInactive(current.game().vigilanteId(), current.players(), now)) {
|
||||||
|
current = rerollVigilante(
|
||||||
|
current.asPersistentState(), current.game().vigilanteId(), onlinePlayerIds, now
|
||||||
|
);
|
||||||
|
}
|
||||||
|
current = rerollExpiredTyrant(current, onlinePlayerIds, now);
|
||||||
|
current = rerollExpiredVigilante(current, onlinePlayerIds, now);
|
||||||
|
if (current.game().tyrantId().isEmpty() && current.game().pendingTyrant().isEmpty()) {
|
||||||
|
current = selectTyrant(current, Optional.empty(), onlinePlayerIds, now);
|
||||||
|
}
|
||||||
|
if (current.game().tyrantId().isPresent()
|
||||||
|
&& current.game().vigilanteId().isEmpty()
|
||||||
|
&& current.game().pendingVigilante().isEmpty()) {
|
||||||
|
current = rerollVigilante(
|
||||||
|
current.asPersistentState(), Optional.empty(), onlinePlayerIds, now
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return current;
|
||||||
|
}
|
||||||
|
|
||||||
|
public LifecycleState rerollVigilante(
|
||||||
|
PersistentState state,
|
||||||
|
Optional<UUID> previousVigilante,
|
||||||
|
Set<UUID> onlinePlayerIds,
|
||||||
|
Instant now
|
||||||
|
) {
|
||||||
|
Map<UUID, PlayerState> players = clearFollowers(state.players(), previousVigilante);
|
||||||
|
Set<UUID> excluded = state.game().tyrantId().map(Set::of).orElseGet(Set::of);
|
||||||
|
Optional<UUID> selected = candidates.select(
|
||||||
|
players, excluded, previousVigilante, now, activityWindow, random
|
||||||
|
);
|
||||||
|
Optional<UUID> active = selected.filter(onlinePlayerIds::contains);
|
||||||
|
Optional<PendingSelection> pending = selected
|
||||||
|
.filter(playerId -> active.isEmpty())
|
||||||
|
.map(playerId -> new PendingSelection(playerId, now.plus(pendingTimeout)));
|
||||||
|
GameState game = copyRoles(
|
||||||
|
state.game(), state.game().tyrantId(), active,
|
||||||
|
state.game().pendingTyrant(), pending
|
||||||
|
);
|
||||||
|
return new LifecycleState(game, players);
|
||||||
|
}
|
||||||
|
|
||||||
|
private LifecycleState confirmPending(
|
||||||
|
PersistentState state,
|
||||||
|
Set<UUID> onlinePlayerIds,
|
||||||
|
Instant now
|
||||||
|
) {
|
||||||
|
GameState game = state.game();
|
||||||
|
Optional<UUID> tyrant = game.tyrantId();
|
||||||
|
Optional<UUID> vigilante = game.vigilanteId();
|
||||||
|
Optional<PendingSelection> pendingTyrant = game.pendingTyrant();
|
||||||
|
Optional<PendingSelection> pendingVigilante = game.pendingVigilante();
|
||||||
|
if (pendingTyrant.isPresent()) {
|
||||||
|
PendingSelection pending = pendingTyrant.orElseThrow();
|
||||||
|
if (!now.isAfter(pending.expiresAt())
|
||||||
|
&& onlinePlayerIds.contains(pending.candidateId())
|
||||||
|
&& eligibleAtConfirmation(state.players().get(pending.candidateId()), now)
|
||||||
|
&& vigilante.filter(pending.candidateId()::equals).isEmpty()) {
|
||||||
|
tyrant = Optional.of(pending.candidateId());
|
||||||
|
pendingTyrant = Optional.empty();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (pendingVigilante.isPresent()) {
|
||||||
|
PendingSelection pending = pendingVigilante.orElseThrow();
|
||||||
|
if (!now.isAfter(pending.expiresAt())
|
||||||
|
&& onlinePlayerIds.contains(pending.candidateId())
|
||||||
|
&& eligibleAtConfirmation(state.players().get(pending.candidateId()), now)
|
||||||
|
&& tyrant.filter(pending.candidateId()::equals).isEmpty()) {
|
||||||
|
vigilante = Optional.of(pending.candidateId());
|
||||||
|
pendingVigilante = Optional.empty();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return new LifecycleState(
|
||||||
|
copyRoles(game, tyrant, vigilante, pendingTyrant, pendingVigilante),
|
||||||
|
state.players()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private LifecycleState rerollExpiredTyrant(
|
||||||
|
LifecycleState state,
|
||||||
|
Set<UUID> onlinePlayerIds,
|
||||||
|
Instant now
|
||||||
|
) {
|
||||||
|
Optional<PendingSelection> pending = state.game().pendingTyrant();
|
||||||
|
if (pending.isEmpty() || !now.isAfter(pending.orElseThrow().expiresAt())) {
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
return selectTyrant(
|
||||||
|
state,
|
||||||
|
Optional.of(pending.orElseThrow().candidateId()),
|
||||||
|
onlinePlayerIds,
|
||||||
|
now
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private LifecycleState selectTyrant(
|
||||||
|
LifecycleState state,
|
||||||
|
Optional<UUID> previous,
|
||||||
|
Set<UUID> onlinePlayerIds,
|
||||||
|
Instant now
|
||||||
|
) {
|
||||||
|
Set<UUID> excluded = state.game().vigilanteId().map(Set::of).orElseGet(Set::of);
|
||||||
|
Optional<UUID> selected = candidates.select(
|
||||||
|
state.players(), excluded, previous, now, activityWindow, random
|
||||||
|
);
|
||||||
|
Optional<UUID> active = selected.filter(onlinePlayerIds::contains);
|
||||||
|
Optional<PendingSelection> pending = selected
|
||||||
|
.filter(playerId -> active.isEmpty())
|
||||||
|
.map(playerId -> new PendingSelection(playerId, now.plus(pendingTimeout)));
|
||||||
|
GameState game = copyRoles(
|
||||||
|
state.game(), active, state.game().vigilanteId(), pending,
|
||||||
|
state.game().pendingVigilante()
|
||||||
|
);
|
||||||
|
return new LifecycleState(game, state.players());
|
||||||
|
}
|
||||||
|
|
||||||
|
private LifecycleState rerollExpiredVigilante(
|
||||||
|
LifecycleState state,
|
||||||
|
Set<UUID> onlinePlayerIds,
|
||||||
|
Instant now
|
||||||
|
) {
|
||||||
|
Optional<PendingSelection> pending = state.game().pendingVigilante();
|
||||||
|
if (pending.isEmpty() || !now.isAfter(pending.orElseThrow().expiresAt())) {
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
return rerollVigilante(
|
||||||
|
state.asPersistentState(),
|
||||||
|
Optional.of(pending.orElseThrow().candidateId()),
|
||||||
|
onlinePlayerIds,
|
||||||
|
now
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isInactive(
|
||||||
|
Optional<UUID> roleHolder,
|
||||||
|
Map<UUID, PlayerState> players,
|
||||||
|
Instant now
|
||||||
|
) {
|
||||||
|
if (roleHolder.isEmpty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
PlayerState player = players.get(roleHolder.orElseThrow());
|
||||||
|
return player != null
|
||||||
|
&& player.lastLogin().isPresent()
|
||||||
|
&& !player.lastLogin().orElseThrow().plus(inactivity).isAfter(now);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean eligibleAtConfirmation(PlayerState player, Instant now) {
|
||||||
|
return player != null
|
||||||
|
&& player.optedOutUntil().filter(deadline -> deadline.isAfter(now)).isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Map<UUID, PlayerState> clearFollowers(
|
||||||
|
Map<UUID, PlayerState> players,
|
||||||
|
Optional<UUID> previousVigilante
|
||||||
|
) {
|
||||||
|
if (previousVigilante.isEmpty()) {
|
||||||
|
return players;
|
||||||
|
}
|
||||||
|
Map<UUID, PlayerState> updated = new HashMap<>();
|
||||||
|
UUID previous = previousVigilante.orElseThrow();
|
||||||
|
for (PlayerState player : players.values()) {
|
||||||
|
Optional<UUID> followerOf = player.followerOf().filter(id -> !id.equals(previous));
|
||||||
|
updated.put(player.playerId(), new PlayerState(
|
||||||
|
player.playerId(), player.latestName(), player.lastLogin(), player.optedOutUntil(),
|
||||||
|
player.tyrantClass(), followerOf, player.cooldownEnds(),
|
||||||
|
player.readyAbilityItems(), player.capturedMobs()
|
||||||
|
));
|
||||||
|
}
|
||||||
|
return Map.copyOf(updated);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static GameState copyRoles(
|
||||||
|
GameState game,
|
||||||
|
Optional<UUID> tyrant,
|
||||||
|
Optional<UUID> vigilante,
|
||||||
|
Optional<PendingSelection> pendingTyrant,
|
||||||
|
Optional<PendingSelection> pendingVigilante
|
||||||
|
) {
|
||||||
|
return new GameState(
|
||||||
|
game.lifecycle(), tyrant, vigilante, pendingTyrant, pendingVigilante,
|
||||||
|
game.pausedAt(), game.accumulatedPausedTime(), game.tyrantLevel(),
|
||||||
|
game.unspentChoices(), game.purchases()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package games.dmg.spigottyrant;
|
||||||
|
|
||||||
|
import java.time.Clock;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import org.bukkit.Server;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
public final class RoleMaintenanceTask implements Runnable {
|
||||||
|
private final TyrantStateManager stateManager;
|
||||||
|
private final RoleMaintenanceService maintenance;
|
||||||
|
private final TyrantPresentation presentation;
|
||||||
|
private final Server server;
|
||||||
|
private final Clock clock;
|
||||||
|
|
||||||
|
public RoleMaintenanceTask(
|
||||||
|
TyrantStateManager stateManager,
|
||||||
|
RoleMaintenanceService maintenance,
|
||||||
|
TyrantPresentation presentation,
|
||||||
|
Server server,
|
||||||
|
Clock clock
|
||||||
|
) {
|
||||||
|
this.stateManager = stateManager;
|
||||||
|
this.maintenance = maintenance;
|
||||||
|
this.presentation = presentation;
|
||||||
|
this.server = server;
|
||||||
|
this.clock = clock;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
PersistentState before = stateManager.snapshot();
|
||||||
|
Set<UUID> online = server.getOnlinePlayers().stream()
|
||||||
|
.map(Player::getUniqueId)
|
||||||
|
.collect(Collectors.toUnmodifiableSet());
|
||||||
|
LifecycleState after = maintenance.maintain(before, online, clock.instant());
|
||||||
|
if (!after.asPersistentState().equals(before)) {
|
||||||
|
stateManager.replaceState(after);
|
||||||
|
stateManager.saveIfDirty();
|
||||||
|
presentation.reconcile(after.game().tyrantId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,6 +10,7 @@ import org.bukkit.plugin.java.JavaPlugin;
|
|||||||
public final class SpigotTyrantPlugin extends JavaPlugin {
|
public final class SpigotTyrantPlugin extends JavaPlugin {
|
||||||
private PluginSettings settings;
|
private PluginSettings settings;
|
||||||
private TyrantStateManager stateManager;
|
private TyrantStateManager stateManager;
|
||||||
|
private TyrantPresentation tyrantPresentation;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
@@ -27,6 +28,20 @@ public final class SpigotTyrantPlugin extends JavaPlugin {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Clock clock = Clock.systemUTC();
|
||||||
|
RoleCandidateSelector candidateSelector = new RoleCandidateSelector();
|
||||||
|
java.util.random.RandomGenerator random = java.util.random.RandomGenerator.getDefault();
|
||||||
|
TyrantSuccessionService succession = new TyrantSuccessionService(
|
||||||
|
candidateSelector,
|
||||||
|
settings.candidateActivityWindow(),
|
||||||
|
settings.pendingSelectionTimeout(),
|
||||||
|
random
|
||||||
|
);
|
||||||
|
tyrantPresentation = new BukkitTyrantPresentation(getServer());
|
||||||
|
ManagedRoleEffects managedEffects = new BukkitManagedRoleEffects(
|
||||||
|
stateManager, tyrantPresentation
|
||||||
|
);
|
||||||
|
managedEffects.restoreAll();
|
||||||
Objects.requireNonNull(getCommand("tyrant"), "Missing tyrant command metadata")
|
Objects.requireNonNull(getCommand("tyrant"), "Missing tyrant command metadata")
|
||||||
.setExecutor(new TyrantCommand(stateManager, new TyrantProgressionService()));
|
.setExecutor(new TyrantCommand(stateManager, new TyrantProgressionService()));
|
||||||
Objects.requireNonNull(getCommand("tyrantadmin"), "Missing tyrantadmin metadata")
|
Objects.requireNonNull(getCommand("tyrantadmin"), "Missing tyrantadmin metadata")
|
||||||
@@ -34,23 +49,51 @@ public final class SpigotTyrantPlugin extends JavaPlugin {
|
|||||||
stateManager,
|
stateManager,
|
||||||
new GameLifecycleService(),
|
new GameLifecycleService(),
|
||||||
new BukkitOnlinePlayerDirectory(),
|
new BukkitOnlinePlayerDirectory(),
|
||||||
new NoopManagedRoleEffects(),
|
managedEffects,
|
||||||
Clock.systemUTC(),
|
clock,
|
||||||
new RoleCandidateSelector(),
|
candidateSelector,
|
||||||
settings.candidateActivityWindow(),
|
settings.candidateActivityWindow(),
|
||||||
settings.pendingSelectionTimeout(),
|
settings.pendingSelectionTimeout(),
|
||||||
java.util.random.RandomGenerator.getDefault()
|
random
|
||||||
));
|
));
|
||||||
getServer().getPluginManager().registerEvents(
|
getServer().getPluginManager().registerEvents(
|
||||||
new PlayerJoinListener(stateManager, Clock.systemUTC()),
|
new PlayerJoinListener(stateManager, clock, tyrantPresentation),
|
||||||
this
|
this
|
||||||
);
|
);
|
||||||
|
getServer().getPluginManager().registerEvents(
|
||||||
|
new TyrantDeathListener(
|
||||||
|
stateManager, succession, tyrantPresentation, getServer(), clock
|
||||||
|
),
|
||||||
|
this
|
||||||
|
);
|
||||||
|
RoleMaintenanceService maintenance = new RoleMaintenanceService(
|
||||||
|
candidateSelector,
|
||||||
|
succession,
|
||||||
|
settings.roleInactivity(),
|
||||||
|
settings.candidateActivityWindow(),
|
||||||
|
settings.pendingSelectionTimeout(),
|
||||||
|
random
|
||||||
|
);
|
||||||
|
long maintenanceTicks = Math.max(
|
||||||
|
1L, Math.multiplyExact(settings.selectionRetryInterval().toSeconds(), 20L)
|
||||||
|
);
|
||||||
|
getServer().getScheduler().runTaskTimer(
|
||||||
|
this,
|
||||||
|
new RoleMaintenanceTask(
|
||||||
|
stateManager, maintenance, tyrantPresentation, getServer(), clock
|
||||||
|
),
|
||||||
|
maintenanceTicks,
|
||||||
|
maintenanceTicks
|
||||||
|
);
|
||||||
getServer().getScheduler().runTaskTimer(this, stateManager::saveIfDirty, 600L, 600L);
|
getServer().getScheduler().runTaskTimer(this, stateManager::saveIfDirty, 600L, 600L);
|
||||||
getLogger().info("Spigot Tyrant enabled.");
|
getLogger().info("Spigot Tyrant enabled.");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDisable() {
|
public void onDisable() {
|
||||||
|
if (tyrantPresentation != null) {
|
||||||
|
tyrantPresentation.clear();
|
||||||
|
}
|
||||||
if (stateManager != null) {
|
if (stateManager != null) {
|
||||||
stateManager.saveIfDirty();
|
stateManager.saveIfDirty();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
package games.dmg.spigottyrant;
|
||||||
|
|
||||||
|
import java.time.Clock;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import org.bukkit.ChatColor;
|
||||||
|
import org.bukkit.Server;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.EventHandler;
|
||||||
|
import org.bukkit.event.EventPriority;
|
||||||
|
import org.bukkit.event.Listener;
|
||||||
|
import org.bukkit.event.entity.PlayerDeathEvent;
|
||||||
|
|
||||||
|
public final class TyrantDeathListener implements Listener {
|
||||||
|
private final TyrantStateManager stateManager;
|
||||||
|
private final TyrantSuccessionService succession;
|
||||||
|
private final TyrantPresentation presentation;
|
||||||
|
private final Server server;
|
||||||
|
private final Clock clock;
|
||||||
|
|
||||||
|
public TyrantDeathListener(
|
||||||
|
TyrantStateManager stateManager,
|
||||||
|
TyrantSuccessionService succession,
|
||||||
|
TyrantPresentation presentation,
|
||||||
|
Server server,
|
||||||
|
Clock clock
|
||||||
|
) {
|
||||||
|
this.stateManager = stateManager;
|
||||||
|
this.succession = succession;
|
||||||
|
this.presentation = presentation;
|
||||||
|
this.server = server;
|
||||||
|
this.clock = clock;
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventHandler(priority = EventPriority.MONITOR)
|
||||||
|
public void onDeath(PlayerDeathEvent event) {
|
||||||
|
UUID victimId = event.getEntity().getUniqueId();
|
||||||
|
GameState game = stateManager.game();
|
||||||
|
if (game.lifecycle() != GameLifecycle.RUNNING
|
||||||
|
|| game.tyrantId().filter(victimId::equals).isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Optional<UUID> killerId = Optional.ofNullable(event.getEntity().getKiller())
|
||||||
|
.map(Player::getUniqueId);
|
||||||
|
Set<UUID> online = server.getOnlinePlayers().stream()
|
||||||
|
.map(Player::getUniqueId)
|
||||||
|
.collect(Collectors.toUnmodifiableSet());
|
||||||
|
LifecycleState succeeded = succession.succeed(
|
||||||
|
stateManager.snapshot(), killerId, online, clock.instant()
|
||||||
|
);
|
||||||
|
stateManager.replaceState(succeeded);
|
||||||
|
stateManager.saveIfDirty();
|
||||||
|
presentation.reconcile(succeeded.game().tyrantId());
|
||||||
|
String successor = succeeded.game().tyrantId()
|
||||||
|
.map(id -> {
|
||||||
|
Player player = server.getPlayer(id);
|
||||||
|
return player == null ? id.toString() : player.getName();
|
||||||
|
})
|
||||||
|
.orElse("pending selection");
|
||||||
|
String message = ChatColor.RED + successor + " is the new Tyrant!";
|
||||||
|
server.getOnlinePlayers().forEach(player -> player.sendMessage(message));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package games.dmg.spigottyrant;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
public interface TyrantPresentation {
|
||||||
|
void reconcile(Optional<UUID> tyrantId);
|
||||||
|
|
||||||
|
void clear();
|
||||||
|
}
|
||||||
@@ -0,0 +1,109 @@
|
|||||||
|
package games.dmg.spigottyrant;
|
||||||
|
|
||||||
|
import java.time.Duration;
|
||||||
|
import java.time.Instant;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.random.RandomGenerator;
|
||||||
|
|
||||||
|
public final class TyrantSuccessionService {
|
||||||
|
private final RoleCandidateSelector candidates;
|
||||||
|
private final Duration activityWindow;
|
||||||
|
private final Duration pendingTimeout;
|
||||||
|
private final RandomGenerator random;
|
||||||
|
|
||||||
|
public TyrantSuccessionService(
|
||||||
|
RoleCandidateSelector candidates,
|
||||||
|
Duration activityWindow,
|
||||||
|
Duration pendingTimeout,
|
||||||
|
RandomGenerator random
|
||||||
|
) {
|
||||||
|
this.candidates = candidates;
|
||||||
|
this.activityWindow = activityWindow;
|
||||||
|
this.pendingTimeout = pendingTimeout;
|
||||||
|
this.random = random;
|
||||||
|
}
|
||||||
|
|
||||||
|
public LifecycleState succeed(
|
||||||
|
PersistentState state,
|
||||||
|
Optional<UUID> killerId,
|
||||||
|
Set<UUID> onlinePlayerIds,
|
||||||
|
Instant now
|
||||||
|
) {
|
||||||
|
if (state.game().lifecycle() != GameLifecycle.RUNNING
|
||||||
|
|| state.game().tyrantId().isEmpty()) {
|
||||||
|
throw new IllegalStateException("a running Tyrant reign is required");
|
||||||
|
}
|
||||||
|
UUID formerTyrant = state.game().tyrantId().orElseThrow();
|
||||||
|
Optional<UUID> formerVigilante = state.game().vigilanteId();
|
||||||
|
Map<UUID, PlayerState> clearedPlayers = clearAssignments(state.players());
|
||||||
|
Optional<UUID> selectedTyrant = killerId.isPresent()
|
||||||
|
? killerId
|
||||||
|
: candidates.select(
|
||||||
|
clearedPlayers,
|
||||||
|
Set.of(),
|
||||||
|
Optional.of(formerTyrant),
|
||||||
|
now,
|
||||||
|
activityWindow,
|
||||||
|
random
|
||||||
|
);
|
||||||
|
Optional<UUID> activeTyrant = selectedTyrant
|
||||||
|
.filter(playerId -> killerId.isPresent() || onlinePlayerIds.contains(playerId));
|
||||||
|
Optional<PendingSelection> pendingTyrant = selectedTyrant
|
||||||
|
.filter(playerId -> activeTyrant.isEmpty())
|
||||||
|
.map(playerId -> new PendingSelection(playerId, now.plus(pendingTimeout)));
|
||||||
|
|
||||||
|
Optional<UUID> selectedVigilante = activeTyrant.flatMap(tyrantId ->
|
||||||
|
candidates.select(
|
||||||
|
clearedPlayers,
|
||||||
|
Set.of(tyrantId),
|
||||||
|
formerVigilante,
|
||||||
|
now,
|
||||||
|
activityWindow,
|
||||||
|
random
|
||||||
|
)
|
||||||
|
);
|
||||||
|
Optional<UUID> activeVigilante = selectedVigilante
|
||||||
|
.filter(onlinePlayerIds::contains);
|
||||||
|
Optional<PendingSelection> pendingVigilante = selectedVigilante
|
||||||
|
.filter(playerId -> activeVigilante.isEmpty())
|
||||||
|
.map(playerId -> new PendingSelection(playerId, now.plus(pendingTimeout)));
|
||||||
|
|
||||||
|
GameState game = new GameState(
|
||||||
|
GameLifecycle.RUNNING,
|
||||||
|
activeTyrant,
|
||||||
|
activeVigilante,
|
||||||
|
pendingTyrant,
|
||||||
|
pendingVigilante,
|
||||||
|
Optional.empty(),
|
||||||
|
state.game().accumulatedPausedTime(),
|
||||||
|
0,
|
||||||
|
1,
|
||||||
|
Set.of()
|
||||||
|
);
|
||||||
|
return new LifecycleState(game, clearedPlayers);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Map<UUID, PlayerState> clearAssignments(
|
||||||
|
Map<UUID, PlayerState> players
|
||||||
|
) {
|
||||||
|
Map<UUID, PlayerState> cleared = new HashMap<>();
|
||||||
|
for (PlayerState player : players.values()) {
|
||||||
|
cleared.put(player.playerId(), new PlayerState(
|
||||||
|
player.playerId(),
|
||||||
|
player.latestName(),
|
||||||
|
player.lastLogin(),
|
||||||
|
player.optedOutUntil(),
|
||||||
|
TyrantClass.NONE,
|
||||||
|
Optional.empty(),
|
||||||
|
Map.of(),
|
||||||
|
Set.of(),
|
||||||
|
player.capturedMobs()
|
||||||
|
));
|
||||||
|
}
|
||||||
|
return Map.copyOf(cleared);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package games.dmg.spigottyrant;
|
||||||
|
|
||||||
|
import static org.mockito.Mockito.mock;
|
||||||
|
import static org.mockito.Mockito.verify;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.UUID;
|
||||||
|
import org.bukkit.ChatColor;
|
||||||
|
import org.bukkit.Server;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.scoreboard.Scoreboard;
|
||||||
|
import org.bukkit.scoreboard.ScoreboardManager;
|
||||||
|
import org.bukkit.scoreboard.Team;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
final class BukkitTyrantPresentationTest {
|
||||||
|
@Test
|
||||||
|
void givesCurrentTyrantRedNameAndGlowingOutline() {
|
||||||
|
UUID tyrantId = UUID.fromString("11111111-1111-1111-1111-111111111111");
|
||||||
|
Server server = mock(Server.class);
|
||||||
|
ScoreboardManager manager = mock(ScoreboardManager.class);
|
||||||
|
Scoreboard scoreboard = mock(Scoreboard.class);
|
||||||
|
Team team = mock(Team.class);
|
||||||
|
Player tyrant = mock(Player.class);
|
||||||
|
when(server.getScoreboardManager()).thenReturn(manager);
|
||||||
|
when(manager.getMainScoreboard()).thenReturn(scoreboard);
|
||||||
|
when(scoreboard.getTeam("tyrant-red")).thenReturn(null);
|
||||||
|
when(scoreboard.registerNewTeam("tyrant-red")).thenReturn(team);
|
||||||
|
when(server.getPlayer(tyrantId)).thenReturn(tyrant);
|
||||||
|
when(tyrant.getName()).thenReturn("TyrantPlayer");
|
||||||
|
BukkitTyrantPresentation presentation = new BukkitTyrantPresentation(server);
|
||||||
|
|
||||||
|
presentation.reconcile(Optional.of(tyrantId));
|
||||||
|
|
||||||
|
verify(team).setColor(ChatColor.RED);
|
||||||
|
verify(team).addEntry("TyrantPlayer");
|
||||||
|
verify(tyrant).setGlowing(true);
|
||||||
|
verify(tyrant).setPlayerListName(ChatColor.RED + "TyrantPlayer");
|
||||||
|
verify(tyrant).setDisplayName(ChatColor.RED + "TyrantPlayer");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,155 @@
|
|||||||
|
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 RoleMaintenanceServiceTest {
|
||||||
|
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 CANDIDATE = UUID.fromString("33333333-3333-3333-3333-333333333333");
|
||||||
|
private static final UUID OTHER = UUID.fromString("44444444-4444-4444-4444-444444444444");
|
||||||
|
private static final UUID FOLLOWER = UUID.fromString("55555555-5555-5555-5555-555555555555");
|
||||||
|
private static final Instant NOW = Instant.parse("2026-08-14T12:00:00Z");
|
||||||
|
private final RandomGenerator random = RandomGenerator.of("L64X128MixRandom");
|
||||||
|
private final RoleCandidateSelector selector = new RoleCandidateSelector();
|
||||||
|
private final RoleMaintenanceService service = new RoleMaintenanceService(
|
||||||
|
selector,
|
||||||
|
new TyrantSuccessionService(
|
||||||
|
selector, Duration.ofHours(24), Duration.ofHours(24), random
|
||||||
|
),
|
||||||
|
Duration.ofHours(48),
|
||||||
|
Duration.ofHours(24),
|
||||||
|
Duration.ofHours(24),
|
||||||
|
random
|
||||||
|
);
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void onlinePendingVigilanteConfirmsWithoutConflictingWithTyrant() {
|
||||||
|
GameState game = game(
|
||||||
|
Optional.of(TYRANT), Optional.empty(), Optional.empty(),
|
||||||
|
Optional.of(new PendingSelection(CANDIDATE, NOW.plusSeconds(60)))
|
||||||
|
);
|
||||||
|
PersistentState state = new PersistentState(game, players(
|
||||||
|
active(TYRANT), active(CANDIDATE)
|
||||||
|
));
|
||||||
|
|
||||||
|
LifecycleState maintained = service.maintain(state, Set.of(TYRANT, CANDIDATE), NOW);
|
||||||
|
|
||||||
|
assertEquals(Optional.of(CANDIDATE), maintained.game().vigilanteId());
|
||||||
|
assertEquals(Optional.empty(), maintained.game().pendingVigilante());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void expiredPendingSelectionRerollsAwayFromPreviousCandidate() {
|
||||||
|
GameState game = game(
|
||||||
|
Optional.of(TYRANT), Optional.empty(), Optional.empty(),
|
||||||
|
Optional.of(new PendingSelection(CANDIDATE, NOW.minusSeconds(1)))
|
||||||
|
);
|
||||||
|
PersistentState state = new PersistentState(game, players(
|
||||||
|
active(TYRANT), active(CANDIDATE), active(OTHER)
|
||||||
|
));
|
||||||
|
|
||||||
|
LifecycleState maintained = service.maintain(state, Set.of(TYRANT), NOW);
|
||||||
|
|
||||||
|
assertEquals(OTHER,
|
||||||
|
maintained.game().pendingVigilante().orElseThrow().candidateId());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void inactiveVigilanteIsRerolledAndFollowersAreCleared() {
|
||||||
|
PlayerState follower = withFollower(
|
||||||
|
withLogin(active(FOLLOWER), NOW.minus(Duration.ofHours(25))),
|
||||||
|
VIGILANTE
|
||||||
|
);
|
||||||
|
PlayerState staleVigilante = withLogin(active(VIGILANTE), NOW.minus(Duration.ofHours(49)));
|
||||||
|
GameState game = game(
|
||||||
|
Optional.of(TYRANT), Optional.of(VIGILANTE), Optional.empty(), Optional.empty()
|
||||||
|
);
|
||||||
|
PersistentState state = new PersistentState(game, Map.of(
|
||||||
|
TYRANT, active(TYRANT), VIGILANTE, staleVigilante,
|
||||||
|
FOLLOWER, follower, OTHER, active(OTHER)
|
||||||
|
));
|
||||||
|
|
||||||
|
LifecycleState maintained = service.maintain(state, Set.of(TYRANT, OTHER), NOW);
|
||||||
|
|
||||||
|
assertEquals(Optional.of(OTHER), maintained.game().vigilanteId());
|
||||||
|
assertEquals(Optional.empty(), maintained.players().get(FOLLOWER).followerOf());
|
||||||
|
assertEquals(Optional.of(TYRANT), maintained.game().tyrantId());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void inactiveTyrantEndsReignAndUsesNormalSuccession() {
|
||||||
|
PlayerState staleTyrant = withLogin(
|
||||||
|
active(TYRANT), NOW.minus(Duration.ofHours(48))
|
||||||
|
);
|
||||||
|
PlayerState successor = new PlayerState(
|
||||||
|
OTHER, "Successor", Optional.of(NOW.minusSeconds(60)), Optional.empty(),
|
||||||
|
TyrantClass.FIXER, Optional.of(VIGILANTE), Map.of(), Set.of(),
|
||||||
|
java.util.List.of()
|
||||||
|
);
|
||||||
|
GameState game = new GameState(
|
||||||
|
GameLifecycle.RUNNING, Optional.of(TYRANT), Optional.of(VIGILANTE),
|
||||||
|
Optional.empty(), Optional.empty(), Optional.empty(), Duration.ZERO,
|
||||||
|
5, 0, Set.of(TyrantUnlock.FIXER)
|
||||||
|
);
|
||||||
|
PersistentState state = new PersistentState(game, Map.of(
|
||||||
|
TYRANT, staleTyrant, VIGILANTE, active(VIGILANTE), OTHER, successor
|
||||||
|
));
|
||||||
|
|
||||||
|
LifecycleState maintained = service.maintain(state, Set.of(OTHER), NOW);
|
||||||
|
|
||||||
|
assertEquals(0, maintained.game().tyrantLevel());
|
||||||
|
assertEquals(1, maintained.game().unspentChoices());
|
||||||
|
assertEquals(Set.of(), maintained.game().purchases());
|
||||||
|
assertEquals(TyrantClass.NONE, maintained.players().get(OTHER).tyrantClass());
|
||||||
|
assertEquals(Optional.empty(), maintained.players().get(OTHER).followerOf());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static GameState game(
|
||||||
|
Optional<UUID> tyrant,
|
||||||
|
Optional<UUID> vigilante,
|
||||||
|
Optional<PendingSelection> pendingTyrant,
|
||||||
|
Optional<PendingSelection> pendingVigilante
|
||||||
|
) {
|
||||||
|
return new GameState(
|
||||||
|
GameLifecycle.RUNNING, tyrant, vigilante, pendingTyrant, pendingVigilante,
|
||||||
|
Optional.empty(), Duration.ZERO, 1, 0, Set.of()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Map<UUID, PlayerState> players(PlayerState... players) {
|
||||||
|
java.util.HashMap<UUID, PlayerState> map = new java.util.HashMap<>();
|
||||||
|
for (PlayerState player : players) {
|
||||||
|
map.put(player.playerId(), player);
|
||||||
|
}
|
||||||
|
return Map.copyOf(map);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PlayerState active(UUID id) {
|
||||||
|
return withLogin(PlayerState.newPlayer(id, id.toString()), NOW.minusSeconds(60));
|
||||||
|
}
|
||||||
|
|
||||||
|
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()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PlayerState withFollower(PlayerState player, UUID vigilante) {
|
||||||
|
return new PlayerState(
|
||||||
|
player.playerId(), player.latestName(), player.lastLogin(), player.optedOutUntil(),
|
||||||
|
player.tyrantClass(), Optional.of(vigilante), player.cooldownEnds(),
|
||||||
|
player.readyAbilityItems(), player.capturedMobs()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
package games.dmg.spigottyrant;
|
||||||
|
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.ArgumentMatchers.eq;
|
||||||
|
import static org.mockito.Mockito.doReturn;
|
||||||
|
import static org.mockito.Mockito.mock;
|
||||||
|
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.Map;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.UUID;
|
||||||
|
import org.bukkit.Server;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.entity.PlayerDeathEvent;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
final class TyrantDeathListenerTest {
|
||||||
|
@Test
|
||||||
|
void tyrantDeathAppliesSuccessionAndPresentation() {
|
||||||
|
UUID tyrantId = UUID.fromString("11111111-1111-1111-1111-111111111111");
|
||||||
|
UUID killerId = 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, 1, Set.of()
|
||||||
|
);
|
||||||
|
PersistentState before = new PersistentState(game, Map.of());
|
||||||
|
GameState succeededGame = new GameState(
|
||||||
|
GameLifecycle.RUNNING, Optional.of(killerId), Optional.empty(),
|
||||||
|
Optional.empty(), Optional.empty(), Optional.empty(), Duration.ZERO,
|
||||||
|
0, 1, Set.of()
|
||||||
|
);
|
||||||
|
LifecycleState succeeded = new LifecycleState(succeededGame, Map.of());
|
||||||
|
TyrantStateManager manager = mock(TyrantStateManager.class);
|
||||||
|
when(manager.game()).thenReturn(game);
|
||||||
|
when(manager.snapshot()).thenReturn(before);
|
||||||
|
TyrantSuccessionService succession = mock(TyrantSuccessionService.class);
|
||||||
|
when(succession.succeed(eq(before), eq(Optional.of(killerId)), any(), any()))
|
||||||
|
.thenReturn(succeeded);
|
||||||
|
TyrantPresentation presentation = mock(TyrantPresentation.class);
|
||||||
|
Server server = mock(Server.class);
|
||||||
|
Player victim = mock(Player.class);
|
||||||
|
when(victim.getUniqueId()).thenReturn(tyrantId);
|
||||||
|
Player killer = mock(Player.class);
|
||||||
|
when(killer.getUniqueId()).thenReturn(killerId);
|
||||||
|
when(victim.getKiller()).thenReturn(killer);
|
||||||
|
doReturn(List.of(victim, killer)).when(server).getOnlinePlayers();
|
||||||
|
PlayerDeathEvent event = mock(PlayerDeathEvent.class);
|
||||||
|
when(event.getEntity()).thenReturn(victim);
|
||||||
|
TyrantDeathListener listener = new TyrantDeathListener(
|
||||||
|
manager,
|
||||||
|
succession,
|
||||||
|
presentation,
|
||||||
|
server,
|
||||||
|
Clock.fixed(Instant.parse("2026-08-14T12:00:00Z"), ZoneOffset.UTC)
|
||||||
|
);
|
||||||
|
|
||||||
|
listener.onDeath(event);
|
||||||
|
|
||||||
|
verify(manager).replaceState(succeeded);
|
||||||
|
verify(presentation).reconcile(Optional.of(killerId));
|
||||||
|
verify(killer).sendMessage(org.mockito.ArgumentMatchers.contains("new Tyrant"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,95 @@
|
|||||||
|
package games.dmg.spigottyrant;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertNotEquals;
|
||||||
|
|
||||||
|
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 TyrantSuccessionServiceTest {
|
||||||
|
private static final UUID OLD_TYRANT = UUID.fromString("11111111-1111-1111-1111-111111111111");
|
||||||
|
private static final UUID OLD_VIGILANTE = UUID.fromString("22222222-2222-2222-2222-222222222222");
|
||||||
|
private static final UUID KILLER = UUID.fromString("33333333-3333-3333-3333-333333333333");
|
||||||
|
private static final UUID OTHER = UUID.fromString("44444444-4444-4444-4444-444444444444");
|
||||||
|
private static final Instant NOW = Instant.parse("2026-08-14T12:00:00Z");
|
||||||
|
private final TyrantSuccessionService service = new TyrantSuccessionService(
|
||||||
|
new RoleCandidateSelector(),
|
||||||
|
Duration.ofHours(24),
|
||||||
|
Duration.ofHours(24),
|
||||||
|
RandomGenerator.of("L64X128MixRandom")
|
||||||
|
);
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void playerKillerBecomesTyrantAndEntireReignIsReset() {
|
||||||
|
PersistentState before = progressedState();
|
||||||
|
|
||||||
|
LifecycleState after = service.succeed(
|
||||||
|
before, Optional.of(KILLER), Set.of(KILLER, OTHER), NOW
|
||||||
|
);
|
||||||
|
|
||||||
|
assertEquals(Optional.of(KILLER), after.game().tyrantId());
|
||||||
|
assertEquals(0, after.game().tyrantLevel());
|
||||||
|
assertEquals(1, after.game().unspentChoices());
|
||||||
|
assertEquals(Set.of(), after.game().purchases());
|
||||||
|
assertNotEquals(after.game().tyrantId(), after.game().vigilanteId());
|
||||||
|
for (PlayerState player : after.players().values()) {
|
||||||
|
assertEquals(TyrantClass.NONE, player.tyrantClass());
|
||||||
|
assertEquals(Optional.empty(), player.followerOf());
|
||||||
|
assertEquals(Map.of(), player.cooldownEnds());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void environmentalDeathRandomlySelectsRecentPlayerInsteadOfFormerTyrant() {
|
||||||
|
PersistentState before = progressedState();
|
||||||
|
|
||||||
|
LifecycleState after = service.succeed(before, Optional.empty(), Set.of(OTHER), NOW);
|
||||||
|
|
||||||
|
UUID selected = after.game().tyrantId().orElseGet(() ->
|
||||||
|
after.game().pendingTyrant().orElseThrow().candidateId()
|
||||||
|
);
|
||||||
|
assertNotEquals(OLD_TYRANT, selected);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PersistentState progressedState() {
|
||||||
|
GameState game = new GameState(
|
||||||
|
GameLifecycle.RUNNING, Optional.of(OLD_TYRANT), Optional.of(OLD_VIGILANTE),
|
||||||
|
Optional.empty(), Optional.empty(), Optional.empty(), Duration.ZERO,
|
||||||
|
5, 2, Set.of(TyrantUnlock.ASSASSIN, TyrantUnlock.STRENGTH)
|
||||||
|
);
|
||||||
|
Map<UUID, PlayerState> players = Map.of(
|
||||||
|
OLD_TYRANT, active(new PlayerState(
|
||||||
|
OLD_TYRANT, "OldTyrant", Optional.empty(), Optional.empty(),
|
||||||
|
TyrantClass.NONE, Optional.empty(),
|
||||||
|
Map.of(Ability.ROSTER_INTELLIGENCE, NOW.plusSeconds(20)),
|
||||||
|
Set.of(), java.util.List.of()
|
||||||
|
)),
|
||||||
|
OLD_VIGILANTE, active(new PlayerState(
|
||||||
|
OLD_VIGILANTE, "OldVigilante", Optional.empty(), Optional.empty(),
|
||||||
|
TyrantClass.ASSASSIN, Optional.empty(),
|
||||||
|
Map.of(Ability.ASSASSIN_INVISIBILITY, NOW.plusSeconds(20)),
|
||||||
|
Set.of(Ability.ASSASSIN_INVISIBILITY), java.util.List.of()
|
||||||
|
)),
|
||||||
|
KILLER, active(PlayerState.newPlayer(KILLER, "Killer")),
|
||||||
|
OTHER, active(new PlayerState(
|
||||||
|
OTHER, "Other", Optional.empty(), Optional.empty(), TyrantClass.FIXER,
|
||||||
|
Optional.of(OLD_VIGILANTE), Map.of(), Set.of(), java.util.List.of()
|
||||||
|
))
|
||||||
|
);
|
||||||
|
return new PersistentState(game, players);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PlayerState active(PlayerState player) {
|
||||||
|
return new PlayerState(
|
||||||
|
player.playerId(), player.latestName(), Optional.of(NOW.minusSeconds(60)),
|
||||||
|
player.optedOutUntil(), player.tyrantClass(), player.followerOf(),
|
||||||
|
player.cooldownEnds(), player.readyAbilityItems(), player.capturedMobs()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user