From e9d7d5d5f2a4942af7d9e92e9685a79229f9e7b8 Mon Sep 17 00:00:00 2001
From: Melledy <52122272+Melledy@users.noreply.github.com>
Date: Wed, 11 May 2022 03:56:40 -0700
Subject: [PATCH 01/59] Implement quests

---
 .../command/commands/QuestCommand.java        |  66 ++++++
 .../java/emu/grasscutter/data/GameData.java   |   6 +
 .../emu/grasscutter/data/ResourceLoader.java  |  34 +++-
 .../grasscutter/data/custom/QuestConfig.java  |  25 +++
 .../data/custom/QuestConfigData.java          | 104 ++++++++++
 .../grasscutter/database/DatabaseHelper.java  |  15 ++
 .../grasscutter/database/DatabaseManager.java |   5 +-
 .../emu/grasscutter/game/player/Player.java   |  38 +++-
 .../grasscutter/game/quest/GameMainQuest.java | 124 ++++++++++++
 .../emu/grasscutter/game/quest/GameQuest.java | 188 ++++++++++++++++++
 .../grasscutter/game/quest/QuestManager.java  | 119 +++++++++++
 .../game/quest/enums/LogicType.java           |  23 +++
 .../game/quest/enums/ParentQuestState.java    |  18 ++
 .../game/quest/enums/QuestCondType.java       |  92 +++++++++
 .../game/quest/enums/QuestExecType.java       |  82 ++++++++
 .../game/quest/enums/QuestGuideType.java      |  17 ++
 .../game/quest/enums/QuestShowType.java       |  16 ++
 .../game/quest/enums/QuestState.java          |  19 ++
 .../game/quest/enums/QuestType.java           |  22 ++
 .../game/quest/enums/ShowQuestGuideType.java  |  17 ++
 .../send/PacketFinishedParentQuestNotify.java |  22 ++
 ...PacketFinishedParentQuestUpdateNotify.java |  19 ++
 .../packet/send/PacketQuestListNotify.java    |  23 +++
 .../send/PacketQuestListUpdateNotify.java     |  20 ++
 .../send/PacketQuestProgressUpdateNotify.java |  30 +++
 ...etServerCondMeetQuestListUpdateNotify.java |  37 ++++
 src/main/resources/languages/en-US.json       |   8 +
 27 files changed, 1183 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/emu/grasscutter/command/commands/QuestCommand.java
 create mode 100644 src/main/java/emu/grasscutter/data/custom/QuestConfig.java
 create mode 100644 src/main/java/emu/grasscutter/data/custom/QuestConfigData.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/GameQuest.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/QuestManager.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/enums/LogicType.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/enums/ParentQuestState.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/enums/QuestCondType.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/enums/QuestExecType.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/enums/QuestGuideType.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/enums/QuestShowType.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/enums/QuestState.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/enums/QuestType.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/enums/ShowQuestGuideType.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestNotify.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestUpdateNotify.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketQuestListNotify.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketQuestListUpdateNotify.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketQuestProgressUpdateNotify.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketServerCondMeetQuestListUpdateNotify.java

diff --git a/src/main/java/emu/grasscutter/command/commands/QuestCommand.java b/src/main/java/emu/grasscutter/command/commands/QuestCommand.java
new file mode 100644
index 000000000..70fae0120
--- /dev/null
+++ b/src/main/java/emu/grasscutter/command/commands/QuestCommand.java
@@ -0,0 +1,66 @@
+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.GameQuest;
+
+import java.util.List;
+
+import static emu.grasscutter.utils.Language.translate;
+
+@Command(label = "quest", usage = "quest <add|finish> [quest id]", permission = "player.quest", permissionTargeted = "player.quest.others", description = "commands.quest.description")
+public final class QuestCommand implements CommandHandler {
+
+    @Override
+    public void execute(Player sender, Player targetPlayer, List<String> args) {
+		if (targetPlayer == null) {
+			CommandHandler.sendMessage(sender, translate(sender, "commands.execution.need_target"));
+			return;
+		}
+		
+		if (args.size() != 2) {
+			CommandHandler.sendMessage(sender, translate(sender, "commands.quest.usage"));
+            return;
+		}
+		
+		String cmd = args.get(0).toLowerCase();
+		int questId;
+		
+		try {
+			questId = Integer.parseInt(args.get(1));
+		} catch (Exception e) {
+			CommandHandler.sendMessage(sender, translate(sender, "commands.quest.invalid_id"));
+            return;
+		}
+		
+		switch (cmd) {
+			case "add" -> {
+				GameQuest quest = sender.getQuestManager().addQuest(questId);
+				
+				if (quest != null) {
+					CommandHandler.sendMessage(sender, translate(sender, "commands.quest.added", questId));
+					return;
+				}
+				
+				CommandHandler.sendMessage(sender, translate(sender, "commands.quest.not_found"));
+			}
+			case "finish" -> {
+				GameQuest quest = sender.getQuestManager().getQuestById(questId);
+				
+				if (quest == null) {
+					CommandHandler.sendMessage(sender, translate(sender, "commands.quest.not_found"));
+					return;
+				}
+				
+				quest.finish();
+				
+				CommandHandler.sendMessage(sender, translate(sender, "commands.quest.finished", questId));
+			}
+			default -> {
+				CommandHandler.sendMessage(sender, translate(sender, "commands.quest.usage"));
+			}
+		}
+    }
+}
diff --git a/src/main/java/emu/grasscutter/data/GameData.java b/src/main/java/emu/grasscutter/data/GameData.java
index ac2472192..2b40818e1 100644
--- a/src/main/java/emu/grasscutter/data/GameData.java
+++ b/src/main/java/emu/grasscutter/data/GameData.java
@@ -12,6 +12,7 @@ import emu.grasscutter.data.custom.AbilityEmbryoEntry;
 import emu.grasscutter.data.custom.AbilityModifier;
 import emu.grasscutter.data.custom.AbilityModifierEntry;
 import emu.grasscutter.data.custom.OpenConfigEntry;
+import emu.grasscutter.data.custom.QuestConfig;
 import emu.grasscutter.data.custom.ScenePointEntry;
 import emu.grasscutter.data.def.*;
 import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
@@ -27,6 +28,7 @@ public class GameData {
 	private static final Map<String, AbilityModifierEntry> abilityModifiers = new HashMap<>();
 	private static final Map<String, OpenConfigEntry> openConfigEntries = new HashMap<>();
 	private static final Map<String, ScenePointEntry> scenePointEntries = new HashMap<>();
+	private static final Int2ObjectMap<QuestConfig> questConfigs = new Int2ObjectOpenHashMap<>();
 	
 	// ExcelConfigs
 	private static final Int2ObjectMap<PlayerLevelData> playerLevelDataMap = new Int2ObjectOpenHashMap<>();
@@ -122,6 +124,10 @@ public class GameData {
 		return getScenePointEntries().get(sceneId + "_" + pointId);
 	}
 
+	public static Int2ObjectMap<QuestConfig> getQuestConfigs() {
+		return questConfigs;
+	}
+
 	public static Int2ObjectMap<AvatarData> getAvatarDataMap() {
 		return avatarDataMap;
 	}
diff --git a/src/main/java/emu/grasscutter/data/ResourceLoader.java b/src/main/java/emu/grasscutter/data/ResourceLoader.java
index c2708bd63..ae73de8ff 100644
--- a/src/main/java/emu/grasscutter/data/ResourceLoader.java
+++ b/src/main/java/emu/grasscutter/data/ResourceLoader.java
@@ -24,6 +24,9 @@ import emu.grasscutter.data.custom.AbilityModifier.AbilityModifierAction;
 import emu.grasscutter.data.custom.AbilityModifier.AbilityModifierActionType;
 import emu.grasscutter.data.custom.AbilityModifierEntry;
 import emu.grasscutter.data.custom.OpenConfigEntry;
+import emu.grasscutter.data.custom.QuestConfig;
+import emu.grasscutter.data.custom.QuestConfigData;
+import emu.grasscutter.data.custom.QuestConfigData.SubQuestConfigData;
 import emu.grasscutter.data.custom.ScenePointEntry;
 import emu.grasscutter.game.world.SpawnDataEntry;
 import emu.grasscutter.game.world.SpawnDataEntry.SpawnGroupEntry;
@@ -57,8 +60,9 @@ public class ResourceLoader {
 		loadResources();
 		// Process into depots
 		GameDepot.load();
-		// Load spawn data
+		// Load spawn data and quests
 		loadSpawnData();
+		loadQuests();
 		// Load scene points - must be done AFTER resources are loaded
 		loadScenePoints();
 		// Custom - TODO move this somewhere else
@@ -396,6 +400,34 @@ public class ResourceLoader {
 			GameData.getOpenConfigEntries().put(entry.getName(), entry);
 		}
 	}
+	
+	private static void loadQuests() {
+		File folder = new File(Grasscutter.getConfig().RESOURCE_FOLDER + "BinOutput/Quest/");
+		
+		if (!folder.exists()) {
+			return;
+		}
+		
+		for (File file : folder.listFiles()) {
+			QuestConfigData mainQuest = null;
+			
+			try (FileReader fileReader = new FileReader(file)) {
+				mainQuest = Grasscutter.getGsonFactory().fromJson(fileReader, QuestConfigData.class);
+			} catch (Exception e) {
+				e.printStackTrace();
+				continue;
+			}
+			
+			if (mainQuest.getSubQuests() != null) {
+				for (SubQuestConfigData subQuest : mainQuest.getSubQuests()) {
+					QuestConfig quest = new QuestConfig(mainQuest, subQuest);
+					GameData.getQuestConfigs().put(quest.getId(), quest);
+				}
+			}
+		}
+		
+		Grasscutter.getLogger().info("Loaded " + GameData.getQuestConfigs().size() + " Quest Configs");
+	}
 
 	// BinOutput configs
 	
diff --git a/src/main/java/emu/grasscutter/data/custom/QuestConfig.java b/src/main/java/emu/grasscutter/data/custom/QuestConfig.java
new file mode 100644
index 000000000..8674ff7ab
--- /dev/null
+++ b/src/main/java/emu/grasscutter/data/custom/QuestConfig.java
@@ -0,0 +1,25 @@
+package emu.grasscutter.data.custom;
+
+import emu.grasscutter.data.custom.QuestConfigData.SubQuestConfigData;
+
+public class QuestConfig {
+	private final QuestConfigData mainQuest;
+	private final SubQuestConfigData subQuest;
+	
+	public QuestConfig(QuestConfigData mainQuest, SubQuestConfigData subQuest) {
+		this.mainQuest = mainQuest;
+		this.subQuest = subQuest;
+	}
+
+	public int getId() {
+		return subQuest.getSubId();
+	}
+
+	public QuestConfigData getMainQuest() {
+		return mainQuest;
+	}
+
+	public SubQuestConfigData getSubQuest() {
+		return subQuest;
+	}
+}
diff --git a/src/main/java/emu/grasscutter/data/custom/QuestConfigData.java b/src/main/java/emu/grasscutter/data/custom/QuestConfigData.java
new file mode 100644
index 000000000..4ba0ce47c
--- /dev/null
+++ b/src/main/java/emu/grasscutter/data/custom/QuestConfigData.java
@@ -0,0 +1,104 @@
+package emu.grasscutter.data.custom;
+
+import emu.grasscutter.game.quest.enums.LogicType;
+import emu.grasscutter.game.quest.enums.QuestCondType;
+import emu.grasscutter.game.quest.enums.QuestType;
+
+public class QuestConfigData {
+	private int id;
+	private int series;
+	private QuestType type;
+	
+	private long titleTextMapHash;
+	private int[] suggestTrackMainQuestList;
+	private int[] rewardIdList;
+	
+	private SubQuestConfigData[] subQuests;
+	
+	public int getId() {
+		return id;
+	}
+
+	public int getSeries() {
+		return series;
+	}
+
+	public QuestType getType() {
+		return type;
+	}
+
+	public long getTitleTextMapHash() {
+		return titleTextMapHash;
+	}
+
+	public int[] getSuggestTrackMainQuestList() {
+		return suggestTrackMainQuestList;
+	}
+
+	public int[] getRewardIdList() {
+		return rewardIdList;
+	}
+
+	public SubQuestConfigData[] getSubQuests() {
+		return subQuests;
+	}
+
+	public class SubQuestConfigData {
+		private int subId;
+		private int mainId;
+		
+		private LogicType acceptCondComb;
+		private QuestCondition[] acceptCond;
+		
+		private LogicType finishCondComb;
+		private QuestCondition[] finishCond;
+		
+		private LogicType failCondComb;
+		private QuestCondition[] failCond;
+		
+		public int getSubId() {
+			return subId;
+		}
+		
+		public int getMainId() {
+			return mainId;
+		}
+		
+		public LogicType getAcceptCondComb() {
+			return acceptCondComb;
+		}
+		
+		public QuestCondition[] getAcceptCond() {
+			return acceptCond;
+		}
+		
+		public LogicType getFinishCondComb() {
+			return finishCondComb;
+		}
+		
+		public QuestCondition[] getFinishCond() {
+			return finishCond;
+		}
+		
+		public LogicType getFailCondComb() {
+			return failCondComb;
+		}
+		
+		public QuestCondition[] getFailCond() {
+			return failCond;
+		}
+	}
+	
+	public class QuestCondition {
+		private QuestCondType type;
+		private int[] param;
+		
+		public QuestCondType getType() {
+			return type;
+		}
+		
+		public int[] getParam() {
+			return param;
+		}
+	}
+}
diff --git a/src/main/java/emu/grasscutter/database/DatabaseHelper.java b/src/main/java/emu/grasscutter/database/DatabaseHelper.java
index 8f1de0bb9..fe931bdc3 100644
--- a/src/main/java/emu/grasscutter/database/DatabaseHelper.java
+++ b/src/main/java/emu/grasscutter/database/DatabaseHelper.java
@@ -15,6 +15,7 @@ import emu.grasscutter.game.gacha.GachaRecord;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.mail.Mail;
 import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.GameMainQuest;
 
 import static com.mongodb.client.model.Filters.eq;
 
@@ -111,6 +112,8 @@ public final class DatabaseHelper {
 		DatabaseManager.getDatabase().getCollection("gachas").deleteMany(eq("ownerId", target.getPlayerUid()));
 		// Delete GameItem.class data
 		DatabaseManager.getDatabase().getCollection("items").deleteMany(eq("ownerId", target.getPlayerUid()));
+		// Delete GameMainQuest.class data
+		DatabaseManager.getDatabase().getCollection("quests").deleteMany(eq("ownerUid", target.getPlayerUid()));
 
 		// Delete friendships.
 		// Here, we need to make sure to not only delete the deleted account's friendships,
@@ -260,4 +263,16 @@ public final class DatabaseHelper {
 		DeleteResult result = DatabaseManager.getDatastore().delete(mail);
 		return result.wasAcknowledged();
 	}
+	
+	public static List<GameMainQuest> getAllQuests(Player player) {
+		return DatabaseManager.getDatastore().find(GameMainQuest.class).filter(Filters.eq("ownerUid", player.getUid())).stream().toList();
+	}
+	
+	public static void saveQuest(GameMainQuest quest) {
+		DatabaseManager.getDatastore().save(quest);
+	}
+	
+	public static boolean deleteQuest(GameMainQuest quest) {
+		return DatabaseManager.getDatastore().delete(quest).wasAcknowledged();
+	}
 }
diff --git a/src/main/java/emu/grasscutter/database/DatabaseManager.java b/src/main/java/emu/grasscutter/database/DatabaseManager.java
index 90ff17238..12bb444b8 100644
--- a/src/main/java/emu/grasscutter/database/DatabaseManager.java
+++ b/src/main/java/emu/grasscutter/database/DatabaseManager.java
@@ -20,6 +20,8 @@ import emu.grasscutter.game.gacha.GachaRecord;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.mail.Mail;
 import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.GameMainQuest;
+import emu.grasscutter.game.quest.GameQuest;
 
 public final class DatabaseManager {
 
@@ -30,7 +32,8 @@ public final class DatabaseManager {
 	private static Datastore dispatchDatastore;
 	
 	private static final Class<?>[] mappedClasses = new Class<?>[] {
-		DatabaseCounter.class, Account.class, Player.class, Avatar.class, GameItem.class, Friendship.class, GachaRecord.class, Mail.class
+		DatabaseCounter.class, Account.class, Player.class, Avatar.class, GameItem.class, Friendship.class, 
+		GachaRecord.class, Mail.class, GameMainQuest.class
 	};
     
     public static Datastore getDatastore() {
diff --git a/src/main/java/emu/grasscutter/game/player/Player.java b/src/main/java/emu/grasscutter/game/player/Player.java
index 477f974ea..e8c4cd61b 100644
--- a/src/main/java/emu/grasscutter/game/player/Player.java
+++ b/src/main/java/emu/grasscutter/game/player/Player.java
@@ -29,6 +29,9 @@ import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.game.props.EntityType;
 import emu.grasscutter.game.props.PlayerProperty;
 import emu.grasscutter.game.props.SceneType;
+import emu.grasscutter.game.quest.GameMainQuest;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestManager;
 import emu.grasscutter.game.shop.ShopLimit;
 import emu.grasscutter.game.managers.MapMarkManager.*;
 import emu.grasscutter.game.tower.TowerManager;
@@ -91,6 +94,7 @@ public class Player {
 	@Transient private MailHandler mailHandler;
 	@Transient private MessageHandler messageHandler;
 	@Transient private AbilityManager abilityManager;
+	@Transient private QuestManager questManager;
 	
 	@Transient private SotSManager sotsManager;
 
@@ -145,6 +149,7 @@ public class Player {
 		this.mailHandler = new MailHandler(this);
 		this.towerManager = new TowerManager(this);
 		this.abilityManager = new AbilityManager(this);
+		this.setQuestManager(new QuestManager(this));
 		this.pos = new Position();
 		this.rotation = new Position();
 		this.properties = new HashMap<>();
@@ -409,6 +414,14 @@ public class Player {
 		return towerManager;
 	}
 
+	public QuestManager getQuestManager() {
+		return questManager;
+	}
+
+	public void setQuestManager(QuestManager questManager) {
+		this.questManager = questManager;
+	}
+
 	public PlayerGachaInfo getGachaInfo() {
 		return gachaInfo;
 	}
@@ -883,9 +896,7 @@ public class Player {
 	}
 
 	public void sendPacket(BasePacket packet) {
-		if (this.hasSentAvatarDataNotify) {
-			this.getSession().send(packet);
-		}
+		this.getSession().send(packet);
 	}
 
 	public OnlinePlayerInfo getOnlinePlayerInfo() {
@@ -1118,7 +1129,23 @@ public class Player {
 
 		this.getFriendsList().loadFromDatabase();
 		this.getMailHandler().loadFromDatabase();
+		this.getQuestManager().loadFromDatabase();
+		
+		// Quest - Commented out because a problem is caused if you log out while this quest is active
+		/*
+		if (getQuestManager().getMainQuestById(351) == null) {
+			GameQuest quest = getQuestManager().addQuest(35104);
+			if (quest != null) {
+				quest.finish();
+			}
 
+			getQuestManager().addQuest(35101);
+			
+			this.setSceneId(3);
+			this.getPos().set(GameConstants.START_POSITION);
+		}
+		*/
+		
 		// Create world
 		World world = new World(this);
 		world.addPlayer(this);
@@ -1138,7 +1165,10 @@ public class Player {
 		session.send(new PacketStoreWeightLimitNotify());
 		session.send(new PacketPlayerStoreNotify(this));
 		session.send(new PacketAvatarDataNotify(this));
-
+		session.send(new PacketFinishedParentQuestNotify(this));
+		session.send(new PacketQuestListNotify(this));
+		session.send(new PacketServerCondMeetQuestListUpdateNotify(this));
+		
 		getTodayMoonCard(); // The timer works at 0:0, some users log in after that, use this method to check if they have received a reward today or not. If not, send the reward.
 
 		session.send(new PacketPlayerEnterSceneNotify(this)); // Enter game world
diff --git a/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java b/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
new file mode 100644
index 000000000..1ceda3356
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
@@ -0,0 +1,124 @@
+package emu.grasscutter.game.quest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.bson.types.ObjectId;
+
+import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.Id;
+import dev.morphia.annotations.Indexed;
+import dev.morphia.annotations.Transient;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.custom.QuestConfig;
+import emu.grasscutter.database.DatabaseHelper;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.enums.ParentQuestState;
+import emu.grasscutter.game.quest.enums.QuestState;
+import emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest;
+import emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest;
+import emu.grasscutter.net.proto.QuestOuterClass.Quest;
+import emu.grasscutter.server.packet.send.PacketFinishedParentQuestUpdateNotify;
+import emu.grasscutter.server.packet.send.PacketQuestListUpdateNotify;
+import emu.grasscutter.server.packet.send.PacketQuestProgressUpdateNotify;
+import emu.grasscutter.utils.Utils;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+
+@Entity(value = "quests", useDiscriminator = false)
+public class GameMainQuest {
+	@Id private ObjectId id;
+	
+	@Indexed private int ownerUid;
+	@Transient private Player owner;
+	
+	private Map<Integer, GameQuest> childQuests;
+	
+	private int parentQuestId;
+	private int[] questVars;
+	private ParentQuestState state;
+	private boolean isFinished;
+	
+	@Deprecated // Morphia only. Do not use.
+	public GameMainQuest() {}
+	
+	public GameMainQuest(Player player, int parentQuestId) {
+		this.owner = player;
+		this.ownerUid = player.getUid();
+		this.parentQuestId = parentQuestId;
+		this.childQuests = new HashMap<>();
+		this.questVars = new int[5];
+		this.state = ParentQuestState.PARENT_QUEST_STATE_NONE;
+	}
+
+	public int getParentQuestId() {
+		return parentQuestId;
+	}
+	
+	public int getOwnerUid() {
+		return ownerUid;
+	}
+
+	public Player getOwner() {
+		return owner;
+	}
+
+	public void setOwner(Player player) {
+		if (player.getUid() != this.getOwnerUid()) return;
+		this.owner = player;
+	}
+
+	public Map<Integer, GameQuest> getChildQuests() {
+		return childQuests;
+	}
+	
+	public GameQuest getChildQuestById(int id) {
+		return this.getChildQuests().get(id);
+	}
+
+	public int[] getQuestVars() {
+		return questVars;
+	}
+
+	public ParentQuestState getState() {
+		return state;
+	}
+
+	public boolean isFinished() {
+		return isFinished;
+	}
+
+	public void finish() {
+		this.isFinished = true;
+		this.state = ParentQuestState.PARENT_QUEST_STATE_FINISHED;
+		this.getOwner().getSession().send(new PacketFinishedParentQuestUpdateNotify(this));
+	}
+
+	public void save() {
+		DatabaseHelper.saveQuest(this);
+	}
+
+	public ParentQuest toProto() {
+		ParentQuest.Builder proto = ParentQuest.newBuilder()
+				.setParentQuestId(getParentQuestId())
+				.setIsFinished(isFinished())
+				.setParentQuestState(getState().getValue());
+		
+		for (GameQuest quest : this.getChildQuests().values()) {
+			ChildQuest childQuest = ChildQuest.newBuilder()
+					.setQuestId(quest.getQuestId())
+					.setState(quest.getState().getValue())
+					.build();
+			
+			proto.addChildQuestList(childQuest);
+		}
+		
+		if (getQuestVars() != null) {
+			for (int i : getQuestVars()) {
+				proto.addQuestVar(i);
+			}
+		}
+
+		return proto.build();
+	}
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/GameQuest.java b/src/main/java/emu/grasscutter/game/quest/GameQuest.java
new file mode 100644
index 000000000..53599830c
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/GameQuest.java
@@ -0,0 +1,188 @@
+package emu.grasscutter.game.quest;
+
+import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.Transient;
+import emu.grasscutter.data.custom.QuestConfig;
+import emu.grasscutter.data.custom.QuestConfigData.SubQuestConfigData;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.enums.QuestState;
+import emu.grasscutter.net.proto.QuestOuterClass.Quest;
+import emu.grasscutter.server.packet.send.PacketQuestProgressUpdateNotify;
+import emu.grasscutter.utils.Utils;
+
+@Entity
+public class GameQuest {
+	@Transient private GameMainQuest mainQuest;
+	@Transient private QuestConfig config;
+	
+	private int questId;
+	private int mainQuestId;
+	private QuestState state;
+	
+	private int startTime;
+	private int acceptTime;
+	private int finishTime;
+	
+	private int[] finishProgressList;
+	private int[] failProgressList;
+	
+	@Deprecated // Morphia only. Do not use.
+	public GameQuest() {}
+	
+	public GameQuest(GameMainQuest mainQuest, QuestConfig config) {
+		this.mainQuest = mainQuest;
+		this.questId = config.getId();
+		this.mainQuestId = config.getMainQuest().getId();
+		this.config = config;
+		this.acceptTime = Utils.getCurrentSeconds();
+		this.startTime = this.acceptTime;
+		this.state = QuestState.QUEST_STATE_UNFINISHED;
+		
+		if (config.getSubQuest().getFinishCond() != null) {
+			this.finishProgressList = new int[config.getSubQuest().getFinishCond().length];
+		}
+		
+		if (config.getSubQuest().getFailCond() != null) {
+			this.failProgressList = new int[config.getSubQuest().getFailCond().length];
+		}
+		
+		this.mainQuest.getChildQuests().put(this.questId, this);
+	}
+	
+	public GameMainQuest getMainQuest() {
+		return mainQuest;
+	}
+
+	public void setMainQuest(GameMainQuest mainQuest) {
+		this.mainQuest = mainQuest;
+	}
+	
+	public Player getOwner() {
+		return getMainQuest().getOwner();
+	}
+
+	public int getQuestId() {
+		return questId;
+	}
+
+	public int getMainQuestId() {
+		return mainQuestId;
+	}
+
+	public QuestConfig getConfig() {
+		return config;
+	}
+
+	public void setConfig(QuestConfig config) {
+		if (this.getQuestId() != config.getId()) return;
+		this.config = config;
+	}
+
+	public QuestState getState() {
+		return state;
+	}
+
+	public void setState(QuestState state) {
+		this.state = state;
+	}
+
+	public int getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(int startTime) {
+		this.startTime = startTime;
+	}
+
+	public int getAcceptTime() {
+		return acceptTime;
+	}
+
+	public void setAcceptTime(int acceptTime) {
+		this.acceptTime = acceptTime;
+	}
+
+	public int getFinishTime() {
+		return finishTime;
+	}
+
+	public void setFinishTime(int finishTime) {
+		this.finishTime = finishTime;
+	}
+	
+	public int[] getFinishProgressList() {
+		return finishProgressList;
+	}
+	
+	public void setFinishProgress(int index, int value) {
+		finishProgressList[index] = value;
+	}
+
+	public int[] getFailProgressList() {
+		return failProgressList;
+	}
+	
+	public void setFailProgress(int index, int value) {
+		failProgressList[index] = value;
+	}
+
+	public void finish() {
+		this.state = QuestState.QUEST_STATE_FINISHED;
+		this.finishTime = Utils.getCurrentSeconds();
+		
+		if (this.getFinishProgressList() != null) {
+			for (int i = 0 ; i < getFinishProgressList().length; i++) {
+				getFinishProgressList()[i] = 1;
+			}
+		}
+		
+		this.getOwner().getSession().send(new PacketQuestProgressUpdateNotify(this));
+		
+		// Finish main quest if all child quests are done
+		this.tryFinishMainQuest();
+		this.save();
+	}
+	
+	public boolean tryFinishMainQuest() {
+		try {
+			SubQuestConfigData subQuestData = getConfig().getMainQuest().getSubQuests()[getConfig().getMainQuest().getSubQuests().length - 1];
+			
+			if (subQuestData.getSubId() == this.getQuestId()) {
+				getMainQuest().finish();
+				return true;
+			}
+		} catch (Exception e) {
+			
+		}
+
+		return false;
+	}
+	
+	public void save() {
+		getMainQuest().save();
+	}
+	
+	public Quest toProto() {
+		Quest.Builder proto = Quest.newBuilder()
+				.setQuestId(this.getQuestId())
+				.setState(this.getState().getValue())
+				.setParentQuestId(this.getMainQuestId())
+				.setStartTime(this.getStartTime())
+				.setStartGameTime(438)
+				.setAcceptTime(this.getAcceptTime());
+		
+		if (this.getFinishProgressList() != null) {
+			for (int i : this.getFinishProgressList()) {
+				proto.addFinishProgressList(i);
+			}
+		}
+		
+		if (this.getFailProgressList() != null) {
+			for (int i : this.getFailProgressList()) {
+				proto.addFailProgressList(i);
+			}
+		}
+		
+		return proto.build();
+	}
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/QuestManager.java b/src/main/java/emu/grasscutter/game/quest/QuestManager.java
new file mode 100644
index 000000000..e1c26704c
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/QuestManager.java
@@ -0,0 +1,119 @@
+package emu.grasscutter.game.quest;
+
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.custom.QuestConfig;
+import emu.grasscutter.database.DatabaseHelper;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.enums.QuestState;
+import emu.grasscutter.server.packet.send.PacketFinishedParentQuestUpdateNotify;
+import emu.grasscutter.server.packet.send.PacketQuestListUpdateNotify;
+import emu.grasscutter.server.packet.send.PacketServerCondMeetQuestListUpdateNotify;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+
+public class QuestManager {
+	private final Player player;
+	private final Int2ObjectMap<GameMainQuest> quests;
+	
+	public QuestManager(Player player) {
+		this.player = player;
+		this.quests = new Int2ObjectOpenHashMap<>();
+	}
+
+	public Player getPlayer() {
+		return player;
+	}
+
+	public Int2ObjectMap<GameMainQuest> getQuests() {
+		return quests;
+	}
+	
+	public GameMainQuest getMainQuestById(int mainQuestId) {
+		return getQuests().get(mainQuestId);
+	}
+	
+	public GameQuest getQuestById(int questId) {
+		QuestConfig questConfig = GameData.getQuestConfigs().get(questId);
+		if (questConfig == null) {
+			return null;
+		}
+		
+		GameMainQuest mainQuest = getQuests().get(questConfig.getMainQuest().getId());
+		
+		if (mainQuest == null) {
+			return null;
+		}
+		
+		return mainQuest.getChildQuests().get(questId);
+	}
+	
+	public void forEachQuest(Consumer<GameQuest> callback) {
+		for (GameMainQuest mainQuest : getQuests().values()) {
+			for (GameQuest quest : mainQuest.getChildQuests().values()) {
+				callback.accept(quest);
+			}
+		}
+	}
+	
+	public GameMainQuest addMainQuest(QuestConfig questConfig) {
+		GameMainQuest mainQuest = new GameMainQuest(getPlayer(), questConfig.getMainQuest().getId());
+		getQuests().put(mainQuest.getParentQuestId(), mainQuest);
+
+		getPlayer().sendPacket(new PacketFinishedParentQuestUpdateNotify(mainQuest));
+		
+		return mainQuest;
+	}
+	
+	public GameQuest addQuest(int questId) {
+		QuestConfig questConfig = GameData.getQuestConfigs().get(questId);
+		if (questConfig == null) {
+			return null;
+		}
+		
+		// Main quest
+		GameMainQuest mainQuest = this.getMainQuestById(questConfig.getMainQuest().getId());
+		
+		// Create main quest if it doesnt exist
+		if (mainQuest == null) {
+			mainQuest = addMainQuest(questConfig);
+		}
+		
+		// Sub quest
+		GameQuest quest = mainQuest.getChildQuestById(questId);
+		
+		if (quest != null) {
+			return null;
+		}
+
+		// Create
+		quest = new GameQuest(mainQuest, questConfig);
+
+		// Save main quest
+		mainQuest.save();
+
+		// Send packet
+		getPlayer().sendPacket(new PacketServerCondMeetQuestListUpdateNotify(quest));
+		getPlayer().sendPacket(new PacketQuestListUpdateNotify(quest));
+
+		return quest;
+	}
+
+	public void loadFromDatabase() {
+		List<GameMainQuest> quests = DatabaseHelper.getAllQuests(getPlayer());
+		
+		for (GameMainQuest mainQuest : quests) {
+			mainQuest.setOwner(this.getPlayer());
+			
+			for (GameQuest quest : mainQuest.getChildQuests().values()) {
+				quest.setMainQuest(mainQuest);
+				quest.setConfig(GameData.getQuestConfigs().get(quest.getQuestId()));
+			}
+			
+			this.getQuests().put(mainQuest.getParentQuestId(), mainQuest);
+		}
+	}
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/LogicType.java b/src/main/java/emu/grasscutter/game/quest/enums/LogicType.java
new file mode 100644
index 000000000..608ec9c28
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/enums/LogicType.java
@@ -0,0 +1,23 @@
+package emu.grasscutter.game.quest.enums;
+
+public enum LogicType {
+	LOGIC_NONE (0),
+	LOGIC_AND (1),
+	LOGIC_OR (2),
+	LOGIC_NOT (3),
+	LOGIC_A_AND_ETCOR (4),
+	LOGIC_A_AND_B_AND_ETCOR (5),
+	LOGIC_A_OR_ETCAND (6),
+	LOGIC_A_OR_B_OR_ETCAND (7),
+	LOGIC_A_AND_B_OR_ETCAND (8);
+	
+	private final int value;
+	
+	LogicType(int id) {
+		this.value = id;
+	}
+
+	public int getValue() {
+		return value;
+	}
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/ParentQuestState.java b/src/main/java/emu/grasscutter/game/quest/enums/ParentQuestState.java
new file mode 100644
index 000000000..6c7805f8d
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/enums/ParentQuestState.java
@@ -0,0 +1,18 @@
+package emu.grasscutter.game.quest.enums;
+
+public enum ParentQuestState {
+	PARENT_QUEST_STATE_NONE (0),
+	PARENT_QUEST_STATE_FINISHED (1),
+	PARENT_QUEST_STATE_FAILED (2),
+	PARENT_QUEST_STATE_CANCELED (3);
+	
+	private final int value;
+	
+	ParentQuestState(int id) {
+		this.value = id;
+	}
+
+	public int getValue() {
+		return value;
+	}
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/QuestCondType.java b/src/main/java/emu/grasscutter/game/quest/enums/QuestCondType.java
new file mode 100644
index 000000000..42db14f2d
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/enums/QuestCondType.java
@@ -0,0 +1,92 @@
+package emu.grasscutter.game.quest.enums;
+
+public enum QuestCondType {
+	QUEST_COND_NONE (0),
+	QUEST_COND_STATE_EQUAL (1),
+	QUEST_COND_STATE_NOT_EQUAL (2),
+	QUEST_COND_PACK_HAVE_ITEM (3),
+	QUEST_COND_AVATAR_ELEMENT_EQUAL (4),
+	QUEST_COND_AVATAR_ELEMENT_NOT_EQUAL (5),
+	QUEST_COND_AVATAR_CAN_CHANGE_ELEMENT (6),
+	QUEST_COND_CITY_LEVEL_EQUAL_GREATER (7),
+	QUEST_COND_ITEM_NUM_LESS_THAN (8),
+	QUEST_COND_DAILY_TASK_START (9),
+	QUEST_COND_OPEN_STATE_EQUAL (10),
+	QUEST_COND_DAILY_TASK_OPEN (11),
+	QUEST_COND_DAILY_TASK_REWARD_CAN_GET (12),
+	QUEST_COND_DAILY_TASK_REWARD_RECEIVED (13),
+	QUEST_COND_PLAYER_LEVEL_REWARD_CAN_GET (14),
+	QUEST_COND_EXPLORATION_REWARD_CAN_GET (15),
+	QUEST_COND_IS_WORLD_OWNER (16),
+	QUEST_COND_PLAYER_LEVEL_EQUAL_GREATER (17),
+	QUEST_COND_SCENE_AREA_UNLOCKED (18),
+	QUEST_COND_ITEM_GIVING_ACTIVED (19),
+	QUEST_COND_ITEM_GIVING_FINISHED (20),
+	QUEST_COND_IS_DAYTIME (21),
+	QUEST_COND_CURRENT_AVATAR (22),
+	QUEST_COND_CURRENT_AREA (23),
+	QUEST_COND_QUEST_VAR_EQUAL (24),
+	QUEST_COND_QUEST_VAR_GREATER (25),
+	QUEST_COND_QUEST_VAR_LESS (26),
+	QUEST_COND_FORGE_HAVE_FINISH (27),
+	QUEST_COND_DAILY_TASK_IN_PROGRESS (28),
+	QUEST_COND_DAILY_TASK_FINISHED (29),
+	QUEST_COND_ACTIVITY_COND (30),
+	QUEST_COND_ACTIVITY_OPEN (31),
+	QUEST_COND_DAILY_TASK_VAR_GT (32),
+	QUEST_COND_DAILY_TASK_VAR_EQ (33),
+	QUEST_COND_DAILY_TASK_VAR_LT (34),
+	QUEST_COND_BARGAIN_ITEM_GT (35),
+	QUEST_COND_BARGAIN_ITEM_EQ (36),
+	QUEST_COND_BARGAIN_ITEM_LT (37),
+	QUEST_COND_COMPLETE_TALK (38),
+	QUEST_COND_NOT_HAVE_BLOSSOM_TALK (39),
+	QUEST_COND_IS_CUR_BLOSSOM_TALK (40),
+	QUEST_COND_QUEST_NOT_RECEIVE (41),
+	QUEST_COND_QUEST_SERVER_COND_VALID (42),
+	QUEST_COND_ACTIVITY_CLIENT_COND (43),
+	QUEST_COND_QUEST_GLOBAL_VAR_EQUAL (44),
+	QUEST_COND_QUEST_GLOBAL_VAR_GREATER (45),
+	QUEST_COND_QUEST_GLOBAL_VAR_LESS (46),
+	QUEST_COND_PERSONAL_LINE_UNLOCK (47),
+	QUEST_COND_CITY_REPUTATION_REQUEST (48),
+	QUEST_COND_MAIN_COOP_START (49),
+	QUEST_COND_MAIN_COOP_ENTER_SAVE_POINT (50),
+	QUEST_COND_CITY_REPUTATION_LEVEL (51),
+	QUEST_COND_CITY_REPUTATION_UNLOCK (52),
+	QUEST_COND_LUA_NOTIFY (53),
+	QUEST_COND_CUR_CLIMATE (54),
+	QUEST_COND_ACTIVITY_END (55),
+	QUEST_COND_COOP_POINT_RUNNING (56),
+	QUEST_COND_GADGET_TALK_STATE_EQUAL (57),
+	QUEST_COND_AVATAR_FETTER_GT (58),
+	QUEST_COND_AVATAR_FETTER_EQ (59),
+	QUEST_COND_AVATAR_FETTER_LT (60),
+	QUEST_COND_NEW_HOMEWORLD_MOUDLE_UNLOCK (61),
+	QUEST_COND_NEW_HOMEWORLD_LEVEL_REWARD (62),
+	QUEST_COND_NEW_HOMEWORLD_MAKE_FINISH (63),
+	QUEST_COND_HOMEWORLD_NPC_EVENT (64),
+	QUEST_COND_TIME_VAR_GT_EQ (65),
+	QUEST_COND_TIME_VAR_PASS_DAY (66),
+	QUEST_COND_HOMEWORLD_NPC_NEW_TALK (67),
+	QUEST_COND_PLAYER_CHOOSE_MALE (68),
+	QUEST_COND_HISTORY_GOT_ANY_ITEM (69),
+	QUEST_COND_LEARNED_RECIPE (70),
+	QUEST_COND_LUNARITE_REGION_UNLOCKED (71),
+	QUEST_COND_LUNARITE_HAS_REGION_HINT_COUNT (72),
+	QUEST_COND_LUNARITE_COLLECT_FINISH (73),
+	QUEST_COND_LUNARITE_MARK_ALL_FINISH (74),
+	QUEST_COND_NEW_HOMEWORLD_SHOP_ITEM (75),
+	QUEST_COND_SCENE_POINT_UNLOCK (76),
+	QUEST_COND_SCENE_LEVEL_TAG_EQ (77);
+	
+	private final int value;
+	
+	QuestCondType(int id) {
+		this.value = id;
+	}
+
+	public int getValue() {
+		return value;
+	}
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/QuestExecType.java b/src/main/java/emu/grasscutter/game/quest/enums/QuestExecType.java
new file mode 100644
index 000000000..4f3c2557c
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/enums/QuestExecType.java
@@ -0,0 +1,82 @@
+package emu.grasscutter.game.quest.enums;
+
+public enum QuestExecType {
+	QUEST_EXEC_NONE (0),
+	QUEST_EXEC_DEL_PACK_ITEM (1),
+	QUEST_EXEC_UNLOCK_POINT (2),
+	QUEST_EXEC_UNLOCK_AREA (3),
+	QUEST_EXEC_UNLOCK_FORCE (4),
+	QUEST_EXEC_LOCK_FORCE (5),
+	QUEST_EXEC_CHANGE_AVATAR_ELEMET (6),
+	QUEST_EXEC_REFRESH_GROUP_MONSTER (7),
+	QUEST_EXEC_SET_IS_FLYABLE (8),
+	QUEST_EXEC_SET_IS_WEATHER_LOCKED (9),
+	QUEST_EXEC_SET_IS_GAME_TIME_LOCKED (10),
+	QUEST_EXEC_SET_IS_TRANSFERABLE (11),
+	QUEST_EXEC_GRANT_TRIAL_AVATAR (12),
+	QUEST_EXEC_OPEN_BORED (13),
+	QUEST_EXEC_ROLLBACK_QUEST (14),
+	QUEST_EXEC_NOTIFY_GROUP_LUA (15),
+	QUEST_EXEC_SET_OPEN_STATE (16),
+	QUEST_EXEC_LOCK_POINT (17),
+	QUEST_EXEC_DEL_PACK_ITEM_BATCH (18),
+	QUEST_EXEC_REFRESH_GROUP_SUITE (19),
+	QUEST_EXEC_REMOVE_TRIAL_AVATAR (20),
+	QUEST_EXEC_SET_GAME_TIME (21),
+	QUEST_EXEC_SET_WEATHER_GADGET (22),
+	QUEST_EXEC_ADD_QUEST_PROGRESS (23),
+	QUEST_EXEC_NOTIFY_DAILY_TASK (24),
+	QUEST_EXEC_CREATE_PATTERN_GROUP (25),
+	QUEST_EXEC_REMOVE_PATTERN_GROUP (26),
+	QUEST_EXEC_REFRESH_GROUP_SUITE_RANDOM (27),
+	QUEST_EXEC_ACTIVE_ITEM_GIVING (28),
+	QUEST_EXEC_DEL_ALL_SPECIFIC_PACK_ITEM (29),
+	QUEST_EXEC_ROLLBACK_PARENT_QUEST (30),
+	QUEST_EXEC_LOCK_AVATAR_TEAM (31),
+	QUEST_EXEC_UNLOCK_AVATAR_TEAM (32),
+	QUEST_EXEC_UPDATE_PARENT_QUEST_REWARD_INDEX (33),
+	QUEST_EXEC_SET_DAILY_TASK_VAR (34),
+	QUEST_EXEC_INC_DAILY_TASK_VAR (35),
+	QUEST_EXEC_DEC_DAILY_TASK_VAR (36),
+	QUEST_EXEC_ACTIVE_ACTIVITY_COND_STATE (37),
+	QUEST_EXEC_INACTIVE_ACTIVITY_COND_STATE (38),
+	QUEST_EXEC_ADD_CUR_AVATAR_ENERGY (39),
+	QUEST_EXEC_START_BARGAIN (41),
+	QUEST_EXEC_STOP_BARGAIN (42),
+	QUEST_EXEC_SET_QUEST_GLOBAL_VAR (43),
+	QUEST_EXEC_INC_QUEST_GLOBAL_VAR (44),
+	QUEST_EXEC_DEC_QUEST_GLOBAL_VAR (45),
+	QUEST_EXEC_REGISTER_DYNAMIC_GROUP (46),
+	QUEST_EXEC_UNREGISTER_DYNAMIC_GROUP (47),
+	QUEST_EXEC_SET_QUEST_VAR (48),
+	QUEST_EXEC_INC_QUEST_VAR (49),
+	QUEST_EXEC_DEC_QUEST_VAR (50),
+	QUEST_EXEC_RANDOM_QUEST_VAR (51),
+	QUEST_EXEC_ACTIVATE_SCANNING_PIC (52),
+	QUEST_EXEC_RELOAD_SCENE_TAG (53),
+	QUEST_EXEC_REGISTER_DYNAMIC_GROUP_ONLY (54),
+	QUEST_EXEC_CHANGE_SKILL_DEPOT (55),
+	QUEST_EXEC_ADD_SCENE_TAG (56),
+	QUEST_EXEC_DEL_SCENE_TAG (57),
+	QUEST_EXEC_INIT_TIME_VAR (58),
+	QUEST_EXEC_CLEAR_TIME_VAR (59),
+	QUEST_EXEC_MODIFY_CLIMATE_AREA (60),
+	QUEST_EXEC_GRANT_TRIAL_AVATAR_AND_LOCK_TEAM (61),
+	QUEST_EXEC_CHANGE_MAP_AREA_STATE (62),
+	QUEST_EXEC_DEACTIVE_ITEM_GIVING (63),
+	QUEST_EXEC_CHANGE_SCENE_LEVEL_TAG (64),
+	QUEST_EXEC_UNLOCK_PLAYER_WORLD_SCENE (65),
+	QUEST_EXEC_LOCK_PLAYER_WORLD_SCENE (66),
+	QUEST_EXEC_FAIL_MAINCOOP (67),
+	QUEST_EXEC_MODIFY_WEATHER_AREA (68);
+	
+	private final int value;
+	
+	QuestExecType(int id) {
+		this.value = id;
+	}
+
+	public int getValue() {
+		return value;
+	}
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/QuestGuideType.java b/src/main/java/emu/grasscutter/game/quest/enums/QuestGuideType.java
new file mode 100644
index 000000000..45915c6b7
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/enums/QuestGuideType.java
@@ -0,0 +1,17 @@
+package emu.grasscutter.game.quest.enums;
+
+public enum QuestGuideType {
+	QUEST_GUIDE_NONE (0),
+	QUEST_GUIDE_LOCATION (1),
+	QUEST_GUIDE_NPC (2);
+	
+	private final int value;
+	
+	QuestGuideType(int id) {
+		this.value = id;
+	}
+
+	public int getValue() {
+		return value;
+	}
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/QuestShowType.java b/src/main/java/emu/grasscutter/game/quest/enums/QuestShowType.java
new file mode 100644
index 000000000..014c1ee06
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/enums/QuestShowType.java
@@ -0,0 +1,16 @@
+package emu.grasscutter.game.quest.enums;
+
+public enum QuestShowType {
+	QUEST_SHOW (0),
+	QUEST_HIDDEN (1);
+	
+	private final int value;
+	
+	QuestShowType(int id) {
+		this.value = id;
+	}
+
+	public int getValue() {
+		return value;
+	}
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/QuestState.java b/src/main/java/emu/grasscutter/game/quest/enums/QuestState.java
new file mode 100644
index 000000000..d258a2582
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/enums/QuestState.java
@@ -0,0 +1,19 @@
+package emu.grasscutter.game.quest.enums;
+
+public enum QuestState {
+	QUEST_STATE_NONE (0),
+	QUEST_STATE_UNSTARTED (1),
+	QUEST_STATE_UNFINISHED (2),
+	QUEST_STATE_FINISHED (3),
+	QUEST_STATE_FAILED (4);
+	
+	private final int value;
+	
+	QuestState(int id) {
+		this.value = id;
+	}
+
+	public int getValue() {
+		return value;
+	}
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/QuestType.java b/src/main/java/emu/grasscutter/game/quest/enums/QuestType.java
new file mode 100644
index 000000000..fbbac2ae0
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/enums/QuestType.java
@@ -0,0 +1,22 @@
+package emu.grasscutter.game.quest.enums;
+
+public enum QuestType {
+	AQ (0),
+	FQ (1),
+	LQ (2),
+	EQ (3),
+	DQ (4),
+	IQ (5),
+	VQ (6),
+	WQ (7);
+	
+	private final int value;
+	
+	QuestType(int id) {
+		this.value = id;
+	}
+
+	public int getValue() {
+		return value;
+	}
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/ShowQuestGuideType.java b/src/main/java/emu/grasscutter/game/quest/enums/ShowQuestGuideType.java
new file mode 100644
index 000000000..d4e985592
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/enums/ShowQuestGuideType.java
@@ -0,0 +1,17 @@
+package emu.grasscutter.game.quest.enums;
+
+public enum ShowQuestGuideType {
+	QUEST_GUIDE_ITEM_ENABLE (0),
+	QUEST_GUIDE_ITEM_DISABLE (1),
+	QUEST_GUIDE_ITEM_MOVE_HIDE (2);
+	
+	private final int value;
+	
+	ShowQuestGuideType(int id) {
+		this.value = id;
+	}
+
+	public int getValue() {
+		return value;
+	}
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestNotify.java
new file mode 100644
index 000000000..7d64da48f
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestNotify.java
@@ -0,0 +1,22 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.GameMainQuest;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.FinishedParentQuestNotifyOuterClass.FinishedParentQuestNotify;
+
+public class PacketFinishedParentQuestNotify extends BasePacket {
+	
+	public PacketFinishedParentQuestNotify(Player player) {
+		super(PacketOpcodes.FinishedParentQuestNotify, true);
+
+		FinishedParentQuestNotify.Builder proto = FinishedParentQuestNotify.newBuilder();
+		
+		for (GameMainQuest mainQuest : player.getQuestManager().getQuests().values()) {
+			proto.addParentQuestList(mainQuest.toProto());
+		}
+		
+		this.setData(proto);
+	}
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestUpdateNotify.java
new file mode 100644
index 000000000..68eab7222
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketFinishedParentQuestUpdateNotify.java
@@ -0,0 +1,19 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.quest.GameMainQuest;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.FinishedParentQuestUpdateNotifyOuterClass.FinishedParentQuestUpdateNotify;
+
+public class PacketFinishedParentQuestUpdateNotify extends BasePacket {
+	
+	public PacketFinishedParentQuestUpdateNotify(GameMainQuest quest) {
+		super(PacketOpcodes.FinishedParentQuestUpdateNotify);
+		
+		FinishedParentQuestUpdateNotify proto = FinishedParentQuestUpdateNotify.newBuilder()
+				.addParentQuestList(quest.toProto())
+				.build();
+		
+		this.setData(proto);
+	}
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestListNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestListNotify.java
new file mode 100644
index 000000000..ccf0d765a
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestListNotify.java
@@ -0,0 +1,23 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.GameMainQuest;
+import emu.grasscutter.game.quest.QuestManager;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.QuestListNotifyOuterClass.QuestListNotify;
+
+public class PacketQuestListNotify extends BasePacket {
+	
+	public PacketQuestListNotify(Player player) {
+		super(PacketOpcodes.QuestListNotify, true);
+
+		QuestListNotify.Builder proto = QuestListNotify.newBuilder();
+		
+		player.getQuestManager().forEachQuest(quest -> {
+			proto.addQuestList(quest.toProto());
+		});
+		
+		this.setData(proto);
+	}
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestListUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestListUpdateNotify.java
new file mode 100644
index 000000000..adc0767a8
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestListUpdateNotify.java
@@ -0,0 +1,20 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.quest.GameMainQuest;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.QuestListUpdateNotifyOuterClass.QuestListUpdateNotify;
+
+public class PacketQuestListUpdateNotify extends BasePacket {
+	
+	public PacketQuestListUpdateNotify(GameQuest quest) {
+		super(PacketOpcodes.QuestListUpdateNotify);
+
+		QuestListUpdateNotify proto = QuestListUpdateNotify.newBuilder()
+				.addQuestList(quest.toProto())
+				.build();
+		
+		this.setData(proto);
+	}
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketQuestProgressUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestProgressUpdateNotify.java
new file mode 100644
index 000000000..76ee56316
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketQuestProgressUpdateNotify.java
@@ -0,0 +1,30 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.quest.GameMainQuest;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.QuestProgressUpdateNotifyOuterClass.QuestProgressUpdateNotify;
+
+public class PacketQuestProgressUpdateNotify extends BasePacket {
+	
+	public PacketQuestProgressUpdateNotify(GameQuest quest) {
+		super(PacketOpcodes.QuestProgressUpdateNotify);
+		
+		QuestProgressUpdateNotify.Builder proto = QuestProgressUpdateNotify.newBuilder().setQuestId(quest.getQuestId());
+		
+		if (quest.getFinishProgressList() != null) {
+			for (int i : quest.getFinishProgressList()) {
+				proto.addFinishProgressList(i);
+			}
+		}
+		
+		if (quest.getFailProgressList() != null) {
+			for (int i : quest.getFailProgressList()) {
+				proto.addFailProgressList(i);
+			}
+		}
+		
+		this.setData(proto);
+	}
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketServerCondMeetQuestListUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketServerCondMeetQuestListUpdateNotify.java
new file mode 100644
index 000000000..b2ea3d577
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketServerCondMeetQuestListUpdateNotify.java
@@ -0,0 +1,37 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.custom.QuestConfig;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.GameMainQuest;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.ServerCondMeetQuestListUpdateNotifyOuterClass.ServerCondMeetQuestListUpdateNotify;
+
+public class PacketServerCondMeetQuestListUpdateNotify extends BasePacket {
+	
+	public PacketServerCondMeetQuestListUpdateNotify(Player player) {
+		super(PacketOpcodes.ServerCondMeetQuestListUpdateNotify);
+
+		ServerCondMeetQuestListUpdateNotify.Builder proto = ServerCondMeetQuestListUpdateNotify.newBuilder();
+		
+		player.getQuestManager().forEachQuest(quest -> {
+			if (quest.getState().getValue() <= 2) {
+				proto.addAddQuestIdList(quest.getQuestId());
+			}
+		});
+		
+		this.setData(proto);
+	}
+	
+	public PacketServerCondMeetQuestListUpdateNotify(GameQuest quest) {
+		super(PacketOpcodes.ServerCondMeetQuestListUpdateNotify);
+
+		ServerCondMeetQuestListUpdateNotify proto = ServerCondMeetQuestListUpdateNotify.newBuilder()
+				.addAddQuestIdList(quest.getQuestId())
+				.build();
+		
+		this.setData(proto);
+	}
+}
diff --git a/src/main/resources/languages/en-US.json b/src/main/resources/languages/en-US.json
index 893f490af..107a12d71 100644
--- a/src/main/resources/languages/en-US.json
+++ b/src/main/resources/languages/en-US.json
@@ -210,6 +210,14 @@
       "success": "Coordinates: %s, %s, %s\nScene id: %s",
       "description": "Get coordinates."
     },
+    "quest": {
+      "description": "Add or finish quests",
+      "usage": "quest <add|finish> [quest id]",
+      "added": "Quest %s added",
+      "finished": "Finished quest %s",
+      "not_found": "Quest not found",
+      "invalid_id": "Invalid quest id"
+    },
     "reload": {
       "reload_start": "Reloading config.",
       "reload_done": "Reload complete.",

From dfd8fcb250a5c456dc79affbeab1e3442300788a Mon Sep 17 00:00:00 2001
From: Melledy <52122272+Melledy@users.noreply.github.com>
Date: Wed, 11 May 2022 04:01:38 -0700
Subject: [PATCH 02/59] Fix build error from merge

---
 src/main/java/emu/grasscutter/data/ResourceLoader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/emu/grasscutter/data/ResourceLoader.java b/src/main/java/emu/grasscutter/data/ResourceLoader.java
index 92fda7bb1..5c2ac1ee6 100644
--- a/src/main/java/emu/grasscutter/data/ResourceLoader.java
+++ b/src/main/java/emu/grasscutter/data/ResourceLoader.java
@@ -400,7 +400,7 @@ public class ResourceLoader {
 	}
 	
 	private static void loadQuests() {
-		File folder = new File(Grasscutter.getConfig().RESOURCE_FOLDER + "BinOutput/Quest/");
+		File folder = new File(RESOURCE("BinOutput/Quest/"));
 		
 		if (!folder.exists()) {
 			return;

From 9ed1bb9b940d98cbba73528bc3e0ea02dcafedd0 Mon Sep 17 00:00:00 2001
From: Secretboy-SMR <secretboy.smr@icloud.com>
Date: Wed, 11 May 2022 21:14:07 +0800
Subject: [PATCH 03/59] It will use the english as default rather than tell you
 the value is not exist if there's no translation for currently language

---
 src/main/java/emu/grasscutter/utils/Language.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/emu/grasscutter/utils/Language.java b/src/main/java/emu/grasscutter/utils/Language.java
index 3789f594a..c343e949e 100644
--- a/src/main/java/emu/grasscutter/utils/Language.java
+++ b/src/main/java/emu/grasscutter/utils/Language.java
@@ -160,7 +160,9 @@ public final class Language {
         JsonObject object = this.languageData;
 
         int index = 0;
-        String result = "This value does not exist. Please report this to the Discord: " + key;
+        String valueNotFoundPattern = "This value does not exist. Please report this to the Discord: ";
+        String result = valueNotFoundPattern + key;
+        boolean isValueFound = false;
 
         while (true) {
             if(index == keys.length) break;
@@ -171,10 +173,18 @@ public final class Language {
                 if(element.isJsonObject())
                     object = element.getAsJsonObject();
                 else {
+                    isValueFound = true;
                     result = element.getAsString(); break;
                 }
             } else break;
         }
+
+        if (!isValueFound && !languageCode.equals("en-US")) {
+            var englishValue = Grasscutter.getLanguage("en-US").get(key);
+            if (!englishValue.contains(valueNotFoundPattern)) {
+                result += "\nhere is english version:\n" + englishValue;
+            }
+        }
         
         this.cachedTranslations.put(key, result); return result;
     }

From c932f9c7e5389868c958456f2cdb33ddf3d6382b Mon Sep 17 00:00:00 2001
From: Benjamin Elsdon <benjamin7006@gmail.com>
Date: Wed, 11 May 2022 20:35:27 +0800
Subject: [PATCH 04/59] Add verifyUser to AuthenticationHandler

---
 .../dispatch/authentication/AuthenticationHandler.java     | 7 +++++++
 .../authentication/DefaultAuthenticationHandler.java       | 6 ++++++
 src/main/resources/languages/en-US.json                    | 3 +++
 3 files changed, 16 insertions(+)

diff --git a/src/main/java/emu/grasscutter/server/dispatch/authentication/AuthenticationHandler.java b/src/main/java/emu/grasscutter/server/dispatch/authentication/AuthenticationHandler.java
index 92a2961ea..e644a9f1d 100644
--- a/src/main/java/emu/grasscutter/server/dispatch/authentication/AuthenticationHandler.java
+++ b/src/main/java/emu/grasscutter/server/dispatch/authentication/AuthenticationHandler.java
@@ -12,5 +12,12 @@ public interface AuthenticationHandler {
     void handleRegister(Request req, Response res);
     void handleChangePassword(Request req, Response res);
 
+    /**
+     * Other plugins may need to verify a user's identity using details from handleLogin()
+     * @param details The user's unique one-time token that needs to be verified
+     * @return If the verification was successful
+     */
+    boolean verifyUser(String details);
+
     LoginResultJson handleGameLogin(Request req, LoginAccountRequestJson requestData);
 }
diff --git a/src/main/java/emu/grasscutter/server/dispatch/authentication/DefaultAuthenticationHandler.java b/src/main/java/emu/grasscutter/server/dispatch/authentication/DefaultAuthenticationHandler.java
index 67b3d4023..122e04ff6 100644
--- a/src/main/java/emu/grasscutter/server/dispatch/authentication/DefaultAuthenticationHandler.java
+++ b/src/main/java/emu/grasscutter/server/dispatch/authentication/DefaultAuthenticationHandler.java
@@ -28,6 +28,12 @@ public class DefaultAuthenticationHandler implements AuthenticationHandler {
         res.send("Authentication is not available with the default authentication method");
     }
 
+    @Override
+    public boolean verifyUser(String details) {
+        Grasscutter.getLogger().info(translate("dispatch.authentication.default_unable_to_verify"));
+        return false;
+    }
+
     @Override
     public LoginResultJson handleGameLogin(Request req, LoginAccountRequestJson requestData) {
         LoginResultJson responseData = new LoginResultJson();
diff --git a/src/main/resources/languages/en-US.json b/src/main/resources/languages/en-US.json
index c9c3c0c70..2b392b682 100644
--- a/src/main/resources/languages/en-US.json
+++ b/src/main/resources/languages/en-US.json
@@ -16,6 +16,9 @@
         "no_keystore_error": "[Dispatch] No SSL cert found! Falling back to HTTP server.",
         "default_password": "[Dispatch] The default keystore password was loaded successfully. Please consider setting the password to 123456 in config.json."
       },
+      "authentication": {
+        "default_unable_to_verify": "[Authentication] Something called the verifyUser method which is unavailable in the default authentication handler"
+      },
       "no_commands_error": "Commands are not supported in dispatch only mode.",
       "unhandled_request_error": "[Dispatch] Potential unhandled %s request: %s",
       "account": {

From 99de46e2618a23b9012184a5c431e0caf964946a Mon Sep 17 00:00:00 2001
From: tester233 <105267106+tester233@users.noreply.github.com>
Date: Wed, 11 May 2022 18:25:01 +0800
Subject: [PATCH 05/59] Improve text & remove extra punctuation

---
 src/main/resources/languages/zh-CN.json | 100 ++++++++++++------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json
index 2f9663f4f..01572a20b 100644
--- a/src/main/resources/languages/zh-CN.json
+++ b/src/main/resources/languages/zh-CN.json
@@ -55,7 +55,7 @@
       "permission_error": "哼哼哼！你没有执行此命令的权限！请联系服务器管理员解决！",
       "console_execute_error": "此命令只能在服务器控制台执行呐~",
       "player_execute_error": "此命令只能在游戏内执行哦~",
-      "command_exist_error": "这条命令……好像找不到呢？。",
+      "command_exist_error": "这条命令...好像找不到呢？",
       "no_description_specified": "没有指定说明",
       "invalid": {
         "amount": "无效的数量。",
@@ -97,19 +97,19 @@
       "delete": "账号已删除。",
       "no_account": "账号不存在。",
       "command_usage": "用法：account <create|delete> <用户名> [uid]",
-      "description": "创建或删除账号。"
+      "description": "创建或删除账号"
     },
     "broadcast": {
       "command_usage": "用法：broadcast <消息>",
       "message_sent": "公告已发送。",
-      "description": "向所有玩家发送公告。"
+      "description": "向所有玩家发送公告"
     },
     "changescene": {
       "usage": "用法：changescene <场景ID>",
       "already_in_scene": "你已经在这个场景中了。",
       "success": "已切换至场景 %s。",
       "exists_error": "此场景不存在。",
-      "description": "切换指定场景。"
+      "description": "切换指定场景"
     },
     "clear": {
       "command_usage": "用法：clear <all|wp|art|mat>\nall: 所有, wp: 武器, art: 圣遗物, mat: 材料",
@@ -120,32 +120,32 @@
       "displays": "已清空 %s 的屏幕。",
       "virtuals": "已清除 %s 的所有货币和经验值。",
       "everything": "已清除 %s 的所有物品。",
-      "description": "从你的背包中删除所有未装备且已解锁的物品，包括稀有物品。"
+      "description": "从你的背包中删除所有未装备且已解锁的物品，包括稀有物品"
     },
     "coop": {
       "usage": "用法：coop <玩家ID> <目标玩家ID>",
-      "success": "已强制传送 %s 到 %s 的世界",
-      "description": "强制传送指定用户到他人的世界。"
+      "success": "已强制传送 %s 到 %s 的世界。",
+      "description": "强制传送指定用户到他人的世界"
     },
     "enter_dungeon": {
       "usage": "用法：enterdungeon <秘境ID>",
-      "changed": "已进入秘境 %s",
+      "changed": "已进入秘境 %s。",
       "not_found_error": "此秘境不存在。",
       "in_dungeon_error": "你已经在秘境中了。",
-      "description": "进入指定秘境。"
+      "description": "进入指定秘境"
     },
     "giveAll": {
       "usage": "用法：giveall [玩家] [数量]",
       "started": "正在给予全部物品...",
       "success": "已给予 %s 全部物品。",
       "invalid_amount_or_playerId": "无效的数量/玩家ID。",
-      "description": "给予所有物品。"
+      "description": "给予所有物品"
     },
     "giveArtifact": {
       "usage": "用法：giveart|gart [玩家] <圣遗物ID> <主词条ID> [<副词条ID>[,<强化次数>]]... [等级]",
       "id_error": "无效的圣遗物ID。",
       "success": "已将 %s 给予 %s。",
-      "description": "给予指定圣遗物。"
+      "description": "给予指定圣遗物"
     },
     "giveChar": {
       "usage": "用法：givechar <玩家> <角色ID|角色名> [数量]",
@@ -153,50 +153,50 @@
       "invalid_avatar_id": "无效的角色ID。",
       "invalid_avatar_level": "无效的角色等级。",
       "invalid_avatar_or_player_id": "无效的角色ID/玩家ID。",
-      "description": "给予指定角色。"
+      "description": "给予指定角色"
     },
     "give": {
       "usage": "用法：give <玩家> <物品ID|物品名> [数量] [等级] [精炼等级]",
       "refinement_only_applicable_weapons": "只有武器可以设置精炼等级。",
       "refinement_must_between_1_and_5": "精炼等级必须在 1 到 5 之间。",
       "given": "已将 %s 个 %s 给予 %s。",
-      "given_with_level_and_refinement": "已将 %s (等级 %s, 精炼 %s) %s 个给予 %s",
-      "given_level": "已将 %s (等级 %s) %s 个给予 %s",
-      "description": "给予指定物品。"
+      "given_with_level_and_refinement": "已将 %s (等级 %s, 精炼 %s) %s 个给予 %s。",
+      "given_level": "已将 %s (等级 %s) %s 个给予 %s。",
+      "description": "给予指定物品"
     },
     "godmode": {
-      "success": "%s 的无敌模式已被设置为 %s。",
-      "description": "防止你受到伤害。"
+      "success": "%s 的上帝模式已被设置为 %s。",
+      "description": "防止你受到伤害"
     },
     "heal": {
       "success": "已经治疗所有角色。",
-      "description": "治疗当前队伍的角色。"
+      "description": "治疗当前队伍的角色"
     },
     "kick": {
-      "player_kick_player": "玩家 [%s:%s] 已将 [%s:%s] 踢出",
-      "server_kick_player": "正在踢出玩家 [%s:%s]",
-      "description": "从服务器内踢出指定玩家。"
+      "player_kick_player": "玩家 [%s:%s] 已将 [%s:%s] 踢出。",
+      "server_kick_player": "正在踢出玩家 [%s:%s]...",
+      "description": "从服务器内踢出指定玩家"
     },
     "kill": {
       "usage": "用法：killall [玩家UID] [场景ID]",
-      "scene_not_found_in_player_world": "未在玩家世界中找到此场景",
+      "scene_not_found_in_player_world": "未在玩家世界中找到此场景。",
       "kill_monsters_in_scene": "已杀死场景 %s 中的 %s 个怪物。",
-      "description": "杀死所有怪物。"
+      "description": "杀死所有怪物"
     },
     "killCharacter": {
       "usage": "用法：/killcharacter [玩家ID]",
       "success": "已杀死 %s 当前角色。",
-      "description": "杀死当前角色。"
+      "description": "杀死当前角色"
     },
     "language": {
       "current_language": "当前语言是: %s",
       "language_changed": "语言切换至: %s",
       "language_not_found": "目前服务端没有这种语言: %s",
-      "description": "显示或切换当前语言。"
+      "description": "显示或切换当前语言"
     },
     "list": {
       "success": "目前在线人数：%s",
-      "description": "查看所有玩家。"
+      "description": "查看所有玩家"
     },
     "permission": {
       "usage": "用法：permission <add|remove> <用户名> <权限>",
@@ -205,25 +205,25 @@
       "remove": "权限已移除。",
       "not_have_error": "此玩家未拥有权限！",
       "account_error": "账号不存在。",
-      "description": "添加或移除指定玩家的权限。"
+      "description": "添加或移除指定玩家的权限"
     },
     "position": {
       "success": "坐标：%s, %s, %s\n场景ID：%s",
-      "description": "获取所在位置。"
+      "description": "获取所在位置"
     },
     "reload": {
       "reload_start": "正在重载配置文件和数据。",
       "reload_done": "重载完成。",
-      "description": "重载配置文件和数据。"
+      "description": "重载配置文件和数据"
     },
     "resetConst": {
       "reset_all": "重置所有角色的命座。",
       "success": "已重置 %s 的命座，重新登录后生效。",
-      "description": "重置当前角色的命之座，执行命令后需重新登录以生效。"
+      "description": "重置当前角色的命之座，执行命令后需重新登录以生效"
     },
     "resetShopLimit": {
       "usage": "用法：/resetshop <玩家ID>",
-      "description": "重置所选玩家的商店刷新时间。"
+      "description": "重置所选玩家的商店刷新时间"
     },
     "sendMail": {
       "usage": "用法：give [玩家] <物品ID|物品名称> [数量]",
@@ -246,19 +246,19 @@
       "sender": "<发件人>",
       "arguments": "<物品ID|物品名称|finish> [数量] [等级]",
       "error": "错误：无效的编写阶段 %s。需要 StackTrace 请查看服务器控制台。",
-      "description": "向指定用户发送邮件。此命令的用法可根据附加的参数而变化。"
+      "description": "向指定用户发送邮件。此命令的用法可根据附加的参数而变化"
     },
     "sendMessage": {
       "usage": "用法：sendmessage <玩家> <消息>",
       "success": "消息已发送。",
-      "description": "向指定玩家发送消息。"
+      "description": "向指定玩家发送消息"
     },
     "setFetterLevel": {
       "usage": "用法：setfetterlevel <好感度等级>",
       "range_error": "好感度等级必须在 0 到 10 之间。",
-      "success": "好感度已设置为 %s 级",
+      "success": "好感度已设置为 %s 级。",
       "level_error": "无效的好感度等级。",
-      "description": "设置当前角色的好感度等级。"
+      "description": "设置当前角色的好感度等级"
     },
     "setStats": {
       "usage_console": "用法：setstats|stats @<UID> <属性> <数值>",
@@ -270,23 +270,23 @@
       "set_self": "%s 已设为 %s。",
       "set_for_uid": "将 %s (来自 %s) 设置为 %s。",
       "set_max_hp": "最大生命值已设为 %s。",
-      "description": "设置当前角色的属性。"
+      "description": "设置当前角色的属性"
     },
     "setWorldLevel": {
       "usage": "用法：setworldlevel <等级>",
       "value_error": "世界等级必须设置在0-8之间。",
       "success": "已将世界等级设为 %s。",
       "invalid_world_level": "无效的世界等级。",
-      "description": "设置世界等级，执行命令后需重新登录以生效。"
+      "description": "设置世界等级，执行命令后需重新登录以生效"
     },
     "spawn": {
       "usage": "用法：spawn <实体ID> [数量] [等级(仅怪物)]",
       "success": "已生成 %s 个 %s。",
-      "description": "在你附近生成一个生物。"
+      "description": "在你附近生成一个生物"
     },
     "stop": {
       "success": "正在关闭服务器...",
-      "description": "停止服务器。"
+      "description": "停止服务器"
     },
     "talent": {
       "usage_1": "设置天赋等级：/talent set <天赋ID> <数值>",
@@ -303,20 +303,20 @@
       "normal_attack_id": "普通攻击的 ID 为 %s。",
       "e_skill_id": "元素战技ID %s。",
       "q_skill_id": "元素爆发ID %s。",
-      "description": "设置当前角色的天赋等级。"
+      "description": "设置当前角色的天赋等级"
     },
     "teleportAll": {
-      "success": "已将所有玩家传送到你的位置",
+      "success": "已将所有玩家传送到你的位置。",
       "error": "你只能在多人游戏状态下执行此命令。",
-      "description": "将你世界中的所有玩家传送到你所在的位置。"
+      "description": "将你世界中的所有玩家传送到你所在的位置"
     },
     "teleport": {
       "usage_server": "用法：/tp @<玩家ID> <x> <y> <z> [场景ID]",
       "usage": "用法：/tp [@<玩家ID>] <x> <y> <z> [场景ID]",
       "specify_player_id": "你必须指定一个玩家ID。",
       "invalid_position": "无效的位置。",
-      "success": "传送 %s 到坐标 %s,%s,%s，场景为 %s",
-      "description": "改变指定玩家的位置。"
+      "success": "传送 %s 到坐标 %s,%s,%s，场景为 %s。",
+      "description": "改变指定玩家的位置"
     },
     "tower": {
       "unlock_done": "深境回廊的所有层已全部解锁。"
@@ -325,28 +325,28 @@
       "usage": "用法：weather <天气ID> [气候ID]",
       "success": "已更改天气为 %s，气候为 %s。",
       "invalid_id": "无效的天气ID。",
-      "description": "更改天气。"
+      "description": "更改天气"
     },
     "drop": {
       "command_usage": "用法：drop <物品ID|物品名称> [数量]",
       "success": "已丢下 %s 个 %s。",
-      "description": "在你附近丢下一个物品。"
+      "description": "在你附近丢下一个物品"
     },
     "help": {
       "usage": "用法：",
       "aliases": "别名：",
       "available_commands": "可用命令：",
-      "description": "发送帮助信息或显示指定命令的信息。"
+      "description": "发送帮助信息或显示指定命令的信息"
     },
     "restart": {
-      "description": "重新启动服务器。"
+      "description": "重新启动服务器"
     },
     "unlocktower": {
       "success": "解锁完成。",
-      "description": "解锁深境螺旋的所有层。"
+      "description": "解锁深境螺旋的所有层"
     },
     "resetshop": {
-      "description": "重置商店刷新时间。"
+      "description": "重置商店刷新时间"
     }
   }
 }

From 9fc18151c94e4d6c0aa96d4169db7eb12586252f Mon Sep 17 00:00:00 2001
From: tester233 <105267106+tester233@users.noreply.github.com>
Date: Wed, 11 May 2022 19:37:52 +0800
Subject: [PATCH 06/59] Improve text

---
 src/main/resources/languages/zh-CN.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json
index 01572a20b..111e3c0c5 100644
--- a/src/main/resources/languages/zh-CN.json
+++ b/src/main/resources/languages/zh-CN.json
@@ -20,7 +20,7 @@
       "unhandled_request_error": "[Dispatch] 潜在的未处理请求：%s %s",
       "account": {
         "login_attempt": "[Dispatch] 客户端 %s 正在尝试登录",
-        "login_success": "[Dispatch] 客户端 %s 已登录，UID为 %s",
+        "login_success": "[Dispatch] 客户端 %s 已登录，UID 为 %s",
         "login_token_attempt": "[Dispatch] 客户端 %s 正在尝试使用 token 登录",
         "login_token_error": "[Dispatch] 客户端 %s 使用 token 登录失败",
         "login_token_success": "[Dispatch] 客户端 %s 已通过 token 登录，UID 为 %s",
@@ -96,7 +96,7 @@
       "create": "已创建账号，UID 为 %s。",
       "delete": "账号已删除。",
       "no_account": "账号不存在。",
-      "command_usage": "用法：account <create|delete> <用户名> [uid]",
+      "command_usage": "用法：account <create|delete> <用户名> [UID]",
       "description": "创建或删除账号"
     },
     "broadcast": {
@@ -290,7 +290,7 @@
     },
     "talent": {
       "usage_1": "设置天赋等级：/talent set <天赋ID> <数值>",
-      "usage_2": "另一种设置天赋等级的方法：/talent <n (普攻) | e (元素战技) | q (元素爆发)> <数值>",
+      "usage_2": "另一种设置天赋等级的方法：/talent <n (普通攻击) | e (元素战技) | q (元素爆发)> <数值>",
       "usage_3": "获取天赋ID：/talent getid",
       "lower_16": "无效的天赋等级，天赋等级应小于等于15。",
       "set_id": "将天赋等级设为 %s。",

From a77ae0bc3c1001997eb29d0bf23c5e83113a5b70 Mon Sep 17 00:00:00 2001
From: mingjun97 <my@lyric.today>
Date: Tue, 10 May 2022 18:34:30 -0700
Subject: [PATCH 07/59] Introduce `-version` argument to display version

---
 build.gradle                                   | 16 ++++++++++++++++
 src/main/java/emu/grasscutter/Grasscutter.java |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/build.gradle b/build.gradle
index 4434ed28e..186a6d440 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,6 +45,14 @@ targetCompatibility = JavaVersion.VERSION_17
 group = 'xyz.grasscutters'
 version = '1.1.1-dev'
 
+def gitCommitHash = {
+    try {
+        return 'git rev-parse --verify --short HEAD'.execute().text.trim()
+    } catch (e) {
+        return "GIT_NOT_FOUND"
+    }
+}
+
 sourceCompatibility = 17
 targetCompatibility = 17
 
@@ -97,6 +105,7 @@ application {
     mainClassName = 'emu.grasscutter.Grasscutter'
 }
 
+
 jar {
     manifest {
         attributes 'Main-Class': 'emu.grasscutter.Grasscutter'
@@ -113,6 +122,13 @@ jar {
     from('src/main/java') {
         include '*.xml'
     }
+    new File(projectDir, "src/generated/main/java/emu/grasscutter/BuildConfig.java").text = """
+    package emu.grasscutter;
+    public class BuildConfig {
+            public static final String VERSION = \"${version}\";
+            public static final String GIT_HASH = \"${gitCommitHash()}\";
+    }
+    """
 
     destinationDir = file(".")
 }
diff --git a/src/main/java/emu/grasscutter/Grasscutter.java b/src/main/java/emu/grasscutter/Grasscutter.java
index 73e761e6e..a192815d1 100644
--- a/src/main/java/emu/grasscutter/Grasscutter.java
+++ b/src/main/java/emu/grasscutter/Grasscutter.java
@@ -29,6 +29,7 @@ import emu.grasscutter.server.dispatch.DispatchServer;
 import emu.grasscutter.server.game.GameServer;
 import emu.grasscutter.tools.Tools;
 import emu.grasscutter.utils.Crypto;
+import emu.grasscutter.BuildConfig;
 
 import javax.annotation.Nullable;
 
@@ -82,6 +83,9 @@ public final class Grasscutter {
 				case "-gachamap" -> {
 					Tools.createGachaMapping(DATA("gacha_mappings.js")); exitEarly = true;
 				}
+				case "-version" -> {
+					System.out.println("Grasscutter version: " + BuildConfig.VERSION + "\nGit Hash: " + BuildConfig.GIT_HASH); exitEarly = true;
+				}
 			}
 		} 
 		

From 170db70b6fc503488b911a9acdbceeae73426815 Mon Sep 17 00:00:00 2001
From: mingjun97 <my@lyric.today>
Date: Tue, 10 May 2022 21:11:19 -0700
Subject: [PATCH 08/59] Fix github action build issue

* Move `BuildConfig.java` from `/src/generated`to `/src/main` to accomplish the building pipeline

* Add BuildConfig.java to the .gitignore
---
 .gitignore   | 1 +
 build.gradle | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9fa6c9427..6fd78ed3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,7 @@ language/
 languages/
 gacha-mapping.js
 data/gacha_mappings.js
+BuildConfig.java
 
 # macOS
 .DS_Store
diff --git a/build.gradle b/build.gradle
index 186a6d440..47f433b57 100644
--- a/build.gradle
+++ b/build.gradle
@@ -122,7 +122,7 @@ jar {
     from('src/main/java') {
         include '*.xml'
     }
-    new File(projectDir, "src/generated/main/java/emu/grasscutter/BuildConfig.java").text = """
+    new File(projectDir, "src/main/java/emu/grasscutter/BuildConfig.java").text = """
     package emu.grasscutter;
     public class BuildConfig {
             public static final String VERSION = \"${version}\";

From 895e2bc44ae321b19ccf3c397cce49eb44fc523c Mon Sep 17 00:00:00 2001
From: mingjun97 <my@lyric.today>
Date: Tue, 10 May 2022 21:36:30 -0700
Subject: [PATCH 09/59] Display version info at console starting

---
 src/main/java/emu/grasscutter/Grasscutter.java | 1 +
 src/main/resources/languages/en-US.json        | 3 ++-
 src/main/resources/languages/pl-PL.json        | 3 ++-
 src/main/resources/languages/zh-CN.json        | 3 ++-
 src/main/resources/languages/zh-TW.json        | 3 ++-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/emu/grasscutter/Grasscutter.java b/src/main/java/emu/grasscutter/Grasscutter.java
index a192815d1..b328a453b 100644
--- a/src/main/java/emu/grasscutter/Grasscutter.java
+++ b/src/main/java/emu/grasscutter/Grasscutter.java
@@ -190,6 +190,7 @@ public final class Grasscutter {
 		}
 
 		getLogger().info(translate("messages.status.done"));
+		getLogger().info(translate("messages.status.version", BuildConfig.VERSION, BuildConfig.GIT_HASH));
 		String input = null;
 		boolean isLastInterrupted = false;
 		while (true) {
diff --git a/src/main/resources/languages/en-US.json b/src/main/resources/languages/en-US.json
index 2b392b682..099e36eaa 100644
--- a/src/main/resources/languages/en-US.json
+++ b/src/main/resources/languages/en-US.json
@@ -48,7 +48,8 @@
       "run_mode_error": "Invalid server run mode: %s.",
       "run_mode_help": "Server run mode must be 'HYBRID', 'DISPATCH_ONLY', or 'GAME_ONLY'. Unable to start Grasscutter...",
       "create_resources": "Creating resources folder...",
-      "resources_error": "Place a copy of 'BinOutput' and 'ExcelBinOutput' in the resources folder."
+      "resources_error": "Place a copy of 'BinOutput' and 'ExcelBinOutput' in the resources folder.",
+      "version": "Grasscutter version: %s, Git Hash: %s"
     }
   },
   "commands": {
diff --git a/src/main/resources/languages/pl-PL.json b/src/main/resources/languages/pl-PL.json
index 8f76d8951..0f5d88aa9 100644
--- a/src/main/resources/languages/pl-PL.json
+++ b/src/main/resources/languages/pl-PL.json
@@ -45,7 +45,8 @@
       "run_mode_error": "Błędny tryb pracy serwera: %s.",
       "run_mode_help": "Tryb pracy serwera musi być ustawiony na 'HYBRID', 'DISPATCH_ONLY', lub 'GAME_ONLY'. Nie można wystartować Grasscutter...",
       "create_resources": "Tworzenie folderu resources...",
-      "resources_error": "Umieść kopię 'BinOutput' i 'ExcelBinOutput' w folderze resources."
+      "resources_error": "Umieść kopię 'BinOutput' i 'ExcelBinOutput' w folderze resources.",
+      "version": "Grasscutter versión: %s, Git Hash: %s"
     }
   },
   "commands": {
diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json
index 111e3c0c5..5f2b02736 100644
--- a/src/main/resources/languages/zh-CN.json
+++ b/src/main/resources/languages/zh-CN.json
@@ -45,7 +45,8 @@
       "run_mode_error": "无效的服务器运行模式：%s。",
       "run_mode_help": "服务器运行模式必须为 HYBRID、DISPATCH_ONLY 或 GAME_ONLY。Grasscutter 启动失败...",
       "create_resources": "正在创建 resources 目录...",
-      "resources_error": "请将 BinOutput 和 ExcelBinOutput 复制到 resources 目录。"
+      "resources_error": "请将 BinOutput 和 ExcelBinOutput 复制到 resources 目录。",
+      "version": "Grasscutter版本: %s, Git Hash: %s"
     }
   },
   "commands": {
diff --git a/src/main/resources/languages/zh-TW.json b/src/main/resources/languages/zh-TW.json
index 9c3c99686..3cb850415 100644
--- a/src/main/resources/languages/zh-TW.json
+++ b/src/main/resources/languages/zh-TW.json
@@ -45,7 +45,8 @@
       "run_mode_error": "無效的伺服器運行模式： %s。",
       "run_mode_help": "伺服器運行模式必須為 HYBRID 或者 DISPATCH_ONLY 或者 GAME_ONLY。Grasscutter 啟動失敗...",
       "create_resources": "正在建立 resources 資料夾...",
-      "resources_error": "請將 BinOutput 和 ExcelBinOutput 複製到 resources 資料夾。"
+      "resources_error": "請將 BinOutput 和 ExcelBinOutput 複製到 resources 資料夾。",
+      "version": "Grasscutter版本: %s, Git Hash: %s"
     }
   },
   "commands": {

From 570635ea02a4824b68d8e98de3ed4c26cb7ae8e7 Mon Sep 17 00:00:00 2001
From: mingjun97 <my@lyric.today>
Date: Tue, 10 May 2022 23:23:58 -0700
Subject: [PATCH 10/59] Revise version format

---
 src/main/java/emu/grasscutter/Grasscutter.java | 2 +-
 src/main/resources/languages/en-US.json        | 2 +-
 src/main/resources/languages/pl-PL.json        | 2 +-
 src/main/resources/languages/zh-CN.json        | 2 +-
 src/main/resources/languages/zh-TW.json        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/emu/grasscutter/Grasscutter.java b/src/main/java/emu/grasscutter/Grasscutter.java
index b328a453b..6ca78dfa9 100644
--- a/src/main/java/emu/grasscutter/Grasscutter.java
+++ b/src/main/java/emu/grasscutter/Grasscutter.java
@@ -84,7 +84,7 @@ public final class Grasscutter {
 					Tools.createGachaMapping(DATA("gacha_mappings.js")); exitEarly = true;
 				}
 				case "-version" -> {
-					System.out.println("Grasscutter version: " + BuildConfig.VERSION + "\nGit Hash: " + BuildConfig.GIT_HASH); exitEarly = true;
+					System.out.println("Grasscutter version: " + BuildConfig.VERSION + "-" + BuildConfig.GIT_HASH); exitEarly = true;
 				}
 			}
 		} 
diff --git a/src/main/resources/languages/en-US.json b/src/main/resources/languages/en-US.json
index 099e36eaa..81e97eed7 100644
--- a/src/main/resources/languages/en-US.json
+++ b/src/main/resources/languages/en-US.json
@@ -49,7 +49,7 @@
       "run_mode_help": "Server run mode must be 'HYBRID', 'DISPATCH_ONLY', or 'GAME_ONLY'. Unable to start Grasscutter...",
       "create_resources": "Creating resources folder...",
       "resources_error": "Place a copy of 'BinOutput' and 'ExcelBinOutput' in the resources folder.",
-      "version": "Grasscutter version: %s, Git Hash: %s"
+      "version": "Grasscutter version: %s-%s"
     }
   },
   "commands": {
diff --git a/src/main/resources/languages/pl-PL.json b/src/main/resources/languages/pl-PL.json
index 0f5d88aa9..aa06723d8 100644
--- a/src/main/resources/languages/pl-PL.json
+++ b/src/main/resources/languages/pl-PL.json
@@ -46,7 +46,7 @@
       "run_mode_help": "Tryb pracy serwera musi być ustawiony na 'HYBRID', 'DISPATCH_ONLY', lub 'GAME_ONLY'. Nie można wystartować Grasscutter...",
       "create_resources": "Tworzenie folderu resources...",
       "resources_error": "Umieść kopię 'BinOutput' i 'ExcelBinOutput' w folderze resources.",
-      "version": "Grasscutter versión: %s, Git Hash: %s"
+      "version": "Grasscutter versión: %s-%s"
     }
   },
   "commands": {
diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json
index 5f2b02736..84d4a8c94 100644
--- a/src/main/resources/languages/zh-CN.json
+++ b/src/main/resources/languages/zh-CN.json
@@ -46,7 +46,7 @@
       "run_mode_help": "服务器运行模式必须为 HYBRID、DISPATCH_ONLY 或 GAME_ONLY。Grasscutter 启动失败...",
       "create_resources": "正在创建 resources 目录...",
       "resources_error": "请将 BinOutput 和 ExcelBinOutput 复制到 resources 目录。",
-      "version": "Grasscutter版本: %s, Git Hash: %s"
+      "version": "Grasscutter版本: %s-%s"
     }
   },
   "commands": {
diff --git a/src/main/resources/languages/zh-TW.json b/src/main/resources/languages/zh-TW.json
index 3cb850415..8e7a75949 100644
--- a/src/main/resources/languages/zh-TW.json
+++ b/src/main/resources/languages/zh-TW.json
@@ -46,7 +46,7 @@
       "run_mode_help": "伺服器運行模式必須為 HYBRID 或者 DISPATCH_ONLY 或者 GAME_ONLY。Grasscutter 啟動失敗...",
       "create_resources": "正在建立 resources 資料夾...",
       "resources_error": "請將 BinOutput 和 ExcelBinOutput 複製到 resources 資料夾。",
-      "version": "Grasscutter版本: %s, Git Hash: %s"
+      "version": "Grasscutter版本: %s-%s"
     }
   },
   "commands": {

From 41de6bd229c0329da9a12ab8570266b4b879bd4a Mon Sep 17 00:00:00 2001
From: mingjun97 <my@lyric.today>
Date: Tue, 10 May 2022 23:34:53 -0700
Subject: [PATCH 11/59] Make `injectGitHash` as a task

---
 build.gradle | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 47f433b57..ffb6a498e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,13 +45,6 @@ targetCompatibility = JavaVersion.VERSION_17
 group = 'xyz.grasscutters'
 version = '1.1.1-dev'
 
-def gitCommitHash = {
-    try {
-        return 'git rev-parse --verify --short HEAD'.execute().text.trim()
-    } catch (e) {
-        return "GIT_NOT_FOUND"
-    }
-}
 
 sourceCompatibility = 17
 targetCompatibility = 17
@@ -122,13 +115,6 @@ jar {
     from('src/main/java') {
         include '*.xml'
     }
-    new File(projectDir, "src/main/java/emu/grasscutter/BuildConfig.java").text = """
-    package emu.grasscutter;
-    public class BuildConfig {
-            public static final String VERSION = \"${version}\";
-            public static final String GIT_HASH = \"${gitCommitHash()}\";
-    }
-    """
 
     destinationDir = file(".")
 }
@@ -242,6 +228,26 @@ javadoc {
     }
 }
 
+task injectGitHash {
+    doLast {
+        def gitCommitHash = {
+            try {
+                return 'git rev-parse --verify --short HEAD'.execute().text.trim()
+            } catch (e) {
+                return "GIT_NOT_FOUND"
+            }
+        }
+        new File(projectDir, "src/main/java/emu/grasscutter/BuildConfig.java").text = """
+            package emu.grasscutter;
+            public class BuildConfig {
+                    public static final String VERSION = \"${version}\";
+                    public static final String GIT_HASH = \"${gitCommitHash()}\";
+            }
+        """
+    }
+}
+
 processResources {
     dependsOn "generateProto"
+    dependsOn "injectGitHash"
 }

From c105c71e533cbdf30bc6642c036d9f590ab6cb49 Mon Sep 17 00:00:00 2001
From: mingjun97 <my@lyric.today>
Date: Tue, 10 May 2022 23:55:40 -0700
Subject: [PATCH 12/59] Fix building error

---
 build.gradle | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index ffb6a498e..3a8d2c34d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -229,25 +229,22 @@ javadoc {
 }
 
 task injectGitHash {
-    doLast {
-        def gitCommitHash = {
-            try {
-                return 'git rev-parse --verify --short HEAD'.execute().text.trim()
-            } catch (e) {
-                return "GIT_NOT_FOUND"
-            }
+    def gitCommitHash = {
+        try {
+            return 'git rev-parse --verify --short HEAD'.execute().text.trim()
+        } catch (e) {
+            return "GIT_NOT_FOUND"
         }
-        new File(projectDir, "src/main/java/emu/grasscutter/BuildConfig.java").text = """
-            package emu.grasscutter;
-            public class BuildConfig {
-                    public static final String VERSION = \"${version}\";
-                    public static final String GIT_HASH = \"${gitCommitHash()}\";
-            }
-        """
     }
+    new File(projectDir, "src/main/java/emu/grasscutter/BuildConfig.java").text = """
+        package emu.grasscutter;
+        public class BuildConfig {
+                public static final String VERSION = \"${version}\";
+                public static final String GIT_HASH = \"${gitCommitHash()}\";
+        }
+    """
 }
 
 processResources {
     dependsOn "generateProto"
-    dependsOn "injectGitHash"
 }

From 57c7f7a43b3ed20194c1abccdfa662dd0efa3dcd Mon Sep 17 00:00:00 2001
From: ImmuState <kyoko12@gmx.at>
Date: Wed, 11 May 2022 11:19:25 -0700
Subject: [PATCH 13/59] Add gacha details page.

---
 data/gacha_details.html                       | 121 ++++++++++++++++++
 .../grasscutter/game/gacha/GachaBanner.java   |   9 +-
 .../grasscutter/game/gacha/GachaManager.java  |  18 ++-
 .../server/dispatch/DispatchServer.java       |   4 +
 .../dispatch/http/GachaDetailsHandler.java    |  90 +++++++++++++
 src/main/resources/languages/en-US.json       |   9 ++
 src/main/resources/languages/pl-PL.json       |   9 ++
 src/main/resources/languages/zh-CN.json       |   9 ++
 src/main/resources/languages/zh-TW.json       |   9 ++
 9 files changed, 275 insertions(+), 3 deletions(-)
 create mode 100644 data/gacha_details.html
 create mode 100644 src/main/java/emu/grasscutter/server/dispatch/http/GachaDetailsHandler.java

diff --git a/data/gacha_details.html b/data/gacha_details.html
new file mode 100644
index 000000000..16cf7313a
--- /dev/null
+++ b/data/gacha_details.html
@@ -0,0 +1,121 @@
+<!doctype html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400&display=swap">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css">
+        <style>
+            body {
+                background-color: #f0f0f0;
+            }
+            p {
+                font-weight:300;
+            }
+            a,a:hover {
+                text-decoration:none !important;
+                color:#626976;
+            }
+            .content {
+                padding:3rem 0;
+            }
+            .container {
+                color:#626976;
+                position: relative;
+            }
+
+            h2 {
+                font-size:20px;
+            }
+            h3 {
+                font-size:16px;
+            }
+        </style>
+        <title>Banner Details</title>
+        <script type="text/javascript" src="/gacha/mappings"></script>
+    </head>
+    <body>
+        <div class="content">
+            <div class="container">
+                <h2 class="mb-5">{{TITLE}}</h2>
+
+                <h3 class="">{{AVAILABLE_FIVE_STARS}}</h3>
+                <hr />
+                <ul id="5-star-list">
+                </ul>
+
+                <h3 class="">{{AVAILABLE_FOUR_STARS}}</h3>
+                <hr />
+                <ul id="4-star-list">
+                </ul>
+
+                <h3 class="">{{AVAILABLE_THREE_STARS}}</h3>
+                <hr />
+                <ul id="3-star-list">
+                </ul>
+            </div>
+        </div>
+        <footer>
+            <div class="copyright">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-md-6">
+                            <span>
+                                Template by BecodReyes. All rights reserved.
+                            </span>
+                        </div>
+                        <div class="col-md-6">
+                            <ul style="float:right">
+                                <li class="list-inline-item">
+                                    <a href="https://github.com/Grasscutters/Grasscutter">Github</a>
+                                </li>
+                                <li class="list-inline-item">·</li>
+                                <li class="list-inline-item">
+                                    <a href="https://github.com/Grasscutters/Grasscutter/blob/stable/LICENSE">License</a>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </footer>
+
+        <script>
+            fiveStarItems = {{FIVE_STARS}};
+            fourStarItems = {{FOUR_STARS}};
+            threeStarItems = {{THREE_STARS}};
+
+            var lang = new window.URLSearchParams(window.location.search).get("lang");
+            function getNameForId(itemId) {
+                if (mappings[lang] != null && mappings[lang][itemId] != null) {
+                    return mappings[lang][itemId][0];
+                }
+                else if (mappings["en-us"] != null && mappings["en-us"][itemId] != null) {
+                    return mappings["en-us"][itemId][0];
+                }
+                
+                return itemId.toString();
+            }
+
+            fiveStarList = document.getElementById("5-star-list");
+            fourStarList = document.getElementById("4-star-list");
+            threeStarList = document.getElementById("3-star-list");
+
+            fiveStarItems.forEach(element => {
+                var entry = document.createElement("li");
+                entry.innerHTML = getNameForId(element);
+                fiveStarList.appendChild(entry);
+            });
+            fourStarItems.forEach(element => {
+                var entry = document.createElement("li");
+                entry.innerHTML = getNameForId(element);
+                fourStarList.appendChild(entry);
+            });
+            threeStarItems.forEach(element => {
+                var entry = document.createElement("li");
+                entry.innerHTML = getNameForId(element);
+                threeStarList.appendChild(entry);
+            });
+        </script>
+    </body>
+</html>
diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java b/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
index dce433fcf..7a2646a4f 100644
--- a/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
@@ -102,6 +102,11 @@ public class GachaBanner {
 						+ lr(DISPATCH_INFO.accessAddress, DISPATCH_INFO.bindAddress) + ":"
 						+ lr(DISPATCH_INFO.accessPort, DISPATCH_INFO.bindPort)
 						+ "/gacha?s=" + sessionKey + "&gachaType=" + gachaType;
+		String details = "http" + (DISPATCH_INFO.encryption.useInRouting ? "s" : "") + "://"
+						+ lr(DISPATCH_INFO.accessAddress, DISPATCH_INFO.bindAddress) + ":"
+						+ lr(DISPATCH_INFO.accessPort, DISPATCH_INFO.bindPort)
+						+ "/gacha/details?s=" + sessionKey + "&gachaType=" + gachaType;
+
 		// Grasscutter.getLogger().info("record = " + record);
 		GachaInfo.Builder info = GachaInfo.newBuilder()
 				.setGachaType(this.getGachaType())
@@ -112,8 +117,8 @@ public class GachaBanner {
 	            .setCostItemNum(1)
 	            .setGachaPrefabPath(this.getPrefabPath())
 	            .setGachaPreviewPrefabPath(this.getPreviewPrefabPath())
-	            .setGachaProbUrl(record)
-	            .setGachaProbUrlOversea(record)
+	            .setGachaProbUrl(details)
+	            .setGachaProbUrlOversea(details)
 	            .setGachaRecordUrl(record)
 	            .setGachaRecordUrlOversea(record)
 	            .setTenCostItemId(this.getCostItem())
diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
index 03edca09a..f0baf65a9 100644
--- a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
@@ -65,7 +65,23 @@ public class GachaManager {
 	public Int2ObjectMap<GachaBanner> getGachaBanners() {
 		return gachaBanners;
 	}
-	
+
+	public int[] getYellowAvatars() {
+		return this.yellowAvatars;
+	}
+	public int[] getYellowWeapons() {
+		return this.yellowWeapons;
+	}
+	public int[] getPurpleAvatars() {
+		return this.purpleAvatars;
+	}
+	public int[] getPurpleWeapons() {
+		return this.purpleWeapons;
+	}
+	public int[] getBlueWeapons() {
+		return this.blueWeapons;
+	}
+
 	public int randomRange(int min, int max) {
 		return ThreadLocalRandom.current().nextInt(max - min + 1) + min;
 	}
diff --git a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
index 4e09f8881..c78aff7c6 100644
--- a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
+++ b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
@@ -16,6 +16,7 @@ import emu.grasscutter.net.proto.RegionInfoOuterClass.RegionInfo;
 import emu.grasscutter.net.proto.RegionSimpleInfoOuterClass.RegionSimpleInfo;
 import emu.grasscutter.server.dispatch.authentication.AuthenticationHandler;
 import emu.grasscutter.server.dispatch.authentication.DefaultAuthenticationHandler;
+import emu.grasscutter.server.dispatch.http.GachaDetailsHandler;
 import emu.grasscutter.server.dispatch.http.GachaRecordHandler;
 import emu.grasscutter.server.dispatch.json.*;
 import emu.grasscutter.server.dispatch.json.ComboTokenReqJson.LoginTokenData;
@@ -455,6 +456,9 @@ public final class DispatchServer {
 
 		httpServer.raw().config.addSinglePageRoot("/gacha/mappings", gachaMappingsPath, Location.EXTERNAL);
 
+		// gacha details
+		httpServer.get("/gacha/details", new GachaDetailsHandler());
+
 		// static file support for plugins
 		httpServer.raw().config.precompressStaticFiles = false; // If this isn't set to false, files such as images may appear corrupted when serving static files
 
diff --git a/src/main/java/emu/grasscutter/server/dispatch/http/GachaDetailsHandler.java b/src/main/java/emu/grasscutter/server/dispatch/http/GachaDetailsHandler.java
new file mode 100644
index 000000000..d46cead40
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/dispatch/http/GachaDetailsHandler.java
@@ -0,0 +1,90 @@
+package emu.grasscutter.server.dispatch.http;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.database.DatabaseHelper;
+import emu.grasscutter.game.Account;
+import emu.grasscutter.game.gacha.GachaBanner;
+import emu.grasscutter.game.gacha.GachaManager;
+import emu.grasscutter.game.gacha.GachaBanner.BannerType;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.utils.FileUtils;
+import emu.grasscutter.utils.Utils;
+import express.http.HttpContextHandler;
+import express.http.Request;
+import express.http.Response;
+
+import static emu.grasscutter.utils.Language.translate;
+
+import static emu.grasscutter.Configuration.*;
+
+public final class GachaDetailsHandler implements HttpContextHandler {
+	private final String render_template;
+
+	public GachaDetailsHandler() {
+		File template = new File(Utils.toFilePath(DATA("/gacha_details.html")));
+		this.render_template = template.exists() ? new String(FileUtils.read(template)) : null;
+	}
+
+	@Override
+	public void handle(Request req, Response res) throws IOException {
+		String response = this.render_template;
+
+		// Get player info (for langauge).
+		String sessionKey = req.query("s");
+		Account account = DatabaseHelper.getAccountBySessionKey(sessionKey);
+		Player player = Grasscutter.getGameServer().getPlayerByUid(account.getPlayerUid());
+
+		// If the template was not loaded, return an error.
+		if (this.render_template == null) {
+			res.send(translate(player, "gacha.details.template_missing"));
+			return;
+		}
+
+		// Add translated title etc. to the page.
+		response = response.replace("{{TITLE}}", translate(player, "gacha.details.title"));
+		response = response.replace("{{AVAILABLE_FIVE_STARS}}", translate(player, "gacha.details.available_five_stars"));
+		response = response.replace("{{AVAILABLE_FOUR_STARS}}", translate(player, "gacha.details.available_four_stars"));
+		response = response.replace("{{AVAILABLE_THREE_STARS}}", translate(player, "gacha.details.available_three_stars"));
+		
+		// Get the banner info for the banner we want.
+		int gachaType = Integer.parseInt(req.query("gachaType"));
+		GachaManager manager = Grasscutter.getGameServer().getGachaManager();
+	 	GachaBanner banner = manager.getGachaBanners().get(gachaType);
+
+		// Add 5-star items.
+		Set<String> fiveStarItems = new LinkedHashSet<>();
+
+		Arrays.stream(banner.getRateUpItems1()).forEach(i -> fiveStarItems.add(Integer.toString(i)));
+		if (banner.getBannerType() == BannerType.STANDARD || banner.getBannerType() == BannerType.EVENT) {
+			Arrays.stream(manager.getYellowAvatars()).forEach(i -> fiveStarItems.add(Integer.toString(i)));
+		}
+		if (banner.getBannerType() == BannerType.STANDARD || banner.getBannerType() == BannerType.WEAPON) {
+			Arrays.stream(manager.getYellowWeapons()).forEach(i -> fiveStarItems.add(Integer.toString(i)));
+		}
+
+		response = response.replace("{{FIVE_STARS}}", "[" + String.join(",", fiveStarItems) + "]");
+		
+		// Add 4-star items.
+		Set<String> fourStarItems = new LinkedHashSet<>();
+
+		Arrays.stream(banner.getRateUpItems2()).forEach(i -> fourStarItems.add(Integer.toString(i)));
+		Arrays.stream(manager.getPurpleAvatars()).forEach(i -> fourStarItems.add(Integer.toString(i)));
+		Arrays.stream(manager.getPurpleWeapons()).forEach(i -> fourStarItems.add(Integer.toString(i)));
+
+		response = response.replace("{{FOUR_STARS}}", "[" + String.join(",", fourStarItems) + "]");
+
+		// Add 3-star items.
+		Set<String> threeStarItems = new LinkedHashSet<>();
+		Arrays.stream(manager.getBlueWeapons()).forEach(i -> threeStarItems.add(Integer.toString(i)));
+		response = response.replace("{{THREE_STARS}}", "[" + String.join(",", threeStarItems) + "]");
+
+		// Done.
+		res.send(response);
+	}
+}
diff --git a/src/main/resources/languages/en-US.json b/src/main/resources/languages/en-US.json
index 81e97eed7..42b52d7f5 100644
--- a/src/main/resources/languages/en-US.json
+++ b/src/main/resources/languages/en-US.json
@@ -352,5 +352,14 @@
     "resetshop": {
       "description": "reset shop"
     }
+  },
+  "gacha": {
+    "details": {
+      "title": "Banner Details",
+      "available_five_stars": "Available 5-star Items",
+      "available_four_stars": "Available 4-star Items",
+      "available_three_stars": "Available 3-star Items",
+      "template_missing": "data/gacha_details.html is missing."
+    }
   }
 }
diff --git a/src/main/resources/languages/pl-PL.json b/src/main/resources/languages/pl-PL.json
index aa06723d8..e5eff2d84 100644
--- a/src/main/resources/languages/pl-PL.json
+++ b/src/main/resources/languages/pl-PL.json
@@ -302,5 +302,14 @@
     "resetshop": {
       "description": "zresetuj sklep"
     }
+  },
+  "gacha": {
+    "details": {
+      "title": "Banner Details",
+      "available_five_stars": "Available 5-star Items",
+      "available_four_stars": "Available 4-star Items",
+      "available_three_stars": "Available 3-star Items",
+      "template_missing": "data/gacha_details.html is missing."
+    }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json
index 84d4a8c94..ac46370d5 100644
--- a/src/main/resources/languages/zh-CN.json
+++ b/src/main/resources/languages/zh-CN.json
@@ -349,5 +349,14 @@
     "resetshop": {
       "description": "重置商店刷新时间"
     }
+  },
+  "gacha": {
+    "details": {
+      "title": "Banner Details",
+      "available_five_stars": "Available 5-star Items",
+      "available_four_stars": "Available 4-star Items",
+      "available_three_stars": "Available 3-star Items",
+      "template_missing": "data/gacha_details.html is missing."
+    }
   }
 }
diff --git a/src/main/resources/languages/zh-TW.json b/src/main/resources/languages/zh-TW.json
index 8e7a75949..f6ae52c9d 100644
--- a/src/main/resources/languages/zh-TW.json
+++ b/src/main/resources/languages/zh-TW.json
@@ -302,5 +302,14 @@
     "resetshop": {
       "description": "重置商店時間"
     }
+  },
+  "gacha": {
+    "details": {
+      "title": "Banner Details",
+      "available_five_stars": "Available 5-star Items",
+      "available_four_stars": "Available 4-star Items",
+      "available_three_stars": "Available 3-star Items",
+      "template_missing": "data/gacha_details.html is missing."
+    }
   }
 }

From e5a85f81c27d564d3ddefb960e44a8c8c7a1478a Mon Sep 17 00:00:00 2001
From: ImmuState <kyoko12@gmx.at>
Date: Wed, 11 May 2022 11:36:14 -0700
Subject: [PATCH 14/59] Insert language setting based on the player's account.

---
 data/gacha_details.html                                | 10 +++++-----
 .../server/dispatch/http/GachaDetailsHandler.java      |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/data/gacha_details.html b/data/gacha_details.html
index 16cf7313a..ccd775ef6 100644
--- a/data/gacha_details.html
+++ b/data/gacha_details.html
@@ -38,7 +38,7 @@
         <div class="content">
             <div class="container">
                 <h2 class="mb-5">{{TITLE}}</h2>
-
+                
                 <h3 class="">{{AVAILABLE_FIVE_STARS}}</h3>
                 <hr />
                 <ul id="5-star-list">
@@ -81,11 +81,11 @@
         </footer>
 
         <script>
-            fiveStarItems = {{FIVE_STARS}};
-            fourStarItems = {{FOUR_STARS}};
-            threeStarItems = {{THREE_STARS}};
+            var fiveStarItems = {{FIVE_STARS}};
+            var fourStarItems = {{FOUR_STARS}};
+            var threeStarItems = {{THREE_STARS}};
+            var lang = "{{LANGUAGE}}";
 
-            var lang = new window.URLSearchParams(window.location.search).get("lang");
             function getNameForId(itemId) {
                 if (mappings[lang] != null && mappings[lang][itemId] != null) {
                     return mappings[lang][itemId][0];
diff --git a/src/main/java/emu/grasscutter/server/dispatch/http/GachaDetailsHandler.java b/src/main/java/emu/grasscutter/server/dispatch/http/GachaDetailsHandler.java
index d46cead40..5e1877b9b 100644
--- a/src/main/java/emu/grasscutter/server/dispatch/http/GachaDetailsHandler.java
+++ b/src/main/java/emu/grasscutter/server/dispatch/http/GachaDetailsHandler.java
@@ -51,6 +51,8 @@ public final class GachaDetailsHandler implements HttpContextHandler {
 		response = response.replace("{{AVAILABLE_FIVE_STARS}}", translate(player, "gacha.details.available_five_stars"));
 		response = response.replace("{{AVAILABLE_FOUR_STARS}}", translate(player, "gacha.details.available_four_stars"));
 		response = response.replace("{{AVAILABLE_THREE_STARS}}", translate(player, "gacha.details.available_three_stars"));
+
+		response = response.replace("{{LANGUAGE}}", Utils.getLanguageCode(account.getLocale()));
 		
 		// Get the banner info for the banner we want.
 		int gachaType = Integer.parseInt(req.query("gachaType"));

From 7befebe37fcbe26cbd09bfeea51879bdf8e8daba Mon Sep 17 00:00:00 2001
From: Melledy <52122272+Melledy@users.noreply.github.com>
Date: Wed, 11 May 2022 12:47:16 -0700
Subject: [PATCH 15/59] Add quest ids to handbook

---
 src/main/java/emu/grasscutter/tools/Tools.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/emu/grasscutter/tools/Tools.java b/src/main/java/emu/grasscutter/tools/Tools.java
index 4a5af6e49..8b28c027e 100644
--- a/src/main/java/emu/grasscutter/tools/Tools.java
+++ b/src/main/java/emu/grasscutter/tools/Tools.java
@@ -19,6 +19,7 @@ import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandMap;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.ResourceLoader;
+import emu.grasscutter.data.custom.QuestConfig;
 import emu.grasscutter.data.def.AvatarData;
 import emu.grasscutter.data.def.ItemData;
 import emu.grasscutter.data.def.MonsterData;
@@ -88,7 +89,7 @@ public final class Tools {
 final class ToolsWithLanguageOption {
 	@SuppressWarnings("deprecation")
 	public static void createGmHandbook(String language) throws Exception {
-		ResourceLoader.loadResources();
+		ResourceLoader.loadAll();
 		
 		Map<Long, String> map;
 		try (InputStreamReader fileReader = new InputStreamReader(new FileInputStream(Utils.toFilePath(RESOURCE("TextMap/TextMap"+language+".json"))), StandardCharsets.UTF_8)) {
@@ -148,6 +149,15 @@ final class ToolsWithLanguageOption {
 				writer.println(data.getId() + " : " + data.getScriptData());
 			}
 			
+			writer.println("// Quests");
+			list = new ArrayList<>(GameData.getQuestConfigs().keySet());
+			Collections.sort(list); 
+			
+			for (Integer id : list) {
+				QuestConfig data = GameData.getQuestConfigs().get(id);
+				writer.println(data.getId() + " : " + map.get(data.getMainQuest().getTitleTextMapHash()));
+			}
+			
 			writer.println();
 			
 			writer.println("// Monsters");

From ba5635bf395740bb785b0a749d17108177cb202b Mon Sep 17 00:00:00 2001
From: gentlespoon <github@gentlespoon.com>
Date: Wed, 11 May 2022 07:22:19 -0700
Subject: [PATCH 16/59] Update StaminaManager

1. Update function signatures to prepare for vehicle stamina.
3. Remove hard-coded skills.
2. Wind resonance -15% stamina cost.
4. Climb talent cost reduction.
5. Swim talent cost reduction.
6. Diluc will now consume stamina at full price if talent not activated.
7. Sayu's windwheel no longer consumes stamina.
---
 .../java/emu/grasscutter/Grasscutter.java     |   4 +
 .../StaminaManager/StaminaManager.java        | 275 +++++++++---------
 .../send/PacketVehicleStaminaNotify.java      |  19 ++
 3 files changed, 157 insertions(+), 141 deletions(-)
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketVehicleStaminaNotify.java

diff --git a/src/main/java/emu/grasscutter/Grasscutter.java b/src/main/java/emu/grasscutter/Grasscutter.java
index 6ca78dfa9..2af2415ab 100644
--- a/src/main/java/emu/grasscutter/Grasscutter.java
+++ b/src/main/java/emu/grasscutter/Grasscutter.java
@@ -4,6 +4,7 @@ import java.io.*;
 import java.util.Calendar;
 
 import emu.grasscutter.command.CommandMap;
+import emu.grasscutter.game.managers.StaminaManager.StaminaManager;
 import emu.grasscutter.plugin.PluginManager;
 import emu.grasscutter.plugin.api.ServerHook;
 import emu.grasscutter.scripts.ScriptLoader;
@@ -110,6 +111,9 @@ public final class Grasscutter {
 		new ServerHook(gameServer, dispatchServer);
 		// Create plugin manager instance.
 		pluginManager = new PluginManager();
+
+		// TODO: find a better place?
+		StaminaManager.initialize();
 	
 		// Start servers.
 		var runMode = SERVER.runMode;
diff --git a/src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java b/src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java
index 7a949b8ab..e076f5856 100644
--- a/src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java
@@ -2,6 +2,7 @@ package emu.grasscutter.game.managers.StaminaManager;
 
 import ch.qos.logback.classic.Logger;
 import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.GameData;
 import emu.grasscutter.game.entity.EntityAvatar;
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.player.Player;
@@ -18,16 +19,15 @@ import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Position;
 import org.jetbrains.annotations.NotNull;
 
-import java.lang.Math;
 import java.util.*;
 
-import static emu.grasscutter.Configuration.*;
+import static emu.grasscutter.Configuration.GAME_OPTIONS;
 
 public class StaminaManager {
 
     // TODO: Skiff state detection?
     private final Player player;
-    private final HashMap<String, HashSet<MotionState>> MotionStatesCategorized = new HashMap<>() {{
+    private static final HashMap<String, HashSet<MotionState>> MotionStatesCategorized = new HashMap<>() {{
         put("CLIMB", new HashSet<>(List.of(
                 MotionState.MOTION_CLIMB, // sustained, when not moving no cost no recover
                 MotionState.MOTION_STANDBY_TO_CLIMB // NOT OBSERVED, see MOTION_JUMP_UP_WALL_FOR_STANDBY
@@ -122,74 +122,67 @@ public class StaminaManager {
     private int lastSkillId = 0;
     private int lastSkillCasterId = 0;
     private boolean lastSkillFirstTick = true;
-    public static final HashSet<Integer> TalentMovements = new HashSet<>(List.of(
+    private static final HashSet<Integer> TalentMovements = new HashSet<>(List.of(
             10013, // Kamisato Ayaka
             10413 // Mona
     ));
+    private static final HashMap<Integer, Float> ClimbFoodReductionMap = new HashMap<>() {{
+        // TODO: get real food id
+        put(0, 0.8f); // Sample food
+    }};
+    private static final HashMap<Integer, Float> DashFoodReductionMap = new HashMap<>() {{
+        // TODO: get real food id
+        put(0, 0.8f); // Sample food
+    }};
+    private static final HashMap<Integer, Float> FlyFoodReductionMap = new HashMap<>() {{
+        // TODO: get real food id
+        put(0, 0.8f); // Sample food
+    }};
+    private static final HashMap<Integer, Float> SwimFoodReductionMap = new HashMap<>() {{
+        // TODO: get real food id
+        put(0, 0.8f); // Sample food
+    }};
+    private static final HashMap<Integer, Float> ClimbTalentReductionMap = new HashMap<>() {{
+        put(262301, 0.8f); // Xiao
+    }};
+    private static final HashMap<Integer, Float> FlyTalentReductionMap = new HashMap<>() {{
+        put(212301, 0.8f); // Amber
+        put(222301, 0.8f); // Venti
+    }};
+    private static final HashMap<Integer, Float> SwimTalentReductionMap = new HashMap<>() {{
+        put(242301, 0.8f); // Beidou
+        put(542301, 0.8f); // Sangonomiya Kokomi
+    }};
 
-    // TODO: Get from somewhere else, instead of hard-coded here?
-    public static final HashSet<Integer> ClaymoreSkills = new HashSet<>(List.of(
-            10160, // Diluc, /=2
-            10201, // Razor
-            10241, // Beidou
-            10341, // Noelle
-            10401, // Chongyun
-            10441, // Xinyan
-            10511, // Eula
-            10531, // Sayu
-            10571 // Arataki Itto, = 0
-    ));
-    public static final HashSet<Integer> CatalystSkills = new HashSet<>(List.of(
-            10060, // Lisa
-            10070, // Barbara
-            10271, // Ningguang
-            10291, // Klee
-            10411, // Mona
-            10431, // Sucrose
-            10481, // Yanfei
-            10541, // Sangonomoiya Kokomi
-            10581 // Yae Miko
-    ));
-    public static final HashSet<Integer> PolearmSkills = new HashSet<>(List.of(
-            10231, // Xiangling
-            10261, // Xiao
-            10301, // Zhongli
-            10451, // Rosaria
-            10461, // Hu Tao
-            10501, // Thoma
-            10521, // Raiden Shogun
-            10631, // Shenhe
-            10641 // Yunjin
-    ));
-    public static final HashSet<Integer> SwordSkills = new HashSet<>(List.of(
-            10024, // Kamisato Ayaka
-            10031, // Jean
-            10073, // Kaeya
-            10321, // Bennett
-            10337, // Tartaglia, melee stance (10332 switch to melee, 10336 switch to ranged stance)
-            10351, // Qiqi
-            10381, // Xingqiu
-            10386, // Albedo
-            10421, // Keqing, =-2500
-            10471, // Kaedehara Kazuha
-            10661, // Kamisato Ayato
-            100553, // Lumine
-            100540 // Aether
-    ));
-    public static final HashSet<Integer> BowSkills = new HashSet<>(List.of(
-            10041, 10043, // Amber
-            10221, 10223,// Venti
-            10311, 10315, // Fischl
-            10331, 10335, // Tartaglia, ranged stance
-            10371, // Ganyu
-            10391, 10394, // Diona
-            10491, // Yoimiya
-            10551, 10554, // Gorou
-            10561, 10564, // Kojou Sara
-            10621, // Aloy
-            99998, 99999 // Yelan // TODO: get real values
-    ));
+    public static final HashSet<Integer> BowAvatars = new HashSet<>();
+    public static final HashSet<Integer> CatalystAvatars = new HashSet<>();
+    public static final HashSet<Integer> ClaymoreAvatars = new HashSet<>();
+    public static final HashSet<Integer> PolearmAvatars = new HashSet<>();
+    public static final HashSet<Integer> SwordAvatars = new HashSet<>();
 
+    public static void initialize() {
+        // Initialize skill categories
+        GameData.getAvatarDataMap().forEach((avatarId, avatarData) -> {
+            switch(avatarData.getWeaponType()) {
+                case "WEAPON_BOW":
+                    BowAvatars.add(avatarId);
+                    break;
+                case "WEAPON_CLAYMORE":
+                    ClaymoreAvatars.add(avatarId);
+                    break;
+                case "WEAPON_CATALYST":
+                    CatalystAvatars.add(avatarId);
+                    break;
+                case "WEAPON_POLE":
+                    PolearmAvatars.add(avatarId);
+                    break;
+                case "WEAPON_SWORD_ONE_HAND":
+                    SwordAvatars.add(avatarId);
+                    break;
+            }
+            // TODO: Initialize foods etc.
+        });
+    }
 
     public StaminaManager(Player player) {
         this.player = player;
@@ -244,8 +237,8 @@ public class StaminaManager {
         return Math.abs(diffX) > 0.3 || Math.abs(diffY) > 0.2 || Math.abs(diffZ) > 0.3;
     }
 
-    public int updateStaminaRelative(GameSession session, Consumption consumption) {
-        int currentStamina = player.getProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA);
+    public int updateStaminaRelative(GameSession session, Consumption consumption, PlayerProperty staminaType) {
+        int currentStamina = player.getProperty(staminaType);
         if (consumption.amount == 0) {
             return currentStamina;
         }
@@ -253,7 +246,7 @@ public class StaminaManager {
         for (Map.Entry<String, BeforeUpdateStaminaListener> listener : beforeUpdateStaminaListeners.entrySet()) {
             Consumption overriddenConsumption = listener.getValue().onBeforeUpdateStamina(consumption.type.toString(), consumption);
             if ((overriddenConsumption.type != consumption.type) && (overriddenConsumption.amount != consumption.amount)) {
-                logger.debug("[StaminaManager] Stamina update relative(" +
+                logger.debug("Stamina update relative(" +
                         consumption.type.toString() + ", " + consumption.amount + ") overridden to relative(" +
                         consumption.type.toString() + ", " + consumption.amount + ") by: " + listener.getKey());
                 return currentStamina;
@@ -269,16 +262,16 @@ public class StaminaManager {
         } else if (newStamina > playerMaxStamina) {
             newStamina = playerMaxStamina;
         }
-        return setStamina(session, consumption.type.toString(), newStamina);
+        return setStamina(session, consumption.type.toString(), newStamina, staminaType);
     }
 
-    public int updateStaminaAbsolute(GameSession session, String reason, int newStamina) {
+    public int updateStaminaAbsolute(GameSession session, String reason, int newStamina, PlayerProperty staminaType) {
         int currentStamina = player.getProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA);
         // notify will update
         for (Map.Entry<String, BeforeUpdateStaminaListener> listener : beforeUpdateStaminaListeners.entrySet()) {
             int overriddenNewStamina = listener.getValue().onBeforeUpdateStamina(reason, newStamina);
             if (overriddenNewStamina != newStamina) {
-                logger.debug("[StaminaManager] Stamina update absolute(" +
+                logger.debug("Stamina update absolute(" +
                         reason + ", " + newStamina + ") overridden to absolute(" +
                         reason + ", " + newStamina + ") by: " + listener.getKey());
                 return currentStamina;
@@ -290,18 +283,22 @@ public class StaminaManager {
         } else if (newStamina > playerMaxStamina) {
             newStamina = playerMaxStamina;
         }
-        return setStamina(session, reason, newStamina);
+        return setStamina(session, reason, newStamina, staminaType);
     }
 
     // Returns new stamina and sends PlayerPropNotify
-    public int setStamina(GameSession session, String reason, int newStamina) {
+    public int setStamina(GameSession session, String reason, int newStamina, PlayerProperty staminaType) {
         if (!GAME_OPTIONS.staminaUsage) {
             newStamina = player.getProperty(PlayerProperty.PROP_MAX_STAMINA);
         }
-        
         // set stamina
-        player.setProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA, newStamina);
-        session.send(new PacketPlayerPropNotify(player, PlayerProperty.PROP_CUR_PERSIST_STAMINA));
+        player.setProperty(staminaType, newStamina);
+        if (staminaType == PlayerProperty.PROP_CUR_TEMPORARY_STAMINA) {
+            // TODO: Implement
+            // session.send(new PacketVehicleStaminaNotify(vehicleEntity, newStamina));
+        } else {
+            session.send(new PacketPlayerPropNotify(player, PlayerProperty.PROP_CUR_PERSIST_STAMINA));
+        }
         // notify updated
         for (Map.Entry<String, AfterUpdateStaminaListener> listener : afterUpdateStaminaListeners.entrySet()) {
             listener.getValue().onAfterUpdateStamina(reason, newStamina);
@@ -343,22 +340,23 @@ public class StaminaManager {
     // External trigger handler
 
     public void handleEvtDoSkillSuccNotify(GameSession session, int skillId, int casterId) {
-        // Ignore if skill not cast by not current active
+        // Ignore if skill not cast by not current active avatar
         if (casterId != player.getTeamManager().getCurrentAvatarEntity().getId()) {
             return;
         }
         setSkillCast(skillId, casterId);
         // Handle immediate stamina cost
-        if (ClaymoreSkills.contains(skillId)) {
+        int currentAvatarId = player.getTeamManager().getCurrentAvatarEntity().getAvatar().getAvatarId();
+        if (ClaymoreAvatars.contains(currentAvatarId)) {
             // Exclude claymore as their stamina cost starts when MixinStaminaCost gets in
             return;
         }
         // TODO: Differentiate normal attacks from charged attacks and exclude
         // TODO: Temporary: Exclude non-claymore attacks for now
-        if (BowSkills.contains(skillId)
-                || SwordSkills.contains(skillId)
-                || PolearmSkills.contains(skillId)
-                || CatalystSkills.contains(skillId)
+        if (BowAvatars.contains(currentAvatarId)
+                || SwordAvatars.contains(currentAvatarId)
+                || PolearmAvatars.contains(currentAvatarId)
+                || CatalystAvatars.contains(currentAvatarId)
         ) {
             return;
         }
@@ -367,7 +365,7 @@ public class StaminaManager {
 
     public void handleMixinCostStamina(boolean isSwim) {
         // Talent moving and claymore avatar charged attack duration
-        // logger.trace("abilityMixinCostStamina: isSwim: " + isSwim);
+        // logger.trace("abilityMixinCostStamina: isSwim: " + isSwim + "\tlastSkill: " + lastSkillId);
         if (lastSkillCasterId == player.getTeamManager().getCurrentAvatarEntity().getId()) {
             handleImmediateStamina(cachedSession, lastSkillId);
         }
@@ -401,22 +399,22 @@ public class StaminaManager {
         switch (motionState) {
             case MOTION_CLIMB:
                 if (currentState != MotionState.MOTION_CLIMB) {
-                    updateStaminaRelative(session, new Consumption(ConsumptionType.CLIMB_START));
+                    updateStaminaRelative(session, new Consumption(ConsumptionType.CLIMB_START), PlayerProperty.PROP_CUR_PERSIST_STAMINA);
                 }
                 break;
             case MOTION_DASH_BEFORE_SHAKE:
                 if (previousState != MotionState.MOTION_DASH_BEFORE_SHAKE) {
-                    updateStaminaRelative(session, new Consumption(ConsumptionType.SPRINT));
+                    updateStaminaRelative(session, new Consumption(ConsumptionType.SPRINT), PlayerProperty.PROP_CUR_PERSIST_STAMINA);
                 }
                 break;
             case MOTION_CLIMB_JUMP:
                 if (previousState != MotionState.MOTION_CLIMB_JUMP) {
-                    updateStaminaRelative(session, new Consumption(ConsumptionType.CLIMB_JUMP));
+                    updateStaminaRelative(session, new Consumption(ConsumptionType.CLIMB_JUMP), PlayerProperty.PROP_CUR_PERSIST_STAMINA);
                 }
                 break;
             case MOTION_SWIM_DASH:
                 if (previousState != MotionState.MOTION_SWIM_DASH) {
-                    updateStaminaRelative(session, new Consumption(ConsumptionType.SWIM_DASH_START));
+                    updateStaminaRelative(session, new Consumption(ConsumptionType.SWIM_DASH_START), PlayerProperty.PROP_CUR_PERSIST_STAMINA);
                 }
                 break;
         }
@@ -424,7 +422,7 @@ public class StaminaManager {
 
     private void handleImmediateStamina(GameSession session, int skillId) {
         Consumption consumption = getFightConsumption(skillId);
-        updateStaminaRelative(session, consumption);
+        updateStaminaRelative(session, consumption, PlayerProperty.PROP_CUR_PERSIST_STAMINA);
     }
 
     private class SustainedStaminaHandler extends TimerTask {
@@ -449,41 +447,45 @@ public class StaminaManager {
                     consumption = getSkiffConsumption();
                 } else if (MotionStatesCategorized.get("STANDBY").contains(currentState)) {
                     consumption = new Consumption(ConsumptionType.STANDBY);
-                } else if (MotionStatesCategorized.get("SWIM").contains((currentState))) {
+                } else if (MotionStatesCategorized.get("SWIM").contains(currentState)) {
                     consumption = getSwimConsumptions();
-                } else if (MotionStatesCategorized.get("WALK").contains((currentState))) {
+                } else if (MotionStatesCategorized.get("WALK").contains(currentState)) {
                     consumption = new Consumption(ConsumptionType.WALK);
-                } else if (MotionStatesCategorized.get("OTHER").contains((currentState))) {
+                } else if (MotionStatesCategorized.get("NOCOST_NORECOVER").contains(currentState)) {
+                    consumption = new Consumption();
+                } else if (MotionStatesCategorized.get("OTHER").contains(currentState)) {
                     consumption = getOtherConsumptions();
-                } else {
-                    // ignore
+                } else { // ignore
                     return;
                 }
+
                 if (consumption.amount < 0) {
                     /* Do not apply reduction factor when recovering stamina
                     TODO: Reductions that apply to all motion types:
-                        Elemental Resonance
-                            Wind: -15%
                         Skills
                             Diona E: -10% while shield lasts - applies to SP+MP
                             Barbara E: -12% while lasts - applies to SP+MP
                     */
+                    // Elemental Resonance - Winds -15%
+                    if (player.getTeamManager().getTeamResonances().contains(10301)) {
+                         consumption.amount *= 0.85f;
+                    }
                 }
-                // Delay 2 seconds before starts recovering stamina
-                if (cachedSession != null) {
+                // Delay 1 seconds before starts recovering stamina
+                if (consumption.amount != 0 && cachedSession != null) {
                     if (consumption.amount < 0) {
                         staminaRecoverDelay = 0;
                     }
                     if (consumption.amount > 0 && consumption.type != ConsumptionType.POWERED_FLY) {
                         // For POWERED_FLY recover immediately - things like Amber's gliding exam may require this.
-                        if (staminaRecoverDelay < 10) {
-                            // For others recover after 2 seconds (10 ticks) - as official server does.
+                        if (staminaRecoverDelay < 5) {
+                            // For others recover after 1 seconds (5 ticks) - as official server does.
                             staminaRecoverDelay++;
                             consumption.amount = 0;
-                            logger.trace("[StaminaManager] Delaying recovery: " + staminaRecoverDelay);
+                            logger.trace("Delaying recovery: " + staminaRecoverDelay);
                         }
                     }
-                    updateStaminaRelative(cachedSession, consumption);
+                    updateStaminaRelative(cachedSession, consumption, PlayerProperty.PROP_CUR_PERSIST_STAMINA);
                 }
             }
             previousState = currentState;
@@ -496,6 +498,7 @@ public class StaminaManager {
     }
 
     private void handleDrowning() {
+        // TODO: fix drowning waverider entity
         int stamina = player.getProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA);
         if (stamina < 10) {
             logger.trace(player.getProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA) + "/" +
@@ -517,23 +520,24 @@ public class StaminaManager {
             return getTalentMovingSustainedCost(skillCasting);
         }
         // Bow avatar charged attack
-        if (BowSkills.contains(skillCasting)) {
+        int currentAvatarId = player.getTeamManager().getCurrentAvatarEntity().getAvatar().getAvatarId();
+        if (BowAvatars.contains(currentAvatarId)) {
             return getBowSustainedCost(skillCasting);
         }
         // Claymore avatar charged attack
-        if (ClaymoreSkills.contains(skillCasting)) {
+        if (ClaymoreAvatars.contains(currentAvatarId)) {
             return getClaymoreSustainedCost(skillCasting);
         }
         // Catalyst avatar charged attack
-        if (CatalystSkills.contains(skillCasting)) {
+        if (CatalystAvatars.contains(currentAvatarId)) {
             return getCatalystSustainedCost(skillCasting);
         }
         // Polearm avatar charged attack
-        if (PolearmSkills.contains(skillCasting)) {
+        if (PolearmAvatars.contains(currentAvatarId)) {
             return getPolearmSustainedCost(skillCasting);
         }
         // Sword avatar charged attack
-        if (SwordSkills.contains(skillCasting)) {
+        if (SwordAvatars.contains(skillCasting)) {
             return getSwordSustainedCost(skillCasting);
         }
         return new Consumption();
@@ -546,18 +550,8 @@ public class StaminaManager {
             consumption.amount = ConsumptionType.CLIMBING.amount;
         }
         // Climbing specific reductions
-        // TODO: create a food cost reduction map
-        HashMap<Integer, Float> foodReductionMap = new HashMap<>() {{
-            // TODO: get real talent id
-            put(0, 0.8f); // Sample food
-        }};
-        consumption.amount *= getFoodCostReductionFactor(foodReductionMap);
-
-        HashMap<Integer, Float> talentReductionMap = new HashMap<>() {{
-            // TODO: get real talent id
-            put(0, 0.8f); // Xiao
-        }};
-        consumption.amount *= getTalentCostReductionFactor(talentReductionMap);
+        consumption.amount *= getFoodCostReductionFactor(ClimbFoodReductionMap);
+        consumption.amount *= getTalentCostReductionFactor(ClimbTalentReductionMap);
         return consumption;
     }
 
@@ -572,13 +566,9 @@ public class StaminaManager {
             consumption.type = ConsumptionType.SWIM_DASH;
             consumption.amount = ConsumptionType.SWIM_DASH.amount;
         }
-        // Reductions
-        HashMap<Integer, Float> talentReductionMap = new HashMap<>() {{
-            // TODO: get real talent id
-            put(0, 0.8f); // Beidou
-            put(1, 0.8f); // Sangonomiya Kokomi
-        }};
-        consumption.amount *= getTalentCostReductionFactor(talentReductionMap);
+        // Swimming specific reductions
+        consumption.amount *= getFoodCostReductionFactor(SwimFoodReductionMap);
+        consumption.amount *= getTalentCostReductionFactor(SwimTalentReductionMap);
         return consumption;
     }
 
@@ -587,8 +577,8 @@ public class StaminaManager {
         if (currentState == MotionState.MOTION_DASH) {
             consumption.type = ConsumptionType.DASH;
             consumption.amount = ConsumptionType.DASH.amount;
-            // TODO: Dashing specific reductions
-            //     Foods:
+            // Dashing specific reductions
+            consumption.amount *= getFoodCostReductionFactor(DashFoodReductionMap);
         }
         return consumption;
     }
@@ -599,13 +589,9 @@ public class StaminaManager {
             return new Consumption(ConsumptionType.POWERED_FLY);
         }
         Consumption consumption = new Consumption(ConsumptionType.FLY);
-        // Passive Talents
-        HashMap<Integer, Float> talentReductionMap = new HashMap<>() {{
-            put(212301, 0.8f); // Amber
-            put(222301, 0.8f); // Venti
-        }};
-        consumption.amount *= getTalentCostReductionFactor(talentReductionMap);
-        // TODO: Foods
+        // Flying specific reductions
+        consumption.amount *= getFoodCostReductionFactor(FlyFoodReductionMap);
+        consumption.amount *= getTalentCostReductionFactor(FlyTalentReductionMap);
         return consumption;
     }
 
@@ -619,12 +605,17 @@ public class StaminaManager {
     }
 
     private Consumption getOtherConsumptions() {
-        if (currentState == MotionState.MOTION_NOTIFY) {
-            if (BowSkills.contains(lastSkillId)) {
+        switch (currentState) {
+            case MOTION_NOTIFY:
+//                if (BowSkills.contains(lastSkillId)) {
+//                    return new Consumption(ConsumptionType.FIGHT, 500);
+//                }
+                break;
+            case MOTION_FIGHT:
+                // TODO: what if charged attack
                 return new Consumption(ConsumptionType.FIGHT, 500);
-            }
         }
-        // TODO: Add other logic
+
         return new Consumption();
     }
 
@@ -685,11 +676,13 @@ public class StaminaManager {
         // Character specific handling
         switch (skillId) {
             case 10571: // Arataki Itto, does not consume stamina at all.
+            case 10532: // Sayu, windwheel does not consume stamina.
                 consumption.amount = 0;
                 break;
             case 10160: // Diluc, with talent "Relentless" stamina cost is decreased by 50%
-                // TODO: How to get talent status?
-                consumption.amount /= 2;
+                if (player.getTeamManager().getCurrentAvatarEntity().getAvatar().getProudSkillList().contains(162101)) {
+                    consumption.amount /= 2;
+                }
                 break;
         }
         return consumption;
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleStaminaNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleStaminaNotify.java
new file mode 100644
index 000000000..917bce387
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleStaminaNotify.java
@@ -0,0 +1,19 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.VehicleStaminaNotifyOuterClass.VehicleStaminaNotify;
+
+public class PacketVehicleStaminaNotify extends BasePacket {
+
+	public PacketVehicleStaminaNotify(GameEntity entity, int newStamina) {
+		super(PacketOpcodes.VehicleStaminaNotify);
+		VehicleStaminaNotify.Builder proto = VehicleStaminaNotify.newBuilder();
+
+		proto.setEntityId(entity.getId());
+		proto.setCurStamina(newStamina);
+
+		this.setData(proto.build());
+	}
+}

From 2531ae366dc6d5f5ba3ae9a0f56f7e0c6d2fc594 Mon Sep 17 00:00:00 2001
From: gentlespoon <github@gentlespoon.com>
Date: Wed, 11 May 2022 17:11:57 -0700
Subject: [PATCH 17/59] Feature: vehicle stamina

1. Remove references.
2. Handle vehicle stamina.
---
 .../AfterUpdateStaminaListener.java           |   2 +-
 .../BeforeUpdateStaminaListener.java          |   4 +-
 .../StaminaManager/ConsumptionType.java       |   9 +-
 .../StaminaManager/StaminaManager.java        | 209 ++++++++++--------
 .../emu/grasscutter/game/player/Player.java   |   2 +-
 .../recv/HandlerVehicleInteractReq.java       |   1 +
 .../send/PacketVehicleStaminaNotify.java      |   5 +-
 7 files changed, 127 insertions(+), 105 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/managers/StaminaManager/AfterUpdateStaminaListener.java b/src/main/java/emu/grasscutter/game/managers/StaminaManager/AfterUpdateStaminaListener.java
index bb4f0b188..11a5c9178 100644
--- a/src/main/java/emu/grasscutter/game/managers/StaminaManager/AfterUpdateStaminaListener.java
+++ b/src/main/java/emu/grasscutter/game/managers/StaminaManager/AfterUpdateStaminaListener.java
@@ -8,5 +8,5 @@ public interface AfterUpdateStaminaListener {
      * @param reason     Why updating stamina.
      * @param newStamina New Stamina value.
      */
-    void onAfterUpdateStamina(String reason, int newStamina);
+    void onAfterUpdateStamina(String reason, int newStamina, boolean isCharacterStamina);
 }
diff --git a/src/main/java/emu/grasscutter/game/managers/StaminaManager/BeforeUpdateStaminaListener.java b/src/main/java/emu/grasscutter/game/managers/StaminaManager/BeforeUpdateStaminaListener.java
index 02f1f3522..39075f35b 100644
--- a/src/main/java/emu/grasscutter/game/managers/StaminaManager/BeforeUpdateStaminaListener.java
+++ b/src/main/java/emu/grasscutter/game/managers/StaminaManager/BeforeUpdateStaminaListener.java
@@ -8,7 +8,7 @@ public interface BeforeUpdateStaminaListener {
      * @param newStamina New ABSOLUTE stamina value.
      * @return true if you want to cancel this update, otherwise false.
      */
-    int onBeforeUpdateStamina(String reason, int newStamina);
+    int onBeforeUpdateStamina(String reason, int newStamina, boolean isCharacterStamina);
     /**
      * onBeforeUpdateStamina() will be called before StaminaManager attempt to update the player's current stamina.
      * This gives listeners a chance to intercept this update.
@@ -16,5 +16,5 @@ public interface BeforeUpdateStaminaListener {
      * @param consumption ConsumptionType and RELATIVE stamina change amount.
      * @return true if you want to cancel this update, otherwise false.
      */
-    Consumption onBeforeUpdateStamina(String reason, Consumption consumption);
+    Consumption onBeforeUpdateStamina(String reason, Consumption consumption, boolean isCharacterStamina);
 }
\ No newline at end of file
diff --git a/src/main/java/emu/grasscutter/game/managers/StaminaManager/ConsumptionType.java b/src/main/java/emu/grasscutter/game/managers/StaminaManager/ConsumptionType.java
index feb42d14e..506bf1728 100644
--- a/src/main/java/emu/grasscutter/game/managers/StaminaManager/ConsumptionType.java
+++ b/src/main/java/emu/grasscutter/game/managers/StaminaManager/ConsumptionType.java
@@ -13,18 +13,19 @@ public enum ConsumptionType {
     // Slow swimming is handled per movement, not per second.
     // Arm movement frequency depends on gender/age/height.
     // TODO: Instead of cost -80 per tick, find a proper way to calculate cost.
-    SKIFF(-300), // TODO: Get real value
+    SKIFF_DASH(-204),
     SPRINT(-1800),
-    SWIM_DASH_START(-20),
+    SWIM_DASH_START(-2000),
     SWIM_DASH(-204), // -10.2 per second, 5Hz = -204 each tick
     SWIMMING(-80),
     TALENT_DASH(-300), // -1500 per second, 5Hz = -300 each tick
     TALENT_DASH_START(-1000),
 
     // restore
-    POWERED_FLY(500), // TODO: Get real value
-    POWERED_SKIFF(2000), // TODO: Get real value
+    POWERED_FLY(500),
+    POWERED_SKIFF(500),
     RUN(500),
+    SKIFF(500),
     STANDBY(500),
     WALK(500);
 
diff --git a/src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java b/src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java
index e076f5856..85225b4b8 100644
--- a/src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java
@@ -14,6 +14,7 @@ import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
 import emu.grasscutter.net.proto.MotionStateOuterClass.MotionState;
 import emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType;
 import emu.grasscutter.net.proto.VectorOuterClass.Vector;
+import emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Position;
@@ -48,7 +49,7 @@ public class StaminaManager {
         )));
         put("SKIFF", new HashSet<>(List.of(
                 MotionState.MOTION_SKIFF_BOARDING, // NOT OBSERVED even when boarding
-                MotionState.MOTION_SKIFF_DASH, // NOT OBSERVED even when dashing
+                MotionState.MOTION_SKIFF_DASH, // sustained, observed with waverider entity ID.
                 MotionState.MOTION_SKIFF_NORMAL, // sustained, OBSERVED when both normal and dashing
                 MotionState.MOTION_SKIFF_POWERED_DASH // sustained, recover
         )));
@@ -108,7 +109,8 @@ public class StaminaManager {
     }};
 
     private final Logger logger = Grasscutter.getLogger();
-    public final static int GlobalMaximumStamina = 24000;
+    public final static int GlobalCharacterMaximumStamina = 24000;
+    public final static int GlobalVehicleMaxStamina = 24000;
     private Position currentCoordinates = new Position(0, 0, 0);
     private Position previousCoordinates = new Position(0, 0, 0);
     private MotionState currentState = MotionState.MOTION_STANDBY;
@@ -122,9 +124,10 @@ public class StaminaManager {
     private int lastSkillId = 0;
     private int lastSkillCasterId = 0;
     private boolean lastSkillFirstTick = true;
+    private int vehicleId = -1;
+    private int vehicleStamina = GlobalVehicleMaxStamina;
     private static final HashSet<Integer> TalentMovements = new HashSet<>(List.of(
-            10013, // Kamisato Ayaka
-            10413 // Mona
+            10013, 10413
     ));
     private static final HashMap<Integer, Float> ClimbFoodReductionMap = new HashMap<>() {{
         // TODO: get real food id
@@ -143,15 +146,15 @@ public class StaminaManager {
         put(0, 0.8f); // Sample food
     }};
     private static final HashMap<Integer, Float> ClimbTalentReductionMap = new HashMap<>() {{
-        put(262301, 0.8f); // Xiao
+        put(262301, 0.8f);
     }};
     private static final HashMap<Integer, Float> FlyTalentReductionMap = new HashMap<>() {{
-        put(212301, 0.8f); // Amber
-        put(222301, 0.8f); // Venti
+        put(212301, 0.8f);
+        put(222301, 0.8f);
     }};
     private static final HashMap<Integer, Float> SwimTalentReductionMap = new HashMap<>() {{
-        put(242301, 0.8f); // Beidou
-        put(542301, 0.8f); // Sangonomiya Kokomi
+        put(242301, 0.8f);
+        put(542301, 0.8f);
     }};
 
     public static final HashSet<Integer> BowAvatars = new HashSet<>();
@@ -163,25 +166,15 @@ public class StaminaManager {
     public static void initialize() {
         // Initialize skill categories
         GameData.getAvatarDataMap().forEach((avatarId, avatarData) -> {
-            switch(avatarData.getWeaponType()) {
-                case "WEAPON_BOW":
-                    BowAvatars.add(avatarId);
-                    break;
-                case "WEAPON_CLAYMORE":
-                    ClaymoreAvatars.add(avatarId);
-                    break;
-                case "WEAPON_CATALYST":
-                    CatalystAvatars.add(avatarId);
-                    break;
-                case "WEAPON_POLE":
-                    PolearmAvatars.add(avatarId);
-                    break;
-                case "WEAPON_SWORD_ONE_HAND":
-                    SwordAvatars.add(avatarId);
-                    break;
+            switch (avatarData.getWeaponType()) {
+                case "WEAPON_BOW" -> BowAvatars.add(avatarId);
+                case "WEAPON_CLAYMORE" -> ClaymoreAvatars.add(avatarId);
+                case "WEAPON_CATALYST" -> CatalystAvatars.add(avatarId);
+                case "WEAPON_POLE" -> PolearmAvatars.add(avatarId);
+                case "WEAPON_SWORD_ONE_HAND" -> SwordAvatars.add(avatarId);
             }
-            // TODO: Initialize foods etc.
         });
+        // TODO: Initialize foods etc.
     }
 
     public StaminaManager(Player player) {
@@ -196,6 +189,22 @@ public class StaminaManager {
         lastSkillCasterId = skillCasterId;
     }
 
+    public int getMaxCharacterStamina() {
+        return player.getProperty(PlayerProperty.PROP_MAX_STAMINA);
+    }
+
+    public int getCurrentCharacterStamina() {
+        return player.getProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA);
+    }
+
+    public int getMaxVehicleStamina() {
+        return GlobalVehicleMaxStamina;
+    }
+
+    public int getCurrentVehicleStamina() {
+        return vehicleStamina;
+    }
+
     public boolean registerBeforeUpdateStaminaListener(String listenerName, BeforeUpdateStaminaListener listener) {
         if (beforeUpdateStaminaListeners.containsKey(listenerName)) {
             return false;
@@ -237,14 +246,14 @@ public class StaminaManager {
         return Math.abs(diffX) > 0.3 || Math.abs(diffY) > 0.2 || Math.abs(diffZ) > 0.3;
     }
 
-    public int updateStaminaRelative(GameSession session, Consumption consumption, PlayerProperty staminaType) {
-        int currentStamina = player.getProperty(staminaType);
+    public int updateStaminaRelative(GameSession session, Consumption consumption, boolean isCharacterStamina) {
+        int currentStamina = isCharacterStamina ? getCurrentCharacterStamina() : getCurrentVehicleStamina();
         if (consumption.amount == 0) {
             return currentStamina;
         }
         // notify will update
         for (Map.Entry<String, BeforeUpdateStaminaListener> listener : beforeUpdateStaminaListeners.entrySet()) {
-            Consumption overriddenConsumption = listener.getValue().onBeforeUpdateStamina(consumption.type.toString(), consumption);
+            Consumption overriddenConsumption = listener.getValue().onBeforeUpdateStamina(consumption.type.toString(), consumption, isCharacterStamina);
             if ((overriddenConsumption.type != consumption.type) && (overriddenConsumption.amount != consumption.amount)) {
                 logger.debug("Stamina update relative(" +
                         consumption.type.toString() + ", " + consumption.amount + ") overridden to relative(" +
@@ -252,24 +261,24 @@ public class StaminaManager {
                 return currentStamina;
             }
         }
-        int playerMaxStamina = player.getProperty(PlayerProperty.PROP_MAX_STAMINA);
-        logger.trace(currentStamina + "/" + playerMaxStamina + "\t" + currentState + "\t" +
+        int maxStamina = isCharacterStamina ? getMaxCharacterStamina() : getMaxVehicleStamina();
+        logger.warn((isCharacterStamina ? "C " : "V ") + currentStamina + "/" + maxStamina + "\t" + currentState + "\t" +
                 (isPlayerMoving() ? "moving" : "      ") + "\t(" + consumption.type + "," +
                 consumption.amount + ")");
         int newStamina = currentStamina + consumption.amount;
         if (newStamina < 0) {
             newStamina = 0;
-        } else if (newStamina > playerMaxStamina) {
-            newStamina = playerMaxStamina;
+        } else if (newStamina > maxStamina) {
+            newStamina = maxStamina;
         }
-        return setStamina(session, consumption.type.toString(), newStamina, staminaType);
+        return setStamina(session, consumption.type.toString(), newStamina, isCharacterStamina);
     }
 
-    public int updateStaminaAbsolute(GameSession session, String reason, int newStamina, PlayerProperty staminaType) {
-        int currentStamina = player.getProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA);
+    public int updateStaminaAbsolute(GameSession session, String reason, int newStamina, boolean isCharacterStamina) {
+        int currentStamina = isCharacterStamina ? getCurrentCharacterStamina() : getCurrentVehicleStamina();
         // notify will update
         for (Map.Entry<String, BeforeUpdateStaminaListener> listener : beforeUpdateStaminaListeners.entrySet()) {
-            int overriddenNewStamina = listener.getValue().onBeforeUpdateStamina(reason, newStamina);
+            int overriddenNewStamina = listener.getValue().onBeforeUpdateStamina(reason, newStamina, isCharacterStamina);
             if (overriddenNewStamina != newStamina) {
                 logger.debug("Stamina update absolute(" +
                         reason + ", " + newStamina + ") overridden to absolute(" +
@@ -277,31 +286,31 @@ public class StaminaManager {
                 return currentStamina;
             }
         }
-        int playerMaxStamina = player.getProperty(PlayerProperty.PROP_MAX_STAMINA);
+        int maxStamina = isCharacterStamina ? getMaxCharacterStamina() : getMaxVehicleStamina();
         if (newStamina < 0) {
             newStamina = 0;
-        } else if (newStamina > playerMaxStamina) {
-            newStamina = playerMaxStamina;
+        } else if (newStamina > maxStamina) {
+            newStamina = maxStamina;
         }
-        return setStamina(session, reason, newStamina, staminaType);
+        return setStamina(session, reason, newStamina, isCharacterStamina);
     }
 
-    // Returns new stamina and sends PlayerPropNotify
-    public int setStamina(GameSession session, String reason, int newStamina, PlayerProperty staminaType) {
+    // Returns new stamina and sends PlayerPropNotify or VehicleStaminaNotify
+    public int setStamina(GameSession session, String reason, int newStamina, boolean isCharacterStamina) {
         if (!GAME_OPTIONS.staminaUsage) {
-            newStamina = player.getProperty(PlayerProperty.PROP_MAX_STAMINA);
+            newStamina = getMaxCharacterStamina();
         }
-        // set stamina
-        player.setProperty(staminaType, newStamina);
-        if (staminaType == PlayerProperty.PROP_CUR_TEMPORARY_STAMINA) {
-            // TODO: Implement
-            // session.send(new PacketVehicleStaminaNotify(vehicleEntity, newStamina));
-        } else {
+        // set stamina if is character stamina
+        if (isCharacterStamina) {
+            player.setProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA, newStamina);
             session.send(new PacketPlayerPropNotify(player, PlayerProperty.PROP_CUR_PERSIST_STAMINA));
+        } else {
+            vehicleStamina = newStamina;
+            session.send(new PacketVehicleStaminaNotify(vehicleId, ((float) newStamina) / 100));
         }
         // notify updated
         for (Map.Entry<String, AfterUpdateStaminaListener> listener : afterUpdateStaminaListeners.entrySet()) {
-            listener.getValue().onAfterUpdateStamina(reason, newStamina);
+            listener.getValue().onAfterUpdateStamina(reason, newStamina, isCharacterStamina);
         }
         return newStamina;
     }
@@ -379,11 +388,11 @@ public class StaminaManager {
         MotionState motionState = motionInfo.getState();
         int notifyEntityId = entity.getId();
         int currentAvatarEntityId = session.getPlayer().getTeamManager().getCurrentAvatarEntity().getId();
-        if (notifyEntityId != currentAvatarEntityId) {
+        if (notifyEntityId != currentAvatarEntityId && notifyEntityId != vehicleId) {
             return;
         }
         currentState = motionState;
-        // logger.trace("" + currentState);
+        // logger.trace(currentState + "\t" + (notifyEntityId == currentAvatarEntityId ? "character" : "vehicle"));
         Vector posVector = motionInfo.getPos();
         Position newPos = new Position(posVector.getX(), posVector.getY(), posVector.getZ());
         if (newPos.getX() != 0 && newPos.getY() != 0 && newPos.getZ() != 0) {
@@ -393,28 +402,40 @@ public class StaminaManager {
         handleImmediateStamina(session, motionState);
     }
 
+    public void handleVehicleInteractReq(GameSession session, int vehicleId, VehicleInteractType vehicleInteractType) {
+        if (vehicleInteractType == VehicleInteractType.VEHICLE_INTERACT_IN) {
+            this.vehicleId = vehicleId;
+            // Reset character stamina here to prevent falling into water immediately on ejection if char stamina is
+            //      close to empty when boarding.
+            updateStaminaAbsolute(session, "board vehicle", getMaxCharacterStamina(), true);
+            updateStaminaAbsolute(session, "board vehicle", getMaxVehicleStamina(), false);
+        } else {
+            this.vehicleId = -1;
+        }
+    }
+
     // Internal handler
 
     private void handleImmediateStamina(GameSession session, @NotNull MotionState motionState) {
         switch (motionState) {
             case MOTION_CLIMB:
                 if (currentState != MotionState.MOTION_CLIMB) {
-                    updateStaminaRelative(session, new Consumption(ConsumptionType.CLIMB_START), PlayerProperty.PROP_CUR_PERSIST_STAMINA);
+                    updateStaminaRelative(session, new Consumption(ConsumptionType.CLIMB_START), true);
                 }
                 break;
             case MOTION_DASH_BEFORE_SHAKE:
                 if (previousState != MotionState.MOTION_DASH_BEFORE_SHAKE) {
-                    updateStaminaRelative(session, new Consumption(ConsumptionType.SPRINT), PlayerProperty.PROP_CUR_PERSIST_STAMINA);
+                    updateStaminaRelative(session, new Consumption(ConsumptionType.SPRINT), true);
                 }
                 break;
             case MOTION_CLIMB_JUMP:
                 if (previousState != MotionState.MOTION_CLIMB_JUMP) {
-                    updateStaminaRelative(session, new Consumption(ConsumptionType.CLIMB_JUMP), PlayerProperty.PROP_CUR_PERSIST_STAMINA);
+                    updateStaminaRelative(session, new Consumption(ConsumptionType.CLIMB_JUMP), true);
                 }
                 break;
             case MOTION_SWIM_DASH:
                 if (previousState != MotionState.MOTION_SWIM_DASH) {
-                    updateStaminaRelative(session, new Consumption(ConsumptionType.SWIM_DASH_START), PlayerProperty.PROP_CUR_PERSIST_STAMINA);
+                    updateStaminaRelative(session, new Consumption(ConsumptionType.SWIM_DASH_START), true);
                 }
                 break;
         }
@@ -422,18 +443,20 @@ public class StaminaManager {
 
     private void handleImmediateStamina(GameSession session, int skillId) {
         Consumption consumption = getFightConsumption(skillId);
-        updateStaminaRelative(session, consumption, PlayerProperty.PROP_CUR_PERSIST_STAMINA);
+        updateStaminaRelative(session, consumption, true);
     }
 
     private class SustainedStaminaHandler extends TimerTask {
         public void run() {
             boolean moving = isPlayerMoving();
-            int currentStamina = player.getProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA);
-            int maxStamina = player.getProperty(PlayerProperty.PROP_MAX_STAMINA);
-            if (moving || (currentStamina < maxStamina)) {
+            int currentCharacterStamina = getCurrentCharacterStamina();
+            int maxCharacterStamina = getMaxCharacterStamina();
+            int currentVehicleStamina = getCurrentVehicleStamina();
+            int maxVehicleStamina = getMaxVehicleStamina();
+            if (moving || (currentCharacterStamina < maxCharacterStamina) || (currentVehicleStamina < maxVehicleStamina)) {
                 logger.trace("Player moving: " + moving + ", stamina full: " +
-                        (currentStamina >= maxStamina) + ", recalculate stamina");
-
+                        (currentCharacterStamina >= maxCharacterStamina) + ", recalculate stamina");
+                boolean isCharacterStamina = true;
                 Consumption consumption;
                 if (MotionStatesCategorized.get("CLIMB").contains(currentState)) {
                     consumption = getClimbConsumption();
@@ -445,6 +468,7 @@ public class StaminaManager {
                     consumption = new Consumption(ConsumptionType.RUN);
                 } else if (MotionStatesCategorized.get("SKIFF").contains(currentState)) {
                     consumption = getSkiffConsumption();
+                    isCharacterStamina = false;
                 } else if (MotionStatesCategorized.get("STANDBY").contains(currentState)) {
                     consumption = new Consumption(ConsumptionType.STANDBY);
                 } else if (MotionStatesCategorized.get("SWIM").contains(currentState)) {
@@ -459,16 +483,10 @@ public class StaminaManager {
                     return;
                 }
 
-                if (consumption.amount < 0) {
-                    /* Do not apply reduction factor when recovering stamina
-                    TODO: Reductions that apply to all motion types:
-                        Skills
-                            Diona E: -10% while shield lasts - applies to SP+MP
-                            Barbara E: -12% while lasts - applies to SP+MP
-                    */
-                    // Elemental Resonance - Winds -15%
+                if (consumption.amount < 0 && isCharacterStamina) {
+                    // Do not apply reduction factor when recovering stamina
                     if (player.getTeamManager().getTeamResonances().contains(10301)) {
-                         consumption.amount *= 0.85f;
+                        consumption.amount *= 0.85f;
                     }
                 }
                 // Delay 1 seconds before starts recovering stamina
@@ -476,8 +494,10 @@ public class StaminaManager {
                     if (consumption.amount < 0) {
                         staminaRecoverDelay = 0;
                     }
-                    if (consumption.amount > 0 && consumption.type != ConsumptionType.POWERED_FLY) {
-                        // For POWERED_FLY recover immediately - things like Amber's gliding exam may require this.
+                    if (consumption.amount > 0
+                            && consumption.type != ConsumptionType.POWERED_FLY
+                            && consumption.type != ConsumptionType.POWERED_SKIFF) {
+                        // For POWERED_* recover immediately - things like Amber's gliding exam and skiff challenges may require this.
                         if (staminaRecoverDelay < 5) {
                             // For others recover after 1 seconds (5 ticks) - as official server does.
                             staminaRecoverDelay++;
@@ -485,7 +505,7 @@ public class StaminaManager {
                             logger.trace("Delaying recovery: " + staminaRecoverDelay);
                         }
                     }
-                    updateStaminaRelative(cachedSession, consumption, PlayerProperty.PROP_CUR_PERSIST_STAMINA);
+                    updateStaminaRelative(cachedSession, consumption, isCharacterStamina);
                 }
             }
             previousState = currentState;
@@ -499,10 +519,10 @@ public class StaminaManager {
 
     private void handleDrowning() {
         // TODO: fix drowning waverider entity
-        int stamina = player.getProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA);
+        int stamina = getCurrentCharacterStamina();
         if (stamina < 10) {
-            logger.trace(player.getProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA) + "/" +
-                    player.getProperty(PlayerProperty.PROP_MAX_STAMINA) + "\t" + currentState);
+            logger.trace(getCurrentCharacterStamina() + "/" +
+                    getMaxCharacterStamina() + "\t" + currentState);
             if (currentState != MotionState.MOTION_SWIM_IDLE) {
                 killAvatar(cachedSession, cachedEntity, PlayerDieType.PLAYER_DIE_DRAWN);
             }
@@ -530,15 +550,15 @@ public class StaminaManager {
         }
         // Catalyst avatar charged attack
         if (CatalystAvatars.contains(currentAvatarId)) {
-            return getCatalystSustainedCost(skillCasting);
+            return getCatalystCost(skillCasting);
         }
         // Polearm avatar charged attack
         if (PolearmAvatars.contains(currentAvatarId)) {
-            return getPolearmSustainedCost(skillCasting);
+            return getPolearmCost(skillCasting);
         }
         // Sword avatar charged attack
         if (SwordAvatars.contains(skillCasting)) {
-            return getSwordSustainedCost(skillCasting);
+            return getSwordCost(skillCasting);
         }
         return new Consumption();
     }
@@ -596,12 +616,13 @@ public class StaminaManager {
     }
 
     private Consumption getSkiffConsumption() {
-        // POWERED_SKIFF, e.g. wind tunnel
-        if (currentState == MotionState.MOTION_SKIFF_POWERED_DASH) {
-            return new Consumption(ConsumptionType.POWERED_SKIFF);
-        }
         // No known reduction for skiffing.
-        return new Consumption(ConsumptionType.SKIFF);
+        return switch (currentState) {
+            case MOTION_SKIFF_DASH -> new Consumption(ConsumptionType.SKIFF_DASH);
+            case MOTION_SKIFF_POWERED_DASH -> new Consumption(ConsumptionType.POWERED_SKIFF);
+            case MOTION_SKIFF_NORMAL -> new Consumption(ConsumptionType.SKIFF);
+            default -> new Consumption();
+        };
     }
 
     private Consumption getOtherConsumptions() {
@@ -662,11 +683,11 @@ public class StaminaManager {
         return new Consumption(ConsumptionType.FIGHT, +500);
     }
 
-    private Consumption getCatalystSustainedCost(int skillId) {
+    private Consumption getCatalystCost(int skillId) {
         Consumption consumption = new Consumption(ConsumptionType.FIGHT, -5000);
         // Character specific handling
         switch (skillId) {
-            // TODO: Yanfei
+            // TODO:
         }
         return consumption;
     }
@@ -675,11 +696,11 @@ public class StaminaManager {
         Consumption consumption = new Consumption(ConsumptionType.FIGHT, -1333); // 4000 / 3 = 1333
         // Character specific handling
         switch (skillId) {
-            case 10571: // Arataki Itto, does not consume stamina at all.
-            case 10532: // Sayu, windwheel does not consume stamina.
+            case 10571:
+            case 10532:
                 consumption.amount = 0;
                 break;
-            case 10160: // Diluc, with talent "Relentless" stamina cost is decreased by 50%
+            case 10160:
                 if (player.getTeamManager().getCurrentAvatarEntity().getAvatar().getProudSkillList().contains(162101)) {
                     consumption.amount /= 2;
                 }
@@ -688,7 +709,7 @@ public class StaminaManager {
         return consumption;
     }
 
-    private Consumption getPolearmSustainedCost(int skillId) {
+    private Consumption getPolearmCost(int skillId) {
         Consumption consumption = new Consumption(ConsumptionType.FIGHT, -2500);
         // Character specific handling
         switch (skillId) {
@@ -697,11 +718,11 @@ public class StaminaManager {
         return consumption;
     }
 
-    private Consumption getSwordSustainedCost(int skillId) {
+    private Consumption getSwordCost(int skillId) {
         Consumption consumption = new Consumption(ConsumptionType.FIGHT, -2000);
         // Character specific handling
         switch (skillId) {
-            case 10421: // Keqing, -2500
+            case 10421:
                 consumption.amount = -2500;
                 break;
         }
diff --git a/src/main/java/emu/grasscutter/game/player/Player.java b/src/main/java/emu/grasscutter/game/player/Player.java
index fd5343be8..58e500b97 100644
--- a/src/main/java/emu/grasscutter/game/player/Player.java
+++ b/src/main/java/emu/grasscutter/game/player/Player.java
@@ -1237,7 +1237,7 @@ public class Player {
 		} else if (prop == PlayerProperty.PROP_IS_TRANSFERABLE) { // 10009
 			if (!(0 <= value && value <= 1)) { return false; }
 		} else if (prop == PlayerProperty.PROP_MAX_STAMINA) { // 10010
-			if (!(value >= 0 && value <= StaminaManager.GlobalMaximumStamina)) { return false; }
+			if (!(value >= 0 && value <= StaminaManager.GlobalCharacterMaximumStamina)) { return false; }
 		} else if (prop == PlayerProperty.PROP_CUR_PERSIST_STAMINA) { // 10011
 			int playerMaximumStamina = getProperty(PlayerProperty.PROP_MAX_STAMINA);
 			if (!(value >= 0 && value <= playerMaximumStamina)) { return false; }
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerVehicleInteractReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerVehicleInteractReq.java
index 3baba9c5b..d45befa89 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerVehicleInteractReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerVehicleInteractReq.java
@@ -14,6 +14,7 @@ public class HandlerVehicleInteractReq extends PacketHandler {
 	@Override
 	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
 		VehicleInteractReqOuterClass.VehicleInteractReq req = VehicleInteractReqOuterClass.VehicleInteractReq.parseFrom(payload);
+		session.getPlayer().getStaminaManager().handleVehicleInteractReq(session, req.getEntityId(), req.getInteractType());
 		session.send(new PacketVehicleInteractRsp(session.getPlayer(), req.getEntityId(), req.getInteractType()));
 	}
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleStaminaNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleStaminaNotify.java
index 917bce387..0a6a315e3 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleStaminaNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleStaminaNotify.java
@@ -1,17 +1,16 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.VehicleStaminaNotifyOuterClass.VehicleStaminaNotify;
 
 public class PacketVehicleStaminaNotify extends BasePacket {
 
-	public PacketVehicleStaminaNotify(GameEntity entity, int newStamina) {
+	public PacketVehicleStaminaNotify(int vehicleId, float newStamina) {
 		super(PacketOpcodes.VehicleStaminaNotify);
 		VehicleStaminaNotify.Builder proto = VehicleStaminaNotify.newBuilder();
 
-		proto.setEntityId(entity.getId());
+		proto.setEntityId(vehicleId);
 		proto.setCurStamina(newStamina);
 
 		this.setData(proto.build());

From 226a29f7c20139ac5fe457c1545fef95ec912a7a Mon Sep 17 00:00:00 2001
From: gentlespoon <github@gentlespoon.com>
Date: Wed, 11 May 2022 17:15:32 -0700
Subject: [PATCH 18/59] Fix logging level

---
 .../game/managers/StaminaManager/StaminaManager.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java b/src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java
index 85225b4b8..1f452a667 100644
--- a/src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java
@@ -262,7 +262,7 @@ public class StaminaManager {
             }
         }
         int maxStamina = isCharacterStamina ? getMaxCharacterStamina() : getMaxVehicleStamina();
-        logger.warn((isCharacterStamina ? "C " : "V ") + currentStamina + "/" + maxStamina + "\t" + currentState + "\t" +
+        logger.trace((isCharacterStamina ? "C " : "V ") + currentStamina + "/" + maxStamina + "\t" + currentState + "\t" +
                 (isPlayerMoving() ? "moving" : "      ") + "\t(" + consumption.type + "," +
                 consumption.amount + ")");
         int newStamina = currentStamina + consumption.amount;

From 595234cc8411bad7d2534f79bbe7773b1f71bbf0 Mon Sep 17 00:00:00 2001
From: AnimeGitB <AnimeGitB@bigblueball.in>
Date: Wed, 11 May 2022 20:33:25 +0930
Subject: [PATCH 19/59] Add Inventory.payItems() method

---
 .../grasscutter/game/inventory/Inventory.java | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/src/main/java/emu/grasscutter/game/inventory/Inventory.java b/src/main/java/emu/grasscutter/game/inventory/Inventory.java
index 4a217ba54..2c0478dda 100644
--- a/src/main/java/emu/grasscutter/game/inventory/Inventory.java
+++ b/src/main/java/emu/grasscutter/game/inventory/Inventory.java
@@ -7,6 +7,7 @@ import java.util.List;
 
 import emu.grasscutter.GameConstants;
 import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.data.def.AvatarCostumeData;
 import emu.grasscutter.data.def.AvatarData;
 import emu.grasscutter.data.def.AvatarFlycloakData;
@@ -256,6 +257,52 @@ public class Inventory implements Iterable<GameItem> {
 					getPlayer().setCrystals(player.getCrystals() + count);
 		}
 	}
+
+	private int getVirtualItemCount(int itemId) {
+		switch (itemId) {
+			case 201:  // Primogem
+				return player.getPrimogems();
+			case 202:  // Mora
+				return player.getMora();
+			case 203:  // Genesis Crystals
+				return player.getCrystals();
+			default:
+				GameItem item = getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(itemId);  // What if we ever want to operate on weapons/relics/furniture? :S
+				return (item == null) ? 0 : item.getCount();
+		}
+	}
+
+	public boolean payItems(Collection<ItemParamData> items) {
+		return payItems(items, null);
+	}
+	
+	public synchronized boolean payItems(Collection<ItemParamData> costItems, ActionReason reason) {
+		// Make sure player has requisite items
+		for (ItemParamData cost : costItems) {
+			if (getVirtualItemCount(cost.getId()) < cost.getCount()) {
+				return false;
+			}
+		}
+		// All costs are satisfied, now remove them all
+		for (ItemParamData cost : costItems) {
+			switch (cost.getId()) {
+				case 201 ->  // Primogem
+					player.setPrimogems(player.getPrimogems() - cost.getCount());
+				case 202 ->  // Mora
+					player.setMora(player.getMora() - cost.getCount());
+				case 203 ->  // Genesis Crystals
+					player.setCrystals(player.getCrystals() - cost.getCount());
+				default ->
+					removeItem(getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(cost.getId()), cost.getCount());
+			}
+		}
+		
+		if (reason != null) {  // Do we need these?
+			// getPlayer().sendPacket(new PacketItemAddHintNotify(changedItems, reason));
+		}
+		// getPlayer().sendPacket(new PacketStoreItemChangeNotify(changedItems));
+		return true;
+	}
 	
 	public void removeItems(List<GameItem> items) {
 		// TODO Bulk delete

From b4d457d78a76aeee53a78e54262d3f2bb7d46701 Mon Sep 17 00:00:00 2001
From: AnimeGitB <AnimeGitB@bigblueball.in>
Date: Wed, 11 May 2022 21:53:25 +0930
Subject: [PATCH 20/59] Add some usage of Inventory.payItems() And add quantity
 to it

---
 .../grasscutter/game/gacha/GachaManager.java  | 10 +--
 .../grasscutter/game/inventory/Inventory.java | 20 +++--
 .../game/managers/InventoryManager.java       | 75 +++++--------------
 .../packet/recv/HandlerBuyGoodsReq.java       | 35 ++-------
 4 files changed, 39 insertions(+), 101 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
index f0baf65a9..c730a646a 100644
--- a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
@@ -13,6 +13,7 @@ import com.google.gson.reflect.TypeToken;
 import com.sun.nio.file.SensitivityWatchEventModifier;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.data.def.ItemData;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.avatar.Avatar;
@@ -127,13 +128,8 @@ public class GachaManager {
 		}
 
 		// Spend currency
-		if (banner.getCostItem() > 0) {
-			GameItem costItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(banner.getCostItem());
-			if (costItem == null || costItem.getCount() < times) {
-				return;
-			}
-			
-			player.getInventory().removeItem(costItem, times);
+		if (banner.getCostItem() > 0 && !player.getInventory().payItems(new ItemParamData[] {new ItemParamData(banner.getCostItem(), times)})) {
+			return;
 		}
 		
 		// Roll
diff --git a/src/main/java/emu/grasscutter/game/inventory/Inventory.java b/src/main/java/emu/grasscutter/game/inventory/Inventory.java
index 2c0478dda..6936ca066 100644
--- a/src/main/java/emu/grasscutter/game/inventory/Inventory.java
+++ b/src/main/java/emu/grasscutter/game/inventory/Inventory.java
@@ -272,14 +272,18 @@ public class Inventory implements Iterable<GameItem> {
 		}
 	}
 
-	public boolean payItems(Collection<ItemParamData> items) {
-		return payItems(items, null);
+	public boolean payItems(ItemParamData[] costItems) {
+		return payItems(costItems, 1, null);
+	}
+
+	public boolean payItems(ItemParamData[] costItems, int quantity) {
+		return payItems(costItems, quantity, null);
 	}
 	
-	public synchronized boolean payItems(Collection<ItemParamData> costItems, ActionReason reason) {
+	public synchronized boolean payItems(ItemParamData[] costItems, int quantity, ActionReason reason) {
 		// Make sure player has requisite items
 		for (ItemParamData cost : costItems) {
-			if (getVirtualItemCount(cost.getId()) < cost.getCount()) {
+			if (getVirtualItemCount(cost.getId()) < (cost.getCount() * quantity)) {
 				return false;
 			}
 		}
@@ -287,13 +291,13 @@ public class Inventory implements Iterable<GameItem> {
 		for (ItemParamData cost : costItems) {
 			switch (cost.getId()) {
 				case 201 ->  // Primogem
-					player.setPrimogems(player.getPrimogems() - cost.getCount());
+					player.setPrimogems(player.getPrimogems() - (cost.getCount() * quantity));
 				case 202 ->  // Mora
-					player.setMora(player.getMora() - cost.getCount());
+					player.setMora(player.getMora() - (cost.getCount() * quantity));
 				case 203 ->  // Genesis Crystals
-					player.setCrystals(player.getCrystals() - cost.getCount());
+					player.setCrystals(player.getCrystals() - (cost.getCount() * quantity));
 				default ->
-					removeItem(getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(cost.getId()), cost.getCount());
+					removeItem(getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(cost.getId()), cost.getCount() * quantity);
 			}
 		}
 		
diff --git a/src/main/java/emu/grasscutter/game/managers/InventoryManager.java b/src/main/java/emu/grasscutter/game/managers/InventoryManager.java
index f3b9c0293..f75f8b074 100644
--- a/src/main/java/emu/grasscutter/game/managers/InventoryManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/InventoryManager.java
@@ -1,6 +1,7 @@
 package emu.grasscutter.game.managers;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -496,27 +497,16 @@ public class InventoryManager {
 			return;
 		}
 		
-		// Make sure player has promote items
-		for (ItemParamData cost : nextPromoteData.getCostItems()) {
-			GameItem feedItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(cost.getId());
-			if (feedItem == null || feedItem.getCount() < cost.getCount()) {
-				return;
-			}
+		// Pay materials and mora if possible
+		ItemParamData[] costs = nextPromoteData.getCostItems();  // Can this be null?
+		if (nextPromoteData.getCoinCost() > 0) {
+			costs = Arrays.copyOf(costs, costs.length + 1);
+			costs[costs.length-1] = new ItemParamData(202, nextPromoteData.getCoinCost());
 		}
-		
-		// Mora check
-		if (player.getMora() >= nextPromoteData.getCoinCost()) {
-			player.setMora(player.getMora() - nextPromoteData.getCoinCost());
-		} else {
+		if (!player.getInventory().payItems(costs)) {
 			return;
 		}
 		
-		// Consume promote filler items
-		for (ItemParamData cost : nextPromoteData.getCostItems()) {
-			GameItem feedItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(cost.getId());
-			player.getInventory().removeItem(feedItem, cost.getCount());
-		}
-		
 		int oldPromoteLevel = weapon.getPromoteLevel();
 		weapon.setPromoteLevel(nextPromoteLevel);
 		weapon.save();
@@ -552,27 +542,16 @@ public class InventoryManager {
 			return;
 		}
 		
-		// Make sure player has cost items
-		for (ItemParamData cost : nextPromoteData.getCostItems()) {
-			GameItem feedItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(cost.getId());
-			if (feedItem == null || feedItem.getCount() < cost.getCount()) {
-				return;
-			}
+		// Pay materials and mora if possible
+		ItemParamData[] costs = nextPromoteData.getCostItems();  // Can this be null?
+		if (nextPromoteData.getCoinCost() > 0) {
+			costs = Arrays.copyOf(costs, costs.length + 1);
+			costs[costs.length-1] = new ItemParamData(202, nextPromoteData.getCoinCost());
 		}
-		
-		// Mora check
-		if (player.getMora() >= nextPromoteData.getCoinCost()) {
-			player.setMora(player.getMora() - nextPromoteData.getCoinCost());
-		} else {
+		if (!player.getInventory().payItems(costs)) {
 			return;
 		}
 		
-		// Consume promote filler items
-		for (ItemParamData cost : nextPromoteData.getCostItems()) {
-			GameItem feedItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(cost.getId());
-			player.getInventory().removeItem(feedItem, cost.getCount());
-		}
-		
 		// Update promote level
 		avatar.setPromoteLevel(nextPromoteLevel);
 		
@@ -764,33 +743,15 @@ public class InventoryManager {
 			return;
 		}
 		
-		// Make sure player has cost items
-		for (ItemParamData cost : proudSkill.getCostItems()) {
-			if (cost.getId() == 0) {
-				continue;
-			}
-			GameItem feedItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(cost.getId());
-			if (feedItem == null || feedItem.getCount() < cost.getCount()) {
-				return;
-			}
+		// Pay materials and mora if possible
+		List<ItemParamData> costs = proudSkill.getCostItems();  // Can this be null?
+		if (proudSkill.getCoinCost() > 0) {
+			costs.add(new ItemParamData(202, proudSkill.getCoinCost()));
 		}
-		
-		// Mora check
-		if (player.getMora() >= proudSkill.getCoinCost()) {
-			player.setMora(player.getMora() - proudSkill.getCoinCost());
-		} else {
+		if (!player.getInventory().payItems(costs.toArray(new ItemParamData[0]))) {
 			return;
 		}
 		
-		// Consume promote filler items
-		for (ItemParamData cost : proudSkill.getCostItems()) {
-			if (cost.getId() == 0) {
-				continue;
-			}
-			GameItem feedItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(cost.getId());
-			player.getInventory().removeItem(feedItem, cost.getCount());
-		}
-		
 		// Upgrade skill
 		avatar.getSkillLevelMap().put(skillId, nextLevel);
 		avatar.save();
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java
index 0a2c30802..fc9564734 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java
@@ -18,7 +18,7 @@ import emu.grasscutter.server.packet.send.PacketBuyGoodsRsp;
 import emu.grasscutter.server.packet.send.PacketStoreItemChangeNotify;
 import emu.grasscutter.utils.Utils;
 
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -56,36 +56,13 @@ public class HandlerBuyGoodsReq extends PacketHandler {
                 return;
             }
 
-            if (sg.getScoin() > 0 && session.getPlayer().getMora() < buyGoodsReq.getBoughtNum() * sg.getScoin()) {
+            List<ItemParamData> costs = sg.getCostItemList();  // Can this even be null?
+            costs.add(new ItemParamData(202, sg.getScoin()));
+            costs.add(new ItemParamData(201, sg.getHcoin()));
+            costs.add(new ItemParamData(203, sg.getMcoin()));
+            if (!session.getPlayer().getInventory().payItems(costs.toArray(new ItemParamData[0]), buyGoodsReq.getBoughtNum())) {
                 return;
             }
-            if (sg.getHcoin() > 0 && session.getPlayer().getPrimogems() < buyGoodsReq.getBoughtNum() * sg.getHcoin()) {
-                return;
-            }
-            if (sg.getMcoin() > 0 && session.getPlayer().getCrystals() < buyGoodsReq.getBoughtNum() * sg.getMcoin()) {
-                return;
-            }
-
-            HashMap<GameItem, Integer> itemsCache = new HashMap<>();
-            if (sg.getCostItemList() != null) {
-                for (ItemParamData p : sg.getCostItemList()) {
-                    Optional<GameItem> invItem = session.getPlayer().getInventory().getItems().values().stream().filter(x -> x.getItemId() == p.getId()).findFirst();
-                    if (invItem.isEmpty() || invItem.get().getCount() < p.getCount())
-                        return;
-                    itemsCache.put(invItem.get(), p.getCount() * buyGoodsReq.getBoughtNum());
-                }
-            }
-
-            session.getPlayer().setMora(session.getPlayer().getMora() - buyGoodsReq.getBoughtNum() * sg.getScoin());
-            session.getPlayer().setPrimogems(session.getPlayer().getPrimogems() - buyGoodsReq.getBoughtNum() * sg.getHcoin());
-            session.getPlayer().setCrystals(session.getPlayer().getCrystals() - buyGoodsReq.getBoughtNum() * sg.getMcoin());
-
-            if (!itemsCache.isEmpty()) {
-                for (GameItem gi : itemsCache.keySet()) {
-                    session.getPlayer().getInventory().removeItem(gi, itemsCache.get(gi));
-                }
-                itemsCache.clear();
-            }
 
             session.getPlayer().addShopLimit(sg.getGoodsId(), buyGoodsReq.getBoughtNum(), ShopManager.getShopNextRefreshTime(sg));
             GameItem item = new GameItem(GameData.getItemDataMap().get(sg.getGoodsItem().getId()));

From b787c70cb02f1579eb3f8a0369bbe202957c74e3 Mon Sep 17 00:00:00 2001
From: AnimeGitB <AnimeGitB@bigblueball.in>
Date: Wed, 11 May 2022 23:34:22 +0930
Subject: [PATCH 21/59] More usage of payItems

---
 .../grasscutter/game/gacha/GachaManager.java  |   2 +-
 .../grasscutter/game/inventory/Inventory.java |   8 +
 .../game/managers/InventoryManager.java       | 183 +++++++-----------
 3 files changed, 75 insertions(+), 118 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
index c730a646a..160377913 100644
--- a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
@@ -128,7 +128,7 @@ public class GachaManager {
 		}
 
 		// Spend currency
-		if (banner.getCostItem() > 0 && !player.getInventory().payItems(new ItemParamData[] {new ItemParamData(banner.getCostItem(), times)})) {
+		if (banner.getCostItem() > 0 && !player.getInventory().payItem(banner.getCostItem(), times)) {
 			return;
 		}
 		
diff --git a/src/main/java/emu/grasscutter/game/inventory/Inventory.java b/src/main/java/emu/grasscutter/game/inventory/Inventory.java
index 6936ca066..1af6038d9 100644
--- a/src/main/java/emu/grasscutter/game/inventory/Inventory.java
+++ b/src/main/java/emu/grasscutter/game/inventory/Inventory.java
@@ -272,6 +272,14 @@ public class Inventory implements Iterable<GameItem> {
 		}
 	}
 
+	public boolean payItem(int id, int count) {
+		return payItem(new ItemParamData(id, count));
+	}
+
+	public boolean payItem(ItemParamData costItem) {
+		return payItems(new ItemParamData[] {costItem}, 1, null);
+	}
+
 	public boolean payItems(ItemParamData[] costItems) {
 		return payItems(costItems, 1, null);
 	}
diff --git a/src/main/java/emu/grasscutter/game/managers/InventoryManager.java b/src/main/java/emu/grasscutter/game/managers/InventoryManager.java
index f75f8b074..7c0288318 100644
--- a/src/main/java/emu/grasscutter/game/managers/InventoryManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/InventoryManager.java
@@ -39,6 +39,8 @@ public class InventoryManager {
 	
 	private final static int RELIC_MATERIAL_1 = 105002; // Sanctifying Unction
 	private final static int RELIC_MATERIAL_2 = 105003; // Sanctifying Essence
+	private final static int RELIC_MATERIAL_EXP_1 = 2500; // Sanctifying Unction
+	private final static int RELIC_MATERIAL_EXP_2 = 10000; // Sanctifying Essence
 	
 	private final static int WEAPON_ORE_1 = 104011; // Enhancement Ore
 	private final static int WEAPON_ORE_2 = 104012; // Fine Enhancement Ore
@@ -86,6 +88,7 @@ public class InventoryManager {
 		int moraCost = 0;
 		int expGain = 0;
 		
+		List<GameItem> foodRelics = new ArrayList<GameItem>();
 		for (long guid : foodRelicList) {
 			// Add to delete queue
 			GameItem food = player.getInventory().getItemByGuid(guid);
@@ -97,23 +100,21 @@ public class InventoryManager {
 			expGain += food.getItemData().getBaseConvExp();
 			// Feeding artifact with exp already
 			if (food.getTotalExp() > 0) {
-				expGain += (int) Math.floor(food.getTotalExp() * .8f);
+				expGain += (food.getTotalExp() * 4) / 5;
 			}
+			foodRelics.add(food);
 		}
+		List<ItemParamData> payList = new ArrayList<ItemParamData>();
 		for (ItemParam itemParam : list) {
-			GameItem food = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(itemParam.getItemId());
-			if (food == null || food.getItemData().getMaterialType() != MaterialType.MATERIAL_RELIQUARY_MATERIAL) {
-				continue;
-			}
-			int amount = Math.min(food.getCount(), itemParam.getCount());
-			int gain = 0;
-			if (food.getItemId() == RELIC_MATERIAL_2) {
-				gain = 10000 * amount;
-			} else if (food.getItemId() == RELIC_MATERIAL_1) {
-				gain = 2500 * amount;
-			}
+			int amount = itemParam.getCount();  // Previously this capped to inventory amount, but rejecting the payment makes more sense for an invalid order
+			int gain = amount * switch(itemParam.getItemId()) {
+				case RELIC_MATERIAL_1 -> RELIC_MATERIAL_EXP_1;
+				case RELIC_MATERIAL_2 -> RELIC_MATERIAL_EXP_2;
+				default -> 0;
+			};
 			expGain += gain;
 			moraCost += gain;
+			payList.add(new ItemParamData(itemParam.getItemId(), itemParam.getCount()));
 		}
 		
 		// Make sure exp gain is valid
@@ -121,28 +122,14 @@ public class InventoryManager {
 			return;
 		}
 		
-		// Check mora
-		if (player.getMora() < moraCost) {
+		// Confirm payment of materials and mora (assume food relics are payable afterwards)
+		payList.add(new ItemParamData(202, moraCost));
+		if (!player.getInventory().payItems(payList.toArray(new ItemParamData[0]))) {
 			return;
 		}
-		player.setMora(player.getMora() - moraCost);
 		
-		// Consume food items
-		for (long guid : foodRelicList) {
-			GameItem food = player.getInventory().getItemByGuid(guid);
-			if (food == null || !food.isDestroyable()) {
-				continue;
-			}
-			player.getInventory().removeItem(food);
-		}
-		for (ItemParam itemParam : list) {
-			GameItem food = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(itemParam.getItemId());
-			if (food == null || food.getItemData().getMaterialType() != MaterialType.MATERIAL_RELIQUARY_MATERIAL) {
-				continue;
-			}
-			int amount = Math.min(food.getCount(), itemParam.getCount());
-			player.getInventory().removeItem(food, amount);
-		}
+		// Consume food relics
+		player.getInventory().removeItems(foodRelics);
 		
 		// Implement random rate boost
 		int rate = 1;
@@ -232,22 +219,16 @@ public class InventoryManager {
 			}
 			expGain += food.getItemData().getWeaponBaseExp();
 			if (food.getTotalExp() > 0) {
-				expGain += (int) Math.floor(food.getTotalExp() * .8f);
+				expGain += (food.getTotalExp() * 4) / 5;
 			}
 		}
 		for (ItemParam param : itemParamList) {
-			GameItem food = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(param.getItemId());
-			if (food == null || food.getItemData().getMaterialType() != MaterialType.MATERIAL_WEAPON_EXP_STONE) {
-				continue;
-			}
-			int amount = Math.min(param.getCount(), food.getCount());
-			if (food.getItemId() == WEAPON_ORE_3) {
-				expGain += 10000 * amount;
-			} else if (food.getItemId() == WEAPON_ORE_2) {
-				expGain += 2000 * amount;
-			} else if (food.getItemId() == WEAPON_ORE_1) {
-				expGain += 400 * amount;
-			}
+			expGain += param.getCount() * switch(param.getItemId()) {
+				case WEAPON_ORE_1 -> WEAPON_ORE_EXP_1;
+				case WEAPON_ORE_2 -> WEAPON_ORE_EXP_2;
+				case WEAPON_ORE_3 -> WEAPON_ORE_EXP_3;
+				default -> 0;
+			};
 		}
 		
 		// Try
@@ -289,65 +270,45 @@ public class InventoryManager {
 		}
 		
 		// Get exp gain
-		int expGain = 0, moraCost = 0;
-		
+		int expGain = 0, expGainFree = 0;
+		List<GameItem> foodWeapons = new ArrayList<GameItem>();
 		for (long guid : foodWeaponGuidList) {
 			GameItem food = player.getInventory().getItemByGuid(guid);
 			if (food == null || !food.isDestroyable()) {
 				continue;
 			}
 			expGain += food.getItemData().getWeaponBaseExp();
-			moraCost += (int) Math.floor(food.getItemData().getWeaponBaseExp() * .1f);
 			if (food.getTotalExp() > 0) {
-				expGain += (int) Math.floor(food.getTotalExp() * .8f);
+				expGainFree += (food.getTotalExp() * 4) / 5;  // No tax :D
 			}
+			foodWeapons.add(food);
 		}
+		List<ItemParamData> payList = new ArrayList<ItemParamData>();
 		for (ItemParam param : itemParamList) {
-			GameItem food = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(param.getItemId());
-			if (food == null || food.getItemData().getMaterialType() != MaterialType.MATERIAL_WEAPON_EXP_STONE) {
-				continue;
-			}
-			int amount = Math.min(param.getCount(), food.getCount());
-			int gain = 0;
-			if (food.getItemId() == WEAPON_ORE_3) {
-				gain = 10000 * amount;
-			} else if (food.getItemId() == WEAPON_ORE_2) {
-				gain = 2000 * amount;
-			} else if (food.getItemId() == WEAPON_ORE_1) {
-				gain = 400 * amount;
-			}
+			int amount = param.getCount();  // Previously this capped to inventory amount, but rejecting the payment makes more sense for an invalid order
+			int gain = amount * switch(param.getItemId()) {
+				case WEAPON_ORE_1 -> WEAPON_ORE_EXP_1;
+				case WEAPON_ORE_2 -> WEAPON_ORE_EXP_2;
+				case WEAPON_ORE_3 -> WEAPON_ORE_EXP_3;
+				default -> 0;
+			};
 			expGain += gain;
-			moraCost += (int) Math.floor(gain * .1f);
+			payList.add(new ItemParamData(param.getItemId(), amount));
 		}
 		
 		// Make sure exp gain is valid
+		int moraCost = expGain / 10;
+		expGain += expGainFree;
 		if (expGain <= 0) {
 			return;
 		}
-		
-		// Mora check
-		if (player.getMora() >= moraCost) {
-			player.setMora(player.getMora() - moraCost);
-		} else {
+
+		// Confirm payment of materials and mora (assume food weapons are payable afterwards)
+		payList.add(new ItemParamData(202, moraCost));
+		if (!player.getInventory().payItems(payList.toArray(new ItemParamData[0]))) {
 			return;
 		}
-		
-		// Consume weapon/items used to feed
-		for (long guid : foodWeaponGuidList) {
-			GameItem food = player.getInventory().getItemByGuid(guid);
-			if (food == null || !food.isDestroyable()) {
-				continue;
-			}
-			player.getInventory().removeItem(food);
-		}
-		for (ItemParam param : itemParamList) {
-			GameItem food = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(param.getItemId());
-			if (food == null || food.getItemData().getMaterialType() != MaterialType.MATERIAL_WEAPON_EXP_STONE) {
-				continue;
-			}
-			int amount = Math.min(param.getCount(), food.getCount());
-			player.getInventory().removeItem(food, amount);
-		}
+		player.getInventory().removeItems(foodWeapons);
 		
 		// Level up
 		int maxLevel = promoteData.getUnlockMaxLevel();
@@ -394,7 +355,7 @@ public class InventoryManager {
 		player.sendPacket(new PacketWeaponUpgradeRsp(weapon, oldLevel, leftovers));
 	}
 	
-	private List<ItemParam> getLeftoverOres(float leftover) {
+	private List<ItemParam> getLeftoverOres(int leftover) {
 		List<ItemParam> leftoverOreList = new ArrayList<>(3);
 		
 		if (leftover < WEAPON_ORE_EXP_1) {
@@ -402,11 +363,11 @@ public class InventoryManager {
 		}
 		
 		// Get leftovers
-		int ore3 = (int) Math.floor(leftover / WEAPON_ORE_EXP_3);
+		int ore3 = leftover / WEAPON_ORE_EXP_3;
 		leftover = leftover % WEAPON_ORE_EXP_3;
-		int ore2 = (int) Math.floor(leftover / WEAPON_ORE_EXP_2);
+		int ore2 = leftover / WEAPON_ORE_EXP_2;
 		leftover = leftover % WEAPON_ORE_EXP_2;
-		int ore1 = (int) Math.floor(leftover / WEAPON_ORE_EXP_1);
+		int ore1 = leftover / WEAPON_ORE_EXP_1;
 		
 		if (ore3 > 0) {
 			leftoverOreList.add(ItemParam.newBuilder().setItemId(WEAPON_ORE_3).setCount(ore3).build());
@@ -595,34 +556,25 @@ public class InventoryManager {
 			return;
 		}
 		
-		GameItem feedItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(itemId);
-		
-		if (feedItem == null || feedItem.getItemData().getMaterialType() != MaterialType.MATERIAL_EXP_FRUIT || feedItem.getCount() < count) {
-			return;
-		}
-		
 		// Calc exp
-		int expGain = 0, moraCost = 0;
+		int expGain = switch(itemId) {
+			case AVATAR_BOOK_1 -> AVATAR_BOOK_EXP_1 * count;
+			case AVATAR_BOOK_2 -> AVATAR_BOOK_EXP_2 * count;
+			case AVATAR_BOOK_3 -> AVATAR_BOOK_EXP_3 * count;
+			default -> 0;
+		};
 		
-		// TODO clean up
-		if (itemId == AVATAR_BOOK_3) {
-			expGain = AVATAR_BOOK_EXP_3 * count;
-		} else if (itemId == AVATAR_BOOK_2) {
-			expGain = AVATAR_BOOK_EXP_2 * count;
-		} else if (itemId == AVATAR_BOOK_1) {
-			expGain = AVATAR_BOOK_EXP_1 * count;
-		}
-		moraCost = (int) Math.floor(expGain * .2f);
-		
-		// Mora check
-		if (player.getMora() >= moraCost) {
-			player.setMora(player.getMora() - moraCost);
-		} else {
+		// Sanity check
+		if (expGain <= 0) {
+			return;
+		}
+
+		// Payment check
+		int moraCost = expGain / 5;
+		ItemParamData[] costItems = new ItemParamData[] {new ItemParamData(itemId, count), new ItemParamData(202, moraCost)};
+		if (!player.getInventory().payItems(costItems)) {
 			return;
 		}
-		
-		// Consume items
-		player.getInventory().removeItem(feedItem, count);
 		
 		// Level up
 		upgradeAvatar(player, avatar, promoteData, expGain);
@@ -783,14 +735,11 @@ public class InventoryManager {
 			return;
 		}
 		
-		GameItem costItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(talentData.getMainCostItemId());
-		if (costItem == null || costItem.getCount() < talentData.getMainCostItemCount()) {
+		// Pay constellation item if possible
+		if (!player.getInventory().payItem(talentData.getMainCostItemId(), 1)) {
 			return;
 		}
 		
-		// Consume item
-		player.getInventory().removeItem(costItem, talentData.getMainCostItemCount());
-		
 		// Apply + recalc
 		avatar.getTalentIdList().add(talentData.getId());
 		avatar.setCoreProudSkillLevel(currentTalentLevel + 1);

From f45e106b2afd877f045529695fb9d301963e7264 Mon Sep 17 00:00:00 2001
From: AnimeGitB <AnimeGitB@bigblueball.in>
Date: Thu, 12 May 2022 02:36:34 +0930
Subject: [PATCH 22/59] Fix immutable lists

---
 .../java/emu/grasscutter/game/managers/InventoryManager.java    | 2 +-
 .../emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/managers/InventoryManager.java b/src/main/java/emu/grasscutter/game/managers/InventoryManager.java
index 7c0288318..6efe945aa 100644
--- a/src/main/java/emu/grasscutter/game/managers/InventoryManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/InventoryManager.java
@@ -696,7 +696,7 @@ public class InventoryManager {
 		}
 		
 		// Pay materials and mora if possible
-		List<ItemParamData> costs = proudSkill.getCostItems();  // Can this be null?
+		List<ItemParamData> costs = new ArrayList<ItemParamData>(proudSkill.getCostItems());  // Can this be null?
 		if (proudSkill.getCoinCost() > 0) {
 			costs.add(new ItemParamData(202, proudSkill.getCoinCost()));
 		}
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java
index fc9564734..25cf05d24 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java
@@ -56,7 +56,7 @@ public class HandlerBuyGoodsReq extends PacketHandler {
                 return;
             }
 
-            List<ItemParamData> costs = sg.getCostItemList();  // Can this even be null?
+            List<ItemParamData> costs = new ArrayList<ItemParamData>(sg.getCostItemList());  // Can this even be null?
             costs.add(new ItemParamData(202, sg.getScoin()));
             costs.add(new ItemParamData(201, sg.getHcoin()));
             costs.add(new ItemParamData(203, sg.getMcoin()));

From 8c32438b52ae96c28231556b5647072fe870c99f Mon Sep 17 00:00:00 2001
From: Yazawazi <47273265+Yazawazi@users.noreply.github.com>
Date: Thu, 12 May 2022 16:06:59 +0800
Subject: [PATCH 23/59] feature(widget): simple implementation of widget

Simple implementation of a part of the gadget support, very rough, hard code variables, I am very sorry for that. It can now handle part of the gadget rig. More features and better support await PRs from others. if no one else does, I'll give it a try.
---
 .../emu/grasscutter/game/player/Player.java   | 13 ++++
 .../packet/recv/HandlerGetWidgetSlotReq.java  |  6 +-
 .../packet/recv/HandlerSetWidgetSlotReq.java  | 33 +++++++++++
 .../send/PacketAllWidgetDataNotify.java       | 59 +++++++++++++++++++
 .../packet/send/PacketGetWidgetSlotRsp.java   | 41 +++++++++++++
 .../packet/send/PacketSetWidgetSlotRsp.java   | 18 ++++++
 .../send/PacketWidgetGadgetAllDataNotify.java | 16 +++++
 .../send/PacketWidgetSlotChangeNotify.java    | 47 +++++++++++++++
 8 files changed, 232 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/emu/grasscutter/server/packet/recv/HandlerSetWidgetSlotReq.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketAllWidgetDataNotify.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketGetWidgetSlotRsp.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketSetWidgetSlotRsp.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketWidgetGadgetAllDataNotify.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketWidgetSlotChangeNotify.java

diff --git a/src/main/java/emu/grasscutter/game/player/Player.java b/src/main/java/emu/grasscutter/game/player/Player.java
index 58e500b97..0be6c7a54 100644
--- a/src/main/java/emu/grasscutter/game/player/Player.java
+++ b/src/main/java/emu/grasscutter/game/player/Player.java
@@ -82,6 +82,8 @@ public class Player {
 	private Set<Integer> flyCloakList;
 	private Set<Integer> costumeList;
 
+	private Integer widgetId;
+
 	@Transient private long nextGuid = 0;
 	@Transient private int peerId;
 	@Transient private World world;
@@ -297,6 +299,14 @@ public class Player {
 		this.updateProfile();
 	}
 
+	public Integer getWidgetId() {
+		return widgetId;
+	}
+
+	public void setWidgetId(Integer widgetId) {
+		this.widgetId = widgetId;
+	}
+
 	public Position getPos() {
 		return pos;
 	}
@@ -1141,6 +1151,9 @@ public class Player {
 		session.send(new PacketPlayerStoreNotify(this));
 		session.send(new PacketAvatarDataNotify(this));
 
+		session.send(new PacketAllWidgetDataNotify(this));
+		session.send(new PacketWidgetGadgetAllDataNotify());
+
 		getTodayMoonCard(); // The timer works at 0:0, some users log in after that, use this method to check if they have received a reward today or not. If not, send the reward.
 
 		session.send(new PacketPlayerEnterSceneNotify(this)); // Enter game world
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetWidgetSlotReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetWidgetSlotReq.java
index b41a6cc1d..e7b352122 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetWidgetSlotReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetWidgetSlotReq.java
@@ -1,16 +1,20 @@
 package emu.grasscutter.server.packet.recv;
 
+import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.packet.PacketHandler;
 import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketGetShopRsp;
+import emu.grasscutter.server.packet.send.PacketGetWidgetSlotRsp;
 
 @Opcodes(PacketOpcodes.GetWidgetSlotReq)
 public class HandlerGetWidgetSlotReq extends PacketHandler {
 	
 	@Override
 	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-		// Unhandled
+		Player player = session.getPlayer();
+		session.send(new PacketGetWidgetSlotRsp(player));
 	}
 	
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetWidgetSlotReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetWidgetSlotReq.java
new file mode 100644
index 000000000..6f55e2ab9
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetWidgetSlotReq.java
@@ -0,0 +1,33 @@
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.SetWidgetSlotReqOuterClass;
+import emu.grasscutter.net.proto.WidgetSlotOpOuterClass;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketSetWidgetSlotRsp;
+import emu.grasscutter.server.packet.send.PacketWidgetSlotChangeNotify;
+
+@Opcodes(PacketOpcodes.SetWidgetSlotReq)
+public class HandlerSetWidgetSlotReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        SetWidgetSlotReqOuterClass.SetWidgetSlotReq req = SetWidgetSlotReqOuterClass.SetWidgetSlotReq.parseFrom(payload);
+
+        Player player = session.getPlayer();
+        player.setWidgetId(req.getMaterialId());
+
+        // WidgetSlotChangeNotify op & slot key
+        session.send(new PacketWidgetSlotChangeNotify(WidgetSlotOpOuterClass.WidgetSlotOp.DETACH));
+        // WidgetSlotChangeNotify slot
+        session.send(new PacketWidgetSlotChangeNotify(req.getMaterialId()));
+
+        // SetWidgetSlotRsp
+        session.send(new PacketSetWidgetSlotRsp(req.getMaterialId()));
+    }
+
+}
+
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketAllWidgetDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketAllWidgetDataNotify.java
new file mode 100644
index 000000000..c52cc1594
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketAllWidgetDataNotify.java
@@ -0,0 +1,59 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.AllWidgetDataNotifyOuterClass.AllWidgetDataNotify;
+import emu.grasscutter.net.proto.LunchBoxDataOuterClass;
+import emu.grasscutter.net.proto.WidgetSlotDataOuterClass;
+import emu.grasscutter.net.proto.WidgetSlotTagOuterClass;
+
+import java.util.List;
+import java.util.Map;
+
+public class PacketAllWidgetDataNotify extends BasePacket {
+
+    public PacketAllWidgetDataNotify(Player player) {
+        super(PacketOpcodes.AllWidgetDataNotify);
+
+        // TODO: Implement this
+
+        AllWidgetDataNotify.Builder proto = AllWidgetDataNotify.newBuilder()
+                // If you want to implement this, feel free to do so. :)
+                .setLunchBoxData(
+                        LunchBoxDataOuterClass.LunchBoxData.newBuilder().build()
+                )
+                // Maybe it's a little difficult, or it makes you upset :(
+                .addAllOneoffGatherPointDetectorDataList(List.of())
+                // So, goodbye, and hopefully sometime in the future o(*￣▽￣*)ブ
+                .addAllCoolDownGroupDataList(List.of())
+                // I'll see your PR with a title that says (・∀・(・∀・(・∀・*)
+                .addAllAnchorPointList(List.of())
+                // "Complete implementation of widget functionality" b（￣▽￣）d　
+                .addAllClientCollectorDataList(List.of())
+                // Good luck, my boy.
+                .addAllNormalCoolDownDataList(List.of());
+
+        if (player.getWidgetId() == null) {
+            proto.addAllSlotList(List.of());
+        } else {
+            proto.addSlotList(
+                    WidgetSlotDataOuterClass.WidgetSlotData.newBuilder()
+                            .setIsActive(true)
+                            .setMaterialId(player.getWidgetId())
+                            .build()
+            );
+
+            proto.addSlotList(
+                    WidgetSlotDataOuterClass.WidgetSlotData.newBuilder()
+                            .setTag(WidgetSlotTagOuterClass.WidgetSlotTag.WIDGET_SLOT_ATTACH_AVATAR)
+                            .build()
+            );
+        }
+
+        AllWidgetDataNotify protoData = proto.build();
+
+        this.setData(protoData);
+    }
+}
+
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetWidgetSlotRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetWidgetSlotRsp.java
new file mode 100644
index 000000000..a4e8a2ea9
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetWidgetSlotRsp.java
@@ -0,0 +1,41 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass;
+import emu.grasscutter.net.proto.WidgetSlotDataOuterClass;
+import emu.grasscutter.net.proto.WidgetSlotTagOuterClass;
+
+import java.util.List;
+
+public class PacketGetWidgetSlotRsp extends BasePacket {
+
+    public PacketGetWidgetSlotRsp(Player player) {
+        super(PacketOpcodes.GetWidgetSlotRsp);
+
+        GetWidgetSlotRspOuterClass.GetWidgetSlotRsp.Builder proto =
+                GetWidgetSlotRspOuterClass.GetWidgetSlotRsp.newBuilder();
+
+        if (player.getWidgetId() == null) {
+            proto.addAllSlotList(List.of());
+        } else {
+            proto.addSlotList(
+                    WidgetSlotDataOuterClass.WidgetSlotData.newBuilder()
+                            .setIsActive(true)
+                            .setMaterialId(player.getWidgetId())
+                            .build()
+            );
+
+            proto.addSlotList(
+                    WidgetSlotDataOuterClass.WidgetSlotData.newBuilder()
+                            .setTag(WidgetSlotTagOuterClass.WidgetSlotTag.WIDGET_SLOT_ATTACH_AVATAR)
+                            .build()
+            );
+        }
+
+        GetWidgetSlotRspOuterClass.GetWidgetSlotRsp protoData = proto.build();
+
+        this.setData(protoData);
+    }
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSetWidgetSlotRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSetWidgetSlotRsp.java
new file mode 100644
index 000000000..0f81afa85
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetWidgetSlotRsp.java
@@ -0,0 +1,18 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass;
+
+public class PacketSetWidgetSlotRsp extends BasePacket {
+
+    public PacketSetWidgetSlotRsp(int materialId) {
+        super(PacketOpcodes.SetWidgetSlotRsp);
+
+        SetWidgetSlotRspOuterClass.SetWidgetSlotRsp proto = SetWidgetSlotRspOuterClass.SetWidgetSlotRsp.newBuilder()
+                .setMaterialId(materialId)
+                .build();
+
+        this.setData(proto);
+    }
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetGadgetAllDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetGadgetAllDataNotify.java
new file mode 100644
index 000000000..b0000efb7
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetGadgetAllDataNotify.java
@@ -0,0 +1,16 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.WidgetGadgetAllDataNotifyOuterClass.WidgetGadgetAllDataNotify;
+
+public class PacketWidgetGadgetAllDataNotify extends BasePacket {
+
+    public PacketWidgetGadgetAllDataNotify() {
+        super(PacketOpcodes.AllWidgetDataNotify);
+
+        WidgetGadgetAllDataNotify proto = WidgetGadgetAllDataNotify.newBuilder().build();
+
+        this.setData(proto);
+    }
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetSlotChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetSlotChangeNotify.java
new file mode 100644
index 000000000..ab0ace7eb
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetSlotChangeNotify.java
@@ -0,0 +1,47 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.WidgetSlotChangeNotifyOuterClass;
+import emu.grasscutter.net.proto.WidgetSlotDataOuterClass;
+import emu.grasscutter.net.proto.WidgetSlotOpOuterClass;
+
+public class PacketWidgetSlotChangeNotify extends BasePacket {
+
+    public PacketWidgetSlotChangeNotify(WidgetSlotChangeNotifyOuterClass.WidgetSlotChangeNotify proto) {
+        super(PacketOpcodes.WidgetSlotChangeNotify);
+
+        this.setData(proto);
+    }
+
+    public PacketWidgetSlotChangeNotify(WidgetSlotOpOuterClass.WidgetSlotOp op) {
+        super(PacketOpcodes.WidgetSlotChangeNotify);
+
+        WidgetSlotChangeNotifyOuterClass.WidgetSlotChangeNotify proto = WidgetSlotChangeNotifyOuterClass.WidgetSlotChangeNotify.newBuilder()
+                .setOp(op)
+                .setSlot(
+                        WidgetSlotDataOuterClass.WidgetSlotData.newBuilder()
+                                .setIsActive(true)
+                                .build()
+                )
+                .build();
+
+        this.setData(proto);
+    }
+
+    public PacketWidgetSlotChangeNotify(int materialId) {
+        super(PacketOpcodes.WidgetSlotChangeNotify);
+
+        WidgetSlotChangeNotifyOuterClass.WidgetSlotChangeNotify proto = WidgetSlotChangeNotifyOuterClass.WidgetSlotChangeNotify.newBuilder()
+                .setSlot(
+                        WidgetSlotDataOuterClass.WidgetSlotData.newBuilder()
+                                .setIsActive(true)
+                                .setMaterialId(materialId)
+                                .build()
+                )
+                .build();
+
+        this.setData(proto);
+    }
+
+}

From 1231802192a66b3e15390d811efefe91877f6d77 Mon Sep 17 00:00:00 2001
From: Melledy <52122272+Melledy@users.noreply.github.com>
Date: Thu, 12 May 2022 02:30:34 -0700
Subject: [PATCH 24/59] Implement basic quest condition handling

Quests that require talking to npcs now work.
---
 .../data/custom/QuestConfigData.java          |   6 +-
 .../emu/grasscutter/game/quest/GameQuest.java |  36 ++-
 .../grasscutter/game/quest/QuestManager.java  |  64 +++++
 .../grasscutter/game/quest/QuestValue.java    |  11 +
 .../game/quest/ServerQuestHandler.java        |  91 +++++++
 .../game/quest/conditions/BaseCondition.java  |  18 ++
 .../ConditionPlayerLevelEqualGreater.java     |  17 ++
 .../quest/conditions/ConditionStateEqual.java |  23 ++
 .../game/quest/content/BaseContent.java       |  18 ++
 .../quest/content/ContentCompleteTalk.java    |  17 ++
 .../game/quest/enums/LogicType.java           |  20 ++
 .../game/quest/enums/QuestCondType.java       |  92 -------
 .../game/quest/enums/QuestExecType.java       |  82 ------
 .../game/quest/enums/QuestTriggerType.java    | 235 ++++++++++++++++++
 .../game/quest/handlers/QuestBaseHandler.java |  10 +
 .../grasscutter/server/game/GameServer.java   |  10 +-
 .../server/packet/recv/HandlerNpcTalkReq.java |   3 +
 17 files changed, 566 insertions(+), 187 deletions(-)
 create mode 100644 src/main/java/emu/grasscutter/game/quest/QuestValue.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/ServerQuestHandler.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/conditions/BaseCondition.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/conditions/ConditionPlayerLevelEqualGreater.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateEqual.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/content/BaseContent.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java
 delete mode 100644 src/main/java/emu/grasscutter/game/quest/enums/QuestCondType.java
 delete mode 100644 src/main/java/emu/grasscutter/game/quest/enums/QuestExecType.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/enums/QuestTriggerType.java
 create mode 100644 src/main/java/emu/grasscutter/game/quest/handlers/QuestBaseHandler.java

diff --git a/src/main/java/emu/grasscutter/data/custom/QuestConfigData.java b/src/main/java/emu/grasscutter/data/custom/QuestConfigData.java
index 4ba0ce47c..3ede024f2 100644
--- a/src/main/java/emu/grasscutter/data/custom/QuestConfigData.java
+++ b/src/main/java/emu/grasscutter/data/custom/QuestConfigData.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.data.custom;
 
 import emu.grasscutter.game.quest.enums.LogicType;
-import emu.grasscutter.game.quest.enums.QuestCondType;
+import emu.grasscutter.game.quest.enums.QuestTriggerType;
 import emu.grasscutter.game.quest.enums.QuestType;
 
 public class QuestConfigData {
@@ -90,10 +90,10 @@ public class QuestConfigData {
 	}
 	
 	public class QuestCondition {
-		private QuestCondType type;
+		private QuestTriggerType type;
 		private int[] param;
 		
-		public QuestCondType getType() {
+		public QuestTriggerType getType() {
 			return type;
 		}
 		
diff --git a/src/main/java/emu/grasscutter/game/quest/GameQuest.java b/src/main/java/emu/grasscutter/game/quest/GameQuest.java
index 53599830c..d3a240a07 100644
--- a/src/main/java/emu/grasscutter/game/quest/GameQuest.java
+++ b/src/main/java/emu/grasscutter/game/quest/GameQuest.java
@@ -3,10 +3,13 @@ package emu.grasscutter.game.quest;
 import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.Transient;
 import emu.grasscutter.data.custom.QuestConfig;
+import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
 import emu.grasscutter.data.custom.QuestConfigData.SubQuestConfigData;
 import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.enums.LogicType;
 import emu.grasscutter.game.quest.enums.QuestState;
 import emu.grasscutter.net.proto.QuestOuterClass.Quest;
+import emu.grasscutter.server.packet.send.PacketQuestListUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketQuestProgressUpdateNotify;
 import emu.grasscutter.utils.Utils;
 
@@ -137,19 +140,34 @@ public class GameQuest {
 		}
 		
 		this.getOwner().getSession().send(new PacketQuestProgressUpdateNotify(this));
-		
-		// Finish main quest if all child quests are done
-		this.tryFinishMainQuest();
+		this.getOwner().getSession().send(new PacketQuestListUpdateNotify(this));
 		this.save();
+		
+		this.tryAcceptQuestLine();
 	}
 	
-	public boolean tryFinishMainQuest() {
+	public boolean tryAcceptQuestLine() {
 		try {
-			SubQuestConfigData subQuestData = getConfig().getMainQuest().getSubQuests()[getConfig().getMainQuest().getSubQuests().length - 1];
-			
-			if (subQuestData.getSubId() == this.getQuestId()) {
-				getMainQuest().finish();
-				return true;
+			for (SubQuestConfigData questData : getConfig().getMainQuest().getSubQuests()) {
+				GameQuest quest = getMainQuest().getChildQuestById(questData.getSubId());
+				
+				if (quest == null) {
+					int[] accept = new int[questData.getAcceptCond().length];
+							
+					// TODO
+					for (int i = 0; i < questData.getAcceptCond().length; i++) {
+						QuestCondition condition = questData.getAcceptCond()[i];
+						boolean result = getOwner().getServer().getQuestHandler().triggerCondition(this, condition);
+						
+						accept[i] = result ? 1 : 0;
+					}
+					
+					boolean shouldAccept = LogicType.calculate(questData.getAcceptCondComb(), accept);
+					
+					if (shouldAccept) {
+						this.getOwner().getQuestManager().addQuest(questData.getSubId());
+					}
+				}
 			}
 		} catch (Exception e) {
 			
diff --git a/src/main/java/emu/grasscutter/game/quest/QuestManager.java b/src/main/java/emu/grasscutter/game/quest/QuestManager.java
index e1c26704c..76c098b07 100644
--- a/src/main/java/emu/grasscutter/game/quest/QuestManager.java
+++ b/src/main/java/emu/grasscutter/game/quest/QuestManager.java
@@ -1,16 +1,25 @@
 package emu.grasscutter.game.quest;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.custom.QuestConfig;
+import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
+import emu.grasscutter.data.custom.QuestConfigData.SubQuestConfigData;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.enums.QuestTriggerType;
+import emu.grasscutter.game.quest.enums.LogicType;
 import emu.grasscutter.game.quest.enums.QuestState;
 import emu.grasscutter.server.packet.send.PacketFinishedParentQuestUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketQuestListUpdateNotify;
+import emu.grasscutter.server.packet.send.PacketQuestProgressUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketServerCondMeetQuestListUpdateNotify;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
@@ -59,6 +68,17 @@ public class QuestManager {
 		}
 	}
 	
+	// TODO
+	public void forEachActiveQuest(Consumer<GameQuest> callback) {
+		for (GameMainQuest mainQuest : getQuests().values()) {
+			for (GameQuest quest : mainQuest.getChildQuests().values()) {
+				if (quest.getState() != QuestState.QUEST_STATE_FINISHED) {
+					callback.accept(quest);
+				}
+			}
+		}
+	}
+	
 	public GameMainQuest addMainQuest(QuestConfig questConfig) {
 		GameMainQuest mainQuest = new GameMainQuest(getPlayer(), questConfig.getMainQuest().getId());
 		getQuests().put(mainQuest.getParentQuestId(), mainQuest);
@@ -101,6 +121,50 @@ public class QuestManager {
 
 		return quest;
 	}
+	
+	public void triggerEvent(QuestTriggerType condType, int... params) {
+		Set<GameQuest> changedQuests = new HashSet<>();
+		
+		this.forEachActiveQuest(quest -> {
+			SubQuestConfigData data = quest.getConfig().getSubQuest();
+			
+			for (int i = 0; i < data.getFinishCond().length; i++) {
+				if (quest.getFinishProgressList()[i] == 1) {
+					continue;
+				}
+				
+				QuestCondition condition = data.getFinishCond()[i];
+				
+				if (condition.getType() != condType) {
+					continue;
+				}
+				
+				boolean result = getPlayer().getServer().getQuestHandler().triggerContent(quest, condition, params);
+				
+				if (result) {
+					quest.getFinishProgressList()[i] = 1;
+					
+					changedQuests.add(quest);
+				}
+			}
+		});
+		
+		for (GameQuest quest : changedQuests) {
+			LogicType logicType = quest.getConfig().getSubQuest().getFailCondComb();
+			int[] progress = quest.getFinishProgressList();
+			
+			// Handle logical comb
+			boolean finish = LogicType.calculate(logicType, progress);
+
+			// Finish
+			if (finish) {
+				quest.finish();
+			} else {
+				getPlayer().sendPacket(new PacketQuestProgressUpdateNotify(quest));
+				quest.save();
+			}
+		}
+	}
 
 	public void loadFromDatabase() {
 		List<GameMainQuest> quests = DatabaseHelper.getAllQuests(getPlayer());
diff --git a/src/main/java/emu/grasscutter/game/quest/QuestValue.java b/src/main/java/emu/grasscutter/game/quest/QuestValue.java
new file mode 100644
index 000000000..3042ad5de
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/QuestValue.java
@@ -0,0 +1,11 @@
+package emu.grasscutter.game.quest;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import emu.grasscutter.game.quest.enums.QuestTriggerType;
+
+@Retention(RetentionPolicy.RUNTIME) 
+public @interface QuestValue {
+	QuestTriggerType value();
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/ServerQuestHandler.java b/src/main/java/emu/grasscutter/game/quest/ServerQuestHandler.java
new file mode 100644
index 000000000..1c269de90
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/ServerQuestHandler.java
@@ -0,0 +1,91 @@
+package emu.grasscutter.game.quest;
+
+import java.util.Set;
+
+import org.reflections.Reflections;
+
+import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
+import emu.grasscutter.game.quest.enums.QuestTriggerType;
+import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.server.game.GameServer;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+
+@SuppressWarnings("unchecked")
+public class ServerQuestHandler {
+	private final Int2ObjectMap<QuestBaseHandler> condHandlers;
+	private final Int2ObjectMap<QuestBaseHandler> contHandlers;
+	private final Int2ObjectMap<QuestBaseHandler> execHandlers;
+	
+	public ServerQuestHandler() {
+		this.condHandlers = new Int2ObjectOpenHashMap<>(); 
+		this.contHandlers = new Int2ObjectOpenHashMap<>();
+		this.execHandlers = new Int2ObjectOpenHashMap<>();
+		
+		this.registerHandlers();
+	}
+
+	public void registerHandlers() {
+		this.registerHandlers(this.condHandlers, "emu.grasscutter.game.quest.conditions");
+		this.registerHandlers(this.contHandlers, "emu.grasscutter.game.quest.content");
+		this.registerHandlers(this.execHandlers, "emu.grasscutter.game.quest.exec");
+	}
+	
+	public void registerHandlers(Int2ObjectMap<QuestBaseHandler> map, String packageName) {
+		Reflections reflections = new Reflections(packageName);
+		Set<?> handlerClasses = reflections.getSubTypesOf(QuestBaseHandler.class);
+		
+		for (Object obj : handlerClasses) {
+			this.registerPacketHandler(map, (Class<? extends QuestBaseHandler>) obj);
+		}
+	}
+
+	public void registerPacketHandler(Int2ObjectMap<QuestBaseHandler> map, Class<? extends QuestBaseHandler> handlerClass) {
+		try {
+			QuestValue opcode = handlerClass.getAnnotation(QuestValue.class);
+
+			if (opcode == null || opcode.value().getValue() <= 0) {
+				return;
+			}
+
+			QuestBaseHandler packetHandler = (QuestBaseHandler) handlerClass.newInstance();
+
+			map.put(opcode.value().getValue(), packetHandler);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	
+	// TODO make cleaner
+	
+	public boolean triggerCondition(GameQuest quest, QuestCondition condition, int... params) {
+		QuestBaseHandler handler = condHandlers.get(condition.getType().getValue());
+
+		if (handler == null || quest.getConfig() == null) {
+			return false;
+		}
+		
+		return handler.execute(quest, condition, params);
+	}
+	
+	public boolean triggerContent(GameQuest quest, QuestCondition condition, int... params) {
+		QuestBaseHandler handler = contHandlers.get(condition.getType().getValue());
+
+		if (handler == null || quest.getConfig() == null) {
+			return false;
+		}
+		
+		return handler.execute(quest, condition, params);
+	}
+	
+	public boolean triggerExec(GameQuest quest, QuestCondition condition, int... params) {
+		QuestBaseHandler handler = execHandlers.get(condition.getType().getValue());
+
+		if (handler == null || quest.getConfig() == null) {
+			return false;
+		}
+		
+		return handler.execute(quest, condition, params);
+	}
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/BaseCondition.java b/src/main/java/emu/grasscutter/game/quest/conditions/BaseCondition.java
new file mode 100644
index 000000000..903773f0e
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/BaseCondition.java
@@ -0,0 +1,18 @@
+package emu.grasscutter.game.quest.conditions;
+
+import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
+import emu.grasscutter.game.quest.QuestValue;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.enums.QuestTriggerType;
+import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
+
+@QuestValue(QuestTriggerType.QUEST_CONTENT_NONE)
+public class BaseCondition extends QuestBaseHandler {
+
+	@Override
+	public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+	
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionPlayerLevelEqualGreater.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionPlayerLevelEqualGreater.java
new file mode 100644
index 000000000..f5df2b13c
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionPlayerLevelEqualGreater.java
@@ -0,0 +1,17 @@
+package emu.grasscutter.game.quest.conditions;
+
+import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
+import emu.grasscutter.game.quest.QuestValue;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.enums.QuestTriggerType;
+import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
+
+@QuestValue(QuestTriggerType.QUEST_COND_PLAYER_LEVEL_EQUAL_GREATER)
+public class ConditionPlayerLevelEqualGreater extends QuestBaseHandler {
+
+	@Override
+	public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
+		return quest.getOwner().getLevel() >= condition.getParam()[0];
+	}
+	
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateEqual.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateEqual.java
new file mode 100644
index 000000000..71b44c967
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateEqual.java
@@ -0,0 +1,23 @@
+package emu.grasscutter.game.quest.conditions;
+
+import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
+import emu.grasscutter.game.quest.QuestValue;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.enums.QuestTriggerType;
+import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
+
+@QuestValue(QuestTriggerType.QUEST_COND_STATE_EQUAL)
+public class ConditionStateEqual extends QuestBaseHandler {
+
+	@Override
+	public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
+		GameQuest checkQuest = quest.getOwner().getQuestManager().getQuestById(condition.getParam()[0]);
+		
+		if (checkQuest != null) {
+			return checkQuest.getState().getValue() == condition.getParam()[1];
+		}
+		
+		return false; 
+	}
+	
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/content/BaseContent.java b/src/main/java/emu/grasscutter/game/quest/content/BaseContent.java
new file mode 100644
index 000000000..820d6f133
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/content/BaseContent.java
@@ -0,0 +1,18 @@
+package emu.grasscutter.game.quest.content;
+
+import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
+import emu.grasscutter.game.quest.QuestValue;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.enums.QuestTriggerType;
+import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
+
+@QuestValue(QuestTriggerType.QUEST_CONTENT_NONE)
+public class BaseContent extends QuestBaseHandler {
+
+	@Override
+	public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+	
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java b/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java
new file mode 100644
index 000000000..aad196306
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java
@@ -0,0 +1,17 @@
+package emu.grasscutter.game.quest.content;
+
+import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
+import emu.grasscutter.game.quest.QuestValue;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.enums.QuestTriggerType;
+import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
+
+@QuestValue(QuestTriggerType.QUEST_CONTENT_COMPLETE_TALK)
+public class ContentCompleteTalk extends QuestBaseHandler {
+
+	@Override
+	public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
+		return condition.getParam()[0] == params[0];
+	}
+	
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/LogicType.java b/src/main/java/emu/grasscutter/game/quest/enums/LogicType.java
index 608ec9c28..12677ee0d 100644
--- a/src/main/java/emu/grasscutter/game/quest/enums/LogicType.java
+++ b/src/main/java/emu/grasscutter/game/quest/enums/LogicType.java
@@ -1,5 +1,7 @@
 package emu.grasscutter.game.quest.enums;
 
+import java.util.Arrays;
+
 public enum LogicType {
 	LOGIC_NONE (0),
 	LOGIC_AND (1),
@@ -20,4 +22,22 @@ public enum LogicType {
 	public int getValue() {
 		return value;
 	}
+	
+	public static boolean calculate(LogicType logicType, int[] progress) {
+		if (logicType == null) {
+			return progress[0] == 1;
+		}
+		
+		switch (logicType) {
+		case LOGIC_AND -> {
+			return Arrays.stream(progress).allMatch(i -> i == 1);
+		}
+		case LOGIC_OR -> {
+			return Arrays.stream(progress).anyMatch(i -> i == 1);
+		}
+		default	-> {
+			return Arrays.stream(progress).anyMatch(i -> i == 1);
+		}
+	}
+	}
 }
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/QuestCondType.java b/src/main/java/emu/grasscutter/game/quest/enums/QuestCondType.java
deleted file mode 100644
index 42db14f2d..000000000
--- a/src/main/java/emu/grasscutter/game/quest/enums/QuestCondType.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package emu.grasscutter.game.quest.enums;
-
-public enum QuestCondType {
-	QUEST_COND_NONE (0),
-	QUEST_COND_STATE_EQUAL (1),
-	QUEST_COND_STATE_NOT_EQUAL (2),
-	QUEST_COND_PACK_HAVE_ITEM (3),
-	QUEST_COND_AVATAR_ELEMENT_EQUAL (4),
-	QUEST_COND_AVATAR_ELEMENT_NOT_EQUAL (5),
-	QUEST_COND_AVATAR_CAN_CHANGE_ELEMENT (6),
-	QUEST_COND_CITY_LEVEL_EQUAL_GREATER (7),
-	QUEST_COND_ITEM_NUM_LESS_THAN (8),
-	QUEST_COND_DAILY_TASK_START (9),
-	QUEST_COND_OPEN_STATE_EQUAL (10),
-	QUEST_COND_DAILY_TASK_OPEN (11),
-	QUEST_COND_DAILY_TASK_REWARD_CAN_GET (12),
-	QUEST_COND_DAILY_TASK_REWARD_RECEIVED (13),
-	QUEST_COND_PLAYER_LEVEL_REWARD_CAN_GET (14),
-	QUEST_COND_EXPLORATION_REWARD_CAN_GET (15),
-	QUEST_COND_IS_WORLD_OWNER (16),
-	QUEST_COND_PLAYER_LEVEL_EQUAL_GREATER (17),
-	QUEST_COND_SCENE_AREA_UNLOCKED (18),
-	QUEST_COND_ITEM_GIVING_ACTIVED (19),
-	QUEST_COND_ITEM_GIVING_FINISHED (20),
-	QUEST_COND_IS_DAYTIME (21),
-	QUEST_COND_CURRENT_AVATAR (22),
-	QUEST_COND_CURRENT_AREA (23),
-	QUEST_COND_QUEST_VAR_EQUAL (24),
-	QUEST_COND_QUEST_VAR_GREATER (25),
-	QUEST_COND_QUEST_VAR_LESS (26),
-	QUEST_COND_FORGE_HAVE_FINISH (27),
-	QUEST_COND_DAILY_TASK_IN_PROGRESS (28),
-	QUEST_COND_DAILY_TASK_FINISHED (29),
-	QUEST_COND_ACTIVITY_COND (30),
-	QUEST_COND_ACTIVITY_OPEN (31),
-	QUEST_COND_DAILY_TASK_VAR_GT (32),
-	QUEST_COND_DAILY_TASK_VAR_EQ (33),
-	QUEST_COND_DAILY_TASK_VAR_LT (34),
-	QUEST_COND_BARGAIN_ITEM_GT (35),
-	QUEST_COND_BARGAIN_ITEM_EQ (36),
-	QUEST_COND_BARGAIN_ITEM_LT (37),
-	QUEST_COND_COMPLETE_TALK (38),
-	QUEST_COND_NOT_HAVE_BLOSSOM_TALK (39),
-	QUEST_COND_IS_CUR_BLOSSOM_TALK (40),
-	QUEST_COND_QUEST_NOT_RECEIVE (41),
-	QUEST_COND_QUEST_SERVER_COND_VALID (42),
-	QUEST_COND_ACTIVITY_CLIENT_COND (43),
-	QUEST_COND_QUEST_GLOBAL_VAR_EQUAL (44),
-	QUEST_COND_QUEST_GLOBAL_VAR_GREATER (45),
-	QUEST_COND_QUEST_GLOBAL_VAR_LESS (46),
-	QUEST_COND_PERSONAL_LINE_UNLOCK (47),
-	QUEST_COND_CITY_REPUTATION_REQUEST (48),
-	QUEST_COND_MAIN_COOP_START (49),
-	QUEST_COND_MAIN_COOP_ENTER_SAVE_POINT (50),
-	QUEST_COND_CITY_REPUTATION_LEVEL (51),
-	QUEST_COND_CITY_REPUTATION_UNLOCK (52),
-	QUEST_COND_LUA_NOTIFY (53),
-	QUEST_COND_CUR_CLIMATE (54),
-	QUEST_COND_ACTIVITY_END (55),
-	QUEST_COND_COOP_POINT_RUNNING (56),
-	QUEST_COND_GADGET_TALK_STATE_EQUAL (57),
-	QUEST_COND_AVATAR_FETTER_GT (58),
-	QUEST_COND_AVATAR_FETTER_EQ (59),
-	QUEST_COND_AVATAR_FETTER_LT (60),
-	QUEST_COND_NEW_HOMEWORLD_MOUDLE_UNLOCK (61),
-	QUEST_COND_NEW_HOMEWORLD_LEVEL_REWARD (62),
-	QUEST_COND_NEW_HOMEWORLD_MAKE_FINISH (63),
-	QUEST_COND_HOMEWORLD_NPC_EVENT (64),
-	QUEST_COND_TIME_VAR_GT_EQ (65),
-	QUEST_COND_TIME_VAR_PASS_DAY (66),
-	QUEST_COND_HOMEWORLD_NPC_NEW_TALK (67),
-	QUEST_COND_PLAYER_CHOOSE_MALE (68),
-	QUEST_COND_HISTORY_GOT_ANY_ITEM (69),
-	QUEST_COND_LEARNED_RECIPE (70),
-	QUEST_COND_LUNARITE_REGION_UNLOCKED (71),
-	QUEST_COND_LUNARITE_HAS_REGION_HINT_COUNT (72),
-	QUEST_COND_LUNARITE_COLLECT_FINISH (73),
-	QUEST_COND_LUNARITE_MARK_ALL_FINISH (74),
-	QUEST_COND_NEW_HOMEWORLD_SHOP_ITEM (75),
-	QUEST_COND_SCENE_POINT_UNLOCK (76),
-	QUEST_COND_SCENE_LEVEL_TAG_EQ (77);
-	
-	private final int value;
-	
-	QuestCondType(int id) {
-		this.value = id;
-	}
-
-	public int getValue() {
-		return value;
-	}
-}
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/QuestExecType.java b/src/main/java/emu/grasscutter/game/quest/enums/QuestExecType.java
deleted file mode 100644
index 4f3c2557c..000000000
--- a/src/main/java/emu/grasscutter/game/quest/enums/QuestExecType.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package emu.grasscutter.game.quest.enums;
-
-public enum QuestExecType {
-	QUEST_EXEC_NONE (0),
-	QUEST_EXEC_DEL_PACK_ITEM (1),
-	QUEST_EXEC_UNLOCK_POINT (2),
-	QUEST_EXEC_UNLOCK_AREA (3),
-	QUEST_EXEC_UNLOCK_FORCE (4),
-	QUEST_EXEC_LOCK_FORCE (5),
-	QUEST_EXEC_CHANGE_AVATAR_ELEMET (6),
-	QUEST_EXEC_REFRESH_GROUP_MONSTER (7),
-	QUEST_EXEC_SET_IS_FLYABLE (8),
-	QUEST_EXEC_SET_IS_WEATHER_LOCKED (9),
-	QUEST_EXEC_SET_IS_GAME_TIME_LOCKED (10),
-	QUEST_EXEC_SET_IS_TRANSFERABLE (11),
-	QUEST_EXEC_GRANT_TRIAL_AVATAR (12),
-	QUEST_EXEC_OPEN_BORED (13),
-	QUEST_EXEC_ROLLBACK_QUEST (14),
-	QUEST_EXEC_NOTIFY_GROUP_LUA (15),
-	QUEST_EXEC_SET_OPEN_STATE (16),
-	QUEST_EXEC_LOCK_POINT (17),
-	QUEST_EXEC_DEL_PACK_ITEM_BATCH (18),
-	QUEST_EXEC_REFRESH_GROUP_SUITE (19),
-	QUEST_EXEC_REMOVE_TRIAL_AVATAR (20),
-	QUEST_EXEC_SET_GAME_TIME (21),
-	QUEST_EXEC_SET_WEATHER_GADGET (22),
-	QUEST_EXEC_ADD_QUEST_PROGRESS (23),
-	QUEST_EXEC_NOTIFY_DAILY_TASK (24),
-	QUEST_EXEC_CREATE_PATTERN_GROUP (25),
-	QUEST_EXEC_REMOVE_PATTERN_GROUP (26),
-	QUEST_EXEC_REFRESH_GROUP_SUITE_RANDOM (27),
-	QUEST_EXEC_ACTIVE_ITEM_GIVING (28),
-	QUEST_EXEC_DEL_ALL_SPECIFIC_PACK_ITEM (29),
-	QUEST_EXEC_ROLLBACK_PARENT_QUEST (30),
-	QUEST_EXEC_LOCK_AVATAR_TEAM (31),
-	QUEST_EXEC_UNLOCK_AVATAR_TEAM (32),
-	QUEST_EXEC_UPDATE_PARENT_QUEST_REWARD_INDEX (33),
-	QUEST_EXEC_SET_DAILY_TASK_VAR (34),
-	QUEST_EXEC_INC_DAILY_TASK_VAR (35),
-	QUEST_EXEC_DEC_DAILY_TASK_VAR (36),
-	QUEST_EXEC_ACTIVE_ACTIVITY_COND_STATE (37),
-	QUEST_EXEC_INACTIVE_ACTIVITY_COND_STATE (38),
-	QUEST_EXEC_ADD_CUR_AVATAR_ENERGY (39),
-	QUEST_EXEC_START_BARGAIN (41),
-	QUEST_EXEC_STOP_BARGAIN (42),
-	QUEST_EXEC_SET_QUEST_GLOBAL_VAR (43),
-	QUEST_EXEC_INC_QUEST_GLOBAL_VAR (44),
-	QUEST_EXEC_DEC_QUEST_GLOBAL_VAR (45),
-	QUEST_EXEC_REGISTER_DYNAMIC_GROUP (46),
-	QUEST_EXEC_UNREGISTER_DYNAMIC_GROUP (47),
-	QUEST_EXEC_SET_QUEST_VAR (48),
-	QUEST_EXEC_INC_QUEST_VAR (49),
-	QUEST_EXEC_DEC_QUEST_VAR (50),
-	QUEST_EXEC_RANDOM_QUEST_VAR (51),
-	QUEST_EXEC_ACTIVATE_SCANNING_PIC (52),
-	QUEST_EXEC_RELOAD_SCENE_TAG (53),
-	QUEST_EXEC_REGISTER_DYNAMIC_GROUP_ONLY (54),
-	QUEST_EXEC_CHANGE_SKILL_DEPOT (55),
-	QUEST_EXEC_ADD_SCENE_TAG (56),
-	QUEST_EXEC_DEL_SCENE_TAG (57),
-	QUEST_EXEC_INIT_TIME_VAR (58),
-	QUEST_EXEC_CLEAR_TIME_VAR (59),
-	QUEST_EXEC_MODIFY_CLIMATE_AREA (60),
-	QUEST_EXEC_GRANT_TRIAL_AVATAR_AND_LOCK_TEAM (61),
-	QUEST_EXEC_CHANGE_MAP_AREA_STATE (62),
-	QUEST_EXEC_DEACTIVE_ITEM_GIVING (63),
-	QUEST_EXEC_CHANGE_SCENE_LEVEL_TAG (64),
-	QUEST_EXEC_UNLOCK_PLAYER_WORLD_SCENE (65),
-	QUEST_EXEC_LOCK_PLAYER_WORLD_SCENE (66),
-	QUEST_EXEC_FAIL_MAINCOOP (67),
-	QUEST_EXEC_MODIFY_WEATHER_AREA (68);
-	
-	private final int value;
-	
-	QuestExecType(int id) {
-		this.value = id;
-	}
-
-	public int getValue() {
-		return value;
-	}
-}
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/QuestTriggerType.java b/src/main/java/emu/grasscutter/game/quest/enums/QuestTriggerType.java
new file mode 100644
index 000000000..cf8dabdba
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/enums/QuestTriggerType.java
@@ -0,0 +1,235 @@
+package emu.grasscutter.game.quest.enums;
+
+public enum QuestTriggerType {
+	QUEST_COND_NONE (0),
+	QUEST_COND_STATE_EQUAL (1),
+	QUEST_COND_STATE_NOT_EQUAL (2),
+	QUEST_COND_PACK_HAVE_ITEM (3),
+	QUEST_COND_AVATAR_ELEMENT_EQUAL (4),
+	QUEST_COND_AVATAR_ELEMENT_NOT_EQUAL (5),
+	QUEST_COND_AVATAR_CAN_CHANGE_ELEMENT (6),
+	QUEST_COND_CITY_LEVEL_EQUAL_GREATER (7),
+	QUEST_COND_ITEM_NUM_LESS_THAN (8),
+	QUEST_COND_DAILY_TASK_START (9),
+	QUEST_COND_OPEN_STATE_EQUAL (10),
+	QUEST_COND_DAILY_TASK_OPEN (11),
+	QUEST_COND_DAILY_TASK_REWARD_CAN_GET (12),
+	QUEST_COND_DAILY_TASK_REWARD_RECEIVED (13),
+	QUEST_COND_PLAYER_LEVEL_REWARD_CAN_GET (14),
+	QUEST_COND_EXPLORATION_REWARD_CAN_GET (15),
+	QUEST_COND_IS_WORLD_OWNER (16),
+	QUEST_COND_PLAYER_LEVEL_EQUAL_GREATER (17),
+	QUEST_COND_SCENE_AREA_UNLOCKED (18),
+	QUEST_COND_ITEM_GIVING_ACTIVED (19),
+	QUEST_COND_ITEM_GIVING_FINISHED (20),
+	QUEST_COND_IS_DAYTIME (21),
+	QUEST_COND_CURRENT_AVATAR (22),
+	QUEST_COND_CURRENT_AREA (23),
+	QUEST_COND_QUEST_VAR_EQUAL (24),
+	QUEST_COND_QUEST_VAR_GREATER (25),
+	QUEST_COND_QUEST_VAR_LESS (26),
+	QUEST_COND_FORGE_HAVE_FINISH (27),
+	QUEST_COND_DAILY_TASK_IN_PROGRESS (28),
+	QUEST_COND_DAILY_TASK_FINISHED (29),
+	QUEST_COND_ACTIVITY_COND (30),
+	QUEST_COND_ACTIVITY_OPEN (31),
+	QUEST_COND_DAILY_TASK_VAR_GT (32),
+	QUEST_COND_DAILY_TASK_VAR_EQ (33),
+	QUEST_COND_DAILY_TASK_VAR_LT (34),
+	QUEST_COND_BARGAIN_ITEM_GT (35),
+	QUEST_COND_BARGAIN_ITEM_EQ (36),
+	QUEST_COND_BARGAIN_ITEM_LT (37),
+	QUEST_COND_COMPLETE_TALK (38),
+	QUEST_COND_NOT_HAVE_BLOSSOM_TALK (39),
+	QUEST_COND_IS_CUR_BLOSSOM_TALK (40),
+	QUEST_COND_QUEST_NOT_RECEIVE (41),
+	QUEST_COND_QUEST_SERVER_COND_VALID (42),
+	QUEST_COND_ACTIVITY_CLIENT_COND (43),
+	QUEST_COND_QUEST_GLOBAL_VAR_EQUAL (44),
+	QUEST_COND_QUEST_GLOBAL_VAR_GREATER (45),
+	QUEST_COND_QUEST_GLOBAL_VAR_LESS (46),
+	QUEST_COND_PERSONAL_LINE_UNLOCK (47),
+	QUEST_COND_CITY_REPUTATION_REQUEST (48),
+	QUEST_COND_MAIN_COOP_START (49),
+	QUEST_COND_MAIN_COOP_ENTER_SAVE_POINT (50),
+	QUEST_COND_CITY_REPUTATION_LEVEL (51),
+	QUEST_COND_CITY_REPUTATION_UNLOCK (52),
+	QUEST_COND_LUA_NOTIFY (53),
+	QUEST_COND_CUR_CLIMATE (54),
+	QUEST_COND_ACTIVITY_END (55),
+	QUEST_COND_COOP_POINT_RUNNING (56),
+	QUEST_COND_GADGET_TALK_STATE_EQUAL (57),
+	QUEST_COND_AVATAR_FETTER_GT (58),
+	QUEST_COND_AVATAR_FETTER_EQ (59),
+	QUEST_COND_AVATAR_FETTER_LT (60),
+	QUEST_COND_NEW_HOMEWORLD_MOUDLE_UNLOCK (61),
+	QUEST_COND_NEW_HOMEWORLD_LEVEL_REWARD (62),
+	QUEST_COND_NEW_HOMEWORLD_MAKE_FINISH (63),
+	QUEST_COND_HOMEWORLD_NPC_EVENT (64),
+	QUEST_COND_TIME_VAR_GT_EQ (65),
+	QUEST_COND_TIME_VAR_PASS_DAY (66),
+	QUEST_COND_HOMEWORLD_NPC_NEW_TALK (67),
+	QUEST_COND_PLAYER_CHOOSE_MALE (68),
+	QUEST_COND_HISTORY_GOT_ANY_ITEM (69),
+	QUEST_COND_LEARNED_RECIPE (70),
+	QUEST_COND_LUNARITE_REGION_UNLOCKED (71),
+	QUEST_COND_LUNARITE_HAS_REGION_HINT_COUNT (72),
+	QUEST_COND_LUNARITE_COLLECT_FINISH (73),
+	QUEST_COND_LUNARITE_MARK_ALL_FINISH (74),
+	QUEST_COND_NEW_HOMEWORLD_SHOP_ITEM (75),
+	QUEST_COND_SCENE_POINT_UNLOCK (76),
+	QUEST_COND_SCENE_LEVEL_TAG_EQ (77),
+	
+	QUEST_CONTENT_NONE (0),
+	QUEST_CONTENT_KILL_MONSTER (1),
+	QUEST_CONTENT_COMPLETE_TALK (2),
+	QUEST_CONTENT_MONSTER_DIE (3),
+	QUEST_CONTENT_FINISH_PLOT (4),
+	QUEST_CONTENT_OBTAIN_ITEM (5),
+	QUEST_CONTENT_TRIGGER_FIRE (6),
+	QUEST_CONTENT_CLEAR_GROUP_MONSTER (7),
+	QUEST_CONTENT_NOT_FINISH_PLOT (8),
+	QUEST_CONTENT_ENTER_DUNGEON (9),
+	QUEST_CONTENT_ENTER_MY_WORLD (10),
+	QUEST_CONTENT_FINISH_DUNGEON (11),
+	QUEST_CONTENT_DESTROY_GADGET (12),
+	QUEST_CONTENT_OBTAIN_MATERIAL_WITH_SUBTYPE (13),
+	QUEST_CONTENT_NICK_NAME (14),
+	QUEST_CONTENT_WORKTOP_SELECT (15),
+	QUEST_CONTENT_SEAL_BATTLE_RESULT (16),
+	QUEST_CONTENT_ENTER_ROOM (17),
+	QUEST_CONTENT_GAME_TIME_TICK (18),
+	QUEST_CONTENT_FAIL_DUNGEON (19),
+	QUEST_CONTENT_LUA_NOTIFY (20),
+	QUEST_CONTENT_TEAM_DEAD (21),
+	QUEST_CONTENT_COMPLETE_ANY_TALK (22),
+	QUEST_CONTENT_UNLOCK_TRANS_POINT (23),
+	QUEST_CONTENT_ADD_QUEST_PROGRESS (24),
+	QUEST_CONTENT_INTERACT_GADGET (25),
+	QUEST_CONTENT_DAILY_TASK_COMP_FINISH (26),
+	QUEST_CONTENT_FINISH_ITEM_GIVING (27),
+	QUEST_CONTENT_SKILL (107),
+	QUEST_CONTENT_CITY_LEVEL_UP (109),
+	QUEST_CONTENT_PATTERN_GROUP_CLEAR_MONSTER (110),
+	QUEST_CONTENT_ITEM_LESS_THAN (111),
+	QUEST_CONTENT_PLAYER_LEVEL_UP (112),
+	QUEST_CONTENT_DUNGEON_OPEN_STATUE (113),
+	QUEST_CONTENT_UNLOCK_AREA (114),
+	QUEST_CONTENT_OPEN_CHEST_WITH_GADGET_ID (115),
+	QUEST_CONTENT_UNLOCK_TRANS_POINT_WITH_TYPE (116),
+	QUEST_CONTENT_FINISH_DAILY_DUNGEON (117),
+	QUEST_CONTENT_FINISH_WEEKLY_DUNGEON (118),
+	QUEST_CONTENT_QUEST_VAR_EQUAL (119),
+	QUEST_CONTENT_QUEST_VAR_GREATER (120),
+	QUEST_CONTENT_QUEST_VAR_LESS (121),
+	QUEST_CONTENT_OBTAIN_VARIOUS_ITEM (122),
+	QUEST_CONTENT_FINISH_TOWER_LEVEL (123),
+	QUEST_CONTENT_BARGAIN_SUCC (124),
+	QUEST_CONTENT_BARGAIN_FAIL (125),
+	QUEST_CONTENT_ITEM_LESS_THAN_BARGAIN (126),
+	QUEST_CONTENT_ACTIVITY_TRIGGER_FAILED (127),
+	QUEST_CONTENT_MAIN_COOP_ENTER_SAVE_POINT (128),
+	QUEST_CONTENT_ANY_MANUAL_TRANSPORT (129),
+	QUEST_CONTENT_USE_ITEM (130),
+	QUEST_CONTENT_MAIN_COOP_ENTER_ANY_SAVE_POINT (131),
+	QUEST_CONTENT_ENTER_MY_HOME_WORLD (132),
+	QUEST_CONTENT_ENTER_MY_WORLD_SCENE (133),
+	QUEST_CONTENT_TIME_VAR_GT_EQ (134),
+	QUEST_CONTENT_TIME_VAR_PASS_DAY (135),
+	QUEST_CONTENT_QUEST_STATE_EQUAL (136),
+	QUEST_CONTENT_QUEST_STATE_NOT_EQUAL (137),
+	QUEST_CONTENT_UNLOCKED_RECIPE (138),
+	QUEST_CONTENT_NOT_UNLOCKED_RECIPE (139),
+	QUEST_CONTENT_FISHING_SUCC (140),
+	QUEST_CONTENT_ENTER_ROGUE_DUNGEON (141),
+	QUEST_CONTENT_USE_WIDGET (142),
+	QUEST_CONTENT_CAPTURE_SUCC (143),
+	QUEST_CONTENT_CAPTURE_USE_CAPTURETAG_LIST (144),
+	QUEST_CONTENT_CAPTURE_USE_MATERIAL_LIST (145),
+	QUEST_CONTENT_ENTER_VEHICLE (147),
+	QUEST_CONTENT_SCENE_LEVEL_TAG_EQ (148),
+	QUEST_CONTENT_LEAVE_SCENE (149),
+	QUEST_CONTENT_LEAVE_SCENE_RANGE (150),
+	QUEST_CONTENT_IRODORI_FINISH_FLOWER_COMBINATION (151),
+	QUEST_CONTENT_IRODORI_POETRY_REACH_MIN_PROGRESS (152),
+	QUEST_CONTENT_IRODORI_POETRY_FINISH_FILL_POETRY (153),
+	
+	QUEST_EXEC_NONE (0),
+	QUEST_EXEC_DEL_PACK_ITEM (1),
+	QUEST_EXEC_UNLOCK_POINT (2),
+	QUEST_EXEC_UNLOCK_AREA (3),
+	QUEST_EXEC_UNLOCK_FORCE (4),
+	QUEST_EXEC_LOCK_FORCE (5),
+	QUEST_EXEC_CHANGE_AVATAR_ELEMET (6),
+	QUEST_EXEC_REFRESH_GROUP_MONSTER (7),
+	QUEST_EXEC_SET_IS_FLYABLE (8),
+	QUEST_EXEC_SET_IS_WEATHER_LOCKED (9),
+	QUEST_EXEC_SET_IS_GAME_TIME_LOCKED (10),
+	QUEST_EXEC_SET_IS_TRANSFERABLE (11),
+	QUEST_EXEC_GRANT_TRIAL_AVATAR (12),
+	QUEST_EXEC_OPEN_BORED (13),
+	QUEST_EXEC_ROLLBACK_QUEST (14),
+	QUEST_EXEC_NOTIFY_GROUP_LUA (15),
+	QUEST_EXEC_SET_OPEN_STATE (16),
+	QUEST_EXEC_LOCK_POINT (17),
+	QUEST_EXEC_DEL_PACK_ITEM_BATCH (18),
+	QUEST_EXEC_REFRESH_GROUP_SUITE (19),
+	QUEST_EXEC_REMOVE_TRIAL_AVATAR (20),
+	QUEST_EXEC_SET_GAME_TIME (21),
+	QUEST_EXEC_SET_WEATHER_GADGET (22),
+	QUEST_EXEC_ADD_QUEST_PROGRESS (23),
+	QUEST_EXEC_NOTIFY_DAILY_TASK (24),
+	QUEST_EXEC_CREATE_PATTERN_GROUP (25),
+	QUEST_EXEC_REMOVE_PATTERN_GROUP (26),
+	QUEST_EXEC_REFRESH_GROUP_SUITE_RANDOM (27),
+	QUEST_EXEC_ACTIVE_ITEM_GIVING (28),
+	QUEST_EXEC_DEL_ALL_SPECIFIC_PACK_ITEM (29),
+	QUEST_EXEC_ROLLBACK_PARENT_QUEST (30),
+	QUEST_EXEC_LOCK_AVATAR_TEAM (31),
+	QUEST_EXEC_UNLOCK_AVATAR_TEAM (32),
+	QUEST_EXEC_UPDATE_PARENT_QUEST_REWARD_INDEX (33),
+	QUEST_EXEC_SET_DAILY_TASK_VAR (34),
+	QUEST_EXEC_INC_DAILY_TASK_VAR (35),
+	QUEST_EXEC_DEC_DAILY_TASK_VAR (36),
+	QUEST_EXEC_ACTIVE_ACTIVITY_COND_STATE (37),
+	QUEST_EXEC_INACTIVE_ACTIVITY_COND_STATE (38),
+	QUEST_EXEC_ADD_CUR_AVATAR_ENERGY (39),
+	QUEST_EXEC_START_BARGAIN (41),
+	QUEST_EXEC_STOP_BARGAIN (42),
+	QUEST_EXEC_SET_QUEST_GLOBAL_VAR (43),
+	QUEST_EXEC_INC_QUEST_GLOBAL_VAR (44),
+	QUEST_EXEC_DEC_QUEST_GLOBAL_VAR (45),
+	QUEST_EXEC_REGISTER_DYNAMIC_GROUP (46),
+	QUEST_EXEC_UNREGISTER_DYNAMIC_GROUP (47),
+	QUEST_EXEC_SET_QUEST_VAR (48),
+	QUEST_EXEC_INC_QUEST_VAR (49),
+	QUEST_EXEC_DEC_QUEST_VAR (50),
+	QUEST_EXEC_RANDOM_QUEST_VAR (51),
+	QUEST_EXEC_ACTIVATE_SCANNING_PIC (52),
+	QUEST_EXEC_RELOAD_SCENE_TAG (53),
+	QUEST_EXEC_REGISTER_DYNAMIC_GROUP_ONLY (54),
+	QUEST_EXEC_CHANGE_SKILL_DEPOT (55),
+	QUEST_EXEC_ADD_SCENE_TAG (56),
+	QUEST_EXEC_DEL_SCENE_TAG (57),
+	QUEST_EXEC_INIT_TIME_VAR (58),
+	QUEST_EXEC_CLEAR_TIME_VAR (59),
+	QUEST_EXEC_MODIFY_CLIMATE_AREA (60),
+	QUEST_EXEC_GRANT_TRIAL_AVATAR_AND_LOCK_TEAM (61),
+	QUEST_EXEC_CHANGE_MAP_AREA_STATE (62),
+	QUEST_EXEC_DEACTIVE_ITEM_GIVING (63),
+	QUEST_EXEC_CHANGE_SCENE_LEVEL_TAG (64),
+	QUEST_EXEC_UNLOCK_PLAYER_WORLD_SCENE (65),
+	QUEST_EXEC_LOCK_PLAYER_WORLD_SCENE (66),
+	QUEST_EXEC_FAIL_MAINCOOP (67),
+	QUEST_EXEC_MODIFY_WEATHER_AREA (68);
+	
+	private final int value;
+	
+	QuestTriggerType(int id) {
+		this.value = id;
+	}
+
+	public int getValue() {
+		return value;
+	}
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/handlers/QuestBaseHandler.java b/src/main/java/emu/grasscutter/game/quest/handlers/QuestBaseHandler.java
new file mode 100644
index 000000000..68bf88361
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/handlers/QuestBaseHandler.java
@@ -0,0 +1,10 @@
+package emu.grasscutter.game.quest.handlers;
+
+import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
+import emu.grasscutter.game.quest.GameQuest;
+
+public abstract class QuestBaseHandler {
+	
+	public abstract boolean execute(GameQuest quest, QuestCondition condition, int... params);
+	
+}
diff --git a/src/main/java/emu/grasscutter/server/game/GameServer.java b/src/main/java/emu/grasscutter/server/game/GameServer.java
index 71e1cf856..f44aa1bc4 100644
--- a/src/main/java/emu/grasscutter/server/game/GameServer.java
+++ b/src/main/java/emu/grasscutter/server/game/GameServer.java
@@ -14,6 +14,8 @@ import emu.grasscutter.game.managers.ChatManager;
 import emu.grasscutter.game.managers.InventoryManager;
 import emu.grasscutter.game.managers.MultiplayerManager;
 import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.ServerQuestHandler;
+import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
 import emu.grasscutter.game.shop.ShopManager;
 import emu.grasscutter.game.tower.TowerScheduleManager;
 import emu.grasscutter.game.world.World;
@@ -37,7 +39,8 @@ import static emu.grasscutter.Configuration.*;
 public final class GameServer extends KcpServer {
 	private final InetSocketAddress address;
 	private final GameServerPacketHandler packetHandler;
-
+	private final ServerQuestHandler questHandler;
+	
 	private final Map<Integer, Player> players;
 	private final Set<World> worlds;
 	
@@ -68,6 +71,7 @@ public final class GameServer extends KcpServer {
 		this.setServerInitializer(new GameServerInitializer(this));
 		this.address = address;
 		this.packetHandler = new GameServerPacketHandler(PacketHandler.class);
+		this.questHandler = new ServerQuestHandler();
 		this.players = new ConcurrentHashMap<>();
 		this.worlds = Collections.synchronizedSet(new HashSet<>());
 		
@@ -91,6 +95,10 @@ public final class GameServer extends KcpServer {
 		return packetHandler;
 	}
 
+	public ServerQuestHandler getQuestHandler() {
+		return questHandler;
+	}
+
 	public Map<Integer, Player> getPlayers() {
 		return players;
 	}
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java
index 309d7e2e2..515552289 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java
@@ -1,6 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.quest.enums.QuestTriggerType;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq;
@@ -14,6 +15,8 @@ public class HandlerNpcTalkReq extends PacketHandler {
 	@Override
 	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
 		NpcTalkReq req = NpcTalkReq.parseFrom(payload);
+		
+		session.getPlayer().getQuestManager().triggerEvent(QuestTriggerType.QUEST_CONTENT_COMPLETE_TALK, req.getTalkId());
 
 		session.send(new PacketNpcTalkRsp(req.getNpcEntityId(), req.getTalkId(), req.getEntityId()));
 	}

From 8c71af26f0e6ad8ef91a446ff1ad49ad4c3c74d0 Mon Sep 17 00:00:00 2001
From: gentlespoon <github@gentlespoon.com>
Date: Thu, 12 May 2022 02:13:04 -0700
Subject: [PATCH 25/59] Clean up map mark related code

1. Remove unnecessary manager from player collection.
2. Clean up MarkMapReq handler.
3. Remove redundant checks.
---
 .../game/managers/MapMarkManager/MapMark.java | 57 ++++-------
 .../MapMarkManager/MapMarksManager.java       | 99 ++++++++++++-------
 .../emu/grasscutter/game/player/Player.java   | 11 ++-
 .../server/packet/recv/HandlerMarkMapReq.java | 69 +------------
 .../server/packet/send/PacketMarkMapRsp.java  |  2 +-
 5 files changed, 93 insertions(+), 145 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/managers/MapMarkManager/MapMark.java b/src/main/java/emu/grasscutter/game/managers/MapMarkManager/MapMark.java
index 2dcbf7972..5e8a6b2dd 100644
--- a/src/main/java/emu/grasscutter/game/managers/MapMarkManager/MapMark.java
+++ b/src/main/java/emu/grasscutter/game/managers/MapMarkManager/MapMark.java
@@ -1,29 +1,29 @@
 package emu.grasscutter.game.managers.MapMarkManager;
 
 import dev.morphia.annotations.Entity;
-import emu.grasscutter.net.proto.MapMarkFromTypeOuterClass;
-import emu.grasscutter.net.proto.MapMarkPointOuterClass;
-import emu.grasscutter.net.proto.MapMarkPointTypeOuterClass;
+import emu.grasscutter.net.proto.MapMarkFromTypeOuterClass.MapMarkFromType;
+import emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint;
+import emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.MapMarkPointType;
 import emu.grasscutter.utils.Position;
 
 @Entity
 public class MapMark {
-    private int sceneId;
-    private String name;
-    private Position position;
-    private MapMarkPointTypeOuterClass.MapMarkPointType pointType;
-    private int monsterId = 0;
-    private  MapMarkFromTypeOuterClass.MapMarkFromType fromType;
-    private int questId = 7;
+    private final int sceneId;
+    private final String name;
+    private final Position position;
+    private final MapMarkPointType pointType;
+    private final int monsterId;
+    private final MapMarkFromType fromType;
+    private final int questId;
 
-    public MapMark(Position position, MapMarkPointTypeOuterClass.MapMarkPointType type) {
-        this.position = position;
-    }
-
-    public MapMark(MapMarkPointOuterClass.MapMarkPoint mapMarkPoint) {
+    public MapMark(MapMarkPoint mapMarkPoint) {
         this.sceneId = mapMarkPoint.getSceneId();
         this.name = mapMarkPoint.getName();
-        this.position = new Position(mapMarkPoint.getPos().getX(), mapMarkPoint.getPos().getY(), mapMarkPoint.getPos().getZ());
+        this.position = new Position(
+                mapMarkPoint.getPos().getX(),
+                mapMarkPoint.getPos().getY(),
+                mapMarkPoint.getPos().getZ()
+        );
         this.pointType = mapMarkPoint.getPointType();
         this.monsterId = mapMarkPoint.getMonsterId();
         this.fromType = mapMarkPoint.getFromType();
@@ -33,41 +33,22 @@ public class MapMark {
     public int getSceneId() {
         return this.sceneId;
     }
-
     public String getName() {
         return this.name;
     }
-
     public Position getPosition() {
         return this.position;
     }
-
-    public MapMarkPointTypeOuterClass.MapMarkPointType getMapMarkPointType() {
+    public MapMarkPointType getMapMarkPointType() {
         return this.pointType;
     }
-
-    public void setMapMarkPointType(MapMarkPointTypeOuterClass.MapMarkPointType pointType) {
-        this.pointType = pointType;
-    }
-
     public int getMonsterId() {
         return this.monsterId;
     }
-
-    public void setMonsterId(int monsterId) {
-        this.monsterId = monsterId;
-    }
-
-    public MapMarkFromTypeOuterClass.MapMarkFromType getMapMarkFromType() {
+    public MapMarkFromType getMapMarkFromType() {
         return this.fromType;
     }
-
     public int getQuestId() {
         return this.questId;
     }
-
-    public void setQuestId(int questId) {
-        this.questId = questId;
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/emu/grasscutter/game/managers/MapMarkManager/MapMarksManager.java b/src/main/java/emu/grasscutter/game/managers/MapMarkManager/MapMarksManager.java
index d014ce204..2751adf9a 100644
--- a/src/main/java/emu/grasscutter/game/managers/MapMarkManager/MapMarksManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/MapMarkManager/MapMarksManager.java
@@ -1,61 +1,90 @@
 package emu.grasscutter.game.managers.MapMarkManager;
 
-import dev.morphia.annotations.Entity;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.MapMarkPointType;
+import emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq;
+import emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation;
+import emu.grasscutter.server.packet.send.PacketMarkMapRsp;
+import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
 import emu.grasscutter.utils.Position;
+
 import java.util.HashMap;
 
-@Entity
 public class MapMarksManager {
-
-    static final int mapMarkMaxCount = 150;
+    public static final int mapMarkMaxCount = 150;
     private HashMap<String, MapMark> mapMarks;
+    private final Player player;
 
-    public MapMarksManager() {
-        mapMarks = new HashMap<String, MapMark>();
+    public MapMarksManager(Player player) {
+        this.player = player;
+        this.mapMarks = player.getMapMarks();
+        if (this.mapMarks == null) { this.mapMarks = new HashMap<>(); }
     }
 
-    public MapMarksManager(HashMap<String, MapMark> mapMarks) {
-        this.mapMarks = mapMarks;
-    }
-
-    public HashMap<String, MapMark> getAllMapMarks() {
-        return mapMarks;
-    }
-
-    public MapMark getMapMark(Position position) {
-        String key = getMapMarkKey(position);
-        if (mapMarks.containsKey(key)) {
-            return mapMarks.get(key);
-        } else {
-            return null;
+    public void handleMapMarkReq(MarkMapReq req) {
+        Operation op = req.getOp();
+        switch (op) {
+            case ADD -> {
+                MapMark createMark = new MapMark(req.getMark());
+                // keep teleporting functionality on fishhook mark.
+                if (createMark.getMapMarkPointType() == MapMarkPointType.MAP_MARK_POINT_TYPE_FISH_POOL) {
+                    teleport(player, createMark);
+                    return;
+                }
+                addMapMark(createMark);
+            }
+            case MOD -> {
+                MapMark oldMark = new MapMark(req.getOld());
+                removeMapMark(oldMark.getPosition());
+                MapMark newMark = new MapMark(req.getMark());
+                addMapMark(newMark);
+            }
+            case DEL -> {
+                MapMark deleteMark = new MapMark(req.getMark());
+                removeMapMark(deleteMark.getPosition());
+            }
         }
+        if (op != Operation.GET) {
+            saveMapMarks();
+        }
+        player.getSession().send(new PacketMarkMapRsp(getMapMarks()));
+    }
+
+    public HashMap<String, MapMark> getMapMarks() {
+        return mapMarks;
     }
 
     public String getMapMarkKey(Position position) {
         return "x" + (int)position.getX()+ "z" + (int)position.getZ();
     }
 
-    public boolean removeMapMark(Position position) {
-        String key = getMapMarkKey(position);
-        if (mapMarks.containsKey(key)) {
-            mapMarks.remove(key);
-            return true;
-        }
-        return false;
+    public void removeMapMark(Position position) {
+        mapMarks.remove(getMapMarkKey(position));
     }
 
-    public boolean addMapMark(MapMark mapMark) {
+    public void addMapMark(MapMark mapMark) {
         if (mapMarks.size() < mapMarkMaxCount) {
-            if (!mapMarks.containsKey(getMapMarkKey(mapMark.getPosition()))) {
-                mapMarks.put(getMapMarkKey(mapMark.getPosition()), mapMark);
-                return true;
-            }
+            mapMarks.put(getMapMarkKey(mapMark.getPosition()), mapMark);
         }
-        return false;
     }
 
-    public void setMapMarks(HashMap<String, MapMark> mapMarks) {
-        this.mapMarks = mapMarks;
+    private void saveMapMarks() {
+        player.setMapMarks(mapMarks);
+        player.save();
     }
 
+    private void teleport(Player player, MapMark mapMark) {
+        float y;
+        try {
+            y = (float)Integer.parseInt(mapMark.getName());
+        } catch (Exception e) {
+            y = 300;
+        }
+        Position pos = mapMark.getPosition();
+        player.getPos().set(pos.getX(), y, pos.getZ());
+        if (mapMark.getSceneId() != player.getSceneId()) {
+            player.getWorld().transferPlayerToScene(player, mapMark.getSceneId(), player.getPos());
+        }
+        player.getScene().broadcastPacket(new PacketSceneEntityAppearNotify(player));
+    }
 }
diff --git a/src/main/java/emu/grasscutter/game/player/Player.java b/src/main/java/emu/grasscutter/game/player/Player.java
index 0be6c7a54..f27d68a29 100644
--- a/src/main/java/emu/grasscutter/game/player/Player.java
+++ b/src/main/java/emu/grasscutter/game/player/Player.java
@@ -134,10 +134,11 @@ public class Player {
 	@Transient private final InvokeHandler<AbilityInvokeEntry> abilityInvokeHandler;
 	@Transient private final InvokeHandler<AbilityInvokeEntry> clientAbilityInitFinishHandler;
 
-	private MapMarksManager mapMarksManager;
+	@Transient private MapMarksManager mapMarksManager;
 	@Transient private StaminaManager staminaManager;
 
 	private long springLastUsed;
+	private HashMap<String, MapMark> mapMarks;
 
 
 	@Deprecated
@@ -181,7 +182,7 @@ public class Player {
 		this.shopLimit = new ArrayList<>();
 		this.expeditionInfo = new HashMap<>();
 		this.messageHandler = null;
-		this.mapMarksManager = new MapMarksManager();
+		this.mapMarksManager = new MapMarksManager(this);
 		this.staminaManager = new StaminaManager(this);
 		this.sotsManager = new SotSManager(this);
 	}
@@ -209,7 +210,7 @@ public class Player {
 		this.getPos().set(GameConstants.START_POSITION);
 		this.getRotation().set(0, 307, 0);
 		this.messageHandler = null;
-		this.mapMarksManager = new MapMarksManager();
+		this.mapMarksManager = new MapMarksManager(this);
 		this.staminaManager = new StaminaManager(this);
 		this.sotsManager = new SotSManager(this);
 	}
@@ -1044,6 +1045,10 @@ public class Player {
 		return abilityManager;
 	}
 
+	public HashMap<String, MapMark> getMapMarks() { return mapMarks; }
+
+	public void setMapMarks(HashMap<String, MapMark> newMarks) { mapMarks = newMarks; }
+
 	public synchronized void onTick() {
 		// Check ping
 		if (this.getLastPingTime() > System.currentTimeMillis() + 60000) {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMarkMapReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMarkMapReq.java
index fc5d0a602..58348a2e0 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMarkMapReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMarkMapReq.java
@@ -1,84 +1,17 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.game.managers.MapMarkManager.MapMark;
-import emu.grasscutter.game.managers.MapMarkManager.MapMarksManager;
-import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketHandler;
 import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.*;
 import emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketMarkMapRsp;
-import emu.grasscutter.server.packet.send.PacketMarkNewNotify;
-import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
-import emu.grasscutter.utils.Position;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
 
 @Opcodes(PacketOpcodes.MarkMapReq)
 public class HandlerMarkMapReq extends PacketHandler {
 
-	private static boolean isInt(String str) {
-
-		try {
-			@SuppressWarnings("unused")
-			int x = Integer.parseInt(str);
-			return true; // String is an Integer
-		} catch (NumberFormatException e) {
-			return false; // String is not an Integer
-		}
-
-	}
-
 	@Override
 	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
 		MarkMapReq req = MarkMapReq.parseFrom(payload);
-		MarkMapReq.Operation op = req.getOp();
-		Player player = session.getPlayer();
-		MapMarksManager mapMarksManager = player.getMapMarksManager();
-		if (op == MarkMapReq.Operation.ADD) {
-			MapMark newMapMark = new MapMark(req.getMark());
-			// keep teleporting functionality on fishhook mark.
-			if (newMapMark.getMapMarkPointType() == MapMarkPointTypeOuterClass.MapMarkPointType.MAP_MARK_POINT_TYPE_FISH_POOL) {
-				teleport(player, newMapMark);
-				return;
-			}
-			if (mapMarksManager.addMapMark(newMapMark)) {
-				player.save();
-			}
-		} else if (op == MarkMapReq.Operation.MOD) {
-			MapMark newMapMark = new MapMark(req.getMark());
-			if (mapMarksManager.removeMapMark(newMapMark.getPosition())) {
-				if (mapMarksManager.addMapMark(newMapMark)) {
-					player.save();
-				}
-			}
-		} else if (op == MarkMapReq.Operation.DEL) {
-			MapMark newMapMark = new MapMark(req.getMark());
-			if (mapMarksManager.removeMapMark(newMapMark.getPosition())) {
-				player.save();
-			}
-		} else if (op == MarkMapReq.Operation.GET) {
-			// no-op
-		}
-		// send all marks to refresh client map view.
-		HashMap<String, MapMark> mapMarks = mapMarksManager.getAllMapMarks();
-		session.send(new PacketMarkMapRsp(player, mapMarks));
-	}
-
-	private void teleport(Player player, MapMark mapMark) {
-		float y = isInt(mapMark.getName()) ? Integer.parseInt(mapMark.getName()) : 300;
-		float x = mapMark.getPosition().getX();
-		float z = mapMark.getPosition().getZ();
-		player.getPos().set(x, y, z);
-		if (mapMark.getSceneId() != player.getSceneId()) {
-			player.getWorld().transferPlayerToScene(player, mapMark.getSceneId(),
-					player.getPos());
-		} else {
-			player.getScene().broadcastPacket(new PacketSceneEntityAppearNotify(player));
-		}
+		session.getPlayer().getMapMarksManager().handleMapMarkReq(req);
 	}
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketMarkMapRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketMarkMapRsp.java
index d7ee20d61..21ccbe74e 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketMarkMapRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketMarkMapRsp.java
@@ -10,7 +10,7 @@ import java.util.*;
 
 public class PacketMarkMapRsp extends BasePacket {
 
-    public PacketMarkMapRsp(Player player, HashMap<String, MapMark> mapMarks) {
+    public PacketMarkMapRsp(HashMap<String, MapMark> mapMarks) {
         super(PacketOpcodes.MarkMapRsp);
 
         MarkMapRspOuterClass.MarkMapRsp.Builder proto = MarkMapRspOuterClass.MarkMapRsp.newBuilder();

From 65fcae7961505f5185c63b8256cacee167b941e4 Mon Sep 17 00:00:00 2001
From: gentlespoon <github@gentlespoon.com>
Date: Wed, 11 May 2022 22:13:44 -0700
Subject: [PATCH 26/59] Slowly recover HP near statue

---
 .../game/managers/SotSManager.java            | 223 +++++++++---------
 .../HandlerEnterTransPointRegionNotify.java   |   8 +-
 .../HandlerExitTransPointRegionNotify.java    |   5 +-
 3 files changed, 121 insertions(+), 115 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/managers/SotSManager.java b/src/main/java/emu/grasscutter/game/managers/SotSManager.java
index 564663662..0004e389a 100644
--- a/src/main/java/emu/grasscutter/game/managers/SotSManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/SotSManager.java
@@ -1,16 +1,14 @@
 package emu.grasscutter.game.managers;
 
+import ch.qos.logback.classic.Logger;
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.entity.EntityAvatar;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.game.props.PlayerProperty;
-import emu.grasscutter.net.proto.ChangeHpReasonOuterClass;
-import emu.grasscutter.net.proto.PropChangeReasonOuterClass;
+import emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason;
+import emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketAvatarFightPropUpdateNotify;
-import emu.grasscutter.server.packet.send.PacketAvatarLifeStateChangeNotify;
 import emu.grasscutter.server.packet.send.PacketEntityFightPropChangeReasonNotify;
 import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
 
@@ -24,7 +22,9 @@ public class SotSManager {
     // NOTE: Spring volume balance *1  = fight prop HP *100
 
     private final Player player;
+    private final Logger logger = Grasscutter.getLogger();
     private Timer autoRecoverTimer;
+    private final boolean enablePriorityHealing = false;
 
     public final static int GlobalMaximumSpringVolume = 8500000;
 
@@ -38,6 +38,7 @@ public class SotSManager {
 
     public void setIsAutoRecoveryEnabled(boolean enabled) {
         player.setProperty(PlayerProperty.PROP_IS_SPRING_AUTO_USE, enabled ? 1 : 0);
+        player.save();
     }
 
     public int getAutoRecoveryPercentage() {
@@ -46,49 +47,122 @@ public class SotSManager {
 
     public void setAutoRecoveryPercentage(int percentage) {
         player.setProperty(PlayerProperty.PROP_SPRING_AUTO_USE_PERCENT, percentage);
+        player.save();
     }
 
-    // autoRevive automatically revives all team members.
-    public void autoRevive(GameSession session) {
-        player.getTeamManager().getActiveTeam().forEach(entity -> {
-            boolean isAlive = entity.isAlive();
-            float currentHP = entity.getAvatar().getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
-            float maxHP = entity.getAvatar().getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
-//            Grasscutter.getLogger().debug("" + entity.getAvatar().getAvatarData().getName() + "\t" + currentHP + "/" + maxHP + "\t" + (isAlive ? "ALIVE":"DEAD"));
-            float newHP = (float)(maxHP * 0.3);
-            if (currentHP < newHP) {
-                updateAvatarCurHP(session, entity, newHP);
-            }
-            if (!isAlive) {
-                entity.getWorld().broadcastPacket(new PacketAvatarLifeStateChangeNotify(entity.getAvatar()));
-            }
-        });
+    public long getLastUsed() {
+        return player.getSpringLastUsed();
     }
 
-    public void scheduleAutoRecover(GameSession session) {
+    public void setLastUsed() {
+        player.setSpringLastUsed(System.currentTimeMillis() / 1000);
+        player.save();
+    }
+
+    public int getMaxVolume() {
+        return player.getProperty(PlayerProperty.PROP_MAX_SPRING_VOLUME);
+    }
+
+    public void setMaxVolume(int volume) {
+        player.setProperty(PlayerProperty.PROP_MAX_SPRING_VOLUME, volume);
+        player.save();
+    }
+
+    public int getCurrentVolume() {
+        return player.getProperty(PlayerProperty.PROP_CUR_SPRING_VOLUME);
+    }
+
+    public void setCurrentVolume(int volume) {
+        player.setProperty(PlayerProperty.PROP_CUR_SPRING_VOLUME, volume);
+        setLastUsed();
+        player.save();
+    }
+
+    public void handleEnterTransPointRegionNotify() {
+        logger.trace("Player entered statue region");
+        autoRevive();
         if (autoRecoverTimer == null) {
             autoRecoverTimer = new Timer();
-            autoRecoverTimer.schedule(new AutoRecoverTimerTick(session), 2500);
+            autoRecoverTimer.schedule(new AutoRecoverTimerTick(), 2500, 15000);
         }
     }
 
-    public void cancelAutoRecover() {
+    public void handleExitTransPointRegionNotify() {
+        logger.trace("Player left statue region");
         if (autoRecoverTimer != null) {
             autoRecoverTimer.cancel();
             autoRecoverTimer = null;
         }
     }
 
-    private class AutoRecoverTimerTick extends TimerTask
-    {
-        private GameSession session;
+    // autoRevive automatically revives all team members.
+    public void autoRevive() {
+        player.getTeamManager().getActiveTeam().forEach(entity -> {
+            boolean isAlive = entity.isAlive();
+            if (isAlive) {
+                return;
+            }
+            logger.trace("Reviving avatar " + entity.getAvatar().getAvatarData().getName());
+            player.getTeamManager().reviveAvatar(entity.getAvatar());
+            player.getTeamManager().healAvatar(entity.getAvatar(), 30, 0);
+        });
+    }
 
-        public AutoRecoverTimerTick(GameSession session) {
-            this.session = session;
-        }
+    private class AutoRecoverTimerTick extends TimerTask {
+        // autoRecover checks player setting to see if auto recover is enabled, and refill HP to the predefined level.
         public void run() {
-            autoRecover(session);
-            cancelAutoRecover();
+            refillSpringVolume();
+
+            logger.trace("isAutoRecoveryEnabled: " + getIsAutoRecoveryEnabled() + "\tautoRecoverPercentage: " + getAutoRecoveryPercentage());
+
+            if (getIsAutoRecoveryEnabled()) {
+                List<EntityAvatar> activeTeam = player.getTeamManager().getActiveTeam();
+                // When the statue does not have enough remaining volume:
+                //      Enhanced experience: Enable priority healing
+                //                              The current active character will get healed first, then sequential.
+                //      Vanilla experience: Disable priority healing
+                //                              Sequential healing based on character index.
+                int priorityIndex = enablePriorityHealing ? player.getTeamManager().getCurrentCharacterIndex() : -1;
+                if (priorityIndex >= 0) {
+                    checkAndHealAvatar(activeTeam.get(priorityIndex));
+                }
+                for (int i = 0; i < activeTeam.size(); i++) {
+                    if (i != priorityIndex) {
+                        checkAndHealAvatar(activeTeam.get(i));
+                    }
+                }
+            }
+        }
+    }
+
+    public void checkAndHealAvatar(EntityAvatar entity) {
+        int maxHP = (int) (entity.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP) * 100);
+        int currentHP = (int) (entity.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP) * 100);
+        if (currentHP == maxHP) {
+            return;
+        }
+        int targetHP = maxHP * getAutoRecoveryPercentage() / 100;
+
+        if (targetHP > currentHP) {
+            int needHP = targetHP - currentHP;
+            int currentVolume = getCurrentVolume();
+            if (currentVolume >= needHP) {
+                // sufficient
+                setCurrentVolume(currentVolume - needHP);
+            } else {
+                // insufficient balance
+                needHP = currentVolume;
+                setCurrentVolume(0);
+            }
+            if (needHP > 0) {
+                logger.trace("Healing avatar " + entity.getAvatar().getAvatarData().getName() + " +" + needHP);
+                player.getTeamManager().healAvatar(entity.getAvatar(), 0, needHP);
+                player.getSession().send(new PacketEntityFightPropChangeReasonNotify(entity, FightProperty.FIGHT_PROP_CUR_HP,
+                        ((float) needHP / 100), List.of(3), PropChangeReason.PROP_CHANGE_STATUE_RECOVER,
+                        ChangeHpReason.ChangeHpAddStatue));
+                player.getSession().send(new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_HP));
+
+            }
         }
     }
 
@@ -96,84 +170,23 @@ public class SotSManager {
         // Temporary: Max spring volume depends on level of the statues in Mondstadt and Liyue. Override until we have statue level.
         // TODO: remove
         // https://genshin-impact.fandom.com/wiki/Statue_of_The_Seven#:~:text=region%20of%20Inazuma.-,Statue%20Levels,-Upon%20first%20unlocking
-        player.setProperty(PlayerProperty.PROP_MAX_SPRING_VOLUME, 8500000);
+        setMaxVolume(8500000);
         // Temporary: Auto enable 100% statue recovery until we can adjust statue settings in game
         // TODO: remove
-        player.setProperty(PlayerProperty.PROP_SPRING_AUTO_USE_PERCENT, 100);
-        player.setProperty(PlayerProperty.PROP_IS_SPRING_AUTO_USE, 1);
+        setAutoRecoveryPercentage(100);
+        setIsAutoRecoveryEnabled(true);
 
-        long now = System.currentTimeMillis() / 1000;
-        long secondsSinceLastUsed = now - player.getSpringLastUsed();
-        float percentageRefilled = (float)secondsSinceLastUsed / 15 / 100; // 15s = 1% max volume
-        int maxVolume = player.getProperty(PlayerProperty.PROP_MAX_SPRING_VOLUME);
-        int currentVolume = player.getProperty(PlayerProperty.PROP_CUR_SPRING_VOLUME);
+        int maxVolume = getMaxVolume();
+        int currentVolume = getCurrentVolume();
         if (currentVolume < maxVolume) {
-            int volumeRefilled = (int)(percentageRefilled * maxVolume);
-            int newVolume = currentVolume + volumeRefilled;
-            if (currentVolume + volumeRefilled > maxVolume) {
-                newVolume = maxVolume;
-            }
-            player.setProperty(PlayerProperty.PROP_CUR_SPRING_VOLUME, newVolume);
-        }
-        player.setSpringLastUsed(now);
-        player.save();
-    }
-
-    // autoRecover checks player setting to see if auto recover is enabled, and refill HP to the predefined level.
-    public void autoRecover(GameSession session) {
-        // TODO: In MP, respect SotS settings from the HOST.
-        boolean  isAutoRecoveryEnabled = getIsAutoRecoveryEnabled();
-        int autoRecoverPercentage = getAutoRecoveryPercentage();
-        Grasscutter.getLogger().debug("isAutoRecoveryEnabled: " + isAutoRecoveryEnabled + "\tautoRecoverPercentage: " + autoRecoverPercentage);
-
-        if (isAutoRecoveryEnabled) {
-            player.getTeamManager().getActiveTeam().forEach(entity -> {
-                float maxHP = entity.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
-                float currentHP = entity.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
-                if (currentHP == maxHP) {
-                    return;
-                }
-                float targetHP = maxHP * autoRecoverPercentage / 100;
-
-                if (targetHP > currentHP) {
-                    float needHP = targetHP - currentHP;
-                    float needSV = needHP * 100; // convert HP needed to Spring Volume needed
-
-                    int sotsSVBalance = player.getProperty(PlayerProperty.PROP_CUR_SPRING_VOLUME);
-                    if (sotsSVBalance >= needSV) {
-                        // sufficient
-                        sotsSVBalance -= needSV;
-                    } else {
-                        // insufficient balance
-                        needSV = sotsSVBalance;
-                        sotsSVBalance = 0;
-                    }
-                    player.setProperty(PlayerProperty.PROP_CUR_SPRING_VOLUME, sotsSVBalance);
-                    player.setSpringLastUsed(System.currentTimeMillis() / 1000);
-
-                    float newHP = currentHP + needSV / 100; // convert SV to HP
-
-                    updateAvatarCurHP(session, entity, newHP);
-                }
-            });
+            long now = System.currentTimeMillis() / 1000;
+            int secondsSinceLastUsed = (int) (now - getLastUsed());
+            // 15s = 1% max volume
+            int volumeRefilled = secondsSinceLastUsed * maxVolume / 15 / 100;
+            logger.trace("Statue has refilled HP volume: " + volumeRefilled);
+            currentVolume = Math.min(currentVolume + volumeRefilled, maxVolume);
+            logger.trace("Statue remaining HP volume: " + currentVolume);
+            setCurrentVolume(currentVolume);
         }
     }
-
-    private void updateAvatarCurHP(GameSession session, EntityAvatar entity, float newHP) {
-        // TODO: Figure out why client shows current HP instead of added HP.
-        //    Say an avatar had 12000 and now has 14000, it should show "2000".
-        //    The client always show "+14000" which is incorrect.
-        entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, newHP);
-        session.send(new PacketEntityFightPropChangeReasonNotify(entity, FightProperty.FIGHT_PROP_CUR_HP,
-                newHP, List.of(3), PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_STATUE_RECOVER,
-                ChangeHpReasonOuterClass.ChangeHpReason.ChangeHpAddStatue));
-        session.send(new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_HP));
-
-        Avatar avatar = entity.getAvatar();
-        avatar.setCurrentHp(newHP);
-        session.send(new PacketAvatarFightPropUpdateNotify(avatar, FightProperty.FIGHT_PROP_CUR_HP));
-        player.save();
-    }
-
-
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterTransPointRegionNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterTransPointRegionNotify.java
index 94c9bfd8b..9a5872033 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterTransPointRegionNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterTransPointRegionNotify.java
@@ -11,12 +11,6 @@ import emu.grasscutter.server.game.GameSession;
 public class HandlerEnterTransPointRegionNotify extends PacketHandler {
     @Override
     public void handle(GameSession session, byte[] header, byte[] payload) throws Exception{
-        Player player = session.getPlayer();
-        SotSManager sotsManager = player.getSotSManager();
-
-        sotsManager.refillSpringVolume();
-        sotsManager.autoRevive(session);
-        sotsManager.scheduleAutoRecover(session);
-        // TODO: allow interaction with the SotS?
+        session.getPlayer().getSotSManager().handleEnterTransPointRegionNotify();
     }
 }
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerExitTransPointRegionNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerExitTransPointRegionNotify.java
index 0d35c1762..03fcd4e3c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerExitTransPointRegionNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerExitTransPointRegionNotify.java
@@ -1,5 +1,6 @@
 package emu.grasscutter.server.packet.recv;
 
+import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.managers.SotSManager;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.packet.Opcodes;
@@ -11,8 +12,6 @@ import emu.grasscutter.server.game.GameSession;
 public class HandlerExitTransPointRegionNotify extends PacketHandler {
     @Override
     public void handle(GameSession session, byte[] header, byte[] payload) throws Exception{
-        Player player = session.getPlayer();
-        SotSManager sotsManager = player.getSotSManager();
-        sotsManager.cancelAutoRecover();
+        session.getPlayer().getSotSManager().handleExitTransPointRegionNotify();
     }
 }

From f441d0665a2765e8c711b6c41e4b37eac828b05c Mon Sep 17 00:00:00 2001
From: Hotaru <105128850+HotaruYS@users.noreply.github.com>
Date: Thu, 12 May 2022 22:30:12 +0200
Subject: [PATCH 27/59] Allow to override final jar filename using project
 property

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 3a8d2c34d..de4bf60c0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -105,6 +105,7 @@ jar {
     }
 
     jar.baseName = 'grasscutter'
+    jar.archiveName = project.hasProperty('jarFilename') ? "${jarFilename}.${extension}" : archiveName
 
     from {
         configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }

From 2451d2c897334da5e35325707e58e52d35440aae Mon Sep 17 00:00:00 2001
From: Hotaru <105128850+HotaruYS@users.noreply.github.com>
Date: Thu, 12 May 2022 22:04:44 +0200
Subject: [PATCH 28/59] Build region_list and cur_region dynamically

---
 data/query_cur_region.txt                     |  1 -
 data/query_region_list.txt                    |  1 -
 .../command/commands/ReloadCommand.java       |  1 -
 .../server/dispatch/DispatchServer.java       | 84 ++++++++-----------
 .../packet/send/PacketPlayerLoginRsp.java     | 19 ++---
 .../java/emu/grasscutter/utils/Crypto.java    | 10 ++-
 6 files changed, 46 insertions(+), 70 deletions(-)
 delete mode 100644 data/query_cur_region.txt
 delete mode 100644 data/query_region_list.txt

diff --git a/data/query_cur_region.txt b/data/query_cur_region.txt
deleted file mode 100644
index ddef1aff6..000000000
--- a/data/query_cur_region.txt
+++ /dev/null
@@ -1 +0,0 @@
-GpgdCgo4LjIwOS42Ni4xENWsARosaHR0cHM6Ly9vc2V1cm9vYXNlcnZlci55dWFuc2hlbi5jb20vcmVjaGFyZ2U6BGV1cm9COWh0dHBzOi8vYXV0b3BhdGNoaGsueXVhbnNoZW4uY29tL2NsaWVudF9nYW1lX3Jlcy8yLjZfbGl2ZUo8aHR0cHM6Ly9hdXRvcGF0Y2hoay55dWFuc2hlbi5jb20vY2xpZW50X2Rlc2lnbl9kYXRhLzIuNl9saXZlUpIBaHR0cHM6Ly93ZWJzdGF0aWMtc2VhLmhveW92ZXJzZS5jb20veXMvZXZlbnQvaW0tc2VydmljZS9pbmRleC5odG1sP2ltX291dD1mYWxzZSZzaWduX3R5cGU9MiZhdXRoX2FwcGlkPWltX2NjcyZhdXRoa2V5X3Zlcj0xJndpbl9kaXJlY3Rpb249cG9ydHJhaXRiCDIuNl9saXZlcNnsmgOQAdnsmgOaAVx7InJlbW90ZU5hbWUiOiAiZGF0YV92ZXJzaW9ucyIsICJtZDUiOiAiMWE0NDVhZTQ4ZmJkYmUwMzgzMTJiZTg2OGYyODEzZDIiLCAiZmlsZVNpemUiOiA0NDE1faIBW3sicmVtb3RlTmFtZSI6ICJkYXRhX3ZlcnNpb25zIiwgIm1kNSI6ICIxNzU0MmM3YmJhYzQ5YjkxMWRlMjlhOTYyNzU0YmQ2MSIsICJmaWxlU2l6ZSI6IDUxNH2yAYEGCL23mQMa4AV7InJlbW90ZU5hbWUiOiAicmVzX3ZlcnNpb25zX2V4dGVybmFsIiwgIm1kNSI6ICI5ZjA5MmNhMTMwNjdjYWU0MzEzNDkzZWVkM2QzZTlhZSIsICJmaWxlU2l6ZSI6IDUyNjk2Nn0NCnsicmVtb3RlTmFtZSI6ICJyZXNfdmVyc2lvbnNfbWVkaXVtIiwgIm1kNSI6ICI3Yzk0MmU3MDRhODA0YzIxMjJmYzYzZWU5MjhlNzE0OCIsICJmaWxlU2l6ZSI6IDI4NTU1MH0NCnsicmVtb3RlTmFtZSI6ICJyZXNfdmVyc2lvbnNfc3RyZWFtaW5nIiwgIm1kNSI6ICJlMzVmNmQ4NTNkMDRjZTAyMmFjN2MzNmQ0M2Y0MGU3YyIsICJmaWxlU2l6ZSI6IDEyMjAzNn0NCnsicmVtb3RlTmFtZSI6ICJyZWxlYXNlX3Jlc192ZXJzaW9uc19leHRlcm5hbCIsICJtZDUiOiAiODc2NGIwZjJlZDgxNWNkNDQzMGUwODVjNDYxYTZmNGQiLCAiZmlsZVNpemUiOiA1MjY5NjZ9DQp7InJlbW90ZU5hbWUiOiAicmVsZWFzZV9yZXNfdmVyc2lvbnNfbWVkaXVtIiwgIm1kNSI6ICIxYmJlMzc0YzE2YmZmNDU5MTU5OWMyMTk3MzQyMDM0OCIsICJmaWxlU2l6ZSI6IDI4NTU1MH0NCnsicmVtb3RlTmFtZSI6ICJyZWxlYXNlX3Jlc192ZXJzaW9uc19zdHJlYW1pbmciLCAibWQ1IjogIjcyZmE3ZmY2NmQ1MTRmY2JhMzRhZjAwN2YyYjljMmY4IiwgImZpbGVTaXplIjogMTIyMDM2fQ0KeyJyZW1vdGVOYW1lIjogImJhc2VfcmV2aXNpb24iLCAibWQ1IjogImZiZmE2ZDZlMDcwMmQxYzc5ZTA1NjRmYjI4NjdlNzM4IiwgImZpbGVTaXplIjogMTh9IgEwKgo3YTM0YTM2YTZlMggyLjZfbGl2ZboBnBBFYzJiEAAAAJNvNOvzlkCCDSqpQ6a141IACAAA6gq2poqqrhWr1LS/wULjaiSPJIGsouCxUfY40ezmGoMU5SZZLwQ97KrlkCLKvTVycxteFwEPDxFrKxiHE1oigrAAkjc0NU12JqcQBFL8ExWeR+3QfCPnh7MWo424stJoHPADl9E6R/n3YDXAtq1gUzZu5Y4aGtd9XDyVjozcbIrtVVTGVpvRIuwGYoOCRCwDeRKphu9MoJfbi9mawLh5XSq+KLsAksjM90JJ/DEUzP2XCB/QILsiSiwbET5LUrl65OXCN4sLxZg+86qmeU28cdz4tWDewXYFO+Y7AnJAt7JfpgR/8Os7A9CDPD8WA6GBdqyplmoKRtnjjZG9ZGZIk1YF7AdGUhE8672XlWW3clJaNMBpHFkON+t7Utgu6prY/uJJLFZlGm5KMSend8u8GTMYOE5/AJsVkX/5eS8V2F6Dt6mZJgPtGAlX7Rp1a1R57FMKQLS+9nIzKDMclWFs7ebbnv+lcqckuqln19/JMrYQg9E4IiDVn5akaHZbnYBw0+HDR5kfT2xWfWVo8CJu4mPSpVR1kI4HhZXTURnHa7ezObuwHQm3NS7wHK7VO0E+qgnUgb+vK9M0cHTQE6FsCi/bk0VaHZtDxpMCTfKluJiOsxhvRePOjEVyNyLwLJaoxwwSukMfSH9G+q62ygFmmErAQfKKWLreb72UegOgmhD8T8aytvWXHkWk07QCttqgPhax8BAW2OvRJluvorBUIeHDeO6QeBaZns4EXIYUcIQlfi3yGsLKhhGLb2OgN6a6B3ElxdgXRRYMGAdDoAxEnCcWmdZx874vEvf2KFUP6aU8l4lh0XV6RU/D7A+eqWN5bH4ffS4QBQq2MU6CNA5XumMsD4zUfC6od5T7Tt7uQsgbqtIMgXKpO8lRk4pRgnpPsqM1Ou8kTb1UdQSc4yREuJlrL2Tmtf35cAw7W290LIO/GaO9Rj1CPhATMn7jbUTA6+QN7rTxIzbVl66k95wQth81TYuvw1DlGOpVDTbcCB0uvfmcAAGhj57jVBlyVIu+KJzrrx8z9Uh6scsMCgrMPJn7nsCHSXD6yElTgLrF7FVwgqsxDjgcquqkrSnknP92jb+11IJbw05Ass4hcMRGJxdAefSWDIgdi7l4GnppPdUvLkG5uvBlO85AiT2NpqNmShebfst8rQLFc1B7hAcvh9EpM9Sii0/XXfe9tEf7AwKj2SWmS79PsjEiAiv18tJ6gDlaJ0WFSchXNBRPu8ESvKlE8q7myuc2t5nnxv/hctkez5+nh9SgQ3beL34chSL4RPTH32Jqzs5p7s2n87Bv4vfQccYFAF+kKMUZzKnWKl0LCrStSd3+s+4KF/tZXEKue5KoVobNhaQrD33HjWf9Rvw0ULd4ho4A6wj/uga9o7rZ2C2v1YEDNNqZ5/v/udN3hl7tXrWv5UXcUyTtooa66sJ8oITE8+4aDWimtX6dy0CdFQj2mHppbbvRF66flDd/gFA35xQOXfYdOud3NJogglHXofOoB0LEdbao9C6Nt2v+z7C4S0l3cAMXp/yiI9qxJT9b0mQ2zp2GN5i4gvrp+6iKjqxf+IA++oB/JzbbpSVOFJmFSysv4v3Al2AVbmFycYqv0GaoiZ22wiu8Ok3+LCyKJTITtaJLAtgbpwRfa9SUkdpRwMK1vMN1s6jZU9gdejY3oLVKjFpg66c9bagpmvIG1/gfgY9yT++Y8img4aB/JDJMAS2MVGxGlyrRFGaXBWLq3SkhqDqGD5klbvYv2IFMr4BAHP2uwLb92qEhtlksiVQYk8HGxLWlU2Fo+Pxee8L1xvQOgPdY4/cb33BuJXvtyW5ea5EmVtBPo4MU1ws9BvAzLs13Nisl+/FBvBn8ktkZmE5e6nsdpGEtq4/d7MfCLXGRI5L730mIieeAvtQcb0NMWGcubHPgjY58Pv4MSdRpOQakzM2rA5UD5O57rGH5q6p3HZfZk2iPUcJRsebMKJ4l1omr5JeD95DKDKy7Cts3RajufslekL3/wHwUZbAdEWyux2w1zbiukmhTfh0nbenm8Q8KOASCDo0SWO3e9FpOz5o+phHBVYgmfxRt11OonnLt1qKB7j/a7YdufvkFSsFm4UdgsJMPIHzeBjbSSDlLeCdmdKGQtFLC73npe6efYGUupMIV9EYup1D/OoCNlz2r/FhJ7aLRtj6Q6cb161MLp+rmjbSzN+RVFwf7wAVpLQMrHwTvUzB/8M7cTjN5VFE583uhy4KKf+W3iTxzdyX2SAD9QVu6EXv4KaEFBy8Vo0sga907Fi7imkwgjY2cdnEtPMMeO2Jqj3yWPdqrlVtfAn1jd14oix7YObsJ8mVBeueiplG9d7dxcA1GV+7xX9wOyPDcfH5FBAIlglBIEhjSyNQErH+JYRbOUotXMBQa1tlRRtBSLLDCRgEpG8F+Dv5Oao9ZBnKAi0GRjPKo+OjsehWzrNXGDcoTQsGD/bmKpCdaUOuEa6rLA7tbYwqT2SPdCJzBx2J+kI1bwDWhFF9ROrh9MvmwvMBE9dH5mbQj78p2P5gar2BUcNNbSVvSgxtCa1NHsf/GwrPmTQLPxCrEBcDucxIpsqfINp48iCJGZ4NvlRIZolmaVBWlxjVl/XYcb2YOl3K48e+LsfblTU6tyneZimrS+Y0qt7lncte6NZGPnf98wNLxY39IX8gATezGXoZ03TOhy1jX3epf4Bfw5ZyvU8/XJ2BvbPpw+b8LgS0y0DkeQG4mQGlHidnCAU9odHRwczovL3dlYnN0YXRpYy1zZWEuaG95b3ZlcnNlLmNvbS95cy9ldmVudC9lMjAyMDA0MTBnb19jb21tdW5pdHkvaW5kZXguaHRtbCMv0gEKYWRmZWI4YmU3MdoBCmFkZmViOGJlNzH6AR1odHRwczovL2FjY291bnQuaG95b3ZlcnNlLmNvbYICcWh0dHBzOi8vaGs0ZS1hcGktb3MuaG95b3ZlcnNlLmNvbS9jb21tb24vYXBpY2RrZXkvYXBpL2V4Y2hhbmdlQ2RrZXk/c2lnbl90eXBlPTImYXV0aF9hcHBpZD1hcGljZGtleSZhdXRoa2V5X3Zlcj0xigJMaHR0cHM6Ly9hY2NvdW50LmhveW92ZXJzZS5jb20vIy9hYm91dC9wcml2YWN5SW5HYW1lP2FwcF9pZD00JmJpej1oazRlX2dsb2JhbFqcEEVjMmIQAAAAk2806/OWQIINKqlDprXjUgAIAADqCramiqquFavUtL/BQuNqJI8kgayi4LFR9jjR7OYagxTlJlkvBD3squWQIsq9NXJzG14XAQ8PEWsrGIcTWiKCsACSNzQ1TXYmpxAEUvwTFZ5H7dB8I+eHsxajjbiy0mgc8AOX0TpH+fdgNcC2rWBTNm7ljhoa131cPJWOjNxsiu1VVMZWm9Ei7AZig4JELAN5EqmG70ygl9uL2ZrAuHldKr4ouwCSyMz3Qkn8MRTM/ZcIH9AguyJKLBsRPktSuXrk5cI3iwvFmD7zqqZ5Tbxx3Pi1YN7BdgU75jsCckC3sl+mBH/w6zsD0IM8PxYDoYF2rKmWagpG2eONkb1kZkiTVgXsB0ZSETzrvZeVZbdyUlo0wGkcWQ4363tS2C7qmtj+4kksVmUabkoxJ6d3y7wZMxg4Tn8AmxWRf/l5LxXYXoO3qZkmA+0YCVftGnVrVHnsUwpAtL72cjMoMxyVYWzt5tue/6VypyS6qWfX38kythCD0TgiINWflqRodludgHDT4cNHmR9PbFZ9ZWjwIm7iY9KlVHWQjgeFldNRGcdrt7M5u7AdCbc1LvAcrtU7QT6qCdSBv68r0zRwdNAToWwKL9uTRVodm0PGkwJN8qW4mI6zGG9F486MRXI3IvAslqjHDBK6Qx9If0b6rrbKAWaYSsBB8opYut5vvZR6A6CaEPxPxrK29ZceRaTTtAK22qA+FrHwEBbY69EmW6+isFQh4cN47pB4FpmezgRchhRwhCV+LfIawsqGEYtvY6A3proHcSXF2BdFFgwYB0OgDEScJxaZ1nHzvi8S9/YoVQ/ppTyXiWHRdXpFT8PsD56pY3lsfh99LhAFCrYxToI0Dle6YywPjNR8Lqh3lPtO3u5CyBuq0gyBcqk7yVGTilGCek+yozU67yRNvVR1BJzjJES4mWsvZOa1/flwDDtbb3Qsg78Zo71GPUI+EBMyfuNtRMDr5A3utPEjNtWXrqT3nBC2HzVNi6/DUOUY6lUNNtwIHS69+ZwAAaGPnuNUGXJUi74onOuvHzP1SHqxywwKCsw8mfuewIdJcPrISVOAusXsVXCCqzEOOByq6qStKeSc/3aNv7XUglvDTkCyziFwxEYnF0B59JYMiB2LuXgaemk91S8uQbm68GU7zkCJPY2mo2ZKF5t+y3ytAsVzUHuEBy+H0Skz1KKLT9dd9720R/sDAqPZJaZLv0+yMSICK/Xy0nqAOVonRYVJyFc0FE+7wRK8qUTyrubK5za3mefG/+Fy2R7Pn6eH1KBDdt4vfhyFIvhE9MffYmrOzmnuzafzsG/i99BxxgUAX6QoxRnMqdYqXQsKtK1J3f6z7goX+1lcQq57kqhWhs2FpCsPfceNZ/1G/DRQt3iGjgDrCP+6Br2jutnYLa/VgQM02pnn+/+503eGXu1eta/lRdxTJO2ihrrqwnyghMTz7hoNaKa1fp3LQJ0VCPaYemltu9EXrp+UN3+AUDfnFA5d9h0653c0miCCUdeh86gHQsR1tqj0Lo23a/7PsLhLSXdwAxen/KIj2rElP1vSZDbOnYY3mLiC+un7qIqOrF/4gD76gH8nNtulJU4UmYVLKy/i/cCXYBVuYXJxiq/QZqiJnbbCK7w6Tf4sLIolMhO1oksC2BunBF9r1JSR2lHAwrW8w3WzqNlT2B16NjegtUqMWmDrpz1tqCma8gbX+B+Bj3JP75jyKaDhoH8kMkwBLYxUbEaXKtEUZpcFYurdKSGoOoYPmSVu9i/YgUyvgEAc/a7Atv3aoSG2WSyJVBiTwcbEtaVTYWj4/F57wvXG9A6A91jj9xvfcG4le+3Jbl5rkSZW0E+jgxTXCz0G8DMuzXc2KyX78UG8GfyS2RmYTl7qex2kYS2rj93sx8ItcZEjkvvfSYiJ54C+1BxvQ0xYZy5sc+CNjnw+/gxJ1Gk5BqTMzasDlQPk7nusYfmrqncdl9mTaI9RwlGx5swoniXWiavkl4P3kMoMrLsK2zdFqO5+yV6Qvf/AfBRlsB0RbK7HbDXNuK6SaFN+HSdt6ebxDwo4BIIOjRJY7d70Wk7Pmj6mEcFViCZ/FG3XU6iecu3WooHuP9rth25++QVKwWbhR2Cwkw8gfN4GNtJIOUt4J2Z0oZC0UsLveel7p59gZS6kwhX0Ri6nUP86gI2XPav8WEntotG2PpDpxvXrUwun6uaNtLM35FUXB/vABWktAysfBO9TMH/wztxOM3lUUTnze6HLgop/5beJPHN3JfZIAP1BW7oRe/gpoQUHLxWjSyBr3TsWLuKaTCCNjZx2cS08wx47YmqPfJY92quVW18CfWN3XiiLHtg5uwnyZUF656KmUb13t3FwDUZX7vFf3A7I8Nx8fkUEAiWCUEgSGNLI1ASsf4lhFs5Si1cwFBrW2VFG0FIssMJGASkbwX4O/k5qj1kGcoCLQZGM8qj46Ox6FbOs1cYNyhNCwYP9uYqkJ1pQ64RrqssDu1tjCpPZI90InMHHYn6QjVvANaEUX1E6uH0y+bC8wET10fmZtCPvynY/mBqvYFRw01tJW9KDG0JrU0ex/8bCs+ZNAs/EKsQFwO5zEimyp8g2njyIIkZng2+VEhmiWZpUFaXGNWX9dhxvZg6Xcrjx74ux9uVNTq3Kd5mKatL5jSq3uWdy17o1kY+d/3zA0vFjf0hfyABN7MZehnTdM6HLWNfd6l/gF/DlnK9Tz9cnYG9s+nD5vwuBLTLQOR5AbiZAaUeJ2WLVAtaPymwUgxn8nMUMGk2pDMbkJNLgHPcao2F2HLBdC2W3r1Qs5PtDbMuMCIPSYscVx1x66qcJw19SiQyNLxCY9ErLGDY4mChY/X5NX7Pc2ricYE7EzCSZMYQmtUVZoqn1RPGz1P9Gj65Edm70zFOfRWfR+sTboONM7W3oNk1mkI2M5GwQrQpkAiyb5zwdxpsOwtQ0s0Sin4IOonpW9KcRv8yB8rMOMu6+C6m4h2MwRPj6QrVPWd8PV22qB4iAwfV3UYpjo91Mw/V5xT1DRSrb65vYtu8E4lR3HMv37at4aV6v8RluqeAIHHDJBANaUN3eLCSHewfEb+osQ5BV7XQT5Dwdy/LLFo+hdCBp0Retgtiwsq3+EgRs9i/d9tmghRqEdD/6re752aRiyTsf7CkWY6O7cCGfvmOLE0XhNQra+tLnlJCR1y4m1LOTB3ulQnZrA2E7Mmk7
\ No newline at end of file
diff --git a/data/query_region_list.txt b/data/query_region_list.txt
deleted file mode 100644
index b4681aaa7..000000000
--- a/data/query_region_list.txt
+++ /dev/null
@@ -1 +0,0 @@
-ElIKBm9zX3VzYRIHQW1lcmljYRoKREVWX1BVQkxJQyIzaHR0cHM6Ly9vc3VzYWRpc3BhdGNoLnl1YW5zaGVuLmNvbS9xdWVyeV9jdXJfcmVnaW9uElMKB29zX2V1cm8SBkV1cm9wZRoKREVWX1BVQkxJQyI0aHR0cHM6Ly9vc2V1cm9kaXNwYXRjaC55dWFuc2hlbi5jb20vcXVlcnlfY3VyX3JlZ2lvbhJRCgdvc19hc2lhEgRBc2lhGgpERVZfUFVCTElDIjRodHRwczovL29zYXNpYWRpc3BhdGNoLnl1YW5zaGVuLmNvbS9xdWVyeV9jdXJfcmVnaW9uElUKBm9zX2NodBIKVFcsIEhLLCBNTxoKREVWX1BVQkxJQyIzaHR0cHM6Ly9vc2NodGRpc3BhdGNoLnl1YW5zaGVuLmNvbS9xdWVyeV9jdXJfcmVnaW9uKpwQRWMyYhAAAABbrAvbhfIRHfaSCN24qQyVAAgAAMs68ZiMdPfEj41O2wBCYqGiC/WdovvJvaw4t3/m1zIYDrt3/ftK9GKFb7C+2E8FmaHqOnwjJYBg2wI1sXpGmuSxkeWw8Avr36wlNtQjhXNV9zoNKstuZYuheyLlpbPRbYZ3UA6/BzTVsjIhjR1lcqFrigQnpV6MgRR9KqxakCaffK6qIzMlodx4ZPKlqseQhCiyVAvLWQSRqCRcZipzotXsmgLQbpDFtRzhgukXPjfW5dAlzMwswPuu7ZQsf1AKipI34dVQLu6gtXthGgbjn89h/79VR5AokLCPGqIV7/2s+gHfykrjDtyp5rwCcmGQqwV3gHy5LGrHl8Zm12jNd7Qcng51ydqtX4xzet6J2iMF6Dw5nPd/hTyxn+i3Ttk6fop9rbCq3iNgEw3+0cSDal1I1ThYdVnMgPhZgQkZc5/SpTaR+8vfDzRIKbSSrrPSEgLnQvWZOOugXhNdyuiaBc8rJveno7vvktmnhDUF3xWi6osj75j2KghRrdHfDR3Zuh4COrGZDRBSKHft2AvfrxaMT9O8hPzzzYk0U2iicVCDlNP/8wqaT9Vqt1kHmruLxqh377iyp0mxKfNt0+SNRzLyRoyvOar/z3AT6TU9LRoCFrkcJpVsUN+2MVeT52PfMbv5O/Nw9sqsFDlofCJJ/EknY0wDc+tNarYOhDM67/ojn/p6W3ZPBJxb2wcF1TOh9dpAeZdCGJusqhMIj5lpoW8nENTFhkEgMUv2Lh5Z6WpeOAKAu9eDpBMhlRNCccDaNYUgo6TdVDtWxtPrS3NRYqtkvb2I2SEFP0apht954oKdG3ncxyOgHRUkwgtxbCMAngzWo9+VWV3H3OlqeEOv7DdO2o0y95EvlHYb/qtosXPI2jC+6FPa+yl4xmLqcENRTUrU23dsmX3SyBEmZvML4dNeyC53B+mh7DUFtPFJFndxj2tGO9mTSDgy8eCmKG90AiJOMoxaLB2HpnDXN1sTiIcd3WraiE6ZCt4E54hKXvXHPyN52CHkxq1y/TeXHEq4X4MyHyDSRLHmzVs9pnwHM0ZLthKFNyvGfTvjiYokAWtNEuh74syt+m6Wietb6JvgibnnDj6uFKI3BbH4GUT9blsnMgug323bJ6bFvV4iESvz1fNnnUSokWQy5+fWzxPDohULgFzhDCpwov78Bp0E3t6DXSWnrUdNqpLbYKmXO1Hdbn+QH4B90p85UB1V5eSZgxPpUvZbIO4GPScil8K+dkDLdsFa1zypWNmlUN0Ns5H/iuzMuJql2QFYz+SnV1R1T+qywwqCNP9oswcLiAR3XnSacs52vd3PI9+0PZuoF6tVMWlvutsQ34IFZaAwIkdKigZcHumLBt/0KyFASBfN674n8FnHrHOQHU6oCeXkQA9kC8MtkvMb7fOLdzbTsD6SVojzZ64i9mDXxF+iLR9o52OxjIFzwLGRy/ivT/aAnHLZ3AsbnvslDjlQl2ADBFvf7xjmvFu0xlfK58TUpfVEkScFFapWJyKVybB4CRz1wKKz6n/a9581LpCVOWRsJa5p+j0zYcS2PfhmRf3RzwsDHeBjEVlIARbhxNKvmjdZyIidSdMMcsJHDRLE3bvo9kKfag0vRVKmuPLPc9FrACsz3vlkApcVQvzieHWoiP+foEvfj9+7Ti2tLfKdzVkMUmugZiZ46+7PKvIciiiuBPlyld0CCPTtTFHUOMO5dUfrUblX8K3awWiaNQFBS0J3iK08t1bgWfLhsKzsS32fRWugaqecwO9Rji9oHn+UuN8Nz9SgNxodroq9q7y/KHFxbqjCl62g25HN9zUa/s5wnIRwVAiWgTuOe3qGqjwp5m/GR8YVSSK/8mV9EL4AaF8d1uifdVA6wWSH1e/1UB8vcdU83P8ne3u1ho+Y/57WB7KnQaGaiD/108+wiAxNqMb2ex8on01VxdLKV1makXV3gzsvWaRevW8t/K11ZwYfo9g+guWADsA0JO0jWooiaupq1kNWrEheBdSRXBO7Jnb+56cTjPGwLpp7ZOHe/bSCJ4MGzPF3lK66LXhVo+rxvNjhoKVRjhGYxN4T8+AiRo3r+1KwdIGSrtODp3ri3JWAy6Eajp1Ukp9GaCbHSJFnYml84nKew7zLLe//ExQpjd4QAjMTvnbm+Ff6a1jf69QEVo0I33gI7/buwqgjiuvjeL6EYaMolKrKlHZHf/HwWbFbdID8T9aoyZJuCUd6YHaMPRAS6n5nvTwkRLlJ/f6wgyypUGZ22Bb1qGIb9SoPgSgIJkifUoewQW2EexqfoAsHXJVABLy+jp/SC4xzHZOSh42zU1k80HIgrnSOmu6T56F6gqy4Y2cZuZU8LXbO/01u8ifEz8yaXfEFSFdxE0TWl92OLKFtJZr9nNOBQQQr5FDGf6zB1/0CziG/5+PrUDgG3irzho6+7wXkc2CpxlBKOLWdjs3V/Lab6cURz1QZY4HYgUkJtm4U5OKUeO2+murlhC7SrnwyUtGrsD8NbCmI4SRHKPoeLBJQO/m3dRze5Ltr8N9IS7/ukPeOYe1O2agrmhH/JjYfz/l8Gmq8PGY+oavYp8I+2yKvGLD9kCxEgKcTeRh9AW/xPTLGsacrGKQCY+M76DfyLKxCZDiDY9xkBIKchxsMsn7FqZvRMMyJBHbqa3AKQyAN73NCSuFF5f1qDjARU/xqJFhOaKoR64c78oqh1GqOqEFbfNQIRw6WeFCGyW6v6p10uLdR7KXnR7+wub9aG992MpIBk0+gru74yO/WcA0vLdDEQIBwc+M0lmLB53ylsPtde3nliaC5ROHR1IS4LO8Q+3o0BHMr0my0bqFwwCAvZVXOFBHxXyUgrrmUTnZYVSQXNV6+MALBmmRU5yOzhhyHoEdj9YHZeyPpZkYc6DkJWCRYbFfmczNIs133KB9rlfug40w/hHa8pXyRyLaKQUMIUYEvt3Y4AQ==
\ No newline at end of file
diff --git a/src/main/java/emu/grasscutter/command/commands/ReloadCommand.java b/src/main/java/emu/grasscutter/command/commands/ReloadCommand.java
index 9414a89c4..cb25228a6 100644
--- a/src/main/java/emu/grasscutter/command/commands/ReloadCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ReloadCommand.java
@@ -21,7 +21,6 @@ public final class ReloadCommand implements CommandHandler {
         Grasscutter.getGameServer().getGachaManager().load();
         Grasscutter.getGameServer().getDropManager().load();
         Grasscutter.getGameServer().getShopManager().load();
-        Grasscutter.getDispatchServer().loadQueries();
         
         CommandHandler.sendMessage(sender, translate(sender, "commands.reload.reload_done"));
     }
diff --git a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
index c78aff7c6..7e439a1a4 100644
--- a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
+++ b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
@@ -23,6 +23,7 @@ import emu.grasscutter.server.dispatch.json.ComboTokenReqJson.LoginTokenData;
 import emu.grasscutter.server.event.dispatch.QueryAllRegionsEvent;
 import emu.grasscutter.server.event.dispatch.QueryCurrentRegionEvent;
 import emu.grasscutter.tools.Tools;
+import emu.grasscutter.utils.Crypto;
 import emu.grasscutter.utils.FileUtils;
 import emu.grasscutter.utils.Utils;
 import express.Express;
@@ -41,9 +42,6 @@ import static emu.grasscutter.utils.Language.translate;
 import static emu.grasscutter.Configuration.*;
 
 public final class DispatchServer {
-	public static String query_region_list = "";
-	public static String query_cur_region = "";
-
 	private final Gson gson;
 	private final String defaultServerName = "os_usa";
 
@@ -56,7 +54,6 @@ public final class DispatchServer {
 		this.regions = new HashMap<>();
 		this.gson = new GsonBuilder().create();
 
-		this.loadQueries();
 		this.initRegion();
 	}
 
@@ -84,31 +81,11 @@ public final class DispatchServer {
 		return null;
 	}
 
-	public void loadQueries() {
-		File file;
-
-		file = new File(DATA("query_region_list.txt"));
-		if (file.exists()) {
-			query_region_list = new String(FileUtils.read(file));
-		} else {
-			Grasscutter.getLogger().warn("[Dispatch] query_region_list not found! Using default region list.");
-		}
-
-		file = new File(DATA("query_cur_region.txt"));
-		if (file.exists()) {
-			query_cur_region = new String(FileUtils.read(file));
-		} else {
-			Grasscutter.getLogger().warn("[Dispatch] query_cur_region not found! Using default current region.");
-		}
-	}
-
 	private void initRegion() {
 		try {
-			byte[] decoded = Base64.getDecoder().decode(query_region_list);
-			QueryRegionListHttpRsp rl = QueryRegionListHttpRsp.parseFrom(decoded);
-
-			byte[] decoded2 = Base64.getDecoder().decode(query_cur_region);
-			QueryCurrRegionHttpRsp regionQuery = QueryCurrRegionHttpRsp.parseFrom(decoded2);
+			String dispatchDomain = "http" + (DISPATCH_ENCRYPTION.useInRouting ? "s" : "") + "://"
+				+ lr(DISPATCH_INFO.accessAddress, DISPATCH_INFO.bindAddress) + ":"
+				+ lr(DISPATCH_INFO.accessPort, DISPATCH_INFO.bindPort);
 
 			List<RegionSimpleInfo> servers = new ArrayList<>();
 			List<String> usedNames = new ArrayList<>(); // List to check for potential naming conflicts.
@@ -117,24 +94,26 @@ public final class DispatchServer {
 						.setName("os_usa")
 						.setTitle(DISPATCH_INFO.defaultName)
 						.setType("DEV_PUBLIC")
-						.setDispatchUrl(
-								"http" + (DISPATCH_ENCRYPTION.useInRouting ? "s" : "") + "://"
-										+ lr(DISPATCH_INFO.accessAddress, DISPATCH_INFO.bindAddress) + ":"
-										+ lr(DISPATCH_INFO.accessPort, DISPATCH_INFO.bindPort)
-										+ "/query_cur_region/" + defaultServerName)
+						.setDispatchUrl(dispatchDomain + "/query_cur_region/" + defaultServerName)
 						.build();
 				usedNames.add(defaultServerName);
 				servers.add(server);
 
-				RegionInfo serverRegion = regionQuery.getRegionInfo().toBuilder()
+				// todo: we might want to push custom config to client, see regionList below for clues.
+				RegionInfo serverRegion = RegionInfo.newBuilder()
 						.setGateserverIp(lr(GAME_INFO.accessAddress, GAME_INFO.bindAddress))
 						.setGateserverPort(lr(GAME_INFO.accessPort, GAME_INFO.bindPort))
-						.setSecretKey(ByteString.copyFrom(FileUtils.read(KEYS_FOLDER + "/dispatchSeed.bin")))
+						.setSecretKey(ByteString.copyFrom(Crypto.DISPATCH_SEED))
 						.build();
 
-				QueryCurrRegionHttpRsp parsedRegionQuery = regionQuery.toBuilder().setRegionInfo(serverRegion).build();
-				regions.put(defaultServerName, new RegionData(parsedRegionQuery,
-						Base64.getEncoder().encodeToString(parsedRegionQuery.toByteString().toByteArray())));
+				QueryCurrRegionHttpRsp parsedRegionQuery = QueryCurrRegionHttpRsp.newBuilder().setRegionInfo(serverRegion).build();
+				regions.put(
+					defaultServerName,
+					new RegionData(
+						parsedRegionQuery,
+						Base64.getEncoder().encodeToString(parsedRegionQuery.toByteString().toByteArray())
+					)
+				);
 
 			} else if (DISPATCH_INFO.regions.length == 0) {
 				Grasscutter.getLogger().error("[Dispatch] There are no game servers available. Exiting due to unplayable state.");
@@ -146,35 +125,40 @@ public final class DispatchServer {
 					Grasscutter.getLogger().error("Region name already in use.");
 					continue;
 				}
+
+				// todo: we might want to push custom config to client, see regionList below for clues.
 				RegionSimpleInfo server = RegionSimpleInfo.newBuilder()
 						.setName(regionInfo.Name)
 						.setTitle(regionInfo.Title)
 						.setType("DEV_PUBLIC")
-						.setDispatchUrl(
-								"http" + (DISPATCH_ENCRYPTION.useInRouting ? "s" : "") + "://"
-										+ lr(DISPATCH_INFO.accessAddress, DISPATCH_INFO.bindAddress) + ":" 
-										+ lr(DISPATCH_INFO.accessPort, DISPATCH_INFO.bindPort) 
-										+ "/query_cur_region/" + regionInfo.Name)
+						.setDispatchUrl(dispatchDomain + "/query_cur_region/" + regionInfo.Name)
 						.build();
 				usedNames.add(regionInfo.Name);
 				servers.add(server);
 
-				RegionInfo serverRegion = regionQuery.getRegionInfo().toBuilder()
+				RegionInfo serverRegion = RegionInfo.newBuilder()
 						.setGateserverIp(regionInfo.Ip)
 						.setGateserverPort(regionInfo.Port)
-						.setSecretKey(ByteString
-								.copyFrom(FileUtils.read(KEYS_FOLDER + "/dispatchSeed.bin")))
+						.setSecretKey(ByteString.copyFrom(Crypto.DISPATCH_SEED))
 						.build();
 
-				QueryCurrRegionHttpRsp parsedRegionQuery = regionQuery.toBuilder().setRegionInfo(serverRegion).build();
-				regions.put(regionInfo.Name, new RegionData(parsedRegionQuery,
-						Base64.getEncoder().encodeToString(parsedRegionQuery.toByteString().toByteArray())));
+				QueryCurrRegionHttpRsp parsedRegionQuery = QueryCurrRegionHttpRsp.newBuilder().setRegionInfo(serverRegion).build();
+				regions.put(
+					regionInfo.Name,
+					new RegionData(
+						parsedRegionQuery,
+						Base64.getEncoder().encodeToString(parsedRegionQuery.toByteString().toByteArray())
+					)
+				);
 			}
 
+			byte[] customConfig = "{\"sdkenv\":\"2\",\"checkdevice\":\"false\",\"loadPatch\":\"false\",\"showexception\":\"false\",\"regionConfig\":\"pm|fk|add\",\"downloadMode\":\"0\"}".getBytes();
+			Crypto.xor(customConfig, Crypto.DISPATCH_KEY);
+
 			QueryRegionListHttpRsp regionList = QueryRegionListHttpRsp.newBuilder()
 					.addAllRegionList(servers)
-					.setClientSecretKey(rl.getClientSecretKey())
-					.setClientCustomConfigEncrypted(rl.getClientCustomConfigEncrypted())
+					.setClientSecretKey(ByteString.copyFrom(Crypto.DISPATCH_SEED))
+					.setClientCustomConfigEncrypted(ByteString.copyFrom(customConfig))
 					.setEnableLoginPc(true)
 					.build();
 
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java
index 9a21e4143..536da8cd1 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java
@@ -9,6 +9,7 @@ import emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp;
 import emu.grasscutter.net.proto.QueryCurrRegionHttpRspOuterClass;
 import emu.grasscutter.net.proto.RegionInfoOuterClass.RegionInfo;
 import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.utils.Crypto;
 import emu.grasscutter.utils.FileUtils;
 
 import java.io.File;
@@ -30,24 +31,14 @@ public class PacketPlayerLoginRsp extends BasePacket {
 		if (SERVER.runMode == ServerRunMode.GAME_ONLY) {
 			if (regionCache == null) {
 				try {
-					File file = new File(DATA("query_cur_region.txt"));
-					String query_cur_region = "";
-					if (file.exists()) {
-						query_cur_region = new String(FileUtils.read(file));
-					} else {
-						Grasscutter.getLogger().warn("query_cur_region not found! Using default current region.");
-					}
-
-					byte[] decodedCurRegion = Base64.getDecoder().decode(query_cur_region);
-					QueryCurrRegionHttpRspOuterClass.QueryCurrRegionHttpRsp regionQuery = QueryCurrRegionHttpRspOuterClass.QueryCurrRegionHttpRsp.parseFrom(decodedCurRegion);
-
-					RegionInfo serverRegion = regionQuery.getRegionInfo().toBuilder()
+					// todo: we might want to push custom config to client
+					RegionInfo serverRegion = RegionInfo.newBuilder()
 							.setGateserverIp(lr(GAME_INFO.accessAddress, GAME_INFO.bindAddress))
 							.setGateserverPort(lr(GAME_INFO.accessPort, GAME_INFO.bindPort))
-							.setSecretKey(ByteString.copyFrom(FileUtils.read(KEYS_FOLDER + "/dispatchSeed.bin")))
+							.setSecretKey(ByteString.copyFrom(Crypto.DISPATCH_SEED))
 							.build();
 
-					regionCache = regionQuery.toBuilder().setRegionInfo(serverRegion).build();
+					regionCache = QueryCurrRegionHttpRspOuterClass.QueryCurrRegionHttpRsp.newBuilder().setRegionInfo(serverRegion).build();
 				} catch (Exception e) {
 					Grasscutter.getLogger().error("Error while initializing region cache!", e);
 				}
diff --git a/src/main/java/emu/grasscutter/utils/Crypto.java b/src/main/java/emu/grasscutter/utils/Crypto.java
index 188a7192e..41150ed13 100644
--- a/src/main/java/emu/grasscutter/utils/Crypto.java
+++ b/src/main/java/emu/grasscutter/utils/Crypto.java
@@ -11,14 +11,18 @@ import static emu.grasscutter.Configuration.*;
 
 public final class Crypto {
 	private static final SecureRandom secureRandom = new SecureRandom();
-	public static final long ENCRYPT_SEED = Long.parseUnsignedLong("11468049314633205968");
-	public static byte[] ENCRYPT_SEED_BUFFER = new byte[0];
 
 	public static byte[] DISPATCH_KEY;
+	public static byte[] DISPATCH_SEED;
+
 	public static byte[] ENCRYPT_KEY;
+	public static long ENCRYPT_SEED = Long.parseUnsignedLong("11468049314633205968");
+	public static byte[] ENCRYPT_SEED_BUFFER = new byte[0];
 	
 	public static void loadKeys() {
 		DISPATCH_KEY = FileUtils.read(KEYS_FOLDER + "/dispatchKey.bin");
+		DISPATCH_SEED = FileUtils.read(KEYS_FOLDER + "/dispatchSeed.bin");
+
 		ENCRYPT_KEY = FileUtils.read(KEYS_FOLDER + "/secretKey.bin");
 		ENCRYPT_SEED_BUFFER = FileUtils.read(KEYS_FOLDER + "/secretKeyBuffer.bin");
 	}
@@ -55,6 +59,6 @@ public final class Crypto {
 	public static byte[] createSessionKey(int length) {
 		byte[] bytes = new byte[length];
 		secureRandom.nextBytes(bytes);
-        return bytes;
+		return bytes;
 	}
 }

From 00ea35b81f5d19604c9762fae1d35a55ab3a34c6 Mon Sep 17 00:00:00 2001
From: Akka <104902222+Akka0@users.noreply.github.com>
Date: Thu, 12 May 2022 19:06:33 +0800
Subject: [PATCH 29/59] add docs for tower

---
 README.md                                                      | 1 +
 README_zh-CN.md                                                | 1 +
 .../java/emu/grasscutter/game/tower/TowerScheduleManager.java  | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bbef2f834..4bb7c96af 100644
--- a/README.md
+++ b/README.md
@@ -139,6 +139,7 @@ There is a dummy user named "Server" in every player's friends list that you can
 | talent         | talent \<talentID> \<value>                         | player.settalent          | Client only  | Sets talent level for your currently selected character           |                                                 |
 | teleport       | teleport [@playerUid] \<x> \<y> \<z> [sceneId]                             | player.teleport           | Both side  | Change the player's position.                                | tp                                              |
 | tpall          |                                                   | player.tpall              | Client only  | Teleports all players in your world to your position         |                                                 |
+| unlocktower    |                                                                                      | player.tower                          | Client only  | Unlock the all floors of abyss                                                                                                      | ut                                                                                                                              |
 | weather        | weather \<weatherID> \<climateID>                   | player.weather            | Client only  | Changes the weather                                          | w                                               |
 
 ### Bonus
diff --git a/README_zh-CN.md b/README_zh-CN.md
index 66878b4f4..372377e4c 100644
--- a/README_zh-CN.md
+++ b/README_zh-CN.md
@@ -140,6 +140,7 @@ chmod +x gradlew
 | talent         | talent <天赋ID> <等级>                       | player.settalent          | 仅客户端 | 设置当前角色的天赋等级                     |                                                 |
 | teleport       | teleport [@playerUid] \<x> \<y> \<z> [sceneId] | player.teleport           | 均可使用 | 传送玩家到指定坐标                         | tp                                              |
 | tpall          |                                                   | player.tpall              | 仅客户端  | 传送多人世界中所有的玩家到自身地点         |                                                 |
+| unlocktower    |                               | player.tower                          | 仅客户端  | 解锁深渊全部层            | ut                                                                                                                              |
 | weather        | weather <天气ID> <气候ID>                    | player.weather            | 仅客户端 | 改变天气                                   | w                                               |
 
 ### 额外功能
diff --git a/src/main/java/emu/grasscutter/game/tower/TowerScheduleManager.java b/src/main/java/emu/grasscutter/game/tower/TowerScheduleManager.java
index ae756f009..1d9a12b89 100644
--- a/src/main/java/emu/grasscutter/game/tower/TowerScheduleManager.java
+++ b/src/main/java/emu/grasscutter/game/tower/TowerScheduleManager.java
@@ -39,7 +39,8 @@ public class TowerScheduleManager {
     public TowerScheduleData getCurrentTowerScheduleData(){
         var data = GameData.getTowerScheduleDataMap().get(towerScheduleConfig.getScheduleId());
         if(data == null){
-            Grasscutter.getLogger().error("Could not get current tower schedule data by config:{}", towerScheduleConfig);
+            Grasscutter.getLogger().error("Could not get current tower schedule data by schedule id {}, please check your resource files",
+                    towerScheduleConfig.getScheduleId());
         }
         
         return data;

From 28f4f73dbe389153f1f86f05ae02a06e05a5b7cb Mon Sep 17 00:00:00 2001
From: tester233 <105267106+tester233@users.noreply.github.com>
Date: Thu, 12 May 2022 17:45:33 +0800
Subject: [PATCH 30/59] Improve text

---
 src/main/resources/languages/zh-CN.json | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json
index ac46370d5..b41e415c2 100644
--- a/src/main/resources/languages/zh-CN.json
+++ b/src/main/resources/languages/zh-CN.json
@@ -16,6 +16,9 @@
         "no_keystore_error": "[Dispatch] 未找到 SSL 证书！已降级到 HTTP 模式",
         "default_password": "[Dispatch] 成功加载 keystore 默认密码。请考虑将 config.json 的默认密码设置为 123456"
       },
+      "authentication": {
+        "default_unable_to_verify": "[Authentication] 称为 verifyUser 的方法在默认身份认证程序中不可用"
+      },
       "no_commands_error": "此命令不适用于 Dispatch-only 模式",
       "unhandled_request_error": "[Dispatch] 潜在的未处理请求：%s %s",
       "account": {
@@ -46,7 +49,7 @@
       "run_mode_help": "服务器运行模式必须为 HYBRID、DISPATCH_ONLY 或 GAME_ONLY。Grasscutter 启动失败...",
       "create_resources": "正在创建 resources 目录...",
       "resources_error": "请将 BinOutput 和 ExcelBinOutput 复制到 resources 目录。",
-      "version": "Grasscutter版本: %s-%s"
+      "version": "Grasscutter 版本: %s-%s"
     }
   },
   "commands": {
@@ -81,7 +84,7 @@
       "player_exist_offline_error": "玩家不存在或已离线。",
       "argument_error": "无效的参数。",
       "clear_target": "目标已清除。",
-      "set_target": "随后的的命令都会以@%s为预设。",
+      "set_target": "随后的的命令都会以 @%s 为预设。",
       "need_target": "此命令需要一个目标 UID。添加 <@UID> 参数或使用 /target @UID 来指定默认目标。"
     },
     "status": {
@@ -150,7 +153,7 @@
     },
     "giveChar": {
       "usage": "用法：givechar <玩家> <角色ID|角色名> [数量]",
-      "given": "已将角色 %s (等级 %s) 给与 %s。",
+      "given": "已将角色 %s [等级 %s] 给与 %s。",
       "invalid_avatar_id": "无效的角色ID。",
       "invalid_avatar_level": "无效的角色等级。",
       "invalid_avatar_or_player_id": "无效的角色ID/玩家ID。",
@@ -161,12 +164,12 @@
       "refinement_only_applicable_weapons": "只有武器可以设置精炼等级。",
       "refinement_must_between_1_and_5": "精炼等级必须在 1 到 5 之间。",
       "given": "已将 %s 个 %s 给予 %s。",
-      "given_with_level_and_refinement": "已将 %s (等级 %s, 精炼 %s) %s 个给予 %s。",
-      "given_level": "已将 %s (等级 %s) %s 个给予 %s。",
+      "given_with_level_and_refinement": "已将 %s [等级 %s, 精炼 %s] %s 个给予 %s。",
+      "given_level": "已将 %s [等级 %s] %s 个给予 %s。",
       "description": "给予指定物品"
     },
     "godmode": {
-      "success": "%s 的上帝模式已被设置为 %s。",
+      "success": "上帝模式已被设置为 %s。[用户：%s]",
       "description": "防止你受到伤害"
     },
     "heal": {
@@ -352,11 +355,11 @@
   },
   "gacha": {
     "details": {
-      "title": "Banner Details",
-      "available_five_stars": "Available 5-star Items",
-      "available_four_stars": "Available 4-star Items",
-      "available_three_stars": "Available 3-star Items",
-      "template_missing": "data/gacha_details.html is missing."
+      "title": "祈愿详情",
+      "available_five_stars": "五星物品清单",
+      "available_four_stars": "四星物品清单",
+      "available_three_stars": "三星物品清单",
+      "template_missing": "缺失文件：data/gacha_details.html"
     }
   }
 }

From 4d9c2becb5054eb7a233d99e3d4858c5327fd8d2 Mon Sep 17 00:00:00 2001
From: tester233 <105267106+tester233@users.noreply.github.com>
Date: Thu, 12 May 2022 18:02:29 +0800
Subject: [PATCH 31/59] Improve text

---
 src/main/resources/languages/zh-CN.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json
index b41e415c2..fe78df38d 100644
--- a/src/main/resources/languages/zh-CN.json
+++ b/src/main/resources/languages/zh-CN.json
@@ -169,11 +169,11 @@
       "description": "给予指定物品"
     },
     "godmode": {
-      "success": "上帝模式已被设置为 %s。[用户：%s]",
+      "success": "上帝模式已设为 %s。[用户：%s]",
       "description": "防止你受到伤害"
     },
     "heal": {
-      "success": "已经治疗所有角色。",
+      "success": "已治疗所有角色。",
       "description": "治疗当前队伍的角色"
     },
     "kick": {
@@ -260,7 +260,7 @@
     "setFetterLevel": {
       "usage": "用法：setfetterlevel <好感度等级>",
       "range_error": "好感度等级必须在 0 到 10 之间。",
-      "success": "好感度已设置为 %s 级。",
+      "success": "好感度已设为 %s 级。",
       "level_error": "无效的好感度等级。",
       "description": "设置当前角色的好感度等级"
     },
@@ -272,14 +272,14 @@
       "uid_error": "无效的UID。",
       "player_error": "玩家不存在或已离线。",
       "set_self": "%s 已设为 %s。",
-      "set_for_uid": "将 %s (来自 %s) 设置为 %s。",
+      "set_for_uid": "%s [来自 %s] 已设为 %s。",
       "set_max_hp": "最大生命值已设为 %s。",
       "description": "设置当前角色的属性"
     },
     "setWorldLevel": {
       "usage": "用法：setworldlevel <等级>",
       "value_error": "世界等级必须设置在0-8之间。",
-      "success": "已将世界等级设为 %s。",
+      "success": "世界等级已设为 %s。",
       "invalid_world_level": "无效的世界等级。",
       "description": "设置世界等级，执行命令后需重新登录以生效"
     },
@@ -356,9 +356,9 @@
   "gacha": {
     "details": {
       "title": "祈愿详情",
-      "available_five_stars": "五星物品清单",
-      "available_four_stars": "四星物品清单",
-      "available_three_stars": "三星物品清单",
+      "available_five_stars": "出现的五星物品",
+      "available_four_stars": "出现的四星物品",
+      "available_three_stars": "出现的三星物品",
       "template_missing": "缺失文件：data/gacha_details.html"
     }
   }

From 12c7c8f8c1acacd2f650f1392f491aaae079b594 Mon Sep 17 00:00:00 2001
From: tester233 <105267106+tester233@users.noreply.github.com>
Date: Thu, 12 May 2022 23:46:39 +0800
Subject: [PATCH 32/59] Improve text

---
 src/main/resources/languages/zh-CN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json
index fe78df38d..4ece73fd9 100644
--- a/src/main/resources/languages/zh-CN.json
+++ b/src/main/resources/languages/zh-CN.json
@@ -17,7 +17,7 @@
         "default_password": "[Dispatch] 成功加载 keystore 默认密码。请考虑将 config.json 的默认密码设置为 123456"
       },
       "authentication": {
-        "default_unable_to_verify": "[Authentication] 称为 verifyUser 的方法在默认身份认证程序中不可用"
+        "default_unable_to_verify": "[Authentication] 称为 verifyUser 的 method 在默认验证程序中不可用"
       },
       "no_commands_error": "此命令不适用于 Dispatch-only 模式",
       "unhandled_request_error": "[Dispatch] 潜在的未处理请求：%s %s",

From 92b103d529e3e5c67017a8af31c23e933883b7b1 Mon Sep 17 00:00:00 2001
From: Hotaru <105128850+HotaruYS@users.noreply.github.com>
Date: Fri, 13 May 2022 02:47:38 +0200
Subject: [PATCH 33/59] Fix UTF-8 encoding in announcements

---
 data/GameAnnouncement.json                    |  47 ++++----
 data/GameAnnouncementList.json                | 110 +++++-------------
 .../server/dispatch/AnnouncementHandler.java  |  33 +++---
 3 files changed, 65 insertions(+), 125 deletions(-)

diff --git a/data/GameAnnouncement.json b/data/GameAnnouncement.json
index 2bce06fdb..96c88f17c 100644
--- a/data/GameAnnouncement.json
+++ b/data/GameAnnouncement.json
@@ -1,29 +1,22 @@
 {
-"list": [
-  {
-    "ann_id": 1,
-    "title": "<b>Welcome to Grasscutter!</b>",
-    "subtitle": "<b>Welcome</b>",
-    "banner": "https://uploadstatic-sea.mihoyo.com/announcement/2020/09/17/f4aa42d505822805eebf4a55d72a78d8_2755691727027973637.jpg",
-    "content": "Hi there!<br>First of all, welcome to Grasscutter. If you have any issues, please let us know so that Lawnmower can help you! Check out our:<br><div><p style=\"white-space: pre-wrap;\"><strong>��Discord��</strong></p><p style=\"white-space: pre-wrap;\"><a href=\"https://discord.gg/T5vZU6UyeG\">https://discord.gg/T5vZU6UyeG</a></p><p style=\"white-space: pre-wrap;\"><strong>��GitHub��</strong></p><p style=\"white-space: pre-wrap;\"><a href=\"https://github.com/Grasscutters/Grasscutter\">https://github.com/Grasscutters/Grasscutter</a></p></div>",
-    "lang": "es-es"
-  },
-  {
-    "ann_id": 2,
-    "title": "<b>How to use announcements</b>",
-    "subtitle": "<b>How to use</b>",
-    "banner": "https://uploadstatic-sea.mihoyo.com/announcement/2020/09/17/f4aa42d505822805eebf4a55d72a78d8_2755691727027973637.jpg",
-    "content": "<strong>Tips<br></strong>>How to use announcements<br><br>>Announcement content can use HTML<br><br>>The specific content of the announcement is stored in the program directory<code>data/GameAnnouncement.json</code>, while<code>GameAnnouncementList.json</code> stores the announcement list data<br><br><strong>How to use</strong><br>>In <code>GameAnnouncement</code><table><thead><thead><tr><th>Parameters</th><th>Description</th></thead></thead><thbody><thead><tr><th>ann_Id</th><th>Announcement unique id</th></thead><thead><tr><th>title</th><th>Show at the top of the content</th></thead><thead><tr><th>subtitle</th><th>title shown on the left</th></thead><thead><tr><th>banner</th><th>Display between content and title</th></thead><thead><tr><th>content</th><th>as u see</th></thead><thead><tr><th>lang</th><th>display language</th></thead><thead><tr><th>total</th><th>Announcement quantity</th></thead></thbody></table><br><br>>In <code>GameAnnouncementList</code><br>If you want to add an annouement, please add the list data in the announcement type corresponding to GameAnnouncementList, and finally add the announcement content in GameAnnouncement",
-    "lang": "es-es"
-  },
-  {
-    "ann_id": 3,
-    "title": "<b>���ǻ����--This is the event announcement</b>",
-    "subtitle": "<b>Welcome</b>",
-    "banner":"https://uploadstatic-sea.mihoyo.com/announcement/2020/09/22/7d85f19b152d218e73224d7c138a0fd0_5818585260283672899.jpg",
-    "content": "Welcome",
-    "lang": "es-es"
-  }
-],
-"total": 3
+  "list": [
+    {
+      "ann_id": 1,
+      "title": "<strong>Welcome to Grasscutter!</strong>",
+      "subtitle": "Welcome!",
+      "banner": "https://uploadstatic-sea.mihoyo.com/announcement/2020/09/17/f4aa42d505822805eebf4a55d72a78d8_2755691727027973637.jpg",
+      "content": "<p>Hi there!</p><p>First of all, welcome to Grasscutter. If you have any issues, please let us know so that Lawnmower can help you!</p><br><p><strong>〓Discord〓</strong></p><a href=\"https://discord.gg/T5vZU6UyeG\">https://discord.gg/T5vZU6UyeG</a><br><br><p><strong>〓GitHub〓</strong><a href=\"https://github.com/Grasscutters/Grasscutter\">https://github.com/Grasscutters/Grasscutter</a>",
+
+      "lang": "en-US"
+    },
+    {
+      "ann_id": 2,
+      "title": "<strong>How to use announcements</strong>",
+      "subtitle": "How to use announcements",
+      "banner": "https://uploadstatic-sea.mihoyo.com/announcement/2020/09/17/f4aa42d505822805eebf4a55d72a78d8_2755691727027973637.jpg",
+      "content": "<p>Announcement content uses HTML. The specific content of the announcement is stored in the program directory <code>GameAnnouncement.json</code>, while <code>GameAnnouncementList.json</code> stores the announcement list data.</p><h2><code>GameAnnouncement</code></h2><table><tr><th>Parameter</th><th>Description</th></tr><tr><td>ann_id</td><td>Unique ID</td></tr><tr><td>title</td><td>Title shown at the top of the content</td></tr><tr><td>subtitle</td><td>Short title shown on the left</td></tr><tr><td>banner</td><td>Image to display between content and title</td></tr><tr><td>content</td><td>Content body in HTML</td></tr><tr><td>lang</td><td>Language code for this entry</td></tr></table><h2><code>GameAnnouncementList</code></h2><p>If you want to add an announcement, please add the list data in the announcement type corresponding to <code>GameAnnouncementList</code>, and finally add the announcement content in <code>GameAnnouncement</code>.</p>",
+      "lang": "en-US"
+    }
+  ],
+  "total": 2
 }
\ No newline at end of file
diff --git a/data/GameAnnouncementList.json b/data/GameAnnouncementList.json
index ea3091fc7..f6566960a 100644
--- a/data/GameAnnouncementList.json
+++ b/data/GameAnnouncementList.json
@@ -5,115 +5,57 @@
       "list": [
         {
           "ann_id": 1,
-          "title": "<b>Welcome to Grasscutter!</b>",
-          "subtitle": "<b>Welcome</b>",
+
+          "title": "<strong>Welcome to Grasscutter!</strong>",
+          "subtitle": "Welcome!",
           "banner": "https://uploadstatic-sea.mihoyo.com/announcement/2020/09/22/7d85f19b152d218e73224d7c138a0fd0_5818585260283672899.jpg",
-          "content": "",
-          "type_label": "Juego",
-          "tag_label": "1",
           "tag_icon": "https://uploadstatic-sea.mihoyo.com/announcement/2020/03/05/a2588f1a51faee9fa8dfe9aead649dd6_7237021399135895303.png",
-          "login_alert": 1,
-          "lang": "es-es",
-          "start_time": "2020-09-25 04:05:30",
-          "end_time": "2023-10-30 11:00:00",
           "type": 2,
-          "remind": 0,
-          "alert": 0,
-          "tag_start_time": "2000-01-02 15:04:05",
-          "tag_end_time": "2030-01-02 15:04:05",
-          "remind_ver": 1,
-          "has_content": true,
-          "extra_remind": 0
+          "type_label": "System",
+          "lang": "en-US",
+          "start_time": "2020-09-25 04:05:30",
+          "end_time": "2030-10-30 11:00:00",
+          "content": "",
+          "has_content": true
         },
         {
           "ann_id": 2,
-          "title": "<b>������Ϸ���� -- This is the game announcement</b>",
-          "subtitle": "<b>This is the game announcement</b>",
-          "banner": "https://uploadstatic-sea.mihoyo.com/announcement/2020/09/17/85b7163c95745a76d49b3d163d893592_6487108933004985049.jpg",
-          "content": "",
-          "type_label": "Juego",
-          "tag_label": "1",
+          "title": "<strong>How to use announcements</strong>",
+          "subtitle": "How to use announcements",
+          "banner": "https://uploadstatic-sea.mihoyo.com/announcement/2020/09/22/7d85f19b152d218e73224d7c138a0fd0_5818585260283672899.jpg",
           "tag_icon": "https://uploadstatic-sea.mihoyo.com/announcement/2020/03/05/a2588f1a51faee9fa8dfe9aead649dd6_7237021399135895303.png",
-          "login_alert": 1,
-          "lang": "es-es",
-          "start_time": "2020-09-25 15:12:09",
-          "end_time": "2030-10-30 11:00:00",
           "type": 2,
-          "remind": 0,
-          "alert": 0,
-          "tag_start_time": "2000-01-02 08:04:05",
-          "tag_end_time": "2030-01-02 08:04:05",
-          "remind_ver": 1,
-          "has_content": true,
-          "extra_remind": 0
+          "type_label": "System",
+          "lang": "en-US",
+          "start_time": "2020-09-25 04:05:30",
+          "end_time": "2030-10-30 11:00:00",
+          "content": "",
+          "has_content": true
         }
       ],
       "type_id": 2,
-      "type_label": "Juego"
-    },
-    {
-      "list": [
-        {
-          "ann_id": 3,
-          "title": "<b>���ǻ����--This is the event announcement</b>",
-          "subtitle": "<b>Welcome</b>",
-          "banner": "https://uploadstatic-sea.mihoyo.com/announcement/2020/09/22/7d85f19b152d218e73224d7c138a0fd0_5818585260283672899.jpg",
-          "content": "",
-          "type_label": "Eventos",
-          "tag_label": "1",
-          "tag_icon": "https://uploadstatic-sea.mihoyo.com/announcement/2020/03/05/a2588f1a51faee9fa8dfe9aead649dd6_7237021399135895303.png",
-          "login_alert": 1,
-          "lang": "es-es",
-          "start_time": "2020-09-25 04:05:30",
-          "end_time": "2022-05-02 00:51:00",
-          "type": 2,
-          "remind": 0,
-          "alert": 0,
-          "tag_start_time": "2000-01-02 15:04:05",
-          "tag_end_time": "2022-05-02 00:51:00",
-          "remind_ver": 1,
-          "has_content": true,
-          "extra_remind": 0
-        }
-      ],
-      "type_id": 1,
-      "type_label": "Eventos"
+      "type_label": "System"
     },
     {
       "list": [
         {}
       ],
       "type_id": 3,
-      "type_label": "Others"
+      "type_label": "Events"
     }
   ],
-  "total": 3,
+  "total": 2,
   "type_list": [
     {
       "id": 2,
-      "name": "��Ϸϵͳ����",
-      "mi18n_name": "Juego"
+      "name": "游戏系统公告",
+      "mi18n_name": "System"
     },
     {
       "id": 1,
-      "name": "�����",
-      "mi18n_name": "Eventos"
-    },
-    {
-      "id": 3,
-      "name": "����",
-      "mi18n_name": "Others"
+      "name": "活动公告",
+      "mi18n_name": "Activity"
     }
   ],
-  "alert": true,
-  "alert_id": 2,
-  "timezone": -5,
-  "pic_list": [
-  ],
-  "pic_total": 0,
-  "pic_type_list": [
-  ],
-  "pic_alert": false,
-  "pic_alert_id": 0,
-  "static_sign": ""
+  "timezone": -5
 }
\ No newline at end of file
diff --git a/src/main/java/emu/grasscutter/server/dispatch/AnnouncementHandler.java b/src/main/java/emu/grasscutter/server/dispatch/AnnouncementHandler.java
index ab752c8e1..a3e69113b 100644
--- a/src/main/java/emu/grasscutter/server/dispatch/AnnouncementHandler.java
+++ b/src/main/java/emu/grasscutter/server/dispatch/AnnouncementHandler.java
@@ -5,34 +5,39 @@ import express.http.HttpContextHandler;
 import express.http.Request;
 import express.http.Response;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Objects;
 
 import static emu.grasscutter.Configuration.*;
 
 public final class AnnouncementHandler implements HttpContextHandler {
     @Override
-    public void handle(Request request, Response response) throws IOException {//event
+    public void handle(Request request, Response response) throws IOException {
         if (Objects.equals(request.baseUrl(), "/common/hk4e_global/announcement/api/getAnnContent")) {
-            response.send("{\"retcode\":0,\"message\":\"OK\",\"data\":" + readToString(new File(DATA("GameAnnouncement.json"))) +"}");
+            String data = readToString(Paths.get(DATA("GameAnnouncement.json")));
+
+            response.send("{\"retcode\":0,\"message\":\"OK\",\"data\":" + data + "}");
         } else if (Objects.equals(request.baseUrl(), "/common/hk4e_global/announcement/api/getAnnList")) {
-            String data = readToString(new File(DATA("GameAnnouncementList.json"))).replace("System.currentTimeMillis()",String.valueOf(System.currentTimeMillis()));
-            response.send("{\"retcode\":0,\"message\":\"OK\",\"data\": "+data +"}");
+            String data = readToString(Paths.get(DATA("GameAnnouncementList.json")))
+                .replace("System.currentTimeMillis()", String.valueOf(System.currentTimeMillis()));
+
+            response.send("{\"retcode\":0,\"message\":\"OK\",\"data\": " + data + "}");
         }
     }
-    @SuppressWarnings("ResultOfMethodCallIgnored")
-    private static String readToString(File file) {
-        long length = file.length();
-        byte[] content = new byte[(int) length];
+
+    private static String readToString(Path path) {
+        String content = "";
+
         try {
-            FileInputStream in = new FileInputStream(file);
-            in.read(content); in.close();
+            content = Files.readString(path, StandardCharsets.UTF_8);
         } catch (IOException ignored) {
-            Grasscutter.getLogger().warn("File not found: " + file.getAbsolutePath());
+            Grasscutter.getLogger().warn("Unable to open file " + path.toAbsolutePath());
         }
         
-        return new String(content);
+        return content;
     }
 }
\ No newline at end of file

From b852f384ff9ae77c4f1f6d68b00d9b2f409adc1a Mon Sep 17 00:00:00 2001
From: Hotaru <105128850+HotaruYS@users.noreply.github.com>
Date: Fri, 13 May 2022 03:21:58 +0200
Subject: [PATCH 34/59] Fix broken time formatting on gacha records

---
 data/gacha_records.html | 61 +++--------------------------------------
 1 file changed, 4 insertions(+), 57 deletions(-)

diff --git a/data/gacha_records.html b/data/gacha_records.html
index 5ce8e660f..7bea40f61 100644
--- a/data/gacha_records.html
+++ b/data/gacha_records.html
@@ -53,47 +53,14 @@
             }
         </style>
         <title>Gacha Records</title>
-        <script>
-            // Debug entry
-            // record = [
-            //     {"time": 10000341, "item": 1041}, 
-            //     {"time": 10000342, "item": 1032}, 
-            //     {"time": 10000343, "item": 1035}, 
-            // ];
-            // maxPage = 5;
-
-            // in production environment
-            record = {{REPLACE_RECORD}};
-            maxPage = {{REPLACE_MAXPAGE}};
-
-            // TODO: implement this mapper by yourself
-            // I don't want to put real items' name here to avoid being DMCA'd
-            mappings = {
-                'en-us': {
-                    200: "Standard",
-                    301: "Event Avatar",
-                    302: "Event Weapon",
-                    1041 : ["M0n4", "blue"],
-                    1032 : ["B4nn477", "purple"],
-                    1035 : ["77", "yellow"]
-                },
-                'zh-cn': {
-                        // encoding issues here, maybe we should consider load mappings remotely
-                        // will display as "锟斤铐锟斤铐锟斤铐", lmao
-                    // 200: "常驻", 
-                    // 301: "角色UP-1",
-                    // 302: "武器UP"
-                    200: "Standard",
-                    301: "Event Avatar",
-                    302: "Event Weapon",
-                }
-            };
-        </script>
         <!-- This file could be generated automatically using `java -jar grasscutter.jar -gachamap` -->
         <!-- You can also modify the file manually to customize it -->
         <!-- Otherwise you may onle see number IDs in the gacha record -->
         <script type="text/javascript" src="/gacha/mappings"></script>
         <script>
+            record = {{REPLACE_RECORD}};
+            maxPage = {{REPLACE_MAXPAGE}};
+
             mappings['default'] = mappings['en-us']; // make en-us as default/fallback option
         </script>
     </head>
@@ -161,32 +128,12 @@
                 }
                 return "<span class='blue'>" + itemID + "</span>";
             }
-            function dateFormatter(timeStamp) {
-                var date = new Date(timeStamp);
-                if (lang == "en-us" || lang == null) { // MM/DD/YYYY hh:mm:ss.SSS
-                    return  String(date.getMonth()+1).padStart(2, "0") + 
-                        "/"+String(date.getDate()).padStart(2, "0")+
-                        "/"+date.getFullYear()+
-                        " "+String(date.getHours()).padStart(2, "0")+
-                        ":"+String(date.getMinutes()).padStart(2, "0")+
-                        ":"+String(date.getSeconds()).padStart(2, "0")+
-                        "."+String(date.getMilliseconds()).padStart(3, "0");
-                } else if (lang == "zh-cn") { // YYYY/MM/DD hh:mm:ss.SSS
-                    return date.getFullYear()+ 
-                        "/" + String(date.getMonth()+1).padStart(2, "0") + 
-                        "/"+String(date.getDate()).padStart(2, "0")+
-                        " "+String(date.getHours()).padStart(2, "0")+
-                        ":"+String(date.getMinutes()).padStart(2, "0")+
-                        ":"+String(date.getSeconds()).padStart(2, "0")+
-                        "."+String(date.getMilliseconds()).padStart(3, "0");
-                }
-            }
             (function (){
                 var container = document.getElementById("container");
                 record.forEach(element => {
                     var e = document.createElement("tr");
                     
-                    e.innerHTML= "<td>" + dateFormatter(element.time) + "</td><td>" + itemMapper(element.item) + "</td>";
+                    e.innerHTML= "<td>" + (new Date(element.time).toLocaleString(lang)) + "</td><td>" + itemMapper(element.item) + "</td>";
                     container.appendChild(e);
                 });
                 // setup pagenation buttons

From 3c55aa64eb3880aace707bc58fff083870fac4d0 Mon Sep 17 00:00:00 2001
From: Akka <104902222+Akka0@users.noreply.github.com>
Date: Fri, 13 May 2022 14:59:05 +0800
Subject: [PATCH 35/59] fix: LEAK: ByteBuf.release() was not called

---
 src/main/java/emu/grasscutter/server/game/GameSession.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/emu/grasscutter/server/game/GameSession.java b/src/main/java/emu/grasscutter/server/game/GameSession.java
index 7cc9a799f..cf6386770 100644
--- a/src/main/java/emu/grasscutter/server/game/GameSession.java
+++ b/src/main/java/emu/grasscutter/server/game/GameSession.java
@@ -252,6 +252,7 @@ public class GameSession extends KcpChannel {
 		} catch (Exception e) {
 			e.printStackTrace();
 		} finally {
+			data.release();
 			packet.release();
 		}
 	}

From 631a53030c5d86242aa6214aa3a01b4c2a19eb4e Mon Sep 17 00:00:00 2001
From: Melledy <52122272+Melledy@users.noreply.github.com>
Date: Fri, 13 May 2022 03:12:25 -0700
Subject: [PATCH 36/59] Switch to using quest excels

---
 .../java/emu/grasscutter/data/GameData.java   |  13 +-
 .../emu/grasscutter/data/ResourceLoader.java  |  17 +--
 .../data/custom/MainQuestData.java            |  53 ++++++++
 .../grasscutter/data/custom/QuestConfig.java  |  25 ----
 .../data/custom/QuestConfigData.java          | 104 ----------------
 .../emu/grasscutter/data/def/QuestData.java   | 115 ++++++++++++++++++
 .../grasscutter/game/quest/GameMainQuest.java |   1 -
 .../emu/grasscutter/game/quest/GameQuest.java |  49 +++++---
 .../grasscutter/game/quest/QuestManager.java  |  27 ++--
 .../grasscutter/game/quest/QuestValue.java    |   4 +-
 .../game/quest/ServerQuestHandler.java        |  12 +-
 .../game/quest/conditions/BaseCondition.java  |   6 +-
 .../ConditionPlayerLevelEqualGreater.java     |   8 +-
 .../quest/conditions/ConditionStateEqual.java |  10 +-
 .../game/quest/content/BaseContent.java       |   6 +-
 .../quest/content/ContentCompleteTalk.java    |   6 +-
 ...uestTriggerType.java => QuestTrigger.java} |   4 +-
 .../game/quest/handlers/QuestBaseHandler.java |   2 +-
 .../server/packet/recv/HandlerNpcTalkReq.java |   4 +-
 ...etServerCondMeetQuestListUpdateNotify.java |   3 -
 .../java/emu/grasscutter/tools/Tools.java     |  12 +-
 21 files changed, 262 insertions(+), 219 deletions(-)
 create mode 100644 src/main/java/emu/grasscutter/data/custom/MainQuestData.java
 delete mode 100644 src/main/java/emu/grasscutter/data/custom/QuestConfig.java
 delete mode 100644 src/main/java/emu/grasscutter/data/custom/QuestConfigData.java
 create mode 100644 src/main/java/emu/grasscutter/data/def/QuestData.java
 rename src/main/java/emu/grasscutter/game/quest/enums/{QuestTriggerType.java => QuestTrigger.java} (99%)

diff --git a/src/main/java/emu/grasscutter/data/GameData.java b/src/main/java/emu/grasscutter/data/GameData.java
index 2b40818e1..75b840202 100644
--- a/src/main/java/emu/grasscutter/data/GameData.java
+++ b/src/main/java/emu/grasscutter/data/GameData.java
@@ -12,7 +12,7 @@ import emu.grasscutter.data.custom.AbilityEmbryoEntry;
 import emu.grasscutter.data.custom.AbilityModifier;
 import emu.grasscutter.data.custom.AbilityModifierEntry;
 import emu.grasscutter.data.custom.OpenConfigEntry;
-import emu.grasscutter.data.custom.QuestConfig;
+import emu.grasscutter.data.custom.MainQuestData;
 import emu.grasscutter.data.custom.ScenePointEntry;
 import emu.grasscutter.data.def.*;
 import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
@@ -28,7 +28,7 @@ public class GameData {
 	private static final Map<String, AbilityModifierEntry> abilityModifiers = new HashMap<>();
 	private static final Map<String, OpenConfigEntry> openConfigEntries = new HashMap<>();
 	private static final Map<String, ScenePointEntry> scenePointEntries = new HashMap<>();
-	private static final Int2ObjectMap<QuestConfig> questConfigs = new Int2ObjectOpenHashMap<>();
+	private static final Int2ObjectMap<MainQuestData> mainQuestData = new Int2ObjectOpenHashMap<>();
 	
 	// ExcelConfigs
 	private static final Int2ObjectMap<PlayerLevelData> playerLevelDataMap = new Int2ObjectOpenHashMap<>();
@@ -70,6 +70,7 @@ public class GameData {
 	private static final Int2ObjectMap<WorldLevelData> worldLevelDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<DailyDungeonData> dailyDungeonDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<DungeonData> dungeonDataMap = new Int2ObjectOpenHashMap<>();
+	private static final Int2ObjectMap<QuestData> questDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<ShopGoodsData> shopGoodsDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<CombineData> combineDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<RewardPreviewData> rewardPreviewDataMap = new Int2ObjectOpenHashMap<>();
@@ -124,8 +125,8 @@ public class GameData {
 		return getScenePointEntries().get(sceneId + "_" + pointId);
 	}
 
-	public static Int2ObjectMap<QuestConfig> getQuestConfigs() {
-		return questConfigs;
+	public static Int2ObjectMap<MainQuestData> getMainQuestDataMap() {
+		return mainQuestData;
 	}
 
 	public static Int2ObjectMap<AvatarData> getAvatarDataMap() {
@@ -337,4 +338,8 @@ public class GameData {
 	public static Int2ObjectMap<TowerScheduleData> getTowerScheduleDataMap(){
 		return towerScheduleDataMap;
 	}
+
+	public static Int2ObjectMap<QuestData> getQuestDataMap() {
+		return questDataMap;
+	}
 }
diff --git a/src/main/java/emu/grasscutter/data/ResourceLoader.java b/src/main/java/emu/grasscutter/data/ResourceLoader.java
index 5c2ac1ee6..4b940c44d 100644
--- a/src/main/java/emu/grasscutter/data/ResourceLoader.java
+++ b/src/main/java/emu/grasscutter/data/ResourceLoader.java
@@ -24,9 +24,7 @@ import emu.grasscutter.data.custom.AbilityModifier.AbilityModifierAction;
 import emu.grasscutter.data.custom.AbilityModifier.AbilityModifierActionType;
 import emu.grasscutter.data.custom.AbilityModifierEntry;
 import emu.grasscutter.data.custom.OpenConfigEntry;
-import emu.grasscutter.data.custom.QuestConfig;
-import emu.grasscutter.data.custom.QuestConfigData;
-import emu.grasscutter.data.custom.QuestConfigData.SubQuestConfigData;
+import emu.grasscutter.data.custom.MainQuestData;
 import emu.grasscutter.data.custom.ScenePointEntry;
 import emu.grasscutter.game.world.SpawnDataEntry.*;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@@ -407,24 +405,19 @@ public class ResourceLoader {
 		}
 		
 		for (File file : folder.listFiles()) {
-			QuestConfigData mainQuest = null;
+			MainQuestData mainQuest = null;
 			
 			try (FileReader fileReader = new FileReader(file)) {
-				mainQuest = Grasscutter.getGsonFactory().fromJson(fileReader, QuestConfigData.class);
+				mainQuest = Grasscutter.getGsonFactory().fromJson(fileReader, MainQuestData.class);
 			} catch (Exception e) {
 				e.printStackTrace();
 				continue;
 			}
 			
-			if (mainQuest.getSubQuests() != null) {
-				for (SubQuestConfigData subQuest : mainQuest.getSubQuests()) {
-					QuestConfig quest = new QuestConfig(mainQuest, subQuest);
-					GameData.getQuestConfigs().put(quest.getId(), quest);
-				}
-			}
+			GameData.getMainQuestDataMap().put(mainQuest.getId(), mainQuest);
 		}
 		
-		Grasscutter.getLogger().info("Loaded " + GameData.getQuestConfigs().size() + " Quest Configs");
+		Grasscutter.getLogger().info("Loaded " + GameData.getMainQuestDataMap().size() + " MainQuestDatas.");
 	}
 
 	// BinOutput configs
diff --git a/src/main/java/emu/grasscutter/data/custom/MainQuestData.java b/src/main/java/emu/grasscutter/data/custom/MainQuestData.java
new file mode 100644
index 000000000..e405e3598
--- /dev/null
+++ b/src/main/java/emu/grasscutter/data/custom/MainQuestData.java
@@ -0,0 +1,53 @@
+package emu.grasscutter.data.custom;
+
+import emu.grasscutter.game.quest.enums.LogicType;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
+import emu.grasscutter.game.quest.enums.QuestType;
+
+public class MainQuestData {
+	private int id;
+	private int series;
+	private QuestType type;
+	
+	private long titleTextMapHash;
+	private int[] suggestTrackMainQuestList;
+	private int[] rewardIdList;
+	
+	private SubQuestData[] subQuests;
+	
+	public int getId() {
+		return id;
+	}
+	
+	public int getSeries() {
+		return series;
+	}
+	
+	public QuestType getType() {
+		return type;
+	}
+	
+	public long getTitleTextMapHash() {
+		return titleTextMapHash;
+	}
+	
+	public int[] getSuggestTrackMainQuestList() {
+		return suggestTrackMainQuestList;
+	}
+
+	public int[] getRewardIdList() {
+		return rewardIdList;
+	}
+	
+	public SubQuestData[] getSubQuests() {
+		return subQuests;
+	}
+	
+	public static class SubQuestData {
+		private int subId;
+
+		public int getSubId() {
+			return subId;
+		}
+	}
+}
diff --git a/src/main/java/emu/grasscutter/data/custom/QuestConfig.java b/src/main/java/emu/grasscutter/data/custom/QuestConfig.java
deleted file mode 100644
index 8674ff7ab..000000000
--- a/src/main/java/emu/grasscutter/data/custom/QuestConfig.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package emu.grasscutter.data.custom;
-
-import emu.grasscutter.data.custom.QuestConfigData.SubQuestConfigData;
-
-public class QuestConfig {
-	private final QuestConfigData mainQuest;
-	private final SubQuestConfigData subQuest;
-	
-	public QuestConfig(QuestConfigData mainQuest, SubQuestConfigData subQuest) {
-		this.mainQuest = mainQuest;
-		this.subQuest = subQuest;
-	}
-
-	public int getId() {
-		return subQuest.getSubId();
-	}
-
-	public QuestConfigData getMainQuest() {
-		return mainQuest;
-	}
-
-	public SubQuestConfigData getSubQuest() {
-		return subQuest;
-	}
-}
diff --git a/src/main/java/emu/grasscutter/data/custom/QuestConfigData.java b/src/main/java/emu/grasscutter/data/custom/QuestConfigData.java
deleted file mode 100644
index 3ede024f2..000000000
--- a/src/main/java/emu/grasscutter/data/custom/QuestConfigData.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package emu.grasscutter.data.custom;
-
-import emu.grasscutter.game.quest.enums.LogicType;
-import emu.grasscutter.game.quest.enums.QuestTriggerType;
-import emu.grasscutter.game.quest.enums.QuestType;
-
-public class QuestConfigData {
-	private int id;
-	private int series;
-	private QuestType type;
-	
-	private long titleTextMapHash;
-	private int[] suggestTrackMainQuestList;
-	private int[] rewardIdList;
-	
-	private SubQuestConfigData[] subQuests;
-	
-	public int getId() {
-		return id;
-	}
-
-	public int getSeries() {
-		return series;
-	}
-
-	public QuestType getType() {
-		return type;
-	}
-
-	public long getTitleTextMapHash() {
-		return titleTextMapHash;
-	}
-
-	public int[] getSuggestTrackMainQuestList() {
-		return suggestTrackMainQuestList;
-	}
-
-	public int[] getRewardIdList() {
-		return rewardIdList;
-	}
-
-	public SubQuestConfigData[] getSubQuests() {
-		return subQuests;
-	}
-
-	public class SubQuestConfigData {
-		private int subId;
-		private int mainId;
-		
-		private LogicType acceptCondComb;
-		private QuestCondition[] acceptCond;
-		
-		private LogicType finishCondComb;
-		private QuestCondition[] finishCond;
-		
-		private LogicType failCondComb;
-		private QuestCondition[] failCond;
-		
-		public int getSubId() {
-			return subId;
-		}
-		
-		public int getMainId() {
-			return mainId;
-		}
-		
-		public LogicType getAcceptCondComb() {
-			return acceptCondComb;
-		}
-		
-		public QuestCondition[] getAcceptCond() {
-			return acceptCond;
-		}
-		
-		public LogicType getFinishCondComb() {
-			return finishCondComb;
-		}
-		
-		public QuestCondition[] getFinishCond() {
-			return finishCond;
-		}
-		
-		public LogicType getFailCondComb() {
-			return failCondComb;
-		}
-		
-		public QuestCondition[] getFailCond() {
-			return failCond;
-		}
-	}
-	
-	public class QuestCondition {
-		private QuestTriggerType type;
-		private int[] param;
-		
-		public QuestTriggerType getType() {
-			return type;
-		}
-		
-		public int[] getParam() {
-			return param;
-		}
-	}
-}
diff --git a/src/main/java/emu/grasscutter/data/def/QuestData.java b/src/main/java/emu/grasscutter/data/def/QuestData.java
new file mode 100644
index 000000000..31ac2ce7e
--- /dev/null
+++ b/src/main/java/emu/grasscutter/data/def/QuestData.java
@@ -0,0 +1,115 @@
+package emu.grasscutter.data.def;
+
+import java.util.Arrays;
+import java.util.List;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.game.quest.enums.LogicType;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
+
+@ResourceType(name = "QuestExcelConfigData.json")
+public class QuestData extends GameResource {
+	private int SubId;
+	private int MainId;
+	private int Order;
+	private long DescTextMapHash;
+	
+	private LogicType AcceptCondComb;
+	private QuestCondition[] acceptConditons;
+	private LogicType FinishCondComb;
+	private QuestCondition[] finishConditons;
+	private LogicType FailCondComb;
+	private QuestCondition[] failConditons;
+	
+	private List<QuestParam> AcceptCond;
+	private List<QuestParam> FinishCond;
+	private List<QuestParam> FailCond;
+	private List<QuestExecParam> BeginExec;
+	private List<QuestExecParam> FinishExec;
+	private List<QuestExecParam> FailExec;
+
+	public int getId() {
+		return SubId;
+	}
+
+	public int getMainId() {
+		return MainId;
+	}
+
+	public int getOrder() {
+		return Order;
+	}
+
+	public long getDescTextMapHash() {
+		return DescTextMapHash;
+	}
+
+	public LogicType getAcceptCondComb() {
+		return AcceptCondComb;
+	}
+
+	public QuestCondition[] getAcceptCond() {
+		return acceptConditons;
+	}
+
+	public LogicType getFinishCondComb() {
+		return FinishCondComb;
+	}
+
+	public QuestCondition[] getFinishCond() {
+		return finishConditons;
+	}
+
+	public LogicType getFailCondComb() {
+		return FailCondComb;
+	}
+
+	public QuestCondition[] getFailCond() {
+		return failConditons;
+	}
+
+	public void onLoad() {
+		this.acceptConditons = AcceptCond.stream().filter(p -> p.Type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
+		AcceptCond = null;
+		this.finishConditons = FinishCond.stream().filter(p -> p.Type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
+		FinishCond = null;
+		this.failConditons = FailCond.stream().filter(p -> p.Type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
+		FailCond = null;
+	}
+	
+	public class QuestParam {
+		QuestTrigger Type;
+		int[] Param;
+		String count;
+	}
+	
+	public class QuestExecParam {
+		QuestTrigger Type;
+		String[] Param;
+		String count;
+	}
+	
+	public static class QuestCondition {
+		private QuestTrigger type;
+		private int[] param;
+		private String count;
+		
+		public QuestCondition(QuestParam param) {
+			this.type = param.Type;
+			this.param = param.Param;
+		}
+		
+		public QuestTrigger getType() {
+			return type;
+		}
+		
+		public int[] getParam() {
+			return param;
+		}
+
+		public String getCount() {
+			return count;
+		}
+	}
+}
diff --git a/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java b/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
index 1ceda3356..bf88b8efe 100644
--- a/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
+++ b/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
@@ -10,7 +10,6 @@ import dev.morphia.annotations.Id;
 import dev.morphia.annotations.Indexed;
 import dev.morphia.annotations.Transient;
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.custom.QuestConfig;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.enums.ParentQuestState;
diff --git a/src/main/java/emu/grasscutter/game/quest/GameQuest.java b/src/main/java/emu/grasscutter/game/quest/GameQuest.java
index d3a240a07..b242166eb 100644
--- a/src/main/java/emu/grasscutter/game/quest/GameQuest.java
+++ b/src/main/java/emu/grasscutter/game/quest/GameQuest.java
@@ -2,9 +2,11 @@ package emu.grasscutter.game.quest;
 
 import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.Transient;
-import emu.grasscutter.data.custom.QuestConfig;
-import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
-import emu.grasscutter.data.custom.QuestConfigData.SubQuestConfigData;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.custom.MainQuestData;
+import emu.grasscutter.data.custom.MainQuestData.SubQuestData;
+import emu.grasscutter.data.def.QuestData;
+import emu.grasscutter.data.def.QuestData.QuestCondition;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.enums.LogicType;
 import emu.grasscutter.game.quest.enums.QuestState;
@@ -16,7 +18,7 @@ import emu.grasscutter.utils.Utils;
 @Entity
 public class GameQuest {
 	@Transient private GameMainQuest mainQuest;
-	@Transient private QuestConfig config;
+	@Transient private QuestData questData;
 	
 	private int questId;
 	private int mainQuestId;
@@ -32,21 +34,21 @@ public class GameQuest {
 	@Deprecated // Morphia only. Do not use.
 	public GameQuest() {}
 	
-	public GameQuest(GameMainQuest mainQuest, QuestConfig config) {
+	public GameQuest(GameMainQuest mainQuest, QuestData questData) {
 		this.mainQuest = mainQuest;
-		this.questId = config.getId();
-		this.mainQuestId = config.getMainQuest().getId();
-		this.config = config;
+		this.questId = questData.getId();
+		this.mainQuestId = questData.getMainId();
+		this.questData = questData;
 		this.acceptTime = Utils.getCurrentSeconds();
 		this.startTime = this.acceptTime;
 		this.state = QuestState.QUEST_STATE_UNFINISHED;
 		
-		if (config.getSubQuest().getFinishCond() != null) {
-			this.finishProgressList = new int[config.getSubQuest().getFinishCond().length];
+		if (questData.getFinishCond()!= null) {
+			this.finishProgressList = new int[questData.getFinishCond().length];
 		}
 		
-		if (config.getSubQuest().getFailCond() != null) {
-			this.failProgressList = new int[config.getSubQuest().getFailCond().length];
+		if (questData.getFailCond() != null) {
+			this.failProgressList = new int[questData.getFailCond().length];
 		}
 		
 		this.mainQuest.getChildQuests().put(this.questId, this);
@@ -72,13 +74,13 @@ public class GameQuest {
 		return mainQuestId;
 	}
 
-	public QuestConfig getConfig() {
-		return config;
+	public QuestData getData() {
+		return questData;
 	}
 
-	public void setConfig(QuestConfig config) {
+	public void setConfig(QuestData config) {
 		if (this.getQuestId() != config.getId()) return;
-		this.config = config;
+		this.questData = config;
 	}
 
 	public QuestState getState() {
@@ -148,16 +150,23 @@ public class GameQuest {
 	
 	public boolean tryAcceptQuestLine() {
 		try {
-			for (SubQuestConfigData questData : getConfig().getMainQuest().getSubQuests()) {
-				GameQuest quest = getMainQuest().getChildQuestById(questData.getSubId());
+			MainQuestData questConfig = GameData.getMainQuestDataMap().get(this.getMainQuestId());
+			for (SubQuestData subQuest : questConfig.getSubQuests()) {
+				GameQuest quest = getMainQuest().getChildQuestById(subQuest.getSubId());
 				
 				if (quest == null) {
+					QuestData questData = GameData.getQuestDataMap().get(subQuest.getSubId());
+					
+					if (questData == null) {
+						continue;
+					}
+					
 					int[] accept = new int[questData.getAcceptCond().length];
 							
 					// TODO
 					for (int i = 0; i < questData.getAcceptCond().length; i++) {
 						QuestCondition condition = questData.getAcceptCond()[i];
-						boolean result = getOwner().getServer().getQuestHandler().triggerCondition(this, condition);
+						boolean result = getOwner().getServer().getQuestHandler().triggerCondition(this, condition, condition.getParam());
 						
 						accept[i] = result ? 1 : 0;
 					}
@@ -165,7 +174,7 @@ public class GameQuest {
 					boolean shouldAccept = LogicType.calculate(questData.getAcceptCondComb(), accept);
 					
 					if (shouldAccept) {
-						this.getOwner().getQuestManager().addQuest(questData.getSubId());
+						this.getOwner().getQuestManager().addQuest(questData.getId());
 					}
 				}
 			}
diff --git a/src/main/java/emu/grasscutter/game/quest/QuestManager.java b/src/main/java/emu/grasscutter/game/quest/QuestManager.java
index 76c098b07..548e8241a 100644
--- a/src/main/java/emu/grasscutter/game/quest/QuestManager.java
+++ b/src/main/java/emu/grasscutter/game/quest/QuestManager.java
@@ -9,12 +9,11 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.custom.QuestConfig;
-import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
-import emu.grasscutter.data.custom.QuestConfigData.SubQuestConfigData;
+import emu.grasscutter.data.def.QuestData;
+import emu.grasscutter.data.def.QuestData.QuestCondition;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.quest.enums.QuestTriggerType;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
 import emu.grasscutter.game.quest.enums.LogicType;
 import emu.grasscutter.game.quest.enums.QuestState;
 import emu.grasscutter.server.packet.send.PacketFinishedParentQuestUpdateNotify;
@@ -46,12 +45,12 @@ public class QuestManager {
 	}
 	
 	public GameQuest getQuestById(int questId) {
-		QuestConfig questConfig = GameData.getQuestConfigs().get(questId);
+		QuestData questConfig = GameData.getQuestDataMap().get(questId);
 		if (questConfig == null) {
 			return null;
 		}
 		
-		GameMainQuest mainQuest = getQuests().get(questConfig.getMainQuest().getId());
+		GameMainQuest mainQuest = getQuests().get(questConfig.getMainId());
 		
 		if (mainQuest == null) {
 			return null;
@@ -79,8 +78,8 @@ public class QuestManager {
 		}
 	}
 	
-	public GameMainQuest addMainQuest(QuestConfig questConfig) {
-		GameMainQuest mainQuest = new GameMainQuest(getPlayer(), questConfig.getMainQuest().getId());
+	public GameMainQuest addMainQuest(QuestData questConfig) {
+		GameMainQuest mainQuest = new GameMainQuest(getPlayer(), questConfig.getMainId());
 		getQuests().put(mainQuest.getParentQuestId(), mainQuest);
 
 		getPlayer().sendPacket(new PacketFinishedParentQuestUpdateNotify(mainQuest));
@@ -89,13 +88,13 @@ public class QuestManager {
 	}
 	
 	public GameQuest addQuest(int questId) {
-		QuestConfig questConfig = GameData.getQuestConfigs().get(questId);
+		QuestData questConfig = GameData.getQuestDataMap().get(questId);
 		if (questConfig == null) {
 			return null;
 		}
 		
 		// Main quest
-		GameMainQuest mainQuest = this.getMainQuestById(questConfig.getMainQuest().getId());
+		GameMainQuest mainQuest = this.getMainQuestById(questConfig.getMainId());
 		
 		// Create main quest if it doesnt exist
 		if (mainQuest == null) {
@@ -122,11 +121,11 @@ public class QuestManager {
 		return quest;
 	}
 	
-	public void triggerEvent(QuestTriggerType condType, int... params) {
+	public void triggerEvent(QuestTrigger condType, int... params) {
 		Set<GameQuest> changedQuests = new HashSet<>();
 		
 		this.forEachActiveQuest(quest -> {
-			SubQuestConfigData data = quest.getConfig().getSubQuest();
+			QuestData data = quest.getData();
 			
 			for (int i = 0; i < data.getFinishCond().length; i++) {
 				if (quest.getFinishProgressList()[i] == 1) {
@@ -150,7 +149,7 @@ public class QuestManager {
 		});
 		
 		for (GameQuest quest : changedQuests) {
-			LogicType logicType = quest.getConfig().getSubQuest().getFailCondComb();
+			LogicType logicType = quest.getData().getFailCondComb();
 			int[] progress = quest.getFinishProgressList();
 			
 			// Handle logical comb
@@ -174,7 +173,7 @@ public class QuestManager {
 			
 			for (GameQuest quest : mainQuest.getChildQuests().values()) {
 				quest.setMainQuest(mainQuest);
-				quest.setConfig(GameData.getQuestConfigs().get(quest.getQuestId()));
+				quest.setConfig(GameData.getQuestDataMap().get(quest.getQuestId()));
 			}
 			
 			this.getQuests().put(mainQuest.getParentQuestId(), mainQuest);
diff --git a/src/main/java/emu/grasscutter/game/quest/QuestValue.java b/src/main/java/emu/grasscutter/game/quest/QuestValue.java
index 3042ad5de..42b868fc8 100644
--- a/src/main/java/emu/grasscutter/game/quest/QuestValue.java
+++ b/src/main/java/emu/grasscutter/game/quest/QuestValue.java
@@ -3,9 +3,9 @@ package emu.grasscutter.game.quest;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import emu.grasscutter.game.quest.enums.QuestTriggerType;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
 
 @Retention(RetentionPolicy.RUNTIME) 
 public @interface QuestValue {
-	QuestTriggerType value();
+	QuestTrigger value();
 }
diff --git a/src/main/java/emu/grasscutter/game/quest/ServerQuestHandler.java b/src/main/java/emu/grasscutter/game/quest/ServerQuestHandler.java
index 1c269de90..36c929ab3 100644
--- a/src/main/java/emu/grasscutter/game/quest/ServerQuestHandler.java
+++ b/src/main/java/emu/grasscutter/game/quest/ServerQuestHandler.java
@@ -4,11 +4,9 @@ import java.util.Set;
 
 import org.reflections.Reflections;
 
-import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
-import emu.grasscutter.game.quest.enums.QuestTriggerType;
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.def.QuestData.QuestCondition;
 import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.server.game.GameServer;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
@@ -62,7 +60,7 @@ public class ServerQuestHandler {
 	public boolean triggerCondition(GameQuest quest, QuestCondition condition, int... params) {
 		QuestBaseHandler handler = condHandlers.get(condition.getType().getValue());
 
-		if (handler == null || quest.getConfig() == null) {
+		if (handler == null || quest.getData() == null) {
 			return false;
 		}
 		
@@ -72,7 +70,7 @@ public class ServerQuestHandler {
 	public boolean triggerContent(GameQuest quest, QuestCondition condition, int... params) {
 		QuestBaseHandler handler = contHandlers.get(condition.getType().getValue());
 
-		if (handler == null || quest.getConfig() == null) {
+		if (handler == null || quest.getData() == null) {
 			return false;
 		}
 		
@@ -82,7 +80,7 @@ public class ServerQuestHandler {
 	public boolean triggerExec(GameQuest quest, QuestCondition condition, int... params) {
 		QuestBaseHandler handler = execHandlers.get(condition.getType().getValue());
 
-		if (handler == null || quest.getConfig() == null) {
+		if (handler == null || quest.getData() == null) {
 			return false;
 		}
 		
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/BaseCondition.java b/src/main/java/emu/grasscutter/game/quest/conditions/BaseCondition.java
index 903773f0e..d94e60c22 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/BaseCondition.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/BaseCondition.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.game.quest.conditions;
 
-import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
+import emu.grasscutter.data.def.QuestData.QuestCondition;
 import emu.grasscutter.game.quest.QuestValue;
 import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.enums.QuestTriggerType;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
 import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
 
-@QuestValue(QuestTriggerType.QUEST_CONTENT_NONE)
+@QuestValue(QuestTrigger.QUEST_CONTENT_NONE)
 public class BaseCondition extends QuestBaseHandler {
 
 	@Override
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionPlayerLevelEqualGreater.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionPlayerLevelEqualGreater.java
index f5df2b13c..3e3db87fb 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionPlayerLevelEqualGreater.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionPlayerLevelEqualGreater.java
@@ -1,17 +1,17 @@
 package emu.grasscutter.game.quest.conditions;
 
-import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
+import emu.grasscutter.data.def.QuestData.QuestCondition;
 import emu.grasscutter.game.quest.QuestValue;
 import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.enums.QuestTriggerType;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
 import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
 
-@QuestValue(QuestTriggerType.QUEST_COND_PLAYER_LEVEL_EQUAL_GREATER)
+@QuestValue(QuestTrigger.QUEST_COND_PLAYER_LEVEL_EQUAL_GREATER)
 public class ConditionPlayerLevelEqualGreater extends QuestBaseHandler {
 
 	@Override
 	public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
-		return quest.getOwner().getLevel() >= condition.getParam()[0];
+		return quest.getOwner().getLevel() >= params[0];
 	}
 	
 }
diff --git a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateEqual.java b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateEqual.java
index 71b44c967..37ecc6d30 100644
--- a/src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateEqual.java
+++ b/src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateEqual.java
@@ -1,20 +1,20 @@
 package emu.grasscutter.game.quest.conditions;
 
-import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
+import emu.grasscutter.data.def.QuestData.QuestCondition;
 import emu.grasscutter.game.quest.QuestValue;
 import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.enums.QuestTriggerType;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
 import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
 
-@QuestValue(QuestTriggerType.QUEST_COND_STATE_EQUAL)
+@QuestValue(QuestTrigger.QUEST_COND_STATE_EQUAL)
 public class ConditionStateEqual extends QuestBaseHandler {
 
 	@Override
 	public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
-		GameQuest checkQuest = quest.getOwner().getQuestManager().getQuestById(condition.getParam()[0]);
+		GameQuest checkQuest = quest.getOwner().getQuestManager().getQuestById(params[0]);
 		
 		if (checkQuest != null) {
-			return checkQuest.getState().getValue() == condition.getParam()[1];
+			return checkQuest.getState().getValue() == params[1];
 		}
 		
 		return false; 
diff --git a/src/main/java/emu/grasscutter/game/quest/content/BaseContent.java b/src/main/java/emu/grasscutter/game/quest/content/BaseContent.java
index 820d6f133..ce700896d 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/BaseContent.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/BaseContent.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.game.quest.content;
 
-import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
+import emu.grasscutter.data.def.QuestData.QuestCondition;
 import emu.grasscutter.game.quest.QuestValue;
 import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.enums.QuestTriggerType;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
 import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
 
-@QuestValue(QuestTriggerType.QUEST_CONTENT_NONE)
+@QuestValue(QuestTrigger.QUEST_CONTENT_NONE)
 public class BaseContent extends QuestBaseHandler {
 
 	@Override
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java b/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java
index aad196306..3423519ec 100644
--- a/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.game.quest.content;
 
-import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
+import emu.grasscutter.data.def.QuestData.QuestCondition;
 import emu.grasscutter.game.quest.QuestValue;
 import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.enums.QuestTriggerType;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
 import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
 
-@QuestValue(QuestTriggerType.QUEST_CONTENT_COMPLETE_TALK)
+@QuestValue(QuestTrigger.QUEST_CONTENT_COMPLETE_TALK)
 public class ContentCompleteTalk extends QuestBaseHandler {
 
 	@Override
diff --git a/src/main/java/emu/grasscutter/game/quest/enums/QuestTriggerType.java b/src/main/java/emu/grasscutter/game/quest/enums/QuestTrigger.java
similarity index 99%
rename from src/main/java/emu/grasscutter/game/quest/enums/QuestTriggerType.java
rename to src/main/java/emu/grasscutter/game/quest/enums/QuestTrigger.java
index cf8dabdba..def3a399d 100644
--- a/src/main/java/emu/grasscutter/game/quest/enums/QuestTriggerType.java
+++ b/src/main/java/emu/grasscutter/game/quest/enums/QuestTrigger.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.game.quest.enums;
 
-public enum QuestTriggerType {
+public enum QuestTrigger {
 	QUEST_COND_NONE (0),
 	QUEST_COND_STATE_EQUAL (1),
 	QUEST_COND_STATE_NOT_EQUAL (2),
@@ -225,7 +225,7 @@ public enum QuestTriggerType {
 	
 	private final int value;
 	
-	QuestTriggerType(int id) {
+	QuestTrigger(int id) {
 		this.value = id;
 	}
 
diff --git a/src/main/java/emu/grasscutter/game/quest/handlers/QuestBaseHandler.java b/src/main/java/emu/grasscutter/game/quest/handlers/QuestBaseHandler.java
index 68bf88361..5a3514200 100644
--- a/src/main/java/emu/grasscutter/game/quest/handlers/QuestBaseHandler.java
+++ b/src/main/java/emu/grasscutter/game/quest/handlers/QuestBaseHandler.java
@@ -1,6 +1,6 @@
 package emu.grasscutter.game.quest.handlers;
 
-import emu.grasscutter.data.custom.QuestConfigData.QuestCondition;
+import emu.grasscutter.data.def.QuestData.QuestCondition;
 import emu.grasscutter.game.quest.GameQuest;
 
 public abstract class QuestBaseHandler {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java
index 515552289..82248c98c 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.quest.enums.QuestTriggerType;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq;
@@ -16,7 +16,7 @@ public class HandlerNpcTalkReq extends PacketHandler {
 	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
 		NpcTalkReq req = NpcTalkReq.parseFrom(payload);
 		
-		session.getPlayer().getQuestManager().triggerEvent(QuestTriggerType.QUEST_CONTENT_COMPLETE_TALK, req.getTalkId());
+		session.getPlayer().getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_COMPLETE_TALK, req.getTalkId());
 
 		session.send(new PacketNpcTalkRsp(req.getNpcEntityId(), req.getTalkId(), req.getEntityId()));
 	}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketServerCondMeetQuestListUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketServerCondMeetQuestListUpdateNotify.java
index b2ea3d577..fa2e8ab81 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketServerCondMeetQuestListUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketServerCondMeetQuestListUpdateNotify.java
@@ -1,9 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.custom.QuestConfig;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.quest.GameMainQuest;
 import emu.grasscutter.game.quest.GameQuest;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
diff --git a/src/main/java/emu/grasscutter/tools/Tools.java b/src/main/java/emu/grasscutter/tools/Tools.java
index 8b28c027e..5b0f563ee 100644
--- a/src/main/java/emu/grasscutter/tools/Tools.java
+++ b/src/main/java/emu/grasscutter/tools/Tools.java
@@ -19,10 +19,11 @@ import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandMap;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.ResourceLoader;
-import emu.grasscutter.data.custom.QuestConfig;
+import emu.grasscutter.data.custom.MainQuestData;
 import emu.grasscutter.data.def.AvatarData;
 import emu.grasscutter.data.def.ItemData;
 import emu.grasscutter.data.def.MonsterData;
+import emu.grasscutter.data.def.QuestData;
 import emu.grasscutter.data.def.SceneData;
 import emu.grasscutter.utils.Utils;
 
@@ -149,13 +150,16 @@ final class ToolsWithLanguageOption {
 				writer.println(data.getId() + " : " + data.getScriptData());
 			}
 			
+			writer.println();
+			
 			writer.println("// Quests");
-			list = new ArrayList<>(GameData.getQuestConfigs().keySet());
+			list = new ArrayList<>(GameData.getQuestDataMap().keySet());
 			Collections.sort(list); 
 			
 			for (Integer id : list) {
-				QuestConfig data = GameData.getQuestConfigs().get(id);
-				writer.println(data.getId() + " : " + map.get(data.getMainQuest().getTitleTextMapHash()));
+				QuestData data = GameData.getQuestDataMap().get(id);
+				MainQuestData mainQuest = GameData.getMainQuestDataMap().get(data.getMainId());
+				writer.println(data.getId() + " : " + map.get(mainQuest.getTitleTextMapHash()) + " - " + map.get(data.getDescTextMapHash()));
 			}
 			
 			writer.println();

From cbd46e9215fb02ac625697dff84a6c35dbd42812 Mon Sep 17 00:00:00 2001
From: Melledy <52122272+Melledy@users.noreply.github.com>
Date: Fri, 13 May 2022 05:33:43 -0700
Subject: [PATCH 37/59] Add one more quest trigger

---
 .../game/dungeons/DungeonManager.java           |  4 +++-
 .../game/quest/content/ContentEnterDungeon.java | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/emu/grasscutter/game/quest/content/ContentEnterDungeon.java

diff --git a/src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java b/src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java
index 0a68e6ab0..5c0d1fd27 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java
@@ -7,6 +7,7 @@ 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.game.quest.enums.QuestTrigger;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.server.game.GameServer;
@@ -51,8 +52,9 @@ public class DungeonManager {
 		int sceneId = data.getSceneId();
 		player.getScene().setPrevScene(sceneId);
 		
-		if(player.getWorld().transferPlayerToScene(player, sceneId, data)){
+		if (player.getWorld().transferPlayerToScene(player, sceneId, data)) {
 			player.getScene().addDungeonSettleObserver(basicDungeonSettleObserver);
+			player.getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_ENTER_DUNGEON, data.getId());
 		}
 		
 		player.getScene().setPrevScenePoint(pointId);
diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentEnterDungeon.java b/src/main/java/emu/grasscutter/game/quest/content/ContentEnterDungeon.java
new file mode 100644
index 000000000..e00e59f9a
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentEnterDungeon.java
@@ -0,0 +1,17 @@
+package emu.grasscutter.game.quest.content;
+
+import emu.grasscutter.data.def.QuestData.QuestCondition;
+import emu.grasscutter.game.quest.QuestValue;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
+import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
+
+@QuestValue(QuestTrigger.QUEST_CONTENT_ENTER_DUNGEON)
+public class ContentEnterDungeon extends QuestBaseHandler {
+
+	@Override
+	public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
+		return condition.getParam()[0] == params[0];
+	}
+	
+}

From f83f13204ee53bafbf6ad4f6a60b6c0e24379ccc Mon Sep 17 00:00:00 2001
From: AnimeGitB <AnimeGitB@bigblueball.in>
Date: Fri, 6 May 2022 23:39:45 +0930
Subject: [PATCH 38/59] Gacha rework Add fallback stripping and C6 stripping
 Converting banner definitions from pity vars to lerp arrays Properly
 implement rates and pool smoothing Also move reusable functions to Utils

---
 data/Banners.json                             |  19 +-
 .../grasscutter/game/gacha/GachaBanner.java   |  82 +++--
 .../grasscutter/game/gacha/GachaManager.java  | 314 ++++++++++--------
 .../game/gacha/PlayerGachaBannerInfo.java     |  84 ++++-
 .../java/emu/grasscutter/utils/Utils.java     |  66 ++++
 5 files changed, 397 insertions(+), 168 deletions(-)

diff --git a/data/Banners.json b/data/Banners.json
index a4f724ac9..1aaf39cb7 100644
--- a/data/Banners.json
+++ b/data/Banners.json
@@ -10,8 +10,9 @@
 		"beginTime": 0,
 		"endTime": 1924992000,
 		"sortId": 1000,
-		"rateUpItems1": [],
-		"rateUpItems2": []
+		"fallbackItems4Pool1": [1006, 1014, 1015, 1020, 1021, 1023, 1024, 1025, 1027, 1031, 1032, 1034, 1036, 1039, 1043, 1044, 1045, 1048, 1053, 1055, 1056, 1064],
+		"weights4": [[1,510], [8,510], [10,10000]],
+		"weights5": [[1,75], [73,150], [90,10000]]
 	},
 	{
 		"gachaType": 301,
@@ -24,9 +25,10 @@
 		"beginTime": 0,
 		"endTime": 1924992000,
 		"sortId": 9998,
-		"maxItemType": 1,
-		"rateUpItems1": [1002],
-		"rateUpItems2": [1053, 1020, 1045]
+		"rateUpItems4": [1053, 1020, 1045],
+		"rateUpItems5": [1002],
+		"fallbackItems5Pool2": [],
+		"weights5": [[1,80], [73,80], [90,10000]]
 	},
 	{
 		"gachaType": 302,
@@ -39,11 +41,12 @@
 		"beginTime": 0,
 		"endTime": 1924992000,
 		"sortId": 9997,
-		"minItemType": 2,
 		"eventChance": 75,
 		"softPity": 80,
 		"hardPity": 80,
-		"rateUpItems1": [11509, 12504],
-		"rateUpItems2": [11401, 12402, 13407, 14401, 15401]
+		"rateUpItems4": [11401, 12402, 13407, 14401, 15401],
+		"rateUpItems5": [11509, 12504],
+		"fallbackItems5Pool1": [],
+		"weights5": [[1,100], [62,100], [73, 7800], [80,10000]]
 	}
 ]
diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java b/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
index 7a2646a4f..52630768c 100644
--- a/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
@@ -2,6 +2,7 @@ package emu.grasscutter.game.gacha;
 
 import emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo;
 import emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo;
+import emu.grasscutter.utils.Utils;
 
 import static emu.grasscutter.Configuration.*;
 
@@ -15,14 +16,31 @@ public class GachaBanner {
 	private int beginTime;
 	private int endTime;
 	private int sortId;
-	private int[] rateUpItems1;
-	private int[] rateUpItems2;
-	private int baseYellowWeight = 60; // Max 10000
-	private int basePurpleWeight = 510; // Max 10000
-	private int eventChance = 50; // Chance to win a featured event item
-	private int softPity = 75;
-	private int hardPity = 90;
+	private int[] rateUpItems4 = {};
+	private int[] rateUpItems5 = {};
+	private int[] fallbackItems3 = {11301, 11302, 11306, 12301, 12302, 12305, 13303, 14301, 14302, 14304, 15301, 15302, 15304};
+	private int[] fallbackItems4Pool1 = {1014, 1020, 1023, 1024, 1025, 1027, 1031, 1032, 1034, 1036, 1039, 1043, 1044, 1045, 1048, 1053, 1055, 1056, 1064};
+	private int[] fallbackItems4Pool2 = {11401, 11402, 11403, 11405, 12401, 12402, 12403, 12405, 13401, 13407, 14401, 14402, 14403, 14409, 15401, 15402, 15403, 15405};
+	private int[] fallbackItems5Pool1 = {1003, 1016, 1042, 1035, 1041};
+	private int[] fallbackItems5Pool2 = {11501, 11502, 12501, 12502, 13502, 13505, 14501, 14502, 15501, 15502};
+	private boolean removeC6FromPool = false;
+	private boolean autoStripRateUpFromFallback = true;
+	private int[][] weights4 = {{1,510}, {8,510}, {10,10000}};
+	private int[][] weights5 = {{1,75}, {73,150}, {90,10000}};
+	private int[][] poolBalanceWeights4 = {{1,255}, {17,255}, {21,10455}};
+	private int[][] poolBalanceWeights5 = {{1,30}, {147,150}, {181,10230}};
+	private int eventChance4 = 50; // Chance to win a featured event item
+	private int eventChance5 = 50; // Chance to win a featured event item
 	private BannerType bannerType = BannerType.STANDARD;
+
+	// Kinda wanna deprecate these but they're in people's configs
+	private int[] rateUpItems1 = {};
+	private int[] rateUpItems2 = {};
+	private int softPity = -1;
+	private int hardPity = -1;
+	private int eventChance = -1;
+	private int baseYellowWeight = -1;
+	private int basePurpleWeight = -1;
 	
 	public int getGachaType() {
 		return gachaType;
@@ -72,24 +90,42 @@ public class GachaBanner {
 		return basePurpleWeight;
 	}
 
-	public int[] getRateUpItems1() {
-		return rateUpItems1;
+	public int[] getRateUpItems4() {
+		return (rateUpItems2.length > 0) ? rateUpItems2 : rateUpItems4;
+	}
+	public int[] getRateUpItems5() {
+		return (rateUpItems1.length > 0) ? rateUpItems1 : rateUpItems5;
 	}
 
-	public int[] getRateUpItems2() {
-		return rateUpItems2;
-	}
-	
-	public int getSoftPity() {
-		return softPity - 1;
+	public int[] getFallbackItems3() {return fallbackItems3;}
+	public int[] getFallbackItems4Pool1() {return fallbackItems4Pool1;}
+	public int[] getFallbackItems4Pool2() {return fallbackItems4Pool2;}
+	public int[] getFallbackItems5Pool1() {return fallbackItems5Pool1;}
+	public int[] getFallbackItems5Pool2() {return fallbackItems5Pool2;}
+
+	public boolean getRemoveC6FromPool() {return removeC6FromPool;}
+	public boolean getAutoStripRateUpFromFallback() {return autoStripRateUpFromFallback;}
+
+
+	public int getWeight(int rarity, int pity) {
+		return switch(rarity) {
+			case 4 -> Utils.lerp(pity, weights4);
+			default -> Utils.lerp(pity, weights5);
+		};
 	}
 
-	public int getHardPity() {
-		return hardPity - 1;
+	public int getPoolBalanceWeight(int rarity, int pity) {
+		return switch(rarity) {
+			case 4 -> Utils.lerp(pity, poolBalanceWeights4);
+			default -> Utils.lerp(pity, poolBalanceWeights5);
+		};
 	}
 
-	public int getEventChance() {
-		return eventChance;
+	public int getEventChance(int rarity) {
+		return switch(rarity) {
+			case 4 -> eventChance4;
+			default -> (eventChance > -1) ? eventChance : eventChance5;
+		};
 	}
 
 	@Deprecated
@@ -131,10 +167,10 @@ public class GachaBanner {
 			info.setGachaTitlePath(this.getTitlePath());
 		}
 		
-		if (this.getRateUpItems1().length > 0) {
+		if (this.getRateUpItems5().length > 0) {
 			GachaUpInfo.Builder upInfo = GachaUpInfo.newBuilder().setItemParentType(1);
 			
-			for (int id : getRateUpItems1()) {
+			for (int id : getRateUpItems5()) {
 				upInfo.addItemIdList(id);
 				info.addMainNameId(id);
 			}
@@ -142,10 +178,10 @@ public class GachaBanner {
 			info.addGachaUpInfoList(upInfo);
 		}
 		
-		if (this.getRateUpItems2().length > 0) {
+		if (this.getRateUpItems4().length > 0) {
 			GachaUpInfo.Builder upInfo = GachaUpInfo.newBuilder().setItemParentType(2);
 			
-			for (int id : getRateUpItems2()) {
+			for (int id : getRateUpItems4()) {
 				upInfo.addItemIdList(id);
 				if (info.getSubNameIdCount() == 0) {
 					info.addSubNameId(id);
diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
index 160377913..e3c0153e0 100644
--- a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
@@ -29,6 +29,7 @@ import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
 import emu.grasscutter.server.game.GameServer;
 import emu.grasscutter.server.game.GameServerTickEvent;
 import emu.grasscutter.server.packet.send.PacketDoGachaRsp;
+import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
@@ -42,12 +43,6 @@ public class GachaManager {
 	private final Int2ObjectMap<GachaBanner> gachaBanners;
 	private GetGachaInfoRsp cachedProto;
 	WatchService watchService;
-
-	private final int[] yellowAvatars = new int[] {1003, 1016, 1042, 1035, 1041};
-	private final int[] yellowWeapons = new int[] {11501, 11502, 12501, 12502, 13502, 13505, 14501, 14502, 15501, 15502};
-	private final int[] purpleAvatars = new int[] {1006, 1014, 1015, 1020, 1021, 1023, 1024, 1025, 1027, 1031, 1032, 1034, 1036, 1039, 1043, 1044, 1045, 1048, 1053, 1055, 1056, 1064};
-	private final int[] purpleWeapons = new int[] {11401, 11402, 11403, 11405, 12401, 12402, 12403, 12405, 13401, 13407, 14401, 14402, 14403, 14409, 15401, 15402, 15403, 15405};
-	private final int[] blueWeapons = new int[] {11301, 11302, 11306, 12301, 12302, 12305, 13303, 14301, 14302, 14304, 15301, 15302, 15304};
 	
 	private static final int starglitterId = 221;
 	private static final int stardustId = 222;
@@ -66,24 +61,8 @@ public class GachaManager {
 	public Int2ObjectMap<GachaBanner> getGachaBanners() {
 		return gachaBanners;
 	}
-
-	public int[] getYellowAvatars() {
-		return this.yellowAvatars;
-	}
-	public int[] getYellowWeapons() {
-		return this.yellowWeapons;
-	}
-	public int[] getPurpleAvatars() {
-		return this.purpleAvatars;
-	}
-	public int[] getPurpleWeapons() {
-		return this.purpleWeapons;
-	}
-	public int[] getBlueWeapons() {
-		return this.blueWeapons;
-	}
-
-	public int randomRange(int min, int max) {
+	
+	public int randomRange(int min, int max) {  // Both are inclusive
 		return ThreadLocalRandom.current().nextInt(max - min + 1) + min;
 	}
 	
@@ -98,8 +77,14 @@ public class GachaManager {
 			if(banners.size() > 0) {
 				for (GachaBanner banner : banners) {
 					getGachaBanners().put(banner.getGachaType(), banner);
+					Grasscutter.getLogger().info(String.format("Testing lerp code for banner gachaType %d :", banner.getGachaType()));  // TODO: remove this before merging!
+					for (int i=1; i<91; i++) {
+						Grasscutter.getLogger().info(String.format("Pity %d : Weight %d", i, banner.getWeight(5, i)));
+					}
 				}
 				Grasscutter.getLogger().info("Banners successfully loaded.");
+
+
 				this.cachedProto = createProto();
 			} else {
 				Grasscutter.getLogger().error("Unable to load banners. Banners size is 0.");
@@ -109,6 +94,139 @@ public class GachaManager {
 			e.printStackTrace();
 		}
 	}
+
+	private class BannerPools {
+		public int[] rateUpItems4;
+		public int[] rateUpItems5;
+		public int[] fallbackItems4Pool1;
+		public int[] fallbackItems4Pool2;
+		public int[] fallbackItems5Pool1;
+		public int[] fallbackItems5Pool2;
+
+		public BannerPools(GachaBanner banner) {
+			rateUpItems4 = banner.getRateUpItems4();
+			rateUpItems5 = banner.getRateUpItems5();
+			fallbackItems4Pool1 = banner.getFallbackItems4Pool1();
+			fallbackItems4Pool2 = banner.getFallbackItems4Pool2();
+			fallbackItems5Pool1 = banner.getFallbackItems5Pool1();
+			fallbackItems5Pool2 = banner.getFallbackItems5Pool2();
+
+			if (banner.getAutoStripRateUpFromFallback()) {
+				fallbackItems4Pool1 = Utils.setSubtract(fallbackItems4Pool1, rateUpItems4);
+				fallbackItems4Pool2 = Utils.setSubtract(fallbackItems4Pool2, rateUpItems4);
+				fallbackItems5Pool1 = Utils.setSubtract(fallbackItems5Pool1, rateUpItems5);
+				fallbackItems5Pool2 = Utils.setSubtract(fallbackItems5Pool2, rateUpItems5);
+			}
+		}
+
+		public void removeFromAllPools(int[] itemIds) {
+			rateUpItems4 = Utils.setSubtract(rateUpItems4, itemIds);
+			rateUpItems5 = Utils.setSubtract(rateUpItems5, itemIds);
+			fallbackItems4Pool1 = Utils.setSubtract(fallbackItems4Pool1, itemIds);
+			fallbackItems4Pool2 = Utils.setSubtract(fallbackItems4Pool2, itemIds);
+			fallbackItems5Pool1 = Utils.setSubtract(fallbackItems5Pool1, itemIds);
+			fallbackItems5Pool2 = Utils.setSubtract(fallbackItems5Pool2, itemIds);
+		}
+	}
+
+	private synchronized int checkPlayerAvatarConstellationLevel(Player player, int itemId) {  // Maybe this would be useful in the Player class?
+		ItemData itemData = GameData.getItemDataMap().get(itemId);
+		if ((itemData == null) || (itemData.getMaterialType() != MaterialType.MATERIAL_AVATAR)){
+			return -2;  // Not an Avatar
+		}
+		Avatar avatar = player.getAvatars().getAvatarById((itemId % 1000) + 10000000);
+		if (avatar == null) {
+			return -1;  // Doesn't have
+		}
+		// Constellation
+		int constLevel = avatar.getCoreProudSkillLevel();
+		GameItem constItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(itemId + 100);
+		constLevel += (constItem == null)? 0 : constItem.getCount();
+		return constLevel;
+	}
+
+	private synchronized int[] removeC6FromPool(int[] itemPool, Player player) {
+		IntList temp = new IntArrayList();
+		for (int itemId : itemPool) {
+			if (checkPlayerAvatarConstellationLevel(player, itemId) < 6) {
+				temp.add(itemId);
+			}
+		}
+		return temp.toIntArray();
+	}
+
+	private synchronized int drawRoulette(int[] weights, int cutoff) {
+		// This follows the logic laid out in issue #183
+		// Simple weighted selection with an upper bound for the roll that cuts off trailing entries
+		// All weights must be >= 0
+		int total = 0;
+		for (int i : weights) {
+			if (i < 0) {
+				throw new IllegalArgumentException("Weights must be non-negative!");
+			}
+			total += i;
+		}
+		int roll = ThreadLocalRandom.current().nextInt((total < cutoff)? total : cutoff);
+		int subTotal = 0;
+		for (int i : weights) {
+			subTotal += i;
+			if (roll < subTotal) {
+				return i;
+			}
+		}
+		// throw new IllegalStateException();
+		return 0;  // This should only be reachable if total==0
+	}
+
+	private synchronized int doRarePull(int[] featured, int[] fallback1, int[] fallback2, int rarity, GachaBanner banner, PlayerGachaBannerInfo gachaInfo) {
+		int itemId = 0;
+		if (	(featured.length > 0)
+				&& (gachaInfo.getFailedFeaturedItemPulls(rarity) >= 1)
+				|| (this.randomRange(1, 100) <= banner.getEventChance(rarity))) {
+			itemId = getRandom(featured);
+			gachaInfo.setFailedFeaturedItemPulls(rarity, 0);
+		} else {
+			gachaInfo.addFailedFeaturedItemPulls(rarity, 1);
+			if (fallback1.length < 1) {
+				itemId = getRandom(fallback2);  // Don't ever run an empty fallback2 btw
+			} else {
+				int pityPool1 = banner.getPoolBalanceWeight(rarity, gachaInfo.getPityPool(rarity, 1));
+				int pityPool2 = banner.getPoolBalanceWeight(rarity, gachaInfo.getPityPool(rarity, 2));
+				int chosenPool = switch ((pityPool1 >= pityPool2)? 1 : 0) {  // Larger weight must come first for the hard cutoff to function correctly
+					case 1 -> 1 + drawRoulette(new int[] {pityPool1, pityPool2}, 10000);
+					default -> 2 - drawRoulette(new int[] {pityPool2, pityPool1}, 10000);
+				};
+				itemId = switch (chosenPool) {
+					case 1:
+						gachaInfo.setPityPool(rarity, 1, 0);
+						yield getRandom(fallback1);
+					default:
+						gachaInfo.setPityPool(rarity, 2, 0);
+						yield getRandom(fallback2);
+				};
+			}
+		}
+		return itemId;
+	}
+
+	private synchronized int doPull(GachaBanner banner, PlayerGachaBannerInfo gachaInfo, BannerPools pools) {
+		// Pre-increment all pity pools (yes this makes all calculations assume 1-indexed pity)
+		gachaInfo.incPityAll();
+
+		int[] weights = {banner.getWeight(5, gachaInfo.getPity5()), banner.getWeight(4, gachaInfo.getPity4()), 10000};
+		int levelWon = 5 - drawRoulette(weights, 10000);
+
+		return switch (levelWon) {
+			case 5:
+				gachaInfo.setPity5(0);
+				yield doRarePull(pools.rateUpItems5, pools.fallbackItems5Pool1, pools.fallbackItems5Pool2, 5, banner, gachaInfo);
+			case 4:
+				gachaInfo.setPity4(0);
+				yield doRarePull(pools.rateUpItems4, pools.fallbackItems4Pool1, pools.fallbackItems4Pool2, 4, banner, gachaInfo);
+			default:
+				yield getRandom(banner.getFallbackItems3());
+		};
+	}
 	
 	public synchronized void doPulls(Player player, int gachaType, int times) {
 		// Sanity check
@@ -132,84 +250,27 @@ public class GachaManager {
 			return;
 		}
 		
-		// Roll
-		PlayerGachaBannerInfo gachaInfo = player.getGachaInfo().getBannerInfo(banner);
-		IntList wonItems = new IntArrayList(times);
-		
-		for (int i = 0; i < times; i++) {
-			int random = this.randomRange(1, 10000);
-			int itemId = 0;
-			
-			int bonusYellowChance = gachaInfo.getPity5() >= banner.getSoftPity() ? 100 * (gachaInfo.getPity5() - banner.getSoftPity() - 1): 0;
-			int yellowChance = banner.getBaseYellowWeight() + (int) Math.floor(100f * (gachaInfo.getPity5() / (banner.getSoftPity() - 1D))) + bonusYellowChance;
-			int purpleChance = 10000 - (banner.getBasePurpleWeight() + (int) Math.floor(790f * (gachaInfo.getPity4() / 8f)));
-		
-			if (random <= yellowChance || gachaInfo.getPity5() >= banner.getHardPity()) {
-				if (banner.getRateUpItems1().length > 0) {
-					int eventChance = this.randomRange(1, 100);
-					
-					if (eventChance <= banner.getEventChance() || gachaInfo.getFailedFeaturedItemPulls() >= 1) {
-						itemId = getRandom(banner.getRateUpItems1());
-						gachaInfo.setFailedFeaturedItemPulls(0);
-					} else {
-						// Lost the 50/50... rip
-						gachaInfo.addFailedFeaturedItemPulls(1);
-					}
-				}
-				
-				if (itemId == 0) {
-					int typeChance = this.randomRange(banner.getBannerType() == BannerType.WEAPON ? 2 : 1, banner.getBannerType() == BannerType.EVENT ? 1 : 2);
-					if (typeChance == 1) {
-						itemId = getRandom(this.yellowAvatars);
-					} else {
-						itemId = getRandom(this.yellowWeapons);
-					}
-				}
-
-				// Pity
-				gachaInfo.addPity4(1);
-				gachaInfo.setPity5(0);
-			} else if (random >= purpleChance || gachaInfo.getPity4() >= 9) {
-				if (banner.getRateUpItems2().length > 0) {
-					int eventChance = this.randomRange(1, 100);
-					
-					if (eventChance >= 50) {
-						itemId = getRandom(banner.getRateUpItems2());
-					}
-				}
-				
-				if (itemId == 0) {
-					int typeChance = this.randomRange(banner.getBannerType() == BannerType.WEAPON ? 2 : 1, banner.getBannerType() == BannerType.EVENT ? 1 : 2);
-					if (typeChance == 1) {
-						itemId = getRandom(this.purpleAvatars);
-					} else {
-						itemId = getRandom(this.purpleWeapons);
-					}
-				}
-				
-				// Pity
-				gachaInfo.addPity5(1);
-				gachaInfo.setPity4(0);
-			} else {
-				itemId = getRandom(this.blueWeapons);
-				
-				// Pity
-				gachaInfo.addPity4(1);
-				gachaInfo.addPity5(1);
-			}
-			
-			// Add winning item
-			wonItems.add(itemId);
-		}
-		
 		// Add to character
+		PlayerGachaBannerInfo gachaInfo = player.getGachaInfo().getBannerInfo(banner);
+		BannerPools pools = new BannerPools(banner);
 		List<GachaItem> list = new ArrayList<>();
 		int stardust = 0, starglitter = 0;
+
+		if (banner.getRemoveC6FromPool()) {  // The ultimate form of pity (non-vanilla)
+			pools.rateUpItems4 = removeC6FromPool(pools.rateUpItems4, player);
+			pools.rateUpItems5 = removeC6FromPool(pools.rateUpItems5, player);
+			pools.fallbackItems4Pool1 = removeC6FromPool(pools.fallbackItems4Pool1, player);
+			pools.fallbackItems4Pool2 = removeC6FromPool(pools.fallbackItems4Pool2, player);
+			pools.fallbackItems5Pool1 = removeC6FromPool(pools.fallbackItems5Pool1, player);
+			pools.fallbackItems5Pool2 = removeC6FromPool(pools.fallbackItems5Pool2, player);
+		}
 		
-		for (int itemId : wonItems) {
+		for (int i = 0; i < times; i++) {
+			// Roll
+			int itemId = doPull(banner, gachaInfo, pools);
 			ItemData itemData = GameData.getItemDataMap().get(itemId);
 			if (itemData == null) {
-				continue;
+				continue;  // Maybe we should bail out if an item fails instead of rolling the rest?
 			}
 
 			// Write gacha record
@@ -222,44 +283,33 @@ public class GachaManager {
 			boolean isTransferItem = false;
 			
 			// Const check
-			if (itemData.getMaterialType() == MaterialType.MATERIAL_AVATAR) {
-				int avatarId = (itemData.getId() % 1000) + 10000000;
-				Avatar avatar = player.getAvatars().getAvatarById(avatarId);
-				if (avatar != null) {
-					int constLevel = avatar.getCoreProudSkillLevel();
-					int constItemId = itemData.getId() + 100;
-					GameItem constItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(constItemId);
-					if (constItem != null) {
-						constLevel += constItem.getCount();
+			int constellation = checkPlayerAvatarConstellationLevel(player, itemId);
+			switch (constellation) {
+				case -2:  // Is weapon
+					switch (itemData.getRankLevel()) {
+						case 5 -> addStarglitter = 10;
+						case 4 -> addStarglitter = 2;
+						default -> addStardust = 15;
 					}
-					
-					if (constLevel < 6) {
-						// Not max const
-						addStarglitter = 2;
-						// Add 1 const
+					break;
+				case -1:  // New character
+					gachaItem.setIsGachaItemNew(true);
+					break;
+				default:
+					if (constellation >= 6) {  // C6, give consolation starglitter
+						addStarglitter = (itemData.getRankLevel()==5)? 25 : 5;
+					} else {  // C0-C5, give constellation item
+						if (banner.getRemoveC6FromPool() && constellation == 5) {  // New C6, remove it from the pools so we don't get C7 in a 10pull
+							pools.removeFromAllPools(new int[] {itemId});
+						}
+						addStarglitter = (itemData.getRankLevel()==5)? 10 : 2;
+						int constItemId = itemId + 100;
+						GameItem constItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(constItemId);
 						gachaItem.addTransferItems(GachaTransferItem.newBuilder().setItem(ItemParam.newBuilder().setItemId(constItemId).setCount(1)).setIsTransferItemNew(constItem == null));
 						player.getInventory().addItem(constItemId, 1);
-					} else {
-						// Is max const
-						addStarglitter = 5;
 					}
-					
-					if (itemData.getRankLevel() == 5) {
-						addStarglitter *= 5;
-					}
-					
 					isTransferItem = true;
-				} else {
-					// New
-					gachaItem.setIsGachaItemNew(true);
-				}
-			} else {
-				// Is weapon
-				switch (itemData.getRankLevel()) {
-					case 5 -> addStarglitter = 10;
-					case 4 -> addStarglitter = 2;
-					case 3 -> addStardust = 15;
-				}
+					break;
 			}
 
 			// Create item
@@ -272,7 +322,8 @@ public class GachaManager {
 			
 			if (addStardust > 0) {
 				gachaItem.addTokenItemList(ItemParam.newBuilder().setItemId(stardustId).setCount(addStardust));
-			} if (addStarglitter > 0) {
+			}
+			if (addStarglitter > 0) {
 				ItemParam starglitterParam = ItemParam.newBuilder().setItemId(starglitterId).setCount(addStarglitter).build();
 				if (isTransferItem) {
 					gachaItem.addTransferItems(GachaTransferItem.newBuilder().setItem(starglitterParam));
@@ -286,7 +337,8 @@ public class GachaManager {
 		// Add stardust/starglitter
 		if (stardust > 0) {
 			player.getInventory().addItem(stardustId, stardust);
-		} if (starglitter > 0) {
+		}
+		if (starglitter > 0) {
 			player.getInventory().addItem(starglitterId, starglitter);
 		}
 		
diff --git a/src/main/java/emu/grasscutter/game/gacha/PlayerGachaBannerInfo.java b/src/main/java/emu/grasscutter/game/gacha/PlayerGachaBannerInfo.java
index b0c85d355..f07d2eff0 100644
--- a/src/main/java/emu/grasscutter/game/gacha/PlayerGachaBannerInfo.java
+++ b/src/main/java/emu/grasscutter/game/gacha/PlayerGachaBannerInfo.java
@@ -7,6 +7,11 @@ public class PlayerGachaBannerInfo {
 	private int pity5 = 0;
 	private int pity4 = 0;
 	private int failedFeaturedItemPulls = 0;
+	private int failedFeatured4ItemPulls = 0;
+	private int pity5Pool1 = 0;
+	private int pity5Pool2 = 0;
+	private int pity4Pool1 = 0;
+	private int pity4Pool2 = 0;
 	
 	public int getPity5() {
 		return pity5;
@@ -32,15 +37,82 @@ public class PlayerGachaBannerInfo {
 		this.pity4 += amount;
 	}
 	
-	public int getFailedFeaturedItemPulls() {
-		return failedFeaturedItemPulls;
+	public int getFailedFeaturedItemPulls(int rarity) {
+		return switch (rarity) {
+			case 4 -> failedFeatured4ItemPulls;
+			default -> failedFeaturedItemPulls;  // 5
+		};
 	}
 	
-	public void setFailedFeaturedItemPulls(int failedEventCharacterPulls) {
-		this.failedFeaturedItemPulls = failedEventCharacterPulls;
+	public void setFailedFeaturedItemPulls(int rarity, int amount) {
+		switch (rarity) {
+			case 4 -> failedFeatured4ItemPulls = amount;
+			default -> failedFeaturedItemPulls = amount;  // 5
+		};
 	}
 	
-	public void addFailedFeaturedItemPulls(int amount) {
-		failedFeaturedItemPulls += amount;
+	public void addFailedFeaturedItemPulls(int rarity, int amount) {
+		switch (rarity) {
+			case 4 -> failedFeatured4ItemPulls += amount;
+			default -> failedFeaturedItemPulls += amount;  // 5
+		};
+	}
+	
+	public int getPityPool(int rarity, int pool) {
+		return switch (rarity) {
+			case 4 -> switch (pool) {
+				case 1 -> pity4Pool1;
+				default -> pity4Pool2;
+			};
+			default -> switch (pool) {
+				case 1 -> pity5Pool1;
+				default -> pity5Pool2;
+			};
+		};
+	}
+	
+	public void setPityPool(int rarity, int pool, int amount) {
+		switch (rarity) {
+			case 4:
+				switch (pool) {
+					case 1 -> pity4Pool1 = amount;
+					default -> pity4Pool2 = amount;
+				};
+				break;
+			case 5:
+			default:
+				switch (pool) {
+					case 1 -> pity5Pool1 = amount;
+					default -> pity5Pool2 = amount;
+				};
+				break;
+		};
+	}
+	
+	public void addPityPool(int rarity, int pool, int amount) {
+		switch (rarity) {
+			case 4:
+				switch (pool) {
+					case 1 -> pity4Pool1 += amount;
+					default -> pity4Pool2 += amount;
+				};
+				break;
+			case 5:
+			default:
+				switch (pool) {
+					case 1 -> pity5Pool1 += amount;
+					default -> pity5Pool2 += amount;
+				};
+				break;
+		};
+	}
+
+	public void incPityAll() {
+		pity4++;
+		pity5++;
+		pity4Pool1++;
+		pity4Pool2++;
+		pity5Pool1++;
+		pity5Pool2++;
 	}
 }
diff --git a/src/main/java/emu/grasscutter/utils/Utils.java b/src/main/java/emu/grasscutter/utils/Utils.java
index 4af62bfb4..58fc83cd0 100644
--- a/src/main/java/emu/grasscutter/utils/Utils.java
+++ b/src/main/java/emu/grasscutter/utils/Utils.java
@@ -15,6 +15,8 @@ import emu.grasscutter.Grasscutter;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
 
 import org.slf4j.Logger;
 
@@ -314,4 +316,68 @@ public final class Utils {
         return String.format("%s-%s", locale.getLanguage(), locale.getCountry());
     }
 
+	/**
+	 * Performs a linear interpolation using a table of fixed points to create an effective piecewise f(x) = y function.
+	 * @param x
+	 * @param xyArray Array of points in [[x0,y0], ... [xN, yN]] format
+	 * @return f(x) = y
+	 */
+	public static int lerp(int x, int[][] xyArray) {
+		try {
+			if (x <= xyArray[0][0]){  // Clamp to first point
+				return xyArray[0][1];
+			} else if (x >= xyArray[xyArray.length-1][0]) {  // Clamp to last point
+				return xyArray[xyArray.length-1][1];
+			}
+			// At this point we're guaranteed to have two lerp points, and pity be somewhere between them.
+			for (int i=0; i < xyArray.length-1; i++) {
+				if (x == xyArray[i+1][0]) {
+					return xyArray[i+1][1];
+				}
+				if (x < xyArray[i+1][0]) {
+					// We are between [i] and [i+1], interpolation time!
+					// Using floats would be slightly cleaner but we can just as easily use ints if we're careful with order of operations. 
+					int position = x - xyArray[i][0];
+					int fullDist = xyArray[i+1][0] - xyArray[i][0];
+					int prevValue = xyArray[i][1];
+					int fullDelta = xyArray[i+1][1] - prevValue;
+					return prevValue + ( (position * fullDelta) / fullDist );
+				}
+			}
+		} catch (IndexOutOfBoundsException e) {
+			Grasscutter.getLogger().error("Malformed lerp point array. Must be of form [[x0, y0], ..., [xN, yN]].");
+		}
+		return 0;
+	}
+
+	/**
+	 * Checks if an int is in an int[]
+	 * @param key int to look for
+	 * @param array int[] to look in
+	 * @return key in array
+	 */
+	public static boolean intInArray(int key, int[] array) {
+		for (int i : array) {
+			if (i == key) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Return a copy of minuend without any elements found in subtrahend.
+	 * @param minuend The array we want elements from
+	 * @param subtrahend The array whose elements we don't want
+	 * @return The array with only the elements we want, in the order that minuend had them
+	 */
+	public static int[] setSubtract(int[] minuend, int[] subtrahend) {
+		IntList temp = new IntArrayList();
+		for (int i : minuend) {
+			if (!intInArray(i, subtrahend)) {
+				temp.add(i);
+			}
+		}
+		return temp.toIntArray();
+	}
 }

From 83c46cb9c8254d2fe84b11f320fe0741e10548a7 Mon Sep 17 00:00:00 2001
From: AnimeGitB <AnimeGitB@bigblueball.in>
Date: Wed, 11 May 2022 19:24:59 +0930
Subject: [PATCH 39/59] Custom costs for different gacha pulls

---
 .../grasscutter/game/gacha/GachaBanner.java   | 29 ++++++++++---------
 .../grasscutter/game/gacha/GachaManager.java  | 17 ++++++-----
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java b/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
index 52630768c..3c97e671c 100644
--- a/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
@@ -6,13 +6,18 @@ import emu.grasscutter.utils.Utils;
 
 import static emu.grasscutter.Configuration.*;
 
+import emu.grasscutter.data.common.ItemParamData;
+
 public class GachaBanner {
 	private int gachaType;
 	private int scheduleId;
 	private String prefabPath;
 	private String previewPrefabPath;
 	private String titlePath;
-	private int costItem;
+	private int costItemId = 0;
+	private int costItemAmount = 1;
+	private int costItemId10 = 0;
+	private int costItemAmount10 = 10;
 	private int beginTime;
 	private int endTime;
 	private int sortId;
@@ -36,11 +41,8 @@ public class GachaBanner {
 	// Kinda wanna deprecate these but they're in people's configs
 	private int[] rateUpItems1 = {};
 	private int[] rateUpItems2 = {};
-	private int softPity = -1;
-	private int hardPity = -1;
 	private int eventChance = -1;
-	private int baseYellowWeight = -1;
-	private int basePurpleWeight = -1;
+	private int costItem = 0;
 	
 	public int getGachaType() {
 		return gachaType;
@@ -66,8 +68,15 @@ public class GachaBanner {
 		return titlePath;
 	}
 
+	public ItemParamData getCost(int numRolls) {
+		return switch (numRolls) {
+			case 10 -> new ItemParamData((costItemId10 > 0) ? costItemId10 : getCostItem(), costItemAmount10);
+			default -> new ItemParamData(getCostItem(), costItemAmount * numRolls);
+		};
+	}
+
 	public int getCostItem() {
-		return costItem;
+		return (costItem > 0) ? costItem : costItemId;
 	}
 
 	public int getBeginTime() {
@@ -82,14 +91,6 @@ public class GachaBanner {
 		return sortId;
 	}
 
-	public int getBaseYellowWeight() {
-		return baseYellowWeight;
-	}
-
-	public int getBasePurpleWeight() {
-		return basePurpleWeight;
-	}
-
 	public int[] getRateUpItems4() {
 		return (rateUpItems2.length > 0) ? rateUpItems2 : rateUpItems4;
 	}
diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
index e3c0153e0..11945c3d3 100644
--- a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
@@ -19,6 +19,7 @@ import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.gacha.GachaBanner.BannerType;
 import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.inventory.Inventory;
 import emu.grasscutter.game.inventory.ItemType;
 import emu.grasscutter.game.inventory.MaterialType;
 import emu.grasscutter.game.player.Player;
@@ -233,7 +234,8 @@ public class GachaManager {
 		if (times != 10 && times != 1) {
 			return;
 		} 
-		if (player.getInventory().getInventoryTab(ItemType.ITEM_WEAPON).getSize() + times > player.getInventory().getInventoryTab(ItemType.ITEM_WEAPON).getMaxCapacity()) {
+		Inventory inventory = player.getInventory();
+		if (inventory.getInventoryTab(ItemType.ITEM_WEAPON).getSize() + times > inventory.getInventoryTab(ItemType.ITEM_WEAPON).getMaxCapacity()) {
 			player.sendPacket(new PacketDoGachaRsp());
 			return;
 		}
@@ -246,7 +248,8 @@ public class GachaManager {
 		}
 
 		// Spend currency
-		if (banner.getCostItem() > 0 && !player.getInventory().payItem(banner.getCostItem(), times)) {
+		ItemParamData cost = banner.getCost(times);
+		if (cost.getCount() > 0 && !inventory.payItem(cost)) {
 			return;
 		}
 		
@@ -304,9 +307,9 @@ public class GachaManager {
 						}
 						addStarglitter = (itemData.getRankLevel()==5)? 10 : 2;
 						int constItemId = itemId + 100;
-						GameItem constItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(constItemId);
+						GameItem constItem = inventory.getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(constItemId);
 						gachaItem.addTransferItems(GachaTransferItem.newBuilder().setItem(ItemParam.newBuilder().setItemId(constItemId).setCount(1)).setIsTransferItemNew(constItem == null));
-						player.getInventory().addItem(constItemId, 1);
+						inventory.addItem(constItemId, 1);
 					}
 					isTransferItem = true;
 					break;
@@ -315,7 +318,7 @@ public class GachaManager {
 			// Create item
 			GameItem item = new GameItem(itemData);
 			gachaItem.setGachaItem(item.toItemParam());
-			player.getInventory().addItem(item);
+			inventory.addItem(item);
 			
 			stardust += addStardust;
 			starglitter += addStarglitter;
@@ -336,10 +339,10 @@ public class GachaManager {
 		
 		// Add stardust/starglitter
 		if (stardust > 0) {
-			player.getInventory().addItem(stardustId, stardust);
+			inventory.addItem(stardustId, stardust);
 		}
 		if (starglitter > 0) {
-			player.getInventory().addItem(starglitterId, starglitter);
+			inventory.addItem(starglitterId, starglitter);
 		}
 		
 		// Packets

From 736ca85300d79c188d5f779614ee2179f2b241e2 Mon Sep 17 00:00:00 2001
From: AnimeGitB <AnimeGitB@bigblueball.in>
Date: Thu, 12 May 2022 00:14:26 +0930
Subject: [PATCH 40/59] Remove debug log from gacha

---
 src/main/java/emu/grasscutter/game/gacha/GachaManager.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
index 11945c3d3..a0337be7f 100644
--- a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
@@ -17,7 +17,6 @@ import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.data.def.ItemData;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.gacha.GachaBanner.BannerType;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.inventory.Inventory;
 import emu.grasscutter.game.inventory.ItemType;
@@ -78,10 +77,6 @@ public class GachaManager {
 			if(banners.size() > 0) {
 				for (GachaBanner banner : banners) {
 					getGachaBanners().put(banner.getGachaType(), banner);
-					Grasscutter.getLogger().info(String.format("Testing lerp code for banner gachaType %d :", banner.getGachaType()));  // TODO: remove this before merging!
-					for (int i=1; i<91; i++) {
-						Grasscutter.getLogger().info(String.format("Pity %d : Weight %d", i, banner.getWeight(5, i)));
-					}
 				}
 				Grasscutter.getLogger().info("Banners successfully loaded.");
 

From 420801b49e2d0f882064b4830fa9ba35cefedff1 Mon Sep 17 00:00:00 2001
From: AnimeGitB <AnimeGitB@bigblueball.in>
Date: Thu, 12 May 2022 02:23:51 +0930
Subject: [PATCH 41/59] Updated cost logic and default weights

---
 data/Banners.json                             |  9 ++++--
 .../grasscutter/game/gacha/GachaBanner.java   | 12 ++++----
 .../grasscutter/game/gacha/GachaManager.java  | 30 ++++++++++++-------
 .../server/packet/send/PacketDoGachaRsp.java  | 11 ++++---
 4 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/data/Banners.json b/data/Banners.json
index 1aaf39cb7..17e720e65 100644
--- a/data/Banners.json
+++ b/data/Banners.json
@@ -6,7 +6,9 @@
 		"prefabPath": "GachaShowPanel_A022",
 		"previewPrefabPath": "UI_Tab_GachaShowPanel_A022",
 		"titlePath": "UI_GACHA_SHOW_PANEL_A022_TITLE",
-		"costItem": 224,
+		"costItemId": 224,
+		"costItemAmount": 1,
+		"costItemAmount10": 10,
 		"beginTime": 0,
 		"endTime": 1924992000,
 		"sortId": 1000,
@@ -21,7 +23,7 @@
 		"prefabPath": "GachaShowPanel_A079",
 		"previewPrefabPath": "UI_Tab_GachaShowPanel_A079",
 		"titlePath": "UI_GACHA_SHOW_PANEL_A048_TITLE",
-		"costItem": 223,
+		"costItemId": 223,
 		"beginTime": 0,
 		"endTime": 1924992000,
 		"sortId": 9998,
@@ -37,7 +39,7 @@
 		"prefabPath": "GachaShowPanel_A080",
 		"previewPrefabPath": "UI_Tab_GachaShowPanel_A080",
 		"titlePath": "UI_GACHA_SHOW_PANEL_A021_TITLE",
-		"costItem": 223,
+		"costItemId": 223,
 		"beginTime": 0,
 		"endTime": 1924992000,
 		"sortId": 9997,
@@ -47,6 +49,7 @@
 		"rateUpItems4": [11401, 12402, 13407, 14401, 15401],
 		"rateUpItems5": [11509, 12504],
 		"fallbackItems5Pool1": [],
+		"weights4": [[1,600], [7,600], [8, 6600], [10,12600]],
 		"weights5": [[1,100], [62,100], [73, 7800], [80,10000]]
 	}
 ]
diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java b/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
index 3c97e671c..1586198c2 100644
--- a/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
@@ -6,6 +6,7 @@ import emu.grasscutter.utils.Utils;
 
 import static emu.grasscutter.Configuration.*;
 
+import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.common.ItemParamData;
 
 public class GachaBanner {
@@ -145,25 +146,26 @@ public class GachaBanner {
 						+ "/gacha/details?s=" + sessionKey + "&gachaType=" + gachaType;
 
 		// Grasscutter.getLogger().info("record = " + record);
+		ItemParamData costItem1 = this.getCost(1);
+		ItemParamData costItem10 = this.getCost(10);
 		GachaInfo.Builder info = GachaInfo.newBuilder()
 				.setGachaType(this.getGachaType())
 				.setScheduleId(this.getScheduleId())
 				.setBeginTime(this.getBeginTime())
 				.setEndTime(this.getEndTime())
-				.setCostItemId(this.getCostItem())
-	            .setCostItemNum(1)
+				.setCostItemId(costItem1.getId())
+	            .setCostItemNum(costItem1.getCount())
+	            .setTenCostItemId(costItem10.getId())
+	            .setTenCostItemNum(costItem10.getCount())
 	            .setGachaPrefabPath(this.getPrefabPath())
 	            .setGachaPreviewPrefabPath(this.getPreviewPrefabPath())
 	            .setGachaProbUrl(details)
 	            .setGachaProbUrlOversea(details)
 	            .setGachaRecordUrl(record)
 	            .setGachaRecordUrlOversea(record)
-	            .setTenCostItemId(this.getCostItem())
-	            .setTenCostItemNum(10)
 	            .setLeftGachaTimes(Integer.MAX_VALUE)
 	            .setGachaTimesLimit(Integer.MAX_VALUE)
 	            .setGachaSortId(this.getSortId());
-		
 		if (this.getTitlePath() != null) {
 			info.setGachaTitlePath(this.getTitlePath());
 		}
diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
index a0337be7f..4cbfde094 100644
--- a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.FileReader;
 import java.nio.file.*;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
@@ -46,6 +47,8 @@ public class GachaManager {
 	
 	private static final int starglitterId = 221;
 	private static final int stardustId = 222;
+	private int[] fallbackItems4Pool2Default = {11401, 11402, 11403, 11405, 12401, 12402, 12403, 12405, 13401, 13407, 14401, 14402, 14403, 14409, 15401, 15402, 15403, 15405};
+	private int[] fallbackItems5Pool2Default = {11501, 11502, 12501, 12502, 13502, 13505, 14501, 14502, 15501, 15502};
 
 	public GachaManager(GameServer server) {
 		this.server = server;
@@ -156,16 +159,16 @@ public class GachaManager {
 		// Simple weighted selection with an upper bound for the roll that cuts off trailing entries
 		// All weights must be >= 0
 		int total = 0;
-		for (int i : weights) {
-			if (i < 0) {
+		for (int weight : weights) {
+			if (weight < 0) {
 				throw new IllegalArgumentException("Weights must be non-negative!");
 			}
-			total += i;
+			total += weight;
 		}
 		int roll = ThreadLocalRandom.current().nextInt((total < cutoff)? total : cutoff);
 		int subTotal = 0;
-		for (int i : weights) {
-			subTotal += i;
+		for (int i=0; i<weights.length; i++) {
+			subTotal += weights[i];
 			if (roll < subTotal) {
 				return i;
 			}
@@ -176,16 +179,22 @@ public class GachaManager {
 
 	private synchronized int doRarePull(int[] featured, int[] fallback1, int[] fallback2, int rarity, GachaBanner banner, PlayerGachaBannerInfo gachaInfo) {
 		int itemId = 0;
-		if (	(featured.length > 0)
-				&& (gachaInfo.getFailedFeaturedItemPulls(rarity) >= 1)
-				|| (this.randomRange(1, 100) <= banner.getEventChance(rarity))) {
+		boolean pullFeatured = (gachaInfo.getFailedFeaturedItemPulls(rarity) >= 1)  // Lost previous coinflip
+							|| (this.randomRange(1, 100) <= banner.getEventChance(rarity));  // Won this coinflip
+		if (pullFeatured && (featured.length > 0)) {
 			itemId = getRandom(featured);
 			gachaInfo.setFailedFeaturedItemPulls(rarity, 0);
 		} else {
 			gachaInfo.addFailedFeaturedItemPulls(rarity, 1);
 			if (fallback1.length < 1) {
-				itemId = getRandom(fallback2);  // Don't ever run an empty fallback2 btw
-			} else {
+				if (fallback2.length < 1) {
+					itemId = getRandom((rarity==5)? fallbackItems5Pool2Default : fallbackItems4Pool2Default);
+				} else {
+					itemId = getRandom(fallback2);
+				}
+			} else if (fallback2.length < 1) {
+				itemId = getRandom(fallback1);
+			} else {  // Both pools are possible, use the pool balancer
 				int pityPool1 = banner.getPoolBalanceWeight(rarity, gachaInfo.getPityPool(rarity, 1));
 				int pityPool2 = banner.getPoolBalanceWeight(rarity, gachaInfo.getPityPool(rarity, 2));
 				int chosenPool = switch ((pityPool1 >= pityPool2)? 1 : 0) {  // Larger weight must come first for the hard cutoff to function correctly
@@ -245,6 +254,7 @@ public class GachaManager {
 		// Spend currency
 		ItemParamData cost = banner.getCost(times);
 		if (cost.getCount() > 0 && !inventory.payItem(cost)) {
+			player.sendPacket(new PacketDoGachaRsp());
 			return;
 		}
 		
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDoGachaRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDoGachaRsp.java
index 9144c0d8e..6d8b9ddd9 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDoGachaRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDoGachaRsp.java
@@ -2,6 +2,7 @@ package emu.grasscutter.server.packet.send;
 
 import java.util.List;
 
+import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.game.gacha.GachaBanner;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
@@ -14,16 +15,18 @@ public class PacketDoGachaRsp extends BasePacket {
 	public PacketDoGachaRsp(GachaBanner banner, List<GachaItem> list) {
 		super(PacketOpcodes.DoGachaRsp);
 
+		ItemParamData costItem = banner.getCost(1);
+		ItemParamData costItem10 = banner.getCost(10);
 		DoGachaRsp p = DoGachaRsp.newBuilder()
 				.setGachaType(banner.getGachaType())
 				.setGachaScheduleId(banner.getScheduleId())
 				.setGachaTimes(list.size())
 				.setNewGachaRandom(12345)
 				.setLeftGachaTimes(Integer.MAX_VALUE)
-				.setCostItemId(banner.getCostItem())
-	            .setCostItemNum(1)
-	            .setTenCostItemId(banner.getCostItem())
-	            .setTenCostItemNum(10)
+				.setCostItemId(costItem.getId())
+	            .setCostItemNum(costItem.getCount())
+	            .setTenCostItemId(costItem10.getId())
+	            .setTenCostItemNum(costItem10.getCount())
 	            .addAllGachaItemList(list)
 				.build();
 		

From 395da1ebcb229ac999282a536025808b5dee57a0 Mon Sep 17 00:00:00 2001
From: AnimeGitB <AnimeGitB@bigblueball.in>
Date: Thu, 12 May 2022 15:00:40 +0930
Subject: [PATCH 42/59] Fix gachadetails

---
 .../dispatch/http/GachaDetailsHandler.java     | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main/java/emu/grasscutter/server/dispatch/http/GachaDetailsHandler.java b/src/main/java/emu/grasscutter/server/dispatch/http/GachaDetailsHandler.java
index 5e1877b9b..e5359a9da 100644
--- a/src/main/java/emu/grasscutter/server/dispatch/http/GachaDetailsHandler.java
+++ b/src/main/java/emu/grasscutter/server/dispatch/http/GachaDetailsHandler.java
@@ -62,28 +62,24 @@ public final class GachaDetailsHandler implements HttpContextHandler {
 		// Add 5-star items.
 		Set<String> fiveStarItems = new LinkedHashSet<>();
 
-		Arrays.stream(banner.getRateUpItems1()).forEach(i -> fiveStarItems.add(Integer.toString(i)));
-		if (banner.getBannerType() == BannerType.STANDARD || banner.getBannerType() == BannerType.EVENT) {
-			Arrays.stream(manager.getYellowAvatars()).forEach(i -> fiveStarItems.add(Integer.toString(i)));
-		}
-		if (banner.getBannerType() == BannerType.STANDARD || banner.getBannerType() == BannerType.WEAPON) {
-			Arrays.stream(manager.getYellowWeapons()).forEach(i -> fiveStarItems.add(Integer.toString(i)));
-		}
+		Arrays.stream(banner.getRateUpItems5()).forEach(i -> fiveStarItems.add(Integer.toString(i)));
+		Arrays.stream(banner.getFallbackItems5Pool1()).forEach(i -> fiveStarItems.add(Integer.toString(i)));
+		Arrays.stream(banner.getFallbackItems5Pool2()).forEach(i -> fiveStarItems.add(Integer.toString(i)));
 
 		response = response.replace("{{FIVE_STARS}}", "[" + String.join(",", fiveStarItems) + "]");
 		
 		// Add 4-star items.
 		Set<String> fourStarItems = new LinkedHashSet<>();
 
-		Arrays.stream(banner.getRateUpItems2()).forEach(i -> fourStarItems.add(Integer.toString(i)));
-		Arrays.stream(manager.getPurpleAvatars()).forEach(i -> fourStarItems.add(Integer.toString(i)));
-		Arrays.stream(manager.getPurpleWeapons()).forEach(i -> fourStarItems.add(Integer.toString(i)));
+		Arrays.stream(banner.getRateUpItems4()).forEach(i -> fourStarItems.add(Integer.toString(i)));
+		Arrays.stream(banner.getFallbackItems4Pool1()).forEach(i -> fourStarItems.add(Integer.toString(i)));
+		Arrays.stream(banner.getFallbackItems4Pool2()).forEach(i -> fourStarItems.add(Integer.toString(i)));
 
 		response = response.replace("{{FOUR_STARS}}", "[" + String.join(",", fourStarItems) + "]");
 
 		// Add 3-star items.
 		Set<String> threeStarItems = new LinkedHashSet<>();
-		Arrays.stream(manager.getBlueWeapons()).forEach(i -> threeStarItems.add(Integer.toString(i)));
+		Arrays.stream(banner.getFallbackItems3()).forEach(i -> threeStarItems.add(Integer.toString(i)));
 		response = response.replace("{{THREE_STARS}}", "[" + String.join(",", threeStarItems) + "]");
 
 		// Done.

From d4eb686fe2f7bd1afd7ee8c74068b7e6fb565fab Mon Sep 17 00:00:00 2001
From: kyoko12 <kyoko12@gmx.at>
Date: Fri, 13 May 2022 14:10:02 +0200
Subject: [PATCH 43/59] Don't silently delete config.json if there is an error.

---
 .../java/emu/grasscutter/Grasscutter.java     | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/emu/grasscutter/Grasscutter.java b/src/main/java/emu/grasscutter/Grasscutter.java
index 2af2415ab..af8a759a5 100644
--- a/src/main/java/emu/grasscutter/Grasscutter.java
+++ b/src/main/java/emu/grasscutter/Grasscutter.java
@@ -153,16 +153,22 @@ public final class Grasscutter {
 	 * Attempts to load the configuration from a file.
 	 */
 	public static void loadConfig() {
+		// Check if config.json exists. If not, we generate a new config.
+		if (!configFile.exists()) {
+			getLogger().info("config.json could not be found. Generating a default configuration ...");
+			config = new ConfigContainer();
+			Grasscutter.saveConfig(config);
+			return;
+		} 
+
+		// If the file already exists, we attempt to load it.
 		try (FileReader file = new FileReader(configFile)) {
 			config = gson.fromJson(file, ConfigContainer.class);
-		} catch (Exception exception) {
-			Grasscutter.saveConfig(null);
-			config = new ConfigContainer();
-		} catch (Error error) {
-			// Occurred probably from an outdated config file.
-			Grasscutter.saveConfig(null);
-			config = new ConfigContainer();
-		}
+		} 
+		catch (Exception exception) {
+			getLogger().error("There was an error while trying to load the configuration from config.json. Please make sure that there are no syntax errors. If you want to start with a default configuration, delete your existing config.json.");
+			System.exit(1);
+		} 
 	}
 
 	public static void loadLanguage() {

From 891c70e5ea8689c8c0e799bc3a50a7b31cb99940 Mon Sep 17 00:00:00 2001
From: Kimi <34180607+Kimi898246@users.noreply.github.com>
Date: Fri, 13 May 2022 20:10:40 +0800
Subject: [PATCH 44/59] Traditional Chinese | Translation Patches

---
 src/main/resources/languages/zh-TW.json | 146 ++++++++++++++++--------
 1 file changed, 98 insertions(+), 48 deletions(-)

diff --git a/src/main/resources/languages/zh-TW.json b/src/main/resources/languages/zh-TW.json
index f6ae52c9d..2b6fe34ff 100644
--- a/src/main/resources/languages/zh-TW.json
+++ b/src/main/resources/languages/zh-TW.json
@@ -16,6 +16,9 @@
         "no_keystore_error": "[Dispatch] 未找到 SSL 憑證！已後降到 HTTP 伺服器。",
         "default_password": "[Dispatch] 默認的 keystore 密碼加載成功。請考慮將 config.json 的憑證密碼設定成 123456。"
       },
+      "authentication": {
+        "default_unable_to_verify": "[驗證系統] 稱為 verifyUser 方法的東西在默認身份驗證程序中不可用。"
+      },
       "no_commands_error": "此指令不適用於Dispatch-only模式。",
       "unhandled_request_error": "[Dispatch] 潛在的未處理請求  %s 請求：%s",
       "account": {
@@ -46,7 +49,7 @@
       "run_mode_help": "伺服器運行模式必須為 HYBRID 或者 DISPATCH_ONLY 或者 GAME_ONLY。Grasscutter 啟動失敗...",
       "create_resources": "正在建立 resources 資料夾...",
       "resources_error": "請將 BinOutput 和 ExcelBinOutput 複製到 resources 資料夾。",
-      "version": "Grasscutter版本: %s-%s"
+      "version": "Grasscutter版本： %s-%s"
     }
   },
   "commands": {
@@ -57,6 +60,7 @@
       "console_execute_error": "此指令只能在伺服器的命令提示字元執行。",
       "player_execute_error": "請在遊戲裡使用這條指令。",
       "command_exist_error": "找不到指令。",
+      "no_description_specified": "没有指定說明。",
       "invalid": {
         "amount": "無效的數量。",
         "artifactId": "無效的聖遺物ID。",
@@ -96,17 +100,20 @@
       "create": "已建立帳號，UID 為 %s 。",
       "delete": "帳號已刪除。",
       "no_account": "帳號不存在。",
-      "command_usage": "用法：account <create|delete> <username> [uid]"
+      "command_usage": "用法：account <create|delete> <username> [uid]",
+      "description": "建立或刪除帳號。"
     },
     "broadcast": {
       "command_usage": "用法：broadcast <message>",
-      "message_sent": "公告已發送。"
+      "message_sent": "公告已發送。",
+      "description": "向所有玩家發送公告。"
     },
     "changescene": {
       "usage": "用法：changescene <scene id>",
       "already_in_scene": "你已經在這個場景中了。",
       "success": "已切換至場景 %s.",
-      "exists_error": "此場景不存在。"
+      "exists_error": "此場景不存在。",
+      "description": "切換指定場景。"
     },
     "clear": {
       "command_usage": "用法： clear <all|wp|art|mat>",
@@ -116,35 +123,41 @@
       "furniture": "已將 %s 的塵歌壺家具清空。",
       "displays": "已清除 %s 的顯示。",
       "virtuals": "已將 %s 的所有貨幣和經驗值清空。",
-      "everything": "已將 %s 的所有物品清空。"
+      "everything": "已將 %s 的所有物品清空。",
+      "description": "從你的背包中刪除所有未裝備且未上鎖的物品，包括稀有物品。"
     },
     "coop": {
       "usage": "用法：coop <playerId> <target playerId>",
-      "success": "召喚了 %s 到 %s 的世界。"
+      "success": "召喚了 %s 到 %s 的世界。",
+      "description": "強制傳送指定用戶到他人的世界。"
     },
     "enter_dungeon": {
       "usage": "用法：enterdungeon <dungeon id>",
-      "changed": "已進入副本 %s",
-      "not_found_error": "此副本不存在。",
-      "in_dungeon_error": "你已經在祕境中了。"
+      "changed": "已進入祕境 %s",
+      "not_found_error": "此祕境不存在。",
+      "in_dungeon_error": "你已經在祕境中了。",
+      "description": "進入指定祕境。"
     },
     "giveAll": {
       "usage": "用法：giveall [player] [amount]",
       "started": "正在賦予全部物品...",
       "success": "已賦予全部物品。",
-      "invalid_amount_or_playerId": "無效的數量/玩家ID。"
+      "invalid_amount_or_playerId": "無效的數量/玩家ID。",
+      "description": "賦予所有物品。"
     },
     "giveArtifact": {
       "usage": "用法：giveart|gart [player] <artifactId> <mainPropId> [<appendPropId>[,<times>]]... [level]",
       "id_error": "無效的聖遺物ID。",
-      "success": "已把 %s 給予 %s。"
+      "success": "已把 %s 給予 %s。",
+      "description": "給予指定聖遺物。"
     },
     "giveChar": {
       "usage": "用法：givechar <player> <itemId|itemName> [amount]",
       "given": "已將 %s 等級 %s 給予 %s。",
       "invalid_avatar_id": "無效的角色ID。",
       "invalid_avatar_level": "無效的角色等級。.",
-      "invalid_avatar_or_player_id": "無效的角色ID/玩家ID。"
+      "invalid_avatar_or_player_id": "無效的角色ID/玩家ID。",
+      "description": "給予指定角色。"
     },
     "give": {
       "usage": "用法：give <player> <itemId|itemName> [amount] [level]",
@@ -152,29 +165,42 @@
       "refinement_must_between_1_and_5": "精煉度必需在 1 到 5 之間。",
       "given": "已經將 %s 個 %s 給予 %s。",
       "given_with_level_and_refinement": "已將 %s [等級%s, 精煉%s] %s個給予 %s",
-      "given_level": "已將 %s 等級 %s %s 個給予 %s"
+      "given_level": "已將 %s 等級 %s %s 個給予 %s",
+      "description": "給予指定物品。"
     },
     "godmode": {
-      "success": "上帝模式設定為 %s 。 [用戶：%s]"
+      "success": "上帝模式設定為 %s 。 [用戶：%s]",
+      "description": "防止你受到傷害。"
     },
     "heal": {
-      "success": "所有角色已被治療。"
+      "success": "所有角色已被治療。",
+      "description": "治療當前隊伍的角色。"
     },
     "kick": {
       "player_kick_player": "玩家 [%s:%s] 已把 [%s:%s] 踢出",
-      "server_kick_player": "正在踢出玩家 [%s:%s]"
+      "server_kick_player": "正在踢出玩家 [%s:%s]",
+      "description": "從伺服器內踢出指定玩家。"
     },
     "kill": {
       "usage": "用法：killall [playerUid] [sceneId]",
       "scene_not_found_in_player_world": "未在玩家世界中找到此場景",
-      "kill_monsters_in_scene": "已殺死 %s 個怪物。 [場景ID： %s]"
+      "kill_monsters_in_scene": "已殺死 %s 個怪物。 [場景ID： %s]",
+      "description": "殺死所有怪物。"
     },
     "killCharacter": {
       "usage": "用法：/killcharacter [playerId]",
-      "success": "已殺死 %s 目前的場上角色。"
+      "success": "已殺死 %s 目前的場上角色。",
+      "description": "殺死玩家目前使用的場上角色。"
+    },
+    "language": {
+      "current_language": "當前語言是： %s",
+      "language_changed": "語言切換至： %s",
+      "language_not_found": "目前客戶端沒有這種語言： %s",
+      "description": "顯示或切換當前語言。"
     },
     "list": {
-      "success": "目前總線上人數：%s"
+      "success": "目前總線上人數：%s" ,
+      "description": "查看所有在線玩家"
     },
     "permission": {
       "usage": "用法：permission <add|remove> <username> <permission>",
@@ -182,21 +208,26 @@
       "has_error": "此玩家已擁有權限！",
       "remove": "權限已移除。",
       "not_have_error": "此玩家未擁有權限！",
-      "account_error": "The account cannot be found."
+      "account_error": "帳號不存在。",
+      "description": "指派或移除指定玩家的權限。"
     },
     "position": {
-      "success": "坐標：%s, %s, %s\n場景ID：%s"
+      "success": "座標：%s, %s, %s\n場景ID：%s",
+      "description": "獲取目前所在位置的座標。"
     },
     "reload": {
       "reload_start": "正在重新加載設定檔。",
-      "reload_done": "重新加載已完成。"
+      "reload_done": "重新加載已完成。",
+      "description": "重新加載設定檔和數據。"
     },
     "resetConst": {
       "reset_all": "重設所有角色的命座。",
-      "success": "已重設 %s 的命座，重新登入後將會生效。"
+      "success": "已重設 %s 的命座，重新登入後將會生效。",
+      "description": "重置當前角色的命之座，重新登入後將會生效。"
     },
     "resetShopLimit": {
-      "usage": "用法：/resetshop <player id>"
+      "usage": "用法：/resetshop <player id>",
+      "description": "重置所選玩家的商店刷新時間。"
     },
     "sendMail": {
       "usage": "用法：give [player] <itemId|itemName> [amount]",
@@ -218,17 +249,20 @@
       "message": "<正文>",
       "sender": "<寄件者>",
       "arguments": "<itemId|itemName|finish> [數量] [等級]",
-      "error": "錯誤：無效的編寫階段 %s。需要 stacktrace 請查看伺服器命令提示字元。"
+      "error": "錯誤：無效的編寫階段 %s。需要 stacktrace 請查看伺服器命令提示字元。",
+      "description": "向指定用戶發送郵件。此指令的用法可根據附加的參數而改變。"
     },
     "sendMessage": {
       "usage": "用法：sendmessage <player> <message>",
-      "success": "訊息已發送。"
+      "success": "訊息已發送。",
+      "description": "向指定玩家發送訊息。"
     },
     "setFetterLevel": {
       "usage": "用法：setfetterlevel <level>",
       "range_error": "好感度必須在 0 到 10 之間。",
       "success": "好感等級已設定為 %s",
-      "level_error": "無效的好感度。"
+      "level_error": "無效的好感度。",
+      "description": "設定當前角色的好感度等級。"
     },
     "setStats": {
       "usage_console": "用法：setstats|stats @<UID> <stat> <value>",
@@ -239,77 +273,93 @@
       "player_error": "玩家不存在或已離線。",
       "set_self": "%s 已經設為 %s。",
       "set_for_uid": "%s 的使用者 %s 更改為 %s。",
-      "set_max_hp": "最大生命值更改為 %s。"
+      "set_max_hp": "最大生命值更改為 %s。",
+      "description": "設定當前角色的數據類型。"
     },
     "setWorldLevel": {
       "usage": "用法：setworldlevel <level>",
       "value_error": "世界等級必須設定在0-8之間。",
       "success": "已將世界等級設為%s。",
-      "invalid_world_level": "無效的世界等級。"
+      "invalid_world_level": "無效的世界等級。",
+      "description": "設定世界等級，執行指令後需重新登入後才會生效。"
     },
     "spawn": {
       "usage": "用法：spawn <entityId> [amount] [level(僅限怪物)]",
-      "success": "已生成 %s 個 %s。"
+      "success": "已生成 %s 個 %s。",
+      "description": "在你附近生成一個實體動物。"
     },
     "stop": {
-      "success": "正在關閉伺服器..."
+      "success": "正在關閉伺服器...",
+      "description": "以正常的方式關閉伺服器。"
     },
     "talent": {
       "usage_1": "設定天賦等級：/talent set <talentID> <value>",
       "usage_2": "另一種設定天賦等級的指令使用方法：/talent <n or e or q> <value>",
       "usage_3": "獲取天賦ID指令用法：/talent getid",
-      "lower_16": "無效的技能等級，技能等級應低於 16。",
+      "lower_16": "無效的天賦等級，技能等級應低於 16。",
       "set_id": "將天賦等級設為%s。",
       "set_atk": "將普通攻擊等級設為 %s。",
-      "set_e": "設定天賦E等級至 %s。",
-      "set_q": "設定天賦Q等級至 %s。",
+      "set_e": "設定元素戰技的天賦等級至 %s。",
+      "set_q": "設定元素爆發的天賦等級至 %s。",
       "invalid_skill_id": "無效的技能ID。",
       "set_this": "將天賦等級設為 %s。",
       "invalid_level": "無效的天賦等級。",
       "normal_attack_id": "普通攻擊的 ID 為 %s。",
-      "e_skill_id": "E技能ID %s。",
-      "q_skill_id": "Q技能ID %s。"
+      "e_skill_id": "元素戰技技能ID %s。",
+      "q_skill_id": "元素爆發技能ID %s。",
+      "description": "設定當前角色的天賦等級"
     },
     "teleportAll": {
       "success": "召喚了所有玩家到你的位置上。",
-      "error": "此指令僅可在多人遊戲下可用。"
+      "error": "此指令僅可在多人遊戲下可用。",
+      "description": "將你世界裡的所有玩家傳送到你目前的所在位置。"
     },
     "teleport": {
       "usage_server": "用法：/tp @<player id> <x> <y> <z> [scene id]",
       "usage": "用法：/tp [@<player id>] <x> <y> <z> [scene id]",
       "specify_player_id": "你必須指定一個玩家ID。",
-      "invalid_position": "無效的位置。",
-      "success": "傳送 %s 到坐標 %s,%s,%s ，場景為 %s"
+      "invalid_position": "無效的座標。",
+      "success": "傳送 %s 到座標 %s,%s,%s ，場景為 %s 。",
+      "description": "將玩家的位置傳送到你所指定的座標。"
+    },
+    "tower": {
+      "unlock_done": "解鎖所有級別的深境螺旋已全部解鎖。"
     },
     "weather": {
       "usage": "用法：weather <weatherId> [climateId]",
       "success": "已將當前天氣設定為 %s ，氣候則為 %s 。",
-      "invalid_id": "無效的ID。"
+      "invalid_id": "無效的ID。",
+      "description": "更改目前的天氣。"
     },
     "drop": {
       "command_usage": "用法：drop <itemId|itemName> [amount]",
-      "success": "已將 %s x %s 丟在附近。"
+      "success": "已將 %s x %s 丟在附近。",
+      "description": "在你附近丟下一個物品。"
     },
     "help": {
       "usage": "用法：",
       "aliases": "別名：",
+      "description": "發送幫助信息或顯示特定命令的信息",
       "available_commands": "可用指令："
     },
+    "restart": {
+      "description": "重新啟動伺服器。"
+    },
     "unlocktower": {
       "success": "解鎖完成。",
-      "description": "解鎖所有級別的深境螺旋"
+      "description": "解鎖所有級別的深境螺旋。"
     },
     "resetshop": {
-      "description": "重置商店時間"
+      "description": "重置商店刷新時間。"
     }
   },
   "gacha": {
     "details": {
-      "title": "Banner Details",
-      "available_five_stars": "Available 5-star Items",
-      "available_four_stars": "Available 4-star Items",
-      "available_three_stars": "Available 3-star Items",
-      "template_missing": "data/gacha_details.html is missing."
+      "title": "祈願詳情",
+      "available_five_stars": "可獲得的5星物品",
+      "available_four_stars": "可獲得的4星物品",
+      "available_three_stars": "可獲得的3星物品",
+      "template_missing": "data/gacha_details.html 不存在。"
     }
   }
 }

From a227b44c70244a6b1574881e6110e491c3a2b27c Mon Sep 17 00:00:00 2001
From: Melledy <52122272+Melledy@users.noreply.github.com>
Date: Fri, 13 May 2022 06:24:50 -0700
Subject: [PATCH 45/59] Fixed quests not finishing their questline

---
 .../java/emu/grasscutter/data/def/QuestData.java    | 11 +++++++++++
 .../emu/grasscutter/game/quest/GameMainQuest.java   |  1 +
 .../java/emu/grasscutter/game/quest/GameQuest.java  | 13 ++++++++++---
 .../emu/grasscutter/game/quest/QuestManager.java    |  2 +-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/main/java/emu/grasscutter/data/def/QuestData.java b/src/main/java/emu/grasscutter/data/def/QuestData.java
index 31ac2ce7e..13e806dab 100644
--- a/src/main/java/emu/grasscutter/data/def/QuestData.java
+++ b/src/main/java/emu/grasscutter/data/def/QuestData.java
@@ -15,6 +15,9 @@ public class QuestData extends GameResource {
 	private int Order;
 	private long DescTextMapHash;
 	
+	private boolean FinishParent;
+	private boolean IsRewind;
+	
 	private LogicType AcceptCondComb;
 	private QuestCondition[] acceptConditons;
 	private LogicType FinishCondComb;
@@ -45,6 +48,14 @@ public class QuestData extends GameResource {
 		return DescTextMapHash;
 	}
 
+	public boolean finishParent() {
+		return FinishParent;
+	}
+
+	public boolean isRewind() {
+		return IsRewind;
+	}
+
 	public LogicType getAcceptCondComb() {
 		return AcceptCondComb;
 	}
diff --git a/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java b/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
index bf88b8efe..613819d0b 100644
--- a/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
+++ b/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
@@ -91,6 +91,7 @@ public class GameMainQuest {
 		this.isFinished = true;
 		this.state = ParentQuestState.PARENT_QUEST_STATE_FINISHED;
 		this.getOwner().getSession().send(new PacketFinishedParentQuestUpdateNotify(this));
+		this.save();
 	}
 
 	public void save() {
diff --git a/src/main/java/emu/grasscutter/game/quest/GameQuest.java b/src/main/java/emu/grasscutter/game/quest/GameQuest.java
index b242166eb..5e1126fcb 100644
--- a/src/main/java/emu/grasscutter/game/quest/GameQuest.java
+++ b/src/main/java/emu/grasscutter/game/quest/GameQuest.java
@@ -143,21 +143,28 @@ public class GameQuest {
 		
 		this.getOwner().getSession().send(new PacketQuestProgressUpdateNotify(this));
 		this.getOwner().getSession().send(new PacketQuestListUpdateNotify(this));
-		this.save();
 		
-		this.tryAcceptQuestLine();
+		if (this.getData().finishParent()) {
+			// This quest finishes the questline - the main quest will also save the quest to db so we dont have to call save() here
+			this.getMainQuest().finish();
+		} else {
+			// Try and accept other quests if possible
+			this.tryAcceptQuestLine();
+			this.save();
+		}
 	}
 	
 	public boolean tryAcceptQuestLine() {
 		try {
 			MainQuestData questConfig = GameData.getMainQuestDataMap().get(this.getMainQuestId());
+			
 			for (SubQuestData subQuest : questConfig.getSubQuests()) {
 				GameQuest quest = getMainQuest().getChildQuestById(subQuest.getSubId());
 				
 				if (quest == null) {
 					QuestData questData = GameData.getQuestDataMap().get(subQuest.getSubId());
 					
-					if (questData == null) {
+					if (questData == null || questData.getAcceptCond() == null) {
 						continue;
 					}
 					
diff --git a/src/main/java/emu/grasscutter/game/quest/QuestManager.java b/src/main/java/emu/grasscutter/game/quest/QuestManager.java
index 548e8241a..745ce9ef8 100644
--- a/src/main/java/emu/grasscutter/game/quest/QuestManager.java
+++ b/src/main/java/emu/grasscutter/game/quest/QuestManager.java
@@ -128,7 +128,7 @@ public class QuestManager {
 			QuestData data = quest.getData();
 			
 			for (int i = 0; i < data.getFinishCond().length; i++) {
-				if (quest.getFinishProgressList()[i] == 1) {
+				if (quest.getFinishProgressList() == null || quest.getFinishProgressList()[i] == 1) {
 					continue;
 				}
 				

From 83f8bec9470b163f01ced39dbf6b3dd14fe8e0ca Mon Sep 17 00:00:00 2001
From: Melledy <52122272+Melledy@users.noreply.github.com>
Date: Fri, 13 May 2022 06:33:12 -0700
Subject: [PATCH 46/59] Implement QUEST_CONTENT_FINISH_PLOT

---
 .../game/quest/content/ContentFinishPlot.java   | 17 +++++++++++++++++
 .../server/packet/recv/HandlerNpcTalkReq.java   |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java

diff --git a/src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java b/src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java
new file mode 100644
index 000000000..d8e0cd4e5
--- /dev/null
+++ b/src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java
@@ -0,0 +1,17 @@
+package emu.grasscutter.game.quest.content;
+
+import emu.grasscutter.data.def.QuestData.QuestCondition;
+import emu.grasscutter.game.quest.QuestValue;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
+import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
+
+@QuestValue(QuestTrigger.QUEST_CONTENT_FINISH_PLOT)
+public class ContentFinishPlot extends QuestBaseHandler {
+
+	@Override
+	public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
+		return condition.getParam()[0] == params[0];
+	}
+	
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java
index 82248c98c..3dae7fe10 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerNpcTalkReq.java
@@ -16,7 +16,9 @@ public class HandlerNpcTalkReq extends PacketHandler {
 	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
 		NpcTalkReq req = NpcTalkReq.parseFrom(payload);
 		
+		// Why are there 2 quest triggers that do the same thing...
 		session.getPlayer().getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_COMPLETE_TALK, req.getTalkId());
+		session.getPlayer().getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_FINISH_PLOT, req.getTalkId());
 
 		session.send(new PacketNpcTalkRsp(req.getNpcEntityId(), req.getTalkId(), req.getEntityId()));
 	}

From 19ee983c086042042f17843211b5cc7abc765bb9 Mon Sep 17 00:00:00 2001
From: Yazawazi <47273265+Yazawazi@users.noreply.github.com>
Date: Sat, 14 May 2022 00:03:55 +0800
Subject: [PATCH 47/59] feature(serenitea pot): Implementation of the entry
 function

It's being perfected, so don't worry. (probably)
---
 .../packet/recv/HandlerWidgetDoBagReq.java    | 57 +++++++++++++++++++
 .../send/PacketWidgetCoolDownNotify.java      | 25 ++++++++
 .../packet/send/PacketWidgetDoBagRsp.java     | 28 +++++++++
 .../send/PacketWidgetGadgetDataNotify.java    | 26 +++++++++
 4 files changed, 136 insertions(+)
 create mode 100644 src/main/java/emu/grasscutter/server/packet/recv/HandlerWidgetDoBagReq.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketWidgetCoolDownNotify.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketWidgetDoBagRsp.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketWidgetGadgetDataNotify.java

diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerWidgetDoBagReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerWidgetDoBagReq.java
new file mode 100644
index 000000000..d9cee08de
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerWidgetDoBagReq.java
@@ -0,0 +1,57 @@
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.def.GadgetData;
+import emu.grasscutter.game.entity.EntityVehicle;
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.props.LifeState;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.*;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
+import emu.grasscutter.server.packet.send.PacketWidgetCoolDownNotify;
+import emu.grasscutter.server.packet.send.PacketWidgetDoBagRsp;
+import emu.grasscutter.server.packet.send.PacketWidgetGadgetDataNotify;
+import emu.grasscutter.utils.Position;
+
+import java.util.List;
+
+@Opcodes(PacketOpcodes.WidgetDoBagReq)
+public class HandlerWidgetDoBagReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        WidgetDoBagReqOuterClass.WidgetDoBagReq req = WidgetDoBagReqOuterClass.WidgetDoBagReq.parseFrom(payload);
+        switch (req.getMaterialId()) {
+            case 220026 -> {
+                GadgetData gadgetData = GameData.getGadgetDataMap().get(70500025);
+                Position pos = new Position(req.getWidgetCreatorInfo().getLocationInfo().getPos());
+                Position rot = new Position(req.getWidgetCreatorInfo().getLocationInfo().getRot());
+                GameEntity entity = new EntityVehicle(
+                        session.getPlayer().getScene(),
+                        session.getPlayer(),
+                        gadgetData.getId(),
+                        0,
+                        pos,
+                        rot
+                );
+
+                session.getPlayer().getScene().addEntity(entity);
+
+                session.send(new PacketWidgetGadgetDataNotify(70500025, List.of(entity.getId())));  // ???
+                session.send(new PacketWidgetCoolDownNotify(15, System.currentTimeMillis() + 5000L, true));
+                session.send(new PacketWidgetCoolDownNotify(15, System.currentTimeMillis() + 5000L, true));
+                // Send twice, and I don't know why, Ask mhy
+                session.send(new PacketWidgetDoBagRsp());
+            }
+            default -> {
+                session.send(new PacketWidgetDoBagRsp());
+            }
+
+        }
+    }
+
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetCoolDownNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetCoolDownNotify.java
new file mode 100644
index 000000000..a73187020
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetCoolDownNotify.java
@@ -0,0 +1,25 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass;
+import emu.grasscutter.net.proto.WidgetCoolDownNotifyOuterClass;
+
+public class PacketWidgetCoolDownNotify extends BasePacket {
+
+    public PacketWidgetCoolDownNotify(int id, long coolDownTime, boolean isSuccess) {
+        super(PacketOpcodes.WidgetCoolDownNotify);
+
+        WidgetCoolDownNotifyOuterClass.WidgetCoolDownNotify proto = WidgetCoolDownNotifyOuterClass.WidgetCoolDownNotify.newBuilder()
+                .addGroupCoolDownDataList(
+                        WidgetCoolDownDataOuterClass.WidgetCoolDownData.newBuilder()
+                                .setId(id)
+                                .setCoolDownTime(coolDownTime)
+                                .setIsSuccess(isSuccess)
+                                .build()
+                )
+                .build();
+
+        this.setData(proto);
+    }
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetDoBagRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetDoBagRsp.java
new file mode 100644
index 000000000..7ce5065ea
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetDoBagRsp.java
@@ -0,0 +1,28 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.WidgetDoBagRspOuterClass;
+
+public class PacketWidgetDoBagRsp extends BasePacket {
+
+    public PacketWidgetDoBagRsp(int materialId) {
+        super(PacketOpcodes.WidgetDoBagRsp);
+
+        WidgetDoBagRspOuterClass.WidgetDoBagRsp proto = WidgetDoBagRspOuterClass.WidgetDoBagRsp.newBuilder()
+                .setMaterialId(materialId)
+                .setRetcode(0)
+                .build();
+
+        this.setData(proto);
+    }
+
+    public PacketWidgetDoBagRsp() {
+        super(PacketOpcodes.WidgetDoBagRsp);
+
+        WidgetDoBagRspOuterClass.WidgetDoBagRsp proto = WidgetDoBagRspOuterClass.WidgetDoBagRsp.newBuilder()
+                .build();
+
+        this.setData(proto);
+    }
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetGadgetDataNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetGadgetDataNotify.java
new file mode 100644
index 000000000..f94c6c10e
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketWidgetGadgetDataNotify.java
@@ -0,0 +1,26 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.WidgetGadgetDataNotifyOuterClass;
+import emu.grasscutter.net.proto.WidgetGadgetDataOuterClass;
+
+import java.io.IOException;
+import java.util.List;
+
+public class PacketWidgetGadgetDataNotify extends BasePacket {
+    public PacketWidgetGadgetDataNotify(int gadgetId, List<Integer> gadgetEntityIdList) throws IOException {
+        super(PacketOpcodes.WidgetGadgetDataNotify);
+
+        WidgetGadgetDataNotifyOuterClass.WidgetGadgetDataNotify proto = WidgetGadgetDataNotifyOuterClass.WidgetGadgetDataNotify.newBuilder()
+                .setWidgetGadgetData(
+                        WidgetGadgetDataOuterClass.WidgetGadgetData.newBuilder()
+                                .setGadgetId(gadgetId)
+                                .addAllGadgetEntityIdList(gadgetEntityIdList)
+                                .build()
+                )
+                .build();
+
+        this.setData(proto);
+    }
+}

From 95a062123f63edfda7a48200e431712e9a1ca74c Mon Sep 17 00:00:00 2001
From: Yazawazi <47273265+Yazawazi@users.noreply.github.com>
Date: Sat, 14 May 2022 03:20:20 +0800
Subject: [PATCH 48/59] feature(serenitea pot): Implementation of enter

Ugly hard code
---
 .../emu/grasscutter/game/player/Player.java   | 30 ++++++++
 .../recv/HandlerHomeChooseModuleReq.java      | 26 +++++++
 .../packet/recv/HandlerTryEnterHomeReq.java   | 68 +++++++++++++++++++
 .../send/PacketHomeChooseModuleRsp.java       | 19 ++++++
 .../send/PacketHomeComfortInfoNotify.java     | 40 +++++++++++
 .../send/PacketPlayerHomeCompInfoNotify.java  | 32 +++++++++
 .../packet/send/PacketTryEnterHomeRsp.java    | 30 ++++++++
 7 files changed, 245 insertions(+)
 create mode 100644 src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChooseModuleReq.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketHomeChooseModuleRsp.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketHomeComfortInfoNotify.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketPlayerHomeCompInfoNotify.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketTryEnterHomeRsp.java

diff --git a/src/main/java/emu/grasscutter/game/player/Player.java b/src/main/java/emu/grasscutter/game/player/Player.java
index b7d8470bf..9c9f1ea56 100644
--- a/src/main/java/emu/grasscutter/game/player/Player.java
+++ b/src/main/java/emu/grasscutter/game/player/Player.java
@@ -87,6 +87,9 @@ public class Player {
 
 	private Integer widgetId;
 
+	private Set<Integer> realmList;
+	private Integer currentRealmId;
+
 	@Transient private long nextGuid = 0;
 	@Transient private int peerId;
 	@Transient private World world;
@@ -313,6 +316,31 @@ public class Player {
 		this.widgetId = widgetId;
 	}
 
+	public Set<Integer> getRealmList() {
+		return realmList;
+	}
+
+	public void setRealmList(Set<Integer> realmList) {
+		this.realmList = realmList;
+	}
+
+	public void addRealmList(int realmId) {
+		if (this.realmList == null) {
+			this.realmList = new HashSet<>();
+		} else if (this.realmList.contains(realmId)) {
+			return;
+		}
+		this.realmList.add(realmId);
+	}
+
+	public Integer getCurrentRealmId() {
+		return currentRealmId;
+	}
+
+	public void setCurrentRealmId(Integer currentRealmId) {
+		this.currentRealmId = currentRealmId;
+	}
+
 	public Position getPos() {
 		return pos;
 	}
@@ -1187,6 +1215,8 @@ public class Player {
 		session.send(new PacketServerCondMeetQuestListUpdateNotify(this));
 		session.send(new PacketAllWidgetDataNotify(this));
 		session.send(new PacketWidgetGadgetAllDataNotify());
+		session.send(new PacketPlayerHomeCompInfoNotify(this));
+		session.send(new PacketHomeComfortInfoNotify(this));
 
 		getTodayMoonCard(); // The timer works at 0:0, some users log in after that, use this method to check if they have received a reward today or not. If not, send the reward.
 
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChooseModuleReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChooseModuleReq.java
new file mode 100644
index 000000000..5a7c0dbe5
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChooseModuleReq.java
@@ -0,0 +1,26 @@
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.HomeChooseModuleReqOuterClass;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketHomeChooseModuleRsp;
+import emu.grasscutter.server.packet.send.PacketHomeComfortInfoNotify;
+import emu.grasscutter.server.packet.send.PacketPlayerHomeCompInfoNotify;
+
+
+@Opcodes(PacketOpcodes.HomeChooseModuleReq)
+public class HandlerHomeChooseModuleReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        HomeChooseModuleReqOuterClass.HomeChooseModuleReq req =
+                HomeChooseModuleReqOuterClass.HomeChooseModuleReq.parseFrom(payload);
+        session.getPlayer().addRealmList(req.getModuleId());
+        session.getPlayer().setCurrentRealmId(req.getModuleId());
+        session.send(new PacketHomeChooseModuleRsp(req.getModuleId()));
+        session.send(new PacketPlayerHomeCompInfoNotify(session.getPlayer()));
+        session.send(new PacketHomeComfortInfoNotify(session.getPlayer()));
+    }
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java
new file mode 100644
index 000000000..3e78bcb3a
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java
@@ -0,0 +1,68 @@
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.TryEnterHomeReqOuterClass;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketTryEnterHomeRsp;
+import emu.grasscutter.utils.Position;
+
+@Opcodes(PacketOpcodes.TryEnterHomeReq)
+public class HandlerTryEnterHomeReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        TryEnterHomeReqOuterClass.TryEnterHomeReq req =
+                TryEnterHomeReqOuterClass.TryEnterHomeReq.parseFrom(payload);
+
+        if (req.getTargetUid() != session.getPlayer().getUid()) {
+            // I hope that tomorrow there will be a hero who can support multiplayer mode and write code like a poem
+            session.send(new PacketTryEnterHomeRsp());
+            return;
+        }
+
+        // Hardcoded for now
+        switch (session.getPlayer().getCurrentRealmId()) {
+            case 1:
+                session.getPlayer().getWorld().transferPlayerToScene(
+                        session.getPlayer(),
+                        2001,
+                        new Position(839, 319, 137)
+                );
+                break;
+
+            case 2:
+                session.getPlayer().getWorld().transferPlayerToScene(
+                        session.getPlayer(),
+                        2002,
+                        new Position(605, 444, 554)
+                );
+                break;
+
+            case 3:
+                session.getPlayer().getWorld().transferPlayerToScene(
+                        session.getPlayer(),
+                        2003,
+                        new Position(511, 229, 605)
+                );
+                break;
+
+            case 4:
+                session.getPlayer().getWorld().transferPlayerToScene(
+                        session.getPlayer(),
+                        2004,
+                        new Position(239, 187, 536)
+                );
+                break;
+
+            default:
+                session.send(new PacketTryEnterHomeRsp());
+                return;
+        }
+
+
+        session.send(new PacketTryEnterHomeRsp(req.getTargetUid()));
+    }
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChooseModuleRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChooseModuleRsp.java
new file mode 100644
index 000000000..e7b3ff1ea
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeChooseModuleRsp.java
@@ -0,0 +1,19 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.HomeChooseModuleRspOuterClass;
+
+public class PacketHomeChooseModuleRsp extends BasePacket {
+
+    public PacketHomeChooseModuleRsp(int moduleId) {
+        super(PacketOpcodes.HomeChooseModuleRsp);
+
+        HomeChooseModuleRspOuterClass.HomeChooseModuleRsp proto = HomeChooseModuleRspOuterClass.HomeChooseModuleRsp.newBuilder()
+                .setRetcode(0)
+                .setModuleId(moduleId)
+                .build();
+
+        this.setData(proto);
+    }
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketHomeComfortInfoNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeComfortInfoNotify.java
new file mode 100644
index 000000000..47e46dfdb
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketHomeComfortInfoNotify.java
@@ -0,0 +1,40 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.HomeComfortInfoNotifyOuterClass;
+import emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PacketHomeComfortInfoNotify extends BasePacket {
+
+    public PacketHomeComfortInfoNotify(Player player) {
+        super(PacketOpcodes.HomeComfortInfoNotify);
+
+        if (player.getRealmList() == null) {
+            // Do not send
+            return;
+        }
+
+        List<HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo> comfortInfoList = new ArrayList<>();
+
+        for (int moduleId : player.getRealmList()) {
+            comfortInfoList.add(
+                    HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo.newBuilder()
+                        .setModuleId(moduleId)
+                        .build()
+            );
+        }
+
+        HomeComfortInfoNotifyOuterClass.HomeComfortInfoNotify proto = HomeComfortInfoNotifyOuterClass.HomeComfortInfoNotify
+                .newBuilder()
+                .addAllModuleInfoList(comfortInfoList)
+                .build();
+
+
+        this.setData(proto);
+    }
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerHomeCompInfoNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerHomeCompInfoNotify.java
new file mode 100644
index 000000000..29a6964b5
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerHomeCompInfoNotify.java
@@ -0,0 +1,32 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.PlayerHomeCompInfoNotifyOuterClass;
+import emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass;
+
+import java.util.List;
+
+public class PacketPlayerHomeCompInfoNotify extends BasePacket {
+
+    public PacketPlayerHomeCompInfoNotify(Player player) {
+        super(PacketOpcodes.PlayerHomeCompInfoNotify);
+
+        if (player.getRealmList() == null) {
+            // Do not send
+            return;
+        }
+
+        PlayerHomeCompInfoNotifyOuterClass.PlayerHomeCompInfoNotify proto = PlayerHomeCompInfoNotifyOuterClass.PlayerHomeCompInfoNotify.newBuilder()
+                .setCompInfo(
+                        PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.newBuilder()
+                                .addAllUnlockedModuleIdList(player.getRealmList())
+                                .addAllLevelupRewardGotLevelList(List.of(1)) // Hardcoded
+                                .build()
+                )
+                .build();
+
+        this.setData(proto);
+    }
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTryEnterHomeRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTryEnterHomeRsp.java
new file mode 100644
index 000000000..369c44140
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTryEnterHomeRsp.java
@@ -0,0 +1,30 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.RetcodeOuterClass;
+import emu.grasscutter.net.proto.TryEnterHomeRspOuterClass;
+
+public class PacketTryEnterHomeRsp extends BasePacket {
+
+    public PacketTryEnterHomeRsp() {
+        super(PacketOpcodes.TryEnterHomeRsp);
+
+        TryEnterHomeRspOuterClass.TryEnterHomeRsp proto = TryEnterHomeRspOuterClass.TryEnterHomeRsp.newBuilder()
+                .setRetcode(RetcodeOuterClass.Retcode.RET_SVR_ERROR_VALUE)
+                .build();
+
+        this.setData(proto);
+    }
+
+    public PacketTryEnterHomeRsp(int uid) {
+        super(PacketOpcodes.TryEnterHomeRsp);
+
+        TryEnterHomeRspOuterClass.TryEnterHomeRsp proto = TryEnterHomeRspOuterClass.TryEnterHomeRsp.newBuilder()
+                .setRetcode(0)
+                .setTargetUid(uid)
+                .build();
+
+        this.setData(proto);
+    }
+}

From ab6aa96144d858a88c8ea35fc13b41c031b024d0 Mon Sep 17 00:00:00 2001
From: Yazawazi <47273265+Yazawazi@users.noreply.github.com>
Date: Sat, 14 May 2022 04:50:31 +0800
Subject: [PATCH 49/59] fix(serenitea pot): teleport & read born pos from lua

---
 .../emu/grasscutter/game/world/World.java     |  5 ++
 .../packet/recv/HandlerTryEnterHomeReq.java   | 48 +++++--------------
 2 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/world/World.java b/src/main/java/emu/grasscutter/game/world/World.java
index 95356a15a..22048077d 100644
--- a/src/main/java/emu/grasscutter/game/world/World.java
+++ b/src/main/java/emu/grasscutter/game/world/World.java
@@ -268,6 +268,11 @@ public class World implements Iterable<Player> {
 		} else if (oldScene == newScene) {
 			enterType = EnterType.ENTER_GOTO;
 		}
+
+		// Home
+		if (2001 <= newScene.getId() && newScene.getId() <= 2004) {
+			enterType = EnterType.ENTER_SELF_HOME;
+		}
 		
 		// Teleport packet
 		player.sendPacket(new PacketPlayerEnterSceneNotify(player, enterType, enterReason, sceneId, pos));
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java
index 3e78bcb3a..5df106df2 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java
@@ -1,10 +1,12 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketHandler;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.TryEnterHomeReqOuterClass;
+import emu.grasscutter.scripts.data.SceneConfig;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketTryEnterHomeRsp;
 import emu.grasscutter.utils.Position;
@@ -23,44 +25,16 @@ public class HandlerTryEnterHomeReq extends PacketHandler {
             return;
         }
 
-        // Hardcoded for now
-        switch (session.getPlayer().getCurrentRealmId()) {
-            case 1:
-                session.getPlayer().getWorld().transferPlayerToScene(
-                        session.getPlayer(),
-                        2001,
-                        new Position(839, 319, 137)
-                );
-                break;
+        int realmId = 2000 + session.getPlayer().getCurrentRealmId();
 
-            case 2:
-                session.getPlayer().getWorld().transferPlayerToScene(
-                        session.getPlayer(),
-                        2002,
-                        new Position(605, 444, 554)
-                );
-                break;
+        Scene scene = session.getPlayer().getWorld().getSceneById(realmId);
+        Position pos = scene.getScriptManager().getConfig().born_pos;
 
-            case 3:
-                session.getPlayer().getWorld().transferPlayerToScene(
-                        session.getPlayer(),
-                        2003,
-                        new Position(511, 229, 605)
-                );
-                break;
-
-            case 4:
-                session.getPlayer().getWorld().transferPlayerToScene(
-                        session.getPlayer(),
-                        2004,
-                        new Position(239, 187, 536)
-                );
-                break;
-
-            default:
-                session.send(new PacketTryEnterHomeRsp());
-                return;
-        }
+        session.getPlayer().getWorld().transferPlayerToScene(
+                session.getPlayer(),
+                realmId,
+                pos
+        );
 
 
         session.send(new PacketTryEnterHomeRsp(req.getTargetUid()));

From 749ef3ff234e05a432357f956fc9f3fcf9b33e60 Mon Sep 17 00:00:00 2001
From: ShigemoriHakura <62388797+ShigemoriHakura@users.noreply.github.com>
Date: Sat, 14 May 2022 07:33:07 +0800
Subject: [PATCH 50/59] Add support for codexQuests (#870)

---
 .../java/emu/grasscutter/data/GameData.java   |  7 ++-
 .../emu/grasscutter/data/def/CodexQuest.java  | 42 +++++++++++++++
 .../emu/grasscutter/game/player/Player.java   |  1 +
 .../grasscutter/game/quest/GameMainQuest.java |  2 +
 .../emu/grasscutter/game/quest/GameQuest.java |  1 +
 .../grasscutter/game/quest/QuestManager.java  |  6 +++
 .../send/PacketCodexDataFullNotify.java       | 54 +++++++++++++++++++
 .../send/PacketCodexDataUpdateNotify.java     | 27 ++++++++++
 8 files changed, 139 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/emu/grasscutter/data/def/CodexQuest.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketCodexDataFullNotify.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketCodexDataUpdateNotify.java

diff --git a/src/main/java/emu/grasscutter/data/GameData.java b/src/main/java/emu/grasscutter/data/GameData.java
index 75b840202..ed5c469bb 100644
--- a/src/main/java/emu/grasscutter/data/GameData.java
+++ b/src/main/java/emu/grasscutter/data/GameData.java
@@ -9,7 +9,6 @@ import java.util.Map;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.utils.Utils;
 import emu.grasscutter.data.custom.AbilityEmbryoEntry;
-import emu.grasscutter.data.custom.AbilityModifier;
 import emu.grasscutter.data.custom.AbilityModifierEntry;
 import emu.grasscutter.data.custom.OpenConfigEntry;
 import emu.grasscutter.data.custom.MainQuestData;
@@ -65,6 +64,8 @@ public class GameData {
 	
 	private static final Int2ObjectMap<SceneData> sceneDataMap = new Int2ObjectLinkedOpenHashMap<>();
 	private static final Int2ObjectMap<FetterData> fetterDataMap = new Int2ObjectOpenHashMap<>();
+	private static final Int2ObjectMap<CodexQuest> codexQuestMap = new Int2ObjectOpenHashMap<>();
+	private static final Int2ObjectMap<CodexQuest> codexQuestIdMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<FetterCharacterCardData> fetterCharacterCardDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<RewardData> rewardDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<WorldLevelData> worldLevelDataMap = new Int2ObjectOpenHashMap<>();
@@ -293,6 +294,10 @@ public class GameData {
 		return fetters;
 	}
 
+	public static Int2ObjectMap<CodexQuest> getCodexQuestMap(){return codexQuestMap;}
+
+	public static Int2ObjectMap<CodexQuest> getCodexQuestIdMap(){return codexQuestIdMap;}
+
 	public static Int2ObjectMap<WorldLevelData> getWorldLevelDataMap() {
 		return worldLevelDataMap;
 	}
diff --git a/src/main/java/emu/grasscutter/data/def/CodexQuest.java b/src/main/java/emu/grasscutter/data/def/CodexQuest.java
new file mode 100644
index 000000000..578837e04
--- /dev/null
+++ b/src/main/java/emu/grasscutter/data/def/CodexQuest.java
@@ -0,0 +1,42 @@
+package emu.grasscutter.data.def;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+
+@ResourceType(name = {"QuestCodexExcelConfigData.json"}, loadPriority = ResourceType.LoadPriority.HIGH)
+public class CodexQuest extends GameResource {
+    private int Id;
+    private int ParentQuestId;
+    private int ChapterId;
+    private int SortOrder;
+    private boolean IsDisuse;
+
+    public int getParentQuestId() {
+        return ParentQuestId;
+    }
+
+    public int getId() {
+        return Id;
+    }
+
+    public int getChapterId() {
+        return ChapterId;
+    }
+
+    public int getSortOrder() {
+        return SortOrder;
+    }
+
+    public boolean getIsDisuse() {
+        return IsDisuse;
+    }
+
+    @Override
+    public void onLoad() {
+        if(!this.getIsDisuse()) {
+            GameData.getCodexQuestIdMap().put(this.getParentQuestId(), this);
+        }
+    }
+}
diff --git a/src/main/java/emu/grasscutter/game/player/Player.java b/src/main/java/emu/grasscutter/game/player/Player.java
index 9c9f1ea56..f86e09370 100644
--- a/src/main/java/emu/grasscutter/game/player/Player.java
+++ b/src/main/java/emu/grasscutter/game/player/Player.java
@@ -1212,6 +1212,7 @@ public class Player {
 		session.send(new PacketAvatarDataNotify(this));
 		session.send(new PacketFinishedParentQuestNotify(this));
 		session.send(new PacketQuestListNotify(this));
+		session.send(new PacketCodexDataFullNotify(this));
 		session.send(new PacketServerCondMeetQuestListUpdateNotify(this));
 		session.send(new PacketAllWidgetDataNotify(this));
 		session.send(new PacketWidgetGadgetAllDataNotify());
diff --git a/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java b/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
index 613819d0b..c298913cc 100644
--- a/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
+++ b/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
@@ -3,6 +3,7 @@ package emu.grasscutter.game.quest;
 import java.util.HashMap;
 import java.util.Map;
 
+import emu.grasscutter.server.packet.send.PacketCodexDataUpdateNotify;
 import org.bson.types.ObjectId;
 
 import dev.morphia.annotations.Entity;
@@ -91,6 +92,7 @@ public class GameMainQuest {
 		this.isFinished = true;
 		this.state = ParentQuestState.PARENT_QUEST_STATE_FINISHED;
 		this.getOwner().getSession().send(new PacketFinishedParentQuestUpdateNotify(this));
+		this.getOwner().getSession().send(new PacketCodexDataUpdateNotify(this));
 		this.save();
 	}
 
diff --git a/src/main/java/emu/grasscutter/game/quest/GameQuest.java b/src/main/java/emu/grasscutter/game/quest/GameQuest.java
index 5e1126fcb..3caf950ba 100644
--- a/src/main/java/emu/grasscutter/game/quest/GameQuest.java
+++ b/src/main/java/emu/grasscutter/game/quest/GameQuest.java
@@ -11,6 +11,7 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.enums.LogicType;
 import emu.grasscutter.game.quest.enums.QuestState;
 import emu.grasscutter.net.proto.QuestOuterClass.Quest;
+import emu.grasscutter.server.packet.send.PacketCodexDataUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketQuestListUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketQuestProgressUpdateNotify;
 import emu.grasscutter.utils.Utils;
diff --git a/src/main/java/emu/grasscutter/game/quest/QuestManager.java b/src/main/java/emu/grasscutter/game/quest/QuestManager.java
index 745ce9ef8..0d81834f0 100644
--- a/src/main/java/emu/grasscutter/game/quest/QuestManager.java
+++ b/src/main/java/emu/grasscutter/game/quest/QuestManager.java
@@ -66,6 +66,12 @@ public class QuestManager {
 			}
 		}
 	}
+
+	public void forEachMainQuest(Consumer<GameMainQuest> callback) {
+		for (GameMainQuest mainQuest : getQuests().values()) {
+			callback.accept(mainQuest);
+		}
+	}
 	
 	// TODO
 	public void forEachActiveQuest(Consumer<GameQuest> callback) {
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCodexDataFullNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCodexDataFullNotify.java
new file mode 100644
index 000000000..760c3b3d2
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCodexDataFullNotify.java
@@ -0,0 +1,54 @@
+package emu.grasscutter.server.packet.send;
+
+import java.util.Collections;
+import java.util.List;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.CodexDataFullNotifyOuterClass.CodexDataFullNotify;
+import emu.grasscutter.net.proto.CodexTypeDataOuterClass.CodexTypeData;
+import emu.grasscutter.net.proto.CodexTypeOuterClass;
+import emu.grasscutter.server.game.GameSession;
+
+public class PacketCodexDataFullNotify extends BasePacket {
+    public PacketCodexDataFullNotify(Player player) {
+        super(PacketOpcodes.CodexDataFullNotify, true);
+
+        //Quests
+        CodexTypeData.Builder questTypeData = CodexTypeData.newBuilder()
+                .setTypeValue(1);
+
+        //Tips
+        CodexTypeData.Builder pushTipsTypeData = CodexTypeData.newBuilder()
+                .setTypeValue(6);
+
+        //Views
+        CodexTypeData.Builder viewTypeData = CodexTypeData.newBuilder()
+                .setTypeValue(7);
+
+        //Weapons
+        CodexTypeData.Builder weaponTypeData = CodexTypeData.newBuilder()
+                .setTypeValue(2);
+
+
+        player.getQuestManager().forEachMainQuest(mainQuest -> {
+            if(mainQuest.isFinished()){
+                var codexQuest = GameData.getCodexQuestIdMap().get(mainQuest.getParentQuestId());
+                if(codexQuest != null){
+                    questTypeData.addCodexIdList(codexQuest.getId()).addAllHaveViewedList(Collections.singleton(true));
+                }
+            }
+        });
+
+        CodexDataFullNotify.Builder proto = CodexDataFullNotify.newBuilder()
+                .addTypeDataList(questTypeData.build())
+                .addTypeDataList(pushTipsTypeData.build())
+                .addTypeDataList(viewTypeData.build())
+                .addTypeDataList(weaponTypeData);
+
+        this.setData(proto);
+    }
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketCodexDataUpdateNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketCodexDataUpdateNotify.java
new file mode 100644
index 000000000..c7318bd91
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketCodexDataUpdateNotify.java
@@ -0,0 +1,27 @@
+package emu.grasscutter.server.packet.send;
+
+import java.util.Collections;
+import java.util.List;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.GameMainQuest;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify;
+import emu.grasscutter.server.game.GameSession;
+
+public class PacketCodexDataUpdateNotify extends BasePacket {
+    public PacketCodexDataUpdateNotify(GameMainQuest quest) {
+        super(PacketOpcodes.CodexDataUpdateNotify, true);
+        var codexQuest = GameData.getCodexQuestIdMap().get(quest.getParentQuestId());
+        if(codexQuest != null){
+            CodexDataUpdateNotify proto = CodexDataUpdateNotify.newBuilder()
+                    .setTypeValue(1)
+                    .setId(codexQuest.getId())
+                    .build();
+            this.setData(proto);
+        }
+    }
+}

From 82698d56238e84fd5cb5f45ee3181ba639b820b7 Mon Sep 17 00:00:00 2001
From: tester233 <105267106+tester233@users.noreply.github.com>
Date: Fri, 13 May 2022 23:36:30 +0800
Subject: [PATCH 51/59] Improve text

---
 src/main/resources/languages/zh-CN.json | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json
index 4ece73fd9..aaeac5a86 100644
--- a/src/main/resources/languages/zh-CN.json
+++ b/src/main/resources/languages/zh-CN.json
@@ -17,7 +17,7 @@
         "default_password": "[Dispatch] 成功加载 keystore 默认密码。请考虑将 config.json 的默认密码设置为 123456"
       },
       "authentication": {
-        "default_unable_to_verify": "[Authentication] 称为 verifyUser 的 method 在默认验证程序中不可用"
+        "default_unable_to_verify": "[Authentication] 称为 verifyUser 的方法在默认验证程序中不可用"
       },
       "no_commands_error": "此命令不适用于 Dispatch-only 模式",
       "unhandled_request_error": "[Dispatch] 潜在的未处理请求：%s %s",
@@ -215,6 +215,14 @@
       "success": "坐标：%s, %s, %s\n场景ID：%s",
       "description": "获取所在位置"
     },
+    "quest": {
+      "description": "添加或完成任务",
+      "usage": "quest <add|finish> [任务ID]",
+      "added": "已添加任务 %s",
+      "finished": "已完成任务 %s",
+      "not_found": "未找到任务",
+      "invalid_id": "无效的任务ID"
+    },
     "reload": {
       "reload_start": "正在重载配置文件和数据。",
       "reload_done": "重载完成。",
@@ -356,9 +364,9 @@
   "gacha": {
     "details": {
       "title": "祈愿详情",
-      "available_five_stars": "出现的五星物品",
-      "available_four_stars": "出现的四星物品",
-      "available_three_stars": "出现的三星物品",
+      "available_five_stars": "可获得的5星物品",
+      "available_four_stars": "可获得的4星物品",
+      "available_three_stars": "可获得的3星物品",
       "template_missing": "缺失文件：data/gacha_details.html"
     }
   }

From 248b655f07c96d322fdb865acffa3ddf82da000d Mon Sep 17 00:00:00 2001
From: Melledy <52122272+Melledy@users.noreply.github.com>
Date: Fri, 13 May 2022 16:35:03 -0700
Subject: [PATCH 52/59] Use scene types instead of hardcoding scene ids for
 checking enter reason

---
 src/main/java/emu/grasscutter/game/world/World.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/world/World.java b/src/main/java/emu/grasscutter/game/world/World.java
index 22048077d..ccbe4b841 100644
--- a/src/main/java/emu/grasscutter/game/world/World.java
+++ b/src/main/java/emu/grasscutter/game/world/World.java
@@ -10,6 +10,7 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.player.Player.SceneLoadState;
 import emu.grasscutter.game.props.EnterReason;
 import emu.grasscutter.game.props.EntityIdType;
+import emu.grasscutter.game.props.SceneType;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.def.DungeonData;
 import emu.grasscutter.data.def.SceneData;
@@ -267,11 +268,9 @@ public class World implements Iterable<Player> {
 			enterReason = EnterReason.DungeonEnter;
 		} else if (oldScene == newScene) {
 			enterType = EnterType.ENTER_GOTO;
-		}
-
-		// Home
-		if (2001 <= newScene.getId() && newScene.getId() <= 2004) {
-			enterType = EnterType.ENTER_SELF_HOME;
+		} else if (newScene.getSceneType() == SceneType.SCENE_HOME_WORLD) {
+			// Home
+			enterType = EnterType.ENTER_SELF_HOME; 
 		}
 		
 		// Teleport packet

From 20e3b8ffda1e695ba479da243e1892ea359d1bf3 Mon Sep 17 00:00:00 2001
From: ShiroSaki <62388797+ShigemoriHakura@users.noreply.github.com>
Date: Sat, 14 May 2022 04:31:27 +0800
Subject: [PATCH 53/59] add support for announcement page

---
 .gitignore                                    |  1 +
 data/GameAnnouncementList.json                | 10 ++-
 .../server/dispatch/DispatchServer.java       |  6 ++
 .../http/AnnouncementIndexHandler.java        | 61 +++++++++++++++++++
 4 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/emu/grasscutter/server/dispatch/http/AnnouncementIndexHandler.java

diff --git a/.gitignore b/.gitignore
index 6fd78ed3b..9a298a89a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,3 +73,4 @@ BuildConfig.java
 
 # macOS
 .DS_Store
+data/hk4e/announcement/
diff --git a/data/GameAnnouncementList.json b/data/GameAnnouncementList.json
index f6566960a..7464b3b0f 100644
--- a/data/GameAnnouncementList.json
+++ b/data/GameAnnouncementList.json
@@ -57,5 +57,13 @@
       "mi18n_name": "Activity"
     }
   ],
-  "timezone": -5
+  "timezone": -5,
+  "alert": false,
+  "alert_id": 0,
+  "pic_list": [],
+  "pic_total": 0,
+  "pic_type_list": [],
+  "pic_alert": false,
+  "pic_alert_id": 0,
+  "static_sign": ""
 }
\ No newline at end of file
diff --git a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
index 7e439a1a4..7153542a4 100644
--- a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
+++ b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
@@ -16,6 +16,7 @@ import emu.grasscutter.net.proto.RegionInfoOuterClass.RegionInfo;
 import emu.grasscutter.net.proto.RegionSimpleInfoOuterClass.RegionSimpleInfo;
 import emu.grasscutter.server.dispatch.authentication.AuthenticationHandler;
 import emu.grasscutter.server.dispatch.authentication.DefaultAuthenticationHandler;
+import emu.grasscutter.server.dispatch.http.AnnouncementIndexHandler;
 import emu.grasscutter.server.dispatch.http.GachaDetailsHandler;
 import emu.grasscutter.server.dispatch.http.GachaRecordHandler;
 import emu.grasscutter.server.dispatch.json.*;
@@ -443,6 +444,11 @@ public final class DispatchServer {
 		// gacha details
 		httpServer.get("/gacha/details", new GachaDetailsHandler());
 
+		// announcement index
+		httpServer.get("/hk4e/announcement/*", new AnnouncementIndexHandler());
+		httpServer.get("/sw.js", new AnnouncementIndexHandler());
+		httpServer.get("/dora/lib/vue/2.6.11/vue.min.js", new AnnouncementIndexHandler());
+
 		// static file support for plugins
 		httpServer.raw().config.precompressStaticFiles = false; // If this isn't set to false, files such as images may appear corrupted when serving static files
 
diff --git a/src/main/java/emu/grasscutter/server/dispatch/http/AnnouncementIndexHandler.java b/src/main/java/emu/grasscutter/server/dispatch/http/AnnouncementIndexHandler.java
new file mode 100644
index 000000000..7e55eac7e
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/dispatch/http/AnnouncementIndexHandler.java
@@ -0,0 +1,61 @@
+package emu.grasscutter.server.dispatch.http;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.database.DatabaseHelper;
+import emu.grasscutter.game.Account;
+import emu.grasscutter.utils.FileUtils;
+import emu.grasscutter.utils.Utils;
+import express.http.HttpContextHandler;
+import express.http.Request;
+import express.http.Response;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Objects;
+
+import static emu.grasscutter.Configuration.DATA;
+
+public class AnnouncementIndexHandler implements HttpContextHandler {
+    private final String render_template;
+    private final String render_swjs;
+    private final String render_vueminjs;
+
+    public AnnouncementIndexHandler() {
+        File template = new File(Utils.toFilePath(DATA("/hk4e/announcement/index.html")));
+        File swjs = new File(Utils.toFilePath(DATA("/hk4e/announcement/sw.js")));
+        File vueminjs = new File(Utils.toFilePath(DATA("/hk4e/announcement/vue.min.js")));
+        this.render_template = template.exists() ? new String(FileUtils.read(template)) : null;
+        this.render_swjs = swjs.exists() ? new String(FileUtils.read(swjs)) : null;
+        this.render_vueminjs = vueminjs.exists() ? new String(FileUtils.read(vueminjs)) : null;
+    }
+
+    @Override
+    public void handle(Request req, Response res) throws IOException {
+        if (Objects.equals(req.path(), "/sw.js")) {
+            res.send(render_swjs);
+        }else if(Objects.equals(req.path(), "/hk4e/announcement/index.html")) {
+            res.send(render_template);
+        }else if(Objects.equals(req.path(), "/dora/lib/vue/2.6.11/vue.min.js")){
+            res.send(render_vueminjs);
+        }else{
+            File renderFile = new File(Utils.toFilePath(DATA(req.path())));
+            if(renderFile.exists()){
+                String ext = req.path().substring(req.path().lastIndexOf(".") + 1);
+                switch(ext){
+                    case "css":
+                        res.type("text/css");
+                        res.send(FileUtils.read(renderFile));
+                        break;
+                    case "js":
+                    default:
+                        res.send(FileUtils.read(renderFile));
+                        break;
+                }
+            }else{
+                Grasscutter.getLogger().info( "File not exist: " + req.path());
+            }
+        }
+
+
+    }
+}

From 922359d6e6ba7e87ce7e62a24cb07a678c234712 Mon Sep 17 00:00:00 2001
From: muhammadeko <muhammadekoprasetyo29@gmail.com>
Date: Sat, 14 May 2022 07:50:36 +0700
Subject: [PATCH 54/59] add negative permission check

---
 src/main/java/emu/grasscutter/game/Account.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/emu/grasscutter/game/Account.java b/src/main/java/emu/grasscutter/game/Account.java
index 6c3daf61a..39fb8969e 100644
--- a/src/main/java/emu/grasscutter/game/Account.java
+++ b/src/main/java/emu/grasscutter/game/Account.java
@@ -144,12 +144,20 @@ public class Account {
 	}
 
 	public boolean hasPermission(String permission) {
-		if (this.permissions.contains(permission) || this.permissions.contains("*")) {
+		if (this.permissions.contains(permission)) {
 			return true;
 		}
+		if(this.permissions.contains("*") && this.permissions.contains("-"+permission)) {
+			return false;
+		}
+
 		String[] permissionParts = permission.split("\\.");
 		for (String p : this.permissions) {
+			if (p.startsWith("-") && permissionMatchesWildcard(p.substring(1), permissionParts)) {
+				return false;
+			}
 			if (permissionMatchesWildcard(p, permissionParts)) {
+				Grasscutter.getLogger().info("Permission " + p + " matches " + permission);
 				return true;
 			}
 		}

From 855a098aa7210ab78bd6d78d7d8855ccd09ee461 Mon Sep 17 00:00:00 2001
From: muhammadeko <muhammadekoprasetyo29@gmail.com>
Date: Sat, 14 May 2022 11:32:33 +0700
Subject: [PATCH 55/59] fix logic and some cleaning

---
 .../java/emu/grasscutter/game/Account.java    | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/Account.java b/src/main/java/emu/grasscutter/game/Account.java
index 39fb8969e..518bd4786 100644
--- a/src/main/java/emu/grasscutter/game/Account.java
+++ b/src/main/java/emu/grasscutter/game/Account.java
@@ -144,24 +144,22 @@ public class Account {
 	}
 
 	public boolean hasPermission(String permission) {
-		if (this.permissions.contains(permission)) {
-			return true;
-		}
-		if(this.permissions.contains("*") && this.permissions.contains("-"+permission)) {
-			return false;
-		}
+
+		if (this.permissions.contains(permission)) return true;
+		if(this.permissions.contains("*") && this.permissions.size() == 1) return true;
 
 		String[] permissionParts = permission.split("\\.");
 		for (String p : this.permissions) {
+
 			if (p.startsWith("-") && permissionMatchesWildcard(p.substring(1), permissionParts)) {
+				Grasscutter.getLogger().info("Permission " + permission + " denied to " + this.username);
 				return false;
 			}
-			if (permissionMatchesWildcard(p, permissionParts)) {
-				Grasscutter.getLogger().info("Permission " + p + " matches " + permission);
-				return true;
-			}
+
+			if (permissionMatchesWildcard(p, permissionParts)) return true;
 		}
-		return false;
+
+		return this.permissions.contains("*");
 	}
 	
 	public boolean removePermission(String permission) {

From 4f553f6694f53dba4c0b5bba6ffa6caee72a2b9f Mon Sep 17 00:00:00 2001
From: muhammadeko <muhammadekoprasetyo29@gmail.com>
Date: Sat, 14 May 2022 11:34:09 +0700
Subject: [PATCH 56/59] remove log

---
 src/main/java/emu/grasscutter/game/Account.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/Account.java b/src/main/java/emu/grasscutter/game/Account.java
index 518bd4786..84873ec61 100644
--- a/src/main/java/emu/grasscutter/game/Account.java
+++ b/src/main/java/emu/grasscutter/game/Account.java
@@ -150,12 +150,7 @@ public class Account {
 
 		String[] permissionParts = permission.split("\\.");
 		for (String p : this.permissions) {
-
-			if (p.startsWith("-") && permissionMatchesWildcard(p.substring(1), permissionParts)) {
-				Grasscutter.getLogger().info("Permission " + permission + " denied to " + this.username);
-				return false;
-			}
-
+			if (p.startsWith("-") && permissionMatchesWildcard(p.substring(1), permissionParts)) return false;
 			if (permissionMatchesWildcard(p, permissionParts)) return true;
 		}
 

From 3c654cf0302b4b43b0315ae39607fccf5bcf5951 Mon Sep 17 00:00:00 2001
From: luluxiaoyu <58876608+luluxiaoyu@users.noreply.github.com>
Date: Sat, 14 May 2022 09:30:40 +0800
Subject: [PATCH 57/59] Update zh-TW.json

---
 src/main/resources/languages/zh-TW.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/resources/languages/zh-TW.json b/src/main/resources/languages/zh-TW.json
index 2b6fe34ff..caf37d0d7 100644
--- a/src/main/resources/languages/zh-TW.json
+++ b/src/main/resources/languages/zh-TW.json
@@ -215,6 +215,14 @@
       "success": "座標：%s, %s, %s\n場景ID：%s",
       "description": "獲取目前所在位置的座標。"
     },
+    "quest": {
+      "description": "添加或完成任務",
+      "usage": "quest <add|finish> [任務ID]",
+      "added": "已添加任務 %s",
+      "finished": "已完成任務 %s",
+      "not_found": "未找到任務",
+      "invalid_id": "無效的任務ID"
+    },
     "reload": {
       "reload_start": "正在重新加載設定檔。",
       "reload_done": "重新加載已完成。",

From 470007a6c0bc9b117985d4de973b7193d0ff737f Mon Sep 17 00:00:00 2001
From: zrll_ <46812903+zrll12@users.noreply.github.com>
Date: Sat, 14 May 2022 15:12:57 +0800
Subject: [PATCH 58/59] Fix connot execute quest command in console

---
 .../java/emu/grasscutter/command/commands/QuestCommand.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/emu/grasscutter/command/commands/QuestCommand.java b/src/main/java/emu/grasscutter/command/commands/QuestCommand.java
index 70fae0120..affbfa769 100644
--- a/src/main/java/emu/grasscutter/command/commands/QuestCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/QuestCommand.java
@@ -37,7 +37,7 @@ public final class QuestCommand implements CommandHandler {
 		
 		switch (cmd) {
 			case "add" -> {
-				GameQuest quest = sender.getQuestManager().addQuest(questId);
+				GameQuest quest = targetPlayer.getQuestManager().addQuest(questId);
 				
 				if (quest != null) {
 					CommandHandler.sendMessage(sender, translate(sender, "commands.quest.added", questId));
@@ -47,7 +47,7 @@ public final class QuestCommand implements CommandHandler {
 				CommandHandler.sendMessage(sender, translate(sender, "commands.quest.not_found"));
 			}
 			case "finish" -> {
-				GameQuest quest = sender.getQuestManager().getQuestById(questId);
+				GameQuest quest = targetPlayer.getQuestManager().getQuestById(questId);
 				
 				if (quest == null) {
 					CommandHandler.sendMessage(sender, translate(sender, "commands.quest.not_found"));

From 741e5749ad4b242efce1ad42dea903136f7ccd4f Mon Sep 17 00:00:00 2001
From: lsCoding666 <73888354+lsCoding666@users.noreply.github.com>
Date: Sat, 14 May 2022 21:28:02 +0800
Subject: [PATCH 59/59] new command join and remove to force join or remove
 avatars into your current team (#549)

* feat:new command "join" and "remove" to force join or remove avatar in your current team

* fix:change MaxAvatarsInTeam from 9 to 4

* feat:update & merge branch.Translate fix
---
 .../command/commands/JoinCommand.java         | 46 +++++++++++++++++++
 .../command/commands/RemoveCommand.java       | 43 +++++++++++++++++
 src/main/resources/languages/en-US.json       |  9 ++++
 src/main/resources/languages/zh-CN.json       |  9 ++++
 src/main/resources/languages/zh-TW.json       |  5 ++
 5 files changed, 112 insertions(+)
 create mode 100644 src/main/java/emu/grasscutter/command/commands/JoinCommand.java
 create mode 100644 src/main/java/emu/grasscutter/command/commands/RemoveCommand.java

diff --git a/src/main/java/emu/grasscutter/command/commands/JoinCommand.java b/src/main/java/emu/grasscutter/command/commands/JoinCommand.java
new file mode 100644
index 000000000..4dac15dd7
--- /dev/null
+++ b/src/main/java/emu/grasscutter/command/commands/JoinCommand.java
@@ -0,0 +1,46 @@
+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.server.packet.send.PacketChangeMpTeamAvatarRsp;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static emu.grasscutter.utils.Language.translate;
+
+@Command(label = "join", usage = "join [AvatarIDs] such as\"join 10000038 10000039\"",
+        description = "commands.join.description", permission = "player.join")
+public class JoinCommand implements CommandHandler {
+
+    @Override
+    public void execute(Player sender, Player targetPlayer, List<String> args) {
+        List<Integer> avatarIds = new ArrayList<>();
+        for (String arg : args) {
+            try {
+                int avatarId = Integer.parseInt(arg);
+                avatarIds.add(avatarId);
+            } catch (Exception ignored) {
+                ignored.printStackTrace();
+                CommandHandler.sendMessage(sender, translate("commands.generic.invalid.avatarId"));
+                return;
+            }
+        }
+
+
+        for (int i = 0; i < args.size(); i++) {
+            Avatar avatar = sender.getAvatars().getAvatarById(avatarIds.get(i));
+            if (avatar == null || sender.getTeamManager().getCurrentTeamInfo().contains(avatar)) {
+                CommandHandler.sendMessage(sender, translate("commands.generic.invalid.avatarId"));
+                return;
+            }
+            sender.getTeamManager().getCurrentTeamInfo().addAvatar(avatar);
+        }
+
+        // Packet
+        sender.getTeamManager().updateTeamEntities(new PacketChangeMpTeamAvatarRsp(sender, sender.getTeamManager().getCurrentTeamInfo()));
+    }
+}
diff --git a/src/main/java/emu/grasscutter/command/commands/RemoveCommand.java b/src/main/java/emu/grasscutter/command/commands/RemoveCommand.java
new file mode 100644
index 000000000..a40b42698
--- /dev/null
+++ b/src/main/java/emu/grasscutter/command/commands/RemoveCommand.java
@@ -0,0 +1,43 @@
+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.server.packet.send.PacketChangeMpTeamAvatarRsp;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static emu.grasscutter.utils.Language.translate;
+
+@Command(label = "remove", usage = "remove [indexOfYourTeams] index start from 1",
+        description = "commands.remove.description", permission = "player.remove")
+public class RemoveCommand implements CommandHandler {
+
+    @Override
+    public void execute(Player sender, Player targetPlayer, List<String> args) {
+        List<Integer> avatarIds = new ArrayList<>();
+        for (String arg : args) {
+            try {
+                int avatarId = Integer.parseInt(arg);
+                avatarIds.add(avatarId);
+            } catch (Exception ignored) {
+                ignored.printStackTrace();
+                CommandHandler.sendMessage(sender, translate("commands.remove.invalid_index"));
+                return;
+            }
+        }
+
+        for (int i = 0; i < avatarIds.size(); i++) {
+            if (avatarIds.get(i) > sender.getTeamManager().getCurrentTeamInfo().getAvatars().size() || avatarIds.get(i) <= 0) {
+                CommandHandler.sendMessage(sender, translate("commands.remove.invalid_index"));
+                return;
+            }
+            sender.getTeamManager().getCurrentTeamInfo().removeAvatar(avatarIds.get(i) - 1);
+        }
+
+        // Packet
+        sender.getTeamManager().updateTeamEntities(new PacketChangeMpTeamAvatarRsp(sender, sender.getTeamManager().getCurrentTeamInfo()));
+    }
+}
diff --git a/src/main/resources/languages/en-US.json b/src/main/resources/languages/en-US.json
index 02945e6d4..32631db1f 100644
--- a/src/main/resources/languages/en-US.json
+++ b/src/main/resources/languages/en-US.json
@@ -176,6 +176,10 @@
       "success": "All characters have been healed.",
       "description": "Heal all characters in your current team."
     },
+    "join": {
+      "usage": "Usage: join [AvatarIDs] such as\"join 10000038 10000039\"",
+      "description": "force join avatar into your team"
+    },
     "kick": {
       "player_kick_player": "Player [%s:%s] has kicked player [%s:%s]",
       "server_kick_player": "Kicking player [%s:%s]",
@@ -228,6 +232,11 @@
       "reload_done": "Reload complete.",
       "description": "Reload server config"
     },
+    "remove": {
+      "usage": "Usage: remove [indexOfYourTeams] index start from 1",
+      "invalid_index": "index start from 1",
+      "description": "force remove avatar into your team"
+    },
     "resetConst": {
       "reset_all": "Reset all avatars' constellations.",
       "success": "Constellations for %s have been reset. Please relog to see changes.",
diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json
index aaeac5a86..5f379540b 100644
--- a/src/main/resources/languages/zh-CN.json
+++ b/src/main/resources/languages/zh-CN.json
@@ -176,6 +176,10 @@
       "success": "已治疗所有角色。",
       "description": "治疗当前队伍的角色"
     },
+    "join": {
+      "usage": "用法：join <角色IDs> 例如\"join 10000038 10000039\"空格分开",
+      "description": "强制将角色加入到当前队伍中"
+    },
     "kick": {
       "player_kick_player": "玩家 [%s:%s] 已将 [%s:%s] 踢出。",
       "server_kick_player": "正在踢出玩家 [%s:%s]...",
@@ -228,6 +232,11 @@
       "reload_done": "重载完成。",
       "description": "重载配置文件和数据"
     },
+    "remove": {
+      "usage": "用法: remove [indexOfYourTeams] 从1开始",
+      "invalid_index": "下标从1开始",
+      "description": "强制移除队内角色"
+    },
     "resetConst": {
       "reset_all": "重置所有角色的命座。",
       "success": "已重置 %s 的命座，重新登录后生效。",
diff --git a/src/main/resources/languages/zh-TW.json b/src/main/resources/languages/zh-TW.json
index caf37d0d7..25f92f869 100644
--- a/src/main/resources/languages/zh-TW.json
+++ b/src/main/resources/languages/zh-TW.json
@@ -228,6 +228,11 @@
       "reload_done": "重新加載已完成。",
       "description": "重新加載設定檔和數據。"
     },
+    "remove": {
+      "usage": "用法: remove [indexOfYourTeams] 从1开始",
+      "invalid_index": "下標從1開始",
+      "description": "强制移除對内角色"
+    },
     "resetConst": {
       "reset_all": "重設所有角色的命座。",
       "success": "已重設 %s 的命座，重新登入後將會生效。",