Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add reset scene tag subcommand #2403

Merged
merged 2 commits into from
Oct 14, 2023
Merged

Add reset scene tag subcommand #2403

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd44d98
Add reset scene tag subcommand
jie65535 Oct 13, 2023
bc2e6b4
Fix Control Flow
jie65535 Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions src/main/java/emu/grasscutter/command/commands/SetSceneTagCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
@Command(
label = "setSceneTag",
aliases = {"tag"},
usage = {"<add|remove|unlockall> <sceneTagId>"},
usage = {"<add|remove|unlockall|reset> <sceneTagId>"},
permission = "player.setscenetag",
permissionTargeted = "player.setscenetag.others")
public final class SetSceneTagCommand implements CommandHandler {
private final Int2ObjectMap<SceneTagData> sceneTagData = GameData.getSceneTagDataMap();

@Override
public void execute(Player sender, Player targetPlayer, List<String> args) {
if (args.size() == 0) {
if (args.isEmpty()) {
sendUsageMessage(sender);
return;
}
Expand All @@ -39,6 +39,9 @@ public void execute(Player sender, Player targetPlayer, List<String> args) {
if (actionStr.equals("unlockall")) {
unlockAllSceneTags(targetPlayer);
return;
} else if (actionStr.equals("reset") || actionStr.equals("restore")) {
resetAllSceneTags(targetPlayer);
return;
} else {
CommandHandler.sendTranslatedMessage(sender, "commands.execution.argument_error");
return;
Expand All @@ -49,7 +52,7 @@ public void execute(Player sender, Player targetPlayer, List<String> args) {

var sceneData =
sceneTagData.values().stream().filter(sceneTag -> sceneTag.getId() == userVal).findFirst();
if (sceneData == null) {
if (sceneData.isEmpty()) {
CommandHandler.sendTranslatedMessage(sender, "commands.generic.invalid.id");
return;
}
Expand Down Expand Up @@ -80,15 +83,13 @@ private void unlockAllSceneTags(Player targetPlayer) {
.toList()
.forEach(
sceneTag -> {
if (targetPlayer.getSceneTags().get(sceneTag.getSceneId()) == null) {
targetPlayer.getSceneTags().put(sceneTag.getSceneId(), new HashSet<>());
}
targetPlayer.getSceneTags().computeIfAbsent(sceneTag.getSceneId(), k -> new HashSet<>());
targetPlayer.getSceneTags().get(sceneTag.getSceneId()).add(sceneTag.getId());
});

// Remove default SceneTags, as most are "before" or "locked" states
allData.stream()
.filter(sceneTag -> sceneTag.isDefaultValid())
.filter(SceneTagData::isDefaultValid)
// Only remove for big world as some other scenes only have defaults
.filter(sceneTag -> sceneTag.getSceneId() == 3)
.forEach(
Expand All @@ -99,6 +100,17 @@ private void unlockAllSceneTags(Player targetPlayer) {
this.setSceneTags(targetPlayer);
}

private void resetAllSceneTags(Player targetPlayer) {
targetPlayer.getSceneTags().clear();
// targetPlayer.applyStartingSceneTags(); // private
GameData.getSceneTagDataMap().values().stream()
.filter(SceneTagData::isDefaultValid)
.forEach(sceneTag -> {
targetPlayer.getSceneTags().computeIfAbsent(sceneTag.getSceneId(), k -> new HashSet<>());
targetPlayer.getSceneTags().get(sceneTag.getSceneId()).add(sceneTag.getId());
});
}

private void setSceneTags(Player targetPlayer) {
targetPlayer.sendPacket(new PacketPlayerWorldSceneInfoListNotify(targetPlayer));
}
Expand Down