diff --git a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAction.java b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAction.java index 1ee53b824..c4e976181 100644 --- a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAction.java +++ b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAction.java @@ -62,6 +62,12 @@ public class ItemUseAction { case ITEM_USE_ADD_DUNGEON_COND_TIME -> null; // [int 1, int 15 or 20] - minigame shards case ITEM_USE_ADD_CHANNELLER_SLAB_BUFF -> null; // [int] minigame buffs case ITEM_USE_ADD_REGIONAL_PLAY_VAR -> null; // [String, int] - coral butterfly effect + case ITEM_USE_ADD_AVATAR_EXTRA_PROPERTY -> null; + case ITEM_USE_GAIN_GCG_CARD -> null; + case ITEM_USE_GAIN_GCG_CARD_FACE -> null; + case ITEM_USE_GAIN_GCG_CARD_BACK -> null; + case ITEM_USE_GAIN_GCG_CARD_FIELD -> null; + case ITEM_USE_OPEN_RENAME_DIALOG -> null; }; } diff --git a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddEnergy.java b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddEnergy.java index 4ebbef1f9..c3a09bd3a 100644 --- a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddEnergy.java +++ b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddEnergy.java @@ -48,6 +48,7 @@ public abstract class ItemUseAddEnergy extends ItemUseAction { case ITEM_USE_TARGET_SPECIFY_AVATAR, ITEM_USE_TARGET_SPECIFY_ALIVE_AVATAR, ITEM_USE_TARGET_SPECIFY_DEAD_AVATAR -> this.addEnergy(params.targetAvatar, params.count); // Targeted items might care about this case ITEM_USE_TARGET_NONE -> false; + case ITEM_USE_TARGET_PLAYER_AVATAR -> false; }; } diff --git a/src/main/java/emu/grasscutter/game/props/ItemUseOp.java b/src/main/java/emu/grasscutter/game/props/ItemUseOp.java index 6e878363b..2e69d2bf1 100644 --- a/src/main/java/emu/grasscutter/game/props/ItemUseOp.java +++ b/src/main/java/emu/grasscutter/game/props/ItemUseOp.java @@ -47,7 +47,13 @@ public enum ItemUseOp { ITEM_USE_COMBINE_ITEM (43), ITEM_USE_UNLOCK_HOME_MODULE (44), ITEM_USE_UNLOCK_HOME_BGM (45), - ITEM_USE_ADD_REGIONAL_PLAY_VAR (46); + ITEM_USE_ADD_REGIONAL_PLAY_VAR (46), + ITEM_USE_ADD_AVATAR_EXTRA_PROPERTY (47), + ITEM_USE_GAIN_GCG_CARD (48), + ITEM_USE_GAIN_GCG_CARD_FACE (49), + ITEM_USE_GAIN_GCG_CARD_BACK (50), + ITEM_USE_GAIN_GCG_CARD_FIELD (51), + ITEM_USE_OPEN_RENAME_DIALOG (52); private final int value; private static final Int2ObjectMap map = new Int2ObjectOpenHashMap<>(); diff --git a/src/main/java/emu/grasscutter/game/props/ItemUseTarget.java b/src/main/java/emu/grasscutter/game/props/ItemUseTarget.java index 38c32fde5..ca4825bf4 100644 --- a/src/main/java/emu/grasscutter/game/props/ItemUseTarget.java +++ b/src/main/java/emu/grasscutter/game/props/ItemUseTarget.java @@ -11,7 +11,8 @@ public enum ItemUseTarget { ITEM_USE_TARGET_CUR_TEAM (2), ITEM_USE_TARGET_SPECIFY_AVATAR (3), ITEM_USE_TARGET_SPECIFY_ALIVE_AVATAR (4), - ITEM_USE_TARGET_SPECIFY_DEAD_AVATAR (5); + ITEM_USE_TARGET_SPECIFY_DEAD_AVATAR (5), + ITEM_USE_TARGET_PLAYER_AVATAR (6); private final int value; private static final Int2ObjectMap map = new Int2ObjectOpenHashMap<>(); diff --git a/src/main/java/emu/grasscutter/game/props/PlayerProperty.java b/src/main/java/emu/grasscutter/game/props/PlayerProperty.java index 6b8fe0fcd..9852f1fdf 100644 --- a/src/main/java/emu/grasscutter/game/props/PlayerProperty.java +++ b/src/main/java/emu/grasscutter/game/props/PlayerProperty.java @@ -12,6 +12,8 @@ public enum PlayerProperty { PROP_BREAK_LEVEL (1002), PROP_SATIATION_VAL (1003), PROP_SATIATION_PENALTY_TIME (1004), + PROP_GEAR_START_VAL (2001), + PROP_GEAR_STOP_VAL (2002), PROP_LEVEL (4001, 0, 90), PROP_LAST_CHANGE_AVATAR_TIME (10001), PROP_MAX_SPRING_VOLUME (10002, 0, 8_500_000), // Maximum volume of the Statue of the Seven for the player [0, 8500000] @@ -51,7 +53,11 @@ public enum PlayerProperty { PROP_PLAYER_WORLD_LEVEL_ADJUST_CD (10040), PROP_PLAYER_LEGENDARY_DAILY_TASK_NUM (10041), PROP_PLAYER_HOME_COIN (10042, 0), // Realm currency [0, +inf) - PROP_PLAYER_WAIT_SUB_HOME_COIN (10043); + PROP_PLAYER_WAIT_SUB_HOME_COIN (10043), + PROP_IS_AUTO_UNLOCK_SPECIFIC_EQUIP (10044), + PROP_PLAYER_GCG_COIN (10045), + PROP_PLAYER_WAIT_SUB_GCG_COIN (10046), + PROP_PLAYER_ONLINE_TIME (10047); private static final int inf = Integer.MAX_VALUE; // Maybe this should be something else? @Getter private final int id, min, max;