Fixed dungeon challenge scoreboard and implement dungeon drops

Also fixed a few dungeon script handlers

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

@@ -4,18 +4,29 @@ import java.util.ArrayList;
 import java.util.List;
 
 import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.common.ItemParamData;
+import emu.grasscutter.data.def.DungeonData;
 import emu.grasscutter.data.def.MonsterData;
 import emu.grasscutter.game.entity.EntityMonster;
 import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.ActionReason;
 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.scripts.data.ScriptArgs;
 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.PacketDungeonSettleNotify;
+import emu.grasscutter.server.packet.send.PacketGadgetAutoPickDropInfoNotify;
 import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
+import emu.grasscutter.utils.Utils;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
 
 public class DungeonChallenge {
 	private final Scene scene;
@@ -28,12 +39,12 @@ public class DungeonChallenge {
 	
 	private int score;
 	private int objective = 0;
+	private IntSet rewardedPlayers;
 	
 	public DungeonChallenge(Scene scene, SceneGroup group) {
 		this.scene = scene;
 		this.group = group;
-		
-		objective += group.monsters.size();
+		this.setRewardedPlayers(new IntOpenHashSet());
 	}
 
 	public Scene getScene() {
@@ -60,6 +71,14 @@ public class DungeonChallenge {
 		this.challengeId = challengeId;
 	}
 
+	public int getObjective() {
+		return objective;
+	}
+
+	public void setObjective(int objective) {
+		this.objective = objective;
+	}
+
 	public boolean isSuccess() {
 		return success;
 	}
@@ -75,6 +94,18 @@ public class DungeonChallenge {
 	public int getScore() {
 		return score;
 	}
+	
+	public int getTimeLimit() {
+		return 600;
+	}
+
+	public IntSet getRewardedPlayers() {
+		return rewardedPlayers;
+	}
+
+	public void setRewardedPlayers(IntSet rewardedPlayers) {
+		this.rewardedPlayers = rewardedPlayers;
+	}
 
 	public void start() {
 		this.progress = true;
@@ -83,23 +114,57 @@ public class DungeonChallenge {
 	
 	public void finish() {
 		this.progress = false;
+		
 		getScene().broadcastPacket(new PacketDungeonChallengeFinishNotify(this));
 		
 		if (this.isSuccess()) {
+			// Call success script event
 			this.getScene().getScriptManager().callEvent(EventType.EVENT_CHALLENGE_SUCCESS, null);
+			
+			// Settle
+			settle();
 		} else {
 			this.getScene().getScriptManager().callEvent(EventType.EVENT_CHALLENGE_FAIL, null);
 		}
 	}
+	
+	private void settle() {
+		getScene().setAutoCloseTime(Utils.getCurrentSeconds() + 1000);
+		getScene().broadcastPacket(new PacketDungeonSettleNotify(this));
+		
+		getScene().getScriptManager().callEvent(EventType.EVENT_DUNGEON_SETTLE, new ScriptArgs(this.isSuccess() ? 1 : 0));
+	}
 
 	public void onMonsterDie(EntityMonster entity) {
 		score = getScore() + 1;
 		
 		getScene().broadcastPacket(new PacketChallengeDataNotify(this, 1, getScore()));
 		
-		if (getScore() >= objective) {
+		if (getScore() >= getObjective()) {
 			this.setSuccess(true);
 			finish();
 		}
 	}
+	
+	public void getStatueDrops(Player player) {
+		DungeonData dungeonData = getScene().getDungeonData();
+		if (!isSuccess() || dungeonData == null || dungeonData.getRewardPreview() == null || dungeonData.getRewardPreview().getPreviewItems().length == 0) {
+			return;
+		}
+		
+		// Already rewarded
+		if (getRewardedPlayers().contains(player.getUid())) {
+			return;
+		}
+		
+		List<GameItem> rewards = new ArrayList<>();
+		for (ItemParamData param : getScene().getDungeonData().getRewardPreview().getPreviewItems()) {
+			rewards.add(new GameItem(param.getId(), Math.max(param.getCount(), 1)));
+		}
+		
+		player.getInventory().addItems(rewards, ActionReason.DungeonStatueDrop);
+		player.sendPacket(new PacketGadgetAutoPickDropInfoNotify(rewards));
+		
+		getRewardedPlayers().add(player.getUid());
+	}
 }

src/main/java/emu/grasscutter/game/inventory/GameItem.java

@@ -415,12 +415,6 @@ public class GameItem {
 				Reliquary relic = this.toReliquaryProto();
 				proto.setEquip(Equip.newBuilder().setReliquary(relic).setIsLocked(this.isLocked()).build());
 				break;
-			case ITEM_MATERIAL:
-				Material material = Material.newBuilder()
-					.setCount(getCount())
-					.build();
-				proto.setMaterial(material);
-				break;
 			case ITEM_FURNITURE:
 				Furniture furniture = Furniture.newBuilder()
 					.setCount(getCount())
@@ -428,6 +422,10 @@ public class GameItem {
 				proto.setFurniture(furniture);
 				break;
 			default:
+				Material material = Material.newBuilder()
+					.setCount(getCount())
+					.build();
+				proto.setMaterial(material);
 				break;
 		}	
 				

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

@@ -11,6 +11,7 @@ import emu.grasscutter.game.CoopRequest;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.avatar.AvatarProfileData;
 import emu.grasscutter.game.avatar.AvatarStorage;
+import emu.grasscutter.game.entity.EntityGadget;
 import emu.grasscutter.game.entity.EntityItem;
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.friends.FriendsList;
@@ -21,6 +22,7 @@ import emu.grasscutter.game.inventory.Inventory;
 import emu.grasscutter.game.mail.Mail;
 import emu.grasscutter.game.mail.MailHandler;
 import emu.grasscutter.game.props.ActionReason;
+import emu.grasscutter.game.props.EntityType;
 import emu.grasscutter.game.props.PlayerProperty;
 import emu.grasscutter.game.shop.ShopLimit;
 import emu.grasscutter.game.world.Scene;
@@ -785,6 +787,16 @@ public class Player {
 				else
 					this.getScene().broadcastPacket(new PacketGadgetInteractRsp(drop, InteractType.INTERACT_PICK_ITEM));
 			}
+		} else if (entity instanceof EntityGadget) {
+			EntityGadget gadget = (EntityGadget) entity;
+			
+			if (gadget.getGadgetData().getType() == EntityType.RewardStatue) {
+				if (scene.getChallenge() != null) {
+					scene.getChallenge().getStatueDrops(this);
+				}
+				
+				this.sendPacket(new PacketGadgetInteractRsp(gadget, InteractType.INTERACT_OPEN_STATUE));
+			}
 		} else {
 			// Delete directly
 			entity.getScene().removeEntity(entity);

src/main/java/emu/grasscutter/game/world/Scene.java

@@ -49,6 +49,7 @@ public class Scene {
 	private final Set<SceneBlock> loadedBlocks;
 	private boolean dontDestroyWhenEmpty;
 	
+	private int autoCloseTime;
 	private int time;
 	private ClimateType climate;
 	private int weather;
@@ -107,6 +108,20 @@ public class Scene {
 		return this.entities.get(id);
 	}
 	
+	/**
+	 * @return the autoCloseTime
+	 */
+	public int getAutoCloseTime() {
+		return autoCloseTime;
+	}
+
+	/**
+	 * @param autoCloseTime the autoCloseTime to set
+	 */
+	public void setAutoCloseTime(int autoCloseTime) {
+		this.autoCloseTime = autoCloseTime;
+	}
+
 	public int getTime() {
 		return time;
 	}
@@ -520,8 +535,22 @@ public class Scene {
 		}
 		
 		// Spawn gadgets AFTER triggers are added
+		// TODO
 		for (SceneGroup group : block.groups) {
-			this.getScriptManager().spawnGadgetsInGroup(group);
+			if (group.init_config == null) {
+				continue;
+			}
+			
+			int suite = group.init_config.suite;
+			
+			if (suite == 0) {
+				continue;
+			}
+			
+			do {
+				this.getScriptManager().spawnGadgetsInGroup(group, suite);
+				suite++;
+			} while (suite < group.init_config.end_suite);
 		}
 	}