Update resources to 5.3

Include Achievement, Avatar, Cutscene, Dungeon, BannerTitle, Gadget, Item, Monster, Scene, Weapon...

Author: jie65535

Source/GrasscutterTools/Game/Data/GameResources.cs

@@ -128,19 +128,35 @@ public GameResources(string resourcesDirPath, TextMapData textMapData)
 
         private static object LoadDataFile(Type type, string path)
         {
-            var list = (IList)JsonConvert.DeserializeObject(File.ReadAllText(path), typeof(List<>).MakeGenericType(type));
-            if (list == null) return null;
-
-            if (!type.IsSubclassOf(typeof(GameResource))) return list;
-
-            var dicType = typeof(Dictionary<,>).MakeGenericType(typeof(int), type);
-            var dic = (IDictionary)Activator.CreateInstance(dicType);
-            foreach (GameResource gameResource in list)
+            IList list = null;
+            try
+            {
+                list = (IList)JsonConvert.DeserializeObject(File.ReadAllText(path), typeof(List<>).MakeGenericType(type));
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Failed to load \"{path}\", Exception={ex}");
+            }
+            if (type.IsSubclassOf(typeof(GameResource)))
+            {
+                var dicType = typeof(Dictionary<,>).MakeGenericType(typeof(int), type);
+                var dic = (IDictionary)Activator.CreateInstance(dicType);
+                if (list != null)
+                {
+                    foreach (GameResource gameResource in list)
+                    {
+                        if (gameResource.Id == 0) continue;
+                        dic.Add(gameResource.Id, gameResource);
+                    }
+                }
+                return dic;
+            }
+            else
             {
-                if (gameResource.Id == 0) continue;
-                dic.Add(gameResource.Id, gameResource);
+                if (list == null)
+                    list = (IList)Activator.CreateInstance(typeof(List<>).MakeGenericType(type));
+                return list;
             }
-            return dic;
         }
 
         private Dictionary<string, string> Languages = new Dictionary<string, string>

Source/GrasscutterTools/Game/Inventory/MaterialType.cs

