mirror of
https://github.com/Melledy/Grasscutter.git
synced 2024-11-26 05:04:20 +00:00
quest fix & personal line impl
This commit is contained in:
parent
0141dcebea
commit
a788828a99
13
proto/AddQuestContentProgressReq.proto
Normal file
13
proto/AddQuestContentProgressReq.proto
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
// CmdId: 417
|
||||||
|
// EnetChannelId: 0
|
||||||
|
// EnetIsReliable: true
|
||||||
|
// IsAllowClient: true
|
||||||
|
message AddQuestContentProgressReq {
|
||||||
|
uint32 content_type = 9;
|
||||||
|
uint32 param = 13;
|
||||||
|
uint32 add_progress = 11;
|
||||||
|
}
|
11
proto/AddQuestContentProgressRsp.proto
Normal file
11
proto/AddQuestContentProgressRsp.proto
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
// CmdId: 485
|
||||||
|
// EnetChannelId: 0
|
||||||
|
// EnetIsReliable: true
|
||||||
|
message AddQuestContentProgressRsp {
|
||||||
|
int32 retcode = 10;
|
||||||
|
uint32 content_type = 7;
|
||||||
|
}
|
10
proto/ChapterState.proto
Normal file
10
proto/ChapterState.proto
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
enum ChapterState {
|
||||||
|
CHAPTER_STATE_INVALID = 0;
|
||||||
|
CHAPTER_STATE_UNABLE_TO_BEGIN = 1;
|
||||||
|
CHAPTER_STATE_BEGIN = 2;
|
||||||
|
CHAPTER_STATE_END = 3;
|
||||||
|
}
|
25
proto/ChapterStateNotify.proto
Normal file
25
proto/ChapterStateNotify.proto
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
import "ChapterState.proto";
|
||||||
|
|
||||||
|
// CmdId: 498
|
||||||
|
// EnetChannelId: 0
|
||||||
|
// EnetIsReliable: true
|
||||||
|
message ChapterStateNotify {
|
||||||
|
uint32 chapter_id = 1;
|
||||||
|
ChapterState chapter_state = 12;
|
||||||
|
NeedPlayerLevel need_player_level = 10;
|
||||||
|
NeedBeginTime need_begin_time = 14;
|
||||||
|
|
||||||
|
message NeedPlayerLevel {
|
||||||
|
bool is_limit = 1;
|
||||||
|
uint32 config_need_player_level = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message NeedBeginTime {
|
||||||
|
bool is_limit = 1;
|
||||||
|
uint32 config_need_begin_time = 2;
|
||||||
|
}
|
||||||
|
}
|
17
proto/EvtEntityRenderersChangedNotify.proto
Normal file
17
proto/EvtEntityRenderersChangedNotify.proto
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
import "EntityRendererChangedInfo.proto";
|
||||||
|
import "ForwardType.proto";
|
||||||
|
|
||||||
|
// CmdId: 354
|
||||||
|
// EnetChannelId: 0
|
||||||
|
// EnetIsReliable: true
|
||||||
|
// IsAllowClient: true
|
||||||
|
message EvtEntityRenderersChangedNotify {
|
||||||
|
ForwardType forward_type = 2;
|
||||||
|
uint32 entity_id = 7;
|
||||||
|
bool is_server_cache = 15;
|
||||||
|
EntityRendererChangedInfo renderer_changed_info = 3;
|
||||||
|
}
|
17
proto/LockedPersonallineData.proto
Normal file
17
proto/LockedPersonallineData.proto
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
message LockedPersonallineData {
|
||||||
|
uint32 personal_line_id = 1;
|
||||||
|
LockReason lock_reason = 2;
|
||||||
|
oneof param {
|
||||||
|
uint32 chapter_id = 3;
|
||||||
|
uint32 level = 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
enum LockReason {
|
||||||
|
LOCK_REASON_LEVEL = 0;
|
||||||
|
LOCK_REASON_QUEST = 1;
|
||||||
|
}
|
||||||
|
}
|
10
proto/PersonalLineAllDataReq.proto
Normal file
10
proto/PersonalLineAllDataReq.proto
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
// CmdId: 446
|
||||||
|
// EnetChannelId: 0
|
||||||
|
// EnetIsReliable: true
|
||||||
|
// IsAllowClient: true
|
||||||
|
message PersonalLineAllDataReq {
|
||||||
|
}
|
17
proto/PersonalLineAllDataRsp.proto
Normal file
17
proto/PersonalLineAllDataRsp.proto
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
import "LockedPersonallineData.proto";
|
||||||
|
|
||||||
|
// CmdId: 433
|
||||||
|
// EnetChannelId: 0
|
||||||
|
// EnetIsReliable: true
|
||||||
|
message PersonalLineAllDataRsp {
|
||||||
|
int32 retcode = 1;
|
||||||
|
uint32 cur_finished_daily_task_count = 4;
|
||||||
|
uint32 legendary_key_count = 3;
|
||||||
|
repeated uint32 ongoing_personal_line_list = 13;
|
||||||
|
repeated uint32 can_be_unlocked_personal_line_list = 12;
|
||||||
|
repeated LockedPersonallineData locked_personal_line_list = 14;
|
||||||
|
}
|
8
proto/QueryFilter.proto
Normal file
8
proto/QueryFilter.proto
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
message QueryFilter {
|
||||||
|
int32 type_id = 1;
|
||||||
|
int32 area_mask = 2;
|
||||||
|
}
|
28
proto/QueryPathReq.proto
Normal file
28
proto/QueryPathReq.proto
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
import "QueryFilter.proto";
|
||||||
|
import "Vector.proto";
|
||||||
|
import "Vector3Int.proto";
|
||||||
|
|
||||||
|
// CmdId: 2309
|
||||||
|
// EnetChannelId: 0
|
||||||
|
// EnetIsReliable: true
|
||||||
|
// IsAllowClient: true
|
||||||
|
message QueryPathReq {
|
||||||
|
OptionType query_type = 9;
|
||||||
|
int32 query_id = 4;
|
||||||
|
uint32 scene_id = 8;
|
||||||
|
Vector source_pos = 14;
|
||||||
|
repeated Vector destination_pos = 11;
|
||||||
|
QueryFilter filter = 5;
|
||||||
|
Vector3Int destination_extend = 7;
|
||||||
|
Vector3Int source_extend = 15;
|
||||||
|
|
||||||
|
enum OptionType {
|
||||||
|
OPTION_TYPE_NONE = 0;
|
||||||
|
OPTION_TYPE_NORMAL = 1;
|
||||||
|
OPTION_TYPE_FIRST_CAN_GO = 2;
|
||||||
|
}
|
||||||
|
}
|
21
proto/QueryPathRsp.proto
Normal file
21
proto/QueryPathRsp.proto
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
import "Vector.proto";
|
||||||
|
|
||||||
|
// CmdId: 2331
|
||||||
|
// EnetChannelId: 0
|
||||||
|
// EnetIsReliable: true
|
||||||
|
message QueryPathRsp {
|
||||||
|
int32 retcode = 14;
|
||||||
|
int32 query_id = 2;
|
||||||
|
PathStatusType query_status = 5;
|
||||||
|
repeated Vector corners = 12;
|
||||||
|
|
||||||
|
enum PathStatusType {
|
||||||
|
PATH_STATUS_TYPE_FAIL = 0;
|
||||||
|
PATH_STATUS_TYPE_SUCC = 1;
|
||||||
|
PATH_STATUS_TYPE_PARTIAL = 2;
|
||||||
|
}
|
||||||
|
}
|
11
proto/UnlockPersonalLineReq.proto
Normal file
11
proto/UnlockPersonalLineReq.proto
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
// CmdId: 476
|
||||||
|
// EnetChannelId: 0
|
||||||
|
// EnetIsReliable: true
|
||||||
|
// IsAllowClient: true
|
||||||
|
message UnlockPersonalLineReq {
|
||||||
|
uint32 personal_line_id = 8;
|
||||||
|
}
|
15
proto/UnlockPersonalLineRsp.proto
Normal file
15
proto/UnlockPersonalLineRsp.proto
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
// CmdId: 472
|
||||||
|
// EnetChannelId: 0
|
||||||
|
// EnetIsReliable: true
|
||||||
|
message UnlockPersonalLineRsp {
|
||||||
|
int32 retcode = 7;
|
||||||
|
uint32 personal_line_id = 8;
|
||||||
|
oneof param {
|
||||||
|
uint32 level = 1;
|
||||||
|
uint32 chapter_id = 15;
|
||||||
|
}
|
||||||
|
}
|
9
proto/Vector3Int.proto
Normal file
9
proto/Vector3Int.proto
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option java_package = "emu.grasscutter.net.proto";
|
||||||
|
|
||||||
|
message Vector3Int {
|
||||||
|
int32 x = 1;
|
||||||
|
int32 y = 2;
|
||||||
|
int32 z = 3;
|
||||||
|
}
|
@ -104,6 +104,8 @@ public class GameData {
|
|||||||
@Getter private static final Int2ObjectMap<ActivityData> activityDataMap = new Int2ObjectOpenHashMap<>();
|
@Getter private static final Int2ObjectMap<ActivityData> activityDataMap = new Int2ObjectOpenHashMap<>();
|
||||||
@Getter private static final Int2ObjectMap<ActivityWatcherData> activityWatcherDataMap = new Int2ObjectOpenHashMap<>();
|
@Getter private static final Int2ObjectMap<ActivityWatcherData> activityWatcherDataMap = new Int2ObjectOpenHashMap<>();
|
||||||
@Getter private static final Int2ObjectMap<MusicGameBasicData> musicGameBasicDataMap = new Int2ObjectOpenHashMap<>();
|
@Getter private static final Int2ObjectMap<MusicGameBasicData> musicGameBasicDataMap = new Int2ObjectOpenHashMap<>();
|
||||||
|
@Getter private static final Int2ObjectMap<PersonalLineData> personalLineDataMap = new Int2ObjectOpenHashMap<>();
|
||||||
|
@Getter private static final Int2ObjectMap<ChapterData> chapterDataMap = new Int2ObjectOpenHashMap<>();
|
||||||
|
|
||||||
// Cache
|
// Cache
|
||||||
private static Map<Integer, List<Integer>> fetters = new HashMap<>();
|
private static Map<Integer, List<Integer>> fetters = new HashMap<>();
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
package emu.grasscutter.data.binout;
|
package emu.grasscutter.data.binout;
|
||||||
|
|
||||||
import emu.grasscutter.game.quest.enums.LogicType;
|
|
||||||
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
|
||||||
import emu.grasscutter.game.quest.enums.QuestType;
|
import emu.grasscutter.game.quest.enums.QuestType;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
public class MainQuestData {
|
public class MainQuestData {
|
||||||
private int id;
|
private int id;
|
||||||
@ -43,11 +42,9 @@ public class MainQuestData {
|
|||||||
return subQuests;
|
return subQuests;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Data
|
||||||
public static class SubQuestData {
|
public static class SubQuestData {
|
||||||
private int subId;
|
private int subId;
|
||||||
|
private int order;
|
||||||
public int getSubId() {
|
|
||||||
return subId;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
37
src/main/java/emu/grasscutter/data/excels/ChapterData.java
Normal file
37
src/main/java/emu/grasscutter/data/excels/ChapterData.java
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
package emu.grasscutter.data.excels;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.GameResource;
|
||||||
|
import emu.grasscutter.data.ResourceType;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
import lombok.experimental.FieldDefaults;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@ResourceType(name = "ChapterExcelConfigData.json")
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@FieldDefaults(level = AccessLevel.PRIVATE)
|
||||||
|
public class ChapterData extends GameResource {
|
||||||
|
int id;
|
||||||
|
int beginQuestId;
|
||||||
|
int endQuestId;
|
||||||
|
int needPlayerLevel;
|
||||||
|
|
||||||
|
public static final Map<Integer, ChapterData> beginQuestChapterMap = new HashMap<>();
|
||||||
|
public static final Map<Integer, ChapterData> endQuestChapterMap = new HashMap<>();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getId() {
|
||||||
|
return this.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onLoad() {
|
||||||
|
beginQuestChapterMap.put(beginQuestId, this);
|
||||||
|
beginQuestChapterMap.put(endQuestId, this);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,28 @@
|
|||||||
|
package emu.grasscutter.data.excels;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.GameResource;
|
||||||
|
import emu.grasscutter.data.ResourceType;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
import lombok.experimental.FieldDefaults;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@ResourceType(name = "PersonalLineExcelConfigData.json")
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@FieldDefaults(level = AccessLevel.PRIVATE)
|
||||||
|
public class PersonalLineData extends GameResource {
|
||||||
|
int id;
|
||||||
|
int avatarID;
|
||||||
|
List<Integer> preQuestId;
|
||||||
|
int startQuestId;
|
||||||
|
int chapterId;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getId() {
|
||||||
|
return this.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -3,12 +3,20 @@ package emu.grasscutter.data.excels;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.google.gson.annotations.SerializedName;
|
||||||
import emu.grasscutter.data.GameResource;
|
import emu.grasscutter.data.GameResource;
|
||||||
import emu.grasscutter.data.ResourceType;
|
import emu.grasscutter.data.ResourceType;
|
||||||
import emu.grasscutter.game.quest.enums.LogicType;
|
import emu.grasscutter.game.quest.enums.LogicType;
|
||||||
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.ToString;
|
||||||
|
import lombok.experimental.FieldDefaults;
|
||||||
|
|
||||||
@ResourceType(name = "QuestExcelConfigData.json")
|
@ResourceType(name = "QuestExcelConfigData.json")
|
||||||
|
@Getter
|
||||||
|
@ToString
|
||||||
public class QuestData extends GameResource {
|
public class QuestData extends GameResource {
|
||||||
private int subId;
|
private int subId;
|
||||||
private int mainId;
|
private int mainId;
|
||||||
@ -19,15 +27,12 @@ public class QuestData extends GameResource {
|
|||||||
private boolean isRewind;
|
private boolean isRewind;
|
||||||
|
|
||||||
private LogicType acceptCondComb;
|
private LogicType acceptCondComb;
|
||||||
private QuestCondition[] acceptConditons;
|
|
||||||
private LogicType finishCondComb;
|
private LogicType finishCondComb;
|
||||||
private QuestCondition[] finishConditons;
|
|
||||||
private LogicType failCondComb;
|
private LogicType failCondComb;
|
||||||
private QuestCondition[] failConditons;
|
|
||||||
|
|
||||||
private List<QuestParam> acceptCond;
|
private List<QuestCondition> acceptCond;
|
||||||
private List<QuestParam> finishCond;
|
private List<QuestCondition> finishCond;
|
||||||
private List<QuestParam> failCond;
|
private List<QuestCondition> failCond;
|
||||||
private List<QuestExecParam> beginExec;
|
private List<QuestExecParam> beginExec;
|
||||||
private List<QuestExecParam> finishExec;
|
private List<QuestExecParam> finishExec;
|
||||||
private List<QuestExecParam> failExec;
|
private List<QuestExecParam> failExec;
|
||||||
@ -60,67 +65,57 @@ public class QuestData extends GameResource {
|
|||||||
return acceptCondComb;
|
return acceptCondComb;
|
||||||
}
|
}
|
||||||
|
|
||||||
public QuestCondition[] getAcceptCond() {
|
public List<QuestCondition> getAcceptCond() {
|
||||||
return acceptConditons;
|
return acceptCond;
|
||||||
}
|
}
|
||||||
|
|
||||||
public LogicType getFinishCondComb() {
|
public LogicType getFinishCondComb() {
|
||||||
return finishCondComb;
|
return finishCondComb;
|
||||||
}
|
}
|
||||||
|
|
||||||
public QuestCondition[] getFinishCond() {
|
public List<QuestCondition> getFinishCond() {
|
||||||
return finishConditons;
|
return finishCond;
|
||||||
}
|
}
|
||||||
|
|
||||||
public LogicType getFailCondComb() {
|
public LogicType getFailCondComb() {
|
||||||
return failCondComb;
|
return failCondComb;
|
||||||
}
|
}
|
||||||
|
|
||||||
public QuestCondition[] getFailCond() {
|
public List<QuestCondition> getFailCond() {
|
||||||
return failConditons;
|
return failCond;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onLoad() {
|
public void onLoad() {
|
||||||
this.acceptConditons = acceptCond.stream().filter(p -> p._type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
|
this.acceptCond = acceptCond.stream().filter(p -> p.type != null).toList();
|
||||||
acceptCond = null;
|
this.finishCond = finishCond.stream().filter(p -> p.type != null).toList();
|
||||||
this.finishConditons = finishCond.stream().filter(p -> p._type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
|
this.failCond = failCond.stream().filter(p -> p.type != null).toList();
|
||||||
finishCond = null;
|
|
||||||
this.failConditons = failCond.stream().filter(p -> p._type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
|
this.beginExec = beginExec.stream().filter(p -> p.type != null).toList();
|
||||||
failCond = null;
|
this.finishExec = finishExec.stream().filter(p -> p.type != null).toList();
|
||||||
}
|
this.failExec = failExec.stream().filter(p -> p.type != null).toList();
|
||||||
|
|
||||||
public class QuestParam {
|
|
||||||
QuestTrigger _type;
|
|
||||||
int[] _param;
|
|
||||||
String _count;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@FieldDefaults(level = AccessLevel.PRIVATE)
|
||||||
public class QuestExecParam {
|
public class QuestExecParam {
|
||||||
QuestTrigger _type;
|
@SerializedName("_type")
|
||||||
String[] _param;
|
QuestTrigger type;
|
||||||
String _count;
|
@SerializedName("_param")
|
||||||
|
String[] param;
|
||||||
|
@SerializedName("_count")
|
||||||
|
String count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Data
|
||||||
public static class QuestCondition {
|
public static class QuestCondition {
|
||||||
|
@SerializedName("_type")
|
||||||
private QuestTrigger type;
|
private QuestTrigger type;
|
||||||
|
@SerializedName("_param")
|
||||||
private int[] param;
|
private int[] param;
|
||||||
|
@SerializedName("_param_str")
|
||||||
|
private String paramStr;
|
||||||
|
@SerializedName("_count")
|
||||||
private String count;
|
private String count;
|
||||||
|
|
||||||
public QuestCondition(QuestParam param) {
|
|
||||||
this.type = param._type;
|
|
||||||
this.param = param._param;
|
|
||||||
}
|
|
||||||
|
|
||||||
public QuestTrigger getType() {
|
|
||||||
return type;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int[] getParam() {
|
|
||||||
return param;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getCount() {
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -271,6 +271,8 @@ public class Inventory implements Iterable<GameItem> {
|
|||||||
this.player.getServer().getInventoryManager().upgradeAvatarFetterLevel(this.player, this.player.getTeamManager().getCurrentAvatarEntity().getAvatar(), count);
|
this.player.getServer().getInventoryManager().upgradeAvatarFetterLevel(this.player, this.player.getTeamManager().getCurrentAvatarEntity().getAvatar(), count);
|
||||||
case 106 -> // Resin
|
case 106 -> // Resin
|
||||||
this.player.getResinManager().addResin(count);
|
this.player.getResinManager().addResin(count);
|
||||||
|
case 107 -> // Legendary Key
|
||||||
|
this.player.addLegendaryKey(count);
|
||||||
case 201 -> // Primogem
|
case 201 -> // Primogem
|
||||||
this.player.setPrimogems(this.player.getPrimogems() + count);
|
this.player.setPrimogems(this.player.getPrimogems() + count);
|
||||||
case 202 -> // Mora
|
case 202 -> // Mora
|
||||||
@ -292,6 +294,8 @@ public class Inventory implements Iterable<GameItem> {
|
|||||||
return this.player.getCrystals();
|
return this.player.getCrystals();
|
||||||
case 106: // Resin
|
case 106: // Resin
|
||||||
return this.player.getProperty(PlayerProperty.PROP_PLAYER_RESIN);
|
return this.player.getProperty(PlayerProperty.PROP_PLAYER_RESIN);
|
||||||
|
case 107: // Legendary Key
|
||||||
|
return this.player.getProperty(PlayerProperty.PROP_PLAYER_LEGENDARY_KEY);
|
||||||
case 204: // Home Coin
|
case 204: // Home Coin
|
||||||
return this.player.getHomeCoin();
|
return this.player.getHomeCoin();
|
||||||
default:
|
default:
|
||||||
@ -334,6 +338,8 @@ public class Inventory implements Iterable<GameItem> {
|
|||||||
player.setCrystals(player.getCrystals() - (cost.getCount() * quantity));
|
player.setCrystals(player.getCrystals() - (cost.getCount() * quantity));
|
||||||
case 106 -> // Resin
|
case 106 -> // Resin
|
||||||
player.getResinManager().useResin(cost.getCount() * quantity);
|
player.getResinManager().useResin(cost.getCount() * quantity);
|
||||||
|
case 107 -> // LegendaryKey
|
||||||
|
player.useLegendaryKey(cost.getCount() * quantity);
|
||||||
case 204 -> // Home Coin
|
case 204 -> // Home Coin
|
||||||
player.setHomeCoin(player.getHomeCoin() - (cost.getCount() * quantity));
|
player.setHomeCoin(player.getHomeCoin() - (cost.getCount() * quantity));
|
||||||
default ->
|
default ->
|
||||||
|
@ -4,10 +4,10 @@ import dev.morphia.annotations.*;
|
|||||||
import emu.grasscutter.GameConstants;
|
import emu.grasscutter.GameConstants;
|
||||||
import emu.grasscutter.Grasscutter;
|
import emu.grasscutter.Grasscutter;
|
||||||
import emu.grasscutter.data.GameData;
|
import emu.grasscutter.data.GameData;
|
||||||
|
import emu.grasscutter.data.excels.PersonalLineData;
|
||||||
import emu.grasscutter.data.excels.PlayerLevelData;
|
import emu.grasscutter.data.excels.PlayerLevelData;
|
||||||
import emu.grasscutter.data.excels.WeatherData;
|
import emu.grasscutter.data.excels.WeatherData;
|
||||||
import emu.grasscutter.database.DatabaseHelper;
|
import emu.grasscutter.database.DatabaseHelper;
|
||||||
import emu.grasscutter.database.DatabaseManager;
|
|
||||||
import emu.grasscutter.game.Account;
|
import emu.grasscutter.game.Account;
|
||||||
import emu.grasscutter.game.CoopRequest;
|
import emu.grasscutter.game.CoopRequest;
|
||||||
import emu.grasscutter.game.ability.AbilityManager;
|
import emu.grasscutter.game.ability.AbilityManager;
|
||||||
@ -1597,7 +1597,17 @@ public class Player {
|
|||||||
getServer().getPlayers().values().removeIf(player1 -> player1 == this);
|
getServer().getPlayers().values().removeIf(player1 -> player1 == this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum SceneLoadState {
|
public int getLegendaryKey() {
|
||||||
|
return this.getProperty(PlayerProperty.PROP_PLAYER_LEGENDARY_KEY);
|
||||||
|
}
|
||||||
|
public synchronized void addLegendaryKey(int count) {
|
||||||
|
this.setProperty(PlayerProperty.PROP_PLAYER_LEGENDARY_KEY, getLegendaryKey() + count);
|
||||||
|
}
|
||||||
|
public synchronized void useLegendaryKey(int count) {
|
||||||
|
this.setProperty(PlayerProperty.PROP_PLAYER_LEGENDARY_KEY, getLegendaryKey() - count);
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum SceneLoadState {
|
||||||
NONE(0), LOADING(1), INIT(2), LOADED(3);
|
NONE(0), LOADING(1), INIT(2), LOADED(3);
|
||||||
|
|
||||||
private final int value;
|
private final int value;
|
||||||
|
@ -39,7 +39,7 @@ public enum PlayerProperty {
|
|||||||
PROP_IS_ONLY_MP_WITH_PS_PLAYER (10024, 0, 1), // Is only MP with PlayStation players? [0, 1]
|
PROP_IS_ONLY_MP_WITH_PS_PLAYER (10024, 0, 1), // Is only MP with PlayStation players? [0, 1]
|
||||||
PROP_PLAYER_MCOIN (10025), // Genesis Crystal (-inf, +inf) see 10015
|
PROP_PLAYER_MCOIN (10025), // Genesis Crystal (-inf, +inf) see 10015
|
||||||
PROP_PLAYER_WAIT_SUB_MCOIN (10026),
|
PROP_PLAYER_WAIT_SUB_MCOIN (10026),
|
||||||
PROP_PLAYER_LEGENDARY_KEY (10027),
|
PROP_PLAYER_LEGENDARY_KEY (10027,0),
|
||||||
PROP_IS_HAS_FIRST_SHARE (10028),
|
PROP_IS_HAS_FIRST_SHARE (10028),
|
||||||
PROP_PLAYER_FORGE_POINT (10029, 0, 300_000),
|
PROP_PLAYER_FORGE_POINT (10029, 0, 300_000),
|
||||||
PROP_CUR_CLIMATE_METER (10035),
|
PROP_CUR_CLIMATE_METER (10035),
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
package emu.grasscutter.game.quest;
|
package emu.grasscutter.game.quest;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.*;
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import emu.grasscutter.server.packet.send.PacketCodexDataUpdateNotify;
|
import emu.grasscutter.server.packet.send.PacketCodexDataUpdateNotify;
|
||||||
import org.bson.types.ObjectId;
|
import org.bson.types.ObjectId;
|
||||||
@ -41,6 +40,7 @@ public class GameMainQuest {
|
|||||||
private int[] questVars;
|
private int[] questVars;
|
||||||
private ParentQuestState state;
|
private ParentQuestState state;
|
||||||
private boolean isFinished;
|
private boolean isFinished;
|
||||||
|
List<QuestGroupSuite> questGroupSuites;
|
||||||
|
|
||||||
@Deprecated // Morphia only. Do not use.
|
@Deprecated // Morphia only. Do not use.
|
||||||
public GameMainQuest() {}
|
public GameMainQuest() {}
|
||||||
@ -52,6 +52,7 @@ public class GameMainQuest {
|
|||||||
this.childQuests = new HashMap<>();
|
this.childQuests = new HashMap<>();
|
||||||
this.questVars = new int[5];
|
this.questVars = new int[5];
|
||||||
this.state = ParentQuestState.PARENT_QUEST_STATE_NONE;
|
this.state = ParentQuestState.PARENT_QUEST_STATE_NONE;
|
||||||
|
this.questGroupSuites = new ArrayList<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getParentQuestId() {
|
public int getParentQuestId() {
|
||||||
@ -91,7 +92,11 @@ public class GameMainQuest {
|
|||||||
return isFinished;
|
return isFinished;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void finish() {
|
public List<QuestGroupSuite> getQuestGroupSuites() {
|
||||||
|
return questGroupSuites;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void finish() {
|
||||||
this.isFinished = true;
|
this.isFinished = true;
|
||||||
this.state = ParentQuestState.PARENT_QUEST_STATE_FINISHED;
|
this.state = ParentQuestState.PARENT_QUEST_STATE_FINISHED;
|
||||||
|
|
||||||
@ -111,6 +116,12 @@ public class GameMainQuest {
|
|||||||
|
|
||||||
getOwner().getInventory().addItemParamDatas(rewardData.getRewardItemList(), ActionReason.QuestReward);
|
getOwner().getInventory().addItemParamDatas(rewardData.getRewardItemList(), ActionReason.QuestReward);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// handoff main quest
|
||||||
|
if(mainQuestData.getSuggestTrackMainQuestList() != null){
|
||||||
|
Arrays.stream(mainQuestData.getSuggestTrackMainQuestList())
|
||||||
|
.forEach(getOwner().getQuestManager()::startMainQuest);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void save() {
|
public void save() {
|
||||||
|
@ -6,13 +6,16 @@ import emu.grasscutter.Grasscutter;
|
|||||||
import emu.grasscutter.data.GameData;
|
import emu.grasscutter.data.GameData;
|
||||||
import emu.grasscutter.data.binout.MainQuestData;
|
import emu.grasscutter.data.binout.MainQuestData;
|
||||||
import emu.grasscutter.data.binout.MainQuestData.SubQuestData;
|
import emu.grasscutter.data.binout.MainQuestData.SubQuestData;
|
||||||
|
import emu.grasscutter.data.excels.ChapterData;
|
||||||
import emu.grasscutter.data.excels.QuestData;
|
import emu.grasscutter.data.excels.QuestData;
|
||||||
import emu.grasscutter.data.excels.QuestData.QuestCondition;
|
import emu.grasscutter.data.excels.QuestData.QuestCondition;
|
||||||
import emu.grasscutter.game.player.Player;
|
import emu.grasscutter.game.player.Player;
|
||||||
import emu.grasscutter.game.quest.enums.LogicType;
|
import emu.grasscutter.game.quest.enums.LogicType;
|
||||||
import emu.grasscutter.game.quest.enums.QuestState;
|
import emu.grasscutter.game.quest.enums.QuestState;
|
||||||
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
|
import emu.grasscutter.net.proto.ChapterStateOuterClass;
|
||||||
import emu.grasscutter.net.proto.QuestOuterClass.Quest;
|
import emu.grasscutter.net.proto.QuestOuterClass.Quest;
|
||||||
import emu.grasscutter.server.packet.send.PacketCodexDataUpdateNotify;
|
import emu.grasscutter.server.packet.send.PacketChapterStateNotify;
|
||||||
import emu.grasscutter.server.packet.send.PacketQuestListUpdateNotify;
|
import emu.grasscutter.server.packet.send.PacketQuestListUpdateNotify;
|
||||||
import emu.grasscutter.server.packet.send.PacketQuestProgressUpdateNotify;
|
import emu.grasscutter.server.packet.send.PacketQuestProgressUpdateNotify;
|
||||||
import emu.grasscutter.utils.Utils;
|
import emu.grasscutter.utils.Utils;
|
||||||
@ -45,15 +48,28 @@ public class GameQuest {
|
|||||||
this.startTime = this.acceptTime;
|
this.startTime = this.acceptTime;
|
||||||
this.state = QuestState.QUEST_STATE_UNFINISHED;
|
this.state = QuestState.QUEST_STATE_UNFINISHED;
|
||||||
|
|
||||||
if (questData.getFinishCond() != null && questData.getAcceptCond().length != 0) {
|
if (questData.getFinishCond() != null && questData.getAcceptCond().size() != 0) {
|
||||||
this.finishProgressList = new int[questData.getFinishCond().length];
|
this.finishProgressList = new int[questData.getFinishCond().size()];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (questData.getFailCond() != null && questData.getFailCond().length != 0) {
|
if (questData.getFailCond() != null && questData.getFailCond().size() != 0) {
|
||||||
this.failProgressList = new int[questData.getFailCond().length];
|
this.failProgressList = new int[questData.getFailCond().size()];
|
||||||
}
|
}
|
||||||
|
|
||||||
this.mainQuest.getChildQuests().put(this.questId, this);
|
this.mainQuest.getChildQuests().put(this.questId, this);
|
||||||
|
|
||||||
|
this.getData().getBeginExec().forEach(e -> getOwner().getServer().getQuestHandler().triggerExec(this, e, e.getParam()));
|
||||||
|
|
||||||
|
this.getOwner().getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_QUEST_STATE_EQUAL, this.questId, this.state.getValue());
|
||||||
|
|
||||||
|
if (ChapterData.beginQuestChapterMap.containsKey(questId)){
|
||||||
|
mainQuest.getOwner().sendPacket(new PacketChapterStateNotify(
|
||||||
|
ChapterData.beginQuestChapterMap.get(questId).getId(),
|
||||||
|
ChapterStateOuterClass.ChapterState.CHAPTER_STATE_BEGIN
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
Grasscutter.getLogger().debug("Quest {} is started", questId);
|
||||||
}
|
}
|
||||||
|
|
||||||
public GameMainQuest getMainQuest() {
|
public GameMainQuest getMainQuest() {
|
||||||
@ -154,6 +170,19 @@ public class GameQuest {
|
|||||||
this.tryAcceptQuestLine();
|
this.tryAcceptQuestLine();
|
||||||
this.save();
|
this.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.getData().getFinishExec().forEach(e -> getOwner().getServer().getQuestHandler().triggerExec(this, e, e.getParam()));
|
||||||
|
|
||||||
|
this.getOwner().getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_QUEST_STATE_EQUAL, this.questId, this.state.getValue());
|
||||||
|
|
||||||
|
if (ChapterData.endQuestChapterMap.containsKey(questId)){
|
||||||
|
mainQuest.getOwner().sendPacket(new PacketChapterStateNotify(
|
||||||
|
ChapterData.endQuestChapterMap.get(questId).getId(),
|
||||||
|
ChapterStateOuterClass.ChapterState.CHAPTER_STATE_END
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
Grasscutter.getLogger().debug("Quest {} is finished", questId);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean tryAcceptQuestLine() {
|
public boolean tryAcceptQuestLine() {
|
||||||
@ -167,16 +196,17 @@ public class GameQuest {
|
|||||||
QuestData questData = GameData.getQuestDataMap().get(subQuest.getSubId());
|
QuestData questData = GameData.getQuestDataMap().get(subQuest.getSubId());
|
||||||
|
|
||||||
if (questData == null || questData.getAcceptCond() == null
|
if (questData == null || questData.getAcceptCond() == null
|
||||||
|| questData.getAcceptCond().length == 0) {
|
|| questData.getAcceptCond().size() == 0) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
int[] accept = new int[questData.getAcceptCond().length];
|
int[] accept = new int[questData.getAcceptCond().size()];
|
||||||
|
|
||||||
// TODO
|
// TODO
|
||||||
for (int i = 0; i < questData.getAcceptCond().length; i++) {
|
for (int i = 0; i < questData.getAcceptCond().size(); i++) {
|
||||||
QuestCondition condition = questData.getAcceptCond()[i];
|
QuestCondition condition = questData.getAcceptCond().get(i);
|
||||||
boolean result = getOwner().getServer().getQuestHandler().triggerCondition(this, condition,
|
boolean result = getOwner().getServer().getQuestHandler().triggerCondition(this, condition,
|
||||||
|
condition.getParamStr(),
|
||||||
condition.getParam());
|
condition.getParam());
|
||||||
|
|
||||||
accept[i] = result ? 1 : 0;
|
accept[i] = result ? 1 : 0;
|
||||||
|
@ -0,0 +1,17 @@
|
|||||||
|
package emu.grasscutter.game.quest;
|
||||||
|
|
||||||
|
import dev.morphia.annotations.Entity;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.experimental.FieldDefaults;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Data
|
||||||
|
@Builder(builderMethodName = "of")
|
||||||
|
@FieldDefaults(level = AccessLevel.PRIVATE)
|
||||||
|
public class QuestGroupSuite {
|
||||||
|
int scene;
|
||||||
|
int group;
|
||||||
|
int suite;
|
||||||
|
}
|
@ -1,22 +1,21 @@
|
|||||||
package emu.grasscutter.game.quest;
|
package emu.grasscutter.game.quest;
|
||||||
|
|
||||||
import java.util.HashSet;
|
import java.util.*;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import emu.grasscutter.Grasscutter;
|
||||||
import emu.grasscutter.data.GameData;
|
import emu.grasscutter.data.GameData;
|
||||||
|
import emu.grasscutter.data.binout.MainQuestData;
|
||||||
import emu.grasscutter.data.excels.QuestData;
|
import emu.grasscutter.data.excels.QuestData;
|
||||||
import emu.grasscutter.data.excels.QuestData.QuestCondition;
|
import emu.grasscutter.data.excels.QuestData.QuestCondition;
|
||||||
import emu.grasscutter.database.DatabaseHelper;
|
import emu.grasscutter.database.DatabaseHelper;
|
||||||
import emu.grasscutter.game.player.Player;
|
import emu.grasscutter.game.player.Player;
|
||||||
|
import emu.grasscutter.game.quest.enums.ParentQuestState;
|
||||||
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
import emu.grasscutter.game.quest.enums.LogicType;
|
import emu.grasscutter.game.quest.enums.LogicType;
|
||||||
import emu.grasscutter.game.quest.enums.QuestState;
|
import emu.grasscutter.game.quest.enums.QuestState;
|
||||||
import emu.grasscutter.server.packet.send.PacketFinishedParentQuestUpdateNotify;
|
import emu.grasscutter.server.packet.send.*;
|
||||||
import emu.grasscutter.server.packet.send.PacketQuestListUpdateNotify;
|
|
||||||
import emu.grasscutter.server.packet.send.PacketQuestProgressUpdateNotify;
|
|
||||||
import emu.grasscutter.server.packet.send.PacketServerCondMeetQuestListUpdateNotify;
|
|
||||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||||
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
||||||
|
|
||||||
@ -122,27 +121,43 @@ public class QuestManager {
|
|||||||
|
|
||||||
return quest;
|
return quest;
|
||||||
}
|
}
|
||||||
|
public void startMainQuest(int mainQuestId){
|
||||||
|
var mainQuestData = GameData.getMainQuestDataMap().get(mainQuestId);
|
||||||
|
|
||||||
public void triggerEvent(QuestTrigger condType, int... params) {
|
if (mainQuestData == null){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Arrays.stream(mainQuestData.getSubQuests())
|
||||||
|
.min(Comparator.comparingInt(MainQuestData.SubQuestData::getOrder))
|
||||||
|
.map(MainQuestData.SubQuestData::getSubId)
|
||||||
|
.ifPresent(this::addQuest);
|
||||||
|
}
|
||||||
|
public void triggerEvent(QuestTrigger condType, int... params) {
|
||||||
|
triggerEvent(condType, "", params);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void triggerEvent(QuestTrigger condType, String paramStr, int... params) {
|
||||||
|
Grasscutter.getLogger().debug("Trigger Event {}, {}, {}", condType, paramStr, params);
|
||||||
Set<GameQuest> changedQuests = new HashSet<>();
|
Set<GameQuest> changedQuests = new HashSet<>();
|
||||||
|
|
||||||
this.forEachActiveQuest(quest -> {
|
this.forEachActiveQuest(quest -> {
|
||||||
QuestData data = quest.getData();
|
QuestData data = quest.getData();
|
||||||
|
|
||||||
for (int i = 0; i < data.getFinishCond().length; i++) {
|
for (int i = 0; i < data.getFinishCond().size(); i++) {
|
||||||
if (quest.getFinishProgressList() == null
|
if (quest.getFinishProgressList() == null
|
||||||
|| quest.getFinishProgressList().length == 0
|
|| quest.getFinishProgressList().length == 0
|
||||||
|| quest.getFinishProgressList()[i] == 1) {
|
|| quest.getFinishProgressList()[i] == 1) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
QuestCondition condition = data.getFinishCond()[i];
|
QuestCondition condition = data.getFinishCond().get(i);
|
||||||
|
|
||||||
if (condition.getType() != condType) {
|
if (condition.getType() != condType) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean result = getPlayer().getServer().getQuestHandler().triggerContent(quest, condition, params);
|
boolean result = getPlayer().getServer().getQuestHandler().triggerContent(quest, condition, paramStr, params);
|
||||||
|
|
||||||
if (result) {
|
if (result) {
|
||||||
quest.getFinishProgressList()[i] = 1;
|
quest.getFinishProgressList()[i] = 1;
|
||||||
@ -169,6 +184,15 @@ public class QuestManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<QuestGroupSuite> getSceneGroupSuite(int sceneId) {
|
||||||
|
return getQuests().values().stream()
|
||||||
|
.filter(i -> i.getState() != ParentQuestState.PARENT_QUEST_STATE_FINISHED)
|
||||||
|
.map(GameMainQuest::getQuestGroupSuites)
|
||||||
|
.filter(Objects::nonNull)
|
||||||
|
.flatMap(Collection::stream)
|
||||||
|
.filter(i -> i.getScene() == sceneId)
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
public void loadFromDatabase() {
|
public void loadFromDatabase() {
|
||||||
List<GameMainQuest> quests = DatabaseHelper.getAllQuests(getPlayer());
|
List<GameMainQuest> quests = DatabaseHelper.getAllQuests(getPlayer());
|
||||||
|
|
||||||
|
@ -2,10 +2,12 @@ package emu.grasscutter.game.quest;
|
|||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.excels.QuestData;
|
||||||
|
import emu.grasscutter.game.quest.handlers.QuestExecHandler;
|
||||||
import org.reflections.Reflections;
|
import org.reflections.Reflections;
|
||||||
|
|
||||||
import emu.grasscutter.Grasscutter;
|
import emu.grasscutter.Grasscutter;
|
||||||
import emu.grasscutter.data.excels.QuestData.QuestCondition;
|
import emu.grasscutter.data.excels.QuestData.*;
|
||||||
import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
||||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||||
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
||||||
@ -14,7 +16,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
|||||||
public class ServerQuestHandler {
|
public class ServerQuestHandler {
|
||||||
private final Int2ObjectMap<QuestBaseHandler> condHandlers;
|
private final Int2ObjectMap<QuestBaseHandler> condHandlers;
|
||||||
private final Int2ObjectMap<QuestBaseHandler> contHandlers;
|
private final Int2ObjectMap<QuestBaseHandler> contHandlers;
|
||||||
private final Int2ObjectMap<QuestBaseHandler> execHandlers;
|
private final Int2ObjectMap<QuestExecHandler> execHandlers;
|
||||||
|
|
||||||
public ServerQuestHandler() {
|
public ServerQuestHandler() {
|
||||||
this.condHandlers = new Int2ObjectOpenHashMap<>();
|
this.condHandlers = new Int2ObjectOpenHashMap<>();
|
||||||
@ -25,21 +27,21 @@ public class ServerQuestHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void registerHandlers() {
|
public void registerHandlers() {
|
||||||
this.registerHandlers(this.condHandlers, "emu.grasscutter.game.quest.conditions");
|
this.registerHandlers(this.condHandlers, "emu.grasscutter.game.quest.conditions", QuestBaseHandler.class);
|
||||||
this.registerHandlers(this.contHandlers, "emu.grasscutter.game.quest.content");
|
this.registerHandlers(this.contHandlers, "emu.grasscutter.game.quest.content", QuestBaseHandler.class);
|
||||||
this.registerHandlers(this.execHandlers, "emu.grasscutter.game.quest.exec");
|
this.registerHandlers(this.execHandlers, "emu.grasscutter.game.quest.exec", QuestExecHandler.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void registerHandlers(Int2ObjectMap<QuestBaseHandler> map, String packageName) {
|
public <T> void registerHandlers(Int2ObjectMap<T> map, String packageName, Class<T> clazz) {
|
||||||
Reflections reflections = new Reflections(packageName);
|
Reflections reflections = new Reflections(packageName);
|
||||||
Set<?> handlerClasses = reflections.getSubTypesOf(QuestBaseHandler.class);
|
var handlerClasses = reflections.getSubTypesOf(clazz);
|
||||||
|
|
||||||
for (Object obj : handlerClasses) {
|
for (var obj : handlerClasses) {
|
||||||
this.registerPacketHandler(map, (Class<? extends QuestBaseHandler>) obj);
|
this.registerPacketHandler(map, obj);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void registerPacketHandler(Int2ObjectMap<QuestBaseHandler> map, Class<? extends QuestBaseHandler> handlerClass) {
|
public <T> void registerPacketHandler(Int2ObjectMap<T> map, Class<? extends T> handlerClass) {
|
||||||
try {
|
try {
|
||||||
QuestValue opcode = handlerClass.getAnnotation(QuestValue.class);
|
QuestValue opcode = handlerClass.getAnnotation(QuestValue.class);
|
||||||
|
|
||||||
@ -47,9 +49,7 @@ public class ServerQuestHandler {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
QuestBaseHandler packetHandler = (QuestBaseHandler) handlerClass.newInstance();
|
map.put(opcode.value().getValue(), handlerClass.newInstance());
|
||||||
|
|
||||||
map.put(opcode.value().getValue(), packetHandler);
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
@ -57,33 +57,36 @@ public class ServerQuestHandler {
|
|||||||
|
|
||||||
// TODO make cleaner
|
// TODO make cleaner
|
||||||
|
|
||||||
public boolean triggerCondition(GameQuest quest, QuestCondition condition, int... params) {
|
public boolean triggerCondition(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
|
||||||
QuestBaseHandler handler = condHandlers.get(condition.getType().getValue());
|
QuestBaseHandler handler = condHandlers.get(condition.getType().getValue());
|
||||||
|
|
||||||
if (handler == null || quest.getData() == null) {
|
if (handler == null || quest.getData() == null) {
|
||||||
|
Grasscutter.getLogger().debug("Could not trigger condition {} at {}", condition.getType().getValue(), quest.getData());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return handler.execute(quest, condition, params);
|
return handler.execute(quest, condition, paramStr, params);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean triggerContent(GameQuest quest, QuestCondition condition, int... params) {
|
public boolean triggerContent(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
|
||||||
QuestBaseHandler handler = contHandlers.get(condition.getType().getValue());
|
QuestBaseHandler handler = contHandlers.get(condition.getType().getValue());
|
||||||
|
|
||||||
if (handler == null || quest.getData() == null) {
|
if (handler == null || quest.getData() == null) {
|
||||||
|
Grasscutter.getLogger().debug("Could not trigger content {} at {}", condition.getType().getValue(), quest.getData());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return handler.execute(quest, condition, params);
|
return handler.execute(quest, condition, paramStr, params);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean triggerExec(GameQuest quest, QuestCondition condition, int... params) {
|
public boolean triggerExec(GameQuest quest, QuestExecParam execParam, String... params) {
|
||||||
QuestBaseHandler handler = execHandlers.get(condition.getType().getValue());
|
QuestExecHandler handler = execHandlers.get(execParam.getType().getValue());
|
||||||
|
|
||||||
if (handler == null || quest.getData() == null) {
|
if (handler == null || quest.getData() == null) {
|
||||||
|
Grasscutter.getLogger().debug("Could not trigger exec {} at {}", execParam.getType().getValue(), quest.getData());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return handler.execute(quest, condition, params);
|
return handler.execute(quest, execParam, params);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,7 +10,7 @@ import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
|||||||
public class BaseCondition extends QuestBaseHandler {
|
public class BaseCondition extends QuestBaseHandler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
|
public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,17 @@
|
|||||||
|
package emu.grasscutter.game.quest.conditions;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.excels.QuestData.QuestCondition;
|
||||||
|
import emu.grasscutter.game.quest.GameQuest;
|
||||||
|
import emu.grasscutter.game.quest.QuestValue;
|
||||||
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
|
import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
||||||
|
|
||||||
|
@QuestValue(QuestTrigger.QUEST_COND_LUA_NOTIFY)
|
||||||
|
public class ConditionLuaNotify extends QuestBaseHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
|
||||||
|
return condition.getParam()[0] == Integer.parseInt(paramStr);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -10,7 +10,7 @@ import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
|||||||
public class ConditionPlayerLevelEqualGreater extends QuestBaseHandler {
|
public class ConditionPlayerLevelEqualGreater extends QuestBaseHandler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
|
public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
|
||||||
return quest.getOwner().getLevel() >= params[0];
|
return quest.getOwner().getLevel() >= params[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
|||||||
public class ConditionStateEqual extends QuestBaseHandler {
|
public class ConditionStateEqual extends QuestBaseHandler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
|
public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
|
||||||
GameQuest checkQuest = quest.getOwner().getQuestManager().getQuestById(params[0]);
|
GameQuest checkQuest = quest.getOwner().getQuestManager().getQuestById(params[0]);
|
||||||
|
|
||||||
if (checkQuest != null) {
|
if (checkQuest != null) {
|
||||||
|
@ -10,7 +10,7 @@ import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
|||||||
public class BaseContent extends QuestBaseHandler {
|
public class BaseContent extends QuestBaseHandler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
|
public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,17 @@
|
|||||||
|
package emu.grasscutter.game.quest.content;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.excels.QuestData.QuestCondition;
|
||||||
|
import emu.grasscutter.game.quest.GameQuest;
|
||||||
|
import emu.grasscutter.game.quest.QuestValue;
|
||||||
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
|
import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
||||||
|
|
||||||
|
@QuestValue(QuestTrigger.QUEST_CONTENT_ADD_QUEST_PROGRESS)
|
||||||
|
public class ContentAddQuestProgress extends QuestBaseHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
|
||||||
|
return condition.getParam()[0] == params[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -10,7 +10,7 @@ import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
|||||||
public class ContentCompleteTalk extends QuestBaseHandler {
|
public class ContentCompleteTalk extends QuestBaseHandler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
|
public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
|
||||||
return condition.getParam()[0] == params[0];
|
return condition.getParam()[0] == params[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
|||||||
public class ContentEnterDungeon extends QuestBaseHandler {
|
public class ContentEnterDungeon extends QuestBaseHandler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
|
public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
|
||||||
return condition.getParam()[0] == params[0];
|
return condition.getParam()[0] == params[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -0,0 +1,17 @@
|
|||||||
|
package emu.grasscutter.game.quest.content;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.excels.QuestData.QuestCondition;
|
||||||
|
import emu.grasscutter.game.quest.GameQuest;
|
||||||
|
import emu.grasscutter.game.quest.QuestValue;
|
||||||
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
|
import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
||||||
|
|
||||||
|
@QuestValue(QuestTrigger.QUEST_CONTENT_ENTER_ROOM)
|
||||||
|
public class ContentEnterRoom extends QuestBaseHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
|
||||||
|
return condition.getParam()[0] == params[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -10,7 +10,7 @@ import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
|||||||
public class ContentFinishPlot extends QuestBaseHandler {
|
public class ContentFinishPlot extends QuestBaseHandler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
|
public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
|
||||||
return condition.getParam()[0] == params[0];
|
return condition.getParam()[0] == params[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -0,0 +1,23 @@
|
|||||||
|
package emu.grasscutter.game.quest.content;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.excels.QuestData.QuestCondition;
|
||||||
|
import emu.grasscutter.game.quest.GameQuest;
|
||||||
|
import emu.grasscutter.game.quest.QuestValue;
|
||||||
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
|
import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
||||||
|
|
||||||
|
@QuestValue(QuestTrigger.QUEST_CONTENT_GAME_TIME_TICK)
|
||||||
|
public class ContentGameTimeTick extends QuestBaseHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
|
||||||
|
var range = condition.getParamStr().split(",");
|
||||||
|
var min = Math.min(Integer.parseInt(range[0]), Integer.parseInt(range[1]));
|
||||||
|
var max = Math.max(Integer.parseInt(range[0]), Integer.parseInt(range[1]));
|
||||||
|
|
||||||
|
// params[0] is clock, params[1] is day
|
||||||
|
return params[0] >= min && params[0] <= max &&
|
||||||
|
params[1] >= condition.getParam()[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,17 @@
|
|||||||
|
package emu.grasscutter.game.quest.content;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.excels.QuestData.QuestCondition;
|
||||||
|
import emu.grasscutter.game.quest.GameQuest;
|
||||||
|
import emu.grasscutter.game.quest.QuestValue;
|
||||||
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
|
import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
||||||
|
|
||||||
|
@QuestValue(QuestTrigger.QUEST_CONTENT_INTERACT_GADGET)
|
||||||
|
public class ContentInteractGadget extends QuestBaseHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
|
||||||
|
return params[0] == condition.getParam()[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,17 @@
|
|||||||
|
package emu.grasscutter.game.quest.content;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.excels.QuestData.QuestCondition;
|
||||||
|
import emu.grasscutter.game.quest.GameQuest;
|
||||||
|
import emu.grasscutter.game.quest.QuestValue;
|
||||||
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
|
import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
||||||
|
|
||||||
|
@QuestValue(QuestTrigger.QUEST_CONTENT_LUA_NOTIFY)
|
||||||
|
public class ContentLuaNotify extends QuestBaseHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
|
||||||
|
return condition.getParamStr().equals(paramStr);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,23 @@
|
|||||||
|
package emu.grasscutter.game.quest.content;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.excels.QuestData.QuestCondition;
|
||||||
|
import emu.grasscutter.game.quest.GameQuest;
|
||||||
|
import emu.grasscutter.game.quest.QuestValue;
|
||||||
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
|
import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
||||||
|
|
||||||
|
@QuestValue(QuestTrigger.QUEST_CONTENT_QUEST_STATE_EQUAL)
|
||||||
|
public class ContentQuestStateEqual extends QuestBaseHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
|
||||||
|
GameQuest checkQuest = quest.getOwner().getQuestManager().getQuestById(params[0]);
|
||||||
|
|
||||||
|
if (checkQuest != null) {
|
||||||
|
return checkQuest.getState().getValue() == params[1];
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -1,5 +1,12 @@
|
|||||||
package emu.grasscutter.game.quest.enums;
|
package emu.grasscutter.game.quest.enums;
|
||||||
|
|
||||||
|
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||||
|
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
public enum QuestTrigger {
|
public enum QuestTrigger {
|
||||||
QUEST_COND_NONE (0),
|
QUEST_COND_NONE (0),
|
||||||
QUEST_COND_STATE_EQUAL (1),
|
QUEST_COND_STATE_EQUAL (1),
|
||||||
@ -232,4 +239,24 @@ public enum QuestTrigger {
|
|||||||
public int getValue() {
|
public int getValue() {
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final Int2ObjectMap<QuestTrigger> contentMap = new Int2ObjectOpenHashMap<>();
|
||||||
|
private static final Map<String, QuestTrigger> contentStringMap = new HashMap<>();
|
||||||
|
|
||||||
|
static {
|
||||||
|
Stream.of(values())
|
||||||
|
.filter(e -> e.name().startsWith("QUEST_CONTENT_"))
|
||||||
|
.forEach(e -> {
|
||||||
|
contentMap.put(e.getValue(), e);
|
||||||
|
contentStringMap.put(e.name(), e);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public static QuestTrigger getContentTriggerByValue(int value) {
|
||||||
|
return contentMap.getOrDefault(value, QUEST_CONTENT_NONE);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static QuestTrigger getContentTriggerByName(String name) {
|
||||||
|
return contentStringMap.getOrDefault(name, QUEST_CONTENT_NONE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,24 @@
|
|||||||
|
package emu.grasscutter.game.quest.exec;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.excels.QuestData;
|
||||||
|
import emu.grasscutter.game.quest.GameQuest;
|
||||||
|
import emu.grasscutter.game.quest.QuestValue;
|
||||||
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
|
import emu.grasscutter.game.quest.handlers.QuestExecHandler;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
@QuestValue(QuestTrigger.QUEST_EXEC_ADD_QUEST_PROGRESS)
|
||||||
|
public class ExecAddQuestProgress extends QuestExecHandler {
|
||||||
|
@Override
|
||||||
|
public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
|
||||||
|
var param = Arrays.stream(paramStr)
|
||||||
|
.filter(i -> !i.isBlank())
|
||||||
|
.mapToInt(Integer::parseInt)
|
||||||
|
.toArray();
|
||||||
|
|
||||||
|
quest.getOwner().getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_ADD_QUEST_PROGRESS, param);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,34 @@
|
|||||||
|
package emu.grasscutter.game.quest.exec;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.excels.QuestData;
|
||||||
|
import emu.grasscutter.game.quest.GameQuest;
|
||||||
|
import emu.grasscutter.game.quest.QuestGroupSuite;
|
||||||
|
import emu.grasscutter.game.quest.QuestValue;
|
||||||
|
import emu.grasscutter.game.quest.enums.QuestState;
|
||||||
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
|
import emu.grasscutter.game.quest.handlers.QuestExecHandler;
|
||||||
|
import emu.grasscutter.scripts.constants.EventType;
|
||||||
|
import emu.grasscutter.scripts.data.ScriptArgs;
|
||||||
|
import emu.grasscutter.server.packet.send.PacketGroupSuiteNotify;
|
||||||
|
|
||||||
|
@QuestValue(QuestTrigger.QUEST_EXEC_NOTIFY_GROUP_LUA)
|
||||||
|
public class ExecNotifyGroupLua extends QuestExecHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
|
||||||
|
var sceneId = Integer.parseInt(paramStr[0]);
|
||||||
|
var groupId = Integer.parseInt(paramStr[1]);
|
||||||
|
|
||||||
|
var scriptManager = quest.getOwner().getScene().getScriptManager();
|
||||||
|
|
||||||
|
if(quest.getOwner().getScene().getId() == sceneId){
|
||||||
|
scriptManager.callEvent(
|
||||||
|
quest.getState() == QuestState.QUEST_STATE_FINISHED ?
|
||||||
|
EventType.EVENT_QUEST_FINISH : EventType.EVENT_QUEST_START
|
||||||
|
, new ScriptArgs());
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,39 @@
|
|||||||
|
package emu.grasscutter.game.quest.exec;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.excels.QuestData;
|
||||||
|
import emu.grasscutter.game.quest.GameQuest;
|
||||||
|
import emu.grasscutter.game.quest.QuestGroupSuite;
|
||||||
|
import emu.grasscutter.game.quest.QuestValue;
|
||||||
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
|
import emu.grasscutter.game.quest.handlers.QuestExecHandler;
|
||||||
|
import emu.grasscutter.server.packet.send.PacketGroupSuiteNotify;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
@QuestValue(QuestTrigger.QUEST_EXEC_REFRESH_GROUP_SUITE)
|
||||||
|
public class ExecRefreshGroupSuite extends QuestExecHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
|
||||||
|
var sceneId = Integer.parseInt(paramStr[0]);
|
||||||
|
var groupId = Integer.parseInt(paramStr[1].split(",")[0]);
|
||||||
|
var suiteId = Integer.parseInt(paramStr[1].split(",")[1]);
|
||||||
|
|
||||||
|
var scriptManager = quest.getOwner().getScene().getScriptManager();
|
||||||
|
|
||||||
|
quest.getMainQuest().getQuestGroupSuites().add(QuestGroupSuite.of()
|
||||||
|
.scene(sceneId)
|
||||||
|
.group(groupId)
|
||||||
|
.suite(suiteId)
|
||||||
|
.build());
|
||||||
|
|
||||||
|
// refresh immediately if player is in this scene
|
||||||
|
if(quest.getOwner().getScene().getId() == sceneId){
|
||||||
|
scriptManager.refreshGroup(scriptManager.getGroupById(groupId), suiteId);
|
||||||
|
quest.getOwner().sendPacket(new PacketGroupSuiteNotify(groupId, suiteId));
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -5,6 +5,6 @@ import emu.grasscutter.game.quest.GameQuest;
|
|||||||
|
|
||||||
public abstract class QuestBaseHandler {
|
public abstract class QuestBaseHandler {
|
||||||
|
|
||||||
public abstract boolean execute(GameQuest quest, QuestCondition condition, int... params);
|
public abstract boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,10 @@
|
|||||||
|
package emu.grasscutter.game.quest.handlers;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.excels.QuestData;
|
||||||
|
import emu.grasscutter.game.quest.GameQuest;
|
||||||
|
|
||||||
|
public abstract class QuestExecHandler {
|
||||||
|
|
||||||
|
public abstract boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr);
|
||||||
|
|
||||||
|
}
|
@ -13,6 +13,7 @@ import emu.grasscutter.game.props.ClimateType;
|
|||||||
import emu.grasscutter.game.props.FightProperty;
|
import emu.grasscutter.game.props.FightProperty;
|
||||||
import emu.grasscutter.game.props.LifeState;
|
import emu.grasscutter.game.props.LifeState;
|
||||||
import emu.grasscutter.game.props.SceneType;
|
import emu.grasscutter.game.props.SceneType;
|
||||||
|
import emu.grasscutter.game.quest.QuestGroupSuite;
|
||||||
import emu.grasscutter.game.world.SpawnDataEntry.SpawnGroupEntry;
|
import emu.grasscutter.game.world.SpawnDataEntry.SpawnGroupEntry;
|
||||||
import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
|
import emu.grasscutter.game.dungeons.challenge.WorldChallenge;
|
||||||
import emu.grasscutter.net.packet.BasePacket;
|
import emu.grasscutter.net.packet.BasePacket;
|
||||||
@ -798,4 +799,22 @@ public class Scene {
|
|||||||
}
|
}
|
||||||
return npcList;
|
return npcList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void loadGroupForQuest(List<QuestGroupSuite> sceneGroupSuite) {
|
||||||
|
if(!scriptManager.isInit()){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
sceneGroupSuite.forEach(i -> {
|
||||||
|
var group = scriptManager.getGroupById(i.getGroup());
|
||||||
|
if(group == null){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var suite = group.getSuiteByIndex(i.getSuite());
|
||||||
|
if(suite == null){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
scriptManager.addGroupSuite(group, suite);
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -482,6 +482,11 @@ public class ScriptLib {
|
|||||||
logger.debug("[LUA] Call AddQuestProgress with {}",
|
logger.debug("[LUA] Call AddQuestProgress with {}",
|
||||||
var1);
|
var1);
|
||||||
|
|
||||||
|
for(var player : getSceneScriptManager().getScene().getPlayers()){
|
||||||
|
player.getQuestManager().triggerEvent(QuestTrigger.QUEST_COND_LUA_NOTIFY, var1);
|
||||||
|
player.getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_LUA_NOTIFY, var1);
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -0,0 +1,23 @@
|
|||||||
|
package emu.grasscutter.server.packet.recv;
|
||||||
|
|
||||||
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
|
import emu.grasscutter.net.packet.Opcodes;
|
||||||
|
import emu.grasscutter.net.packet.PacketHandler;
|
||||||
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
|
import emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass;
|
||||||
|
import emu.grasscutter.server.game.GameSession;
|
||||||
|
import emu.grasscutter.server.packet.send.PacketAddQuestContentProgressRsp;
|
||||||
|
|
||||||
|
@Opcodes(PacketOpcodes.AddQuestContentProgressReq)
|
||||||
|
public class HandlerAddQuestContentProgressReq extends PacketHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
||||||
|
var req = AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.parseFrom(payload);
|
||||||
|
|
||||||
|
session.getPlayer().getQuestManager().triggerEvent(QuestTrigger.getContentTriggerByValue(req.getContentType()), req.getParam());
|
||||||
|
|
||||||
|
session.send(new PacketAddQuestContentProgressRsp(req.getContentType()));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -1,5 +1,6 @@
|
|||||||
package emu.grasscutter.server.packet.recv;
|
package emu.grasscutter.server.packet.recv;
|
||||||
|
|
||||||
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
import emu.grasscutter.net.packet.Opcodes;
|
import emu.grasscutter.net.packet.Opcodes;
|
||||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
import emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq;
|
import emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq;
|
||||||
@ -15,6 +16,9 @@ public class HandlerChangeGameTimeReq extends PacketHandler {
|
|||||||
ChangeGameTimeReq req = ChangeGameTimeReq.parseFrom(payload);
|
ChangeGameTimeReq req = ChangeGameTimeReq.parseFrom(payload);
|
||||||
|
|
||||||
session.getPlayer().getScene().changeTime(req.getGameTime());
|
session.getPlayer().getScene().changeTime(req.getGameTime());
|
||||||
|
session.getPlayer().getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_GAME_TIME_TICK,
|
||||||
|
req.getGameTime() / 60 , // hours
|
||||||
|
req.getExtraDays()); //days
|
||||||
session.getPlayer().sendPacket(new PacketChangeGameTimeRsp(session.getPlayer()));
|
session.getPlayer().sendPacket(new PacketChangeGameTimeRsp(session.getPlayer()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -32,6 +32,12 @@ public class HandlerEnterSceneDoneReq extends PacketHandler {
|
|||||||
|
|
||||||
// spawn NPC
|
// spawn NPC
|
||||||
session.getPlayer().getScene().loadNpcForPlayerEnter(session.getPlayer());
|
session.getPlayer().getScene().loadNpcForPlayerEnter(session.getPlayer());
|
||||||
|
|
||||||
|
// notify client to load the npc for quest
|
||||||
|
var questGroupSuites = session.getPlayer().getQuestManager().getSceneGroupSuite(session.getPlayer().getSceneId());
|
||||||
|
session.getPlayer().getScene().loadGroupForQuest(questGroupSuites);
|
||||||
|
session.send(new PacketGroupSuiteNotify(questGroupSuites));
|
||||||
|
|
||||||
// Reset timer for sending player locations
|
// Reset timer for sending player locations
|
||||||
session.getPlayer().resetSendPlayerLocTime();
|
session.getPlayer().resetSendPlayerLocTime();
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,30 @@
|
|||||||
|
package emu.grasscutter.server.packet.recv;
|
||||||
|
|
||||||
|
import emu.grasscutter.net.packet.Opcodes;
|
||||||
|
import emu.grasscutter.net.packet.PacketHandler;
|
||||||
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
|
import emu.grasscutter.net.proto.EvtEntityRenderersChangedNotifyOuterClass;
|
||||||
|
import emu.grasscutter.net.proto.ForwardTypeOuterClass;
|
||||||
|
import emu.grasscutter.server.game.GameSession;
|
||||||
|
import emu.grasscutter.server.packet.send.PacketEvtEntityRenderersChangedNotify;
|
||||||
|
import emu.grasscutter.server.packet.send.PacketWorldPlayerLocationNotify;
|
||||||
|
|
||||||
|
@Opcodes(PacketOpcodes.EvtEntityRenderersChangedNotify)
|
||||||
|
public class HandlerEvtEntityRenderersChangedNotify extends PacketHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
||||||
|
var req = EvtEntityRenderersChangedNotifyOuterClass.EvtEntityRenderersChangedNotify.parseFrom(payload);
|
||||||
|
|
||||||
|
switch (req.getForwardType()) {
|
||||||
|
case FORWARD_TYPE_TO_ALL ->
|
||||||
|
session.getPlayer().getScene().broadcastPacket(new PacketEvtEntityRenderersChangedNotify(req));
|
||||||
|
case FORWARD_TYPE_TO_ALL_EXCEPT_CUR ->
|
||||||
|
session.getPlayer().getScene().broadcastPacketToOthers(session.getPlayer(), new PacketEvtEntityRenderersChangedNotify(req));
|
||||||
|
case FORWARD_TYPE_TO_HOST ->
|
||||||
|
session.getPlayer().getScene().getWorld().getHost().sendPacket(new PacketEvtEntityRenderersChangedNotify(req));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -1,5 +1,6 @@
|
|||||||
package emu.grasscutter.server.packet.recv;
|
package emu.grasscutter.server.packet.recv;
|
||||||
|
|
||||||
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
import emu.grasscutter.net.packet.Opcodes;
|
import emu.grasscutter.net.packet.Opcodes;
|
||||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
|
import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
|
||||||
@ -13,6 +14,7 @@ public class HandlerGadgetInteractReq extends PacketHandler {
|
|||||||
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
||||||
GadgetInteractReq req = GadgetInteractReq.parseFrom(payload);
|
GadgetInteractReq req = GadgetInteractReq.parseFrom(payload);
|
||||||
|
|
||||||
|
session.getPlayer().getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_INTERACT_GADGET, req.getGadgetId());
|
||||||
session.getPlayer().interactWith(req.getGadgetEntityId(), req);
|
session.getPlayer().interactWith(req.getGadgetEntityId(), req);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -0,0 +1,17 @@
|
|||||||
|
package emu.grasscutter.server.packet.recv;
|
||||||
|
|
||||||
|
import emu.grasscutter.net.packet.Opcodes;
|
||||||
|
import emu.grasscutter.net.packet.PacketHandler;
|
||||||
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
|
import emu.grasscutter.server.game.GameSession;
|
||||||
|
import emu.grasscutter.server.packet.send.PacketPersonalLineAllDataRsp;
|
||||||
|
|
||||||
|
@Opcodes(PacketOpcodes.PersonalLineAllDataReq)
|
||||||
|
public class HandlerPersonalLineAllDataReq extends PacketHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
||||||
|
session.send(new PacketPersonalLineAllDataRsp(session.getPlayer().getQuestManager().getQuests().values()));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -1,5 +1,7 @@
|
|||||||
package emu.grasscutter.server.packet.recv;
|
package emu.grasscutter.server.packet.recv;
|
||||||
|
|
||||||
|
import emu.grasscutter.game.props.SceneType;
|
||||||
|
import emu.grasscutter.game.quest.enums.QuestTrigger;
|
||||||
import emu.grasscutter.net.packet.Opcodes;
|
import emu.grasscutter.net.packet.Opcodes;
|
||||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
import emu.grasscutter.net.packet.PacketHandler;
|
import emu.grasscutter.net.packet.PacketHandler;
|
||||||
@ -11,6 +13,10 @@ public class HandlerPostEnterSceneReq 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 {
|
||||||
|
if(session.getPlayer().getScene().getSceneType() == SceneType.SCENE_ROOM){
|
||||||
|
session.getPlayer().getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_ENTER_ROOM, session.getPlayer().getSceneId());
|
||||||
|
}
|
||||||
|
|
||||||
session.send(new PacketPostEnterSceneRsp(session.getPlayer()));
|
session.send(new PacketPostEnterSceneRsp(session.getPlayer()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,14 +3,21 @@ package emu.grasscutter.server.packet.recv;
|
|||||||
import emu.grasscutter.net.packet.Opcodes;
|
import emu.grasscutter.net.packet.Opcodes;
|
||||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
import emu.grasscutter.net.packet.PacketHandler;
|
import emu.grasscutter.net.packet.PacketHandler;
|
||||||
|
import emu.grasscutter.net.proto.QueryPathReqOuterClass;
|
||||||
import emu.grasscutter.server.game.GameSession;
|
import emu.grasscutter.server.game.GameSession;
|
||||||
|
import emu.grasscutter.server.packet.send.PacketQueryPathRsp;
|
||||||
|
|
||||||
@Opcodes(PacketOpcodes.QueryPathReq)
|
@Opcodes(PacketOpcodes.QueryPathReq)
|
||||||
public class HandlerQueryPathReq extends PacketHandler {
|
public class HandlerQueryPathReq 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 {
|
||||||
// Auto template
|
var req = QueryPathReqOuterClass.QueryPathReq.parseFrom(payload);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* It is not the actual work
|
||||||
|
*/
|
||||||
|
session.send(new PacketQueryPathRsp(req));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,28 @@
|
|||||||
|
package emu.grasscutter.server.packet.recv;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.GameData;
|
||||||
|
import emu.grasscutter.net.packet.Opcodes;
|
||||||
|
import emu.grasscutter.net.packet.PacketHandler;
|
||||||
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
|
import emu.grasscutter.net.proto.UnlockPersonalLineReqOuterClass;
|
||||||
|
import emu.grasscutter.server.game.GameSession;
|
||||||
|
import emu.grasscutter.server.packet.send.PacketUnlockPersonalLineRsp;
|
||||||
|
|
||||||
|
@Opcodes(PacketOpcodes.UnlockPersonalLineReq)
|
||||||
|
public class HandlerUnlockPersonalLineReq extends PacketHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
||||||
|
var req = UnlockPersonalLineReqOuterClass.UnlockPersonalLineReq.parseFrom(payload);
|
||||||
|
var data = GameData.getPersonalLineDataMap().get(req.getPersonalLineId());
|
||||||
|
if(data == null){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
session.getPlayer().getQuestManager().addQuest(data.getStartQuestId());
|
||||||
|
session.getPlayer().useLegendaryKey(1);
|
||||||
|
|
||||||
|
session.send(new PacketUnlockPersonalLineRsp(data.getId(), 1, data.getChapterId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,19 @@
|
|||||||
|
package emu.grasscutter.server.packet.send;
|
||||||
|
|
||||||
|
import emu.grasscutter.net.packet.BasePacket;
|
||||||
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
|
import emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass;
|
||||||
|
|
||||||
|
public class PacketAddQuestContentProgressRsp extends BasePacket {
|
||||||
|
|
||||||
|
public PacketAddQuestContentProgressRsp(int contentType) {
|
||||||
|
super(PacketOpcodes.AddQuestContentProgressRsp);
|
||||||
|
|
||||||
|
var proto = AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp.newBuilder();
|
||||||
|
|
||||||
|
proto.setContentType(contentType);
|
||||||
|
|
||||||
|
this.setData(proto);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,20 @@
|
|||||||
|
package emu.grasscutter.server.packet.send;
|
||||||
|
|
||||||
|
import emu.grasscutter.net.packet.BasePacket;
|
||||||
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
|
import emu.grasscutter.net.proto.ChapterStateNotifyOuterClass;
|
||||||
|
import emu.grasscutter.net.proto.ChapterStateOuterClass;
|
||||||
|
|
||||||
|
public class PacketChapterStateNotify extends BasePacket {
|
||||||
|
|
||||||
|
public PacketChapterStateNotify(int id, ChapterStateOuterClass.ChapterState state) {
|
||||||
|
super(PacketOpcodes.ChapterStateNotify);
|
||||||
|
|
||||||
|
var proto = ChapterStateNotifyOuterClass.ChapterStateNotify.newBuilder();
|
||||||
|
|
||||||
|
proto.setChapterId(id)
|
||||||
|
.setChapterState(state);
|
||||||
|
|
||||||
|
this.setData(proto);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,14 @@
|
|||||||
|
package emu.grasscutter.server.packet.send;
|
||||||
|
|
||||||
|
import emu.grasscutter.net.packet.BasePacket;
|
||||||
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
|
import emu.grasscutter.net.proto.EvtEntityRenderersChangedNotifyOuterClass;
|
||||||
|
|
||||||
|
public class PacketEvtEntityRenderersChangedNotify extends BasePacket {
|
||||||
|
|
||||||
|
public PacketEvtEntityRenderersChangedNotify(EvtEntityRenderersChangedNotifyOuterClass.EvtEntityRenderersChangedNotify req) {
|
||||||
|
super(PacketOpcodes.EvtEntityRenderersChangedNotify, true);
|
||||||
|
|
||||||
|
this.setData(req);
|
||||||
|
}
|
||||||
|
}
|
@ -1,10 +1,12 @@
|
|||||||
package emu.grasscutter.server.packet.send;
|
package emu.grasscutter.server.packet.send;
|
||||||
|
|
||||||
import emu.grasscutter.data.binout.SceneNpcBornEntry;
|
import emu.grasscutter.data.binout.SceneNpcBornEntry;
|
||||||
|
import emu.grasscutter.game.quest.QuestGroupSuite;
|
||||||
import emu.grasscutter.net.packet.BasePacket;
|
import emu.grasscutter.net.packet.BasePacket;
|
||||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
import emu.grasscutter.net.proto.GroupSuiteNotifyOuterClass;
|
import emu.grasscutter.net.proto.GroupSuiteNotifyOuterClass;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class PacketGroupSuiteNotify extends BasePacket {
|
public class PacketGroupSuiteNotify extends BasePacket {
|
||||||
@ -27,4 +29,24 @@ public class PacketGroupSuiteNotify extends BasePacket {
|
|||||||
this.setData(proto);
|
this.setData(proto);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public PacketGroupSuiteNotify(int groupId, int suiteId) {
|
||||||
|
super(PacketOpcodes.GroupSuiteNotify);
|
||||||
|
|
||||||
|
var proto = GroupSuiteNotifyOuterClass.GroupSuiteNotify.newBuilder();
|
||||||
|
|
||||||
|
proto.putGroupMap(groupId, suiteId);
|
||||||
|
|
||||||
|
this.setData(proto);
|
||||||
|
}
|
||||||
|
|
||||||
|
public PacketGroupSuiteNotify(Collection<QuestGroupSuite> questGroupSuites) {
|
||||||
|
super(PacketOpcodes.GroupSuiteNotify);
|
||||||
|
|
||||||
|
var proto = GroupSuiteNotifyOuterClass.GroupSuiteNotify.newBuilder();
|
||||||
|
|
||||||
|
questGroupSuites.forEach(i -> proto.putGroupMap(i.getGroup(), i.getSuite()));
|
||||||
|
|
||||||
|
this.setData(proto);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,35 @@
|
|||||||
|
package emu.grasscutter.server.packet.send;
|
||||||
|
|
||||||
|
import emu.grasscutter.data.GameData;
|
||||||
|
import emu.grasscutter.game.quest.GameMainQuest;
|
||||||
|
import emu.grasscutter.game.quest.GameQuest;
|
||||||
|
import emu.grasscutter.net.packet.BasePacket;
|
||||||
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
|
import emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
public class PacketPersonalLineAllDataRsp extends BasePacket {
|
||||||
|
|
||||||
|
public PacketPersonalLineAllDataRsp(Collection<GameMainQuest> gameMainQuestList) {
|
||||||
|
super(PacketOpcodes.PersonalLineAllDataRsp);
|
||||||
|
|
||||||
|
var proto = PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp.newBuilder();
|
||||||
|
|
||||||
|
var questList = gameMainQuestList.stream()
|
||||||
|
.map(GameMainQuest::getChildQuests)
|
||||||
|
.map(Map::values)
|
||||||
|
.flatMap(Collection::stream)
|
||||||
|
.map(GameQuest::getQuestId)
|
||||||
|
.collect(Collectors.toSet());
|
||||||
|
|
||||||
|
GameData.getPersonalLineDataMap().values().stream()
|
||||||
|
.filter(i -> !questList.contains(i.getStartQuestId()))
|
||||||
|
.forEach(i -> proto.addCanBeUnlockedPersonalLineList(i.getId()));
|
||||||
|
|
||||||
|
this.setData(proto);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,22 @@
|
|||||||
|
package emu.grasscutter.server.packet.send;
|
||||||
|
|
||||||
|
import emu.grasscutter.net.packet.BasePacket;
|
||||||
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
|
import emu.grasscutter.net.proto.QueryPathReqOuterClass;
|
||||||
|
import emu.grasscutter.net.proto.QueryPathRspOuterClass;
|
||||||
|
|
||||||
|
public class PacketQueryPathRsp extends BasePacket {
|
||||||
|
|
||||||
|
public PacketQueryPathRsp(QueryPathReqOuterClass.QueryPathReq req) {
|
||||||
|
super(PacketOpcodes.QueryPathRsp);
|
||||||
|
|
||||||
|
var proto = QueryPathRspOuterClass.QueryPathRsp.newBuilder();
|
||||||
|
|
||||||
|
proto.addCorners(req.getSourcePos())
|
||||||
|
.addCorners(req.getDestinationPos(0))
|
||||||
|
.setQueryId(req.getQueryId())
|
||||||
|
.setQueryStatus(QueryPathRspOuterClass.QueryPathRsp.PathStatusType.PATH_STATUS_TYPE_SUCC);
|
||||||
|
|
||||||
|
this.setData(proto);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,20 @@
|
|||||||
|
package emu.grasscutter.server.packet.send;
|
||||||
|
|
||||||
|
import emu.grasscutter.net.packet.BasePacket;
|
||||||
|
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||||
|
import emu.grasscutter.net.proto.UnlockPersonalLineRspOuterClass;
|
||||||
|
|
||||||
|
public class PacketUnlockPersonalLineRsp extends BasePacket {
|
||||||
|
|
||||||
|
public PacketUnlockPersonalLineRsp(int id, int level, int chapterId) {
|
||||||
|
super(PacketOpcodes.UnlockPersonalLineRsp);
|
||||||
|
|
||||||
|
var proto = UnlockPersonalLineRspOuterClass.UnlockPersonalLineRsp.newBuilder();
|
||||||
|
|
||||||
|
proto.setPersonalLineId(id)
|
||||||
|
.setLevel(level)
|
||||||
|
.setChapterId(chapterId);
|
||||||
|
|
||||||
|
this.setData(proto);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user