mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2025-12-20 02:45:52 +01:00
Implement map marking features
Teleport still exists on fish hook mark. Added mapMark-related protos. Map marking data is stored in players collection.
This commit is contained in:
@@ -0,0 +1,43 @@
|
||||
package emu.grasscutter.server.packet.send;
|
||||
|
||||
import emu.grasscutter.game.managers.MapMarkManager.MapMark;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.net.packet.BasePacket;
|
||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||
import emu.grasscutter.net.proto.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
public class PacketMarkMapRsp extends BasePacket {
|
||||
|
||||
public PacketMarkMapRsp(Player player, HashMap<String, MapMark> mapMarks) {
|
||||
super(PacketOpcodes.MarkMapRsp);
|
||||
|
||||
MarkMapRspOuterClass.MarkMapRsp.Builder proto = MarkMapRspOuterClass.MarkMapRsp.newBuilder();
|
||||
proto.setRetcode(0);
|
||||
|
||||
if (mapMarks != null) {
|
||||
for (MapMark mapMark: mapMarks.values()) {
|
||||
MapMarkPointOuterClass.MapMarkPoint.Builder markPoint = MapMarkPointOuterClass.MapMarkPoint.newBuilder();
|
||||
markPoint.setSceneId(mapMark.getSceneId());
|
||||
markPoint.setName(mapMark.getName());
|
||||
|
||||
VectorOuterClass.Vector.Builder positionVector = VectorOuterClass.Vector.newBuilder();
|
||||
positionVector.setX(mapMark.getPosition().getX());
|
||||
positionVector.setY(mapMark.getPosition().getY());
|
||||
positionVector.setZ(mapMark.getPosition().getZ());
|
||||
markPoint.setPos(positionVector.build());
|
||||
|
||||
markPoint.setPointType(mapMark.getMapMarkPointType());
|
||||
markPoint.setFromType(mapMark.getMapMarkFromType());
|
||||
markPoint.setMonsterId(mapMark.getMonsterId());
|
||||
markPoint.setQuestId(mapMark.getQuestId());
|
||||
|
||||
proto.addMarkList(markPoint.build());
|
||||
}
|
||||
}
|
||||
|
||||
MarkMapRspOuterClass.MarkMapRsp data = proto.build();
|
||||
this.setData(data);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package emu.grasscutter.server.packet.send;
|
||||
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.net.packet.BasePacket;
|
||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||
import emu.grasscutter.net.proto.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class PacketMarkNewNotify extends BasePacket {
|
||||
|
||||
public PacketMarkNewNotify(Player player, int markNewType, ArrayList<Integer> idList) {
|
||||
super(PacketOpcodes.MarkNewNotify);
|
||||
|
||||
MarkNewNotifyOuterClass.MarkNewNotify.Builder proto = MarkNewNotifyOuterClass.MarkNewNotify.newBuilder();
|
||||
proto.setMarkNewType(markNewType);
|
||||
for (Integer id: idList) {
|
||||
proto.addIdList(id);
|
||||
}
|
||||
|
||||
MarkNewNotifyOuterClass.MarkNewNotify data = proto.build();
|
||||
this.setData(data);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user