@@ -11,63 +11,70 @@ namespace GrasscutterTools.Game.Inventory
     /// </summary>
     internal enum MaterialType
     {
-        MATERIAL_NONE = 0,
-        MATERIAL_FOOD = 1,
-        MATERIAL_QUEST = 2,
-        MATERIAL_EXCHANGE = 4,
-        MATERIAL_CONSUME = 5,
-        MATERIAL_EXP_FRUIT = 6,
-        MATERIAL_AVATAR = 7,
-        MATERIAL_ADSORBATE = 8,
-        MATERIAL_CRICKET = 9,
-        MATERIAL_ELEM_CRYSTAL = 10,
-        MATERIAL_WEAPON_EXP_STONE = 11,
-        MATERIAL_CHEST = 12,
-        MATERIAL_RELIQUARY_MATERIAL = 13,
-        MATERIAL_AVATAR_MATERIAL = 14,
-        MATERIAL_NOTICE_ADD_HP = 15,
-        MATERIAL_SEA_LAMP = 16,
-        MATERIAL_SELECTABLE_CHEST = 17,
-        MATERIAL_FLYCLOAK = 18,
-        MATERIAL_NAMECARD = 19,
-        MATERIAL_TALENT = 20,
-        MATERIAL_WIDGET = 21,
-        MATERIAL_CHEST_BATCH_USE = 22,
-        MATERIAL_FAKE_ABSORBATE = 23,
-        MATERIAL_CONSUME_BATCH_USE = 24,
-        MATERIAL_WOOD = 25,
-        MATERIAL_FURNITURE_FORMULA = 27,
-        MATERIAL_CHANNELLER_SLAB_BUFF = 28,
-        MATERIAL_FURNITURE_SUITE_FORMULA = 29,
-        MATERIAL_COSTUME = 30,
-        MATERIAL_HOME_SEED = 31,
-        MATERIAL_FISH_BAIT = 32,
-        MATERIAL_FISH_ROD = 33,
-        MATERIAL_SUMO_BUFF = 34, // sumo 活动道具，never appear
-        MATERIAL_FIREWORKS = 35,
-        MATERIAL_BGM = 36,
-        MATERIAL_SPICE_FOOD = 37,
-        MATERIAL_ACTIVITY_ROBOT = 38,
-        MATERIAL_ACTIVITY_GEAR = 39,
-        MATERIAL_ACTIVITY_JIGSAW = 40,
-        MATERIAL_ARANARA = 41,
-        MATERIAL_GCG_CARD = 42,
-        MATERIAL_GCG_CARD_FACE = 43, // 影幻卡面
-        MATERIAL_GCG_CARD_BACK = 44,
-        MATERIAL_GCG_FIELD = 45,
-        MATERIAL_DESHRET_MANUAL = 46,
-        MATERIAL_RENAME_ITEM = 47,
-        MATERIAL_GCG_EXCHANGE_ITEM = 48,
-        MATERIAL_QUEST_EVENT_BOOK = 49,
-        MATERIAL_PROFILE_PICTURE = 50,
-        MATERIAL_RAINBOW_PRINCE_HAND_BOOK = 51,
-        MATERIAL_PHOTO_DISPLAY_BOOK = 52,
-        MATERIAL_REMUS_MUSIC_BOX = 53,
-        MATERIAL_GREATEFESTIVALV2_INVITE = 54,
-        MATERIAL_PHOTOGRAPH_POSE = 55,
-        MATERIAL_FIRE_MASTER_AVATAR_TALENT_ITEM = 56,
-        MATERIAL_PHOTOV5_HAND_BOOK = 57,
-        MATERIAL_AVATAR_TRACE = 58,
+        MATERIAL_NONE,
+        MATERIAL_FOOD,
+        MATERIAL_QUEST,
+        MATERIAL_EXCHANGE,
+        MATERIAL_CONSUME,
+        MATERIAL_EXP_FRUIT,
+        MATERIAL_AVATAR,
+        MATERIAL_ADSORBATE,
+        MATERIAL_CRICKET,
+        MATERIAL_ELEM_CRYSTAL,
+        MATERIAL_WEAPON_EXP_STONE,
+        MATERIAL_CHEST,
+        MATERIAL_RELIQUARY_MATERIAL,
+        MATERIAL_AVATAR_MATERIAL,
+        MATERIAL_NOTICE_ADD_HP,
+        MATERIAL_SEA_LAMP,
+        MATERIAL_SELECTABLE_CHEST,
+        MATERIAL_FLYCLOAK,
+        MATERIAL_NAMECARD,
+        MATERIAL_TALENT,
+        MATERIAL_WIDGET,
+        MATERIAL_CHEST_BATCH_USE,
+        MATERIAL_FAKE_ABSORBATE,
+        MATERIAL_CONSUME_BATCH_USE,
+        MATERIAL_WOOD,
+        MATERIAL_FURNITURE_FORMULA,
+        MATERIAL_CHANNELLER_SLAB_BUFF,
+        MATERIAL_FURNITURE_SUITE_FORMULA,
+        MATERIAL_COSTUME,
+        MATERIAL_HOME_SEED,
+        MATERIAL_FISH_BAIT,
+        MATERIAL_FISH_ROD,
+        MATERIAL_SUMO_BUFF, // sumo 活动道具，never appear
+        MATERIAL_FIREWORKS,
+        MATERIAL_BGM,
+        MATERIAL_SPICE_FOOD,
+        MATERIAL_ACTIVITY_ROBOT,
+        MATERIAL_ACTIVITY_GEAR,
+        MATERIAL_ACTIVITY_JIGSAW,
+        MATERIAL_ARANARA,
+        MATERIAL_GCG_CARD,
+        MATERIAL_GCG_CARD_FACE, // 影幻卡面
+        MATERIAL_GCG_CARD_BACK,
+        MATERIAL_GCG_FIELD,
+        MATERIAL_DESHRET_MANUAL,
+        MATERIAL_RENAME_ITEM,
+        MATERIAL_GCG_EXCHANGE_ITEM,
+        MATERIAL_QUEST_EVENT_BOOK,
+        MATERIAL_PROFILE_PICTURE,
+        MATERIAL_RAINBOW_PRINCE_HAND_BOOK,
+        MATERIAL_PHOTO_DISPLAY_BOOK,
+        MATERIAL_REMUS_MUSIC_BOX,
+        MATERIAL_GREATEFESTIVALV2_INVITE,
+        MATERIAL_PHOTOGRAPH_POSE,
+        MATERIAL_FIRE_MASTER_AVATAR_TALENT_ITEM,
+        MATERIAL_PHOTOV5_HAND_BOOK,
+        MATERIAL_AVATAR_TRACE,
+        MATERIAL_CHEST_BATCH_USE_WITH_GROUP,
+        MATERIAL_NATLAN_RELATION_A,
+        MATERIAL_NATLAN_RELATION_B,
+        MATERIAL_LANV5_PAIMON_GREETING_CARD,
+        MATERIAL_NATLAN_RACE_ALBUM,
+        MATERIAL_NATLAN_RACE_ENVELOPE,
+        MATERIAL_MUSIC_GAME_BOOK_THEME,
     }
 
     internal static class MaterialTypeExtension
