mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-03-28 02:23:31 +01:00
Copy some files from Grasscutter-Quests
NOT completely finished, nor is it completely done. Protocol issues remain! (including lack of packet IDs)
This commit is contained in:
@@ -14,7 +14,19 @@ public class ActivityConfigItem {
|
||||
int scheduleId;
|
||||
List<Integer> meetCondList;
|
||||
Date beginTime;
|
||||
Date openTime;
|
||||
Date closeTime;
|
||||
Date endTime;
|
||||
|
||||
transient ActivityHandler activityHandler;
|
||||
|
||||
void onLoad() {
|
||||
if (openTime == null) {
|
||||
this.openTime = beginTime;
|
||||
}
|
||||
|
||||
if (closeTime == null) {
|
||||
this.closeTime = endTime;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,9 +2,12 @@ package emu.grasscutter.game.activity;
|
||||
|
||||
import com.esotericsoftware.reflectasm.ConstructorAccess;
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.excels.ActivityData;
|
||||
import emu.grasscutter.data.excels.activity.ActivityData;
|
||||
import emu.grasscutter.data.server.ActivityCondGroup;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionExecutor;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.props.WatcherTriggerType;
|
||||
import emu.grasscutter.game.quest.enums.QuestCond;
|
||||
import emu.grasscutter.net.proto.ActivityInfoOuterClass;
|
||||
import emu.grasscutter.utils.DateHelper;
|
||||
import java.util.*;
|
||||
@@ -19,9 +22,9 @@ import lombok.experimental.FieldDefaults;
|
||||
@FieldDefaults(level = AccessLevel.PRIVATE)
|
||||
public abstract class ActivityHandler {
|
||||
/** Must set before initWatchers */
|
||||
ActivityConfigItem activityConfigItem;
|
||||
@Getter ActivityConfigItem activityConfigItem;
|
||||
|
||||
ActivityData activityData;
|
||||
@Getter ActivityData activityData;
|
||||
Map<WatcherTriggerType, List<ActivityWatcher>> watchersMap = new HashMap<>();
|
||||
|
||||
public abstract void onProtoBuild(
|
||||
@@ -57,6 +60,43 @@ public abstract class ActivityHandler {
|
||||
});
|
||||
}
|
||||
|
||||
protected void triggerCondEvents(Player player) {
|
||||
if (activityData == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
var questManager = player.getQuestManager();
|
||||
activityData
|
||||
.getCondGroupId()
|
||||
.forEach(
|
||||
condGroupId -> {
|
||||
var condGroup = GameData.getActivityCondGroupMap().get((int) condGroupId);
|
||||
condGroup
|
||||
.getCondIds()
|
||||
.forEach(
|
||||
condition ->
|
||||
questManager.queueEvent(QuestCond.QUEST_COND_ACTIVITY_COND, condition));
|
||||
});
|
||||
}
|
||||
|
||||
private List<Integer> getActivityConditions() {
|
||||
if (activityData == null) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
|
||||
return activityData.getCondGroupId().stream()
|
||||
.map(condGroupId -> GameData.getActivityCondGroupMap().get((int) condGroupId))
|
||||
.filter(Objects::nonNull)
|
||||
.map(ActivityCondGroup::getCondIds)
|
||||
.flatMap(Collection::stream)
|
||||
.toList();
|
||||
}
|
||||
|
||||
// TODO handle possible overwrites
|
||||
private List<Integer> getMeetConditions(ActivityConditionExecutor conditionExecutor) {
|
||||
return conditionExecutor.getMeetActivitiesConditions(getActivityConditions());
|
||||
}
|
||||
|
||||
private Map<Integer, PlayerActivityData.WatcherInfo> initWatchersDataForPlayer() {
|
||||
return watchersMap.values().stream()
|
||||
.flatMap(Collection::stream)
|
||||
@@ -76,7 +116,8 @@ public abstract class ActivityHandler {
|
||||
return playerActivityData;
|
||||
}
|
||||
|
||||
public ActivityInfoOuterClass.ActivityInfo toProto(PlayerActivityData playerActivityData) {
|
||||
public ActivityInfoOuterClass.ActivityInfo toProto(
|
||||
PlayerActivityData playerActivityData, ActivityConditionExecutor conditionExecutor) {
|
||||
var proto = ActivityInfoOuterClass.ActivityInfo.newBuilder();
|
||||
proto
|
||||
.setActivityId(activityConfigItem.getActivityId())
|
||||
@@ -85,7 +126,7 @@ public abstract class ActivityHandler {
|
||||
.setBeginTime(DateHelper.getUnixTime(activityConfigItem.getBeginTime()))
|
||||
.setFirstDayStartTime(DateHelper.getUnixTime(activityConfigItem.getBeginTime()))
|
||||
.setEndTime(DateHelper.getUnixTime(activityConfigItem.getEndTime()))
|
||||
.addAllMeetCondList(activityConfigItem.getMeetCondList());
|
||||
.addAllMeetCondList(getMeetConditions(conditionExecutor));
|
||||
|
||||
if (playerActivityData != null) {
|
||||
proto.addAllWatcherInfoList(playerActivityData.getAllWatcherInfoList());
|
||||
|
||||
@@ -4,6 +4,7 @@ import com.esotericsoftware.reflectasm.ConstructorAccess;
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.data.DataLoader;
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.game.activity.condition.*;
|
||||
import emu.grasscutter.game.player.BasePlayerManager;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.props.ActivityType;
|
||||
@@ -12,6 +13,7 @@ import emu.grasscutter.net.proto.ActivityInfoOuterClass;
|
||||
import emu.grasscutter.server.packet.send.PacketActivityScheduleInfoNotify;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import lombok.Getter;
|
||||
import org.reflections.Reflections;
|
||||
|
||||
@@ -19,6 +21,8 @@ import org.reflections.Reflections;
|
||||
public class ActivityManager extends BasePlayerManager {
|
||||
private static final Map<Integer, ActivityConfigItem> activityConfigItemMap;
|
||||
@Getter private static final Map<Integer, ActivityConfigItem> scheduleActivityConfigMap;
|
||||
private final Map<Integer, PlayerActivityData> playerActivityDataMap;
|
||||
private final ActivityConditionExecutor conditionExecutor;
|
||||
|
||||
static {
|
||||
activityConfigItemMap = new HashMap<>();
|
||||
@@ -26,30 +30,6 @@ public class ActivityManager extends BasePlayerManager {
|
||||
loadActivityConfigData();
|
||||
}
|
||||
|
||||
private final Map<Integer, PlayerActivityData> playerActivityDataMap;
|
||||
|
||||
public ActivityManager(Player player) {
|
||||
super(player);
|
||||
|
||||
playerActivityDataMap = new ConcurrentHashMap<>();
|
||||
// load data for player
|
||||
activityConfigItemMap
|
||||
.values()
|
||||
.forEach(
|
||||
item -> {
|
||||
var data = PlayerActivityData.getByPlayer(player, item.getActivityId());
|
||||
if (data == null) {
|
||||
data = item.getActivityHandler().initPlayerActivityData(player);
|
||||
data.save();
|
||||
}
|
||||
data.setPlayer(player);
|
||||
data.setActivityHandler(item.getActivityHandler());
|
||||
playerActivityDataMap.put(item.getActivityId(), data);
|
||||
});
|
||||
|
||||
player.sendPacket(new PacketActivityScheduleInfoNotify(activityConfigItemMap.values()));
|
||||
}
|
||||
|
||||
private static void loadActivityConfigData() {
|
||||
// scan activity type handler & watcher type
|
||||
var activityHandlerTypeMap = new HashMap<ActivityType, ConstructorAccess<?>>();
|
||||
@@ -75,6 +55,7 @@ public class ActivityManager extends BasePlayerManager {
|
||||
DataLoader.loadList("ActivityConfig.json", ActivityConfigItem.class)
|
||||
.forEach(
|
||||
item -> {
|
||||
item.onLoad();
|
||||
var activityData = GameData.getActivityDataMap().get(item.getActivityId());
|
||||
if (activityData == null) {
|
||||
Grasscutter.getLogger().warn("activity {} not exist.", item.getActivityId());
|
||||
@@ -104,6 +85,36 @@ public class ActivityManager extends BasePlayerManager {
|
||||
}
|
||||
}
|
||||
|
||||
public ActivityManager(Player player) {
|
||||
super(player);
|
||||
|
||||
playerActivityDataMap = new ConcurrentHashMap<>();
|
||||
// load data for player
|
||||
activityConfigItemMap
|
||||
.values()
|
||||
.forEach(
|
||||
item -> {
|
||||
var data = PlayerActivityData.getByPlayer(player, item.getActivityId());
|
||||
if (data == null) {
|
||||
data = item.getActivityHandler().initPlayerActivityData(player);
|
||||
data.save();
|
||||
}
|
||||
data.setPlayer(player);
|
||||
data.setActivityHandler(item.getActivityHandler());
|
||||
playerActivityDataMap.put(item.getActivityId(), data);
|
||||
});
|
||||
|
||||
player.sendPacket(new PacketActivityScheduleInfoNotify(activityConfigItemMap.values()));
|
||||
|
||||
conditionExecutor =
|
||||
new BasicActivityConditionExecutor(
|
||||
activityConfigItemMap,
|
||||
GameData.getActivityCondExcelConfigDataMap(),
|
||||
PlayerActivityDataMappingBuilder.buildPlayerActivityDataByActivityCondId(
|
||||
playerActivityDataMap),
|
||||
AllActivityConditionBuilder.buildActivityConditions());
|
||||
}
|
||||
|
||||
/** trigger activity watcher */
|
||||
public void triggerWatcher(WatcherTriggerType watcherTriggerType, String... params) {
|
||||
var watchers =
|
||||
@@ -124,11 +135,71 @@ public class ActivityManager extends BasePlayerManager {
|
||||
params));
|
||||
}
|
||||
|
||||
public boolean isActivityActive(int activityId) {
|
||||
var activityConfig = activityConfigItemMap.get(activityId);
|
||||
if (activityConfig == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
var now = new Date();
|
||||
return now.after(activityConfig.getBeginTime()) && now.before(activityConfig.getEndTime());
|
||||
}
|
||||
|
||||
public boolean hasActivityEnded(int activityId) {
|
||||
var activityConfig = activityConfigItemMap.get(activityId);
|
||||
if (activityConfig == null) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return new Date().after(activityConfig.getEndTime());
|
||||
}
|
||||
|
||||
public boolean isActivityOpen(int activityId) {
|
||||
var activityConfig = activityConfigItemMap.get(activityId);
|
||||
if (activityConfig == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
var now = new Date();
|
||||
return now.after(activityConfig.getOpenTime()) && now.before(activityConfig.getCloseTime());
|
||||
}
|
||||
|
||||
public int getOpenDay(int activityId) {
|
||||
var activityConfig = activityConfigItemMap.get(activityId);
|
||||
if (activityConfig == null) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
var now = new Date();
|
||||
return (int)
|
||||
TimeUnit.DAYS.convert(
|
||||
now.getTime() - activityConfig.getOpenTime().getTime(), TimeUnit.MILLISECONDS)
|
||||
+ 1;
|
||||
}
|
||||
|
||||
public boolean isActivityClosed(int activityId) {
|
||||
var activityConfig = activityConfigItemMap.get(activityId);
|
||||
if (activityConfig == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
var now = new Date();
|
||||
return now.after(activityConfig.getCloseTime());
|
||||
}
|
||||
|
||||
public boolean meetsCondition(int activityCondId) {
|
||||
return conditionExecutor.meetsCondition(activityCondId);
|
||||
}
|
||||
|
||||
public void triggerActivityConditions() {
|
||||
activityConfigItemMap.forEach((k, v) -> v.getActivityHandler().triggerCondEvents(player));
|
||||
}
|
||||
|
||||
public ActivityInfoOuterClass.ActivityInfo getInfoProtoByActivityId(int activityId) {
|
||||
var activityHandler = activityConfigItemMap.get(activityId).getActivityHandler();
|
||||
var activityData = playerActivityDataMap.get(activityId);
|
||||
|
||||
return activityHandler.toProto(activityData);
|
||||
return activityHandler.toProto(activityData, conditionExecutor);
|
||||
}
|
||||
|
||||
public Optional<ActivityHandler> getActivityHandler(ActivityType type) {
|
||||
@@ -138,7 +209,6 @@ public class ActivityManager extends BasePlayerManager {
|
||||
.findFirst();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public <T extends ActivityHandler> Optional<T> getActivityHandlerAs(
|
||||
ActivityType type, Class<T> clazz) {
|
||||
return getActivityHandler(type).map(x -> (T) x);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package emu.grasscutter.game.activity;
|
||||
|
||||
import emu.grasscutter.data.excels.ActivityWatcherData;
|
||||
import emu.grasscutter.data.excels.activity.ActivityWatcherData;
|
||||
import lombok.AccessLevel;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@@ -5,7 +5,7 @@ import dev.morphia.annotations.Id;
|
||||
import dev.morphia.annotations.Transient;
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.common.ItemParamData;
|
||||
import emu.grasscutter.data.excels.ActivityWatcherData;
|
||||
import emu.grasscutter.data.excels.activity.ActivityWatcherData;
|
||||
import emu.grasscutter.database.DatabaseHelper;
|
||||
import emu.grasscutter.game.inventory.GameItem;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
package emu.grasscutter.game.activity.condition;
|
||||
|
||||
import emu.grasscutter.data.excels.ActivityCondExcelConfigData;
|
||||
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
|
||||
|
||||
/**
|
||||
* This annotation marks condition types for NewActivityCondExcelConfigData.json ({@link ActivityCondExcelConfigData}). To use it you should mark
|
||||
* class that extends ActivityConditionBaseHandler, and it will be automatically picked during activity manager initiation.
|
||||
*
|
||||
*/
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface ActivityCondition {
|
||||
ActivityConditions value();
|
||||
}
|
||||
package emu.grasscutter.game.activity.condition;
|
||||
|
||||
import emu.grasscutter.data.excels.activity.ActivityCondExcelConfigData;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
|
||||
/**
|
||||
* This annotation marks condition types for NewActivityCondExcelConfigData.json ({@link
|
||||
* ActivityCondExcelConfigData}). To use it you should mark class that extends
|
||||
* ActivityConditionBaseHandler, and it will be automatically picked during activity manager
|
||||
* initiation.
|
||||
*/
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface ActivityCondition {
|
||||
ActivityConditions value();
|
||||
}
|
||||
|
||||
@@ -1,21 +1,23 @@
|
||||
package emu.grasscutter.game.activity.condition;
|
||||
|
||||
import emu.grasscutter.data.excels.ActivityCondExcelConfigData;
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
|
||||
/**
|
||||
* Base handler for all activity conditions that are listed in NewActivityCondExcelConfigData.json ({@link ActivityCondExcelConfigData})
|
||||
*/
|
||||
public abstract class ActivityConditionBaseHandler {
|
||||
|
||||
/**
|
||||
* Execute activity condition handler and return result of it's calculation
|
||||
*
|
||||
* @param activityData {@link PlayerActivityData} object containing info about activity
|
||||
* @param activityConfig
|
||||
* @param params params for handler
|
||||
* @return result of condition calculation
|
||||
*/
|
||||
public abstract boolean execute(PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params);
|
||||
}
|
||||
package emu.grasscutter.game.activity.condition;
|
||||
|
||||
import emu.grasscutter.data.excels.activity.ActivityCondExcelConfigData;
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
|
||||
/**
|
||||
* Base handler for all activity conditions that are listed in NewActivityCondExcelConfigData.json
|
||||
* ({@link ActivityCondExcelConfigData})
|
||||
*/
|
||||
public abstract class ActivityConditionBaseHandler {
|
||||
|
||||
/**
|
||||
* Execute activity condition handler and return result of it's calculation
|
||||
*
|
||||
* @param activityData {@link PlayerActivityData} object containing info about activity
|
||||
* @param activityConfig
|
||||
* @param params params for handler
|
||||
* @return result of condition calculation
|
||||
*/
|
||||
public abstract boolean execute(
|
||||
PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params);
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package emu.grasscutter.game.activity.condition;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface ActivityConditionExecutor {
|
||||
|
||||
List<Integer> getMeetActivitiesConditions(List<Integer> condIds);
|
||||
|
||||
boolean meetsCondition(int activityCondId);
|
||||
}
|
||||
package emu.grasscutter.game.activity.condition;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface ActivityConditionExecutor {
|
||||
|
||||
List<Integer> getMeetActivitiesConditions(List<Integer> condIds);
|
||||
|
||||
boolean meetsCondition(int activityCondId);
|
||||
}
|
||||
|
||||
@@ -1,51 +1,51 @@
|
||||
package emu.grasscutter.game.activity.condition;
|
||||
|
||||
public enum ActivityConditions {
|
||||
NEW_ACTIVITY_COND_PLAYER_LEVEL_GREAT_EQUAL,
|
||||
NEW_ACTIVITY_COND_NOT_FINISH_TALK,
|
||||
NEW_ACTIVITY_COND_SALESMAN_CAN_DELIVER,
|
||||
NEW_ACTIVITY_COND_FINISH_PHOTO_POS_ID,
|
||||
NEW_ACTIVITY_COND_HACHI_FINISH_STEALTH_STAGE_EQUAL,
|
||||
NEW_ACTIVITY_COND_UNLOCKED_ALL_LISTED_SCENE_POINTS,
|
||||
NEW_ACTIVITY_COND_DAYS_GREAT_EQUAL,
|
||||
NEW_ACTIVITY_COND_FINISH_BARTENDER_LEVEL,
|
||||
NEW_ACTIVITY_COND_FINISH_HACHI_STAGE,
|
||||
NEW_ACTIVITY_COND_FINISH_ANY_INSTABLE_SPRAY_CHALLENGE_STAGE,
|
||||
NEW_ACTIVITY_COND_HACHI_FINISH_BATTLE_STAGE_EQUAL,
|
||||
NEW_ACTIVITY_COND_FINISH_CHANNELLER_SLAB_APPOINTED_STAGE_ALL_CAMP,
|
||||
NEW_ACTIVITY_COND_FINISH_WATCHER,
|
||||
NEW_ACTIVITY_COND_FINISH_REGION_SEARCH,
|
||||
NEW_ACTIVITY_COND_FINISH_WATER_SPIRIT_PHASE,
|
||||
NEW_ACTIVITY_COND_SEA_LAMP_POPULARIT,
|
||||
NEW_ACTIVITY_COND_FINISH_DIG_ACTIVITY,
|
||||
NEW_ACTIVITY_COND_FINISH_FIND_HILICHURL_LEVEL_EQUAL,
|
||||
NEW_ACTIVITY_COND_GACHA_CAN_CREATE_ROBOT,
|
||||
NEW_ACTIVITY_COND_FINISH_SALVAGE_STAGE,
|
||||
NEW_ACTIVITY_COND_FINISH_MUSIC_GAME_ALL_LEVEL,
|
||||
NEW_ACTIVITY_COND_DAYS_LESS,
|
||||
NEW_ACTIVITY_COND_QUEST_FINISH,
|
||||
NEW_ACTIVITY_COND_QUEST_GLOBAL_VAR_EQUAL,
|
||||
NEW_ACTIVITY_COND_GROUP_BUNDLE_FINISHED,
|
||||
NEW_ACTIVITY_COND_SEA_LAMP_PHASE,
|
||||
NEW_ACTIVITY_COND_FINISH_CHANNELLER_SLAB_ANY_STAGE_ALL_CAMP,
|
||||
NEW_ACTIVITY_COND_LUMINANCE_STONE_CHALLENGE_FINAL_GALLERY_COMPLETE,
|
||||
NEW_ACTIVITY_COND_PLANT_FLOWER_CAN_DELIVER,
|
||||
NEW_ACTIVITY_COND_LUMINANCE_STONE_CHALLENGE_STAGE_GREAT_EQUAL,
|
||||
NEW_ACTIVITY_COND_FINISH_ANY_ARENA_CHALLENGE_LEVEL,
|
||||
NEW_ACTIVITY_COND_FINISH_CUSTOM_DUNGEON_OFFICIAL,
|
||||
NEW_ACTIVITY_COND_SCENE_MP_PLAY_ACTIVATED,
|
||||
NEW_ACTIVITY_COND_FINISH_FIND_HILICHURL_LEVEL_LESS,
|
||||
NEW_ACTIVITY_COND_TIME_GREATER,
|
||||
NEW_ACTIVITY_COND_CREATE_NPC,
|
||||
NEW_ACTIVITY_COND_TREASURE_SEELIE_FINISH_REGION,
|
||||
NEW_ACTIVITY_COND_LUNA_RITE_ATMOSPHERE,
|
||||
NEW_ACTIVITY_COND_OFFERING_LEVEL_GREAT_EQUAL,
|
||||
NEW_ACTIVITY_COND_FINISH_CHANNELLER_SLAB_ANY_ONEOFF_DUNGEON,
|
||||
NEW_ACTIVITY_COND_QUEST_FINISH_ALLOW_QUICK_OPEN,
|
||||
NEW_ACTIVITY_COND_FINISH_POTION_ANY_LEVEL,
|
||||
NEW_ACTIVITY_COND_MECHANICUS_OPEN,
|
||||
NEW_ACTIVITY_COND_PLAYER_LEVEL_GREATER,
|
||||
NEW_ACTIVITY_COND_SALESMAN_CAN_GET_REWARD,
|
||||
NEW_ACTIVITY_COND_FINISH_REGION_SEARCH_LOGIC,
|
||||
NEW_ACTIVITY_COND_FINISH_CHANNELLER_SLAB_ONEOFF_DUNGEON_IN_STAGE
|
||||
}
|
||||
package emu.grasscutter.game.activity.condition;
|
||||
|
||||
public enum ActivityConditions {
|
||||
NEW_ACTIVITY_COND_PLAYER_LEVEL_GREAT_EQUAL,
|
||||
NEW_ACTIVITY_COND_NOT_FINISH_TALK,
|
||||
NEW_ACTIVITY_COND_SALESMAN_CAN_DELIVER,
|
||||
NEW_ACTIVITY_COND_FINISH_PHOTO_POS_ID,
|
||||
NEW_ACTIVITY_COND_HACHI_FINISH_STEALTH_STAGE_EQUAL,
|
||||
NEW_ACTIVITY_COND_UNLOCKED_ALL_LISTED_SCENE_POINTS,
|
||||
NEW_ACTIVITY_COND_DAYS_GREAT_EQUAL,
|
||||
NEW_ACTIVITY_COND_FINISH_BARTENDER_LEVEL,
|
||||
NEW_ACTIVITY_COND_FINISH_HACHI_STAGE,
|
||||
NEW_ACTIVITY_COND_FINISH_ANY_INSTABLE_SPRAY_CHALLENGE_STAGE,
|
||||
NEW_ACTIVITY_COND_HACHI_FINISH_BATTLE_STAGE_EQUAL,
|
||||
NEW_ACTIVITY_COND_FINISH_CHANNELLER_SLAB_APPOINTED_STAGE_ALL_CAMP,
|
||||
NEW_ACTIVITY_COND_FINISH_WATCHER,
|
||||
NEW_ACTIVITY_COND_FINISH_REGION_SEARCH,
|
||||
NEW_ACTIVITY_COND_FINISH_WATER_SPIRIT_PHASE,
|
||||
NEW_ACTIVITY_COND_SEA_LAMP_POPULARIT,
|
||||
NEW_ACTIVITY_COND_FINISH_DIG_ACTIVITY,
|
||||
NEW_ACTIVITY_COND_FINISH_FIND_HILICHURL_LEVEL_EQUAL,
|
||||
NEW_ACTIVITY_COND_GACHA_CAN_CREATE_ROBOT,
|
||||
NEW_ACTIVITY_COND_FINISH_SALVAGE_STAGE,
|
||||
NEW_ACTIVITY_COND_FINISH_MUSIC_GAME_ALL_LEVEL,
|
||||
NEW_ACTIVITY_COND_DAYS_LESS,
|
||||
NEW_ACTIVITY_COND_QUEST_FINISH,
|
||||
NEW_ACTIVITY_COND_QUEST_GLOBAL_VAR_EQUAL,
|
||||
NEW_ACTIVITY_COND_GROUP_BUNDLE_FINISHED,
|
||||
NEW_ACTIVITY_COND_SEA_LAMP_PHASE,
|
||||
NEW_ACTIVITY_COND_FINISH_CHANNELLER_SLAB_ANY_STAGE_ALL_CAMP,
|
||||
NEW_ACTIVITY_COND_LUMINANCE_STONE_CHALLENGE_FINAL_GALLERY_COMPLETE,
|
||||
NEW_ACTIVITY_COND_PLANT_FLOWER_CAN_DELIVER,
|
||||
NEW_ACTIVITY_COND_LUMINANCE_STONE_CHALLENGE_STAGE_GREAT_EQUAL,
|
||||
NEW_ACTIVITY_COND_FINISH_ANY_ARENA_CHALLENGE_LEVEL,
|
||||
NEW_ACTIVITY_COND_FINISH_CUSTOM_DUNGEON_OFFICIAL,
|
||||
NEW_ACTIVITY_COND_SCENE_MP_PLAY_ACTIVATED,
|
||||
NEW_ACTIVITY_COND_FINISH_FIND_HILICHURL_LEVEL_LESS,
|
||||
NEW_ACTIVITY_COND_TIME_GREATER,
|
||||
NEW_ACTIVITY_COND_CREATE_NPC,
|
||||
NEW_ACTIVITY_COND_TREASURE_SEELIE_FINISH_REGION,
|
||||
NEW_ACTIVITY_COND_LUNA_RITE_ATMOSPHERE,
|
||||
NEW_ACTIVITY_COND_OFFERING_LEVEL_GREAT_EQUAL,
|
||||
NEW_ACTIVITY_COND_FINISH_CHANNELLER_SLAB_ANY_ONEOFF_DUNGEON,
|
||||
NEW_ACTIVITY_COND_QUEST_FINISH_ALLOW_QUICK_OPEN,
|
||||
NEW_ACTIVITY_COND_FINISH_POTION_ANY_LEVEL,
|
||||
NEW_ACTIVITY_COND_MECHANICUS_OPEN,
|
||||
NEW_ACTIVITY_COND_PLAYER_LEVEL_GREATER,
|
||||
NEW_ACTIVITY_COND_SALESMAN_CAN_GET_REWARD,
|
||||
NEW_ACTIVITY_COND_FINISH_REGION_SEARCH_LOGIC,
|
||||
NEW_ACTIVITY_COND_FINISH_CHANNELLER_SLAB_ONEOFF_DUNGEON_IN_STAGE
|
||||
}
|
||||
|
||||
@@ -1,60 +1,63 @@
|
||||
package emu.grasscutter.game.activity.condition;
|
||||
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.data.excels.ActivityCondExcelConfigData;
|
||||
import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
|
||||
import org.reflections.Reflections;
|
||||
|
||||
import java.util.AbstractMap;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* Class that used for scanning classpath, picking up all activity conditions (for NewActivityCondExcelConfigData.json {@link ActivityCondExcelConfigData})
|
||||
* and saving them to map. Check for more info {@link ActivityCondition}
|
||||
*/
|
||||
public class AllActivityConditionBuilder {
|
||||
|
||||
/**
|
||||
* Build activity conditions handlers
|
||||
*
|
||||
* @return map containing all condition handlers for NewActivityCondExcelConfigData.json
|
||||
*/
|
||||
static public Map<ActivityConditions, ActivityConditionBaseHandler> buildActivityConditions() {
|
||||
return new AllActivityConditionBuilder().initActivityConditions();
|
||||
}
|
||||
|
||||
private Map<ActivityConditions, ActivityConditionBaseHandler> initActivityConditions() {
|
||||
Reflections reflector = Grasscutter.reflector;
|
||||
return reflector.getTypesAnnotatedWith(ActivityCondition.class).stream()
|
||||
.map(this::newInstance)
|
||||
.map(h -> new AbstractMap.SimpleEntry<>(extractActionType(h), h))
|
||||
.collect(Collectors.toMap(AbstractMap.SimpleEntry::getKey, AbstractMap.SimpleEntry::getValue));
|
||||
}
|
||||
|
||||
private ActivityConditions extractActionType(ActivityConditionBaseHandler e) {
|
||||
ActivityCondition condition = e.getClass().getAnnotation(ActivityCondition.class);
|
||||
if (condition == null) {
|
||||
Grasscutter.getLogger().error("Failed to read command type for class {}", e.getClass().getName());
|
||||
return null;
|
||||
}
|
||||
|
||||
return condition.value();
|
||||
}
|
||||
|
||||
private ActivityConditionBaseHandler newInstance(Class<?> clazz) {
|
||||
try {
|
||||
Object result = clazz.getDeclaredConstructor().newInstance();
|
||||
if (result instanceof ActivityConditionBaseHandler) {
|
||||
return (ActivityConditionBaseHandler) result;
|
||||
}
|
||||
Grasscutter.getLogger().error("Failed to initiate activity condition: {}, object have wrong type", clazz.getName());
|
||||
} catch (Exception e) {
|
||||
String message = String.format("Failed to initiate activity condition: %s, %s", clazz.getName(), e.getMessage());
|
||||
Grasscutter.getLogger().error(message, e);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
package emu.grasscutter.game.activity.condition;
|
||||
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.data.excels.activity.ActivityCondExcelConfigData;
|
||||
import java.util.AbstractMap;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
import org.reflections.Reflections;
|
||||
|
||||
/**
|
||||
* Class that used for scanning classpath, picking up all activity conditions (for
|
||||
* NewActivityCondExcelConfigData.json {@link ActivityCondExcelConfigData}) and saving them to map.
|
||||
* Check for more info {@link ActivityCondition}
|
||||
*/
|
||||
public class AllActivityConditionBuilder {
|
||||
|
||||
/**
|
||||
* Build activity conditions handlers
|
||||
*
|
||||
* @return map containing all condition handlers for NewActivityCondExcelConfigData.json
|
||||
*/
|
||||
public static Map<ActivityConditions, ActivityConditionBaseHandler> buildActivityConditions() {
|
||||
return new AllActivityConditionBuilder().initActivityConditions();
|
||||
}
|
||||
|
||||
private Map<ActivityConditions, ActivityConditionBaseHandler> initActivityConditions() {
|
||||
Reflections reflector = Grasscutter.reflector;
|
||||
return reflector.getTypesAnnotatedWith(ActivityCondition.class).stream()
|
||||
.map(this::newInstance)
|
||||
.map(h -> new AbstractMap.SimpleEntry<>(extractActionType(h), h))
|
||||
.collect(
|
||||
Collectors.toMap(AbstractMap.SimpleEntry::getKey, AbstractMap.SimpleEntry::getValue));
|
||||
}
|
||||
|
||||
private ActivityConditions extractActionType(ActivityConditionBaseHandler e) {
|
||||
ActivityCondition condition = e.getClass().getAnnotation(ActivityCondition.class);
|
||||
if (condition == null) {
|
||||
Grasscutter.getLogger()
|
||||
.error("Failed to read command type for class {}", e.getClass().getName());
|
||||
return null;
|
||||
}
|
||||
|
||||
return condition.value();
|
||||
}
|
||||
|
||||
private ActivityConditionBaseHandler newInstance(Class<?> clazz) {
|
||||
try {
|
||||
Object result = clazz.getDeclaredConstructor().newInstance();
|
||||
if (result instanceof ActivityConditionBaseHandler) {
|
||||
return (ActivityConditionBaseHandler) result;
|
||||
}
|
||||
Grasscutter.getLogger()
|
||||
.error(
|
||||
"Failed to initiate activity condition: {}, object have wrong type", clazz.getName());
|
||||
} catch (Exception e) {
|
||||
String message =
|
||||
String.format(
|
||||
"Failed to initiate activity condition: %s, %s", clazz.getName(), e.getMessage());
|
||||
Grasscutter.getLogger().error(message, e);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,71 +1,75 @@
|
||||
package emu.grasscutter.game.activity.condition;
|
||||
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.data.excels.ActivityCondExcelConfigData;
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.all.UnknownActivityConditionHandler;
|
||||
import emu.grasscutter.game.quest.enums.LogicType;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.BooleanSupplier;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class BasicActivityConditionExecutor implements ActivityConditionExecutor {
|
||||
|
||||
private final Map<Integer, ActivityConfigItem> activityConfigItemMap;
|
||||
private final Int2ObjectMap<ActivityCondExcelConfigData> activityConditions;
|
||||
|
||||
private final Int2ObjectMap<PlayerActivityData> playerActivityDataByActivityCondId;
|
||||
private final Map<ActivityConditions, ActivityConditionBaseHandler> activityConditionsHandlers;
|
||||
|
||||
private static final UnknownActivityConditionHandler UNKNOWN_CONDITION_HANDLER = new UnknownActivityConditionHandler();
|
||||
|
||||
public BasicActivityConditionExecutor(Map<Integer, ActivityConfigItem> activityConfigItemMap,
|
||||
Int2ObjectMap<ActivityCondExcelConfigData> activityConditions,
|
||||
Int2ObjectMap<PlayerActivityData> playerActivityDataByActivityCondId,
|
||||
Map<ActivityConditions, ActivityConditionBaseHandler> activityConditionsHandlers) {
|
||||
this.activityConfigItemMap = activityConfigItemMap;
|
||||
this.activityConditions = activityConditions;
|
||||
this.playerActivityDataByActivityCondId = playerActivityDataByActivityCondId;
|
||||
this.activityConditionsHandlers = activityConditionsHandlers;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Integer> getMeetActivitiesConditions(List<Integer> condIds) {
|
||||
return condIds.stream()
|
||||
.filter(this::meetsCondition)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean meetsCondition(int activityCondId) {
|
||||
ActivityCondExcelConfigData condData = activityConditions.get(activityCondId);
|
||||
|
||||
if (condData == null) {
|
||||
Grasscutter.getLogger().error("Could not find condition for activity with id = {}", activityCondId);
|
||||
return false;
|
||||
}
|
||||
|
||||
LogicType condComb = condData.getCondComb();
|
||||
if (condComb == null) {
|
||||
condComb = LogicType.LOGIC_AND;
|
||||
}
|
||||
|
||||
PlayerActivityData activity = playerActivityDataByActivityCondId.get(activityCondId);
|
||||
if(activity==null){
|
||||
return false;
|
||||
}
|
||||
ActivityConfigItem activityConfig = activityConfigItemMap.get(activity.getActivityId());
|
||||
List<BooleanSupplier> predicates = condData.getCond()
|
||||
.stream()
|
||||
.map(c -> (BooleanSupplier) () ->
|
||||
activityConditionsHandlers
|
||||
.getOrDefault(c.getType(), UNKNOWN_CONDITION_HANDLER).execute(activity, activityConfig, c.paramArray()))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return LogicType.calculate(condComb, predicates);
|
||||
}
|
||||
}
|
||||
package emu.grasscutter.game.activity.condition;
|
||||
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.data.excels.activity.ActivityCondExcelConfigData;
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.all.UnknownActivityConditionHandler;
|
||||
import emu.grasscutter.game.quest.enums.LogicType;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.BooleanSupplier;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class BasicActivityConditionExecutor implements ActivityConditionExecutor {
|
||||
|
||||
private final Map<Integer, ActivityConfigItem> activityConfigItemMap;
|
||||
private final Int2ObjectMap<ActivityCondExcelConfigData> activityConditions;
|
||||
|
||||
private final Int2ObjectMap<PlayerActivityData> playerActivityDataByActivityCondId;
|
||||
private final Map<ActivityConditions, ActivityConditionBaseHandler> activityConditionsHandlers;
|
||||
|
||||
private static final UnknownActivityConditionHandler UNKNOWN_CONDITION_HANDLER =
|
||||
new UnknownActivityConditionHandler();
|
||||
|
||||
public BasicActivityConditionExecutor(
|
||||
Map<Integer, ActivityConfigItem> activityConfigItemMap,
|
||||
Int2ObjectMap<ActivityCondExcelConfigData> activityConditions,
|
||||
Int2ObjectMap<PlayerActivityData> playerActivityDataByActivityCondId,
|
||||
Map<ActivityConditions, ActivityConditionBaseHandler> activityConditionsHandlers) {
|
||||
this.activityConfigItemMap = activityConfigItemMap;
|
||||
this.activityConditions = activityConditions;
|
||||
this.playerActivityDataByActivityCondId = playerActivityDataByActivityCondId;
|
||||
this.activityConditionsHandlers = activityConditionsHandlers;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Integer> getMeetActivitiesConditions(List<Integer> condIds) {
|
||||
return condIds.stream().filter(this::meetsCondition).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean meetsCondition(int activityCondId) {
|
||||
ActivityCondExcelConfigData condData = activityConditions.get(activityCondId);
|
||||
|
||||
if (condData == null) {
|
||||
Grasscutter.getLogger()
|
||||
.error("Could not find condition for activity with id = {}", activityCondId);
|
||||
return false;
|
||||
}
|
||||
|
||||
LogicType condComb = condData.getCondComb();
|
||||
if (condComb == null) {
|
||||
condComb = LogicType.LOGIC_AND;
|
||||
}
|
||||
|
||||
PlayerActivityData activity = playerActivityDataByActivityCondId.get(activityCondId);
|
||||
if (activity == null) {
|
||||
return false;
|
||||
}
|
||||
ActivityConfigItem activityConfig = activityConfigItemMap.get(activity.getActivityId());
|
||||
List<BooleanSupplier> predicates =
|
||||
condData.getCond().stream()
|
||||
.map(
|
||||
c ->
|
||||
(BooleanSupplier)
|
||||
() ->
|
||||
activityConditionsHandlers
|
||||
.getOrDefault(c.getType(), UNKNOWN_CONDITION_HANDLER)
|
||||
.execute(activity, activityConfig, c.paramArray()))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return LogicType.calculate(condComb, predicates);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,80 +1,81 @@
|
||||
package emu.grasscutter.game.activity.condition;
|
||||
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.excels.ActivityCondExcelConfigData;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import it.unimi.dsi.fastutil.ints.AbstractInt2ObjectMap.BasicEntry;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* This class is used for building mapping for PlayerActivityData
|
||||
*/
|
||||
public class PlayerActivityDataMappingBuilder {
|
||||
|
||||
|
||||
private final Map<Integer, PlayerActivityData> playerActivityDataMap;
|
||||
|
||||
private final Int2ObjectMap<ActivityCondExcelConfigData> activityCondMap;
|
||||
|
||||
/**
|
||||
* Build mapping for PlayerActivityData.
|
||||
*
|
||||
* @return mapping for activity data. Key is condId from NewActivityCondExcelConfigData.json ({@link ActivityCondExcelConfigData}) resource,
|
||||
* value is {@link PlayerActivityData} class for related activity.
|
||||
*/
|
||||
public static Int2ObjectMap<PlayerActivityData> buildPlayerActivityDataByActivityCondId(Map<Integer, PlayerActivityData> activities) {
|
||||
return new PlayerActivityDataMappingBuilder(activities).buildMappings();
|
||||
}
|
||||
|
||||
public PlayerActivityDataMappingBuilder(Map<Integer, PlayerActivityData> playerActivityDataMap) {
|
||||
this.playerActivityDataMap = playerActivityDataMap;
|
||||
activityCondMap = GameData.getActivityCondExcelConfigDataMap();
|
||||
}
|
||||
|
||||
private Int2ObjectMap<PlayerActivityData> buildMappings() {
|
||||
Int2ObjectMap<PlayerActivityData> result = new Int2ObjectRBTreeMap<>();
|
||||
|
||||
activityCondMap
|
||||
.int2ObjectEntrySet()
|
||||
.stream()
|
||||
.map(entry -> new BasicEntry<>(entry.getIntKey(), getPlayerActivityDataByCondId(entry.getIntKey())))
|
||||
.filter(entry -> entry.getValue() != null)
|
||||
.forEach(entry -> result.put(entry.getIntKey(), entry.getValue()));
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private PlayerActivityData getPlayerActivityDataByCondId(Integer key) {
|
||||
return playerActivityDataMap.get(detectActivityDataIdByCondId(key));
|
||||
}
|
||||
|
||||
/**
|
||||
* Detect activity data id by cond id. Cond id comes from condId field from NewActivityCondExcelConfigData.json.
|
||||
* See {@link ActivityCondExcelConfigData} for condId.
|
||||
* <p>
|
||||
* Generally, there are 3 cases:
|
||||
* <ol>
|
||||
* <li>Activity data id >= 5003. Then cond id will be activity data id plus 3 additional digits.
|
||||
* For example: activity data id = 5087, cond id = 5087xxx (x - any digit)</li>
|
||||
* <li>Activity data id = 5001. Then cond id will be activity data id plus 2 additional digits.
|
||||
* For example: activity data id = 5001, cond id = 5001xx (x - any digit)</li>
|
||||
* <li>Activity data id one of [1001]. Then cond id will be activity data id plus 2 additional digits.
|
||||
* This also applied to activity data id = 1002. For example: activity data id = 1001, cond id = 1001x (x - any digit></li>
|
||||
* </ol>
|
||||
*
|
||||
* @param key cond id for which activity data id should be defined
|
||||
* @return activity data for given cond id. Returns -1 if activity was not found.
|
||||
*/
|
||||
private Integer detectActivityDataIdByCondId(Integer key) {
|
||||
if (key / 10 == 1001 || key / 10 == 1002) {
|
||||
return 1001;
|
||||
} else if (key / 100 == 5001) {
|
||||
return key / 100;
|
||||
} else {
|
||||
return key / 1000;
|
||||
}
|
||||
}
|
||||
}
|
||||
package emu.grasscutter.game.activity.condition;
|
||||
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.excels.activity.ActivityCondExcelConfigData;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import it.unimi.dsi.fastutil.ints.AbstractInt2ObjectMap.BasicEntry;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap;
|
||||
import java.util.Map;
|
||||
|
||||
/** This class is used for building mapping for PlayerActivityData */
|
||||
public class PlayerActivityDataMappingBuilder {
|
||||
|
||||
private final Map<Integer, PlayerActivityData> playerActivityDataMap;
|
||||
|
||||
private final Int2ObjectMap<ActivityCondExcelConfigData> activityCondMap;
|
||||
|
||||
/**
|
||||
* Build mapping for PlayerActivityData.
|
||||
*
|
||||
* @return mapping for activity data. Key is condId from NewActivityCondExcelConfigData.json
|
||||
* ({@link ActivityCondExcelConfigData}) resource, value is {@link PlayerActivityData} class
|
||||
* for related activity.
|
||||
*/
|
||||
public static Int2ObjectMap<PlayerActivityData> buildPlayerActivityDataByActivityCondId(
|
||||
Map<Integer, PlayerActivityData> activities) {
|
||||
return new PlayerActivityDataMappingBuilder(activities).buildMappings();
|
||||
}
|
||||
|
||||
public PlayerActivityDataMappingBuilder(Map<Integer, PlayerActivityData> playerActivityDataMap) {
|
||||
this.playerActivityDataMap = playerActivityDataMap;
|
||||
activityCondMap = GameData.getActivityCondExcelConfigDataMap();
|
||||
}
|
||||
|
||||
private Int2ObjectMap<PlayerActivityData> buildMappings() {
|
||||
Int2ObjectMap<PlayerActivityData> result = new Int2ObjectRBTreeMap<>();
|
||||
|
||||
activityCondMap.int2ObjectEntrySet().stream()
|
||||
.map(
|
||||
entry ->
|
||||
new BasicEntry<>(
|
||||
entry.getIntKey(), getPlayerActivityDataByCondId(entry.getIntKey())))
|
||||
.filter(entry -> entry.getValue() != null)
|
||||
.forEach(entry -> result.put(entry.getIntKey(), entry.getValue()));
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private PlayerActivityData getPlayerActivityDataByCondId(Integer key) {
|
||||
return playerActivityDataMap.get(detectActivityDataIdByCondId(key));
|
||||
}
|
||||
|
||||
/**
|
||||
* Detect activity data id by cond id. Cond id comes from condId field from
|
||||
* NewActivityCondExcelConfigData.json. See {@link ActivityCondExcelConfigData} for condId.
|
||||
*
|
||||
* <p>Generally, there are 3 cases:
|
||||
*
|
||||
* <ol>
|
||||
* <li>Activity data id >= 5003. Then cond id will be activity data id plus 3 additional digits.
|
||||
* For example: activity data id = 5087, cond id = 5087xxx (x - any digit)
|
||||
* <li>Activity data id = 5001. Then cond id will be activity data id plus 2 additional digits.
|
||||
* For example: activity data id = 5001, cond id = 5001xx (x - any digit)
|
||||
* <li>Activity data id one of [1001]. Then cond id will be activity data id plus 2 additional
|
||||
* digits. This also applied to activity data id = 1002. For example: activity data id =
|
||||
* 1001, cond id = 1001x (x - any digit>
|
||||
* </ol>
|
||||
*
|
||||
* @param key cond id for which activity data id should be defined
|
||||
* @return activity data for given cond id. Returns -1 if activity was not found.
|
||||
*/
|
||||
private Integer detectActivityDataIdByCondId(Integer key) {
|
||||
if (key / 10 == 1001 || key / 10 == 1002) {
|
||||
return 1001;
|
||||
} else if (key / 100 == 5001) {
|
||||
return key / 100;
|
||||
} else {
|
||||
return key / 1000;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
package emu.grasscutter.game.activity.condition.all;
|
||||
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.ActivityCondition;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
|
||||
|
||||
import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_DAYS_LESS;
|
||||
|
||||
@ActivityCondition(NEW_ACTIVITY_COND_DAYS_LESS)
|
||||
public class DayLess extends ActivityConditionBaseHandler {
|
||||
@Override
|
||||
public boolean execute(PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||
return true; //TODO implement this and add possibility to always return true
|
||||
}
|
||||
}
|
||||
package emu.grasscutter.game.activity.condition.all;
|
||||
|
||||
import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_DAYS_LESS;
|
||||
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.ActivityCondition;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
|
||||
|
||||
@ActivityCondition(NEW_ACTIVITY_COND_DAYS_LESS)
|
||||
public class DayLess extends ActivityConditionBaseHandler {
|
||||
@Override
|
||||
public boolean execute(
|
||||
PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||
return true; // TODO implement this and add possibility to always return true
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
package emu.grasscutter.game.activity.condition.all;
|
||||
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.ActivityCondition;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_DAYS_GREAT_EQUAL;
|
||||
|
||||
@ActivityCondition(NEW_ACTIVITY_COND_DAYS_GREAT_EQUAL)
|
||||
public class DaysGreatEqual extends ActivityConditionBaseHandler {
|
||||
@Override
|
||||
public boolean execute(PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||
Date activityBeginTime = activityConfig.getBeginTime();
|
||||
long timeDiff = System.currentTimeMillis() - activityBeginTime.getTime();
|
||||
int days = (int) (timeDiff / (1000 * 60 * 60 * 24L));
|
||||
return days + 1 >= params[0];
|
||||
}
|
||||
}
|
||||
package emu.grasscutter.game.activity.condition.all;
|
||||
|
||||
import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_DAYS_GREAT_EQUAL;
|
||||
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.ActivityCondition;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
|
||||
import java.util.Date;
|
||||
|
||||
@ActivityCondition(NEW_ACTIVITY_COND_DAYS_GREAT_EQUAL)
|
||||
public class DaysGreatEqual extends ActivityConditionBaseHandler {
|
||||
@Override
|
||||
public boolean execute(
|
||||
PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||
Date activityBeginTime = activityConfig.getBeginTime();
|
||||
long timeDiff = System.currentTimeMillis() - activityBeginTime.getTime();
|
||||
int days = (int) (timeDiff / (1000 * 60 * 60 * 24L));
|
||||
return days + 1 >= params[0];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,24 +1,25 @@
|
||||
package emu.grasscutter.game.activity.condition.all;
|
||||
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.ActivityCondition;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditions;
|
||||
import lombok.val;
|
||||
|
||||
@ActivityCondition(ActivityConditions.NEW_ACTIVITY_COND_FINISH_WATCHER)
|
||||
public class FinishWatcher extends ActivityConditionBaseHandler {
|
||||
|
||||
@Override
|
||||
public boolean execute(PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||
val watcherMap = activityData.getWatcherInfoMap();
|
||||
for (int param : params) {
|
||||
val watcher = watcherMap.get(param);
|
||||
if(watcher == null || !watcher.isFinished()){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
package emu.grasscutter.game.activity.condition.all;
|
||||
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.ActivityCondition;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditions;
|
||||
import lombok.val;
|
||||
|
||||
@ActivityCondition(ActivityConditions.NEW_ACTIVITY_COND_FINISH_WATCHER)
|
||||
public class FinishWatcher extends ActivityConditionBaseHandler {
|
||||
|
||||
@Override
|
||||
public boolean execute(
|
||||
PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||
val watcherMap = activityData.getWatcherInfoMap();
|
||||
for (int param : params) {
|
||||
val watcher = watcherMap.get(param);
|
||||
if (watcher == null || !watcher.isFinished()) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,22 +1,21 @@
|
||||
package emu.grasscutter.game.activity.condition.all;
|
||||
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.ActivityCondition;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
|
||||
|
||||
import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_NOT_FINISH_TALK;
|
||||
|
||||
@ActivityCondition(NEW_ACTIVITY_COND_NOT_FINISH_TALK)
|
||||
public class NotFinishTalk extends ActivityConditionBaseHandler {
|
||||
@Override
|
||||
public boolean execute(PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||
return activityData
|
||||
.getPlayer()
|
||||
.getQuestManager()
|
||||
.getMainQuests()
|
||||
.int2ObjectEntrySet()
|
||||
.stream()
|
||||
.noneMatch(q -> q.getValue().getTalks().get(params[0]) != null); //FIXME taken from ContentCompleteTalk
|
||||
}
|
||||
}
|
||||
package emu.grasscutter.game.activity.condition.all;
|
||||
|
||||
import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_NOT_FINISH_TALK;
|
||||
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.ActivityCondition;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
|
||||
|
||||
@ActivityCondition(NEW_ACTIVITY_COND_NOT_FINISH_TALK)
|
||||
public class NotFinishTalk extends ActivityConditionBaseHandler {
|
||||
@Override
|
||||
public boolean execute(
|
||||
PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||
return activityData.getPlayer().getQuestManager().getMainQuests().int2ObjectEntrySet().stream()
|
||||
.noneMatch(
|
||||
q ->
|
||||
q.getValue().getTalks().get(params[0])
|
||||
!= null); // FIXME taken from ContentCompleteTalk
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
package emu.grasscutter.game.activity.condition.all;
|
||||
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.ActivityCondition;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
|
||||
|
||||
import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_PLAYER_LEVEL_GREAT_EQUAL;
|
||||
|
||||
@ActivityCondition(NEW_ACTIVITY_COND_PLAYER_LEVEL_GREAT_EQUAL)
|
||||
public class PlayerLevelGreatEqualActivityActivityCondition extends ActivityConditionBaseHandler {
|
||||
|
||||
@Override
|
||||
public boolean execute(PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||
return activityData.getPlayer().getLevel() >= params[0];
|
||||
}
|
||||
}
|
||||
package emu.grasscutter.game.activity.condition.all;
|
||||
|
||||
import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_PLAYER_LEVEL_GREAT_EQUAL;
|
||||
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.ActivityCondition;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
|
||||
|
||||
@ActivityCondition(NEW_ACTIVITY_COND_PLAYER_LEVEL_GREAT_EQUAL)
|
||||
public class PlayerLevelGreatEqualActivityActivityCondition extends ActivityConditionBaseHandler {
|
||||
|
||||
@Override
|
||||
public boolean execute(
|
||||
PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||
return activityData.getPlayer().getLevel() >= params[0];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,23 +1,21 @@
|
||||
package emu.grasscutter.game.activity.condition.all;
|
||||
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.ActivityCondition;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
|
||||
import emu.grasscutter.game.quest.GameQuest;
|
||||
import emu.grasscutter.game.quest.enums.QuestState;
|
||||
|
||||
import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_QUEST_FINISH;
|
||||
|
||||
@ActivityCondition(NEW_ACTIVITY_COND_QUEST_FINISH)
|
||||
public class QuestFinished extends ActivityConditionBaseHandler {
|
||||
@Override
|
||||
public boolean execute(PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||
GameQuest quest = activityData
|
||||
.getPlayer()
|
||||
.getQuestManager()
|
||||
.getQuestById(params[0]);
|
||||
|
||||
return quest != null && quest.getState() == QuestState.QUEST_STATE_FINISHED;
|
||||
}
|
||||
}
|
||||
package emu.grasscutter.game.activity.condition.all;
|
||||
|
||||
import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_QUEST_FINISH;
|
||||
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.ActivityCondition;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
|
||||
import emu.grasscutter.game.quest.GameQuest;
|
||||
import emu.grasscutter.game.quest.enums.QuestState;
|
||||
|
||||
@ActivityCondition(NEW_ACTIVITY_COND_QUEST_FINISH)
|
||||
public class QuestFinished extends ActivityConditionBaseHandler {
|
||||
@Override
|
||||
public boolean execute(
|
||||
PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||
GameQuest quest = activityData.getPlayer().getQuestManager().getQuestById(params[0]);
|
||||
|
||||
return quest != null && quest.getState() == QuestState.QUEST_STATE_FINISHED;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,19 +1,20 @@
|
||||
package emu.grasscutter.game.activity.condition.all;
|
||||
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.ActivityCondition;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
|
||||
|
||||
import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_SALESMAN_CAN_DELIVER;
|
||||
|
||||
@ActivityCondition(NEW_ACTIVITY_COND_SALESMAN_CAN_DELIVER)
|
||||
public class SalesmanCanDeliver extends ActivityConditionBaseHandler {
|
||||
@Override
|
||||
public boolean execute(PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||
//TODO need to reverse engineer this logic.
|
||||
//This condition appears only in one condition "condId": 5003001
|
||||
//and this condition accept no params. I have no idea how to implement it
|
||||
return false;
|
||||
}
|
||||
}
|
||||
package emu.grasscutter.game.activity.condition.all;
|
||||
|
||||
import static emu.grasscutter.game.activity.condition.ActivityConditions.NEW_ACTIVITY_COND_SALESMAN_CAN_DELIVER;
|
||||
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.ActivityCondition;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
|
||||
|
||||
@ActivityCondition(NEW_ACTIVITY_COND_SALESMAN_CAN_DELIVER)
|
||||
public class SalesmanCanDeliver extends ActivityConditionBaseHandler {
|
||||
@Override
|
||||
public boolean execute(
|
||||
PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||
// TODO need to reverse engineer this logic.
|
||||
// This condition appears only in one condition "condId": 5003001
|
||||
// and this condition accept no params. I have no idea how to implement it
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
package emu.grasscutter.game.activity.condition.all;
|
||||
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
|
||||
|
||||
/**
|
||||
* This class is used when condition was not found
|
||||
*/
|
||||
public class UnknownActivityConditionHandler extends ActivityConditionBaseHandler {
|
||||
|
||||
@Override
|
||||
public boolean execute(PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||
Grasscutter.getLogger().error("Called unknown condition handler");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
package emu.grasscutter.game.activity.condition.all;
|
||||
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.game.activity.ActivityConfigItem;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.activity.condition.ActivityConditionBaseHandler;
|
||||
|
||||
/** This class is used when condition was not found */
|
||||
public class UnknownActivityConditionHandler extends ActivityConditionBaseHandler {
|
||||
|
||||
@Override
|
||||
public boolean execute(
|
||||
PlayerActivityData activityData, ActivityConfigItem activityConfig, int... params) {
|
||||
Grasscutter.getLogger().error("Called unknown condition handler");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,36 +1,35 @@
|
||||
package emu.grasscutter.game.activity.trialavatar;
|
||||
|
||||
import emu.grasscutter.game.activity.ActivityWatcher;
|
||||
import emu.grasscutter.game.activity.ActivityWatcherType;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.props.WatcherTriggerType;
|
||||
|
||||
import lombok.val;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
@ActivityWatcherType(WatcherTriggerType.TRIGGER_FINISH_CHALLENGE)
|
||||
public class TrialAvatarActivityChallengeTrigger extends ActivityWatcher {
|
||||
@Override
|
||||
protected boolean isMeet(String... param) {
|
||||
if(param.length < 3) return false;
|
||||
|
||||
val handler = (TrialAvatarActivityHandler) getActivityHandler();
|
||||
if(handler == null) return false;
|
||||
|
||||
val paramList = handler.getTriggerParamList();
|
||||
if(paramList.isEmpty()) return false;
|
||||
|
||||
val paramCond = Stream.of(paramList.get(0).split(",")).toList();
|
||||
return Stream.of(param).allMatch(x -> paramCond.contains(x));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void trigger(PlayerActivityData playerActivityData, String... param) {
|
||||
if (!isMeet(param)) return;
|
||||
|
||||
val handler = (TrialAvatarActivityHandler) getActivityHandler();
|
||||
if(handler == null) return;
|
||||
|
||||
handler.setPassDungeon(playerActivityData);
|
||||
}
|
||||
}
|
||||
package emu.grasscutter.game.activity.trialavatar;
|
||||
|
||||
import emu.grasscutter.game.activity.ActivityWatcher;
|
||||
import emu.grasscutter.game.activity.ActivityWatcherType;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.props.WatcherTriggerType;
|
||||
import java.util.stream.Stream;
|
||||
import lombok.val;
|
||||
|
||||
@ActivityWatcherType(WatcherTriggerType.TRIGGER_FINISH_CHALLENGE)
|
||||
public class TrialAvatarActivityChallengeTrigger extends ActivityWatcher {
|
||||
@Override
|
||||
protected boolean isMeet(String... param) {
|
||||
if (param.length < 3) return false;
|
||||
|
||||
val handler = (TrialAvatarActivityHandler) getActivityHandler();
|
||||
if (handler == null) return false;
|
||||
|
||||
val paramList = handler.getTriggerParamList();
|
||||
if (paramList.isEmpty()) return false;
|
||||
|
||||
val paramCond = Stream.of(paramList.get(0).split(",")).toList();
|
||||
return Stream.of(param).allMatch(x -> paramCond.contains(x));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void trigger(PlayerActivityData playerActivityData, String... param) {
|
||||
if (!isMeet(param)) return;
|
||||
|
||||
val handler = (TrialAvatarActivityHandler) getActivityHandler();
|
||||
if (handler == null) return;
|
||||
|
||||
handler.setPassDungeon(playerActivityData);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,144 +1,164 @@
|
||||
package emu.grasscutter.game.activity.trialavatar;
|
||||
|
||||
import com.esotericsoftware.reflectasm.ConstructorAccess;
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.excels.RewardData;
|
||||
import emu.grasscutter.game.activity.ActivityWatcher;
|
||||
import emu.grasscutter.game.activity.DefaultWatcher;
|
||||
import emu.grasscutter.game.dungeons.DungeonTrialTeam;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.props.ActionReason;
|
||||
import emu.grasscutter.game.props.WatcherTriggerType;
|
||||
import emu.grasscutter.game.activity.ActivityHandler;
|
||||
import emu.grasscutter.game.activity.GameActivity;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.props.ActivityType;
|
||||
import emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo;
|
||||
import emu.grasscutter.net.proto.TrialAvatarGrantRecordOuterClass.TrialAvatarGrantRecord.GrantReason;
|
||||
import emu.grasscutter.server.packet.send.PacketActivityInfoNotify;
|
||||
import emu.grasscutter.server.packet.send.PacketScenePlayerLocationNotify;
|
||||
import emu.grasscutter.utils.JsonUtils;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.*;
|
||||
import lombok.*;
|
||||
|
||||
@GameActivity(ActivityType.NEW_ACTIVITY_TRIAL_AVATAR)
|
||||
public class TrialAvatarActivityHandler extends ActivityHandler {
|
||||
@Getter @Setter private int selectedTrialAvatarIndex;
|
||||
|
||||
@Override
|
||||
public void onInitPlayerActivityData(PlayerActivityData playerActivityData) {
|
||||
TrialAvatarPlayerData trialAvatarPlayerData = TrialAvatarPlayerData.create(getActivityConfigItem().getScheduleId());
|
||||
|
||||
playerActivityData.setDetail(trialAvatarPlayerData);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onProtoBuild(PlayerActivityData playerActivityData, ActivityInfo.Builder activityInfo) {
|
||||
TrialAvatarPlayerData trialAvatarPlayerData = getTrialAvatarPlayerData(playerActivityData);
|
||||
|
||||
activityInfo.setTrialAvatarInfo(trialAvatarPlayerData.toProto());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initWatchers(Map<WatcherTriggerType, ConstructorAccess<?>> activityWatcherTypeMap) {
|
||||
var watcherType = activityWatcherTypeMap.get(WatcherTriggerType.TRIGGER_FINISH_CHALLENGE);
|
||||
ActivityWatcher watcher;
|
||||
if(watcherType != null){
|
||||
watcher = (ActivityWatcher) watcherType.newInstance();
|
||||
}else{
|
||||
watcher = new DefaultWatcher();
|
||||
}
|
||||
|
||||
watcher.setActivityHandler(this);
|
||||
getWatchersMap().computeIfAbsent(WatcherTriggerType.TRIGGER_FINISH_CHALLENGE, k -> new ArrayList<>());
|
||||
getWatchersMap().get(WatcherTriggerType.TRIGGER_FINISH_CHALLENGE).add(watcher);
|
||||
}
|
||||
|
||||
public TrialAvatarPlayerData getTrialAvatarPlayerData(PlayerActivityData playerActivityData) {
|
||||
if (playerActivityData.getDetail() == null || playerActivityData.getDetail().isBlank()) {
|
||||
onInitPlayerActivityData(playerActivityData);
|
||||
playerActivityData.save();
|
||||
}
|
||||
|
||||
return JsonUtils.decode(playerActivityData.getDetail(), TrialAvatarPlayerData.class);
|
||||
}
|
||||
|
||||
public int getTrialActivityDungeonId(int trialAvatarIndexId) {
|
||||
val data = GameData.getTrialAvatarActivityDataByAvatarIndex(trialAvatarIndexId);
|
||||
return data!=null ? data.getDungeonId() : -1;
|
||||
}
|
||||
|
||||
public List<String> getTriggerParamList() {
|
||||
val data = GameData.getTrialAvatarActivityDataByAvatarIndex(getSelectedTrialAvatarIndex());
|
||||
return data!=null ? data.getTriggerConfig().getParamList() : Collections.emptyList();
|
||||
}
|
||||
|
||||
public boolean enterTrialDungeon(Player player, int trialAvatarIndexId, int enterPointId) {
|
||||
// TODO, not sure if this will cause problem in MP, since we are entering trial activity dungeon
|
||||
player.sendPacket(new PacketScenePlayerLocationNotify(player.getScene())); // official does send this
|
||||
|
||||
if (!player.getServer().getDungeonSystem().enterDungeon(
|
||||
player,
|
||||
enterPointId,
|
||||
getTrialActivityDungeonId(trialAvatarIndexId))) return false;
|
||||
|
||||
setSelectedTrialAvatarIndex(trialAvatarIndexId);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public List<Integer> getBattleAvatarsList() {
|
||||
val activityData = GameData.getTrialAvatarActivityDataByAvatarIndex(getSelectedTrialAvatarIndex());
|
||||
if (activityData == null || activityData.getBattleAvatarsList().isBlank()) return List.of();
|
||||
return Stream.of(activityData.getBattleAvatarsList().split(",")).map(Integer::parseInt).toList();
|
||||
}
|
||||
|
||||
public DungeonTrialTeam getTrialAvatarDungeonTeam(){
|
||||
List<Integer> battleAvatarsList = getBattleAvatarsList();
|
||||
if (battleAvatarsList.isEmpty()) return null;
|
||||
|
||||
return new DungeonTrialTeam(battleAvatarsList, GrantReason.GRANT_REASON_BY_TRIAL_AVATAR_ACTIVITY);
|
||||
}
|
||||
|
||||
public void unsetTrialAvatarTeam(Player player) {
|
||||
if (getSelectedTrialAvatarIndex() <= 0) return;
|
||||
player.removeTrialAvatarForActivity();
|
||||
setSelectedTrialAvatarIndex(0);
|
||||
}
|
||||
|
||||
public boolean getReward(Player player, int trialAvatarIndexId) {
|
||||
val playerActivityData = player.getActivityManager().getPlayerActivityDataByActivityType(ActivityType.NEW_ACTIVITY_TRIAL_AVATAR);
|
||||
|
||||
if(playerActivityData.isEmpty()){
|
||||
return false;
|
||||
}
|
||||
|
||||
TrialAvatarPlayerData trialAvatarPlayerData = getTrialAvatarPlayerData(playerActivityData.get());
|
||||
TrialAvatarPlayerData.RewardInfoItem rewardInfo = trialAvatarPlayerData.getRewardInfo(trialAvatarIndexId);
|
||||
if (rewardInfo == null) return false;
|
||||
|
||||
RewardData rewardParam = GameData.getRewardDataMap().get(rewardInfo.getRewardId());
|
||||
if (rewardParam == null) return false;
|
||||
|
||||
player.getInventory().addItemParamDatas(rewardParam.getRewardItemList(), ActionReason.TrialAvatarActivityFirstPassReward);
|
||||
rewardInfo.setReceivedReward(true);
|
||||
playerActivityData.get().setDetail(trialAvatarPlayerData);
|
||||
playerActivityData.get().save();
|
||||
return true;
|
||||
}
|
||||
|
||||
public void setPassDungeon(PlayerActivityData playerActivityData) {
|
||||
TrialAvatarPlayerData trialAvatarPlayerData = getTrialAvatarPlayerData(playerActivityData);
|
||||
TrialAvatarPlayerData.RewardInfoItem rewardInfo = trialAvatarPlayerData.getRewardInfo(getSelectedTrialAvatarIndex());
|
||||
if (rewardInfo == null) return;
|
||||
|
||||
rewardInfo.setPassedDungeon(true);
|
||||
playerActivityData.setDetail(trialAvatarPlayerData);
|
||||
playerActivityData.save();
|
||||
Player player = Grasscutter.getGameServer().getPlayerByUid(playerActivityData.getUid());
|
||||
player.sendPacket(new PacketActivityInfoNotify(toProto(playerActivityData, player.getActivityManager().getConditionExecutor())));
|
||||
}
|
||||
}
|
||||
package emu.grasscutter.game.activity.trialavatar;
|
||||
|
||||
import com.esotericsoftware.reflectasm.ConstructorAccess;
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.excels.RewardData;
|
||||
import emu.grasscutter.game.activity.ActivityHandler;
|
||||
import emu.grasscutter.game.activity.ActivityWatcher;
|
||||
import emu.grasscutter.game.activity.DefaultWatcher;
|
||||
import emu.grasscutter.game.activity.GameActivity;
|
||||
import emu.grasscutter.game.activity.PlayerActivityData;
|
||||
import emu.grasscutter.game.dungeons.DungeonTrialTeam;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.props.ActionReason;
|
||||
import emu.grasscutter.game.props.ActivityType;
|
||||
import emu.grasscutter.game.props.WatcherTriggerType;
|
||||
import emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo;
|
||||
import emu.grasscutter.net.proto.TrialAvatarGrantRecordOuterClass.TrialAvatarGrantRecord.GrantReason;
|
||||
import emu.grasscutter.server.packet.send.PacketActivityInfoNotify;
|
||||
import emu.grasscutter.server.packet.send.PacketScenePlayerLocationNotify;
|
||||
import emu.grasscutter.utils.JsonUtils;
|
||||
import java.util.*;
|
||||
import java.util.stream.*;
|
||||
import lombok.*;
|
||||
|
||||
@GameActivity(ActivityType.NEW_ACTIVITY_TRIAL_AVATAR)
|
||||
public class TrialAvatarActivityHandler extends ActivityHandler {
|
||||
@Getter @Setter private int selectedTrialAvatarIndex;
|
||||
|
||||
@Override
|
||||
public void onInitPlayerActivityData(PlayerActivityData playerActivityData) {
|
||||
TrialAvatarPlayerData trialAvatarPlayerData =
|
||||
TrialAvatarPlayerData.create(getActivityConfigItem().getScheduleId());
|
||||
|
||||
playerActivityData.setDetail(trialAvatarPlayerData);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onProtoBuild(
|
||||
PlayerActivityData playerActivityData, ActivityInfo.Builder activityInfo) {
|
||||
TrialAvatarPlayerData trialAvatarPlayerData = getTrialAvatarPlayerData(playerActivityData);
|
||||
|
||||
// TODO: Apply trial avatar info.
|
||||
// activityInfo.setTrialAvatarInfo(trialAvatarPlayerData.toProto());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initWatchers(Map<WatcherTriggerType, ConstructorAccess<?>> activityWatcherTypeMap) {
|
||||
var watcherType = activityWatcherTypeMap.get(WatcherTriggerType.TRIGGER_FINISH_CHALLENGE);
|
||||
ActivityWatcher watcher;
|
||||
if (watcherType != null) {
|
||||
watcher = (ActivityWatcher) watcherType.newInstance();
|
||||
} else {
|
||||
watcher = new DefaultWatcher();
|
||||
}
|
||||
|
||||
watcher.setActivityHandler(this);
|
||||
getWatchersMap()
|
||||
.computeIfAbsent(WatcherTriggerType.TRIGGER_FINISH_CHALLENGE, k -> new ArrayList<>());
|
||||
getWatchersMap().get(WatcherTriggerType.TRIGGER_FINISH_CHALLENGE).add(watcher);
|
||||
}
|
||||
|
||||
public TrialAvatarPlayerData getTrialAvatarPlayerData(PlayerActivityData playerActivityData) {
|
||||
if (playerActivityData.getDetail() == null || playerActivityData.getDetail().isBlank()) {
|
||||
onInitPlayerActivityData(playerActivityData);
|
||||
playerActivityData.save();
|
||||
}
|
||||
|
||||
return JsonUtils.decode(playerActivityData.getDetail(), TrialAvatarPlayerData.class);
|
||||
}
|
||||
|
||||
public int getTrialActivityDungeonId(int trialAvatarIndexId) {
|
||||
val data = GameData.getTrialAvatarActivityDataByAvatarIndex(trialAvatarIndexId);
|
||||
return data != null ? data.getDungeonId() : -1;
|
||||
}
|
||||
|
||||
public List<String> getTriggerParamList() {
|
||||
val data = GameData.getTrialAvatarActivityDataByAvatarIndex(getSelectedTrialAvatarIndex());
|
||||
return data != null ? data.getTriggerConfig().getParamList() : Collections.emptyList();
|
||||
}
|
||||
|
||||
public boolean enterTrialDungeon(Player player, int trialAvatarIndexId, int enterPointId) {
|
||||
// TODO, not sure if this will cause problem in MP, since we are entering trial activity dungeon
|
||||
player.sendPacket(
|
||||
new PacketScenePlayerLocationNotify(player.getScene())); // official does send this
|
||||
|
||||
if (!player
|
||||
.getServer()
|
||||
.getDungeonSystem()
|
||||
.enterDungeon(player, enterPointId, getTrialActivityDungeonId(trialAvatarIndexId)))
|
||||
return false;
|
||||
|
||||
setSelectedTrialAvatarIndex(trialAvatarIndexId);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public List<Integer> getBattleAvatarsList() {
|
||||
val activityData =
|
||||
GameData.getTrialAvatarActivityDataByAvatarIndex(getSelectedTrialAvatarIndex());
|
||||
if (activityData == null || activityData.getBattleAvatarsList().isBlank()) return List.of();
|
||||
return Stream.of(activityData.getBattleAvatarsList().split(","))
|
||||
.map(Integer::parseInt)
|
||||
.toList();
|
||||
}
|
||||
|
||||
public DungeonTrialTeam getTrialAvatarDungeonTeam() {
|
||||
List<Integer> battleAvatarsList = getBattleAvatarsList();
|
||||
if (battleAvatarsList.isEmpty()) return null;
|
||||
|
||||
return new DungeonTrialTeam(
|
||||
battleAvatarsList, GrantReason.GRANT_REASON_BY_TRIAL_AVATAR_ACTIVITY);
|
||||
}
|
||||
|
||||
public void unsetTrialAvatarTeam(Player player) {
|
||||
if (this.getSelectedTrialAvatarIndex() <= 0) return;
|
||||
player.getTeamManager().removeTrialAvatar();
|
||||
this.setSelectedTrialAvatarIndex(0);
|
||||
}
|
||||
|
||||
public boolean getReward(Player player, int trialAvatarIndexId) {
|
||||
val playerActivityData =
|
||||
player
|
||||
.getActivityManager()
|
||||
.getPlayerActivityDataByActivityType(ActivityType.NEW_ACTIVITY_TRIAL_AVATAR);
|
||||
|
||||
if (playerActivityData.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
TrialAvatarPlayerData trialAvatarPlayerData =
|
||||
getTrialAvatarPlayerData(playerActivityData.get());
|
||||
TrialAvatarPlayerData.RewardInfoItem rewardInfo =
|
||||
trialAvatarPlayerData.getRewardInfo(trialAvatarIndexId);
|
||||
if (rewardInfo == null) return false;
|
||||
|
||||
RewardData rewardParam = GameData.getRewardDataMap().get(rewardInfo.getRewardId());
|
||||
if (rewardParam == null) return false;
|
||||
|
||||
player
|
||||
.getInventory()
|
||||
.addItemParamDatas(
|
||||
rewardParam.getRewardItemList(), ActionReason.TrialAvatarActivityFirstPassReward);
|
||||
rewardInfo.setReceivedReward(true);
|
||||
playerActivityData.get().setDetail(trialAvatarPlayerData);
|
||||
playerActivityData.get().save();
|
||||
return true;
|
||||
}
|
||||
|
||||
public void setPassDungeon(PlayerActivityData playerActivityData) {
|
||||
TrialAvatarPlayerData trialAvatarPlayerData = getTrialAvatarPlayerData(playerActivityData);
|
||||
TrialAvatarPlayerData.RewardInfoItem rewardInfo =
|
||||
trialAvatarPlayerData.getRewardInfo(getSelectedTrialAvatarIndex());
|
||||
if (rewardInfo == null) return;
|
||||
|
||||
rewardInfo.setPassedDungeon(true);
|
||||
playerActivityData.setDetail(trialAvatarPlayerData);
|
||||
playerActivityData.save();
|
||||
Player player = Grasscutter.getGameServer().getPlayerByUid(playerActivityData.getUid());
|
||||
player.sendPacket(
|
||||
new PacketActivityInfoNotify(
|
||||
toProto(playerActivityData, player.getActivityManager().getConditionExecutor())));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,90 +1,90 @@
|
||||
package emu.grasscutter.game.activity.trialavatar;
|
||||
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.common.BaseTrialActivityData;
|
||||
import emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo;
|
||||
import emu.grasscutter.net.proto.TrialAvatarActivityRewardDetailInfoOuterClass.TrialAvatarActivityRewardDetailInfo;
|
||||
import lombok.AccessLevel;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.FieldDefaults;
|
||||
import lombok.val;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.*;
|
||||
|
||||
@Data
|
||||
@FieldDefaults(level = AccessLevel.PRIVATE)
|
||||
@Builder(builderMethodName = "of")
|
||||
public class TrialAvatarPlayerData {
|
||||
List<RewardInfoItem> rewardInfoList;
|
||||
|
||||
private static BaseTrialActivityData getActivityData(int scheduleId){
|
||||
// prefer custom data over official data
|
||||
return GameData.getTrialAvatarActivityCustomData().isEmpty() ? GameData.getTrialAvatarActivityDataMap().get(scheduleId)
|
||||
: GameData.getTrialAvatarActivityCustomData().get(scheduleId);
|
||||
}
|
||||
|
||||
public static List<Integer> getAvatarIdList(int scheduleId) {
|
||||
val activityData = getActivityData(scheduleId);
|
||||
return activityData != null ? activityData.getAvatarIndexIdList() : List.of();
|
||||
}
|
||||
|
||||
public static List<Integer> getRewardIdList(int scheduleId) {
|
||||
val activityData = getActivityData(scheduleId);
|
||||
return activityData != null ? activityData.getRewardIdList() : List.of();
|
||||
}
|
||||
|
||||
public static TrialAvatarPlayerData create(int scheduleId) {
|
||||
List<Integer> avatarIds = getAvatarIdList(scheduleId);
|
||||
List<Integer> rewardIds = getRewardIdList(scheduleId);
|
||||
return TrialAvatarPlayerData.of()
|
||||
.rewardInfoList(IntStream.range(0, avatarIds.size())
|
||||
.filter(i -> avatarIds.get(i) > 0 && rewardIds.get(i) > 0)
|
||||
.mapToObj(i -> RewardInfoItem.create(
|
||||
avatarIds.get(i),
|
||||
rewardIds.get(i)))
|
||||
.collect(Collectors.toList()))
|
||||
.build();
|
||||
}
|
||||
|
||||
public TrialAvatarActivityDetailInfo toProto() {
|
||||
return TrialAvatarActivityDetailInfo.newBuilder()
|
||||
.addAllRewardInfoList(getRewardInfoList().stream()
|
||||
.map(RewardInfoItem::toProto).toList())
|
||||
.build();
|
||||
}
|
||||
|
||||
public RewardInfoItem getRewardInfo(int trialAvatarIndexId) {
|
||||
return getRewardInfoList().stream().filter(x -> x.getTrialAvatarIndexId() == trialAvatarIndexId)
|
||||
.findFirst().orElse(null);
|
||||
}
|
||||
|
||||
@Data
|
||||
@FieldDefaults(level = AccessLevel.PRIVATE)
|
||||
@Builder(builderMethodName = "of")
|
||||
public static class RewardInfoItem {
|
||||
int trialAvatarIndexId;
|
||||
int rewardId;
|
||||
boolean passedDungeon;
|
||||
boolean receivedReward;
|
||||
|
||||
public static RewardInfoItem create(int trialAvatarIndexId, int rewardId) {
|
||||
return RewardInfoItem.of()
|
||||
.trialAvatarIndexId(trialAvatarIndexId)
|
||||
.rewardId(rewardId)
|
||||
.passedDungeon(false)
|
||||
.receivedReward(false)
|
||||
.build();
|
||||
}
|
||||
|
||||
public TrialAvatarActivityRewardDetailInfo toProto() {
|
||||
return TrialAvatarActivityRewardDetailInfo.newBuilder()
|
||||
.setTrialAvatarIndexId(getTrialAvatarIndexId())
|
||||
.setRewardId(getRewardId())
|
||||
.setPassedDungeon(isPassedDungeon())
|
||||
.setReceivedReward(isReceivedReward())
|
||||
.build();
|
||||
}
|
||||
}
|
||||
}
|
||||
package emu.grasscutter.game.activity.trialavatar;
|
||||
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.common.BaseTrialActivityData;
|
||||
import emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo;
|
||||
import emu.grasscutter.net.proto.TrialAvatarActivityRewardDetailInfoOuterClass.TrialAvatarActivityRewardDetailInfo;
|
||||
import java.util.List;
|
||||
import java.util.stream.*;
|
||||
import lombok.AccessLevel;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.FieldDefaults;
|
||||
import lombok.val;
|
||||
|
||||
@Data
|
||||
@FieldDefaults(level = AccessLevel.PRIVATE)
|
||||
@Builder(builderMethodName = "of")
|
||||
public class TrialAvatarPlayerData {
|
||||
List<RewardInfoItem> rewardInfoList;
|
||||
|
||||
private static BaseTrialActivityData getActivityData(int scheduleId) {
|
||||
// prefer custom data over official data
|
||||
return GameData.getTrialAvatarActivityCustomData().isEmpty()
|
||||
? GameData.getTrialAvatarActivityDataMap().get(scheduleId)
|
||||
: GameData.getTrialAvatarActivityCustomData().get(scheduleId);
|
||||
}
|
||||
|
||||
public static List<Integer> getAvatarIdList(int scheduleId) {
|
||||
val activityData = getActivityData(scheduleId);
|
||||
return activityData != null ? activityData.getAvatarIndexIdList() : List.of();
|
||||
}
|
||||
|
||||
public static List<Integer> getRewardIdList(int scheduleId) {
|
||||
val activityData = getActivityData(scheduleId);
|
||||
return activityData != null ? activityData.getRewardIdList() : List.of();
|
||||
}
|
||||
|
||||
public static TrialAvatarPlayerData create(int scheduleId) {
|
||||
List<Integer> avatarIds = getAvatarIdList(scheduleId);
|
||||
List<Integer> rewardIds = getRewardIdList(scheduleId);
|
||||
return TrialAvatarPlayerData.of()
|
||||
.rewardInfoList(
|
||||
IntStream.range(0, avatarIds.size())
|
||||
.filter(i -> avatarIds.get(i) > 0 && rewardIds.get(i) > 0)
|
||||
.mapToObj(i -> RewardInfoItem.create(avatarIds.get(i), rewardIds.get(i)))
|
||||
.collect(Collectors.toList()))
|
||||
.build();
|
||||
}
|
||||
|
||||
public TrialAvatarActivityDetailInfo toProto() {
|
||||
return TrialAvatarActivityDetailInfo.newBuilder()
|
||||
.addAllRewardInfoList(getRewardInfoList().stream().map(RewardInfoItem::toProto).toList())
|
||||
.build();
|
||||
}
|
||||
|
||||
public RewardInfoItem getRewardInfo(int trialAvatarIndexId) {
|
||||
return getRewardInfoList().stream()
|
||||
.filter(x -> x.getTrialAvatarIndexId() == trialAvatarIndexId)
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
}
|
||||
|
||||
@Data
|
||||
@FieldDefaults(level = AccessLevel.PRIVATE)
|
||||
@Builder(builderMethodName = "of")
|
||||
public static class RewardInfoItem {
|
||||
int trialAvatarIndexId;
|
||||
int rewardId;
|
||||
boolean passedDungeon;
|
||||
boolean receivedReward;
|
||||
|
||||
public static RewardInfoItem create(int trialAvatarIndexId, int rewardId) {
|
||||
return RewardInfoItem.of()
|
||||
.trialAvatarIndexId(trialAvatarIndexId)
|
||||
.rewardId(rewardId)
|
||||
.passedDungeon(false)
|
||||
.receivedReward(false)
|
||||
.build();
|
||||
}
|
||||
|
||||
public TrialAvatarActivityRewardDetailInfo toProto() {
|
||||
return TrialAvatarActivityRewardDetailInfo.newBuilder()
|
||||
.setTrialAvatarIndexId(getTrialAvatarIndexId())
|
||||
.setRewardId(getRewardId())
|
||||
.setPassedDungeon(isPassedDungeon())
|
||||
.setReceivedReward(isReceivedReward())
|
||||
.build();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user