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

Format code [skip actions]

Browse Source
This commit is contained in:
github-actions
2023-09-23 17:45:57 +00:00
parent 0dd95450b1
commit 5faf39d359
8 changed files with 61 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/emu/grasscutter/data/excels/CoopChapterData.java
View File

@@ -13,21 +13,22 @@ import lombok.experimental.FieldDefaults;
public class CoopChapterData extends GameResource { public class CoopChapterData extends GameResource {
@Getter(onMethod_ = @Override) @Getter(onMethod_ = @Override)
int id; int id;
int avatarId; int avatarId;
// int chapterNameTextMapHash; // int chapterNameTextMapHash;
// int coopPageTitleTextMapHash; // int coopPageTitleTextMapHash;
// int chapterSortId; // int chapterSortId;
// int avatarSortId; // int avatarSortId;
// String chapterIcon; // String chapterIcon;
List<CoopCondition> unlockCond; List<CoopCondition> unlockCond;
// int [] unlockCondTips; // int [] unlockCondTips;
// int openMaterialId; // int openMaterialId;
// int openMaterialNum; // int openMaterialNum;
// String beginTimeStr; // String beginTimeStr;
// int confidenceValue; // int confidenceValue;
// String pointGraphPath; // String pointGraphPath;
// Double graphXRatio; // Double graphXRatio;
// Double graphYRatio; // Double graphYRatio;
@Data @Data
@FieldDefaults(level = AccessLevel.PRIVATE) @FieldDefaults(level = AccessLevel.PRIVATE)
@@ -42,4 +43,4 @@ public class CoopChapterData extends GameResource {
alternate = {"args"}) alternate = {"args"})
int[] args; int[] args;
} }
} }

13
src/main/java/emu/grasscutter/data/excels/CoopPointData.java
View File

@@ -11,13 +11,14 @@ import lombok.experimental.FieldDefaults;
public class CoopPointData extends GameResource { public class CoopPointData extends GameResource {
@Getter(onMethod_ = @Override) @Getter(onMethod_ = @Override)
int id; int id;
int chapterId; int chapterId;
String type; String type;
int acceptQuest; int acceptQuest;
int [] postPointList; int[] postPointList;
// int pointNameTextMapHash; // int pointNameTextMapHash;
// int pointDecTextMapHash; // int pointDecTextMapHash;
int pointPosId; int pointPosId;
// long photoMaleHash; // long photoMaleHash;
// long photoFemaleHash; // long photoFemaleHash;
} }

2
src/main/java/emu/grasscutter/game/quest/conditions/ConditionMainCoopStart.java
View File

@@ -18,4 +18,4 @@ public class ConditionMainCoopStart extends BaseCondition {
return condition.getParam()[0] == params[0] return condition.getParam()[0] == params[0]
&& (condition.getParam()[1] == 0 || condition.getParam()[1] == params[1]); && (condition.getParam()[1] == 0 || condition.getParam()[1] == params[1]);
} }
} }

5
src/main/java/emu/grasscutter/server/packet/recv/HandlerCancelCoopTaskReq.java
View File

@@ -11,10 +11,11 @@ public class HandlerCancelCoopTaskReq extends PacketHandler {
@Override @Override
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
CancelCoopTaskReqOuterClass.CancelCoopTaskReq req = CancelCoopTaskReqOuterClass.CancelCoopTaskReq.parseFrom(payload); CancelCoopTaskReqOuterClass.CancelCoopTaskReq req =
CancelCoopTaskReqOuterClass.CancelCoopTaskReq.parseFrom(payload);
var chapterId = req.getChapterId(); var chapterId = req.getChapterId();
Grasscutter.getLogger().warn("Call to unimplemented packet CancelCoopTaskReq"); Grasscutter.getLogger().warn("Call to unimplemented packet CancelCoopTaskReq");
// TODO: Actually cancel the quests. // TODO: Actually cancel the quests.
session.send(new PacketCancelCoopTaskRsp(chapterId)); session.send(new PacketCancelCoopTaskRsp(chapterId));
} }
} }

13
src/main/java/emu/grasscutter/server/packet/recv/HandlerStartCoopPointReq.java
View File