@@ -131,6 +138,13 @@ internal static class MaterialTypeExtension
             [MaterialType.MATERIAL_FIRE_MASTER_AVATAR_TALENT_ITEM] = "燧原矿",
             [MaterialType.MATERIAL_PHOTOV5_HAND_BOOK] = "回忆相册",
             [MaterialType.MATERIAL_AVATAR_TRACE] = "游迹",
+            [MaterialType.MATERIAL_CHEST_BATCH_USE_WITH_GROUP] = "分享包",
+            [MaterialType.MATERIAL_NATLAN_RELATION_A] = "圣夜旅织A",
+            [MaterialType.MATERIAL_NATLAN_RELATION_B] = "圣夜旅织B",
+            [MaterialType.MATERIAL_LANV5_PAIMON_GREETING_CARD] = "祝柬",
+            [MaterialType.MATERIAL_NATLAN_RACE_ALBUM] = "砥砺之证",
+            [MaterialType.MATERIAL_NATLAN_RACE_ENVELOPE] = "纪念信件",
+            [MaterialType.MATERIAL_MUSIC_GAME_BOOK_THEME] = "音乐游戏书主题",
         };
         private static readonly Dictionary<MaterialType, string> TextMapEN = new Dictionary<MaterialType, string>
         {
@@ -191,6 +205,13 @@ internal static class MaterialTypeExtension
             [MaterialType.MATERIAL_FIRE_MASTER_AVATAR_TALENT_ITEM] = "Fire_master_avatar_talent_item",
             [MaterialType.MATERIAL_PHOTOV5_HAND_BOOK] = "Photov5_hand_book",
             [MaterialType.MATERIAL_AVATAR_TRACE] = "Avatar_trace",
+            [MaterialType.MATERIAL_CHEST_BATCH_USE_WITH_GROUP] = "Chest_batch_use_with_group",
+            [MaterialType.MATERIAL_NATLAN_RELATION_A] = "Natlan_relation_a",
+            [MaterialType.MATERIAL_NATLAN_RELATION_B] = "Natlan_relation_b",
+            [MaterialType.MATERIAL_LANV5_PAIMON_GREETING_CARD] = "Lanv5_paimon_greeting_card",
+            [MaterialType.MATERIAL_NATLAN_RACE_ALBUM] = "Natlan_race_album",
+            [MaterialType.MATERIAL_NATLAN_RACE_ENVELOPE] = "Natlan_race_envelope",
+            [MaterialType.MATERIAL_MUSIC_GAME_BOOK_THEME] = "Music_game_book_theme",
         };
 
         public static string ToTranslatedString(this MaterialType materialType, string language)

Source/GrasscutterTools/Game/Props/GadgetType.cs

