Merge branch 'development' into development

.gitignore

@@ -67,4 +67,4 @@ mongod.exe
 /*.sh
 language/
 languages/
-gacha_mappings.js
+gacha-mapping.js

build.gradle

@@ -28,7 +28,7 @@ plugins {
     // Eclipse Support
     id 'eclipse'
 
-    // Intelij Support
+    // IntelliJ Support
     id 'idea'
 
     // Maven

data/ExpeditionReward.json

@@ -0,0 +1,112 @@
+[
+	{
+		"expId": 301,
+		"expeditionRewardDataList": [
+			{
+				"hourTime": 4,
+				"expeditionRewardData": [
+					{
+						"itemId": 202,
+						"minCount": 625,
+						"maxCount": 625
+					}
+				]
+			},
+			{
+				"hourTime": 8,
+				"expeditionRewardData": [
+					{
+						"itemId": 202,
+						"minCount": 1575,
+						"maxCount": 1575
+					}
+				]
+			},
+			{
+				"hourTime": 12,
+				"expeditionRewardData": [
+					{
+						"itemId": 202,
+						"minCount": 2500,
+						"maxCount": 2500
+					}
+				]
+			},
+			{
+				"hourTime": 20,
+				"expeditionRewardData": [
+					{
+						"itemId": 202,
+						"minCount": 5000,
+						"maxCount": 5000
+					}
+				]
+			}
+		]
+	},
+	{
+		"expId": 305,
+		"expeditionRewardDataList": [
+			{
+				"hourTime": 4,
+				"rewardMora": 0,
+				"expeditionRewardData": [
+					{
+						"itemId": 100064,
+						"minCount": 1,
+						"maxCount": 1
+					}, {
+						"itemId": 101210,
+						"minCount": 1,
+						"maxCount": 1
+					}
+				]
+			},
+			{
+				"hourTime": 8,
+				"rewardMora": 0,
+				"expeditionRewardData": [
+					{
+						"itemId": 100064,
+						"minCount": 2,
+						"maxCount": 4
+					}, {
+						"itemId": 101210,
+						"minCount": 2,
+						"maxCount": 4
+					}
+				]
+			},
+			{
+				"hourTime": 12,
+				"rewardMora": 0,
+				"expeditionRewardData": [
+					{
+						"itemId": 100064,
+						"minCount": 4,
+						"maxCount": 6
+					}, {
+						"itemId": 101210,
+						"minCount": 4,
+						"maxCount": 6
+					}
+				]
+			},
+			{
+				"hourTime": 20,
+				"rewardMora": 0,
+				"expeditionRewardData": [
+					{
+						"itemId": 100064,
+						"minCount": 8,
+						"maxCount": 12
+					}, {
+						"itemId": 101210,
+						"minCount": 8,
+						"maxCount": 12
+					}
+				]
+			}
+		]
+	}
+]

proto/DungeonSettleNotify.proto

@@ -4,8 +4,13 @@ option java_package = "emu.grasscutter.net.proto";
 
 import "ParamList.proto";
 import "StrengthenPointData.proto";
+import "TowerLevelEndNotify.proto";
 
 message DungeonSettleNotify {
+	oneof Detail {
+		TowerLevelEndNotify tower_level_end_notify = 101;
+		// it has more!
+	}
 	uint32 dungeon_id = 1;
 	bool is_success = 2;
 	repeated uint32 fail_cond_list = 3;

proto/TowerFloorRecordChangeNotify.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "TowerFloorRecord.proto";
+
+message TowerFloorRecordChangeNotify {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 2418;
+	}
+
+	repeated TowerFloorRecord tower_floor_record_list = 1;
+	bool is_finished_entrance_floor = 2;
+}

proto/TowerLevelEndNotify.proto

@@ -0,0 +1,26 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+import "ItemParam.proto";
+
+message TowerLevelEndNotify {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 2456;
+	}
+
+	enum ContinueStateType {
+		CONTINUE_STATE_CAN_NOT_CONTINUE = 0;
+		CONTINUE_STATE_CAN_ENTER_NEXT_LEVEL = 1;
+		CONTINUE_STATE_CAN_ENTER_NEXT_FLOOR = 2;
+	}
+
+	bool is_success = 1;
+	repeated uint32 finished_star_cond_list = 2;
+	repeated ItemParam reward_item_list = 3;
+	uint32 continue_state = 4;
+	uint32 next_floor_id = 5;
+}

src/main/java/emu/grasscutter/Config.java

@@ -6,7 +6,6 @@
 import emu.grasscutter.game.mail.Mail;
 
 public final class Config {
-
 	public String DatabaseUrl = "mongodb://localhost:27017";
 	public String DatabaseCollection = "grasscutter";
 
@@ -41,6 +40,8 @@ public static class DispatchServerOptions {
 		public String KeystorePassword = "123456";
 		public Boolean UseSSL = true;
 		public Boolean FrontHTTPS = true;
+		public Boolean CORS = false;
+		public String[] CORSAllowedOrigins = new String[] { "*" };
 
 		public boolean AutomaticallyCreateAccounts = false;
 		public String[] defaultPermissions = new String[] { "" };
@@ -80,6 +81,10 @@ public static class GameServerOptions {
 		public boolean WatchGacha = false;
 		public String ServerNickname = "Server";
 		public int ServerAvatarId = 10000007;
+		public int ServerNameCardId = 210001;
+		public int ServerLevel = 1;
+		public int ServerWorldLevel = 1;
+		public String ServerSignature = "Server Signature";
 		public int[] WelcomeEmotes = {2007, 1002, 4010};
 		public String WelcomeMotd = "Welcome to Grasscutter emu";
 		public String WelcomeMailTitle = "Welcome to Grasscutter!";

src/main/java/emu/grasscutter/GameConstants.java

@@ -13,7 +13,11 @@ public final class GameConstants {
 	public static final int MAIN_CHARACTER_FEMALE = 10000007;
 	public static final String SERVER_AVATAR_NAME = Grasscutter.getConfig().getGameServerOptions().ServerNickname;
 	public static final int SERVER_AVATAR_ID = Grasscutter.getConfig().getGameServerOptions().ServerAvatarId;
+	public static final String SERVER_SIGNATURE = Grasscutter.getConfig().getGameServerOptions().ServerSignature;
 	public static final Position START_POSITION = new Position(2747, 194, -1719);
+	public static final int SERVER_NAMECARD_ID = Grasscutter.getConfig().getGameServerOptions().ServerNameCardId;
+	public static final int SERVER_LEVEL = Grasscutter.getConfig().getGameServerOptions().ServerLevel;
+	public static final int SERVER_WORLD_LEVEL = Grasscutter.getConfig().getGameServerOptions().ServerWorldLevel;
 
 	public static final int MAX_FRIENDS = 45;
 	public static final int MAX_FRIEND_REQUESTS = 50;