Support spawn NPC

src/main/java/emu/grasscutter/scripts/data/SceneBlock.java

@@ -13,6 +13,8 @@ import javax.script.Bindings;
 import javax.script.CompiledScript;
 import javax.script.ScriptException;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import static emu.grasscutter.Configuration.SCRIPT;
 
@@ -24,7 +26,7 @@ public class SceneBlock {
 	public Position min;
 
 	public int sceneId;
-	public List<SceneGroup> groups;
+	public Map<Integer,SceneGroup> groups;
 	public PhTree<SceneGroup> sceneGroupIndex = new PhTree16<>(3);
 
 	private transient boolean loaded; // Not an actual variable in the scripts either
@@ -61,9 +63,11 @@ public class SceneBlock {
 			cs.eval(bindings);
 
 			// Set groups
-			groups = ScriptLoader.getSerializer().toList(SceneGroup.class, bindings.get("groups"));
-			groups.forEach(g -> g.block_id = id);
-			SceneIndexManager.buildIndex(this.sceneGroupIndex, groups, g -> g.pos.toLongArray());
+			groups = ScriptLoader.getSerializer().toList(SceneGroup.class, bindings.get("groups")).stream()
+					.collect(Collectors.toMap(x -> x.id, y -> y));
+
+			groups.values().forEach(g -> g.block_id = id);
+			SceneIndexManager.buildIndex(this.sceneGroupIndex, groups.values(), g -> g.pos.toLongArray());
 		} catch (ScriptException e) {
 			Grasscutter.getLogger().error("Error loading block " + id + " in scene " + sceneId, e);
 		}

src/main/java/emu/grasscutter/scripts/data/SceneGroup.java

@@ -32,7 +32,7 @@ public class SceneGroup {
 	public Map<Integer,SceneMonster> monsters; // <ConfigId, Monster>
 	public Map<Integer, SceneGadget> gadgets; // <ConfigId, Gadgets>
 	public Map<String, SceneTrigger> triggers;
-
+	public Map<Integer, SceneNPC> npc; // <NpcId, NPC>
 	public List<SceneRegion> regions;
 	public List<SceneSuite> suites;
 	public List<SceneVar> variables;
@@ -44,6 +44,11 @@ public class SceneGroup {
 	private transient boolean loaded; // Not an actual variable in the scripts either
 	private transient CompiledScript script;
 	private transient Bindings bindings;
+	public static SceneGroup of(int groupId) {
+		var group = new SceneGroup();
+		group.id = groupId;
+		return group;
+	}
 
 	public boolean isLoaded() {
 		return loaded;
@@ -124,6 +129,10 @@ public class SceneGroup {
 			
 			// Add variables to suite
 			variables = ScriptLoader.getSerializer().toList(SceneVar.class, bindings.get("variables"));
+			// NPC in groups
+			npc = ScriptLoader.getSerializer().toList(SceneNPC.class, bindings.get("npcs")).stream()
+					.collect(Collectors.toMap(x -> x.npc_id, y -> y));
+			npc.values().forEach(n -> n.group = this);
 
 			// Add monsters and gadgets to suite
 			for (SceneSuite suite : suites) {

src/main/java/emu/grasscutter/scripts/data/SceneNPC.java

@@ -0,0 +1,10 @@
+package emu.grasscutter.scripts.data;
+
+import lombok.Setter;
+import lombok.ToString;
+
+@ToString
+@Setter
+public class SceneNPC extends SceneObject{
+	public int npc_id;
+}