Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-17 01:15:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle Unlocking of Waypoints and Statues (#1608)

Browse Source 
Original commits:

* Add necessary protos for scene point/area unlocking.

* Rename PlayerOpenStateManager to PlayerProgressManager and move data to Player.

* Handle unlocking of waypoints.

* Add primo rewards for waypoint unlock.

* Statue unlocking.

* Add statue quest on player login.

* I forgor to add an unlock command.

* Give EXP as reward, fire quest trigger, make EXP UI show up.
This commit is contained in:
GanyusLeftHorn
2022-08-10 12:03:47 +02:00
committed by GitHub
parent 2d48fab799
commit 04f0fae898
25 changed files with 574 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/emu/grasscutter/command/commands/SetPropCommand.java
View File

@@ -1,15 +1,19 @@
package emu.grasscutter.command.commands;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.data.GameData;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.PlayerProperty;
import emu.grasscutter.game.tower.TowerLevelRecord;
import emu.grasscutter.server.packet.send.PacketOpenStateChangeNotify;
import emu.grasscutter.server.packet.send.PacketSceneAreaUnlockNotify;
import emu.grasscutter.server.packet.send.PacketScenePointUnlockNotify;
@Command(label = "setProp", aliases = {"prop"}, usage = {"<prop> <value>"}, permission = "player.setprop", permissionTargeted = "player.setprop.others")
public final class SetPropCommand implements CommandHandler {
@@ -22,7 +26,8 @@ public final class SetPropCommand implements CommandHandler {
NO_STAMINA,
UNLIMITED_ENERGY,
SET_OPENSTATE,
UNSET_OPENSTATE
UNSET_OPENSTATE,
UNLOCKMAP
}
static class Prop {
@@ -101,6 +106,10 @@ public final class SetPropCommand implements CommandHandler {
Prop unsetopenstate = new Prop("unsetopenstate", PseudoProp.UNSET_OPENSTATE);
this.props.put("unsetopenstate", unsetopenstate);
this.props.put("uo", unsetopenstate);
Prop unlockmap = new Prop("unlockmap", PseudoProp.UNLOCKMAP);
this.props.put("unlockmap", unlockmap);
this.props.put("um", unlockmap);
}
@Override
@@ -139,6 +148,7 @@ public final class SetPropCommand implements CommandHandler {
case GOD_MODE, NO_STAMINA, UNLIMITED_ENERGY -> this.setBool(sender, targetPlayer, prop.pseudoProp, value);
case SET_OPENSTATE -> this.setOpenState(targetPlayer, value, 1);
case UNSET_OPENSTATE -> this.setOpenState(targetPlayer, value, 0);
case UNLOCKMAP -> unlockMap(targetPlayer);
default -> targetPlayer.setProperty(prop.prop, value);
};
@@ -220,4 +230,26 @@ public final class SetPropCommand implements CommandHandler {
targetPlayer.sendPacket(new PacketOpenStateChangeNotify(state, value));
return true;
}
private boolean unlockMap(Player targetPlayer) {
// Unlock.
targetPlayer.setUnlockedScenePoints(new HashMap<>());
targetPlayer.setUnlockedSceneAreas(new HashMap<>());
for (int sceneId : GameData.getScenePointsPerScene().keySet()) {
// Unlock trans points.
targetPlayer.getUnlockedScenePoints().put(sceneId, new ArrayList<>());
targetPlayer.getUnlockedScenePoints().get(sceneId).addAll(GameData.getScenePointsPerScene().get(sceneId));
// Unlock map areas. Unfortunately, there is no readily available source for them in excels or bins.
targetPlayer.getUnlockedSceneAreas().put(sceneId, new ArrayList<>());
targetPlayer.getUnlockedSceneAreas().get(sceneId).addAll(List.of(1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19,20,21,22,23,24,25,29,100,101,102,103,200,210,300,400,401,402,403));
}
// Send notify.
int playerScene = targetPlayer.getSceneId();
targetPlayer.sendPacket(new PacketScenePointUnlockNotify(playerScene, targetPlayer.getUnlockedScenePoints().get(playerScene)));
targetPlayer.sendPacket(new PacketSceneAreaUnlockNotify(playerScene, targetPlayer.getUnlockedSceneAreas().get(playerScene)));
return true;
}
}

8
src/main/java/emu/grasscutter/command/commands/UnlockAllCommand.java
View File

@@ -4,7 +4,7 @@ import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.data.GameData;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.player.PlayerOpenStateManager;
import emu.grasscutter.game.player.PlayerProgressManager;
import emu.grasscutter.server.packet.send.PacketOpenStateChangeNotify;
import java.util.HashMap;
@@ -22,12 +22,12 @@ public final class UnlockAllCommand implements CommandHandler {
for (var state : GameData.getOpenStateList()) {
// Don't unlock blacklisted open states.
if (PlayerOpenStateManager.BLACKLIST_OPEN_STATES.contains(state.getId())) {
if (PlayerProgressManager.BLACKLIST_OPEN_STATES.contains(state.getId())) {
continue;
}
if (targetPlayer.getOpenStateManager().getOpenState(state.getId()) == 0) {
targetPlayer.getOpenStateManager().getOpenStateMap().put(state.getId(), 1);
if (targetPlayer.getProgressManager().getOpenState(state.getId()) == 0) {
targetPlayer.getOpenStates().put(state.getId(), 1);
changed.put(state.getId(), 1);
}
}