Fixed dungeon challenge scoreboard and implement dungeon drops

Also fixed a few dungeon script handlers

src/main/java/emu/grasscutter/scripts/SceneScriptManager.java

@@ -234,14 +234,31 @@ public class SceneScriptManager {
 			variables.forEach(var -> this.getVariables().put(var.name, var.value));
 			
 			// Add monsters to suite TODO optimize
-			HashMap<Integer, SceneMonster> map = (HashMap<Integer, SceneMonster>) group.monsters.stream().collect(Collectors.toMap(m -> m.config_id, m -> m));
+			Int2ObjectMap<Object> map = new Int2ObjectOpenHashMap<>();
+			group.monsters.forEach(m -> map.put(m.config_id, m));
+			group.gadgets.forEach(m -> map.put(m.config_id, m));
 			
 			for (SceneSuite suite : group.suites) {
 				suite.sceneMonsters = new ArrayList<>(suite.monsters.size());
 				for (int id : suite.monsters) {
-					SceneMonster monster = map.get(id);
-					if (monster != null) {
-						suite.sceneMonsters.add(monster);
+					try {
+						SceneMonster monster = (SceneMonster) map.get(id);
+						if (monster != null) {
+							suite.sceneMonsters.add(monster);
+						}
+					} catch (Exception e) {
+						continue;
+					}
+				}
+				suite.sceneGadgets = new ArrayList<>(suite.gadgets.size());
+				for (int id : suite.gadgets) {
+					try {
+						SceneGadget gadget = (SceneGadget) map.get(id);
+						if (gadget != null) {
+							suite.sceneGadgets.add(gadget);
+						}
+					} catch (Exception e) {
+						continue;
 					}
 				}
 			}
@@ -274,8 +291,22 @@ public class SceneScriptManager {
 		}
 	}
 	
+	public void spawnGadgetsInGroup(SceneGroup group, int suiteIndex) {
+		spawnGadgetsInGroup(group, group.getSuiteByIndex(suiteIndex));
+	}
+	
 	public void spawnGadgetsInGroup(SceneGroup group) {
-		for (SceneGadget g : group.gadgets) {
+		spawnGadgetsInGroup(group, null);
+	}
+	
+	public void spawnGadgetsInGroup(SceneGroup group, SceneSuite suite) {
+		List<SceneGadget> gadgets = group.gadgets;
+		
+		if (suite != null) {
+			gadgets = suite.sceneGadgets;
+		}
+		
+		for (SceneGadget g : gadgets) {
 			EntityGadget entity = new EntityGadget(getScene(), g.gadget_id, g.pos);
 			
 			if (entity.getGadgetData() == null) continue;

src/main/java/emu/grasscutter/scripts/ScriptLib.java

@@ -136,7 +136,7 @@ public class ScriptLib {
 	}
 	
 	// param3 (probably time limit for timed dungeons)
-	public int ActiveChallenge(int challengeId, int challengeIndex, int param3, int groupId, int param4, int param5) {
+	public int ActiveChallenge(int challengeId, int challengeIndex, int param3, int groupId, int objectiveKills, int param5) {
 		SceneGroup group = getSceneScriptManager().getGroupById(groupId);
 		
 		if (group == null || group.monsters == null) {
@@ -146,6 +146,7 @@ public class ScriptLib {
 		DungeonChallenge challenge = new DungeonChallenge(getSceneScriptManager().getScene(), group);
 		challenge.setChallengeId(challengeId);
 		challenge.setChallengeIndex(challengeIndex);
+		challenge.setObjective(objectiveKills);
 		
 		getSceneScriptManager().getScene().setChallenge(challenge);
 		
@@ -163,8 +164,13 @@ public class ScriptLib {
 		return getSceneScriptManager().getVariables().getOrDefault(var, 0);
 	}
 	
-	public LuaValue ChangeGroupVariableValue(String var, int value) {
+	public int SetGroupVariableValue(String var, int value) {
 		getSceneScriptManager().getVariables().put(var, value);
+		return 0;
+	}
+	
+	public LuaValue ChangeGroupVariableValue(String var, int value) {
+		getSceneScriptManager().getVariables().put(var, getSceneScriptManager().getVariables().get(var) + value);
 		return LuaValue.ZERO;
 	}
 	
@@ -179,8 +185,8 @@ public class ScriptLib {
 			return 1;
 		}
 		
-		// TODO just spawn all from group for now
 		this.getSceneScriptManager().spawnMonstersInGroup(group, suite);
+		this.getSceneScriptManager().spawnGadgetsInGroup(group, suite);
 		
 		return 0;
 	}

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

@@ -6,8 +6,10 @@ import emu.grasscutter.utils.Position;
 
 public class SceneSuite {
 	public List<Integer> monsters;
+	public List<Integer> gadgets;
 	public List<String> triggers;
 	public int rand_weight;
 	
 	public transient List<SceneMonster> sceneMonsters;
+	public transient List<SceneGadget> sceneGadgets;
 }