@@ -12,15 +12,20 @@ public class HandlerStartCoopPointReq extends PacketHandler {
@Override @Override
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
StartCoopPointReqOuterClass.StartCoopPointReq req = StartCoopPointReqOuterClass.StartCoopPointReq.parseFrom(payload); StartCoopPointReqOuterClass.StartCoopPointReq req =
StartCoopPointReqOuterClass.StartCoopPointReq.parseFrom(payload);
var coopPoint = req.getCoopPoint(); var coopPoint = req.getCoopPoint();
var coopPointData = GameData.getCoopPointDataMap().values().stream().filter(i -> i.getId() == coopPoint).toList(); var coopPointData =
GameData.getCoopPointDataMap().values().stream()
.filter(i -> i.getId() == coopPoint)
.toList();
if (!coopPointData.isEmpty()) { if (!coopPointData.isEmpty()) {
var player = session.getPlayer(); var player = session.getPlayer();
var questManager = player.getQuestManager(); var questManager = player.getQuestManager();
questManager.queueEvent(QuestCond.QUEST_COND_MAIN_COOP_START, coopPointData.get(0).getChapterId(), 0); questManager.queueEvent(
QuestCond.QUEST_COND_MAIN_COOP_START, coopPointData.get(0).getChapterId(), 0);
} }
session.send(new PacketStartCoopPointRsp(coopPoint)); session.send(new PacketStartCoopPointRsp(coopPoint));
} }
} }

2
src/main/java/emu/grasscutter/server/packet/send/PacketCancelCoopTaskRsp.java
View File

@@ -13,4 +13,4 @@ public class PacketCancelCoopTaskRsp extends BasePacket {
this.setData(proto); this.setData(proto);
} }
} }

44
src/main/java/emu/grasscutter/server/packet/send/PacketCoopDataNotify.java
View File

@@ -14,32 +14,36 @@ public class PacketCoopDataNotify extends BasePacket {
var proto = CoopDataNotifyOuterClass.CoopDataNotify.newBuilder(); var proto = CoopDataNotifyOuterClass.CoopDataNotify.newBuilder();
proto.setIsHaveProgress(false); proto.setIsHaveProgress(false);
// TODO: implement: determine the actual current progress point. // TODO: implement: determine the actual current progress point.
// Add every chapter and add the start point to each chapter regardless of actual progress. // Add every chapter and add the start point to each chapter regardless of actual progress.
GameData.getCoopChapterDataMap().values().forEach(i -> { GameData.getCoopChapterDataMap()
var chapter = CoopChapterOuterClass.CoopChapter.newBuilder(); .values()
chapter.setId(i.getId()); .forEach(
i -> {
var chapter = CoopChapterOuterClass.CoopChapter.newBuilder();
chapter.setId(i.getId());
// TODO: implement: look at unlockCond to determine what state each chapter should be in. // TODO: implement: look at unlockCond to determine what state each chapter should be
// Set every chapter to "Accept" regardless of accept conditions. // in.
chapter.setStateValue(3); // 3 == STATE_ACCEPT // Set every chapter to "Accept" regardless of accept conditions.
chapter.setStateValue(3); // 3 == STATE_ACCEPT
var point = CoopPointOuterClass.CoopPoint.newBuilder(); var point = CoopPointOuterClass.CoopPoint.newBuilder();
var pointList = GameData.getCoopPointDataMap().values().stream() var pointList =
.filter(j -> j.getChapterId() == i.getId() && j.getType().equals("POINT_START")) GameData.getCoopPointDataMap().values().stream()
.toList(); .filter(
j -> j.getChapterId() == i.getId() && j.getType().equals("POINT_START"))
.toList();
if (!pointList.isEmpty()) { if (!pointList.isEmpty()) {
int pointId = pointList.get(0).getId(); int pointId = pointList.get(0).getId();
point.setId(pointId); point.setId(pointId);
chapter.addCoopPointList(point); chapter.addCoopPointList(point);
} }
proto.addChapterList(chapter); proto.addChapterList(chapter);
}); });
this.setData(proto); this.setData(proto);
} }
} }

2
src/main/java/emu/grasscutter/server/packet/send/PacketStartCoopPointRsp.java
View File

@@ -13,4 +13,4 @@ public class PacketStartCoopPointRsp extends BasePacket {
this.setData(proto); this.setData(proto);
} }
} }