@@ -25,6 +25,7 @@ internal static class GadgetType
     {
         private static readonly Dictionary<string, string> TextMapCHS = new Dictionary<string, string>
         {
+            ["Avatar"] = "角色",
             ["Gear"] = "机关装置",
             ["Field"] = "领域",
             ["Bullet"] = "技能/飞弹",

Source/GrasscutterTools/Resources/AvatarColor.txt

@@ -87,3 +87,11 @@
 1100:4
 1101:5
 1102:5
+1103:5
+1104:5
+1105:4
+1106:5
+1107:5
+1108:4
+1901:5
+1902:5

Source/GrasscutterTools/Resources/SceneTag.txt

@@ -55,6 +55,9 @@
 180:AlchemySim01
 181:GreatFesV2
 182:XM_TomatoFarm
+183:SumeruBirth
+184:SumeruBirth_NL
+185:CeremonyEvent
 1001:Combine_Lyg
 1002:Combine_Mdc
 1011:Combine_RBQyg
@@ -327,11 +330,34 @@
 1516:NT_OfferingTemple_max
 1517:NT_TKC_Fd (Default)
 1520:Mihai_P4
-1525:NT_HJCSX_01 (Default)
-1526:NT_HJCSX_02
-1527:NT_HJJSY_01 (Default)
-1528:NT_HJJSY_02
+1525:NT_DPSDT_P1 (Default)
+1526:NT_DPSDT_P2
+1527:NT_HJJ_P1 (Default)
+1528:NT_HJJ_P2
+1554:Combine_WarBroken04 (Default)
+1555:Combine_WarBroken01 (Default)
+1556:Combine_WarBroken02 (Default)
+1557:Combine_WarBroken03 (Default)
+1522:Nt_Xilonen0
+1523:Nt_Xilonen1
+1558:Combine_NT_Xilonen
 1559:NT_AQ_ANH
+1565:Combine_NT_AbyssWar (Default)
+1567:NT_SkyPlanet
+1568:SkirmDG
+1569:Combine_SkirmDG (Default)
+1570:SkirmDG02
+1576:NT_GLYQ_In
+1577:NT_GLYQ_Out (Default)
+1580:HdjV5
+1582:Combine_CeremonyEvent
+1585:Combine_SumeruBirth
+1589:NT_AQWZ_BF (Default)
+1590:NT_AQWZ_AF
+1596:Combine_TournamentFes
+1601:TournamentFes
+1607:NT_AQJNB_BF
+1608:NT_AQJNB_AF
 // 4
 106:SummerTime
 108:SummerTime_High
@@ -678,3 +704,34 @@
 1514:Nyx_Light_BF
 1518:Nyx_Light_Dark
 1521:Nyx_TalkLight
+// 20238
+1519:NT_AbyssWar
+1524:WarBroken04
+1551:WarBroken01
+1552:WarBroken02
+1553:WarBroken03
+1561:Combine_WarBroken04 (Default)
+1562:Combine_WarBroken01 (Default)
+1563:Combine_WarBroken02 (Default)
+1564:Combine_WarBroken03 (Default)
+1566:Combine_NT_AbyssWar (Default)
+1571:Combine_NT_AQ_HDD_AF (Default)
+1572:NT_AQ_HDD_AF
+// 20234
+1560:Nt_XLN_CS (Default)
+// 20235
+1578:Gy01
+1579:Gy02 (Default)
+// 20248
+1581:HDJHutaoBF
+1586:HDJHutaoAF (Default)
+// 20240
+1583:Chasca_Dg01 (Default)
+1584:Chasca_Dg02
+// 20243
+1591:NT_AQZFZL_AF
+1597:Combine_NT_JJC
+// 20250
+1605:NT_AQWZ_NAQ
+// 36001
+1609:MVM_DEF_03 (Default)

Source/GrasscutterTools/Resources/WeaponColor.txt

@@ -33,7 +33,9 @@
 11427:purple
 11428:purple
 11429:purple
+11430:purple
 11431:purple
+11432:purple
 11501:yellow
 11502:yellow
 11503:yellow
@@ -46,6 +48,7 @@
 11513:yellow
 11514:yellow
 11515:yellow
+11516:yellow
 12101:blue
 12201:blue
 12301:blue
@@ -75,6 +78,7 @@
 12425:purple
 12426:purple
 12427:purple
+12430:purple
 12431:purple
 12501:yellow
 12502:yellow
@@ -84,6 +88,7 @@
 12511:yellow
 12512:yellow
 12513:yellow
+12514:yellow
 13101:blue
 13201:blue
 13301:blue
@@ -108,6 +113,7 @@
 13425:purple
 13426:purple
 13427:purple
+13430:purple
 13431:purple
 13501:yellow
 13502:yellow
@@ -146,6 +152,7 @@
 14425:purple
 14426:purple
 14427:purple
+14430:purple
 14431:purple
 14501:yellow
 14502:yellow
@@ -159,6 +166,7 @@
 14514:yellow
 14515:yellow
 14516:yellow
+14517:yellow
 15101:blue
 15201:blue
 15301:blue
@@ -190,6 +198,7 @@
 15425:purple
 15426:purple
 15427:purple
+15430:purple
 15431:purple
 15501:yellow
 15502:yellow
@@ -200,3 +209,4 @@
 15511:yellow
 15512:yellow
 15513:yellow
+15514:yellow