add region entity

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

@@ -34,10 +34,10 @@ public class SceneGroup {
 	public Map<Integer, SceneGadget> gadgets; // <ConfigId, Gadgets>
 	public Map<String, SceneTrigger> triggers;
 	public Map<Integer, SceneNPC> npc; // <NpcId, NPC>
-	public List<SceneRegion> regions;
+    public Map<Integer, SceneRegion> regions;
 	public List<SceneSuite> suites;
 	public List<SceneVar> variables;
-	
+
 	public SceneBusiness business;
 	public SceneGarbage garbages;
 	public SceneInitConfig init_config;
@@ -115,9 +115,12 @@ public class SceneGroup {
 			triggers.values().forEach(t -> t.currentGroup = this);
 
 			suites = ScriptLoader.getSerializer().toList(SceneSuite.class, bindings.get("suites"));
-			regions = ScriptLoader.getSerializer().toList(SceneRegion.class, bindings.get("regions"));
+            regions = ScriptLoader.getSerializer().toList(SceneRegion.class, bindings.get("regions")).stream()
+                .collect(Collectors.toMap(x -> x.config_id, y -> y));
+            regions.values().forEach(m -> m.group = this);
+
 			init_config = ScriptLoader.getSerializer().toObject(SceneInitConfig.class, bindings.get("init_config"));
-			
+
 			// Garbages TODO fix properly later
 			Object garbagesValue = bindings.get("garbages");
 			if (garbagesValue != null && garbagesValue instanceof LuaValue garbagesTable) {
@@ -157,12 +160,19 @@ public class SceneGroup {
 								.map(triggers::get)
 								.toList()
 				);
+
+                suite.sceneRegions = new ArrayList<>(
+                    suite.regions.stream()
+                        .filter(regions::containsKey)
+                        .map(regions::get)
+                        .toList()
+                );
 			}
 
 		} catch (ScriptException e) {
 			Grasscutter.getLogger().error("Error loading group " + id + " in scene " + sceneId, e);
 		}
-		
+
 		Grasscutter.getLogger().info("group {} in scene {} is loaded successfully.", id, sceneId);
 		return this;
 	}

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

@@ -1,62 +1,34 @@
 package emu.grasscutter.scripts.data;
 
-import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.scripts.constants.ScriptRegionShape;
 import emu.grasscutter.utils.Position;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSet;
-import lombok.Data;
 import lombok.Setter;
-import lombok.ToString;
 
-@ToString
+
 @Setter
 public class SceneRegion {
 	public int config_id;
 	public int shape;
 	public Position pos;
+    // for CUBIC
 	public Position size;
-	
-	private boolean hasNewEntities;
-	private final IntSet entities; // Ids of entities inside this region
-	
-	public SceneRegion() {
-		this.entities = new IntOpenHashSet();
-	}
-	
-	public IntSet getEntities() {
-		return entities;
-	}
+    // for SPHERE
+    public int radius;
 
-	public void addEntity(GameEntity entity) {
-		if (this.getEntities().contains(entity.getId())) {
-			return;
-		}
-		this.getEntities().add(entity.getId());
-		this.hasNewEntities = true;
-	}
-	
-	public void removeEntity(GameEntity entity) {
-		this.getEntities().remove(entity.getId());
-	}
-	
-	public boolean contains(Position p) {
+    public transient SceneGroup group;
+	public boolean contains(Position position) {
 		switch (shape) {
 			case ScriptRegionShape.CUBIC:
-				return (Math.abs(pos.getX() - p.getX()) <= size.getX()) &&
-				       (Math.abs(pos.getZ() - p.getZ()) <= size.getZ());
+				return (Math.abs(pos.getX() - position.getX()) <= size.getX()) &&
+				       (Math.abs(pos.getY() - position.getY()) <= size.getY()) &&
+				       (Math.abs(pos.getZ() - position.getZ()) <= size.getZ());
 			case ScriptRegionShape.SPHERE:
-				return false;
+                var x = Math.pow(pos.getX() - position.getX(), 2);
+                var y = Math.pow(pos.getY() - position.getY(), 2);
+                var z = Math.pow(pos.getZ() - position.getZ(), 2);
+				return x + y + z <= (radius ^ 2);
 		}
-		
 		return false;
 	}
 
-	public boolean hasNewEntities() {
-		return hasNewEntities;
-	}
-	
-	public void resetNewEntities() {
-		hasNewEntities = false;
-	}
 }

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

@@ -11,9 +11,12 @@ public class SceneSuite {
 	public List<Integer> monsters;
 	public List<Integer> gadgets;
 	public List<String> triggers;
-	public int rand_weight;
-	
+    public List<Integer> regions;
+    public int rand_weight;
+
 	public transient List<SceneMonster> sceneMonsters;
 	public transient List<SceneGadget> sceneGadgets;
 	public transient List<SceneTrigger> sceneTriggers;
+    public transient List<SceneRegion> sceneRegions;
+
 }