Merge pull request #355 from Grasscutters/dungeon-scripts

Implemented Dungeon Support

build.gradle

@@ -71,9 +71,10 @@ dependencies {
 
     implementation group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.2'
     implementation group: 'org.quartz-scheduler', name: 'quartz-jobs', version: '2.3.2'
-
+    
+    implementation group: 'org.luaj', name: 'luaj-jse', version: '3.0.1'
+    
     protobuf files('proto/')
-
 }
 
 application {

src/main/java/emu/grasscutter/Config.java

@@ -10,6 +10,7 @@ public final class Config {
 	public String PACKETS_FOLDER = "./packets/";
 	public String DUMPS_FOLDER = "./dumps/";
 	public String KEY_FOLDER = "./keys/";
+	public String SCRIPTS_FOLDER = "./resources/Scripts/";
 	public String PLUGINS_FOLDER = "./plugins/";
 
 	public String RunMode = "HYBRID"; // HYBRID, DISPATCH_ONLY, GAME_ONLY

src/main/java/emu/grasscutter/Grasscutter.java

@@ -9,6 +9,7 @@ import java.net.InetSocketAddress;
 
 import emu.grasscutter.command.CommandMap;
 import emu.grasscutter.plugin.PluginManager;
+import emu.grasscutter.scripts.ScriptLoader;
 import emu.grasscutter.utils.Utils;
 import org.reflections.Reflections;
 import org.slf4j.LoggerFactory;
@@ -67,6 +68,7 @@ public final class Grasscutter {
 		
 		// Load all resources.
 		ResourceLoader.loadAll();
+		ScriptLoader.init();
 		// Database
 		DatabaseManager.initialize();
 

src/main/java/emu/grasscutter/data/GameData.java

@@ -61,13 +61,15 @@ public class GameData {
 	private static final Int2ObjectMap<FetterCharacterCardData> fetterCharacterCardDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<RewardData> rewardDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<WorldLevelData> worldLevelDataMap = new Int2ObjectOpenHashMap<>();
-
+	private static final Int2ObjectMap<DungeonData> dungeonDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<ShopGoodsData> shopGoodsDataMap = new Int2ObjectOpenHashMap<>();
-	
+
 	// Cache
 	private static Map<Integer, List<Integer>> fetters = new HashMap<>();
 	private static Map<Integer, List<ShopGoodsData>> shopGoods = new HashMap<>();
 	
+	public static char EJWOA = 's';
+	
 	public static Int2ObjectMap<?> getMapByResourceDef(Class<?> resourceDefinition) {
 		Int2ObjectMap<?> map = null;
 		
@@ -100,6 +102,11 @@ public class GameData {
 	public static Map<String, ScenePointEntry> getScenePointEntries() {
 		return scenePointEntries;
 	}
+	
+	// TODO optimize
+	public static ScenePointEntry getScenePointEntryById(int sceneId, int pointId) {
+		return getScenePointEntries().get(sceneId + "_" + pointId);
+	}
 
 	public static Int2ObjectMap<AvatarData> getAvatarDataMap() {
 		return avatarDataMap;
@@ -269,8 +276,10 @@ public class GameData {
 		return worldLevelDataMap;
 	}
 
-  public static char EJWOA = 's';
-  
+	public static Int2ObjectMap<DungeonData> getDungeonDataMap() {
+		return dungeonDataMap;
+	}
+	  
 	public static Map<Integer, List<ShopGoodsData>> getShopGoodsDataEntries() {
 		if (shopGoods.isEmpty()) {
 			shopGoodsDataMap.forEach((k, v) -> {

src/main/java/emu/grasscutter/data/ResourceLoader.java

@@ -164,6 +164,7 @@ public class ResourceLoader {
 
 			for (Map.Entry<String, JsonElement> entry : config.points.entrySet()) {
 				PointData pointData = Grasscutter.getGsonFactory().fromJson(entry.getValue(), PointData.class);
+				pointData.setId(Integer.parseInt(entry.getKey()));
 
 				ScenePointEntry sl = new ScenePointEntry(sceneId + "_" + entry.getKey(), pointData);
 				scenePointList.add(sl);

src/main/java/emu/grasscutter/data/common/PointData.java

 package emu.grasscutter.data.common;
 
-public class PointData {
-    private pos tranPos;
+import emu.grasscutter.utils.Position;
 
-    public pos getTranPos() {
+public class PointData {
+	private int id;
+	private String $type;
+    private Position tranPos;
+    private int[] dungeonIds;
+    
+    public int getId() {
+		return id;
+	}
+    
+    public void setId(int id) {
+		this.id = id;
+	}
+
+    public String getType() {
+		return $type;
+	}
+
+	public Position getTranPos() {
         return tranPos;
     }
 
-    public void setTranPos(pos tranPos) {
-        this.tranPos = tranPos;
-    }
-
-    public class pos {
-        private float x;
-        private float y;
-        private float z;
-
-        public float getX() {
-            return x;
-        }
-
-        public void setX(float x) {
-            this.x = x;
-        }
-
-        public float getY() {
-            return y;
-        }
-
-        public void setY(float y) {
-            this.y = y;
-        }
-
-        public float getZ() {
-            return z;
-        }
-
-        public void setZ(float z) {
-            this.z = z;
-        }
-    }
+	public int[] getDungeonIds() {
+		return dungeonIds;
+	}
 }

src/main/java/emu/grasscutter/data/def/DungeonData.java

+package emu.grasscutter.data.def;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+
+import emu.grasscutter.game.props.SceneType;
+
+@ResourceType(name = "DungeonExcelConfigData.json")
+public class DungeonData extends GameResource {
+	private int Id;
+	private int SceneId;
+	private int ShowLevel;
+	private String InvolveType; // TODO enum
+	    
+	@Override
+	public int getId() {
+		return this.Id;
+	}
+
+	public int getSceneId() {
+		return SceneId;
+	}
+	
+	public int getShowLevel() {
+		return ShowLevel;
+	}
+
+	@Override
+	public void onLoad() {
+		
+	}
+}

src/main/java/emu/grasscutter/data/def/GadgetData.java

@@ -2,12 +2,13 @@ package emu.grasscutter.data.def;
 
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.game.props.EntityType;
 
 @ResourceType(name = "GadgetExcelConfigData.json")
 public class GadgetData extends GameResource {
 	private int Id;
-	
-	private String Type;
+
+	private EntityType Type;
 	private String JsonName;
 	private boolean IsInteractive;
 	private String[] Tags;
@@ -22,7 +23,7 @@ public class GadgetData extends GameResource {
 		return this.Id;
 	}
 
-	public String getType() {
+	public EntityType getType() {
 		return Type;
 	}
 

src/main/java/emu/grasscutter/data/def/SceneData.java

@@ -9,8 +9,9 @@ import emu.grasscutter.game.props.SceneType;
 @ResourceType(name = "SceneExcelConfigData.json")
 public class SceneData extends GameResource {
 	private int Id;
-	private SceneType SceneType;
+	private SceneType Type;
 	private String ScriptData;
+
 	    
 	@Override
 	public int getId() {
@@ -18,7 +19,7 @@ public class SceneData extends GameResource {
 	}
 
 	public SceneType getSceneType() {
-		return SceneType;
+		return Type;
 	}
 
 	public String getScriptData() {
@@ -27,6 +28,6 @@ public class SceneData extends GameResource {
 
 	@Override
 	public void onLoad() {
-		
+
 	}
 }

src/main/java/emu/grasscutter/game/dungeons/DungeonChallenge.java

+package emu.grasscutter.game.dungeons;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.def.MonsterData;
+import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType;
+import emu.grasscutter.scripts.constants.EventType;
+import emu.grasscutter.scripts.data.SceneGroup;
+import emu.grasscutter.scripts.data.SceneMonster;
+import emu.grasscutter.server.packet.send.PacketChallengeDataNotify;
+import emu.grasscutter.server.packet.send.PacketDungeonChallengeBeginNotify;
+import emu.grasscutter.server.packet.send.PacketDungeonChallengeFinishNotify;
+import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
+
+public class DungeonChallenge {
+	private final Scene scene;
+	private final SceneGroup group;
+	
+	private int challengeIndex;
+	private int challengeId;
+	private boolean success;
+	private boolean progress;
+	
+	private int score;
+	private int objective = 0;
+	
+	public DungeonChallenge(Scene scene, SceneGroup group) {
+		this.scene = scene;
+		this.group = group;
+		
+		objective += group.monsters.size();
+	}
+
+	public Scene getScene() {
+		return scene;
+	}
+
+	public SceneGroup getGroup() {
+		return group;
+	}
+	
+	public int getChallengeIndex() {
+		return challengeIndex;
+	}
+
+	public void setChallengeIndex(int challengeIndex) {
+		this.challengeIndex = challengeIndex;
+	}
+
+	public int getChallengeId() {
+		return challengeId;
+	}
+
+	public void setChallengeId(int challengeId) {
+		this.challengeId = challengeId;
+	}
+
+	public boolean isSuccess() {
+		return success;
+	}
+
+	public void setSuccess(boolean isSuccess) {
+		this.success = isSuccess;
+	}
+	
+	public boolean inProgress() {
+		return progress;
+	}
+
+	public int getScore() {
+		return score;
+	}
+
+	public void start() {
+		this.progress = true;
+		getScene().broadcastPacket(new PacketDungeonChallengeBeginNotify(this));
+	}
+	
+	public void finish() {
+		this.progress = false;
+		getScene().broadcastPacket(new PacketDungeonChallengeFinishNotify(this));
+		
+		if (this.isSuccess()) {
+			this.getScene().getScriptManager().callEvent(EventType.EVENT_CHALLENGE_SUCCESS, null);
+		} else {
+			this.getScene().getScriptManager().callEvent(EventType.EVENT_CHALLENGE_FAIL, null);
+		}
+	}
+
+	public void onMonsterDie(EntityMonster entity) {
+		score = getScore() + 1;
+		
+		getScene().broadcastPacket(new PacketChallengeDataNotify(this, 1, getScore()));
+		
+		if (getScore() >= objective) {
+			this.setSuccess(true);
+			finish();
+		}
+	}
+}

src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java

 package emu.grasscutter.game.dungeons;
 
+import emu.grasscutter.GameConstants;
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.custom.ScenePointEntry;
+import emu.grasscutter.data.def.DungeonData;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.SceneType;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.server.game.GameServer;
+import emu.grasscutter.server.packet.send.PacketDungeonEntryInfoRsp;
+import emu.grasscutter.server.packet.send.PacketPlayerEnterDungeonRsp;
+import emu.grasscutter.utils.Position;
 
 public class DungeonManager {
 	private final GameServer server;
@@ -12,4 +24,59 @@ public class DungeonManager {
 	public GameServer getServer() {
 		return server;
 	}
+
+	public void getEntryInfo(Player player, int pointId) {
+		ScenePointEntry entry = GameData.getScenePointEntryById(player.getScene().getId(), pointId);
+		
+		if (entry == null || entry.getPointData().getDungeonIds() == null) {
+			// Error
+			player.sendPacket(new PacketDungeonEntryInfoRsp());
+			return;
+		}
+		
+		player.sendPacket(new PacketDungeonEntryInfoRsp(player, entry.getPointData()));
+	}
+
+	public void enterDungeon(Player player, int pointId, int dungeonId) {
+		DungeonData data = GameData.getDungeonDataMap().get(dungeonId);
+		
+		if (data == null) {
+			return;
+		}
+		
+		Grasscutter.getLogger().info(player.getNickname() + " is trying to enter dungeon " + dungeonId);
+		
+		int sceneId = data.getSceneId();
+		player.getScene().setPrevScene(sceneId);
+		
+		player.getWorld().transferPlayerToScene(player, sceneId, data);
+		
+		player.getScene().setPrevScenePoint(pointId);
+		player.sendPacket(new PacketPlayerEnterDungeonRsp(pointId, dungeonId));
+	}
+	
+	public void exitDungeon(Player player) {
+		if (player.getScene().getSceneType() != SceneType.SCENE_DUNGEON) {
+			return;
+		}
+		
+		// Get previous scene
+		int prevScene = player.getScene().getPrevScene() > 0 ? player.getScene().getPrevScene() : 3;
+		
+		// Get previous position
+		DungeonData dungeonData = player.getScene().getDungeonData();
+		Position prevPos = new Position(GameConstants.START_POSITION);
+		
+		if (dungeonData != null) {
+			ScenePointEntry entry = GameData.getScenePointEntryById(prevScene, player.getScene().getPrevScenePoint());
+			
+			if (entry != null) {
+				prevPos.set(entry.getPointData().getTranPos());
+			}
+		}
+
+		// Transfer player back to world
+		player.getWorld().transferPlayerToScene(player, prevScene, prevPos);
+		player.sendPacket(new BasePacket(PacketOpcodes.PlayerQuitDungeonRsp));
+	}
 }

src/main/java/emu/grasscutter/game/entity/EntityBaseGadget.java

+package emu.grasscutter.game.entity;
+
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.game.world.World;
+
+public abstract class EntityBaseGadget extends GameEntity {
+
+	public EntityBaseGadget(Scene scene) {
+		super(scene);
+	}
+	
+	public abstract int getGadgetId();
+	
+	@Override
+	public void onDeath(int killerId) {
+		
+	}
+}

src/main/java/emu/grasscutter/game/entity/EntityClientGadget.java

@@ -23,7 +23,7 @@ import emu.grasscutter.utils.Position;
 import emu.grasscutter.utils.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
 
-public class EntityClientGadget extends EntityGadget {
+public class EntityClientGadget extends EntityBaseGadget {
 	private final Player owner;
 	
 	private final Position pos;

src/main/java/emu/grasscutter/game/entity/EntityGadget.java

 package emu.grasscutter.game.entity;
 
+import java.util.Arrays;
+import java.util.List;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.def.GadgetData;
+import emu.grasscutter.game.props.EntityIdType;
+import emu.grasscutter.game.props.EntityType;
+import emu.grasscutter.game.props.PlayerProperty;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.game.world.World;
+import emu.grasscutter.net.proto.ClientGadgetInfoOuterClass;
+import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
+import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
+import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
+import emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData;
+import emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo;
+import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
+import emu.grasscutter.net.proto.PropPairOuterClass.PropPair;
+import emu.grasscutter.net.proto.ProtEntityTypeOuterClass.ProtEntityType;
+import emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo;
+import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
+import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
+import emu.grasscutter.net.proto.VectorOuterClass.Vector;
+import emu.grasscutter.net.proto.WorktopInfoOuterClass.WorktopInfo;
+import emu.grasscutter.utils.Position;
+import emu.grasscutter.utils.ProtoHelper;
+import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
 
-public abstract class EntityGadget extends GameEntity {
+public class EntityGadget extends EntityBaseGadget {
+	private final GadgetData data;
+	private final Position pos;
+	private final Position rot;
+	private int gadgetId;
+	
+	private int state;
+	private IntSet worktopOptions;
 
-	public EntityGadget(Scene scene) {
+	public EntityGadget(Scene scene, int gadgetId, Position pos) {
 		super(scene);
+		this.data = GameData.getGadgetDataMap().get(gadgetId);
+		this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
+		this.gadgetId = gadgetId;
+		this.pos = pos.clone();
+		this.rot = new Position();
 	}
 	
-	public abstract int getGadgetId();
+	public GadgetData getGadgetData() {
+		return data;
+	}
+
+	@Override
+	public Position getPosition() {
+		// TODO Auto-generated method stub
+		return this.pos;
+	}
+
+	@Override
+	public Position getRotation() {
+		// TODO Auto-generated method stub
+		return this.rot;
+	}
 	
+	public int getGadgetId() {
+		return gadgetId;
+	}
+
+	public void setGadgetId(int gadgetId) {
+		this.gadgetId = gadgetId;
+	}
+
+	public int getState() {
+		return state;
+	}
+
+	public void setState(int state) {
+		this.state = state;
+	}
+
+	public IntSet getWorktopOptions() {
+		return worktopOptions;
+	}
+	
+	public void addWorktopOptions(int[] options) {
+		if (this.worktopOptions == null) {
+			this.worktopOptions = new IntOpenHashSet();
+		}
+		Arrays.stream(options).forEach(this.worktopOptions::add);
+	}
+	
+	public void removeWorktopOption(int option) {
+		if (this.worktopOptions == null) {
+			return;
+		}
+		this.worktopOptions.remove(option);
+	}
+
+	@Override
+	public Int2FloatOpenHashMap getFightProperties() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 	@Override
 	public void onDeath(int killerId) {
 		
 	}
+	
+	@Override
+	public SceneEntityInfo toProto() {
+		EntityAuthorityInfo authority = EntityAuthorityInfo.newBuilder()
+				.setAbilityInfo(AbilitySyncStateInfo.newBuilder())
+				.setRendererChangedInfo(EntityRendererChangedInfo.newBuilder())
+				.setAiInfo(SceneEntityAiInfo.newBuilder().setIsAiOpen(true).setBornPos(Vector.newBuilder()))
+				.setBornPos(Vector.newBuilder())
+				.build();
+		
+		SceneEntityInfo.Builder entityInfo = SceneEntityInfo.newBuilder()
+				.setEntityId(getId())
+				.setEntityType(ProtEntityType.PROT_ENTITY_GADGET)
+				.setMotionInfo(MotionInfo.newBuilder().setPos(getPosition().toProto()).setRot(getRotation().toProto()).setSpeed(Vector.newBuilder()))
+				.addAnimatorParaList(AnimatorParameterValueInfoPair.newBuilder())
+				.setEntityClientData(EntityClientData.newBuilder())
+				.setEntityAuthorityInfo(authority)
+				.setLifeState(1);
+		
+		PropPair pair = PropPair.newBuilder()
+				.setType(PlayerProperty.PROP_LEVEL.getId())
+				.setPropValue(ProtoHelper.newPropValue(PlayerProperty.PROP_LEVEL, 1))
+				.build();
+		entityInfo.addPropList(pair);
+		
+		SceneGadgetInfo.Builder gadgetInfo = SceneGadgetInfo.newBuilder()
+				.setGadgetId(this.getGadgetId())
+				.setGroupId(this.getGroupId())
+				.setConfigId(this.getConfigId())
+				.setGadgetState(this.getState())
+				.setIsEnableInteract(true)
+				.setAuthorityPeerId(this.getScene().getWorld().getHostPeerId());
+		
+		if (this.getGadgetData().getType() == EntityType.Worktop && this.getWorktopOptions() != null) {
+			WorktopInfo worktop = WorktopInfo.newBuilder()
+					.addAllOptionList(this.getWorktopOptions())
+					.build();
+			gadgetInfo.setWorktop(worktop);
+		}
+
+		entityInfo.setGadget(gadgetInfo);
+		
+		return entityInfo.build();
+	}
 }

src/main/java/emu/grasscutter/game/entity/EntityItem.java

@@ -23,7 +23,7 @@ import emu.grasscutter.utils.Position;
 import emu.grasscutter.utils.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
 
-public class EntityItem extends EntityGadget {
+public class EntityItem extends EntityBaseGadget {
 	private final Position pos;
 	private final Position rot;
 	

src/main/java/emu/grasscutter/game/entity/EntityMonster.java

@@ -4,6 +4,7 @@ import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.PropGrowCurve;
 import emu.grasscutter.data.def.MonsterCurveData;
 import emu.grasscutter.data.def.MonsterData;
+import emu.grasscutter.game.dungeons.DungeonChallenge;
 import emu.grasscutter.game.props.EntityIdType;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.game.props.PlayerProperty;
@@ -22,6 +23,7 @@ import emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo;
 import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
 import emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo;
 import emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo;
+import emu.grasscutter.scripts.constants.EventType;
 import emu.grasscutter.utils.Position;
 import emu.grasscutter.utils.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
@@ -36,9 +38,6 @@ public class EntityMonster extends GameEntity {
 	private final Position bornPos;
 	private final int level;
 	private int weaponEntityId;
-	
-	private int groupId;
-	private int configId;
 	private int poseId;
 	
 	public EntityMonster(Scene scene, MonsterData monsterData, Position pos, int level) {
@@ -103,22 +102,6 @@ public class EntityMonster extends GameEntity {
 	public boolean isAlive() {
 		return this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP) > 0f;
 	}
-	
-	public int getGroupId() {
-		return groupId;
-	}
-
-	public void setGroupId(int groupId) {
-		this.groupId = groupId;
-	}
-
-	public int getConfigId() {
-		return configId;
-	}
-
-	public void setConfigId(int configId) {
-		this.configId = configId;
-	}
 
 	public int getPoseId() {
 		return poseId;
@@ -127,12 +110,18 @@ public class EntityMonster extends GameEntity {
 	public void setPoseId(int poseId) {
 		this.poseId = poseId;
 	}
-	
+
 	@Override
 	public void onDeath(int killerId) {
 		if (this.getSpawnEntry() != null) {
 			this.getScene().getDeadSpawnedEntities().add(getSpawnEntry());
 		}
+		if (getScene().getScriptManager().isInit() && this.getGroupId() > 0) {
+			getScene().getScriptManager().callEvent(EventType.EVENT_ANY_MONSTER_DIE, null);
+		}
+		if (getScene().getChallenge() != null && getScene().getChallenge().getGroup().id == this.getGroupId()) {
+			getScene().getChallenge().onMonsterDie(this);
+		}
 	}
 	
 	public void recalcStats() {

src/main/java/emu/grasscutter/game/entity/EntityVehicle.java

@@ -25,7 +25,7 @@ import emu.grasscutter.utils.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
 
-public class EntityVehicle extends EntityGadget {
+public class EntityVehicle extends EntityBaseGadget {
 	private final Player owner;
 	private final Int2FloatOpenHashMap fightProp;
 

src/main/java/emu/grasscutter/game/entity/GameEntity.java

@@ -17,6 +17,10 @@ public abstract class GameEntity {
 	private final Scene scene;
 	private SpawnDataEntry spawnEntry;
 	
+	private int blockId;
+	private int configId;
+	private int groupId;
+	
 	private MotionState moveState;
 	private int lastMoveSceneTimeMs;
 	private int lastMoveReliableSeq;
@@ -96,6 +100,30 @@ public abstract class GameEntity {
 		return getFightProperties().getOrDefault(prop.getId(), 0f);
 	}
 	
+	public int getBlockId() {
+		return blockId;
+	}
+
+	public void setBlockId(int blockId) {
+		this.blockId = blockId;
+	}
+	
+	public int getConfigId() {
+		return configId;
+	}
+
+	public void setConfigId(int configId) {
+		this.configId = configId;
+	}
+	
+	public int getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(int groupId) {
+		this.groupId = groupId;
+	}
+	
 	protected MotionInfo getMotionInfo() {
 		MotionInfo proto = MotionInfo.newBuilder()
 				.setPos(getPosition().toProto())

src/main/java/emu/grasscutter/game/player/TeamManager.java

@@ -15,7 +15,7 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.def.AvatarSkillDepotData;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.entity.EntityBaseGadget;
 import emu.grasscutter.game.props.ElementType;
 import emu.grasscutter.game.props.EnterReason;
 import emu.grasscutter.game.props.FightProperty;
@@ -54,7 +54,7 @@ public class TeamManager {
 	@Transient private TeamInfo mpTeam;
 	@Transient private int entityId;
 	@Transient private final List<EntityAvatar> avatars;
-	@Transient private final Set<EntityGadget> gadgets;
+	@Transient private final Set<EntityBaseGadget> gadgets;
 	@Transient private final IntSet teamResonances;
 	@Transient private final IntSet teamResonancesConfig;
 	
@@ -141,7 +141,7 @@ public class TeamManager {
 		this.entityId = entityId;
 	}
 
-	public Set<EntityGadget> getGadgets() {
+	public Set<EntityBaseGadget> getGadgets() {
 		return gadgets;
 	}
 

src/main/java/emu/grasscutter/game/props/EntityType.java

+package emu.grasscutter.game.props;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+
+public enum EntityType {
+	None (0),
+	Avatar (1),
+	Monster (2),
+	Bullet (3),
+	AttackPhyisicalUnit (4),
+	AOE (5),
+	Camera (6),
+	EnviroArea (7),
+	Equip (8),
+	MonsterEquip (9),
+	Grass (10),
+	Level (11),
+	NPC (12),
+	TransPointFirst (13),
+	TransPointFirstGadget (14),
+	TransPointSecond (15),
+	TransPointSecondGadget (16),
+	DropItem (17),
+	Field (18),
+	Gadget (19),
+	Water (20),
+	GatherPoint (21),
+	GatherObject (22),
+	AirflowField (23),
+	SpeedupField (24),
+	Gear (25),
+	Chest (26),
+	EnergyBall (27),
+	ElemCrystal (28),
+	Timeline (29),
+	Worktop (30),
+	Team (31),
+	Platform (32),
+	AmberWind (33),
+	EnvAnimal (34),
+	SealGadget (35),
+	Tree (36),
+	Bush (37),
+	QuestGadget (38),
+	Lightning (39),
+	RewardPoint (40),
+	RewardStatue (41),
+	MPLevel (42),
+	WindSeed (43),
+	MpPlayRewardPoint (44),
+	ViewPoint (45),
+	RemoteAvatar (46),
+	GeneralRewardPoint (47),
+	PlayTeam (48),
+	OfferingGadget (49),
+	EyePoint (50),
+	MiracleRing (51),
+	Foundation (52),
+	WidgetGadget (53),
+	PlaceHolder (99);
+	
+	private final int value;
+	private static final Int2ObjectMap<EntityType> map = new Int2ObjectOpenHashMap<>();
+	private static final Map<String, EntityType> stringMap = new HashMap<>();
+	
+	static {
+		Stream.of(values()).forEach(e -> {
+			map.put(e.getValue(), e);
+			stringMap.put(e.name(), e);
+		});
+	}
+	
+	private EntityType(int value) {
+		this.value = value;
+	}
+
+	public int getValue() {
+		return value;
+	}
+	
+	public static EntityType getTypeByValue(int value) {
+		return map.getOrDefault(value, None);
+	}
+	
+	public static EntityType getTypeByName(String name) {
+		return stringMap.getOrDefault(name, None);
+	}
+}