Enable High DPI support (#231)

Fix benner editor format
Add banner title update tool

Source/GrasscutterTools/Forms/FormGachaBannerEditor.cs

@@ -50,8 +50,10 @@ namespace GrasscutterTools.Forms
 
         private void InitBannerPrefab()
         {
-            CmbPrefab.Items.Clear();
-            CmbPrefab.Items.AddRange(GameData.GachaBannerPrefabs.Names);
+            CmbPrefab.DisplayMember = "Value";
+            CmbPrefab.DataSource = GameData.GachaBannerPrefabs;
+            //CmbPrefab.Items.Clear();
+            //CmbPrefab.Items.AddRange(GameData.GachaBannerPrefabs.Names);
         }
 
         private void InitCheckedListBoxs()
@@ -96,6 +98,11 @@ namespace GrasscutterTools.Forms
 
         #region - UI -
 
+        private static string TrimPrefixAndSuffix(string text, int prefixLength, int suffixLength)
+        {
+            return text.Substring(prefixLength, text.Length - prefixLength - suffixLength);
+        }
+
         private void ShowBanner(GachaBanner banner)
         {
             try
@@ -103,10 +110,17 @@ namespace GrasscutterTools.Forms
                 NUDGachaType.Value = banner.GachaType;
                 NUDScheduleId.Value = banner.ScheduleId;
                 CmbBannerType.SelectedIndex = (int)banner.BannerType;
-                if (string.IsNullOrEmpty(banner.TitlePath) || !int.TryParse(banner.TitlePath.Substring("UI_GACHA_SHOW_PANEL_A".Length, 3), out int prefabId))
+                const string titlePrefix = "UI_GACHA_SHOW_PANEL_";
+                const string suffix = "_TITLE";
+                if (string.IsNullOrEmpty(banner.TitlePath) || banner.TitlePath.Length <= titlePrefix.Length + suffix.Length)
+                {
                     CmbPrefab.SelectedIndex = -1;
+                }
                 else
-                    CmbPrefab.SelectedIndex = Array.IndexOf(GameData.GachaBannerPrefabs.Ids, prefabId);
+                {
+                    var titleKey = TrimPrefixAndSuffix(banner.TitlePath, titlePrefix.Length, suffix.Length);
+                    CmbPrefab.SelectedIndex = GameData.GachaBannerTitles.FindIndex(it => it.Key == titleKey);
+                }
                 RbCostItem224.Checked = banner.CostItem == 224;
                 RbCostItem223.Checked = banner.CostItem == 223;
                 NUDBeginTime.Value = banner.BeginTime;
@@ -153,15 +167,15 @@ namespace GrasscutterTools.Forms
             else
                 purpleIds = TxtRateUpItems2.Text.Split(',').Select(s => int.Parse(s.Trim())).ToArray();
 
-            var prefabId = GameData.GachaBannerPrefabs.Ids[CmbPrefab.SelectedIndex];
+            var prefabId = GameData.GachaBannerPrefabs[CmbPrefab.SelectedIndex].Key;
             GachaBanner banner = new GachaBanner
             {
                 GachaType = (int)NUDGachaType.Value,
                 ScheduleId = (int)NUDScheduleId.Value,
                 BannerType = (BannerType)CmbBannerType.SelectedIndex,
-                PrefabPath = $"GachaShowPanel_A{prefabId:000}",
-                PreviewPrefabPath = $"UI_Tab_GachaShowPanel_A{prefabId:000}",
-                TitlePath = $"UI_GACHA_SHOW_PANEL_A{prefabId:000}_TITLE",
+                PrefabPath = $"GachaShowPanel_{prefabId}",
+                PreviewPrefabPath = $"UI_Tab_GachaShowPanel_{prefabId}",
+                TitlePath = $"UI_GACHA_SHOW_PANEL_{prefabId}_TITLE",
                 CostItem = RbCostItem224.Checked ? 224 : 223,
                 BeginTime = (int)NUDBeginTime.Value,
                 EndTime = (int)NUDEndTime.Value,

Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs

@@ -50,8 +50,11 @@ namespace GrasscutterTools.Forms
 
         private void InitBannerPrefab()
         {
-            CmbPrefab.Items.Clear();
-            CmbPrefab.Items.AddRange(GameData.GachaBannerPrefabs.Names);
+            CmbPrefab.DisplayMember = "Value";
+            CmbPrefab.DataSource = GameData.GachaBannerPrefabs;
+
+            //CmbPrefab.Items.Clear();
+            //CmbPrefab.Items.AddRange(GameData.GachaBannerPrefabs.Names);
         }
 
         private void LnkWeightHelp_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
@@ -206,6 +209,10 @@ namespace GrasscutterTools.Forms
 
         #region - 序列化 -
 
+        private static string TrimPrefixAndSuffix(string text, int prefixLength, int suffixLength)
+        {
+            return text.Substring(prefixLength, text.Length - prefixLength - suffixLength);
+        }
         private void ShowBanner(GachaBanner2 banner)
         {
             try
@@ -213,10 +220,17 @@ namespace GrasscutterTools.Forms
                 NUDGachaType.Value = banner.GachaType;
                 NUDScheduleId.Value = banner.ScheduleId;
                 CmbBannerType.SelectedIndex = (int)banner.BannerType;
-                if (string.IsNullOrEmpty(banner.TitlePath) || !int.TryParse(banner.TitlePath.Substring("UI_GACHA_SHOW_PANEL_A".Length, 3), out int prefabId))
+                const string titlePrefix = "UI_GACHA_SHOW_PANEL_";
+                const string suffix = "_TITLE";
+                if (string.IsNullOrEmpty(banner.TitlePath) || banner.TitlePath.Length <= titlePrefix.Length + suffix.Length)
+                {
                     CmbPrefab.SelectedIndex = -1;
+                }
                 else
-                    CmbPrefab.SelectedIndex = Array.IndexOf(GameData.GachaBannerPrefabs.Ids, prefabId);
+                {
+                    var titleKey = TrimPrefixAndSuffix(banner.TitlePath, titlePrefix.Length, suffix.Length);
+                    CmbPrefab.SelectedIndex = GameData.GachaBannerTitles.FindIndex(it => it.Key == titleKey);
+                }
                 RbCostItem224.Checked = banner.CostItem == 224;
                 RbCostItem223.Checked = banner.CostItem == 223;
                 DTPBeginTime.Value = DateTimeOffset.FromUnixTimeSeconds(banner.BeginTime).DateTime;
@@ -248,16 +262,16 @@ namespace GrasscutterTools.Forms
                 MessageBox.Show("请选择奖池预制", Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return null;
             }
-
-            var prefabId = GameData.GachaBannerPrefabs.Ids[CmbPrefab.SelectedIndex];
+            
+            var prefabId = GameData.GachaBannerPrefabs[CmbPrefab.SelectedIndex].Key;
             var banner = new GachaBanner2
             {
                 GachaType = (int)NUDGachaType.Value,
                 ScheduleId = (int)NUDScheduleId.Value,
                 BannerType = (BannerType)CmbBannerType.SelectedIndex,
-                PrefabPath = $"GachaShowPanel_A{prefabId:000}",
-                PreviewPrefabPath = $"UI_Tab_GachaShowPanel_A{prefabId:000}",
-                TitlePath = $"UI_GACHA_SHOW_PANEL_A{prefabId:000}_TITLE",
+                PrefabPath = $"GachaShowPanel_{prefabId}",
+                PreviewPrefabPath = $"UI_Tab_GachaShowPanel_{prefabId}",
+                TitlePath = $"UI_GACHA_SHOW_PANEL_{prefabId}_TITLE",
                 CostItem = RbCostItem224.Checked ? 224 : 223,
                 BeginTime = (int)new DateTimeOffset(DTPBeginTime.Value, TimeSpan.Zero).ToUnixTimeSeconds(),
                 EndTime = (int)new DateTimeOffset(DTPEndTime.Value, TimeSpan.Zero).ToUnixTimeSeconds(),

Source/GrasscutterTools/Forms/FormGachaBannersEditor3.cs

@@ -61,10 +61,10 @@ namespace GrasscutterTools.Forms
 
         private void InitBannerPrefab()
         {
-            CmbPrefab.Items.Clear();
-            CmbPrefab.Items.AddRange(GameData.GachaBannerPrefabs.Names);
-            CmbTitlePath.Items.Clear();
-            CmbTitlePath.Items.AddRange(GameData.GachaBannerTitles.Names);
+            CmbPrefab.DisplayMember = "Value";
+            CmbPrefab.DataSource = GameData.GachaBannerPrefabs;
+            CmbTitlePath.DisplayMember = "Value";
+            CmbTitlePath.DataSource = GameData.GachaBannerTitles;
         }
 
         protected override void OnLoad(EventArgs e)
@@ -405,6 +405,12 @@ namespace GrasscutterTools.Forms
 
         #region - 卡池参数 -
 
+        private static string TrimPrefixAndSuffix(string text, int prefixLength, int suffixLength)
+        {
+            return text.Substring(prefixLength, text.Length - prefixLength - suffixLength);
+        }
+
+
         /// <summary>
         /// 显示指定卡池参数
         /// </summary>
@@ -416,14 +422,28 @@ namespace GrasscutterTools.Forms
                 NUDGachaType.Value = banner.GachaType;
                 NUDScheduleId.Value = banner.ScheduleId;
                 CmbBannerType.SelectedIndex = (int)banner.BannerType;
-                if (string.IsNullOrEmpty(banner.PrefabPath) || !int.TryParse(banner.PrefabPath.Substring("GachaShowPanel_A".Length, 3), out int prefabId))
+                const string prefabPrefix = "GachaShowPanel_";
+                if (string.IsNullOrEmpty(banner.PrefabPath) || banner.PrefabPath.Length <= prefabPrefix.Length)
+                {
                     CmbPrefab.SelectedIndex = -1;
+                }
                 else
-                    CmbPrefab.SelectedIndex = Array.IndexOf(GameData.GachaBannerPrefabs.Ids, prefabId);
-                if (string.IsNullOrEmpty(banner.TitlePath) || !int.TryParse(banner.TitlePath.Substring("UI_GACHA_SHOW_PANEL_A".Length, 3), out int titleId))
+                {
+                    var prefabKey = banner.PrefabPath.Substring(prefabPrefix.Length);
+                    CmbPrefab.SelectedIndex = GameData.GachaBannerPrefabs.FindIndex(it => it.Key == prefabKey);
+                }
+
+                const string titlePrefix = "UI_GACHA_SHOW_PANEL_";
+                const string suffix = "_TITLE";
+                if (string.IsNullOrEmpty(banner.TitlePath) || banner.TitlePath.Length <= titlePrefix.Length + suffix.Length)
+                {
                     CmbTitlePath.SelectedIndex = -1;
+                }
                 else
-                    CmbTitlePath.SelectedIndex = Array.IndexOf(GameData.GachaBannerTitles.Ids, titleId);
+                {
+                    var titleKey = TrimPrefixAndSuffix(banner.TitlePath, titlePrefix.Length, suffix.Length);
+                    CmbTitlePath.SelectedIndex = GameData.GachaBannerTitles.FindIndex(it => it.Key == titleKey);
+                }
                 RbCostItem224.Checked = banner.CostItemId == 224;
                 RbCostItem223.Checked = banner.CostItemId == 223;
                 NUDCostItemAmount1.Value = banner.CoseItemAmount;
@@ -458,16 +478,16 @@ namespace GrasscutterTools.Forms
                 return null;
             }
 
-            var prefabId = GameData.GachaBannerPrefabs.Ids[CmbPrefab.SelectedIndex];
-            var titleId = GameData.GachaBannerTitles.Ids[CmbTitlePath.SelectedIndex];
+            var prefabId = GameData.GachaBannerPrefabs[CmbPrefab.SelectedIndex].Key;
+            var titleId = GameData.GachaBannerTitles[CmbTitlePath.SelectedIndex].Key;
             var banner = new GachaBanner3
             {
                 GachaType = (int)NUDGachaType.Value,
                 ScheduleId = (int)NUDScheduleId.Value,
                 BannerType = (BannerType)CmbBannerType.SelectedIndex,
-                PrefabPath = $"GachaShowPanel_A{prefabId:000}",
-                PreviewPrefabPath = $"UI_Tab_GachaShowPanel_A{prefabId:000}",
-                TitlePath = $"UI_GACHA_SHOW_PANEL_A{titleId:000}_TITLE",
+                PrefabPath = $"GachaShowPanel_{prefabId}",
+                PreviewPrefabPath = $"UI_Tab_GachaShowPanel_{prefabId}",
+                TitlePath = $"UI_GACHA_SHOW_PANEL_{titleId}_TITLE",
                 CostItemId = RbCostItem224.Checked ? 224 : 223,
                 CoseItemAmount = (int)NUDCostItemAmount1.Value,
                 CostItemId10 = RbCostItem224.Checked ? 224 : 223,

Source/GrasscutterTools/Game/GameData.cs

@@ -17,6 +17,7 @@
  *
  **/
 
+using System.Collections.Generic;
 using GrasscutterTools.Properties;
 
 namespace GrasscutterTools.Game
@@ -42,13 +43,28 @@ namespace GrasscutterTools.Game
             Dungeons = new ItemMap(Resources.Dungeon);
             Weapons = new ItemMap(Resources.Weapon);
             WeaponColors = new ItemMap(Resources.WeaponColor);
-            GachaBannerPrefabs = new ItemMap(Resources.GachaBennerPrefab);
-            GachaBannerTitles = new ItemMap(Resources.GachaBannerTitle);
+            GachaBannerPrefabs = ToDictionary(Resources.GachaBannerPrefab);
+            GachaBannerTitles = ToDictionary(Resources.GachaBannerTitle);
             Quests = new ItemMap(Resources.Quest);
             ShopType = new ItemMap(Resources.ShopType);
             Weathers = new ItemMapGroup(Resources.Weather);
         }
 
+        private static List<KeyValuePair<string, string>> ToDictionary(string file)
+        {
+            var lines = file.Split('\n');
+            var dic = new List<KeyValuePair<string, string>>(lines.Length);
+            foreach (var line in lines)
+            {
+                var i = line.IndexOf(':');
+                if (i <= 0) continue;
+                var key = line.Substring(0, i).Trim();
+                var value = line.Substring(i + 1).Trim();
+                dic.Add(new KeyValuePair<string, string>(key, value));
+            }
+            return dic;
+        }
+
         public static ItemMap Achievements { get; private set; }
 
         public static ItemMapGroup Activity { get; private set; }
@@ -83,9 +99,9 @@ namespace GrasscutterTools.Game
 
         public static ItemMap WeaponColors { get; private set; }
 
-        public static ItemMap GachaBannerPrefabs { get; private set; }
+        public static List<KeyValuePair<string, string>> GachaBannerPrefabs { get; private set; }
 
-        public static ItemMap GachaBannerTitles { get; private set; }
+        public static List<KeyValuePair<string, string>> GachaBannerTitles { get; private set; }
 
         public static ItemMap Quests { get; private set; }
 

Source/GrasscutterTools/Game/Inventory/MaterialType.cs

@@ -64,6 +64,7 @@ namespace GrasscutterTools.Game.Inventory
         MATERIAL_PHOTO_DISPLAY_BOOK = 52,
         MATERIAL_REMUS_MUSIC_BOX = 53,
         MATERIAL_GREATEFESTIVALV2_INVITE = 54,
+        MATERIAL_PHOTOGRAPH_POSE = 55,
     }
 
     internal static class MaterialTypeExtension
@@ -123,6 +124,7 @@ namespace GrasscutterTools.Game.Inventory
             [MaterialType.MATERIAL_PHOTO_DISPLAY_BOOK] = "纪念册",
             [MaterialType.MATERIAL_REMUS_MUSIC_BOX] = "音乐盒",
             [MaterialType.MATERIAL_GREATEFESTIVALV2_INVITE] = "邀请函",
+            [MaterialType.MATERIAL_PHOTOGRAPH_POSE] = "照相姿势",
         };
         private static readonly Dictionary<MaterialType, string> TextMapEN = new Dictionary<MaterialType, string>
         {
@@ -179,6 +181,7 @@ namespace GrasscutterTools.Game.Inventory
             [MaterialType.MATERIAL_PHOTO_DISPLAY_BOOK]      = "Album",
             [MaterialType.MATERIAL_REMUS_MUSIC_BOX]         = "MusicBox",
             [MaterialType.MATERIAL_GREATEFESTIVALV2_INVITE] = "Invitation",
+            [MaterialType.MATERIAL_PHOTOGRAPH_POSE]         = "Photograph_pose",
         };
 
         public static string ToTranslatedString(this MaterialType materialType, string language)

Source/GrasscutterTools/GrasscutterTools.csproj

@@ -352,6 +352,7 @@
     <Compile Include="Utils\ArtifactUtils.cs" />
     <Compile Include="Utils\Common.cs" />
     <Compile Include="Utils\GuiRedirect.cs" />
+    <Compile Include="Utils\HighDPIUtil.cs" />
     <Compile Include="Utils\KeyGo.cs" />
     <Compile Include="Utils\HotKeyItem.cs" />
     <Compile Include="Utils\HttpHelper.cs" />
@@ -787,8 +788,8 @@
     <Content Include="Resources\en-us\CustomCommands.txt" />
     <None Include="Resources\en-us\Dungeon.txt" />
     <Content Include="Resources\en-us\Cutscene.txt" />
-    <Content Include="Resources\en-us\GachaBennerTitle.txt" />
-    <Content Include="Resources\en-us\GachaBennerPrefab.txt" />
+    <Content Include="Resources\en-us\GachaBannerTitle.txt" />
+    <Content Include="Resources\en-us\GachaBannerPrefab.txt" />
     <Content Include="Resources\en-us\Gadget.txt" />
     <Content Include="Resources\en-us\Item.txt" />
     <Content Include="Resources\en-us\Monsters.txt" />
@@ -810,8 +811,8 @@
     <Content Include="Resources\ru-ru\CustomCommands.txt" />
     <None Include="Resources\ru-ru\Dungeon.txt" />
     <Content Include="Resources\ru-ru\Cutscene.txt" />
-    <Content Include="Resources\ru-ru\GachaBennerTitle.txt" />
-    <Content Include="Resources\ru-ru\GachaBennerPrefab.txt" />
+    <Content Include="Resources\ru-ru\GachaBannerTitle.txt" />
+    <Content Include="Resources\ru-ru\GachaBannerPrefab.txt" />
     <Content Include="Resources\ru-ru\Gadget.txt" />
     <Content Include="Resources\ru-ru\Item.txt" />
     <Content Include="Resources\ru-ru\Monsters.txt" />
@@ -839,7 +840,7 @@
     <None Include="Resources\zh-cn\Dungeon.txt" />
     <Content Include="Resources\zh-cn\Cutscene.txt" />
     <Content Include="Resources\zh-cn\GachaBannerTitle.txt" />
-    <Content Include="Resources\zh-cn\GachaBennerPrefab.txt" />
+    <Content Include="Resources\zh-cn\GachaBannerPrefab.txt" />
     <Content Include="Resources\zh-cn\Gadget.txt" />
     <Content Include="Resources\zh-cn\Item.txt" />
     <Content Include="Resources\zh-cn\Monsters.txt" />
@@ -858,8 +859,8 @@
     <Content Include="Resources\zh-tw\CustomCommands.txt" />
     <None Include="Resources\zh-tw\Dungeon.txt" />
     <Content Include="Resources\zh-tw\Cutscene.txt" />
-    <Content Include="Resources\zh-tw\GachaBennerTitle.txt" />
-    <Content Include="Resources\zh-tw\GachaBennerPrefab.txt" />
+    <Content Include="Resources\zh-tw\GachaBannerTitle.txt" />
+    <Content Include="Resources\zh-tw\GachaBannerPrefab.txt" />
     <None Include="Resources\zh-tw\Gadget.txt" />
     <Content Include="Resources\zh-tw\Item.txt" />
     <Content Include="Resources\zh-tw\Monsters.txt" />

Source/GrasscutterTools/Pages/PageQuest.Designer.cs

@@ -39,6 +39,7 @@
             this.TxtQuestFilter = new System.Windows.Forms.TextBox();
             this.ListQuest = new System.Windows.Forms.ListBox();
             this.LblClearFilter = new System.Windows.Forms.Label();
+            this.ChkAddAndFinishQuest = new System.Windows.Forms.CheckBox();
             this.GrpQuestFilters.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -107,6 +108,7 @@
             resources.ApplyResources(this.ListQuest, "ListQuest");
             this.ListQuest.FormattingEnabled = true;
             this.ListQuest.Name = "ListQuest";
+            this.ListQuest.SelectedIndexChanged += new System.EventHandler(this.ListQuest_SelectedIndexChanged);
             // 
             // LblClearFilter
             // 
@@ -116,10 +118,17 @@
             this.LblClearFilter.Name = "LblClearFilter";
             this.LblClearFilter.Click += new System.EventHandler(this.LblClearFilter_Click);
             // 
+            // ChkAddAndFinishQuest
+            // 
+            resources.ApplyResources(this.ChkAddAndFinishQuest, "ChkAddAndFinishQuest");
+            this.ChkAddAndFinishQuest.Name = "ChkAddAndFinishQuest";
+            this.ChkAddAndFinishQuest.UseVisualStyleBackColor = true;
+            // 
             // PageQuest
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.ChkAddAndFinishQuest);
             this.Controls.Add(this.LblClearFilter);
             this.Controls.Add(this.GrpQuestFilters);
             this.Controls.Add(this.BtnFinishQuest);
@@ -147,5 +156,6 @@
         private System.Windows.Forms.TextBox TxtQuestFilter;
         private System.Windows.Forms.ListBox ListQuest;
         private System.Windows.Forms.Label LblClearFilter;
+        private System.Windows.Forms.CheckBox ChkAddAndFinishQuest;
     }
 }

Source/GrasscutterTools/Pages/PageQuest.cs

@@ -84,7 +84,19 @@ namespace GrasscutterTools.Pages
                 return;
             var item = ListQuest.SelectedItem as string;
             var id = ItemMap.ToId(item);
-            SetCommand("/quest", $"{(sender as Button).Tag} {id}");
+            SetCommand("/quest", $"{(sender == BtnAddQuest ? "add" : "finish")} {id}");
+        }
+
+        /// <summary>
+        /// 列表选中项改变时触发
+        /// </summary>
+        private void ListQuest_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (!ChkAddAndFinishQuest.Checked || ListQuest.SelectedIndex == -1) return;
+
+            var item = ListQuest.SelectedItem as string;
+            var id = ItemMap.ToId(item);
+            SetCommand($"/quest add {id} | /quest finish {id}");
         }
     }
 }

Source/GrasscutterTools/Pages/PageQuest.en-US.resx

@@ -151,4 +151,10 @@ Tip: Many quest require server-side scripting support
 Therefore, the quest can be added and finished, but not necessarily work.
 </value>
   </data>
+  <data name="ChkAddAndFinishQuest.Size" type="System.Drawing.Size, System.Drawing">
+    <value>187, 21</value>
+  </data>
+  <data name="ChkAddAndFinishQuest.Text" xml:space="preserve">
+    <value>Add &amp;&amp; Finish when selected</value>
+  </data>
 </root>

Source/GrasscutterTools/Pages/PageQuest.resx

@@ -117,315 +117,345 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="GrpQuestFilters.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Left</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="ChkQuestFilterTEST.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="ChkQuestFilterTEST.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="ChkQuestFilterTEST.Location" type="System.Drawing.Point, System.Drawing">
-    <value>26, 82</value>
-  </data>
-  <data name="ChkQuestFilterTEST.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 21</value>
-  </data>
-  <data name="ChkQuestFilterTEST.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="ChkQuestFilterTEST.Text" xml:space="preserve">
-    <value>测试任务</value>
-  </data>
-  <data name="&gt;&gt;ChkQuestFilterTEST.Name" xml:space="preserve">
-    <value>ChkQuestFilterTEST</value>
-  </data>
-  <data name="&gt;&gt;ChkQuestFilterTEST.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ChkQuestFilterTEST.Parent" xml:space="preserve">
-    <value>GrpQuestFilters</value>
-  </data>
-  <data name="&gt;&gt;ChkQuestFilterTEST.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="ChkQuestFilterUNRELEASED.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="ChkQuestFilterUNRELEASED.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
   <data name="ChkQuestFilterUNRELEASED.Location" type="System.Drawing.Point, System.Drawing">
     <value>26, 55</value>
   </data>
-  <data name="ChkQuestFilterUNRELEASED.Size" type="System.Drawing.Size, System.Drawing">
-    <value>99, 21</value>
-  </data>
-  <data name="ChkQuestFilterUNRELEASED.TabIndex" type="System.Int32, mscorlib">
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="TxtQuestFilter.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
-  <data name="ChkQuestFilterUNRELEASED.Text" xml:space="preserve">
-    <value>未发布的任务</value>
+  <data name="&gt;&gt;BtnAddQuest.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="BtnAddQuest.Text" xml:space="preserve">
+    <value>添加任务</value>
+  </data>
+  <data name="TxtQuestFilter.Size" type="System.Drawing.Size, System.Drawing">
+    <value>288, 23</value>
+  </data>
+  <data name="&gt;&gt;TxtQuestFilter.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.15.1.0, Culture=neutral, PublicKeyToken=de2b1c089621e923</value>
   </data>
   <data name="&gt;&gt;ChkQuestFilterUNRELEASED.Name" xml:space="preserve">
     <value>ChkQuestFilterUNRELEASED</value>
   </data>
-  <data name="&gt;&gt;ChkQuestFilterUNRELEASED.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ChkQuestFilterUNRELEASED.Parent" xml:space="preserve">
-    <value>GrpQuestFilters</value>
-  </data>
-  <data name="&gt;&gt;ChkQuestFilterUNRELEASED.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="ChkQuestFilterHIDDEN.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="ChkQuestFilterHIDDEN.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
+  <data name="ChkQuestFilterUNRELEASED.Size" type="System.Drawing.Size, System.Drawing">
+    <value>99, 21</value>
   </data>
   <data name="ChkQuestFilterHIDDEN.Location" type="System.Drawing.Point, System.Drawing">
     <value>26, 28</value>
   </data>
-  <data name="ChkQuestFilterHIDDEN.Size" type="System.Drawing.Size, System.Drawing">
-    <value>87, 21</value>
+  <data name="&gt;&gt;TxtQuestFilter.Name" xml:space="preserve">
+    <value>TxtQuestFilter</value>
   </data>
-  <data name="ChkQuestFilterHIDDEN.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+  <data name="LblClearFilter.TabIndex" type="System.Int32, mscorlib">
+    <value>22</value>
   </data>
-  <data name="ChkQuestFilterHIDDEN.Text" xml:space="preserve">
-    <value>隐藏的任务</value>
+  <data name="LblQuestDescription.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 3</value>
   </data>
-  <data name="&gt;&gt;ChkQuestFilterHIDDEN.Name" xml:space="preserve">
-    <value>ChkQuestFilterHIDDEN</value>
+  <data name="LblClearFilter.Location" type="System.Drawing.Point, System.Drawing">
+    <value>626, 5</value>
   </data>
-  <data name="&gt;&gt;ChkQuestFilterHIDDEN.Type" xml:space="preserve">
+  <data name="&gt;&gt;ChkQuestFilterTEST.Type" xml:space="preserve">
     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;ListQuest.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="ListQuest.ItemHeight" type="System.Int32, mscorlib">
+    <value>17</value>
+  </data>
+  <data name="BtnFinishQuest.Size" type="System.Drawing.Size, System.Drawing">
+    <value>90, 23</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="LblQuestDescription.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left</value>
+  </data>
+  <data name="ChkQuestFilterTEST.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;LblQuestDescription.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>7, 17</value>
+  </data>
+  <data name="ChkQuestFilterTEST.Location" type="System.Drawing.Point, System.Drawing">
+    <value>26, 82</value>
+  </data>
+  <data name="GrpQuestFilters.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left</value>
+  </data>
+  <data name="&gt;&gt;GrpQuestFilters.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;BtnAddQuest.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;BtnFinishQuest.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="ChkQuestFilterTEST.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 21</value>
+  </data>
+  <data name="&gt;&gt;GrpQuestFilters.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="LblClearFilter.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="ChkAddAndFinishQuest.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;LblClearFilter.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;ChkQuestFilterHIDDEN.Parent" xml:space="preserve">
     <value>GrpQuestFilters</value>
   </data>
-  <data name="&gt;&gt;ChkQuestFilterHIDDEN.ZOrder" xml:space="preserve">
+  <data name="BtnAddQuest.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left</value>
+  </data>
+  <data name="&gt;&gt;ListQuest.Name" xml:space="preserve">
+    <value>ListQuest</value>
+  </data>
+  <data name="&gt;&gt;ChkQuestFilterTEST.Parent" xml:space="preserve">
+    <value>GrpQuestFilters</value>
+  </data>
+  <data name="&gt;&gt;GrpQuestFilters.Name" xml:space="preserve">
+    <value>GrpQuestFilters</value>
+  </data>
+  <data name="BtnFinishQuest.Text" xml:space="preserve">
+    <value>完成任务</value>
+  </data>
+  <data name="GrpQuestFilters.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;ChkQuestFilterHIDDEN.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="GrpQuestFilters.Text" xml:space="preserve">
+    <value>列表过滤</value>
+  </data>
+  <data name="BtnFinishQuest.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;ChkAddAndFinishQuest.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="ChkQuestFilterUNRELEASED.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;ChkQuestFilterUNRELEASED.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="ChkAddAndFinishQuest.Text" xml:space="preserve">
+    <value>选中时添加并完成</value>
+  </data>
+  <data name="ListQuest.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
   <data name="GrpQuestFilters.Location" type="System.Drawing.Point, System.Drawing">
     <value>199, 106</value>
   </data>
-  <data name="GrpQuestFilters.Size" type="System.Drawing.Size, System.Drawing">
-    <value>150, 130</value>
+  <data name="ChkQuestFilterHIDDEN.Size" type="System.Drawing.Size, System.Drawing">
+    <value>87, 21</value>
   </data>
-  <data name="GrpQuestFilters.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+  <data name="ChkAddAndFinishQuest.TabIndex" type="System.Int32, mscorlib">
+    <value>23</value>
   </data>
-  <data name="GrpQuestFilters.Text" xml:space="preserve">
-    <value>列表过滤</value>
+  <data name="&gt;&gt;ChkAddAndFinishQuest.Name" xml:space="preserve">
+    <value>ChkAddAndFinishQuest</value>
   </data>
-  <data name="&gt;&gt;GrpQuestFilters.Name" xml:space="preserve">
-    <value>GrpQuestFilters</value>
+  <data name="ChkAddAndFinishQuest.Size" type="System.Drawing.Size, System.Drawing">
+    <value>123, 21</value>
+  </data>
+  <data name="&gt;&gt;ChkQuestFilterTEST.Name" xml:space="preserve">
+    <value>ChkQuestFilterTEST</value>
   </data>
   <data name="&gt;&gt;GrpQuestFilters.Type" xml:space="preserve">
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;GrpQuestFilters.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;GrpQuestFilters.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="BtnFinishQuest.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Left</value>
-  </data>
-  <data name="BtnFinishQuest.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="BtnFinishQuest.Location" type="System.Drawing.Point, System.Drawing">
-    <value>99, 213</value>
-  </data>
-  <data name="BtnFinishQuest.Size" type="System.Drawing.Size, System.Drawing">
-    <value>90, 23</value>
-  </data>
-  <data name="BtnFinishQuest.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="BtnFinishQuest.Text" xml:space="preserve">
-    <value>完成任务</value>
-  </data>
-  <data name="&gt;&gt;BtnFinishQuest.Name" xml:space="preserve">
-    <value>BtnFinishQuest</value>
-  </data>
-  <data name="&gt;&gt;BtnFinishQuest.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;BtnFinishQuest.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;BtnFinishQuest.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="BtnAddQuest.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Left</value>
-  </data>
-  <data name="BtnAddQuest.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="BtnAddQuest.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 213</value>
-  </data>
-  <data name="BtnAddQuest.Size" type="System.Drawing.Size, System.Drawing">
-    <value>90, 23</value>
+  <data name="ChkQuestFilterHIDDEN.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
   <data name="BtnAddQuest.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
   </data>
-  <data name="BtnAddQuest.Text" xml:space="preserve">
-    <value>添加任务</value>
-  </data>
-  <data name="&gt;&gt;BtnAddQuest.Name" xml:space="preserve">
-    <value>BtnAddQuest</value>
-  </data>
-  <data name="&gt;&gt;BtnAddQuest.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;BtnAddQuest.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;BtnAddQuest.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="LblQuestDescription.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Bottom, Left</value>
+  <data name="ListQuest.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
   </data>
   <data name="LblQuestDescription.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
-  <data name="LblQuestDescription.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 3</value>
+  <data name="&gt;&gt;LblQuestDescription.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="ChkQuestFilterTEST.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
   </data>
   <data name="LblQuestDescription.Size" type="System.Drawing.Size, System.Drawing">
     <value>346, 100</value>
   </data>
-  <data name="LblQuestDescription.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+  <data name="ChkQuestFilterTEST.Text" xml:space="preserve">
+    <value>测试任务</value>
+  </data>
+  <data name="ChkAddAndFinishQuest.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 186</value>
+  </data>
+  <data name="LblClearFilter.Size" type="System.Drawing.Size, System.Drawing">
+    <value>16, 17</value>
+  </data>
+  <data name="ChkQuestFilterTEST.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="ListQuest.Size" type="System.Drawing.Size, System.Drawing">
+    <value>288, 208</value>
+  </data>
+  <data name="GrpQuestFilters.Size" type="System.Drawing.Size, System.Drawing">
+    <value>150, 130</value>
+  </data>
+  <data name="&gt;&gt;BtnFinishQuest.Name" xml:space="preserve">
+    <value>BtnFinishQuest</value>
+  </data>
+  <data name="LblClearFilter.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;BtnAddQuest.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;BtnFinishQuest.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="ChkQuestFilterHIDDEN.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="LblClearFilter.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="BtnFinishQuest.Location" type="System.Drawing.Point, System.Drawing">
+    <value>99, 213</value>
+  </data>
+  <data name="LblClearFilter.Text" xml:space="preserve">
+    <value>X</value>
+  </data>
+  <data name="&gt;&gt;BtnAddQuest.Name" xml:space="preserve">
+    <value>BtnAddQuest</value>
+  </data>
+  <data name="ChkAddAndFinishQuest.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left</value>
+  </data>
+  <data name="&gt;&gt;ChkQuestFilterHIDDEN.Name" xml:space="preserve">
+    <value>ChkQuestFilterHIDDEN</value>
+  </data>
+  <data name="ChkQuestFilterUNRELEASED.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="ChkQuestFilterUNRELEASED.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="BtnAddQuest.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 213</value>
+  </data>
+  <data name="&gt;&gt;BtnFinishQuest.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;ChkAddAndFinishQuest.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="LblQuestDescription.Text" xml:space="preserve">
     <value>添加或完成任务
 提示：许多任务需要服务端脚本支持
 因此任务可以接，可以完成，但是不一定可以做</value>
   </data>
-  <data name="&gt;&gt;LblQuestDescription.Name" xml:space="preserve">
-    <value>LblQuestDescription</value>
-  </data>
-  <data name="&gt;&gt;LblQuestDescription.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;LblQuestDescription.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;LblQuestDescription.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
   <data name="TxtQuestFilter.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
-  <data name="TxtQuestFilter.Location" type="System.Drawing.Point, System.Drawing">
-    <value>355, 2</value>
-  </data>
-  <data name="TxtQuestFilter.Size" type="System.Drawing.Size, System.Drawing">
-    <value>288, 23</value>
-  </data>
-  <data name="TxtQuestFilter.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;TxtQuestFilter.Name" xml:space="preserve">
-    <value>TxtQuestFilter</value>
-  </data>
-  <data name="&gt;&gt;TxtQuestFilter.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;TxtQuestFilter.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;TxtQuestFilter.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="ListQuest.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Bottom, Left, Right</value>
-  </data>
-  <data name="ListQuest.ItemHeight" type="System.Int32, mscorlib">
-    <value>17</value>
-  </data>
-  <data name="ListQuest.Location" type="System.Drawing.Point, System.Drawing">
-    <value>355, 28</value>
-  </data>
-  <data name="ListQuest.Size" type="System.Drawing.Size, System.Drawing">
-    <value>288, 208</value>
-  </data>
-  <data name="ListQuest.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;ListQuest.Name" xml:space="preserve">
-    <value>ListQuest</value>
-  </data>
-  <data name="&gt;&gt;ListQuest.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ListQuest.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;ListQuest.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="LblClearFilter.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Right</value>
-  </data>
-  <data name="LblClearFilter.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="LblClearFilter.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="LblClearFilter.Location" type="System.Drawing.Point, System.Drawing">
-    <value>626, 5</value>
-  </data>
-  <data name="LblClearFilter.Size" type="System.Drawing.Size, System.Drawing">
-    <value>16, 17</value>
-  </data>
-  <data name="LblClearFilter.TabIndex" type="System.Int32, mscorlib">
-    <value>22</value>
-  </data>
-  <data name="LblClearFilter.Text" xml:space="preserve">
-    <value>X</value>
-  </data>
-  <data name="LblClearFilter.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>PageQuest</value>
   </data>
   <data name="&gt;&gt;LblClearFilter.Name" xml:space="preserve">
     <value>LblClearFilter</value>
   </data>
-  <data name="&gt;&gt;LblClearFilter.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;TxtQuestFilter.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;LblClearFilter.ZOrder" xml:space="preserve">
+    <value>1</value>
   </data>
   <data name="&gt;&gt;LblClearFilter.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;LblClearFilter.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;TxtQuestFilter.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;ChkQuestFilterUNRELEASED.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="LblClearFilter.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;ChkQuestFilterUNRELEASED.Parent" xml:space="preserve">
+    <value>GrpQuestFilters</value>
+  </data>
+  <data name="LblQuestDescription.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="BtnAddQuest.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="TxtQuestFilter.Location" type="System.Drawing.Point, System.Drawing">
+    <value>355, 2</value>
+  </data>
+  <data name="BtnFinishQuest.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="ChkQuestFilterHIDDEN.Text" xml:space="preserve">
+    <value>隐藏的任务</value>
+  </data>
+  <data name="ListQuest.Location" type="System.Drawing.Point, System.Drawing">
+    <value>355, 28</value>
+  </data>
+  <data name="BtnAddQuest.Size" type="System.Drawing.Size, System.Drawing">
+    <value>90, 23</value>
+  </data>
+  <data name="&gt;&gt;LblQuestDescription.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;ChkQuestFilterTEST.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="BtnFinishQuest.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left</value>
+  </data>
+  <data name="&gt;&gt;ListQuest.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;ChkQuestFilterHIDDEN.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;ListQuest.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="ChkQuestFilterUNRELEASED.Text" xml:space="preserve">
+    <value>未发布的任务</value>
+  </data>
+  <data name="&gt;&gt;LblQuestDescription.Name" xml:space="preserve">
+    <value>LblQuestDescription</value>
+  </data>
+  <data name="ChkQuestFilterHIDDEN.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;ChkAddAndFinishQuest.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>7, 17</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>PageQuest</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923</value>
-  </data>
 </root>

Source/GrasscutterTools/Pages/PageQuest.ru-RU.resx

@@ -151,4 +151,10 @@
 Поэтому квест может быть добавлен или отозван через консоль, но завершён игроком - вряд ли.
 </value>
   </data>
+  <data name="ChkAddAndFinishQuest.Size" type="System.Drawing.Size, System.Drawing">
+    <value>167, 21</value>
+  </data>
+  <data name="ChkAddAndFinishQuest.Text" xml:space="preserve">
+    <value>Добавить и завершить</value>
+  </data>
 </root>

Source/GrasscutterTools/Pages/PageQuest.zh-TW.resx

@@ -141,4 +141,7 @@
 囙此任務可以接，可以完成，但是不一定可以做
 </value>
   </data>
+  <data name="ChkAddAndFinishQuest.Text" xml:space="preserve">
+    <value>選中時添加並完成</value>
+  </data>
 </root>

Source/GrasscutterTools/Pages/PageTools.Designer.cs

@@ -36,6 +36,7 @@
             this.TxtGcResRoot = new System.Windows.Forms.TextBox();
             this.BtnUpdateAllResources = new System.Windows.Forms.Button();
             this.BtnUpdateActivity = new System.Windows.Forms.Button();
+            this.BtnUpdateBannerTitles = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
             // BtnUpdateResources
@@ -110,6 +111,16 @@
             this.BtnUpdateActivity.UseVisualStyleBackColor = true;
             this.BtnUpdateActivity.Click += new System.EventHandler(this.BtnUpdateActivity_Click);
             // 
+            // BtnUpdateBannerTitles
+            // 
+            this.BtnUpdateBannerTitles.Location = new System.Drawing.Point(353, 100);
+            this.BtnUpdateBannerTitles.Name = "BtnUpdateBannerTitles";
+            this.BtnUpdateBannerTitles.Size = new System.Drawing.Size(150, 30);
+            this.BtnUpdateBannerTitles.TabIndex = 0;
+            this.BtnUpdateBannerTitles.Text = "Update Banner Titles";
+            this.BtnUpdateBannerTitles.UseVisualStyleBackColor = true;
+            this.BtnUpdateBannerTitles.Click += new System.EventHandler(this.BtnUpdateBannerTitles_Click);
+            // 
             // PageTools
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
@@ -118,6 +129,7 @@
             this.Controls.Add(this.LblGcResRoot);
             this.Controls.Add(this.TxtProjectResRoot);
             this.Controls.Add(this.LblProjectResRoot);
+            this.Controls.Add(this.BtnUpdateBannerTitles);
             this.Controls.Add(this.BtnUpdateActivity);
             this.Controls.Add(this.BtnUpdateAllResources);
             this.Controls.Add(this.BtnConvertCutScene);
@@ -138,5 +150,6 @@
         private System.Windows.Forms.TextBox TxtGcResRoot;
         private System.Windows.Forms.Button BtnUpdateAllResources;
         private System.Windows.Forms.Button BtnUpdateActivity;
+        private System.Windows.Forms.Button BtnUpdateBannerTitles;
     }
 }

Source/GrasscutterTools/Pages/PageTools.cs

@@ -22,6 +22,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 
 using GrasscutterTools.Game;
@@ -151,10 +152,8 @@ namespace GrasscutterTools.Pages
             {
                 if (!CheckInputPaths()) return;
 
-                if (TextMapData == null)
-                    TextMapData = new TextMapData(TxtGcResRoot.Text);
-                if (GameResources == null)
-                    GameResources = new GameResources(TxtGcResRoot.Text, TextMapData);
+                TextMapData ??= new TextMapData(TxtGcResRoot.Text);
+                GameResources ??= new GameResources(TxtGcResRoot.Text, TextMapData);
 
                 GameResources.ConvertResources(TxtProjectResRoot.Text);
                 MessageBox.Show("OK", Resources.Tips, MessageBoxButtons.OK);
@@ -176,8 +175,7 @@ namespace GrasscutterTools.Pages
                     Encoding.UTF8);
                 var activityItems = JsonConvert.DeserializeObject<List<NewActivityItem>>(json);
 
-                if (TextMapData == null)
-                    TextMapData = new TextMapData(TxtGcResRoot.Text);
+                TextMapData ??= new TextMapData(TxtGcResRoot.Text);
 
                 UpdateActivityForLanguage(activityItems, "TextMapCHS", "zh-cn");
                 UpdateActivityForLanguage(activityItems, "TextMapCHT", "zh-tw");
@@ -218,5 +216,51 @@ namespace GrasscutterTools.Pages
             //    activityItems.Select(it => $"{it.ActivityId}:{TextMapData.GetText(it.NameTextMapHash)}"),
             //    Encoding.UTF8);
         }
+
+
+
+        private void UpdateGachaResourceForLanguage(string textMap, string language)
+        {
+            var i = Array.IndexOf(TextMapData.TextMapFiles, textMap);
+            TextMapData.LoadTextMap(TextMapData.TextMapFilePaths[i]);
+
+            var titleBuffer = new StringBuilder();
+            const string titlePattern = "UI_GACHA_SHOW_PANEL_([^_]+?)_TITLE";
+            const string markPattern = "<[^>]+>";
+
+            foreach (var kv in TextMapData.ManualTextMap)
+            {
+                var titleId = Regex.Match(kv.Value, titlePattern);
+                if (!titleId.Success) continue;
+                var text = TextMapData.TextMap[kv.Key];
+                titleBuffer.Append(titleId.Groups[1].Captures[0].Value)
+                    .Append(":")
+                    .AppendLine(Regex.Replace(text, markPattern, ""));
+            }
+
+            var titleFilePath = Path.Combine(TxtProjectResRoot.Text, language, "GachaBannerTitle.txt");
+            File.WriteAllText(titleFilePath, titleBuffer.ToString(), Encoding.UTF8);
+
+        }
+
+        private void BtnUpdateBannerTitles_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (!CheckInputPaths()) return;
+
+                TextMapData ??= new TextMapData(TxtGcResRoot.Text);
+
+                UpdateGachaResourceForLanguage("TextMapCHS", "zh-cn");
+                UpdateGachaResourceForLanguage("TextMapCHT", "zh-tw");
+                UpdateGachaResourceForLanguage("TextMapEN", "en-us");
+                UpdateGachaResourceForLanguage("TextMapRU", "ru-ru");
+                MessageBox.Show("OK", Resources.Tips, MessageBoxButtons.OK);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.ToString(), Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
     }
 }

Source/GrasscutterTools/Program.cs

@@ -71,6 +71,12 @@ namespace GrasscutterTools
             if (result != -1)
                 return result;
 
+            // 开启高DPI支持
+            if (Environment.OSVersion.Version.Major >= 6) // 至少需要Vista系统
+            {
+               HighDPIUtil.SetDpiAwareness();
+            }
+
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
 

Source/GrasscutterTools/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.15.0")]
-[assembly: AssemblyFileVersion("1.15.0")]
+[assembly: AssemblyVersion("1.15.2")]
+[assembly: AssemblyFileVersion("1.15.2")]

Source/GrasscutterTools/Properties/Resources.Designer.cs

@@ -837,9 +837,9 @@ namespace GrasscutterTools.Properties {
         ///102:神铸赋形-圣显绿箭
         ///103:月草的赐慧-纳西妲
         ///104 [字符串的其余部分被截断]"; 的本地化字符串。
-        /// </summary>
+        /// </summary>
         internal static string GachaBannerPrefab {
-            get {
+            get {
                 return ResourceManager.GetString("GachaBannerPrefab", resourceCulture);
             }
         }

Source/GrasscutterTools/Properties/Resources.en-us.resx

@@ -181,8 +181,8 @@
   <data name="Error" xml:space="preserve">
     <value>Error</value>
   </data>
-  <data name="GachaBennerPrefab" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\en-us\GachaBennerPrefab.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="GachaBannerPrefab" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\en-us\GachaBannerPrefab.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="Help" xml:space="preserve">
     <value>Help</value>
@@ -285,8 +285,8 @@ Improvement suggestions have been submitted, please use caution to send emails t
   <data name="ShopJsonOverrideWarning" xml:space="preserve">
     <value>Only allowed to save in Shop.json format! Are you sure you want to overwrite the currently specified file?</value>
   </data>
-  <data name="GachaBennerTitle" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\en-us\GachaBennerTitle.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;gb2312</value>
+  <data name="GachaBannerTitle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\en-us\GachaBannerTitle.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;gb2312</value>
   </data>
   <data name="Dungeon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\en-us\Dungeon.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>

Source/GrasscutterTools/Properties/Resources.resx

@@ -178,8 +178,8 @@
   <data name="Error" xml:space="preserve">
     <value>错误</value>
   </data>
-  <data name="GachaBennerPrefab" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\zh-cn\GachaBennerPrefab.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="GachaBannerPrefab" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\zh-cn\GachaBannerPrefab.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="SettingSaveError" xml:space="preserve">
     <value>保存设置时异常：</value>

Source/GrasscutterTools/Properties/Resources.ru-ru.resx

@@ -181,8 +181,8 @@
   <data name="Error" xml:space="preserve">
     <value>Ошибка</value>
   </data>
-  <data name="GachaBennerPrefab" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ru-ru\GachaBennerPrefab.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="GachaBannerPrefab" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ru-ru\GachaBannerPrefab.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="Help" xml:space="preserve">
     <value>Помощь</value>
@@ -273,8 +273,8 @@
   <data name="ShopJsonOverrideWarning" xml:space="preserve">
     <value>Разрешено сохранять только в формате Shop.json! Вы уверены, что хотите перезаписать текущий файл?</value>
   </data>
-  <data name="GachaBennerTitle" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ru-ru\GachaBennerTitle.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="GachaBannerTitle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ru-ru\GachaBannerTitle.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="Dungeon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ru-ru\Dungeon.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>

Source/GrasscutterTools/Properties/Resources.zh-TW.resx

@@ -178,8 +178,8 @@
   <data name="Error" xml:space="preserve">
     <value>錯誤</value>
   </data>
-  <data name="GachaBennerPrefab" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\zh-tw\GachaBennerPrefab.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="GachaBannerPrefab" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\zh-tw\GachaBannerPrefab.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="Help" xml:space="preserve">
     <value>幫助</value>
@@ -279,8 +279,8 @@
   <data name="ShopJsonOverrideWarning" xml:space="preserve">
     <value>僅允許以 Shop.json 格式保存！確定要覆蓋當前指定文件嗎？</value>
   </data>
-  <data name="GachaBennerTitle" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\zh-tw\GachaBennerTitle.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="GachaBannerTitle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\zh-tw\GachaBannerTitle.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="Dungeon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\zh-tw\Dungeon.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>

Source/GrasscutterTools/Resources/AvatarColor.txt

@@ -79,4 +79,7 @@
 1092:4
 1093:5
 1094:5
+1095:5
 1096:5
+1097:4
+1098:5

Source/GrasscutterTools/Resources/SceneTag.txt

@@ -272,11 +272,13 @@
 1429:Alc_BaseGrass
 1430:Combine_GreatFesV2
 1431:FD_QZLQ_01
+1438:TrpgGame
 1439:Combine_FD_QZLQ_01
 1440:Combine_XM_TomatoFarm
 1445:NT_YSKJ_P1 (Default)
 1446:NT_YSKJ_P2
 1447:Combine_WishPond_mx
+1476:Combine_TrpgGame
 // 4
 106:SummerTime
 108:SummerTime_High
@@ -568,3 +570,27 @@
 1434:Nihil_P1 (Default)
 1435:Nihil_P2
 1444:Nihil_P1_1
+// 35971
+1456:MVM_ATT_01 (Default)
+// 35972
+1457:MVM_ATT_02 (Default)
+// 35973
+1458:MVM_ATT_01 (Default)
+// 35974
+1459:MVM_ATT_02 (Default)
+// 35976
+1461:MVM_ATT_02 (Default)
+// 35981
+1463:MVM_DEF_01 (Default)
+// 35982
+1464:MVM_DEF_02 (Default)
+// 35983
+1465:MVM_DEF_03 (Default)
+// 35984
+1466:MVM_DEF_01 (Default)
+// 35985
+1467:MVM_DEF_02 (Default)
+// 35986
+1468:MVM_DEF_03 (Default)
+// 35987
+1469:MVM_DEF_04 (Default)

Source/GrasscutterTools/Resources/WeaponColor.txt

@@ -44,6 +44,7 @@
 11512:yellow
 11513:yellow
 11514:yellow
+11515:yellow
 12101:blue
 12201:blue
 12301:blue
@@ -179,6 +180,7 @@
 15419:purple
 15424:purple
 15425:purple
+15426:purple
 15427:purple
 15501:yellow
 15502:yellow
@@ -188,3 +190,4 @@
 15509:yellow
 15511:yellow
 15512:yellow
+15513:yellow

Source/GrasscutterTools/Resources/Weather.txt

@@ -587,6 +587,7 @@
 5058:Fd_General
 5059:Fd_General
 5060:Fd_General
+5061:Fd_General
 5100:Fd41_PSHA_1st
 5101:Fd41_PSHA_2nd
 5102:Fd41_YBDT_1st
@@ -607,6 +608,7 @@
 5117:Fd41_Level_BoxMatch
 5118:Fd41_PSHA_1st_Rain
 5119:Fd41_PSHA_1st_Rain
+5120:Fd47_Cave
 5200:Fd42_LSSG_Before
 5201:Fd42_LSSG_After
 5202:Fd42_PQS_Before
@@ -1042,6 +1044,12 @@
 10267:Fd46_Kpm_GlodenLobby_After
 // 20216
 10268:Fd46_Kpm_GlodenLobby_After
+// 20217
+10274:Fd47_Md_General
+// 20219
+10275:Fd47_Md_General
+// 20225
+10276:Fd47_Md_General
 // 35800
 10009:CycleDungeon_WindFlower
 10010:CycleDungeon_WindFlower_Outdoor

Source/GrasscutterTools/Resources/en-us/Avatar.txt

@@ -79,4 +79,7 @@
 1092:Gaming
 1093:Xianyun
 1094:Chiori
+1095:Sigewinne
 1096:Arlecchino
+1097:Sethos
+1098:Clorinde

Source/GrasscutterTools/Resources/en-us/GachaBannerPrefab.txt

@@ -0,0 +1,139 @@
+A007:Beginners' wish
+A008:Wanderlust Invocation
+A009:Ballad in Goblets
+A010:Dawn Pilgrimage
+A011:Grace of Southwind
+A012:Bane of All Evil
+A013:Epitome Invocation
+A015:Sparkling Steps
+A016:Beginners' wish
+A017:Wanderlust Invocation
+A018:Sparkling Steps
+A019:Ballad in Goblets
+A020:Amos' Bow and Aquila Favonia
+A021:Lost Prayer to the Sacred Winds and Wolf's Gravestone
+A022:Wanderlust Invocation
+A023:Farewell of Snezhnaya
+A024:Gentry of Hermitage
+A025:Skyward Harp and Memory of Dust
+A026:Vortex Vanquisher and The Unforged
+A027:Secretum Secretorum
+A028:Adrift in the Harbor
+A029:Summit Shaper and Skyward Atlas
+A030:Amos' Bow and Skyward Pride
+A031:Invitation to Mundane Life
+A032:Dance of Lanterns
+A033:Moment of Bloom
+A034:Primordial Jade Winged-Spear and Primordial Jade Cutter
+A035:Staff of Homa and Wolf's Gravestone
+A036:Ballad in Goblets
+A037:Farewell of Snezhnaya
+A038:Elegy for the End and Skyward Blade
+A039:Skyward Harp and Lost Prayer to the Sacred Winds
+A040:Gentry of Hermitage
+A041:Born of Ocean Swell
+A042:Summit Shaper and Memory of Dust
+A043:Aquila Favonia and Song of Broken Pines
+A045:Leaves in the Wind
+A048:The Heron's Court
+A049:Tapestry of Golden Flames
+A052:Reign of Serenity
+A053:Drifting Luminescence
+A061:Oni's Royale
+A065:The Transcendent One Returns
+A071:Everbloom Violet
+A076:Azure Excursion
+A081:Discerner of Enigmas
+A091:Tighnari
+A092:Zhongli
+A093:Hunter's Path
+A097:Cyno
+A098:Venti
+A099:Staff of the Scarlet Sands
+A100:<3A><><EFBFBD><EFBFBD><EFBFBD>Q<EFBFBD><51>-<2D><>¶
+A101:<3A><><EFBFBD><EFBFBD>֮Ϣ-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+A102:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-ʥ<><CAA5><EFBFBD>̼<EFBFBD>
+A103:<3A>²ݵĴͻ<C4B4>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+A104:<3A><>ɫ<EFBFBD><C9AB><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD>
+A105:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-ǧҹ<C7A7><D2B9><EFBFBD><EFBFBD>
+A106:<3A><><EFBFBD><EFBFBD>ӣ<EFBFBD><D3A3>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+A107:<3A>ݱ𶬶<DDB1>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+A108:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>ֶ<EFBFBD><D6B6><EFBFBD>
+A109:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+A110:<3A><><EFBFBD>Ŷ<EFBFBD><C5B6><EFBFBD>-<2D><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>
+A111:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-ͼ<><CDBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+A112:Ӱ<><D3B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>׵罫<D7B5><E7BDAB>
+A113:<3A><><EFBFBD><EFBFBD>̤<EFBFBD><CCA4>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+A114:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>S<EFBFBD>ݲ<EFBFBD><DDB2><EFBFBD>
+A115:뷽<><EBB7BD><EFBFBD>ı-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɭ
+A116:<3A>̻<EFBFBD>֮<EFBFBD><D6AE>-<2D><>
+A117:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><>Ҷ<EFBFBD>͹<EFBFBD><CDB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+A118:<3A><><EFBFBD>ſ<EFBFBD>ʱ-<2D><><EFBFBD><EFBFBD>
+A119:<3A><><EFBFBD>ށ<EFBFBD><DE81><EFBFBD>-ҹ<><D2B9>
+A120:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><>Ħ<EFBFBD><C4A6>ˮ
+A121:<3A><>ϣ<EFBFBD><CFA3>
+A122:<3A><>ŵ
+A123:έ<><CEAD><EFBFBD>ű<EFBFBD>/<2F><>ɳ֮<C9B3><D6AE>
+A124:<3A><><EFBFBD><EFBFBD>
+A125:<3A><><EFBFBD><EFBFBD>类<EFBFBD>
+A126:<3A><><EFBFBD><EFBFBD>֮<EFBFBD>ع<EFBFBD>/Ϣ<><CFA2>
+A127:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+A128:<3A><>¶
+A129:ǧҹ<C7A7><D2B9><EFBFBD><EFBFBD>/ʥ<><CAA5>֮Կ
+A130:<3A><><EFBFBD><EFBFBD>
+A131:<3A><><EFBFBD><EFBFBD>
+A132:<3A><><EFBFBD><EFBFBD>֮<EFBFBD><D6AE>/<2F><>Ī˹֮<CBB9><D6AE>
+A133:<3A><><EFBFBD><EFBFBD>
+A134:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+A135:<3A><><EFBFBD><EFBFBD>֮<EFBFBD><D6AE><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD>֮<EFBFBD><D6AE><EFBFBD><EFBFBD>
+A136:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɭ
+A137:<3A><>ԭ<EFBFBD><D4AD>Ҷ
+A138:<3A>Թ<EFBFBD><D4B9><EFBFBD><EFBFBD><EFBFBD>֮<EFBFBD><D6AE>/<2F><>Ҷ<EFBFBD>͹<EFBFBD>
+A139:<3A><>lj
+A140:<3A><><EFBFBD><EFBFBD>
+A141:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֮ʱ/<2F>ķ<EFBFBD>ԭ<EFBFBD><D4AD>
+A142:ɺ<><C9BA><EFBFBD><EFBFBD><EFBFBD>ĺ<EFBFBD>
+A143:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+A144:<3A><><EFBFBD><EFBFBD><EFBFBD>»<EFBFBD>/ͼ<><CDBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļ<EFBFBD><C4BB><EFBFBD>
+A145:<3A><><EFBFBD><EFBFBD>
+A146:ҹ<><D2B9>
+A147:<3A><><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD>ħ<EFBFBD><C4A7>/<2F><>ˮ
+A148:<3A><><EFBFBD><EFBFBD>
+A149:<3A><><EFBFBD><EFBFBD>
+A150:<3A><><EFBFBD><EFBFBD>֮<EFBFBD><D6AE>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+A151:<3A><>ά<EFBFBD><CEAC><EFBFBD><EFBFBD>
+A152:<3A><><EFBFBD><EFBFBD>
+A153:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӿ<EFBFBD><D3BF><EFBFBD><EFBFBD>/<2F><>Ħ֮<C4A6><D6AE>
+A154:<3A><>ŷ˹<C5B7><CBB9>
+A155:<3A>µ<EFBFBD>
+A156:<3A><><EFBFBD><EFBFBD><EFBFBD>ල/<2F><>δ<EFBFBD><CEB4>֮̾ʫ
+A157:ܽ<><DCBD><EFBFBD><EFBFBD>
+A158:<3A><><EFBFBD><EFBFBD>
+A159:<3A><>ˮ<EFBFBD><CBAE>ӿ֮<D3BF><D6AE>/<2F><><EFBFBD><EFBFBD>֮<EFBFBD><D6AE>
+A160:<3A><>ŵ
+A161:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+A162:<3A><><EFBFBD><EFBFBD><EFBFBD>°׾<C2B0><D7BE><EFBFBD>/<2F><>ɳ֮<C9B3><D6AE>
+A163:<3A><>ά<EFBFBD><CEAC>
+A164:<3A><><EFBFBD><EFBFBD>类<EFBFBD>
+A165:<3A>ö<EFBFBD>/<2F><><EFBFBD><EFBFBD>֮<EFBFBD>ع<EFBFBD>
+A166:<3A>׵罫<D7B5><E7BDAB>
+A167:<3A><><EFBFBD><EFBFBD>
+A168:<3A>S<EFBFBD><53>֮<EFBFBD><D6AE><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD>֮<EFBFBD><D6AE><EFBFBD><EFBFBD>
+A169:<3A><><EFBFBD><EFBFBD>
+A170:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+A171:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/ǧҹ<C7A7><D2B9><EFBFBD><EFBFBD>
+A172:<3A><>
+A173:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+A174:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD>֮<EFBFBD><D6AE><EFBFBD><EFBFBD>
+A175:ǧ֯
+A176:<3A><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>
+A177:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD>ʯ<EFBFBD><CAAF><EFBFBD><EFBFBD>
+A178:<3A><>ά<EFBFBD><CEAC><EFBFBD><EFBFBD>
+A179:<3A><>ԭ<EFBFBD><D4AD>Ҷ
+A180:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӿ<EFBFBD><D3BF><EFBFBD><EFBFBD>/<2F>Թ<EFBFBD><D4B9><EFBFBD><EFBFBD><EFBFBD>֮<EFBFBD><D6AE>
+A181:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ŵ
+A182:<3A><><EFBFBD><EFBFBD>
+A183:<3A><><EFBFBD><EFBFBD>֮<EFBFBD><D6AE>/<2F><><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD>ħ<EFBFBD><C4A7>
+A184:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+A185:<3A><><EFBFBD><EFBFBD>
+A186:ͼ<><CDBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļ<EFBFBD><C4BB><EFBFBD>/<2F><><EFBFBD><EFBFBD>֮<EFBFBD><D6AE>

Source/GrasscutterTools/Resources/en-us/GachaBannerTitle.txt

@@ -0,0 +1,53 @@
+A007:Beginners' wish
+A008:Wanderlust Invocation
+A009:Ballad in Goblets
+A010:Dawn Pilgrimage
+A011:Grace of Southwind
+A012:Bane of All Evil
+A013:Epitome Invocation
+A015:Sparkling Steps
+A016:Beginners' wish
+A017:Wanderlust Invocation
+A018:Sparkling Steps
+A019:Ballad in Goblets
+A020:Epitome Invocation
+A021:Epitome Invocation
+A022:Wanderlust Invocation
+A023:Farewell of Snezhnaya
+A024:Gentry of Hermitage
+A027:Secretum Secretorum
+A028:Adrift in the Harbor
+A031:Invitation to Mundane Life
+A032:Dance of Lanterns
+A033:Moment of Bloom
+A036:Ballad in Goblets
+A037:Farewell of Snezhnaya
+A040:Gentry of Hermitage
+A041:Born of Ocean Swell
+A045:Leaves in the Wind
+A048:The Heron's Court
+A049:Tapestry of Golden Flames
+A052:Reign of Serenity
+A053:Drifting Luminescence
+A061:Oni's Royale
+A065:The Transcendent One Returns
+A071:Everbloom Violet
+A076:Azure Excursion
+A081:Discerner of Enigmas
+A091:Viridescent Vigil
+A097:Twilight Arbiter
+A0100:Twirling Lotus
+A0103:The Moongrass' Enlightenment
+A0109:From Ashes Reborn
+A0115:Caution in Confidence
+A0121:Auric Blaze
+A0130:Immaculate Pulse
+A0145:Conjuring Chiaroscuro
+A0151:Decree of the Deeps
+A0154:Tempestuous Destiny
+A0157:Chanson of Many Waters
+A0163:In the Name of the Rosula
+A0169:The Crane Soars Skyward
+A0175:Of Silken Clouds Woven
+A0181:The Hearth's Ashen Shadow
+B001:Ode to the Dawn Breeze

Source/GrasscutterTools/Resources/en-us/GachaBennerPrefab.txt

@@ -1,55 +0,0 @@
-007:Beginners' wish
-008:Wanderlust Invocation
-009:Ballad in Goblets
-010:Dawn Pilgrimage
-011:Grace of Southwind
-012:Bane of All Evil
-013:Epitome Invocation
-015:Sparkling Steps
-016:Beginners' wish
-017:Wanderlust Invocation
-018:Sparkling Steps
-019:Ballad in Goblets
-020:Amos' Bow and Aquila Favonia
-021:Lost Prayer to the Sacred Winds and Wolf's Gravestone
-022:Wanderlust Invocation
-023:Farewell of Snezhnaya
-024:Gentry of Hermitage
-025:Skyward Harp and Memory of Dust
-026:Vortex Vanquisher and The Unforged
-027:Secretum Secretorum
-028:Adrift in the Harbor
-029:Summit Shaper and Skyward Atlas
-030:Amos' Bow and Skyward Pride
-031:Invitation to Mundane Life
-032:Dance of Lanterns
-033:Moment of Bloom
-034:Primordial Jade Winged-Spear and Primordial Jade Cutter
-035:Staff of Homa and Wolf's Gravestone
-036:Ballad in Goblets
-037:Farewell of Snezhnaya
-038:Elegy for the End and Skyward Blade
-039:Skyward Harp and Lost Prayer to the Sacred Winds
-040:Gentry of Hermitage
-041:Born of Ocean Swell
-042:Summit Shaper and Memory of Dust
-043:Aquila Favonia and Song of Broken Pines
-045:Leaves in the Wind
-048:The Heron's Court
-049:Tapestry of Golden Flames
-052:Reign of Serenity
-053:Drifting Luminescence
-061:Oni's Royale
-065:The Transcendent One Returns
-071:Everbloom Violet
-076:Azure Excursion
-081:Discerner of Enigmas
-091:Tighnari
-092:Zhongli
-093:Hunter's Path
-097:Cyno
-098:Venti
-099:Staff of the Scarlet Sands
-//100:Twirling Lotus // Error
-101:Secretorum Secretorum
-102:Epitome Invocation

Source/GrasscutterTools/Resources/en-us/GachaBennerTitle.txt

@@ -1,55 +0,0 @@
-007:Beginners' wish
-008:Wanderlust Invocation
-009:Ballad in Goblets
-010:Dawn Pilgrimage
-011:Grace of Southwind
-012:Bane of All Evil
-013:Epitome Invocation
-015:Sparkling Steps
-016:Beginners' wish
-017:Wanderlust Invocation
-018:Sparkling Steps
-019:Ballad in Goblets
-020:Amos' Bow and Aquila Favonia
-021:Lost Prayer to the Sacred Winds and Wolf's Gravestone
-022:Wanderlust Invocation
-023:Farewell of Snezhnaya
-024:Gentry of Hermitage
-025:Skyward Harp and Memory of Dust
-026:Vortex Vanquisher and The Unforged
-027:Secretum Secretorum
-028:Adrift in the Harbor
-029:Summit Shaper and Skyward Atlas
-030:Amos' Bow and Skyward Pride
-031:Invitation to Mundane Life
-032:Dance of Lanterns
-033:Moment of Bloom
-034:Primordial Jade Winged-Spear and Primordial Jade Cutter
-035:Staff of Homa and Wolf's Gravestone
-036:Ballad in Goblets
-037:Farewell of Snezhnaya
-038:Elegy for the End and Skyward Blade
-039:Skyward Harp and Lost Prayer to the Sacred Winds
-040:Gentry of Hermitage
-041:Born of Ocean Swell
-042:Summit Shaper and Memory of Dust
-043:Aquila Favonia and Song of Broken Pines
-045:Leaves in the Wind
-048:The Heron's Court
-049:Tapestry of Golden Flames
-052:Reign of Serenity
-053:Drifting Luminescence
-061:Oni's Royale
-065:The Transcendent One Returns
-071:Everbloom Violet
-076:Azure Excursion
-081:Discerner of Enigmas
-091:Tighnari
-092:Zhongli
-093:Hunter's Path
-097:Cyno
-098:Venti
-099:Staff of the Scarlet Sands
-//100:Twirling Lotus // Error
-101:Secretorum Secretorum
-102:Epitome Invocation

Source/GrasscutterTools/Resources/en-us/Gadget.txt

@@ -271,6 +271,7 @@
 41076011:Faruzan_WindBlackHole
 41076015:Faruzan_SkillObj_WindZone_Hit
 41083009:Linette_Constellation_WindZone
+41098006:Clorinde_Constellation_1_Gadget
 42000001:Fishing_Aim_Bullet
 42000002:Fishing_Cork
 42103002:Shaman_HealRain_Field
@@ -790,13 +791,43 @@
 41093023:Liuyun_ElementalBurst_SmallWindHole
 41094004:Bullet_Chiori_ElementalArt_Rush_Detect
 41094006:SkillObj_Chiori_ElementalBurst_RockBomb
+41095001:Sigewinne_Extra_Bubble_Bullet
+41095002:Sigewinne_EArt_Bullet_Normal
+41095003:Sigewinne_EArt_Bullet_No_Enemy
+41095004:Sigewinne_EArt_Bullet_One_Enemy
+41095005:Sigewinne_EArt_Bullet_Normal_Shoot_NoTarget
+41095006:Sigewinne_ElementalArt_Core
+41095007:Sigewinne_Arrow_01
+41095008:Sigewinne_Arrow_02
+41095009:Sigewinne_Arrow_03
+41095010:Sigewinne_AimingArrow_WithoutWater
+41095011:Sigewinne_AimingArrow_Water
+41095012:Sigewinne_EArt_Bullet_Normal_New
+41095013:Sigewinne_Burst_Attacker
 41096003:Arlecchino_ExtraAttack_Bullet
+41097001:Sethos_Arrow_01
+41097002:Sethos_Arrow_02
+41097003:Sethos_Arrow_03
+41097004:Sethos_Arrow_04
+41097005:Sethos_AimingArrow_WithoutElec
+41097006:Sethos_AimingArrow_WithElec
+41097007:Sethos_AimingArrow_Lightning
+41097008:Sethos_AimingArrow_Lightning_Burst_01
+41097009:Sethos_AimingArrow_Lightning_Burst_02
+41097010:Sethos_AimingArrow_Lightning_Burst_03
+41097011:Sethos_AimingArrow_Lightning_Burst_04
+41098001:Clorinde_DodgeAttack_Small
+41098002:Clorinde_DodgeAttack_Medium
+41098003:Clorinde_DodgeAttack_Large
+41098004:Clorinde_ElementArt_Attack_Bullet_Penetrating
+41098005:Clorinde_ElementArt_Attack_Bullet_Standard
 42000003:Activity_Pitch_Pot_Throw_Bullet
 42000004:Activity_Pitch_Pot_Throw_Bullet_02
 42000005:BossNarzissenkreuzBattle_PlayerSkill_Bullet_1
 42000006:BossNarzissenkreuzBattle_PlayerSkill_Bullet_2
 42000007:Activity_GoalChallenge_Level03_WindZone
 42000008:Activity_GoalChallenge_Level04_RainZone
+42000010:Bullet_ActivityAbility_MVM_AvatarSkill_Asist
 42001002:Slime_RockThrow
 42001003:Slime_Bubble
 42001004:Slime_IceCone
@@ -925,6 +956,7 @@
 42005021:Oceanid_DelayWaterBall_Trigger
 42005022:Oceanid_Squirrel_WaterWave
 42005024:Oceanid_WaterLaser_LockTarget
+42005026:MvM_Frog_WaterWave
 42005101:Necalevia_RangeBullet
 42005102:Necalevia_AOERangeMulti
 42005103:Necalevia_Small_RangeBullet
@@ -954,8 +986,10 @@
 42006401:Sylph_Ice_IceBullet_01
 42006402:Sylph_Ice_ElementBullet
 42006403:Sylph_Ice_Activated_AirGun
+42006407:Sylph_Ice_IceBullet_02
 42006501:Sylph_Electric_FlyHor_FollowBullet
 42006601:Sylph_Fire_FireBullet
+42006605:MvM_Sylph_Fire_FireBullet
 42006701:Sylph_Grass_GrassBullet
 42006702:Sylph_Grass_HealArea_Bullet
 42006705:Sylph_Grass_Activated_DeathBullet
@@ -985,6 +1019,8 @@
 42101025:Hili_Wei_NoWeapon_ThrowBomb_Bullet03
 42101026:Hili_Electric_SlimeThrow
 42101027:Monster_Arrow_ShootingActivity
+42101028:MvM_Hili_Electric_Arrow
+42101029:MvM_Hili_Ice_Arrow
 42102001:Brute_Axe_FireWave01
 42102002:Brute_Axe_FireWave02
 42102003:Brute_Axe_FireSlime_Fire
@@ -1254,6 +1290,10 @@
 42406057:MachinaIustitia_Bradamante_Summon_Bullet
 42406059:MachinaIustitia_Bradamante_Attack02_FollowBullet2
 42406060:MachinaIustitia_Bradamante_Attack02_FollowBullet3
+42406061:MvM_MachinaIustitia_Ruggiero02_Attack02_Bullet
+42406062:MvM_MachinaIustitia_Ruggiero02_Attack02_Bullet2
+42406063:MvM_MachinaIustitia_Assimilator_NormalAttack01_Bullet
+42406064:MvM_MachinaIustitia_Assimilator_MeleeAttack01_Bullet
 42407002:MachinaIustitia_Nutcracker_Stage1_WindBullet1
 42407003:MachinaIustitia_Nutcracker_Stage1_WindBullet2
 42407004:MachinaIustitia_Nutcracker_Stage1_IceBullet
@@ -1293,6 +1333,9 @@
 42481009:FungusFighterV2_TowerPhysics_SkillBullet
 42481010:FungusFighterV2_TowerElectric_LockTarget
 42481011:FungusFighterV2_TowerWind_LockTarget
+42481012:MvM_TowerFire_FireBullet
+42481013:MvM_TowerIce_IceBullet
+42481014:MvM_TowerWindBullet
 42499001:Bullet_Alternate_01
 42501001:Thoarder_ThrowingKnife
 42501002:Thoarder_Bomb
@@ -1312,6 +1355,8 @@
 42501020:Thoarder_Rocky_Guitar_ElectricBottle
 42501024:Thoarder_Rocky_Guitar_ElectricBomb_Bullet
 42501026:Thoarder_ThrowingKnife_ShootingActivity
+42501027:MvM_Thoarder_MolotovCocktail
+42501028:MvM_Thoarder_Bomb_ElementalEffect_Fire
 42503001:Thoarder_Shovel_MuddyBullet
 42503002:Thoarder_Fat_Shovel_MuddyBullet
 42504001:Thoarder_HatchetThrow
@@ -1322,6 +1367,8 @@
 42508001:Samurai_Ronin_ShootBullet
 42508002:Samurai_RushAtk_Scene
 42508004:Samurai_RushAtk_Bullet
+42508006:MvM_Samurai_Ronin_ShootBullet
+42508007:MvM_Samurai_RushAtk_Bullet
 42509002:Samurai_Ningyo_WindBladeAir1
 42509003:Samurai_Ningyo_WindBladeAir2
 42509006:Samurai_Ningyo_WindGhost_BladeAir
@@ -1399,6 +1446,8 @@
 42601123:FauneAbyssale_SeaHorse_Primo_ElectronCharge_Physic
 42601125:FauneAbyssale_SeaHorse_Primo_RockGadget_Crasher
 42601128:FauneAbyssale_SeaHorse_Primo_ShuttleAttack_Bullet
+42601134:MvM_FauneAbyssale_SeaHorse_Mature_BallLightning
+42601135:MvM_FauneAbyssale_SeaHorse_Mature_WaterBullet
 42602004:Regisvine_RangedAttack01_Bullet
 42602005:Regisvine_RangedAttack02_MinorMissile
 42602006:Regisvine_MissileAttack_LargeMissile
@@ -1485,6 +1534,8 @@
 42606004:Cicin_WaterBall
 42606005:Cicin_IceSpear
 42606006:Cicin_IceShieldEnergy
+42606007:MvM_Cicin_WaterBall
+42606008:MvM_Cicin_ElectricBall
 42607003:Inu_Shihandai_Blink_Hat
 42607006:Inu_Shihandai_CounterAttackBlade
 42607010:Inu_Shihandai_RangeBlade
@@ -1518,6 +1569,7 @@
 42609027:Fungus_Un_Water_SuperWaterBullet
 42609028:Fungus_Trois_Ice_BlizzardPoint
 42609029:Fungus_Deux_Wind_HealingWavePoint
+42609030:MvM_Fungus_Un_Delta_Wind_BulletDecayed
 42610001:Scorpion_Sacred_SacredAttack03_Bullet
 42610002:Scorpion_Sacred_SacredAttack05_Bullet
 42610004:Scorpion_Sacred_SacredEnergy_Bullet
@@ -1890,6 +1942,12 @@
 49001023:MonsterAffix_Activity_Deathrattle_Gadget_DoomLogic
 49001025:MonsterAffix_Activity_AkaFes_RockDamage_LowWave_SingleBullet
 49001027:Activity_MultiCharacter_BulletToGround
+49001034:Gadget_RoleCombat_TracingEnergyBall
+49001036:Gadget_RoleCombat_TracingEnergyBall_Grass
+49001042:MonsterAffix_RoleCombat_DeathMatch_FieldBullet
+49001049:MonsterAffix_RoleCombat_Haunted_Bullet
+49001051:MonsterAffix_RoleCombat_Haunted_TrackGhostBullet
+49001052:MonsterAffix_RoleCombat_Backer_FieldBullet
 70220037:SceneObj_Environment_CobWeb_Bullet
 70220053:Bullet_IceSentryTurrets_Ice_Bullet
 70220073:Bullet_IceSentryTurrets_Thunder_Bullet
@@ -1927,6 +1985,12 @@
 70291138:SceneObj_Area_Common_Property_Ani_Prop_Jamballoon_Bullet_01
 70291151:Penumbra_CannonBall_01
 70291152:Penumbra_CannonBall_02
+70291180:Penumbra_CannonBallV2_01
+70291181:Penumbra_CannonBallV2_02
+70291182:Penumbra_CannonBallV2_03
+70291185:Penumbra_CannonBallV2_04
+70291294:SceneObj_Activity_Common_Property_Ani_Prop_BulletHell_Barrage_Bullet_02
+70291295:SceneObj_Activity_Common_Property_Ani_Prop_BulletHell_Barrage_Bullet_01
 70291440:SceneObj_Activity_Common_Property_Ani_Prop_AutoTimeStop_Barrage_Bullet_03
 70291441:SceneObj_Activity_Common_Property_Ani_Prop_AutoTimeStop_Barrage_Bullet_02
 70291442:SceneObj_Activity_Common_Property_Ani_Prop_AutoTimeStop_Barrage_Bullet_01
@@ -2344,6 +2408,9 @@
 41094007:SkillObj_Chiori_Turret_Constellation
 41096001:Arlecchino_ElementalBurst_Gadget
 41096002:Arlecchino_ElementalArt_ShadowAvatar
+41098007:Clorinde_Constellation_6_Gadget
+42000011:ActivityAbility_MVM_AvatarSkill_Asist_02
+42000012:ActivityAbility_MVM_AvatarSkill_Asist_03
 42001001:Slime_IceCone_AimPoint
 42001005:Slime_IceFog
 42001010:Slime_WindZone_02
@@ -2423,6 +2490,7 @@
 42005019:Oceanid_PlatformDamage
 42005023:Oceanid_MustKill_Empty
 42005025:Oceanid_Affix_DeathExplode
+42005027:MvM_Frog_DeathExplode
 42005129:Narcissusborn_DartAttack_InitialPos
 42005130:Narcissusborn_EnhancedDartDartAttack_InitialPos
 42005131:Narzissenkreuz_DartAttack_InitialPos
@@ -2498,6 +2566,7 @@
 42103035:Shaman_FloorAttack01_Gadget
 42103036:Shaman_SuperJump_Area
 42103037:Shaman_Note_Buff_Gadget
+42103039:MvM_Shaman_Torrent_Area
 42201003:Abyss_FireEnergy_Surround
 42201007:Abyss_Impulse
 42201011:Abyss_IceCone_Area
@@ -2619,6 +2688,7 @@
 42409014:MachinaIustitia_Gravitas_ImpactWave_01
 42481006:FungusFighterV2_TowerFire_SkillAOE
 42481008:FungusFighterV2_TowerIceWall
+42481015:MvM_TowerWater_Torrent_Area
 42501012:BoxMatch_Assistant_IceBomb_TargetPoint
 42501015:BoxMatch_Hatchet_FireWork_Lv1
 42501017:BoxMatch_Hatchet_FireWork_Lv2_Attack
@@ -3031,6 +3101,7 @@
 42910024:Nihil_Story_HelpSkillHandler
 42910026:Nihil_Story_HelpSkill_RushAtk
 42910032:Nihil_Story_HelpSkill_Bomb
+42910033:Nihil_DonimatAttack_Control
 43805005:Bullet_Animal_Electrohercules_ElectricBall_OnGround
 43805014:Animal_Electrohercules_Defend_Turorial
 44000002:SkillObj_GlidingChallenge_AirDash_Forward
@@ -3210,6 +3281,12 @@
 44000594:HideType_A_Style_InvisibleBait_Target
 44000595:HideType_A_Style_InvisibleBait_Target
 44000596:HideType_A_Style_InvisibleBait_Target
+44000597:SkillObj_Activity_AcrobaticsBattle_Lv1
+44000598:SkillObj_Activity_AcrobaticsBattle_Lv3
+44000599:SkillObj_Activity_AcrobaticsBattle_Lv4
+44000600:SkillObj_Activity_AcrobaticsBattle_Lv7
+44000601:SkillObj_Activity_AcrobaticsBattle_Lv0
+44000602:SkillObj_Activity_AcrobaticsBattle_KillCall
 49001001:GeneralSkill_IceDamage_Prison_Center
 49001002:GeneralSkill_WindDamage_Vortex_Center
 49001003:GeneralSkill_RockDamage_LowWave_Emitter
@@ -3223,6 +3300,23 @@
 49001020:MonsterAffix_Drop_Rock_CenterGadget
 49001024:MonsterAffix_Activity_AkaFes_RockDamage_LowWave_Emitter
 49001028:MonsterAffix_Monster_Yunqi_Die_BroadCast
+49001029:Gadget_RoleCombat_ThunderArea
+49001030:Gadget_RoleCombat_ThunderArea_Stage1
+49001031:Gadget_RoleCombat_ThunderArea_Stage2
+49001032:Gadget_RoleCombat_ThunderArea_Stage3
+49001033:Gadget_RoleCombat_TracingEnergyBall_CreatorGadget
+49001035:Gadget_RoleCombat_TracingEnergyBall_Grass_CreatorGadget
+49001038:Gadget_RoleCombat_BulletToGround
+49001039:MonsterAffix_RoleCombat_DeathRattleCrystal_DamageGadget
+49001040:MonsterAffix_RoleCombat_BoomTime_LogicGadget
+49001041:MonsterAffix_RoleCombat_Yunqi_Die_BroadCast
+49001043:Gadget_RoleCombat_Bonus_FungusRaptor_Weak_Kill
+49001044:Gadget_RoleCombat_Bonus_MonolithStarchild_Weak_Kill
+49001045:Gadget_RoleCombat_Bonus_DrakeDeepSea_No_Revive
+49001046:Gadget_RoleCombat_Bonus_DrakeDeepSea_MagicBall_NoHit
+49001047:Gadget_RoleCombat_Bonus_HermitCrabPrimo_Weak_Kill
+49001048:Gadget_RoleCombat_Bonus_SeaHorsePrimo_Recover_Break
+49001050:MonsterAffix_RoleCombat_Haunted_FreeGhost
 70000012:BroadLeaf01
 70020001:Enviro01
 70020002:Enviro02
@@ -3559,6 +3653,8 @@
 70230124:SceneObj_Area_Xm_Property_Ani_Decal_CrystalWall_01
 70230125:SceneObj_Area_Xm_Property_Ani_Decal_CrystalWall_01
 70230126:SceneObj_Area_Xm_Property_Ani_Decal_CrystalWall_01
+70230127:SceneObj_Area_Common_Property_Ani_Prop_MvM_SandTable_01
+70230128:[N/A] 3947176030
 70240001:SceneObj_LostParadise_Common_Property_Prop_RainCol_01
 70240002:SceneObj_LostParadise_Common_Property_Prop_RainCol_01
 70240003:SceneObj_LostParadise_Common_Property_Prop_RainCol_01
@@ -4497,8 +4593,30 @@
 70291167:SceneObj_Area_Common_Property_Ani_Prop_Jamballoon_02
 70291168:SceneObj_Penumbra_Common_Property_Ani_Prop_BladeDanceGate_01
 70291169:[N/A] 2187650446
+70291170:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291171:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonV2_01
+70291172:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonV2_02
+70291186:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTargetBall_01
+70291187:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291188:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291189:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291190:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291282:SceneObj_Quest_DimensionalCollapse_01
+70291283:SceneObj_Level_Common_AvatarObj_Ani_Quest_SgwMixtureBottle_01
+70291284:[N/A] 4156213838
+70291285:[N/A] 4072703862
+70291286:SceneObj_Level_Common_Property_Ani_Prop_CharAmuseBarrier_01
+70291287:SceneObj_Level_Common_Property_Ani_Prop_CharMasterEntrance_01
+70291288:SceneObj_Level_Common_Property_Ani_Prop_MarechausseeGate_01
+70291289:SceneObj_Area_Fd_TreasureEntry_Door_01
+70291290:SceneObj_Level_Common_Property_Ani_Build_Hiddendoor_01
+70291292:SceneObj_Level_Common_Property_Ani_Prop_CoinDummy_02
+70291293:SceneObj_Level_Common_Property_Ani_Prop_CoinDummy_01
 70291296:SceneObj_Area_Fd_ChioriDungeon_SoundController_01
 70291297:SceneObj_Area_Common_Property_Prop_DelucChallengeAirwall_02
+70291298:SceneObj_Level_Common_Property_Ani_Prop_LeaserWall_01
+70291299:SceneObj_Level_Common_Property_Ani_Prop_BulletHellCoin_01
+70291300:SceneObj_Level_Common_Property_Ani_Prop_BulletHellCoin_02
 70291301:SceneObj_Area_Common_Property_Prop_Catcafe_FollowmoveInteract_01
 70291302:SceneObj_Area_Fd_Property_Ani_Prop_FdCommonGate_01
 70291303:SceneObj_Area_Fd_Property_Ani_Prop_FdCommonGate_02
@@ -5612,6 +5730,16 @@
 70320135:SceneObj_Area_Common_Property_Prop_CharAmusementAirWall_07
 70320136:SceneObj_Area_Common_Property_Prop_CharAmusementAirWall_08
 70320137:SceneObj_Area_Common_Property_Prop_CharAmusementAirWall_09
+70320138:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_Flag_01
+70320139:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_Flag_02
+70320140:[N/A] 882392350
+70320141:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_DropCard_01
+70320142:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_DropCard_02
+70320143:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackGate_01
+70320150:[N/A] 4078867398
+70320151:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackGate_02
+70320152:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackLight_01
+70320153:[N/A] 2891105062
 70330002:SceneObj_Gear_ElemForce_Operator
 70330003:SceneObj_Gear_ElemForce_Fire
 70330004:SceneObj_Gear_ElemForce_Fire_Hit
@@ -6707,9 +6835,41 @@
 70350499:SceneObj_Area_Xm_Property_Ani_Prop_ElecTrailBulletGen_02
 70350500:Activity_Gadget_AkaFesPotion_Fire_Debuff_Driver
 70350501:SceneObj_Area_Xm_Property_Ani_Prop_FloatFarr_02
+70350503:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Podium_01
+70350504:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Phonograph_01
+70350505:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Divination_01
+70350506:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_MagicBook_01
+70350507:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_TeamEditor_01
+70350508:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_GuardEntity_01
+70350509:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_CityAxis_01
+70350510:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Entry_01
+70350511:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_LoopElevator_01
 70350512:SceneObj_Level_Common_Property_Ani_Bridge_LyFloatingBridge_01
+70350513:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_TeamEditor_02
+70350514:[N/A] 3284301342
+70350515:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_RageController_01
+70350516:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_RestQuitPoint_01
+70350517:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_CamearAdjust_01
+70350518:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_ESPManager_01
+70350520:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_AirwallAuditorium
+70350521:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_SitPointController_01
+70350522:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_01
+70350523:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_02
+70350525:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_AuditoriumEnd_01
+70350526:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_03
+70350527:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_01
 70350528:SceneObj_Area_Ly_Property_Ani_Prop_GreatFestivalV2_GuidePoint_01
 70350529:SceneObj_Area_Ly_Property_Ani_Prop_GreatFestivalV2_GuidePoint_02
+70350530:SceneObj_Level_Common_Property_Ani_Prop_LightGuideGear_01
+70350531:SceneObj_Level_Common_Property_Ani_Prop_FloorGateGear_01
+70350532:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_04
+70350533:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearDoor_01
+70350534:SceneObj_Gear_MvM_Trap
+70350535:SceneObj_Level_Common_Property_Prop_TowerRepelV3
+70350536:SceneObj_Gear_MvM_Mine
+70350537:SceneObj_Gear_Operator_MvM_Mamolu
+70350538:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_AuditorSound
+70350539:SceneObj_Gear_Operator_MvM_Mamolu_02
 70360011:SceneObj_Gear_Other_Balloon_Destination
 70360012:SceneObj_Gear_Other_Balloon_Destination2
 70360013:SceneObj_Gear_Other_Balloon_Destination3
@@ -8297,6 +8457,8 @@
 70711494:[N/A] 1130721848
 70711495:[N/A] 2735899096
 70711496:[N/A] 454832160
+70711497:[N/A] 2950885832
+70711498:[N/A] 505742752
 70711499:[N/A] 894963696
 70711500:[N/A] 230712120
 70711501:[N/A] 245820744
@@ -8319,11 +8481,66 @@
 70711518:[N/A] 2253302248
 70711519:[N/A] 2953437496
 70711521:[N/A] 3889181896
+70711524:[N/A] 505671616
 70711525:[N/A] 3664702656
+70711526:SceneObj_Eff_Quest_FdHotelTea_02
 70711532:[N/A] 3770495576
 70711534:[N/A] 1937340752
 70711535:[N/A] 3566751808
-70711568:[CHS] - (test)巴慕恩的日记
+70711536:[N/A] 1559943344
+70711537:[N/A] 4005836184
+70711538:[N/A] 1443263448
+70711539:[N/A] 3264946752
+70711540:[N/A] 2774305888
+70711541:[N/A] 467487816
+70711542:[N/A] 191718648
+70711543:[N/A] 379289088
+70711544:[N/A] 3265146368
+70711545:[N/A] 3112380536
+70711546:[N/A] 3293241152
+70711547:[N/A] 1649036848
+70711548:[N/A] 3579505024
+70711549:[N/A] 137682824
+70711550:[N/A] 574660032
+70711551:[N/A] 3832895152
+70711552:[N/A] 4137990640
+70711553:[N/A] 92502520
+70711554:[N/A] 1521413072
+70711555:[N/A] 1463601392
+70711556:[N/A] 3383584096
+70711557:[N/A] 205557824
+70711558:[N/A] 1171982400
+70711560:[N/A] 2051742328
+70711561:SceneObj_Item_Default_Item
+70711563:[N/A] 451175824
+70711564:[N/A] 154356784
+70711565:[N/A] 1820895784
+70711566:[N/A] 4209996104
+70711567:[N/A] 3336031008
+70711568:SceneObj_Quest_SimpleGadgetTalk03
+70711569:SceneObj_Area_Fd_Property_Prop_XgwRoom
+70711570:SceneObj_Quest_SimpleGadgetTalk
+70711571:[N/A] 2286571232
+70711572:[N/A] 79054456
+70711573:SceneObj_Quest_SimpleGadgetTalk05
+70711574:SceneObj_Item_Default_Item
+70711575:SceneObj_Item_Default_Item
+70711576:[N/A] 94595696
+70711577:[N/A] 2592892600
+70711578:[N/A] 3616900488
+70711579:SceneObj_Quest_Property_Ani_Prop_EnergyCaster_Operator_05
+70711580:[N/A] 2097752928
+70711581:SceneObj_Item_Default_Item
+70711582:[N/A] 2478379936
+70711583:[N/A] 2035742872
+70711584:[N/A] 2758548224
+70711585:SceneObj_Item_Default_Item
+70711592:SceneObj_Area_Fd_Property_Ani_Prop_ElderQuilt_02
+70711593:[N/A] 2996193296
+70711594:[N/A] 22295480
+70711595:SceneObj_SigewinneSmoke_01
+70711597:[N/A] 362532096
+70711598:[N/A] 2140889768
 70720216:FireElfTrack
 70720219:SceneObj_Area_Cyjy_Property_Ani_Prop_LitSeelieFootprint_01
 70800002:MsgBoard
@@ -9217,6 +9434,7 @@
 70950206:Activate
 70950207:Unlock
 70950208:Assemble
+70950214:[N/A] 1320639990
 71000004:SceneObj_Amber_RockAmber
 71000005:SceneObj_Task_Rock_Pierce
 71000006:SceneObj_Task_Rock_Pierce
@@ -9565,6 +9783,14 @@
 71700751:[N/A] 233005080
 71700752:[N/A] 3608415800
 71700753:[N/A] 946830120
+71700754:SceneObj_Area_Common_Prop_Common_Twins_Dungeonportal_01
+71700755:SceneObj_Area_Common_Prop_Common_Twins_Butterfly_01
+71700756:[N/A] 1320471632
+71700757:[N/A] 3261253664
+71700758:[N/A] 3555596624
+71700759:[N/A] 1521717744
+71700760:SceneObj_Environment_Bulletin94
+71700761:SceneObj_Environment_Bulletin95
 72000001:SceneObj_Monster_Eldritch_Tentacle_PA
 72000002:SceneObj_Monster_Eldritch_Tentacle_PB
 72000003:SceneObj_Monster_Eldritch_Tentacle_PC
@@ -10178,6 +10404,7 @@
 77111013:Restaurant Rug: "Equal Dialogue"
 77111014:Restaurant Rug: "Bathing in the Breeze"
 77111015:Fontainian Carpet: "Fair and Square"
+77111016:[N/A] 3138406544
 77112001:Well-Worn Buckler
 77112002:Well-Worn Shield
 77112003:Well-Worn Sword
@@ -10778,6 +11005,8 @@
 77204226:"Crystalline Glory"
 77204227:"Inspiration's Pure White Blossoms"
 77204228:"Salubrious Fragrance"
+77204229:[N/A] 3763891128
+77204230:[N/A] 2588701016
 77205001:Smooth Wooden Bench
 77205002:Smooth Stone Bench
 77205003:Googol Chair
@@ -11120,6 +11349,8 @@
 77215099:Bronze Curio: Ancient Golden Visage
 77215100:Suspensus Somnium Mechanism
 77215101:Carefree Simulacrum
+77215102:[N/A] 950928056
+77215103:[N/A] 2479535064
 77216001:Foundations of Stone: Path of Cultivation
 77216002:Foundations of Stone: Timely Arrival
 77216003:Foundations of Stone: Double-Time
@@ -12177,6 +12408,21 @@
 71700729:Anecdota Septentrionalis (III)
 71700747:Shikanoin Heizou's Message
 71700748:Puppy Union Admission Details
+71700762:[N/A] 976481484
+71700763:[N/A] 1459849724
+71700764:[N/A] 524159380
+71700765:[N/A] 1496186356
+71700766:[N/A] 1649628252
+71700767:[N/A] 3370696724
+71700768:[N/A] 2053389412
+71700769:[N/A] 3448013372
+71700770:[N/A] 3218519604
+71700771:[N/A] 4203305580
+71700772:[N/A] 2790292388
+71700773:[N/A] 969093148
+71700774:[N/A] 1702828196
+71700775:[N/A] 476652700
+71700776:[N/A] 1144681508
 77304001:Silk Flower
 77304002:Sweet Flower
 77304003:Cecilia
@@ -12234,6 +12480,7 @@
 49001017:Activity_ChannellerSlab_DangerArea
 49001019:Activity_ChannellerSlab_DangerArea_Enhanced
 49001026:Activity_MultiCharacter_DangerArea
+49001037:Gadget_RoleCombat_DangerArea
 70220054:SceneObj_Gear_Combat_Shooter_Laser
 70220074:SceneObj_Gear_Combat_Shooter_Laser_Elec_01
 70220113:SceneObj_Area_Common_Property_Water_Waterplatform_01
@@ -12322,6 +12569,16 @@
 70291148:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTarget_05
 70291149:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTarget_06
 70291150:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTarget_01
+70291173:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_01
+70291174:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_02
+70291175:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_03
+70291176:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_04
+70291177:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_05
+70291178:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_06
+70291179:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTarget_02
+70291183:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTargetWeak_01
+70291184:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTargetBall_02
+70291291:SceneObj_Level_Common_Property_Ani_Prop_BulletHell_StaticBullet_01
 70291428:SceneObj_Area_Fd_Property_Ani_Prop_ShopRobot_01
 70291429:SceneObj_Area_Fd_Property_Ani_Prop_TrapFittingRoom_01
 70291477:SceneObj_Area_Common_Property_Ani_SpriteEffect_01
@@ -12423,6 +12680,9 @@
 70320104:SceneObj_Area_Fd_Property_Ani_Prop_GearPipe_Gear_03
 70320117:SceneObj_Level_Common_Property_Ani_Prop_CharAmuseBasket_01
 70320118:SceneObj_Level_Common_Property_Ani_Prop_CharAmuseBasket_02
+70320146:SceneObj_Level_Common_Property_Ani_Prop_SgwDungeonTruck_01
+70320147:SceneObj_Level_Common_Property_Ani_Prop_SgwDungeonTruck_02
+70320148:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackSwitcher_02
 70330081:SceneObj_Area_Common_Property_Ani_Rock_RotatableCube_01
 70330083:SceneObj_Area_Common_Property_Ani_Rock_RotatableCube_04
 70330118:SceneObj_Area_Common_Property_Ani_Rock_RotatableCubeShader_04
@@ -12956,6 +13216,8 @@
 50004102:MonEquip_Axe_Electric_02
 50004103:MonEquip_Crossbow_01
 50004104:MonEquip_Thoarder_Rocky_Guitar
+50004105:MonEquip_Axe_01
+50004111:MonEquip_WoodenClub_01
 
 // Equip
 50010002:Weapon_Sword_Metal
@@ -13015,6 +13277,7 @@
 50011512:Weapon_Sword_Metal
 50011513:Weapon_Sword_Metal
 50011514:Weapon_Sword_Metal
+50011515:Weapon_Sword_Metal
 50012101:Weapon_Claymore_Metal
 50012201:Weapon_Claymore_Metal
 50012301:Weapon_Claymore_Metal
@@ -13159,6 +13422,7 @@
 50015419:Weapon_Bow_Metal
 50015424:Weapon_Bow_Metal
 50015425:Weapon_Bow_Metal
+50015426:Weapon_Bow_Metal
 50015427:Weapon_Bow_Metal
 50015501:Weapon_Bow_Metal
 50015502:Weapon_Bow_Metal
@@ -13171,6 +13435,7 @@
 50015509:Weapon_Bow_Metal
 50015511:Weapon_Bow_Metal
 50015512:Weapon_Bow_Metal
+50015513:Weapon_Bow_Metal
 50100001:SubEquip_Feiyan_Steelyard
 
 // SubEquip
@@ -13620,6 +13885,8 @@
 70320095:SceneObj_Area_Fd_Property_Ani_Prop_FactoryJukebox_01
 70320100:SceneObj_Area_Fd_Property_Ani_Prop_ResearchConsole_01
 70320105:SceneObj_Area_Fd_Property_Ani_Prop_FDFacPipeValve_01
+70320144:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackSwitcher_01
+70320145:SceneObj_Level_Common_Property_Ani_Prop_SgwDungeonTruck_03
 70330001:SceneObj_Gear_ElemForce_Initial
 70330019:SceneObj_Gear_ElemForce_Base_Rock
 70330024:SceneObj_Gear_ElemForce_Base
@@ -13734,6 +14001,8 @@
 70350486:SceneObj_Area_Xm_Property_Prop_CipherSwitch_04
 70350493:SceneObj_Level_Xm_Property_Ani_Prop_SlushaShellOperator_01
 70350502:SceneObj_Area_Xm_Property_Prop_CipherSwitch_05
+70350519:SceneObj_Gear_Operator_Mamolu_RoleCombat
+70350524:SceneObj_Level_Common_Property_Ani_Prop_TurntableOperator_01
 70360001:SceneObj_Gear_Operator_Invisible_Operator
 70360002:SceneObj_Gear_Operator_Normal_Operator
 70360003:SceneObj_Quest_Clue01

Source/GrasscutterTools/Resources/en-us/Monsters.txt

@@ -14,6 +14,7 @@
 20010503:Slime_Electric_02_SimpleStick - [N/A] 1834387465
 20010504:Slime_Electric_02 - [N/A] 2297127161
 20010581:Slime_Electric_02 - [N/A] 3442560241
+20010590:Slime_Electric_04 - [N/A] 3609489745
 20010601:Large Electro Slime
 20010602:Large Electro Slime (Mechanicus)
 20010604:Large Electro Slime
@@ -49,6 +50,7 @@
 20011205:Slime_Fire_02_SimpleStick - [N/A] 453720297
 20011207:Slime_Fire_02 - [N/A] 1709031969
 20011281:Slime_Fire_02 - [N/A] 1865400017
+20011290:Slime_Fire_06 - [N/A] 759614481
 20011301:Large Pyro Slime
 20011302:Large Pyro Slime (Mechanicus)
 20011304:Large Pyro Slime
@@ -86,6 +88,7 @@
 20050501:Oceanid Finch
 20050502:Oceanid Finch
 20050581:Monster_Oceanid_Tit - [N/A] 2975528057
+20050590:Monster_Oceanid_Tit_02 - [N/A] 3906620841
 20050601:Oceanid Mallard
 20050602:Oceanid Mallard (Landwalker Version)
 20050603:Oceanid Mallard
@@ -116,10 +119,12 @@
 20060382:Sylph_Wind_01 - [N/A] 2626651433
 20060401:Cryo Specter
 20060481:Sylph_Ice_01 - [N/A] 3638534065
+20060490:Sylph_Ice_02 - [N/A] 1165765169
 20060501:Electro Specter
 20060581:Sylph_Electric_01 - [N/A] 1346991849
 20060601:Pyro Specter
 20060681:Sylph_Fire_01 - [N/A] 2020892233
+20060690:Sylph_Fire_02 - [N/A] 242072433
 20060701:Sylph_Grass_01 - [N/A] 586909705
 20060781:Sylph_Grass_01 - [N/A] 1523065297
 21010101:Hilichurl
@@ -131,6 +136,7 @@
 21010201:Hilichurl Fighter
 21010202:Hili_None_01_Club - [N/A] 518903577
 21010281:Hili_None_01_Club - [N/A] 148649137
+21010290:Hili_None_02_Club - [N/A] 2282353529
 21010299:Hili_None_01_Club_NoAI - [N/A] 1500968553
 21010301:Wooden Shield Hilichurl Guard
 21010302:Wooden Shield Hilichurl Guard (Mechanicus)
@@ -156,10 +162,12 @@
 21010902:Test_Varied Cryo Hilichurl Shooter
 21010981:Hili_Ice_Range - [N/A] 1716558393
 21010982:Hili_Ice_Range_Multi - [N/A] 1237213681
+21010990:Hili_Ice_Range_03 - [N/A] 2345480137
 21011001:Electro Hilichurl Shooter
 21011002:Test_Varied Electro Hilichurl Shooter
 21011081:Hili_Electric_Range - [N/A] 2022453977
 21011082:Hili_Electric_Range_Multi - [N/A] 3012953161
+21011090:Hili_Electric_Range_03 - [N/A] 4254195473
 21011201:Rock Shield Hilichurl Guard
 21011202:Rock Shield Hilichurl Guard (Mechanicus)
 21011281:Hili_None_01_RockShield - [N/A] 2602064417
@@ -184,6 +192,7 @@
 21020204:Brute_None_Axe - [N/A] 1119958809
 21020281:Brute_None_Axe - [N/A] 741150761
 21020282:Brute_None_Axe - [N/A] 1576743033
+21020290:Brute_None_Axe_01 - [N/A] 2024375625
 21020299:Brute_None_Axe_NoAI - [N/A] 4081842953
 21020301:Rock Shieldwall Mitachurl
 21020302:Rock Shieldwall Mitachurl (Mechanicus)
@@ -214,6 +223,7 @@
 21030103:Test_Movement Healing Hydro Samachurl
 21030104:Shaman_Water_01_LostSamachurl - [N/A] 1713314673
 21030181:Shaman_Water_01 - [N/A] 3149869785
+21030190:Shaman_Water_02 - [N/A] 1877774473
 21030201:Dendro Samachurl
 21030202:Dendro Samachurl (Mechanicus)
 21030203:Dendro Samachurl
@@ -324,6 +334,7 @@
 24010109:Ruin Guard
 24010181:Defender_None_01 - [N/A] 1482848121
 24010182:Defender_None_01 - [N/A] 3806686089
+24010190:Defender_None_03 - [N/A] 1203739089
 24010201:Ruin Hunter
 24010202:Ruin Hunter (Mechanicus)
 24010281:Formathr_None - [N/A] 2103947025
@@ -380,6 +391,7 @@
 24060901:MachinaIustitia_Ruggiero_01 - [N/A] 2598421161
 24060902:MachinaIustitia_Ruggiero_02 - [N/A] 1178238353
 24060903:MachinaIustitia_Ruggiero_01 - [N/A] 4091306801
+24060990:MachinaIustitia_Ruggiero_04 - [N/A] 2442754929
 24061001:MachinaIustitia_Bradamante_01 - [N/A] 3820417257
 24061002:MachinaIustitia_Bradamante_02 - [N/A] 2286290561
 24061101:MachinaIustitia_LengthShifter_01 - [N/A] 3147408705
@@ -409,6 +421,7 @@
 24065602:MachinaIustitia_Frigate_04 - [N/A] 1620120737
 24065701:MachinaIustitia_Assimilator_03 - [N/A] 4222863585
 24065702:MachinaIustitia_Assimilator_04 - [N/A] 3834516417
+24065790:MachinaIustitia_Assimilator_90 - [N/A] 410434241
 24065801:MachinaIustitia_Ruggiero_03 - [N/A] 3392589561
 24065802:MachinaIustitia_Ruggiero_04 - [N/A] 2337120689
 24065803:MachinaIustitia_Ruggiero_05 - [N/A] 1989788129
@@ -438,14 +451,24 @@
 24069101:MachinaIustitia_LengthShifter_Codex - [N/A] 306536801
 24069201:MachinaIustitia_Excavator_Codex - [N/A] 4236769177
 24810101:FungusFighterV2_TowerFire_01 - [N/A] 1459265257
+24810190:MvM_TowerFire_01 - [N/A] 3268380201
+24810191:MvM_TowerFire_02 - [N/A] 2853693193
 24810201:FungusFighterV2_TowerFire_02 - [N/A] 1199053881
 24810301:FungusFighterV2_TowerElectric_01 - [N/A] 2345069921
+24810390:MvM_TowerElectric_01 - [N/A] 3800466761
+24810391:MvM_TowerElectric_02 - [N/A] 4010007481
 24810401:FungusFighterV2_TowerElectric_02 - [N/A] 3520636737
 24810501:FungusFighterV2_TowerWater_01 - [N/A] 2746544617
+24810590:MvM_TowerWater_01 - [N/A] 3065011249
+24810591:MvM_TowerWater_02 - [N/A] 2040948281
 24810601:FungusFighterV2_TowerWater_02 - [N/A] 3712937217
 24810701:FungusFighterV2_TowerIce_01 - [N/A] 3750011169
+24810790:MvM_TowerIce_01 - [N/A] 2546590705
+24810791:MvM_TowerIce_02 - [N/A] 1891908609
 24810801:FungusFighterV2_TowerIce_02 - [N/A] 1832843025
 24810901:FungusFighterV2_TowerWind_01 - [N/A] 3717599585
+24810990:MvM_TowerWind_01 - [N/A] 3672283377
+24810991:MvM_TowerWind_02 - [N/A] 750672833
 24811001:FungusFighterV2_TowerWind_02 - [N/A] 540068777
 24811101:FungusFighterV2_TowerPhysics_01 - [N/A] 583303081
 24920101:Balloon_SlimeBalloon_01 - [N/A] 1492263081
@@ -494,6 +517,7 @@
 25010303:NPC_Quest_Male_Standard_Oppo_13715 - [N/A] 724448633
 25010304:NPC_Quest_Male_Standard_Oppo_13777 - [N/A] 2201891417
 25010381:Thoarder_Male_Standard_NoWeapon_Fire_01 - [N/A] 933629753
+25010390:Thoarder_Male_Standard_NoWeapon_Fire_02 - [N/A] 4261880345
 25010401:Treasure Hoarders: Hydro Potioneer
 25010402:Thoarder_Male_Standard_NoWeapon_Water_01_02 - [N/A] 3452436881
 25010403:Thoarder_Male_Standard_NoWeapon_Water_01_02 - [N/A] 4146453193
@@ -503,12 +527,15 @@
 25010501:Treasure Hoarders: Electro Potioneer
 25010502:NPC_Quest_Male_Standard_Colter_13709 - [N/A] 1419015937
 25010503:NPC_Quest_Male_Standard_Oppo_13711 - [N/A] 3201328753
+25010504:NPC_Quest_Male_Standard_Gaston_14054 - [N/A] 2066425721
+25010505:NPC_Quest_Male_Standard_Florian_14132 - [N/A] 4179062537
 25010581:Thoarder_Male_Standard_NoWeapon_Electric_01 - [N/A] 624542921
 25010601:Treasure Hoarders: Cryo Potioneer
 25010602:Thoarder_Male_Standard_NoWeapon_Ice_02 - [N/A] 726418097
 25010603:Thoarder_Male_Standard_NoWeapon_Ice_03 - [N/A] 2398565441
 25010604:NPC_Quest_Male_Standard_Oppo_13714 - [N/A] 50560321
 25010605:NPC_Fontaine_Male_Standard_RobberB_21418 - [N/A] 859928713
+25010606:NPC_Quest_Male_Standard_Enri_14055 - [N/A] 42107321
 25010681:Thoarder_Male_Standard_NoWeapon_Ice_01 - [N/A] 3749122441
 25010701:Treasure Hoarders: Handyman
 25010702:NPC_Quest_Male_Fat_Oppo_13873 - [N/A] 2169448041
@@ -520,6 +547,7 @@
 25020104:NPC_Quest_Male_Standard_Truand_13335 - [N/A] 2313699185
 25020105:Thoarder_Male_Crossbow_01_05 - [N/A] 2794240153
 25020106:NPC_Fontaine_Male_Standard_RobberLeader_21417 - [N/A] 3178123705
+25020107:NPC_Quest_Male_Standard_Lazare_14056 - [N/A] 3978033681
 25020201:Treasure Hoarder Marksman
 25020204:Treasure Hoarders: Marksman
 25020205:Thoarder_Male_Standard_Crossbow_02_04 - [N/A] 763791561
@@ -588,6 +616,7 @@
 25080281:Samurai_Ronin_02 - [N/A] 4200211249
 25080301:Ronin: Anbu
 25080381:Samurai_Ronin_03 - [N/A] 2465854769
+25080390:Samurai_Ronin_05 - [N/A] 1736584545
 25080401:Shogunate Samurai
 25080402:Yoriki Samurai
 25080403:Samurai_Hatamoto_03 - [N/A] 1581579825
@@ -598,11 +627,13 @@
 25100181:Samurai_Kairagi_01 - [N/A] 77071577
 25100182:Samurai_Kairagi_01 - [N/A] 391115545
 25100183:Samurai_Kairagi_01 - [N/A] 222568409
+25100190:Samurai_Kairagi_07 - [N/A] 2745601001
 25100201:Pyro Kairagi
 25100202:Samurai_Kairagi_07 - Pyro Kairagi
 25100281:Samurai_Kairagi_02 - [N/A] 3882445073
 25100282:Samurai_Kairagi_02 - [N/A] 753240097
 25100283:Samurai_Kairagi_02 - [N/A] 3828251937
+25100290:Samurai_Kairagi_08 - [N/A] 1886860641
 25100301:Thunderwraith Kairagi
 25100302:Ochimusha: Ensorcelled Thunder
 25100401:Flameghoul Kairagi
@@ -674,10 +705,12 @@
 25310102:Eremite_Female_Slim_PushDagger_02 - [N/A] 1936242505
 25310181:Eremite_Female_Slim_PushDagger_01 - [N/A] 1365735873
 25310182:Eremite_Female_Slim_PushDagger_01 - [N/A] 1430105225
+25310190:Eremite_Female_Slim_PushDagger_03 - [N/A] 2670641129
 25310201:Eremite_Male_Standard_Glaive_01 - [N/A] 3154173257
 25310202:Eremite_Male_Standard_Glaive_02 - [N/A] 3503187145
 25310281:Eremite_Male_Standard_Glaive_01 - [N/A] 3981952521
 25310282:Eremite_Male_Standard_Glaive_01 - [N/A] 411301145
+25310290:Eremite_Male_Standard_Glaive_03 - [N/A] 423708617
 25310301:Eremite_Male_Standard_Polearm_01 - [N/A] 863506833
 25310381:Eremite_Male_Standard_Polearm_01 - [N/A] 3592293337
 25310382:Eremite_Male_Standard_Polearm_01 - [N/A] 1324855129
@@ -702,6 +735,7 @@
 26010301:Electro Whopperflower
 26030101:Geovishap Hatchling
 26030181:Wyrm_Rock - [N/A] 3059435841
+26030190:Wyrm_Rock_02 - [N/A] 557038713
 26040101:Geovishap: Hydro
 26040102:Geovishap: Pyro
 26040103:Geovishap: Cryo
@@ -734,7 +768,9 @@
 26051201:Drake_DeepSea_Water_03 - [N/A] 1100113145
 26051202:Drake_DeepSea_Water_04 - [N/A] 1628565665
 26060101:Electro Cicin
+26060190:Cicin_Thunder_02 - [N/A] 1457632377
 26060201:Hydro Cicin
+26060290:Cicin_Water_02 - [N/A] 3625213961
 26060301:Cryo Cicin
 26090101:Floating Hydro Fungus
 26090181:Fungus_Un_Gamma_Water_01 - [N/A] 1665501025
@@ -749,6 +785,7 @@
 26090381:Fungus_Un_Delta_Wind_01 - [N/A] 2441732177
 26090390:Fungus_Un_Delta_Wind_Enemy - [N/A] 3376055609
 26090391:Fungus_Un_Delta_Wind_01_Capture - [N/A] 1573739513
+26090393:Fungus_Un_Delta_Wind_02 - [N/A] 2743236449
 26090401:Fungus_Trois_Epsilon_Electric_01 - [N/A] 2774139065
 26090481:Fungus_Trois_Epsilon_Electric_01 - [N/A] 4151812377
 26090490:Fungus_Trois_Epsilon_Electric_Enemy - [N/A] 783524481
@@ -822,6 +859,7 @@
 26160202:Aplysia_Mature_01_Land - [N/A] 2244040649
 26160301:SeaHorse_Mature_01_Sea - [N/A] 1544112625
 26160302:SeaHorse_Mature_01_Land - [N/A] 3992435993
+26160390:SeaHorse_Mature_02 - [N/A] 4085486801
 26162101:HermitCrab_Mature_02 - [N/A] 3832936073
 26162201:MantaRay_Larva_03 - [N/A] 1943296953
 26162301:Seal_Larva_02 - [N/A] 1874832521
@@ -1430,18 +1468,42 @@
 28041105:Fishable_Maritime_MachinaIustitia_05 - [N/A] 1211691881
 
 // Partner
+30010590:Partner_Slime_Electric_04 - [N/A] 1360704329
+30011290:Partner_Slime_Fire_06 - [N/A] 1945956961
 30050501:Partner_Oceanid_Tit - [N/A] 2294162793
+30050590:Partner_Monster_Oceanid_Tit_02 - [N/A] 1992834649
 30050601:Partner_Oceanid_Wigeon_02 - [N/A] 903450313
 30050701:Partner_Oceanid_Squirrel - [N/A] 2642015873
+30060490:Partner_Sylph_Ice_02 - [N/A] 3052301665
+30060690:Partner_Sylph_Fire_02 - [N/A] 2606395609
+31010290:Partner_Hili_None_02_Club - [N/A] 1348459489
+31010990:Partner_Hili_Ice_Range_03 - [N/A] 318427833
+31011090:Partner_Hili_Electric_Range_03 - [N/A] 2029584281
+31020290:Partner_Brute_None_Axe_01 - [N/A] 208842305
+31030190:Partner_Shaman_Water_02 - [N/A] 3800190729
 31040101:Partner_Hilistray_Wind_01 - [N/A] 1924270545
 32110201:Ovacua_Order_02 - [N/A] 569946161
+34010190:Partner_Defender_None_03 - [N/A] 2666244393
 34060101:Partner_MachinaIustitia_Sentry_01 - [N/A] 68219401
 34060102:Partner_MachinaIustitia_Sentry_01 - [N/A] 1581798833
 34060901:Partner_MachinaIustitia_Ruggiero_02 - [N/A] 2221802481
+34060990:Partner_MachinaIustitia_Ruggiero_04 - [N/A] 1146147913
+34065790:Partner_MachinaIustitia_Assimilator_90 - [N/A] 3382698241
+34810190:Partner_MvM_TowerFire_01 - [N/A] 2504772937
+34810191:Partner_MvM_TowerFire_02 - [N/A] 3028471225
+34810390:Partner_MvM_TowerElectric_01 - [N/A] 2883808873
+34810391:Partner_MvM_TowerElectric_02 - [N/A] 1973294081
+34810590:Partner_MvM_TowerWater_01 - [N/A] 3115241505
+34810591:Partner_MvM_TowerWater_02 - [N/A] 3145296577
+34810790:Partner_MvM_TowerIce_01 - [N/A] 941724737
+34810791:Partner_MvM_TowerIce_02 - [N/A] 766759905
+34810990:Partner_MvM_TowerWind_01 - [N/A] 98234177
+34810991:Partner_MvM_TowerWind_02 - [N/A] 1166709913
 35010201:NPC_Fontaine_Male_Standard_Sonny_5132 - [N/A] 2270561153
 35010202:NPC_Quest_Male_Standard_Rouge_21274 - [N/A] 802259057
 35010203:NPC_Quest_Male_Standard_Rocher_21161 - [N/A] 1589132441
 35010204:NPC_Quest_Male_Standard_TieChuaner_21362 - [N/A] 1978991089
+35010390:Partner_Thoarder_Male_Standard_NoWeapon_Fire_02 - [N/A] 642225153
 35010602:Thoarder_Male_Standard_NoWeapon_Ice_02 - [N/A] 2367366025
 35020201:NPC_Fontaine_Male_Standard_Blanc_5233 - [N/A] 295013961
 35020202:NPC_Fontaine_Male_Standard_Bleu_5232 - [N/A] 2091883585
@@ -1450,6 +1512,9 @@
 35060102:NPC_Fontaine_MuscleMan_Standard_Chaussivert_5273 - [N/A] 2070327977
 35060103:NPC_Quest_Muscleman_Standard_Valberry_21163 - [N/A] 2883132241
 35070101:NPC_Quest_MuscleMan_Standard_TieMing_21298 - [N/A] 1105845961
+35080390:Partner_Samurai_Ronin_05 - [N/A] 1710869545
+35100190:Partner_Samurai_Kairagi_07 - [N/A] 1725122433
+35100290:Partner_Samurai_Kairagi_08 - [N/A] 3265297905
 35110101:NPC_Fontaine_Female_Standard_Genevieve_5260 - [N/A] 465377969
 35110102:NPC_Fontaine_Female_Standard_Genevieve_5260 - [N/A] 4203920553
 35110103:NPC_Fontaine_Female_Standard_Genevieve_5260 - [N/A] 387141537
@@ -1471,10 +1536,15 @@
 35210501:NPC - Habachi
 35210502:NPC_Quest_MuscleMan_Standard_Bashar_13107 - [N/A] 4266344825
 35310101:Gilded Brigade ¡¤ Sand Water Purification (Golden Dreamland)
+35310190:Partner_Eremite_Female_Slim_PushDagger_03 - [N/A] 3316783769
+35310290:Partner_Eremite_Male_Standard_Glaive_03 - [N/A] 2388024745
 35310301:The Gilded Brigade ¡¤ Thunder in the Daytime (Golden Dreamland)
 35410101:Partner_Eremite_Male_Strong_Katar_01 - [N/A] 843060329
 35410201:Partner_Eremite_Female_Standard_Longbow_01 - [N/A] 2996340361
+36030190:Partner_Wyrm_Rock_02 - [N/A] 4078935249
 36050601:Drake_DeepSea_Water_01 - [N/A] 478535833
+36060190:Partner_Cicin_Thunder_02 - [N/A] 90474689
+36060290:Partner_Cicin_Water_02 - [N/A] 4196823585
 36090190:Activity - Friendly Flying Water
 36090191:Partner_Fumgus_Un_Gamma_Water - [N/A] 3593336553
 36090192:Partner_Fumgus_Un_Gamma_Water - [N/A] 2780786345
@@ -1484,6 +1554,7 @@
 36090390:Activity - Friendly Flying Wind
 36090391:Partner_Fumgus_Un_Delta_Wind - [N/A] 637837089
 36090392:Partner_Fumgus_Un_Delta_Wind - [N/A] 2589779561
+36090393:Partner_Fungus_Un_Delta_Wind_02 - [N/A] 2231278801
 36090490:Activity - Friendly Spinning Thunder
 36090491:Partner_Fumgus_Trois_Epsilon_Electric - [N/A] 4089561145
 36090492:Partner_Fumgus_Trois_Epsilon_Electric - [N/A] 2409750417
@@ -1505,6 +1576,7 @@
 36091090:Activity - Friendly Stretching Thunder
 36091091:Partner_Fumgus_Deux_Delta_Electric - [N/A] 2177474001
 36091092:Partner_Fumgus_Deux_Delta_Electric - [N/A] 1670919961
+36160390:Partner_SeaHorse_Mature_02 - [N/A] 2198861673
 38050590:Partner_Animal_Electrohercules_01 - [N/A] 2442210649
 38050591:Partner_Animal_Electrohercules_02 - [N/A] 1954661401
 38060502:Partner_Animal_Megamoth_Jungle_01 - [N/A] 113674993

Source/GrasscutterTools/Resources/en-us/Weapon.txt

@@ -44,6 +44,7 @@
 11512:Light of Foliar Incision
 11513:Splendor of Tranquil Waters
 11514:Uraku Misugiri
+11515:Absolution
 12101:Waster Greatsword
 12201:Old Merc's Pal
 12301:Ferrous Shadow
@@ -179,6 +180,7 @@
 15419:Ibis Piercer
 15424:Scion of the Blazing Sun
 15425:Song of Stillness
+15426:Cloudforged
 15427:Range Gauge
 15501:Skyward Harp
 15502:Amos' Bow
@@ -188,3 +190,4 @@
 15509:Thundering Pulse
 15511:Hunter's Path
 15512:The First Great Magic
+15513:Silvershower Heartstrings

Source/GrasscutterTools/Resources/ru-ru/Avatar.txt

@@ -79,4 +79,7 @@
 1092:Ка Мин
 1093:Сянь Юнь
 1094:Тиори
+1095:Сиджвин
 1096:Арлекино
+1097:Сетос
+1098:Клоринда

Source/GrasscutterTools/Resources/ru-ru/GachaBannerPrefab.txt

@@ -0,0 +1,129 @@
+A007:Молитва новичка
+A008:Жажда странствий
+A009:Стихи из винного кубка
+A010:Рассветное паломничество
+A011:Благоволение южного ветра
+A012:Истребление всего зла
+A013:Воплощение божества
+A015:Сверкающая поступь
+A016:Молитва новичка
+A017:Жажда странствий
+A018:Сверкающая поступь
+A019:Стихи из винного кубка
+A020:Воплощение божества
+A021:Воплощение божества
+A022:Жажда странствий
+A023:Зимнее расставание
+A024:Горы и рынки
+A027:Таинственные секреты
+A028:Эфемерное недоверие
+A031:Приглашение к мирской жизни
+A032:Танец фонарей
+A033:Момент цветения
+A036:Стихи из винного кубка
+A037:Зимнее расставание
+A040:Горы и рынки
+A041:Рождённая морской пеной
+A045:Листья на ветру
+A048:Сад белой цапли
+A049:Гобелен золотого пламени
+A052:Господство безмятежности
+A053:Дрейфующее свечение
+A061:Пиршество óни
+A065:Возвращение в мир смертных
+A071:Вечноцветущий пурпур
+A076:Лазурный поход
+A081:Белая радуга
+A091:Патруль лесной чащи
+A092:Горы и рынки
+A093:Охотничья тропа
+A097:Сумеречный вершитель
+A098:Стихи из винного кубка
+A099:Посох алых песков
+A100:翩舞歈莲-妮露
+A101:深秘之息-阿贝多
+A102:神铸赋形-圣显绿箭
+A103:月草的赐慧-纳西妲
+A104:焰色天河-宵宫
+A105:神铸赋形-千夜飞雷
+A106:华紫樱绯-八重神子
+A107:暂别冬都-达达利亚
+A108:神铸赋形-神乐冬极
+A109:余火变相-流浪者
+A110:鬼门斗宴-荒泷一斗
+A111:神铸赋形-图莱杜拉赤角
+A112:影寂天下人-雷电将军
+A113:苍流踏花-神里绫人
+A114:神铸赋形-薙草波乱
+A115:敕诫枢谋-艾尔海森
+A116:烟火之邀-魈
+A117:神铸赋形-裁叶萃光和璞鸢
+A118:赤团开时-胡桃
+A119:素霓伣天-夜兰
+A120:神铸赋形-护摩若水
+A121:迪希雅
+A122:赛诺
+A123:苇海信标/赤沙之杖
+A124:申鹤
+A125:神里绫华
+A126:雾切之回光/息灾
+A127:纳西妲
+A128:妮露
+A129:千夜浮梦/圣显之钥
+A130:白术
+A131:甘雨
+A132:碧落之珑/阿莫斯之弓
+A133:宵宫
+A134:八重神子
+A135:飞雷之弦振/神乐之真意
+A136:艾尔海森
+A137:枫原万叶
+A138:苍古自由之誓/裁叶萃光
+A139:优菈
+A140:可莉
+A141:松籁响起之时/四风原典
+A142:珊瑚宫心海
+A143:流浪者
+A144:不灭月华/图莱杜拉的回忆
+A145:林尼
+A146:夜兰
+A147:最初的大魔术/若水
+A148:钟离
+A149:公子
+A150:贯虹之槊/冬极白星
+A151:那维莱特
+A152:胡桃
+A153:万世流涌大典/护摩之杖
+A154:莱欧斯利
+A155:温迪
+A156:金流监督/终未嗟叹之诗
+A157:芙宁娜
+A158:白术
+A159:静水流涌之辉/碧落之珑
+A160:赛诺
+A161:神里绫人
+A162:波乱月白经津/赤沙之杖
+A163:娜维娅
+A164:神里绫华
+A165:裁断/雾切之回光
+A166:雷电将军
+A167:宵宫
+A168:薙草之稻光/飞雷之弦振
+A169:闲云
+A170:纳西妲
+A171:鹤鸣余音/千夜浮梦
+A172:魈
+A173:八重神子
+A174:和璞鸢/神乐之真意
+A175:千织
+A176:荒泷一斗
+A177:有乐御簾切/赤角石溃杵
+A178:那维莱特
+A179:枫原万叶
+A180:万世流涌大典/苍古自由之誓
+A181:阿蕾奇诺
+A182:林尼
+A183:赤月之形/最初的大魔术
+A184:流浪者
+A185:白术
+A186:图莱杜拉的回忆/碧落之珑

Source/GrasscutterTools/Resources/ru-ru/GachaBannerTitle.txt

@@ -0,0 +1,53 @@
+A007:Молитва новичка
+A008:Жажда странствий
+A009:Стихи из винного кубка
+A010:Рассветное паломничество
+A011:Благоволение южного ветра
+A012:Истребление всего зла
+A013:Воплощение божества
+A015:Сверкающая поступь
+A016:Молитва новичка
+A017:Жажда странствий
+A018:Сверкающая поступь
+A019:Стихи из винного кубка
+A020:Воплощение божества
+A021:Воплощение божества
+A022:Жажда странствий
+A023:Зимнее расставание
+A024:Горы и рынки
+A027:Таинственные секреты
+A028:Эфемерное недоверие
+A031:Приглашение к мирской жизни
+A032:Танец фонарей
+A033:Момент цветения
+A036:Стихи из винного кубка
+A037:Зимнее расставание
+A040:Горы и рынки
+A041:Рождённая морской пеной
+A045:Листья на ветру
+A048:Сад белой цапли
+A049:Гобелен золотого пламени
+A052:Господство безмятежности
+A053:Дрейфующее свечение
+A061:Пиршество óни
+A065:Возвращение в мир смертных
+A071:Вечноцветущий пурпур
+A076:Лазурный поход
+A081:Белая радуга
+A091:Патруль лесной чащи
+A097:Сумеречный вершитель
+A0100:Кружащийся лотос
+A0103:Озарение лунной травы
+A0109:Прах перерождённый
+A0115:Сдержанное благоразумие
+A0121:Пылающее золото
+A0130:Биение мудрого сердца
+A0145:Волшебство света и тени
+A0151:Завет глубин
+A0154:Бушующий рок
+A0157:Песнь водам мира
+A0163:Во имя розы
+A0169:Журавль взлетает в небеса
+A0175:Сплетение шёлковых облаков
+A0181:Пепельная тень очага
+B001:Стихи утреннего ветра

Source/GrasscutterTools/Resources/ru-ru/GachaBennerPrefab.txt

@@ -1,45 +0,0 @@
-007:Молитва новичка
-008:Жажда странствий
-009:Стихи из винного кубка
-010:Рассветное паломничество
-011:Благоволение южного ветра
-012:Истребление всего зла
-013:Воплощение божества
-015:Сверкающая поступь
-016:Молитва новичка
-017:Жажда странствий
-018:Сверкающая поступь
-019:Стихи из винного кубка
-020:Воплощение божества
-021:Воплощение божества
-022:Жажда странствий
-023:Зимнее расставание
-024:Горы и рынки
-027:Таинственные секреты
-028:Эфемерное недоверие
-031:Приглашение к мирской жизни
-032:Танец фонарей
-033:Момент цветения
-036:Стихи из винного кубка
-037:Зимнее расставание
-040:Горы и рынки
-041:Рождённая морской пеной
-045:Листья на ветру
-048:Сад белой цапли
-049:Гобелен золотого пламени
-052:Господство безмятежности
-053:Дрейфующее свечение
-061:Пиршество óни
-065:Возвращение в мир смертных
-071:Вечноцветущий пурпур
-076:Лазурный поход
-081:Белая радуга
-091:Патруль лесной чащи
-092:Горы и рынки
-093:Охотничья тропа
-097:Сумеречный вершитель
-098:Стихи из винного кубка
-099:Посох алых песков
-//100:Кружащийся лотос // Error
-101:Таинственные секреты
-102:Воплощение божества

Source/GrasscutterTools/Resources/ru-ru/GachaBennerTitle.txt

@@ -1,45 +0,0 @@
-007:Молитва новичка
-008:Жажда странствий
-009:Стихи из винного кубка
-010:Рассветное паломничество
-011:Благоволение южного ветра
-012:Истребление всего зла
-013:Воплощение божества
-015:Сверкающая поступь
-016:Молитва новичка
-017:Жажда странствий
-018:Сверкающая поступь
-019:Стихи из винного кубка
-020:Воплощение божества
-021:Воплощение божества
-022:Жажда странствий
-023:Зимнее расставание
-024:Горы и рынки
-027:Таинственные секреты
-028:Эфемерное недоверие
-031:Приглашение к мирской жизни
-032:Танец фонарей
-033:Момент цветения
-036:Стихи из винного кубка
-037:Зимнее расставание
-040:Горы и рынки
-041:Рождённая морской пеной
-045:Листья на ветру
-048:Сад белой цапли
-049:Гобелен золотого пламени
-052:Господство безмятежности
-053:Дрейфующее свечение
-061:Пиршество óни
-065:Возвращение в мир смертных
-071:Вечноцветущий пурпур
-076:Лазурный поход
-081:Белая радуга
-091:Патруль лесной чащи
-092:Горы и рынки
-093:Охотничья тропа
-097:Сумеречный вершитель
-098:Стихи из винного кубка
-099:Посох алых песков
-//100:Кружащийся лотос // Error
-101:Таинственные секреты
-102:Воплощение божества

Source/GrasscutterTools/Resources/ru-ru/Gadget.txt

@@ -271,6 +271,7 @@
 41076011:Faruzan_WindBlackHole
 41076015:Faruzan_SkillObj_WindZone_Hit
 41083009:Linette_Constellation_WindZone
+41098006:Clorinde_Constellation_1_Gadget
 42000001:Fishing_Aim_Bullet
 42000002:Fishing_Cork
 42103002:Shaman_HealRain_Field
@@ -790,13 +791,43 @@
 41093023:Liuyun_ElementalBurst_SmallWindHole
 41094004:Bullet_Chiori_ElementalArt_Rush_Detect
 41094006:SkillObj_Chiori_ElementalBurst_RockBomb
+41095001:Sigewinne_Extra_Bubble_Bullet
+41095002:Sigewinne_EArt_Bullet_Normal
+41095003:Sigewinne_EArt_Bullet_No_Enemy
+41095004:Sigewinne_EArt_Bullet_One_Enemy
+41095005:Sigewinne_EArt_Bullet_Normal_Shoot_NoTarget
+41095006:Sigewinne_ElementalArt_Core
+41095007:Sigewinne_Arrow_01
+41095008:Sigewinne_Arrow_02
+41095009:Sigewinne_Arrow_03
+41095010:Sigewinne_AimingArrow_WithoutWater
+41095011:Sigewinne_AimingArrow_Water
+41095012:Sigewinne_EArt_Bullet_Normal_New
+41095013:Sigewinne_Burst_Attacker
 41096003:Arlecchino_ExtraAttack_Bullet
+41097001:Sethos_Arrow_01
+41097002:Sethos_Arrow_02
+41097003:Sethos_Arrow_03
+41097004:Sethos_Arrow_04
+41097005:Sethos_AimingArrow_WithoutElec
+41097006:Sethos_AimingArrow_WithElec
+41097007:Sethos_AimingArrow_Lightning
+41097008:Sethos_AimingArrow_Lightning_Burst_01
+41097009:Sethos_AimingArrow_Lightning_Burst_02
+41097010:Sethos_AimingArrow_Lightning_Burst_03
+41097011:Sethos_AimingArrow_Lightning_Burst_04
+41098001:Clorinde_DodgeAttack_Small
+41098002:Clorinde_DodgeAttack_Medium
+41098003:Clorinde_DodgeAttack_Large
+41098004:Clorinde_ElementArt_Attack_Bullet_Penetrating
+41098005:Clorinde_ElementArt_Attack_Bullet_Standard
 42000003:Activity_Pitch_Pot_Throw_Bullet
 42000004:Activity_Pitch_Pot_Throw_Bullet_02
 42000005:BossNarzissenkreuzBattle_PlayerSkill_Bullet_1
 42000006:BossNarzissenkreuzBattle_PlayerSkill_Bullet_2
 42000007:Activity_GoalChallenge_Level03_WindZone
 42000008:Activity_GoalChallenge_Level04_RainZone
+42000010:Bullet_ActivityAbility_MVM_AvatarSkill_Asist
 42001002:Slime_RockThrow
 42001003:Slime_Bubble
 42001004:Slime_IceCone
@@ -925,6 +956,7 @@
 42005021:Oceanid_DelayWaterBall_Trigger
 42005022:Oceanid_Squirrel_WaterWave
 42005024:Oceanid_WaterLaser_LockTarget
+42005026:MvM_Frog_WaterWave
 42005101:Necalevia_RangeBullet
 42005102:Necalevia_AOERangeMulti
 42005103:Necalevia_Small_RangeBullet
@@ -954,8 +986,10 @@
 42006401:Sylph_Ice_IceBullet_01
 42006402:Sylph_Ice_ElementBullet
 42006403:Sylph_Ice_Activated_AirGun
+42006407:Sylph_Ice_IceBullet_02
 42006501:Sylph_Electric_FlyHor_FollowBullet
 42006601:Sylph_Fire_FireBullet
+42006605:MvM_Sylph_Fire_FireBullet
 42006701:Sylph_Grass_GrassBullet
 42006702:Sylph_Grass_HealArea_Bullet
 42006705:Sylph_Grass_Activated_DeathBullet
@@ -985,6 +1019,8 @@
 42101025:Hili_Wei_NoWeapon_ThrowBomb_Bullet03
 42101026:Hili_Electric_SlimeThrow
 42101027:Monster_Arrow_ShootingActivity
+42101028:MvM_Hili_Electric_Arrow
+42101029:MvM_Hili_Ice_Arrow
 42102001:Brute_Axe_FireWave01
 42102002:Brute_Axe_FireWave02
 42102003:Brute_Axe_FireSlime_Fire
@@ -1254,6 +1290,10 @@
 42406057:MachinaIustitia_Bradamante_Summon_Bullet
 42406059:MachinaIustitia_Bradamante_Attack02_FollowBullet2
 42406060:MachinaIustitia_Bradamante_Attack02_FollowBullet3
+42406061:MvM_MachinaIustitia_Ruggiero02_Attack02_Bullet
+42406062:MvM_MachinaIustitia_Ruggiero02_Attack02_Bullet2
+42406063:MvM_MachinaIustitia_Assimilator_NormalAttack01_Bullet
+42406064:MvM_MachinaIustitia_Assimilator_MeleeAttack01_Bullet
 42407002:MachinaIustitia_Nutcracker_Stage1_WindBullet1
 42407003:MachinaIustitia_Nutcracker_Stage1_WindBullet2
 42407004:MachinaIustitia_Nutcracker_Stage1_IceBullet
@@ -1293,6 +1333,9 @@
 42481009:FungusFighterV2_TowerPhysics_SkillBullet
 42481010:FungusFighterV2_TowerElectric_LockTarget
 42481011:FungusFighterV2_TowerWind_LockTarget
+42481012:MvM_TowerFire_FireBullet
+42481013:MvM_TowerIce_IceBullet
+42481014:MvM_TowerWindBullet
 42499001:Bullet_Alternate_01
 42501001:Thoarder_ThrowingKnife
 42501002:Thoarder_Bomb
@@ -1312,6 +1355,8 @@
 42501020:Thoarder_Rocky_Guitar_ElectricBottle
 42501024:Thoarder_Rocky_Guitar_ElectricBomb_Bullet
 42501026:Thoarder_ThrowingKnife_ShootingActivity
+42501027:MvM_Thoarder_MolotovCocktail
+42501028:MvM_Thoarder_Bomb_ElementalEffect_Fire
 42503001:Thoarder_Shovel_MuddyBullet
 42503002:Thoarder_Fat_Shovel_MuddyBullet
 42504001:Thoarder_HatchetThrow
@@ -1322,6 +1367,8 @@
 42508001:Samurai_Ronin_ShootBullet
 42508002:Samurai_RushAtk_Scene
 42508004:Samurai_RushAtk_Bullet
+42508006:MvM_Samurai_Ronin_ShootBullet
+42508007:MvM_Samurai_RushAtk_Bullet
 42509002:Samurai_Ningyo_WindBladeAir1
 42509003:Samurai_Ningyo_WindBladeAir2
 42509006:Samurai_Ningyo_WindGhost_BladeAir
@@ -1399,6 +1446,8 @@
 42601123:FauneAbyssale_SeaHorse_Primo_ElectronCharge_Physic
 42601125:FauneAbyssale_SeaHorse_Primo_RockGadget_Crasher
 42601128:FauneAbyssale_SeaHorse_Primo_ShuttleAttack_Bullet
+42601134:MvM_FauneAbyssale_SeaHorse_Mature_BallLightning
+42601135:MvM_FauneAbyssale_SeaHorse_Mature_WaterBullet
 42602004:Regisvine_RangedAttack01_Bullet
 42602005:Regisvine_RangedAttack02_MinorMissile
 42602006:Regisvine_MissileAttack_LargeMissile
@@ -1485,6 +1534,8 @@
 42606004:Cicin_WaterBall
 42606005:Cicin_IceSpear
 42606006:Cicin_IceShieldEnergy
+42606007:MvM_Cicin_WaterBall
+42606008:MvM_Cicin_ElectricBall
 42607003:Inu_Shihandai_Blink_Hat
 42607006:Inu_Shihandai_CounterAttackBlade
 42607010:Inu_Shihandai_RangeBlade
@@ -1518,6 +1569,7 @@
 42609027:Fungus_Un_Water_SuperWaterBullet
 42609028:Fungus_Trois_Ice_BlizzardPoint
 42609029:Fungus_Deux_Wind_HealingWavePoint
+42609030:MvM_Fungus_Un_Delta_Wind_BulletDecayed
 42610001:Scorpion_Sacred_SacredAttack03_Bullet
 42610002:Scorpion_Sacred_SacredAttack05_Bullet
 42610004:Scorpion_Sacred_SacredEnergy_Bullet
@@ -1890,6 +1942,12 @@
 49001023:MonsterAffix_Activity_Deathrattle_Gadget_DoomLogic
 49001025:MonsterAffix_Activity_AkaFes_RockDamage_LowWave_SingleBullet
 49001027:Activity_MultiCharacter_BulletToGround
+49001034:Gadget_RoleCombat_TracingEnergyBall
+49001036:Gadget_RoleCombat_TracingEnergyBall_Grass
+49001042:MonsterAffix_RoleCombat_DeathMatch_FieldBullet
+49001049:MonsterAffix_RoleCombat_Haunted_Bullet
+49001051:MonsterAffix_RoleCombat_Haunted_TrackGhostBullet
+49001052:MonsterAffix_RoleCombat_Backer_FieldBullet
 70220037:SceneObj_Environment_CobWeb_Bullet
 70220053:Bullet_IceSentryTurrets_Ice_Bullet
 70220073:Bullet_IceSentryTurrets_Thunder_Bullet
@@ -1927,6 +1985,12 @@
 70291138:SceneObj_Area_Common_Property_Ani_Prop_Jamballoon_Bullet_01
 70291151:Penumbra_CannonBall_01
 70291152:Penumbra_CannonBall_02
+70291180:Penumbra_CannonBallV2_01
+70291181:Penumbra_CannonBallV2_02
+70291182:Penumbra_CannonBallV2_03
+70291185:Penumbra_CannonBallV2_04
+70291294:SceneObj_Activity_Common_Property_Ani_Prop_BulletHell_Barrage_Bullet_02
+70291295:SceneObj_Activity_Common_Property_Ani_Prop_BulletHell_Barrage_Bullet_01
 70291440:SceneObj_Activity_Common_Property_Ani_Prop_AutoTimeStop_Barrage_Bullet_03
 70291441:SceneObj_Activity_Common_Property_Ani_Prop_AutoTimeStop_Barrage_Bullet_02
 70291442:SceneObj_Activity_Common_Property_Ani_Prop_AutoTimeStop_Barrage_Bullet_01
@@ -2344,6 +2408,9 @@
 41094007:SkillObj_Chiori_Turret_Constellation
 41096001:Arlecchino_ElementalBurst_Gadget
 41096002:Arlecchino_ElementalArt_ShadowAvatar
+41098007:Clorinde_Constellation_6_Gadget
+42000011:ActivityAbility_MVM_AvatarSkill_Asist_02
+42000012:ActivityAbility_MVM_AvatarSkill_Asist_03
 42001001:Slime_IceCone_AimPoint
 42001005:Slime_IceFog
 42001010:Slime_WindZone_02
@@ -2423,6 +2490,7 @@
 42005019:Oceanid_PlatformDamage
 42005023:Oceanid_MustKill_Empty
 42005025:Oceanid_Affix_DeathExplode
+42005027:MvM_Frog_DeathExplode
 42005129:Narcissusborn_DartAttack_InitialPos
 42005130:Narcissusborn_EnhancedDartDartAttack_InitialPos
 42005131:Narzissenkreuz_DartAttack_InitialPos
@@ -2498,6 +2566,7 @@
 42103035:Shaman_FloorAttack01_Gadget
 42103036:Shaman_SuperJump_Area
 42103037:Shaman_Note_Buff_Gadget
+42103039:MvM_Shaman_Torrent_Area
 42201003:Abyss_FireEnergy_Surround
 42201007:Abyss_Impulse
 42201011:Abyss_IceCone_Area
@@ -2619,6 +2688,7 @@
 42409014:MachinaIustitia_Gravitas_ImpactWave_01
 42481006:FungusFighterV2_TowerFire_SkillAOE
 42481008:FungusFighterV2_TowerIceWall
+42481015:MvM_TowerWater_Torrent_Area
 42501012:BoxMatch_Assistant_IceBomb_TargetPoint
 42501015:BoxMatch_Hatchet_FireWork_Lv1
 42501017:BoxMatch_Hatchet_FireWork_Lv2_Attack
@@ -3031,6 +3101,7 @@
 42910024:Nihil_Story_HelpSkillHandler
 42910026:Nihil_Story_HelpSkill_RushAtk
 42910032:Nihil_Story_HelpSkill_Bomb
+42910033:Nihil_DonimatAttack_Control
 43805005:Bullet_Animal_Electrohercules_ElectricBall_OnGround
 43805014:Animal_Electrohercules_Defend_Turorial
 44000002:SkillObj_GlidingChallenge_AirDash_Forward
@@ -3210,6 +3281,12 @@
 44000594:HideType_A_Style_InvisibleBait_Target
 44000595:HideType_A_Style_InvisibleBait_Target
 44000596:HideType_A_Style_InvisibleBait_Target
+44000597:SkillObj_Activity_AcrobaticsBattle_Lv1
+44000598:SkillObj_Activity_AcrobaticsBattle_Lv3
+44000599:SkillObj_Activity_AcrobaticsBattle_Lv4
+44000600:SkillObj_Activity_AcrobaticsBattle_Lv7
+44000601:SkillObj_Activity_AcrobaticsBattle_Lv0
+44000602:SkillObj_Activity_AcrobaticsBattle_KillCall
 49001001:GeneralSkill_IceDamage_Prison_Center
 49001002:GeneralSkill_WindDamage_Vortex_Center
 49001003:GeneralSkill_RockDamage_LowWave_Emitter
@@ -3223,6 +3300,23 @@
 49001020:MonsterAffix_Drop_Rock_CenterGadget
 49001024:MonsterAffix_Activity_AkaFes_RockDamage_LowWave_Emitter
 49001028:MonsterAffix_Monster_Yunqi_Die_BroadCast
+49001029:Gadget_RoleCombat_ThunderArea
+49001030:Gadget_RoleCombat_ThunderArea_Stage1
+49001031:Gadget_RoleCombat_ThunderArea_Stage2
+49001032:Gadget_RoleCombat_ThunderArea_Stage3
+49001033:Gadget_RoleCombat_TracingEnergyBall_CreatorGadget
+49001035:Gadget_RoleCombat_TracingEnergyBall_Grass_CreatorGadget
+49001038:Gadget_RoleCombat_BulletToGround
+49001039:MonsterAffix_RoleCombat_DeathRattleCrystal_DamageGadget
+49001040:MonsterAffix_RoleCombat_BoomTime_LogicGadget
+49001041:MonsterAffix_RoleCombat_Yunqi_Die_BroadCast
+49001043:Gadget_RoleCombat_Bonus_FungusRaptor_Weak_Kill
+49001044:Gadget_RoleCombat_Bonus_MonolithStarchild_Weak_Kill
+49001045:Gadget_RoleCombat_Bonus_DrakeDeepSea_No_Revive
+49001046:Gadget_RoleCombat_Bonus_DrakeDeepSea_MagicBall_NoHit
+49001047:Gadget_RoleCombat_Bonus_HermitCrabPrimo_Weak_Kill
+49001048:Gadget_RoleCombat_Bonus_SeaHorsePrimo_Recover_Break
+49001050:MonsterAffix_RoleCombat_Haunted_FreeGhost
 70000012:BroadLeaf01
 70020001:Enviro01
 70020002:Enviro02
@@ -3559,6 +3653,8 @@
 70230124:SceneObj_Area_Xm_Property_Ani_Decal_CrystalWall_01
 70230125:SceneObj_Area_Xm_Property_Ani_Decal_CrystalWall_01
 70230126:SceneObj_Area_Xm_Property_Ani_Decal_CrystalWall_01
+70230127:SceneObj_Area_Common_Property_Ani_Prop_MvM_SandTable_01
+70230128:[N/A] 3947176030
 70240001:SceneObj_LostParadise_Common_Property_Prop_RainCol_01
 70240002:SceneObj_LostParadise_Common_Property_Prop_RainCol_01
 70240003:SceneObj_LostParadise_Common_Property_Prop_RainCol_01
@@ -4497,8 +4593,30 @@
 70291167:SceneObj_Area_Common_Property_Ani_Prop_Jamballoon_02
 70291168:SceneObj_Penumbra_Common_Property_Ani_Prop_BladeDanceGate_01
 70291169:[N/A] 2187650446
+70291170:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291171:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonV2_01
+70291172:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonV2_02
+70291186:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTargetBall_01
+70291187:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291188:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291189:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291190:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291282:SceneObj_Quest_DimensionalCollapse_01
+70291283:SceneObj_Level_Common_AvatarObj_Ani_Quest_SgwMixtureBottle_01
+70291284:[N/A] 4156213838
+70291285:[N/A] 4072703862
+70291286:SceneObj_Level_Common_Property_Ani_Prop_CharAmuseBarrier_01
+70291287:SceneObj_Level_Common_Property_Ani_Prop_CharMasterEntrance_01
+70291288:SceneObj_Level_Common_Property_Ani_Prop_MarechausseeGate_01
+70291289:SceneObj_Area_Fd_TreasureEntry_Door_01
+70291290:SceneObj_Level_Common_Property_Ani_Build_Hiddendoor_01
+70291292:SceneObj_Level_Common_Property_Ani_Prop_CoinDummy_02
+70291293:SceneObj_Level_Common_Property_Ani_Prop_CoinDummy_01
 70291296:SceneObj_Area_Fd_ChioriDungeon_SoundController_01
 70291297:SceneObj_Area_Common_Property_Prop_DelucChallengeAirwall_02
+70291298:SceneObj_Level_Common_Property_Ani_Prop_LeaserWall_01
+70291299:SceneObj_Level_Common_Property_Ani_Prop_BulletHellCoin_01
+70291300:SceneObj_Level_Common_Property_Ani_Prop_BulletHellCoin_02
 70291301:SceneObj_Area_Common_Property_Prop_Catcafe_FollowmoveInteract_01
 70291302:SceneObj_Area_Fd_Property_Ani_Prop_FdCommonGate_01
 70291303:SceneObj_Area_Fd_Property_Ani_Prop_FdCommonGate_02
@@ -5612,6 +5730,16 @@
 70320135:SceneObj_Area_Common_Property_Prop_CharAmusementAirWall_07
 70320136:SceneObj_Area_Common_Property_Prop_CharAmusementAirWall_08
 70320137:SceneObj_Area_Common_Property_Prop_CharAmusementAirWall_09
+70320138:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_Flag_01
+70320139:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_Flag_02
+70320140:[N/A] 882392350
+70320141:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_DropCard_01
+70320142:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_DropCard_02
+70320143:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackGate_01
+70320150:[N/A] 4078867398
+70320151:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackGate_02
+70320152:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackLight_01
+70320153:[N/A] 2891105062
 70330002:SceneObj_Gear_ElemForce_Operator
 70330003:SceneObj_Gear_ElemForce_Fire
 70330004:SceneObj_Gear_ElemForce_Fire_Hit
@@ -6707,9 +6835,41 @@
 70350499:SceneObj_Area_Xm_Property_Ani_Prop_ElecTrailBulletGen_02
 70350500:Activity_Gadget_AkaFesPotion_Fire_Debuff_Driver
 70350501:SceneObj_Area_Xm_Property_Ani_Prop_FloatFarr_02
+70350503:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Podium_01
+70350504:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Phonograph_01
+70350505:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Divination_01
+70350506:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_MagicBook_01
+70350507:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_TeamEditor_01
+70350508:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_GuardEntity_01
+70350509:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_CityAxis_01
+70350510:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Entry_01
+70350511:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_LoopElevator_01
 70350512:SceneObj_Level_Common_Property_Ani_Bridge_LyFloatingBridge_01
+70350513:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_TeamEditor_02
+70350514:[N/A] 3284301342
+70350515:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_RageController_01
+70350516:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_RestQuitPoint_01
+70350517:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_CamearAdjust_01
+70350518:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_ESPManager_01
+70350520:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_AirwallAuditorium
+70350521:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_SitPointController_01
+70350522:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_01
+70350523:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_02
+70350525:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_AuditoriumEnd_01
+70350526:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_03
+70350527:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_01
 70350528:SceneObj_Area_Ly_Property_Ani_Prop_GreatFestivalV2_GuidePoint_01
 70350529:SceneObj_Area_Ly_Property_Ani_Prop_GreatFestivalV2_GuidePoint_02
+70350530:SceneObj_Level_Common_Property_Ani_Prop_LightGuideGear_01
+70350531:SceneObj_Level_Common_Property_Ani_Prop_FloorGateGear_01
+70350532:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_04
+70350533:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearDoor_01
+70350534:SceneObj_Gear_MvM_Trap
+70350535:SceneObj_Level_Common_Property_Prop_TowerRepelV3
+70350536:SceneObj_Gear_MvM_Mine
+70350537:SceneObj_Gear_Operator_MvM_Mamolu
+70350538:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_AuditorSound
+70350539:SceneObj_Gear_Operator_MvM_Mamolu_02
 70360011:SceneObj_Gear_Other_Balloon_Destination
 70360012:SceneObj_Gear_Other_Balloon_Destination2
 70360013:SceneObj_Gear_Other_Balloon_Destination3
@@ -8297,6 +8457,8 @@
 70711494:[N/A] 1130721848
 70711495:[N/A] 2735899096
 70711496:[N/A] 454832160
+70711497:[N/A] 2950885832
+70711498:[N/A] 505742752
 70711499:[N/A] 894963696
 70711500:[N/A] 230712120
 70711501:[N/A] 245820744
@@ -8319,11 +8481,66 @@
 70711518:[N/A] 2253302248
 70711519:[N/A] 2953437496
 70711521:[N/A] 3889181896
+70711524:[N/A] 505671616
 70711525:[N/A] 3664702656
+70711526:SceneObj_Eff_Quest_FdHotelTea_02
 70711532:[N/A] 3770495576
 70711534:[N/A] 1937340752
 70711535:[N/A] 3566751808
-70711568:[CHS] - (test)巴慕恩的日记
+70711536:[N/A] 1559943344
+70711537:[N/A] 4005836184
+70711538:[N/A] 1443263448
+70711539:[N/A] 3264946752
+70711540:[N/A] 2774305888
+70711541:[N/A] 467487816
+70711542:[N/A] 191718648
+70711543:[N/A] 379289088
+70711544:[N/A] 3265146368
+70711545:[N/A] 3112380536
+70711546:[N/A] 3293241152
+70711547:[N/A] 1649036848
+70711548:[N/A] 3579505024
+70711549:[N/A] 137682824
+70711550:[N/A] 574660032
+70711551:[N/A] 3832895152
+70711552:[N/A] 4137990640
+70711553:[N/A] 92502520
+70711554:[N/A] 1521413072
+70711555:[N/A] 1463601392
+70711556:[N/A] 3383584096
+70711557:[N/A] 205557824
+70711558:[N/A] 1171982400
+70711560:[N/A] 2051742328
+70711561:SceneObj_Item_Default_Item
+70711563:[N/A] 451175824
+70711564:[N/A] 154356784
+70711565:[N/A] 1820895784
+70711566:[N/A] 4209996104
+70711567:[N/A] 3336031008
+70711568:SceneObj_Quest_SimpleGadgetTalk03
+70711569:SceneObj_Area_Fd_Property_Prop_XgwRoom
+70711570:SceneObj_Quest_SimpleGadgetTalk
+70711571:[N/A] 2286571232
+70711572:[N/A] 79054456
+70711573:SceneObj_Quest_SimpleGadgetTalk05
+70711574:SceneObj_Item_Default_Item
+70711575:SceneObj_Item_Default_Item
+70711576:[N/A] 94595696
+70711577:[N/A] 2592892600
+70711578:[N/A] 3616900488
+70711579:SceneObj_Quest_Property_Ani_Prop_EnergyCaster_Operator_05
+70711580:[N/A] 2097752928
+70711581:SceneObj_Item_Default_Item
+70711582:[N/A] 2478379936
+70711583:[N/A] 2035742872
+70711584:[N/A] 2758548224
+70711585:SceneObj_Item_Default_Item
+70711592:SceneObj_Area_Fd_Property_Ani_Prop_ElderQuilt_02
+70711593:[N/A] 2996193296
+70711594:[N/A] 22295480
+70711595:SceneObj_SigewinneSmoke_01
+70711597:[N/A] 362532096
+70711598:[N/A] 2140889768
 70720216:FireElfTrack
 70720219:SceneObj_Area_Cyjy_Property_Ani_Prop_LitSeelieFootprint_01
 70800002:MsgBoard
@@ -9217,6 +9434,7 @@
 70950206:Включить
 70950207:Открыть
 70950208:Собрать
+70950214:[N/A] 1320639990
 71000004:SceneObj_Amber_RockAmber
 71000005:SceneObj_Task_Rock_Pierce
 71000006:SceneObj_Task_Rock_Pierce
@@ -9565,6 +9783,14 @@
 71700751:[N/A] 233005080
 71700752:[N/A] 3608415800
 71700753:[N/A] 946830120
+71700754:SceneObj_Area_Common_Prop_Common_Twins_Dungeonportal_01
+71700755:SceneObj_Area_Common_Prop_Common_Twins_Butterfly_01
+71700756:[N/A] 1320471632
+71700757:[N/A] 3261253664
+71700758:[N/A] 3555596624
+71700759:[N/A] 1521717744
+71700760:SceneObj_Environment_Bulletin94
+71700761:SceneObj_Environment_Bulletin95
 72000001:SceneObj_Monster_Eldritch_Tentacle_PA
 72000002:SceneObj_Monster_Eldritch_Tentacle_PB
 72000003:SceneObj_Monster_Eldritch_Tentacle_PC
@@ -10032,9 +10258,9 @@
 77104077:Пейзаж в сосуде: Свечение удачи
 77104078:Мудрость Запретной крепости
 77104079:Чаепитие в прохладный полдень
-77104080:Цветочная композиция: Почти аквамарин
-77104081:Цветочная композиция: Чистота цветения
-77104082:Цветочная композиция: Искусство контраста
+77104080:Цветочная композиция: «Почти аквамарин»
+77104081:Цветочная композиция: «Чистота цветения»
+77104082:Цветочная композиция: «Искусство контраста»
 77104083:Пунктуальность Дворца Кардиналис
 77104084:Музыка Дворца Кардиналис
 77104085:Клерк Дворца Кардиналис
@@ -10175,9 +10401,10 @@
 77111010:«Безупречный узор пшеничного поля»
 77111011:Ковёр в таверне - Страсть к игре
 77111012:Ковёр в таверне - Мудрость дуэлянта
-77111013:Ковёр в ресторане: Диалог о равенстве
-77111014:Ковёр в ресторане: Купание в бризе
+77111013:Ковёр в ресторане: «Диалог о равенстве»
+77111014:Ковёр в ресторане: «Купание в бризе»
 77111015:Фонтейнский ковёр: Строгость и справедливость
+77111016:[N/A] 3138406544
 77112001:Изношенный круглый щит
 77112002:Изношенный щит
 77112003:Изношенный меч
@@ -10379,8 +10606,8 @@
 77200118:Инадзумский дом: Воспоминания о Ватацуми
 77200119:Инадзумский дом: Коралловый дом
 77200120:Инадзумский дом: Дом бури
-77200121:Праздничная палатка: Необычные чудеса
-77200122:Праздничная палатка: Литературное дарование
+77200121:Праздничная палатка «Необычные чудеса»
+77200122:Праздничная палатка «Литературное дарование»
 77200123:Сцена грушевого сада: Стиль Юнь Хань
 77200124:Подъёмник: Горный воротильщик
 77200125:Подъёмник: Разрушитель холмов
@@ -10496,7 +10723,7 @@
 77200235:«Скромное жилище в Пуассоне»
 77200236:«Мастерская на скорую руку»
 77200237:Торговая лавка: Отдых за чашкой чая
-77200238:Сцена долины: Облачные волны
+77200238:Торговая лавка: Облачные волны
 77200239:Галерея в долине: Далёкие истоки
 77200240:Галерея в долине: Крепкие корни, цветущие ветви
 77200241:Галерея в долине: Тёплые лучи солнца
@@ -10778,6 +11005,8 @@
 77204226:Хрустальная слава
 77204227:Белоснежное вдохновение
 77204228:Целебный аромат
+77204229:[N/A] 3763891128
+77204230:[N/A] 2588701016
 77205001:Гладкая деревянная скамейка
 77205002:Гладкая каменная скамейка
 77205003:Стул «Гугол»
@@ -11066,7 +11295,7 @@
 77215022:Точка телепортации подпространства
 77215023:«Источник чистоты»
 77215024:«Сумерки в сосновом лесу»
-77215025:Каменный фонарный столб: Неподвижный светильник
+77215025:Каменный фонарный столб «Неподвижный светильник»
 77215026:Озеро сапфирной милости
 77215030:Доска объявлений из аралии «Анжи»
 77215031:Реплика древних бочек из отоги
@@ -11111,7 +11340,7 @@
 77215090:Додоко с особым Прыг-скоком
 77215091:Специализированный автомат по продаже Фонты: Особая модификация
 77215092:Величие Запретной крепости
-77215093:Слезорит: Теория открытости
+77215093:Слезорит: «Теория открытости»
 77215094:Принц водяных
 77215095:Механическая модель: Ремонт
 77215096:Механическая модель: Анкер скалолаза
@@ -11120,6 +11349,8 @@
 77215099:Чудесная бронзовая статуя: Золотой лик печали
 77215100:Ловец сновидений
 77215101:Беззаботный симулякр
+77215102:[N/A] 950928056
+77215103:[N/A] 2479535064
 77216001:Основание из камня: Путь возделывания
 77216002:Основание из камня: Своевременное прибытие
 77216003:Основание из камня: Двойной переход
@@ -12177,6 +12408,21 @@
 71700729:Северные хроники III
 71700747:Сообщение от Сиканоина Хэйдзо
 71700748:О принятии в Щенячий союз
+71700762:[N/A] 976481484
+71700763:[N/A] 1459849724
+71700764:[N/A] 524159380
+71700765:[N/A] 1496186356
+71700766:[N/A] 1649628252
+71700767:[N/A] 3370696724
+71700768:[N/A] 2053389412
+71700769:[N/A] 3448013372
+71700770:[N/A] 3218519604
+71700771:[N/A] 4203305580
+71700772:[N/A] 2790292388
+71700773:[N/A] 969093148
+71700774:[N/A] 1702828196
+71700775:[N/A] 476652700
+71700776:[N/A] 1144681508
 77304001:Шелковица
 77304002:Цветок-сахарок
 77304003:Сесилия
@@ -12234,6 +12480,7 @@
 49001017:Activity_ChannellerSlab_DangerArea
 49001019:Activity_ChannellerSlab_DangerArea_Enhanced
 49001026:Activity_MultiCharacter_DangerArea
+49001037:Gadget_RoleCombat_DangerArea
 70220054:SceneObj_Gear_Combat_Shooter_Laser
 70220074:SceneObj_Gear_Combat_Shooter_Laser_Elec_01
 70220113:SceneObj_Area_Common_Property_Water_Waterplatform_01
@@ -12322,6 +12569,16 @@
 70291148:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTarget_05
 70291149:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTarget_06
 70291150:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTarget_01
+70291173:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_01
+70291174:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_02
+70291175:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_03
+70291176:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_04
+70291177:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_05
+70291178:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_06
+70291179:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTarget_02
+70291183:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTargetWeak_01
+70291184:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTargetBall_02
+70291291:SceneObj_Level_Common_Property_Ani_Prop_BulletHell_StaticBullet_01
 70291428:SceneObj_Area_Fd_Property_Ani_Prop_ShopRobot_01
 70291429:SceneObj_Area_Fd_Property_Ani_Prop_TrapFittingRoom_01
 70291477:SceneObj_Area_Common_Property_Ani_SpriteEffect_01
@@ -12423,6 +12680,9 @@
 70320104:SceneObj_Area_Fd_Property_Ani_Prop_GearPipe_Gear_03
 70320117:SceneObj_Level_Common_Property_Ani_Prop_CharAmuseBasket_01
 70320118:SceneObj_Level_Common_Property_Ani_Prop_CharAmuseBasket_02
+70320146:SceneObj_Level_Common_Property_Ani_Prop_SgwDungeonTruck_01
+70320147:SceneObj_Level_Common_Property_Ani_Prop_SgwDungeonTruck_02
+70320148:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackSwitcher_02
 70330081:SceneObj_Area_Common_Property_Ani_Rock_RotatableCube_01
 70330083:SceneObj_Area_Common_Property_Ani_Rock_RotatableCube_04
 70330118:SceneObj_Area_Common_Property_Ani_Rock_RotatableCubeShader_04
@@ -12956,6 +13216,8 @@
 50004102:MonEquip_Axe_Electric_02
 50004103:MonEquip_Crossbow_01
 50004104:MonEquip_Thoarder_Rocky_Guitar
+50004105:MonEquip_Axe_01
+50004111:MonEquip_WoodenClub_01
 
 // Equip
 50010002:Weapon_Sword_Metal
@@ -13015,6 +13277,7 @@
 50011512:Weapon_Sword_Metal
 50011513:Weapon_Sword_Metal
 50011514:Weapon_Sword_Metal
+50011515:Weapon_Sword_Metal
 50012101:Weapon_Claymore_Metal
 50012201:Weapon_Claymore_Metal
 50012301:Weapon_Claymore_Metal
@@ -13159,6 +13422,7 @@
 50015419:Weapon_Bow_Metal
 50015424:Weapon_Bow_Metal
 50015425:Weapon_Bow_Metal
+50015426:Weapon_Bow_Metal
 50015427:Weapon_Bow_Metal
 50015501:Weapon_Bow_Metal
 50015502:Weapon_Bow_Metal
@@ -13171,6 +13435,7 @@
 50015509:Weapon_Bow_Metal
 50015511:Weapon_Bow_Metal
 50015512:Weapon_Bow_Metal
+50015513:Weapon_Bow_Metal
 50100001:SubEquip_Feiyan_Steelyard
 
 // SubEquip
@@ -13620,6 +13885,8 @@
 70320095:SceneObj_Area_Fd_Property_Ani_Prop_FactoryJukebox_01
 70320100:SceneObj_Area_Fd_Property_Ani_Prop_ResearchConsole_01
 70320105:SceneObj_Area_Fd_Property_Ani_Prop_FDFacPipeValve_01
+70320144:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackSwitcher_01
+70320145:SceneObj_Level_Common_Property_Ani_Prop_SgwDungeonTruck_03
 70330001:SceneObj_Gear_ElemForce_Initial
 70330019:SceneObj_Gear_ElemForce_Base_Rock
 70330024:SceneObj_Gear_ElemForce_Base
@@ -13734,6 +14001,8 @@
 70350486:SceneObj_Area_Xm_Property_Prop_CipherSwitch_04
 70350493:SceneObj_Level_Xm_Property_Ani_Prop_SlushaShellOperator_01
 70350502:SceneObj_Area_Xm_Property_Prop_CipherSwitch_05
+70350519:SceneObj_Gear_Operator_Mamolu_RoleCombat
+70350524:SceneObj_Level_Common_Property_Ani_Prop_TurntableOperator_01
 70360001:SceneObj_Gear_Operator_Invisible_Operator
 70360002:SceneObj_Gear_Operator_Normal_Operator
 70360003:SceneObj_Quest_Clue01

Source/GrasscutterTools/Resources/ru-ru/Monsters.txt

@@ -14,6 +14,7 @@
 20010503:Slime_Electric_02_SimpleStick - [N/A] 1834387465
 20010504:Slime_Electric_02 - [N/A] 2297127161
 20010581:Slime_Electric_02 - [N/A] 3442560241
+20010590:Slime_Electric_04 - [N/A] 3609489745
 20010601:Большой Электро слайм
 20010602:Большой Электро слайм (Механикус)
 20010604:Большой Электро слайм
@@ -49,6 +50,7 @@
 20011205:Slime_Fire_02_SimpleStick - [N/A] 453720297
 20011207:Slime_Fire_02 - [N/A] 1709031969
 20011281:Slime_Fire_02 - [N/A] 1865400017
+20011290:Slime_Fire_06 - [N/A] 759614481
 20011301:Большой Пиро слайм
 20011302:Большой Пиро слайм (Механикус)
 20011304:Большой Пиро слайм
@@ -86,6 +88,7 @@
 20050501:Океанид-павлин
 20050502:Гидро мимик: Воробей
 20050581:Monster_Oceanid_Tit - [N/A] 2975528057
+20050590:Monster_Oceanid_Tit_02 - [N/A] 3906620841
 20050601:Океанид-утка
 20050602:Океанид-утка (Сухопутная версия)
 20050603:Гидро мимик: Утка
@@ -116,10 +119,12 @@
 20060382:Sylph_Wind_01 - [N/A] 2626651433
 20060401:Крио призрак
 20060481:Sylph_Ice_01 - [N/A] 3638534065
+20060490:Sylph_Ice_02 - [N/A] 1165765169
 20060501:Электро призрак
 20060581:Sylph_Electric_01 - [N/A] 1346991849
 20060601:Пиро призрак
 20060681:Sylph_Fire_01 - [N/A] 2020892233
+20060690:Sylph_Fire_02 - [N/A] 242072433
 20060701:Sylph_Grass_01 - [N/A] 586909705
 20060781:Sylph_Grass_01 - [N/A] 1523065297
 21010101:Хиличурл
@@ -131,6 +136,7 @@
 21010201:Хиличурл боец
 21010202:Hili_None_01_Club - [N/A] 518903577
 21010281:Hili_None_01_Club - [N/A] 148649137
+21010290:Hili_None_02_Club - [N/A] 2282353529
 21010299:Hili_None_01_Club_NoAI - [N/A] 1500968553
 21010301:Хиличурл с деревянным щитом
 21010302:Хиличурл с деревянным щитом (Механикус)
@@ -156,10 +162,12 @@
 21010902:Test_多重冰箭丘丘人
 21010981:Hili_Ice_Range - [N/A] 1716558393
 21010982:Hili_Ice_Range_Multi - [N/A] 1237213681
+21010990:Hili_Ice_Range_03 - [N/A] 2345480137
 21011001:Электро хиличурл стрелок
 21011002:Test_多重雷箭丘丘人
 21011081:Hili_Electric_Range - [N/A] 2022453977
 21011082:Hili_Electric_Range_Multi - [N/A] 3012953161
+21011090:Hili_Electric_Range_03 - [N/A] 4254195473
 21011201:Хиличурл с каменным щитом
 21011202:Хиличурл с каменным щитом (Механикус)
 21011281:Hili_None_01_RockShield - [N/A] 2602064417
@@ -184,6 +192,7 @@
 21020204:Brute_None_Axe - [N/A] 1119958809
 21020281:Brute_None_Axe - [N/A] 741150761
 21020282:Brute_None_Axe - [N/A] 1576743033
+21020290:Brute_None_Axe_01 - [N/A] 2024375625
 21020299:Brute_None_Axe_NoAI - [N/A] 4081842953
 21020301:Митачурл с каменным щитом
 21020302:Митачурл с каменным щитом (Механикус)
@@ -214,6 +223,7 @@
 21030103:Test_移动治疗水丘丘萨满
 21030104:Shaman_Water_01_LostSamachurl - [N/A] 1713314673
 21030181:Shaman_Water_01 - [N/A] 3149869785
+21030190:Shaman_Water_02 - [N/A] 1877774473
 21030201:Дендро шамачурл
 21030202:Дендро шамачурл (Механикус)
 21030203:Дендро шамачурл
@@ -324,6 +334,7 @@
 24010109:Страж руин
 24010181:Defender_None_01 - [N/A] 1482848121
 24010182:Defender_None_01 - [N/A] 3806686089
+24010190:Defender_None_03 - [N/A] 1203739089
 24010201:Руинный охотник
 24010202:Руинный охотник (Механикус)
 24010281:Formathr_None - [N/A] 2103947025
@@ -380,6 +391,7 @@
 24060901:MachinaIustitia_Ruggiero_01 - [N/A] 2598421161
 24060902:MachinaIustitia_Ruggiero_02 - [N/A] 1178238353
 24060903:MachinaIustitia_Ruggiero_01 - [N/A] 4091306801
+24060990:MachinaIustitia_Ruggiero_04 - [N/A] 2442754929
 24061001:MachinaIustitia_Bradamante_01 - [N/A] 3820417257
 24061002:MachinaIustitia_Bradamante_02 - [N/A] 2286290561
 24061101:MachinaIustitia_LengthShifter_01 - [N/A] 3147408705
@@ -409,6 +421,7 @@
 24065602:MachinaIustitia_Frigate_04 - [N/A] 1620120737
 24065701:MachinaIustitia_Assimilator_03 - [N/A] 4222863585
 24065702:MachinaIustitia_Assimilator_04 - [N/A] 3834516417
+24065790:MachinaIustitia_Assimilator_90 - [N/A] 410434241
 24065801:MachinaIustitia_Ruggiero_03 - [N/A] 3392589561
 24065802:MachinaIustitia_Ruggiero_04 - [N/A] 2337120689
 24065803:MachinaIustitia_Ruggiero_05 - [N/A] 1989788129
@@ -438,14 +451,24 @@
 24069101:MachinaIustitia_LengthShifter_Codex - [N/A] 306536801
 24069201:MachinaIustitia_Excavator_Codex - [N/A] 4236769177
 24810101:FungusFighterV2_TowerFire_01 - [N/A] 1459265257
+24810190:MvM_TowerFire_01 - [N/A] 3268380201
+24810191:MvM_TowerFire_02 - [N/A] 2853693193
 24810201:FungusFighterV2_TowerFire_02 - [N/A] 1199053881
 24810301:FungusFighterV2_TowerElectric_01 - [N/A] 2345069921
+24810390:MvM_TowerElectric_01 - [N/A] 3800466761
+24810391:MvM_TowerElectric_02 - [N/A] 4010007481
 24810401:FungusFighterV2_TowerElectric_02 - [N/A] 3520636737
 24810501:FungusFighterV2_TowerWater_01 - [N/A] 2746544617
+24810590:MvM_TowerWater_01 - [N/A] 3065011249
+24810591:MvM_TowerWater_02 - [N/A] 2040948281
 24810601:FungusFighterV2_TowerWater_02 - [N/A] 3712937217
 24810701:FungusFighterV2_TowerIce_01 - [N/A] 3750011169
+24810790:MvM_TowerIce_01 - [N/A] 2546590705
+24810791:MvM_TowerIce_02 - [N/A] 1891908609
 24810801:FungusFighterV2_TowerIce_02 - [N/A] 1832843025
 24810901:FungusFighterV2_TowerWind_01 - [N/A] 3717599585
+24810990:MvM_TowerWind_01 - [N/A] 3672283377
+24810991:MvM_TowerWind_02 - [N/A] 750672833
 24811001:FungusFighterV2_TowerWind_02 - [N/A] 540068777
 24811101:FungusFighterV2_TowerPhysics_01 - [N/A] 583303081
 24920101:Balloon_SlimeBalloon_01 - [N/A] 1492263081
@@ -494,6 +517,7 @@
 25010303:NPC_Quest_Male_Standard_Oppo_13715 - [N/A] 724448633
 25010304:NPC_Quest_Male_Standard_Oppo_13777 - [N/A] 2201891417
 25010381:Thoarder_Male_Standard_NoWeapon_Fire_01 - [N/A] 933629753
+25010390:Thoarder_Male_Standard_NoWeapon_Fire_02 - [N/A] 4261880345
 25010401:Похитители сокровищ: Гидро химик
 25010402:Thoarder_Male_Standard_NoWeapon_Water_01_02 - [N/A] 3452436881
 25010403:Thoarder_Male_Standard_NoWeapon_Water_01_02 - [N/A] 4146453193
@@ -503,12 +527,15 @@
 25010501:Похитители сокровищ: Электро химик
 25010502:NPC_Quest_Male_Standard_Colter_13709 - [N/A] 1419015937
 25010503:NPC_Quest_Male_Standard_Oppo_13711 - [N/A] 3201328753
+25010504:NPC_Quest_Male_Standard_Gaston_14054 - [N/A] 2066425721
+25010505:NPC_Quest_Male_Standard_Florian_14132 - [N/A] 4179062537
 25010581:Thoarder_Male_Standard_NoWeapon_Electric_01 - [N/A] 624542921
 25010601:Похитители сокровищ: Крио химик
 25010602:Thoarder_Male_Standard_NoWeapon_Ice_02 - [N/A] 726418097
 25010603:Thoarder_Male_Standard_NoWeapon_Ice_03 - [N/A] 2398565441
 25010604:NPC_Quest_Male_Standard_Oppo_13714 - [N/A] 50560321
 25010605:NPC_Fontaine_Male_Standard_RobberB_21418 - [N/A] 859928713
+25010606:NPC_Quest_Male_Standard_Enri_14055 - [N/A] 42107321
 25010681:Thoarder_Male_Standard_NoWeapon_Ice_01 - [N/A] 3749122441
 25010701:Похитители сокровищ: Разнорабочий
 25010702:NPC_Quest_Male_Fat_Oppo_13873 - [N/A] 2169448041
@@ -520,6 +547,7 @@
 25020104:NPC_Quest_Male_Standard_Truand_13335 - [N/A] 2313699185
 25020105:Thoarder_Male_Crossbow_01_05 - [N/A] 2794240153
 25020106:NPC_Fontaine_Male_Standard_RobberLeader_21417 - [N/A] 3178123705
+25020107:NPC_Quest_Male_Standard_Lazare_14056 - [N/A] 3978033681
 25020201:Стрелок Похитителей сокровищ
 25020204:Похитители сокровищ: Стрелок
 25020205:Thoarder_Male_Standard_Crossbow_02_04 - [N/A] 763791561
@@ -588,6 +616,7 @@
 25080281:Samurai_Ronin_02 - [N/A] 4200211249
 25080301:Ронин-тень
 25080381:Samurai_Ronin_03 - [N/A] 2465854769
+25080390:Samurai_Ronin_05 - [N/A] 1736584545
 25080401:Самурай сёгуната
 25080402:Самурай-ёрики
 25080403:Samurai_Hatamoto_03 - [N/A] 1581579825
@@ -598,11 +627,13 @@
 25100181:Samurai_Kairagi_01 - [N/A] 77071577
 25100182:Samurai_Kairagi_01 - [N/A] 391115545
 25100183:Samurai_Kairagi_01 - [N/A] 222568409
+25100190:Samurai_Kairagi_07 - [N/A] 2745601001
 25100201:Пиро кайраги
 25100202:Samurai_Kairagi_07 - Пиро кайраги
 25100281:Samurai_Kairagi_02 - [N/A] 3882445073
 25100282:Samurai_Kairagi_02 - [N/A] 753240097
 25100283:Samurai_Kairagi_02 - [N/A] 3828251937
+25100290:Samurai_Kairagi_08 - [N/A] 1886860641
 25100301:Громовержец кайраги
 25100302:Отимуся: Проклятый гром
 25100401:Огнедышащий кайраги
@@ -674,10 +705,12 @@
 25310102:Eremite_Female_Slim_PushDagger_02 - [N/A] 1936242505
 25310181:Eremite_Female_Slim_PushDagger_01 - [N/A] 1365735873
 25310182:Eremite_Female_Slim_PushDagger_01 - [N/A] 1430105225
+25310190:Eremite_Female_Slim_PushDagger_03 - [N/A] 2670641129
 25310201:Eremite_Male_Standard_Glaive_01 - [N/A] 3154173257
 25310202:Eremite_Male_Standard_Glaive_02 - [N/A] 3503187145
 25310281:Eremite_Male_Standard_Glaive_01 - [N/A] 3981952521
 25310282:Eremite_Male_Standard_Glaive_01 - [N/A] 411301145
+25310290:Eremite_Male_Standard_Glaive_03 - [N/A] 423708617
 25310301:Eremite_Male_Standard_Polearm_01 - [N/A] 863506833
 25310381:Eremite_Male_Standard_Polearm_01 - [N/A] 3592293337
 25310382:Eremite_Male_Standard_Polearm_01 - [N/A] 1324855129
@@ -702,6 +735,7 @@
 26010301:Электро попрыгунья
 26030101:Детёныш геовишапа
 26030181:Wyrm_Rock - [N/A] 3059435841
+26030190:Wyrm_Rock_02 - [N/A] 557038713
 26040101:Геовишап - Гидро
 26040102:Геовишап - Пиро
 26040103:Геовишап - Крио
@@ -734,7 +768,9 @@
 26051201:Drake_DeepSea_Water_03 - [N/A] 1100113145
 26051202:Drake_DeepSea_Water_04 - [N/A] 1628565665
 26060101:Электро цицин
+26060190:Cicin_Thunder_02 - [N/A] 1457632377
 26060201:Гидро цицин
+26060290:Cicin_Water_02 - [N/A] 3625213961
 26060301:Крио цицин
 26090101:Плавучий Гидро плесенник
 26090181:Fungus_Un_Gamma_Water_01 - [N/A] 1665501025
@@ -749,6 +785,7 @@
 26090381:Fungus_Un_Delta_Wind_01 - [N/A] 2441732177
 26090390:Fungus_Un_Delta_Wind_Enemy - [N/A] 3376055609
 26090391:Fungus_Un_Delta_Wind_01_Capture - [N/A] 1573739513
+26090393:Fungus_Un_Delta_Wind_02 - [N/A] 2743236449
 26090401:Fungus_Trois_Epsilon_Electric_01 - [N/A] 2774139065
 26090481:Fungus_Trois_Epsilon_Electric_01 - [N/A] 4151812377
 26090490:Fungus_Trois_Epsilon_Electric_Enemy - [N/A] 783524481
@@ -822,6 +859,7 @@
 26160202:Aplysia_Mature_01_Land - [N/A] 2244040649
 26160301:SeaHorse_Mature_01_Sea - [N/A] 1544112625
 26160302:SeaHorse_Mature_01_Land - [N/A] 3992435993
+26160390:SeaHorse_Mature_02 - [N/A] 4085486801
 26162101:HermitCrab_Mature_02 - [N/A] 3832936073
 26162201:MantaRay_Larva_03 - [N/A] 1943296953
 26162301:Seal_Larva_02 - [N/A] 1874832521
@@ -1430,18 +1468,42 @@
 28041105:Fishable_Maritime_MachinaIustitia_05 - [N/A] 1211691881
 
 // Partner
+30010590:Partner_Slime_Electric_04 - [N/A] 1360704329
+30011290:Partner_Slime_Fire_06 - [N/A] 1945956961
 30050501:Partner_Oceanid_Tit - [N/A] 2294162793
+30050590:Partner_Monster_Oceanid_Tit_02 - [N/A] 1992834649
 30050601:Partner_Oceanid_Wigeon_02 - [N/A] 903450313
 30050701:Partner_Oceanid_Squirrel - [N/A] 2642015873
+30060490:Partner_Sylph_Ice_02 - [N/A] 3052301665
+30060690:Partner_Sylph_Fire_02 - [N/A] 2606395609
+31010290:Partner_Hili_None_02_Club - [N/A] 1348459489
+31010990:Partner_Hili_Ice_Range_03 - [N/A] 318427833
+31011090:Partner_Hili_Electric_Range_03 - [N/A] 2029584281
+31020290:Partner_Brute_None_Axe_01 - [N/A] 208842305
+31030190:Partner_Shaman_Water_02 - [N/A] 3800190729
 31040101:Partner_Hilistray_Wind_01 - [N/A] 1924270545
 32110201:Ovacua_Order_02 - [N/A] 569946161
+34010190:Partner_Defender_None_03 - [N/A] 2666244393
 34060101:Partner_MachinaIustitia_Sentry_01 - [N/A] 68219401
 34060102:Partner_MachinaIustitia_Sentry_01 - [N/A] 1581798833
 34060901:Partner_MachinaIustitia_Ruggiero_02 - [N/A] 2221802481
+34060990:Partner_MachinaIustitia_Ruggiero_04 - [N/A] 1146147913
+34065790:Partner_MachinaIustitia_Assimilator_90 - [N/A] 3382698241
+34810190:Partner_MvM_TowerFire_01 - [N/A] 2504772937
+34810191:Partner_MvM_TowerFire_02 - [N/A] 3028471225
+34810390:Partner_MvM_TowerElectric_01 - [N/A] 2883808873
+34810391:Partner_MvM_TowerElectric_02 - [N/A] 1973294081
+34810590:Partner_MvM_TowerWater_01 - [N/A] 3115241505
+34810591:Partner_MvM_TowerWater_02 - [N/A] 3145296577
+34810790:Partner_MvM_TowerIce_01 - [N/A] 941724737
+34810791:Partner_MvM_TowerIce_02 - [N/A] 766759905
+34810990:Partner_MvM_TowerWind_01 - [N/A] 98234177
+34810991:Partner_MvM_TowerWind_02 - [N/A] 1166709913
 35010201:NPC_Fontaine_Male_Standard_Sonny_5132 - [N/A] 2270561153
 35010202:NPC_Quest_Male_Standard_Rouge_21274 - [N/A] 802259057
 35010203:NPC_Quest_Male_Standard_Rocher_21161 - [N/A] 1589132441
 35010204:NPC_Quest_Male_Standard_TieChuaner_21362 - [N/A] 1978991089
+35010390:Partner_Thoarder_Male_Standard_NoWeapon_Fire_02 - [N/A] 642225153
 35010602:Thoarder_Male_Standard_NoWeapon_Ice_02 - [N/A] 2367366025
 35020201:NPC_Fontaine_Male_Standard_Blanc_5233 - [N/A] 295013961
 35020202:NPC_Fontaine_Male_Standard_Bleu_5232 - [N/A] 2091883585
@@ -1450,6 +1512,9 @@
 35060102:NPC_Fontaine_MuscleMan_Standard_Chaussivert_5273 - [N/A] 2070327977
 35060103:NPC_Quest_Muscleman_Standard_Valberry_21163 - [N/A] 2883132241
 35070101:NPC_Quest_MuscleMan_Standard_TieMing_21298 - [N/A] 1105845961
+35080390:Partner_Samurai_Ronin_05 - [N/A] 1710869545
+35100190:Partner_Samurai_Kairagi_07 - [N/A] 1725122433
+35100290:Partner_Samurai_Kairagi_08 - [N/A] 3265297905
 35110101:NPC_Fontaine_Female_Standard_Genevieve_5260 - [N/A] 465377969
 35110102:NPC_Fontaine_Female_Standard_Genevieve_5260 - [N/A] 4203920553
 35110103:NPC_Fontaine_Female_Standard_Genevieve_5260 - [N/A] 387141537
@@ -1471,10 +1536,15 @@
 35210501:NPC - Хабачи
 35210502:NPC_Quest_MuscleMan_Standard_Bashar_13107 - [N/A] 4266344825
 35310101:Позолоченная бригада · Очистка воды песком (Золотая страна грез)
+35310190:Partner_Eremite_Female_Slim_PushDagger_03 - [N/A] 3316783769
+35310290:Partner_Eremite_Male_Standard_Glaive_03 - [N/A] 2388024745
 35310301:Позолоченная бригада · Гром днем ​​(Золотая страна грез)
 35410101:Partner_Eremite_Male_Strong_Katar_01 - [N/A] 843060329
 35410201:Partner_Eremite_Female_Standard_Longbow_01 - [N/A] 2996340361
+36030190:Partner_Wyrm_Rock_02 - [N/A] 4078935249
 36050601:Drake_DeepSea_Water_01 - [N/A] 478535833
+36060190:Partner_Cicin_Thunder_02 - [N/A] 90474689
+36060290:Partner_Cicin_Water_02 - [N/A] 4196823585
 36090190:Активность — Дружелюбная летающая вода
 36090191:Partner_Fumgus_Un_Gamma_Water - [N/A] 3593336553
 36090192:Partner_Fumgus_Un_Gamma_Water - [N/A] 2780786345
@@ -1484,6 +1554,7 @@
 36090390:Активность — Дружелюбный летающий ветер
 36090391:Partner_Fumgus_Un_Delta_Wind - [N/A] 637837089
 36090392:Partner_Fumgus_Un_Delta_Wind - [N/A] 2589779561
+36090393:Partner_Fungus_Un_Delta_Wind_02 - [N/A] 2231278801
 36090490:Активность — Дружелюбный вращающийся гром
 36090491:Partner_Fumgus_Trois_Epsilon_Electric - [N/A] 4089561145
 36090492:Partner_Fumgus_Trois_Epsilon_Electric - [N/A] 2409750417
@@ -1505,6 +1576,7 @@
 36091090:Активность — Дружелюбный растянутый гром
 36091091:Partner_Fumgus_Deux_Delta_Electric - [N/A] 2177474001
 36091092:Partner_Fumgus_Deux_Delta_Electric - [N/A] 1670919961
+36160390:Partner_SeaHorse_Mature_02 - [N/A] 2198861673
 38050590:Partner_Animal_Electrohercules_01 - [N/A] 2442210649
 38050591:Partner_Animal_Electrohercules_02 - [N/A] 1954661401
 38060502:Partner_Animal_Megamoth_Jungle_01 - [N/A] 113674993

Source/GrasscutterTools/Resources/ru-ru/Weapon.txt

@@ -44,6 +44,7 @@
 11512:Свет лиственного разреза
 11513:Блеск тихих вод
 11514:Ураку мисугири
+11515:Отпущение грехов
 12101:Двуручный меч богатыря
 12201:Лучший друг наёмника
 12301:Металлическая тень
@@ -179,6 +180,7 @@
 15419:Клюв ибиса
 15424:Наследник слепящего солнца
 15425:Мелодия покоя
+15426:Выкованный из облаков
 15427:Дальномер
 15501:Небесное крыло
 15502:Лук Амоса
@@ -188,3 +190,4 @@
 15509:Громовой пульс
 15511:Охотничья тропа
 15512:Первый великий фокус
+15513:Сердечные струны дождя

Source/GrasscutterTools/Resources/zh-cn/Avatar.txt

@@ -79,4 +79,7 @@
 1092:嘉明
 1093:闲云
 1094:千织
+1095:希格雯
 1096:阿蕾奇诺
+1097:赛索斯
+1098:克洛琳德

Source/GrasscutterTools/Resources/zh-cn/GachaBannerPrefab.txt

@@ -0,0 +1,129 @@
+A007:初行者推荐祈愿
+A008:奔行世间
+A009:杯装之诗
+A010:黎明巡礼
+A011:南风之眷
+A012:靖妖傩舞
+A013:神铸赋形
+A015:闪焰的驻足
+A016:初行者推荐祈愿
+A017:奔行世间
+A018:闪焰的驻足
+A019:杯装之诗
+A020:神铸赋形
+A021:神铸赋形
+A022:奔行世间
+A023:暂别冬都
+A024:陵薮市朝
+A027:深秘之息
+A028:浮生孰来
+A031:烟火之邀
+A032:鱼龙灯昼
+A033:赤团开时
+A036:杯装之诗
+A037:暂别冬都
+A040:陵薮市朝
+A041:浪涌之瞬
+A045:叶落风随
+A048:白鹭之庭
+A049:焰色天河
+A052:影寂天下人
+A053:浮岳虹珠
+A061:鬼门斗宴
+A065:出尘入世
+A071:华紫樱绯
+A076:苍流踏花
+A081:素霓伣天
+A091:巡御蘙荟-提纳里
+A092:陵薮市朝-钟离
+A093:神铸赋形-猎人贯虹
+A097:雳裁冥昭-赛诺
+A098:杯装之诗-温迪
+A099:神铸赋形-赤沙终末
+A100:翩舞歈莲-妮露
+A101:深秘之息-阿贝多
+A102:神铸赋形-圣显绿箭
+A103:月草的赐慧-纳西妲
+A104:焰色天河-宵宫
+A105:神铸赋形-千夜飞雷
+A106:华紫樱绯-八重神子
+A107:暂别冬都-达达利亚
+A108:神铸赋形-神乐冬极
+A109:余火变相-流浪者
+A110:鬼门斗宴-荒泷一斗
+A111:神铸赋形-图莱杜拉赤角
+A112:影寂天下人-雷电将军
+A113:苍流踏花-神里绫人
+A114:神铸赋形-薙草波乱
+A115:敕诫枢谋-艾尔海森
+A116:烟火之邀-魈
+A117:神铸赋形-裁叶萃光和璞鸢
+A118:赤团开时-胡桃
+A119:素霓伣天-夜兰
+A120:神铸赋形-护摩若水
+A121:迪希雅
+A122:赛诺
+A123:苇海信标/赤沙之杖
+A124:申鹤
+A125:神里绫华
+A126:雾切之回光/息灾
+A127:纳西妲
+A128:妮露
+A129:千夜浮梦/圣显之钥
+A130:白术
+A131:甘雨
+A132:碧落之珑/阿莫斯之弓
+A133:宵宫
+A134:八重神子
+A135:飞雷之弦振/神乐之真意
+A136:艾尔海森
+A137:枫原万叶
+A138:苍古自由之誓/裁叶萃光
+A139:优菈
+A140:可莉
+A141:松籁响起之时/四风原典
+A142:珊瑚宫心海
+A143:流浪者
+A144:不灭月华/图莱杜拉的回忆
+A145:林尼
+A146:夜兰
+A147:最初的大魔术/若水
+A148:钟离
+A149:公子
+A150:贯虹之槊/冬极白星
+A151:那维莱特
+A152:胡桃
+A153:万世流涌大典/护摩之杖
+A154:莱欧斯利
+A155:温迪
+A156:金流监督/终未嗟叹之诗
+A157:芙宁娜
+A158:白术
+A159:静水流涌之辉/碧落之珑
+A160:赛诺
+A161:神里绫人
+A162:波乱月白经津/赤沙之杖
+A163:娜维娅
+A164:神里绫华
+A165:裁断/雾切之回光
+A166:雷电将军
+A167:宵宫
+A168:薙草之稻光/飞雷之弦振
+A169:闲云
+A170:纳西妲
+A171:鹤鸣余音/千夜浮梦
+A172:魈
+A173:八重神子
+A174:和璞鸢/神乐之真意
+A175:千织
+A176:荒泷一斗
+A177:有乐御簾切/赤角石溃杵
+A178:那维莱特
+A179:枫原万叶
+A180:万世流涌大典/苍古自由之誓
+A181:阿蕾奇诺
+A182:林尼
+A183:赤月之形/最初的大魔术
+A184:流浪者
+A185:白术
+A186:图莱杜拉的回忆/碧落之珑

Source/GrasscutterTools/Resources/zh-cn/GachaBannerTitle.txt

@@ -1,49 +1,53 @@
-007:初行者推荐祈愿
-008:奔行世间
-009:杯装之诗
-010:黎明巡礼
-011:南风之眷
-012:靖妖傩舞
-013:神铸赋形
-015:闪焰的驻足
-016:初行者推荐祈愿
-017:奔行世间
-018:闪焰的驻足
-019:杯装之诗
-020:神铸赋形
-021:神铸赋形
-022:奔行世间
-023:暂别冬都
-024:陵薮市朝
-027:深秘之息
-028:浮生孰来
-031:烟火之邀
-032:鱼龙灯昼
-033:赤团开时
-036:杯装之诗
-037:暂别冬都
-040:陵薮市朝
-041:浪涌之瞬
-045:叶落风随
-048:白鹭之庭
-049:焰色天河
-052:影寂天下人
-053:浮岳虹珠
-061:鬼门斗宴
-065:出尘入世
-071:华紫樱绯
-076:苍流踏花
-081:素霓伣天
-091:巡御蘙荟-提纳里
-092:陵薮市朝-钟离
-093:神铸赋形-猎人贯虹
-097:雳裁冥昭-赛诺
-098:杯装之诗-温迪
-099:神铸赋形-赤沙终末
-0100:翩舞歈莲-妮露
-0103:月草的赐慧-纳西妲
-0109:余火变相-流浪者
-0115:敕诫枢谋-艾尔海森
-101:深秘之息-阿贝多
-101:神铸赋形-圣显绿箭
-121:迪希雅
+A007:初行者推荐祈愿
+A008:奔行世间
+A009:杯装之诗
+A010:黎明巡礼
+A011:南风之眷
+A012:靖妖傩舞
+A013:神铸赋形
+A015:闪焰的驻足
+A016:初行者推荐祈愿
+A017:奔行世间
+A018:闪焰的驻足
+A019:杯装之诗
+A020:神铸赋形
+A021:神铸赋形
+A022:奔行世间
+A023:暂别冬都
+A024:陵薮市朝
+A027:深秘之息
+A028:浮生孰来
+A031:烟火之邀
+A032:鱼龙灯昼
+A033:赤团开时
+A036:杯装之诗
+A037:暂别冬都
+A040:陵薮市朝
+A041:浪涌之瞬
+A045:叶落风随
+A048:白鹭之庭
+A049:焰色天河
+A052:影寂天下人
+A053:浮岳虹珠
+A061:鬼门斗宴
+A065:出尘入世
+A071:华紫樱绯
+A076:苍流踏花
+A081:素霓伣天
+A091:巡御蘙荟
+A097:雳裁冥昭
+A0100:翩舞歈莲
+A0103:月草的赐慧
+A0109:余火变相
+A0115:敕诫枢谋
+A0121:烈阳烁金
+A0130:心珠循琅
+A0145:光与影的戏术
+A0151:渊海界令
+A0154:劫中泛滥
+A0157:众水的颂诗
+A0163:刺玫的铭誓
+A0169:云府鹤行
+A0175:千云绘羽织
+A0181:炉边烬影
+B001:晨风之诗

Source/GrasscutterTools/Resources/zh-cn/GachaBennerPrefab.txt

@@ -1,69 +0,0 @@
-007:初行者推荐祈愿
-008:奔行世间
-009:杯装之诗
-010:黎明巡礼
-011:南风之眷
-012:靖妖傩舞
-013:神铸赋形
-015:闪焰的驻足
-016:初行者推荐祈愿
-017:奔行世间
-018:闪焰的驻足
-019:杯装之诗
-020:神铸赋形
-021:神铸赋形
-022:奔行世间
-023:暂别冬都
-024:陵薮市朝
-027:深秘之息
-028:浮生孰来
-031:烟火之邀
-032:鱼龙灯昼
-033:赤团开时
-036:杯装之诗
-037:暂别冬都
-040:陵薮市朝
-041:浪涌之瞬
-045:叶落风随
-048:白鹭之庭
-049:焰色天河
-052:影寂天下人
-053:浮岳虹珠
-061:鬼门斗宴
-065:出尘入世
-071:华紫樱绯
-076:苍流踏花
-081:素霓伣天
-091:巡御蘙荟-提纳里
-092:陵薮市朝-钟离
-093:神铸赋形-猎人贯虹
-097:雳裁冥昭-赛诺
-098:杯装之诗-温迪
-099:神铸赋形-赤沙终末
-100:翩舞歈莲-妮露
-101:深秘之息-阿贝多
-102:神铸赋形-圣显绿箭
-103:月草的赐慧-纳西妲
-104:焰色天河-宵宫
-105:神铸赋形-千夜飞雷
-106:华紫樱绯-八重神子
-107:暂别冬都-达达利亚
-108:神铸赋形-神乐冬极
-109:余火变相-流浪者
-110:鬼门斗宴-荒泷一斗
-111:神铸赋形-图莱杜拉赤角
-112:影寂天下人-雷电将军
-113:苍流踏花-神里绫人
-114:神铸赋形-薙草波乱
-115:敕诫枢谋-艾尔海森
-116:烟火之邀-魈
-117:神铸赋形-裁叶萃光和璞鸢
-118:赤团开时-胡桃
-119:素霓伣天-夜兰
-120:神铸赋形-护摩若水
-121:迪希雅
-122:赛诺
-123:苇海信标/赤沙之杖
-124:申鹤
-125:神里绫华
-126:雾切之回光/息灾

Source/GrasscutterTools/Resources/zh-cn/Gadget.txt

@@ -271,6 +271,7 @@
 41076011:Faruzan_WindBlackHole
 41076015:Faruzan_SkillObj_WindZone_Hit
 41083009:Linette_Constellation_WindZone
+41098006:Clorinde_Constellation_1_Gadget
 42000001:钓鱼的鱼漂发射器
 42000002:钓鱼的鱼漂
 42103002:丘丘水萨满-群疗区域
@@ -790,13 +791,43 @@
 41093023:Liuyun_ElementalBurst_SmallWindHole
 41094004:Bullet_Chiori_ElementalArt_Rush_Detect
 41094006:SkillObj_Chiori_ElementalBurst_RockBomb
+41095001:Sigewinne_Extra_Bubble_Bullet
+41095002:Sigewinne_EArt_Bullet_Normal
+41095003:Sigewinne_EArt_Bullet_No_Enemy
+41095004:Sigewinne_EArt_Bullet_One_Enemy
+41095005:Sigewinne_EArt_Bullet_Normal_Shoot_NoTarget
+41095006:Sigewinne_ElementalArt_Core
+41095007:Sigewinne_Arrow_01
+41095008:Sigewinne_Arrow_02
+41095009:Sigewinne_Arrow_03
+41095010:Sigewinne_AimingArrow_WithoutWater
+41095011:Sigewinne_AimingArrow_Water
+41095012:Sigewinne_EArt_Bullet_Normal_New
+41095013:Sigewinne_Burst_Attacker
 41096003:Arlecchino_ExtraAttack_Bullet
+41097001:Sethos_Arrow_01
+41097002:Sethos_Arrow_02
+41097003:Sethos_Arrow_03
+41097004:Sethos_Arrow_04
+41097005:Sethos_AimingArrow_WithoutElec
+41097006:Sethos_AimingArrow_WithElec
+41097007:Sethos_AimingArrow_Lightning
+41097008:Sethos_AimingArrow_Lightning_Burst_01
+41097009:Sethos_AimingArrow_Lightning_Burst_02
+41097010:Sethos_AimingArrow_Lightning_Burst_03
+41097011:Sethos_AimingArrow_Lightning_Burst_04
+41098001:Clorinde_DodgeAttack_Small
+41098002:Clorinde_DodgeAttack_Medium
+41098003:Clorinde_DodgeAttack_Large
+41098004:Clorinde_ElementArt_Attack_Bullet_Penetrating
+41098005:Clorinde_ElementArt_Attack_Bullet_Standard
 42000003:Activity_Pitch_Pot_Throw_Bullet
 42000004:Activity_Pitch_Pot_Throw_Bullet_02
 42000005:BossNarzissenkreuzBattle_PlayerSkill_Bullet_1
 42000006:BossNarzissenkreuzBattle_PlayerSkill_Bullet_2
 42000007:Activity_GoalChallenge_Level03_WindZone
 42000008:Activity_GoalChallenge_Level04_RainZone
+42000010:Bullet_ActivityAbility_MVM_AvatarSkill_Asist
 42001002:史莱姆岩锥
 42001003:史莱姆气泡-弹道
 42001004:史莱姆-冰锥
@@ -925,6 +956,7 @@
 42005021:纯水精灵延迟水球生成器
 42005022:纯水松鼠水波
 42005024:纯水水流激光锁定子弹
+42005026:MvM_Frog_WaterWave
 42005101:Necalevia_RangeBullet
 42005102:Necalevia_AOERangeMulti
 42005103:Necalevia_Small_RangeBullet
@@ -954,8 +986,10 @@
 42006401:飘浮灵-冰-小雪球
 42006402:飘浮灵-冰-元素微粒
 42006403:飘浮灵-冰-大雪球
+42006407:Sylph_Ice_IceBullet_02
 42006501:飘浮灵-雷-前冲碰撞子弹
 42006601:飘浮灵-火-小火球
+42006605:MvM_Sylph_Fire_FireBullet
 42006701:飘浮灵-草-子弹
 42006702:飘浮灵-草-捕捉能量弹
 42006705:飘浮灵-草-激活亡语子弹
@@ -985,6 +1019,8 @@
 42101025:大伟丘丘人丢的大物件03
 42101026:雷弹丘丘扔的雷史莱姆
 42101027:Monster_Arrow_ShootingActivity
+42101028:MvM_Hili_Electric_Arrow
+42101029:MvM_Hili_Ice_Arrow
 42102001:火斧暴徒-横波
 42102002:火斧暴徒-纵波
 42102003:火斧暴徒-火史莱姆-着
@@ -1254,6 +1290,10 @@
 42406057:MachinaIustitia_Bradamante_Summon_Bullet
 42406059:MachinaIustitia_Bradamante_Attack02_FollowBullet2
 42406060:MachinaIustitia_Bradamante_Attack02_FollowBullet3
+42406061:MvM_MachinaIustitia_Ruggiero02_Attack02_Bullet
+42406062:MvM_MachinaIustitia_Ruggiero02_Attack02_Bullet2
+42406063:MvM_MachinaIustitia_Assimilator_NormalAttack01_Bullet
+42406064:MvM_MachinaIustitia_Assimilator_MeleeAttack01_Bullet
 42407002:MachinaIustitia_Nutcracker_Stage1_WindBullet1
 42407003:MachinaIustitia_Nutcracker_Stage1_WindBullet2
 42407004:MachinaIustitia_Nutcracker_Stage1_IceBullet
@@ -1293,6 +1333,9 @@
 42481009:FungusFighterV2_TowerPhysics_SkillBullet
 42481010:FungusFighterV2_TowerElectric_LockTarget
 42481011:FungusFighterV2_TowerWind_LockTarget
+42481012:MvM_TowerFire_FireBullet
+42481013:MvM_TowerIce_IceBullet
+42481014:MvM_TowerWindBullet
 42499001:Bullet_Alternate_01
 42501001:盗宝团投掷的飞刀
 42501002:盗宝团投掷的炸弹
@@ -1312,6 +1355,8 @@
 42501020:Thoarder_Rocky_Guitar_ElectricBottle
 42501024:Thoarder_Rocky_Guitar_ElectricBomb_Bullet
 42501026:Thoarder_ThrowingKnife_ShootingActivity
+42501027:MvM_Thoarder_MolotovCocktail
+42501028:MvM_Thoarder_Bomb_ElementalEffect_Fire
 42503001:盗宝团铲子产出的泥巴
 42503002:卡门铲子铲出的泥巴
 42504001:盗宝团投出的手斧
@@ -1322,6 +1367,8 @@
 42508001:浪人手弩发射子弹
 42508002:武士冲刺攻击摧毁创生物
 42508004:浪人冲刺子弹
+42508006:MvM_Samurai_Ronin_ShootBullet
+42508007:MvM_Samurai_RushAtk_Bullet
 42509002:傀儡将军风属性剑气1
 42509003:傀儡将军风属性剑气2
 42509006:傀儡将军风分身普攻剑气
@@ -1399,6 +1446,8 @@
 42601123:FauneAbyssale_SeaHorse_Primo_ElectronCharge_Physic
 42601125:FauneAbyssale_SeaHorse_Primo_RockGadget_Crasher
 42601128:FauneAbyssale_SeaHorse_Primo_ShuttleAttack_Bullet
+42601134:MvM_FauneAbyssale_SeaHorse_Mature_BallLightning
+42601135:MvM_FauneAbyssale_SeaHorse_Mature_WaterBullet
 42602004:急冻树-扫射子弹
 42602005:急冻树-小导弹
 42602006:急冻树-大导弹
@@ -1485,6 +1534,8 @@
 42606004:水莹—水球
 42606005:冰萤冰锥
 42606006:冰萤能量球
+42606007:MvM_Cicin_WaterBall
+42606008:MvM_Cicin_ElectricBall
 42607003:武士狗飞出去的帽子
 42607006:武士狗飞刀攻击
 42607010:武士狗远程剑气攻击
@@ -1518,6 +1569,7 @@
 42609027:Fungus_Un_Water_SuperWaterBullet
 42609028:Fungus_Trois_Ice_BlizzardPoint
 42609029:Fungus_Deux_Wind_HealingWavePoint
+42609030:MvM_Fungus_Un_Delta_Wind_BulletDecayed
 42610001:Scorpion_Sacred_SacredAttack03_Bullet
 42610002:Scorpion_Sacred_SacredAttack05_Bullet
 42610004:Scorpion_Sacred_SacredEnergy_Bullet
@@ -1890,6 +1942,12 @@
 49001023:MonsterAffix_Activity_Deathrattle_Gadget_DoomLogic
 49001025:MonsterAffix_Activity_AkaFes_RockDamage_LowWave_SingleBullet
 49001027:Activity_MultiCharacter_BulletToGround
+49001034:Gadget_RoleCombat_TracingEnergyBall
+49001036:Gadget_RoleCombat_TracingEnergyBall_Grass
+49001042:MonsterAffix_RoleCombat_DeathMatch_FieldBullet
+49001049:MonsterAffix_RoleCombat_Haunted_Bullet
+49001051:MonsterAffix_RoleCombat_Haunted_TrackGhostBullet
+49001052:MonsterAffix_RoleCombat_Backer_FieldBullet
 70220037:蜘蛛子弹
 70220053:雪山守护炮台子弹
 70220073:稻妻守护炮台子弹-雪山守护炮台子弹
@@ -1927,6 +1985,12 @@
 70291138:SceneObj_Area_Common_Property_Ani_Prop_Jamballoon_Bullet_01
 70291151:Penumbra_CannonBall_01
 70291152:Penumbra_CannonBall_02
+70291180:Penumbra_CannonBallV2_01
+70291181:Penumbra_CannonBallV2_02
+70291182:Penumbra_CannonBallV2_03
+70291185:Penumbra_CannonBallV2_04
+70291294:SceneObj_Activity_Common_Property_Ani_Prop_BulletHell_Barrage_Bullet_02
+70291295:SceneObj_Activity_Common_Property_Ani_Prop_BulletHell_Barrage_Bullet_01
 70291440:SceneObj_Activity_Common_Property_Ani_Prop_AutoTimeStop_Barrage_Bullet_03
 70291441:SceneObj_Activity_Common_Property_Ani_Prop_AutoTimeStop_Barrage_Bullet_02
 70291442:SceneObj_Activity_Common_Property_Ani_Prop_AutoTimeStop_Barrage_Bullet_01
@@ -2344,6 +2408,9 @@
 41094007:SkillObj_Chiori_Turret_Constellation
 41096001:Arlecchino_ElementalBurst_Gadget
 41096002:Arlecchino_ElementalArt_ShadowAvatar
+41098007:Clorinde_Constellation_6_Gadget
+42000011:ActivityAbility_MVM_AvatarSkill_Asist_02
+42000012:ActivityAbility_MVM_AvatarSkill_Asist_03
 42001001:史莱姆-冰锥-目标点
 42001005:史莱姆-冰雾
 42001010:史莱姆-风场虚拟体
@@ -2423,6 +2490,7 @@
 42005019:纯水精灵平台伤害
 42005023:纯水必杀空阻碍物
 42005025:纯水挑战爆裂机霸弹
+42005027:MvM_Frog_DeathExplode
 42005129:Narcissusborn_DartAttack_InitialPos
 42005130:Narcissusborn_EnhancedDartDartAttack_InitialPos
 42005131:Narzissenkreuz_DartAttack_InitialPos
@@ -2498,6 +2566,7 @@
 42103035:Shaman_FloorAttack01_Gadget
 42103036:Shaman_SuperJump_Area
 42103037:Shaman_Note_Buff_Gadget
+42103039:MvM_Shaman_Torrent_Area
 42201003:深渊巫师-火焰能量环绕
 42201007:深渊巫师-地火
 42201011:深渊巫师-冰锥区域
@@ -2619,6 +2688,7 @@
 42409014:MachinaIustitia_Gravitas_ImpactWave_01
 42481006:FungusFighterV2_TowerFire_SkillAOE
 42481008:FungusFighterV2_TowerIceWall
+42481015:MvM_TowerWater_Torrent_Area
 42501012:BoxMatch_Assistant_IceBomb_TargetPoint
 42501015:BoxMatch_Hatchet_FireWork_Lv1
 42501017:BoxMatch_Hatchet_FireWork_Lv2_Attack
@@ -3031,6 +3101,7 @@
 42910024:Nihil_Story_HelpSkillHandler
 42910026:Nihil_Story_HelpSkill_RushAtk
 42910032:Nihil_Story_HelpSkill_Bomb
+42910033:Nihil_DonimatAttack_Control
 43805005:Bullet_Animal_Electrohercules_ElectricBall_OnGround
 43805014:Animal_Electrohercules_Defend_Turorial
 44000002:飞行挑战玩法：空中冲刺 前冲
@@ -3210,6 +3281,12 @@
 44000594:HideType_A_Style_InvisibleBait_Target
 44000595:HideType_A_Style_InvisibleBait_Target
 44000596:HideType_A_Style_InvisibleBait_Target
+44000597:SkillObj_Activity_AcrobaticsBattle_Lv1
+44000598:SkillObj_Activity_AcrobaticsBattle_Lv3
+44000599:SkillObj_Activity_AcrobaticsBattle_Lv4
+44000600:SkillObj_Activity_AcrobaticsBattle_Lv7
+44000601:SkillObj_Activity_AcrobaticsBattle_Lv0
+44000602:SkillObj_Activity_AcrobaticsBattle_KillCall
 49001001:$GeneralSkill_IceDamage_Prison_Center-冰牢
 49001002:$GeneralSkill_WindDamage_Vortex_Center-旋涡
 49001003:地波发射器
@@ -3223,6 +3300,23 @@
 49001020:东风快递触发区域强化版
 49001024:MonsterAffix_Activity_AkaFes_RockDamage_LowWave_Emitter
 49001028:MonsterAffix_Monster_Yunqi_Die_BroadCast
+49001029:Gadget_RoleCombat_ThunderArea
+49001030:Gadget_RoleCombat_ThunderArea_Stage1
+49001031:Gadget_RoleCombat_ThunderArea_Stage2
+49001032:Gadget_RoleCombat_ThunderArea_Stage3
+49001033:Gadget_RoleCombat_TracingEnergyBall_CreatorGadget
+49001035:Gadget_RoleCombat_TracingEnergyBall_Grass_CreatorGadget
+49001038:Gadget_RoleCombat_BulletToGround
+49001039:MonsterAffix_RoleCombat_DeathRattleCrystal_DamageGadget
+49001040:MonsterAffix_RoleCombat_BoomTime_LogicGadget
+49001041:MonsterAffix_RoleCombat_Yunqi_Die_BroadCast
+49001043:Gadget_RoleCombat_Bonus_FungusRaptor_Weak_Kill
+49001044:Gadget_RoleCombat_Bonus_MonolithStarchild_Weak_Kill
+49001045:Gadget_RoleCombat_Bonus_DrakeDeepSea_No_Revive
+49001046:Gadget_RoleCombat_Bonus_DrakeDeepSea_MagicBall_NoHit
+49001047:Gadget_RoleCombat_Bonus_HermitCrabPrimo_Weak_Kill
+49001048:Gadget_RoleCombat_Bonus_SeaHorsePrimo_Recover_Break
+49001050:MonsterAffix_RoleCombat_Haunted_FreeGhost
 70000012:测试用阔叶
 70020001:蒙德城天气
 70020002:风魔龙天气
@@ -3559,6 +3653,8 @@
 70230124:SceneObj_Area_Xm_Property_Ani_Decal_CrystalWall_01
 70230125:SceneObj_Area_Xm_Property_Ani_Decal_CrystalWall_01
 70230126:SceneObj_Area_Xm_Property_Ani_Decal_CrystalWall_01
+70230127:SceneObj_Area_Common_Property_Ani_Prop_MvM_SandTable_01
+70230128:[N/A] 3947176030
 70240001:动态挡雨物件ww01 1-动态挡雨物件
 70240002:动态挡雨物件ww01 2-动态挡雨物件
 70240003:动态挡雨物件ww02 1-动态挡雨物件
@@ -4497,8 +4593,30 @@
 70291167:SceneObj_Area_Common_Property_Ani_Prop_Jamballoon_02
 70291168:SceneObj_Penumbra_Common_Property_Ani_Prop_BladeDanceGate_01
 70291169:[N/A] 2187650446
+70291170:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291171:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonV2_01
+70291172:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonV2_02
+70291186:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTargetBall_01
+70291187:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291188:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291189:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291190:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291282:SceneObj_Quest_DimensionalCollapse_01
+70291283:SceneObj_Level_Common_AvatarObj_Ani_Quest_SgwMixtureBottle_01
+70291284:[N/A] 4156213838
+70291285:[N/A] 4072703862
+70291286:SceneObj_Level_Common_Property_Ani_Prop_CharAmuseBarrier_01
+70291287:SceneObj_Level_Common_Property_Ani_Prop_CharMasterEntrance_01
+70291288:SceneObj_Level_Common_Property_Ani_Prop_MarechausseeGate_01
+70291289:SceneObj_Area_Fd_TreasureEntry_Door_01
+70291290:SceneObj_Level_Common_Property_Ani_Build_Hiddendoor_01
+70291292:SceneObj_Level_Common_Property_Ani_Prop_CoinDummy_02
+70291293:SceneObj_Level_Common_Property_Ani_Prop_CoinDummy_01
 70291296:SceneObj_Area_Fd_ChioriDungeon_SoundController_01
 70291297:SceneObj_Area_Common_Property_Prop_DelucChallengeAirwall_02
+70291298:SceneObj_Level_Common_Property_Ani_Prop_LeaserWall_01
+70291299:SceneObj_Level_Common_Property_Ani_Prop_BulletHellCoin_01
+70291300:SceneObj_Level_Common_Property_Ani_Prop_BulletHellCoin_02
 70291301:SceneObj_Area_Common_Property_Prop_Catcafe_FollowmoveInteract_01
 70291302:SceneObj_Area_Fd_Property_Ani_Prop_FdCommonGate_01
 70291303:SceneObj_Area_Fd_Property_Ani_Prop_FdCommonGate_02
@@ -5612,6 +5730,16 @@
 70320135:SceneObj_Area_Common_Property_Prop_CharAmusementAirWall_07
 70320136:SceneObj_Area_Common_Property_Prop_CharAmusementAirWall_08
 70320137:SceneObj_Area_Common_Property_Prop_CharAmusementAirWall_09
+70320138:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_Flag_01
+70320139:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_Flag_02
+70320140:[N/A] 882392350
+70320141:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_DropCard_01
+70320142:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_DropCard_02
+70320143:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackGate_01
+70320150:[N/A] 4078867398
+70320151:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackGate_02
+70320152:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackLight_01
+70320153:[N/A] 2891105062
 70330002:炼金炉领奖台
 70330003:炼金火 小
 70330004:要打的搬运元素之火-搬运元素之火
@@ -6707,9 +6835,41 @@
 70350499:SceneObj_Area_Xm_Property_Ani_Prop_ElecTrailBulletGen_02
 70350500:Activity_Gadget_AkaFesPotion_Fire_Debuff_Driver
 70350501:SceneObj_Area_Xm_Property_Ani_Prop_FloatFarr_02
+70350503:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Podium_01
+70350504:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Phonograph_01
+70350505:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Divination_01
+70350506:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_MagicBook_01
+70350507:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_TeamEditor_01
+70350508:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_GuardEntity_01
+70350509:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_CityAxis_01
+70350510:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Entry_01
+70350511:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_LoopElevator_01
 70350512:SceneObj_Level_Common_Property_Ani_Bridge_LyFloatingBridge_01
+70350513:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_TeamEditor_02
+70350514:[N/A] 3284301342
+70350515:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_RageController_01
+70350516:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_RestQuitPoint_01
+70350517:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_CamearAdjust_01
+70350518:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_ESPManager_01
+70350520:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_AirwallAuditorium
+70350521:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_SitPointController_01
+70350522:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_01
+70350523:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_02
+70350525:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_AuditoriumEnd_01
+70350526:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_03
+70350527:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_01
 70350528:SceneObj_Area_Ly_Property_Ani_Prop_GreatFestivalV2_GuidePoint_01
 70350529:SceneObj_Area_Ly_Property_Ani_Prop_GreatFestivalV2_GuidePoint_02
+70350530:SceneObj_Level_Common_Property_Ani_Prop_LightGuideGear_01
+70350531:SceneObj_Level_Common_Property_Ani_Prop_FloorGateGear_01
+70350532:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_04
+70350533:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearDoor_01
+70350534:SceneObj_Gear_MvM_Trap
+70350535:SceneObj_Level_Common_Property_Prop_TowerRepelV3
+70350536:SceneObj_Gear_MvM_Mine
+70350537:SceneObj_Gear_Operator_MvM_Mamolu
+70350538:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_AuditorSound
+70350539:SceneObj_Gear_Operator_MvM_Mamolu_02
 70360011:膨膨果终点-气球终点(1.1markflag版本）
 70360012:膨膨果终点2-气球终点
 70360013:膨膨果终点3-气球终点
@@ -8297,6 +8457,8 @@
 70711494:[N/A] 1130721848
 70711495:[N/A] 2735899096
 70711496:[N/A] 454832160
+70711497:[N/A] 2950885832
+70711498:[N/A] 505742752
 70711499:[N/A] 894963696
 70711500:[N/A] 230712120
 70711501:[N/A] 245820744
@@ -8319,11 +8481,66 @@
 70711518:[N/A] 2253302248
 70711519:[N/A] 2953437496
 70711521:[N/A] 3889181896
+70711524:[N/A] 505671616
 70711525:[N/A] 3664702656
+70711526:SceneObj_Eff_Quest_FdHotelTea_02
 70711532:[N/A] 3770495576
 70711534:[N/A] 1937340752
 70711535:[N/A] 3566751808
+70711536:[N/A] 1559943344
+70711537:[N/A] 4005836184
+70711538:[N/A] 1443263448
+70711539:[N/A] 3264946752
+70711540:[N/A] 2774305888
+70711541:[N/A] 467487816
+70711542:[N/A] 191718648
+70711543:[N/A] 379289088
+70711544:[N/A] 3265146368
+70711545:[N/A] 3112380536
+70711546:[N/A] 3293241152
+70711547:[N/A] 1649036848
+70711548:[N/A] 3579505024
+70711549:[N/A] 137682824
+70711550:[N/A] 574660032
+70711551:[N/A] 3832895152
+70711552:[N/A] 4137990640
+70711553:[N/A] 92502520
+70711554:[N/A] 1521413072
+70711555:[N/A] 1463601392
+70711556:[N/A] 3383584096
+70711557:[N/A] 205557824
+70711558:[N/A] 1171982400
+70711560:[N/A] 2051742328
+70711561:SceneObj_Item_Default_Item
+70711563:[N/A] 451175824
+70711564:[N/A] 154356784
+70711565:[N/A] 1820895784
+70711566:[N/A] 4209996104
+70711567:[N/A] 3336031008
 70711568:(test)巴慕恩的日记
+70711569:SceneObj_Area_Fd_Property_Prop_XgwRoom
+70711570:SceneObj_Quest_SimpleGadgetTalk
+70711571:[N/A] 2286571232
+70711572:[N/A] 79054456
+70711573:SceneObj_Quest_SimpleGadgetTalk05
+70711574:SceneObj_Item_Default_Item
+70711575:SceneObj_Item_Default_Item
+70711576:[N/A] 94595696
+70711577:[N/A] 2592892600
+70711578:[N/A] 3616900488
+70711579:SceneObj_Quest_Property_Ani_Prop_EnergyCaster_Operator_05
+70711580:[N/A] 2097752928
+70711581:SceneObj_Item_Default_Item
+70711582:[N/A] 2478379936
+70711583:[N/A] 2035742872
+70711584:[N/A] 2758548224
+70711585:SceneObj_Item_Default_Item
+70711592:SceneObj_Area_Fd_Property_Ani_Prop_ElderQuilt_02
+70711593:[N/A] 2996193296
+70711594:[N/A] 22295480
+70711595:SceneObj_SigewinneSmoke_01
+70711597:[N/A] 362532096
+70711598:[N/A] 2140889768
 70720216:火仙灵脚印-仙灵脚印
 70720219:发光仙灵脚印
 70800002:MsgBoard
@@ -9217,6 +9434,7 @@
 70950206:开启
 70950207:解锁
 70950208:组装
+70950214:[N/A] 1320639990
 71000004:岩琥珀
 71000005:射击点-射击点状态1
 71000006:射击点-射击点状态2
@@ -9565,6 +9783,14 @@
 71700751:[N/A] 233005080
 71700752:[N/A] 3608415800
 71700753:[N/A] 946830120
+71700754:SceneObj_Area_Common_Prop_Common_Twins_Dungeonportal_01
+71700755:SceneObj_Area_Common_Prop_Common_Twins_Butterfly_01
+71700756:[N/A] 1320471632
+71700757:[N/A] 3261253664
+71700758:[N/A] 3555596624
+71700759:[N/A] 1521717744
+71700760:SceneObj_Environment_Bulletin94
+71700761:SceneObj_Environment_Bulletin95
 72000001:群玉阁-海底古神-PA
 72000002:群玉阁-海底古神-PB
 72000003:群玉阁-海底古神-PC
@@ -10178,6 +10404,7 @@
 77111013:饭店地毯-「平等对谈」
 77111014:饭店地毯-「如沐风中」
 77111015:枫丹地毯-「平允方正」
+77111016:[N/A] 3138406544
 77112001:圆形的木质盾牌-家园物件
 77112002:有棱角的木质盾牌-家园物件
 77112003:特制的宝剑-家园物件
@@ -10778,6 +11005,8 @@
 77204226:「粼粼的荣彩」
 77204227:「灵感的纯白」
 77204228:「健疗的醇芳」
+77204229:[N/A] 3763891128
+77204230:[N/A] 2588701016
 77205001:木质长椅-家园物件
 77205002:石质的长椅-家园物件
 77205003:谷歌椅子-家园物件
@@ -11120,6 +11349,8 @@
 77215099:奇景铜像-「悠古金面」
 77215100:好梦留影神机
 77215101:慢悠悠仙像
+77215102:[N/A] 950928056
+77215103:[N/A] 2479535064
 77216001:家园路面01-家园物件
 77216002:家园路面02-家园物件
 77216003:家园路面03-家园物件
@@ -12177,6 +12408,21 @@
 71700729:北境秘史·卷三
 71700747:鹿野院平藏的留言
 71700748:「小狗商会」的收治明细
+71700762:[N/A] 976481484
+71700763:[N/A] 1459849724
+71700764:[N/A] 524159380
+71700765:[N/A] 1496186356
+71700766:[N/A] 1649628252
+71700767:[N/A] 3370696724
+71700768:[N/A] 2053389412
+71700769:[N/A] 3448013372
+71700770:[N/A] 3218519604
+71700771:[N/A] 4203305580
+71700772:[N/A] 2790292388
+71700773:[N/A] 969093148
+71700774:[N/A] 1702828196
+71700775:[N/A] 476652700
+71700776:[N/A] 1144681508
 77304001:霓裳花-2.0 家园采集物
 77304002:甜甜花-2.0 家园采集物
 77304003:塞西莉亚花-2.0 家园采集物
@@ -12234,6 +12480,7 @@
 49001017:东风快递触发区域
 49001019:东风快递触发区域强化版
 49001026:Activity_MultiCharacter_DangerArea
+49001037:Gadget_RoleCombat_DangerArea
 70220054:雪山守护机关
 70220074:稻妻守护机关-雪山守护机关
 70220113:莫娜地城移动水片-dungeon地城
@@ -12322,6 +12569,16 @@
 70291148:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTarget_05
 70291149:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTarget_06
 70291150:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTarget_01
+70291173:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_01
+70291174:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_02
+70291175:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_03
+70291176:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_04
+70291177:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_05
+70291178:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_06
+70291179:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTarget_02
+70291183:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTargetWeak_01
+70291184:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTargetBall_02
+70291291:SceneObj_Level_Common_Property_Ani_Prop_BulletHell_StaticBullet_01
 70291428:SceneObj_Area_Fd_Property_Ani_Prop_ShopRobot_01
 70291429:SceneObj_Area_Fd_Property_Ani_Prop_TrapFittingRoom_01
 70291477:SceneObj_Area_Common_Property_Ani_SpriteEffect_01
@@ -12423,6 +12680,9 @@
 70320104:SceneObj_Area_Fd_Property_Ani_Prop_GearPipe_Gear_03
 70320117:SceneObj_Level_Common_Property_Ani_Prop_CharAmuseBasket_01
 70320118:SceneObj_Level_Common_Property_Ani_Prop_CharAmuseBasket_02
+70320146:SceneObj_Level_Common_Property_Ani_Prop_SgwDungeonTruck_01
+70320147:SceneObj_Level_Common_Property_Ani_Prop_SgwDungeonTruck_02
+70320148:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackSwitcher_02
 70330081:雷导立方
 70330083:雷导立方（不可旋转）
 70330118:鹤观 雷导立方（不可旋转）
@@ -12956,6 +13216,8 @@
 50004102:MonEquip_Axe_Electric_02
 50004103:MonEquip_Crossbow_01
 50004104:MonEquip_Thoarder_Rocky_Guitar
+50004105:MonEquip_Axe_01
+50004111:MonEquip_WoodenClub_01
 
 // 装备
 50010002:(test)穿模测试-Equip_Sword_Template
@@ -13015,6 +13277,7 @@
 50011512:Weapon_Sword_Metal
 50011513:Weapon_Sword_Metal
 50011514:Weapon_Sword_Metal
+50011515:Weapon_Sword_Metal
 50012101:训练大剑-Equip_Claymore_Aniki
 50012201:佣兵重剑-Equip_Claymore_Oyaji
 50012301:铁影阔剑-Equip_Claymore_Glaive
@@ -13159,6 +13422,7 @@
 50015419:Weapon_Bow_Metal
 50015424:Weapon_Bow_Metal
 50015425:Weapon_Bow_Metal
+50015426:Weapon_Bow_Metal
 50015427:Weapon_Bow_Metal
 50015501:天空之翼-Equip_Bow_Dvalin
 50015502:阿莫斯之弓-Equip_Bow_Amos
@@ -13171,6 +13435,7 @@
 50015509:飞雷之弦振-Equip_Bow_Narukami
 50015511:猎人之径-Equip_Bow_Ayus
 50015512:Weapon_Bow_Metal
+50015513:Weapon_Bow_Metal
 50100001:绯烟-副武器-杆秤
 
 // 副装备
@@ -13620,6 +13885,8 @@
 70320095:SceneObj_Area_Fd_Property_Ani_Prop_FactoryJukebox_01
 70320100:SceneObj_Area_Fd_Property_Ani_Prop_ResearchConsole_01
 70320105:SceneObj_Area_Fd_Property_Ani_Prop_FDFacPipeValve_01
+70320144:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackSwitcher_01
+70320145:SceneObj_Level_Common_Property_Ani_Prop_SgwDungeonTruck_03
 70330001:炼金初始化
 70330019:岩片吸收器
 70330024:炼金炉-搬运元素之力地基
@@ -13734,6 +14001,8 @@
 70350486:SceneObj_Area_Xm_Property_Prop_CipherSwitch_04
 70350493:SceneObj_Level_Xm_Property_Ani_Prop_SlushaShellOperator_01
 70350502:SceneObj_Area_Xm_Property_Prop_CipherSwitch_05
+70350519:SceneObj_Gear_Operator_Mamolu_RoleCombat
+70350524:SceneObj_Level_Common_Property_Ani_Prop_TurntableOperator_01
 70360001:大世界隐形操作台-隐形操作台
 70360002:机关操作台
 70360003:调查线索-封印线索

Source/GrasscutterTools/Resources/zh-cn/Monsters.txt

@@ -14,6 +14,7 @@
 20010503:Slime_Electric_02_SimpleStick - [N/A] 1834387465
 20010504:Slime_Electric_02 - [N/A] 2297127161
 20010581:Slime_Electric_02 - [N/A] 3442560241
+20010590:Slime_Electric_04 - [N/A] 3609489745
 20010601:大型雷史莱姆
 20010602:大型雷史莱姆（塔防）
 20010604:大型雷史莱姆-强攻强化
@@ -49,6 +50,7 @@
 20011205:Slime_Fire_02_SimpleStick - [N/A] 453720297
 20011207:Slime_Fire_02 - [N/A] 1709031969
 20011281:Slime_Fire_02 - [N/A] 1865400017
+20011290:Slime_Fire_06 - [N/A] 759614481
 20011301:大型火史莱姆
 20011302:大型火史莱姆（塔防）
 20011304:大型火史莱姆-强攻强化
@@ -86,6 +88,7 @@
 20050501:纯水之雀
 20050502:纯水之雀（无脚底特效）
 20050581:Monster_Oceanid_Tit - [N/A] 2975528057
+20050590:Monster_Oceanid_Tit_02 - [N/A] 3906620841
 20050601:纯水之鸭
 20050602:纯水之鸭(陆地行走版）
 20050603:纯水之鸭(陆地行走版，无脚底特效）
@@ -116,10 +119,12 @@
 20060382:Sylph_Wind_01 - [N/A] 2626651433
 20060401:冰飘浮灵
 20060481:Sylph_Ice_01 - [N/A] 3638534065
+20060490:Sylph_Ice_02 - [N/A] 1165765169
 20060501:雷飘浮灵
 20060581:Sylph_Electric_01 - [N/A] 1346991849
 20060601:火飘浮灵
 20060681:Sylph_Fire_01 - [N/A] 2020892233
+20060690:Sylph_Fire_02 - [N/A] 242072433
 20060701:草飘浮灵
 20060781:Sylph_Grass_01 - [N/A] 1523065297
 21010101:丘丘人
@@ -131,6 +136,7 @@
 21010201:打手丘丘人
 21010202:Hili_None_01_Club - [N/A] 518903577
 21010281:Hili_None_01_Club - [N/A] 148649137
+21010290:Hili_None_02_Club - [N/A] 2282353529
 21010299:Hili_None_01_Club_NoAI - [N/A] 1500968553
 21010301:木盾丘丘人
 21010302:木盾丘丘人（塔防）
@@ -156,10 +162,12 @@
 21010902:冰箭丘丘人-强攻强化
 21010981:Hili_Ice_Range - [N/A] 1716558393
 21010982:Hili_Ice_Range_Multi - [N/A] 1237213681
+21010990:Hili_Ice_Range_03 - [N/A] 2345480137
 21011001:雷箭丘丘人
 21011002:雷箭丘丘人-强攻强化
 21011081:Hili_Electric_Range - [N/A] 2022453977
 21011082:Hili_Electric_Range_Multi - [N/A] 3012953161
+21011090:Hili_Electric_Range_03 - [N/A] 4254195473
 21011201:岩盾丘丘人
 21011202:岩盾丘丘人（塔防）
 21011281:Hili_None_01_RockShield - [N/A] 2602064417
@@ -184,6 +192,7 @@
 21020204:Brute_None_Axe - [N/A] 1119958809
 21020281:Brute_None_Axe - [N/A] 741150761
 21020282:Brute_None_Axe - [N/A] 1576743033
+21020290:Brute_None_Axe_01 - [N/A] 2024375625
 21020299:Brute_None_Axe_NoAI - [N/A] 4081842953
 21020301:岩盾丘丘暴徒
 21020302:岩盾丘丘暴徒（塔防）
@@ -214,6 +223,7 @@
 21030103:水丘丘萨满-支援强化
 21030104:Shaman_Water_01_LostSamachurl - [N/A] 1713314673
 21030181:Shaman_Water_01 - [N/A] 3149869785
+21030190:Shaman_Water_02 - [N/A] 1877774473
 21030201:草丘丘萨满
 21030202:草丘丘萨满（塔防）
 21030203:草丘丘萨满-支援强化
@@ -324,6 +334,7 @@
 24010109:遗迹木桩2.0
 24010181:Defender_None_01 - [N/A] 1482848121
 24010182:Defender_None_01 - [N/A] 3806686089
+24010190:Defender_None_03 - [N/A] 1203739089
 24010201:遗迹猎者
 24010202:遗迹猎者（塔防）
 24010281:Formathr_None - [N/A] 2103947025
@@ -380,6 +391,7 @@
 24060901:MachinaIustitia_Ruggiero_01 - [N/A] 2598421161
 24060902:MachinaIustitia_Ruggiero_02 - [N/A] 1178238353
 24060903:MachinaIustitia_Ruggiero_01 - [N/A] 4091306801
+24060990:MachinaIustitia_Ruggiero_04 - [N/A] 2442754929
 24061001:MachinaIustitia_Bradamante_01 - [N/A] 3820417257
 24061002:MachinaIustitia_Bradamante_02 - [N/A] 2286290561
 24061101:MachinaIustitia_LengthShifter_01 - [N/A] 3147408705
@@ -409,6 +421,7 @@
 24065602:MachinaIustitia_Frigate_04 - [N/A] 1620120737
 24065701:MachinaIustitia_Assimilator_03 - [N/A] 4222863585
 24065702:MachinaIustitia_Assimilator_04 - [N/A] 3834516417
+24065790:MachinaIustitia_Assimilator_90 - [N/A] 410434241
 24065801:MachinaIustitia_Ruggiero_03 - [N/A] 3392589561
 24065802:MachinaIustitia_Ruggiero_04 - [N/A] 2337120689
 24065803:MachinaIustitia_Ruggiero_05 - [N/A] 1989788129
@@ -438,14 +451,24 @@
 24069101:MachinaIustitia_LengthShifter_Codex - [N/A] 306536801
 24069201:MachinaIustitia_Excavator_Codex - [N/A] 4236769177
 24810101:防御塔火低级
+24810190:MvM_TowerFire_01 - [N/A] 3268380201
+24810191:MvM_TowerFire_02 - [N/A] 2853693193
 24810201:防御塔火高级
 24810301:防御塔雷低级
+24810390:MvM_TowerElectric_01 - [N/A] 3800466761
+24810391:MvM_TowerElectric_02 - [N/A] 4010007481
 24810401:防御塔雷高级
 24810501:防御塔水低级
+24810590:MvM_TowerWater_01 - [N/A] 3065011249
+24810591:MvM_TowerWater_02 - [N/A] 2040948281
 24810601:防御塔水高级
 24810701:防御塔冰低级
+24810790:MvM_TowerIce_01 - [N/A] 2546590705
+24810791:MvM_TowerIce_02 - [N/A] 1891908609
 24810801:防御塔冰高级
 24810901:防御塔风低级
+24810990:MvM_TowerWind_01 - [N/A] 3672283377
+24810991:MvM_TowerWind_02 - [N/A] 750672833
 24811001:防御塔风高级
 24811101:防御塔物理
 24920101:自律机关-小史莱姆气球
@@ -494,6 +517,7 @@
 25010303:NPC_Quest_Male_Standard_Oppo_13715 - [N/A] 724448633
 25010304:NPC_Quest_Male_Standard_Oppo_13777 - [N/A] 2201891417
 25010381:Thoarder_Male_Standard_NoWeapon_Fire_01 - [N/A] 933629753
+25010390:Thoarder_Male_Standard_NoWeapon_Fire_02 - [N/A] 4261880345
 25010401:盗宝团·水之药剂师
 25010402:Thoarder_Male_Standard_NoWeapon_Water_01_02 - [N/A] 3452436881
 25010403:Thoarder_Male_Standard_NoWeapon_Water_01_02 - [N/A] 4146453193
@@ -503,12 +527,15 @@
 25010501:盗宝团·雷之药剂师
 25010502:NPC_Quest_Male_Standard_Colter_13709 - [N/A] 1419015937
 25010503:NPC_Quest_Male_Standard_Oppo_13711 - [N/A] 3201328753
+25010504:NPC_Quest_Male_Standard_Gaston_14054 - [N/A] 2066425721
+25010505:NPC_Quest_Male_Standard_Florian_14132 - [N/A] 4179062537
 25010581:Thoarder_Male_Standard_NoWeapon_Electric_01 - [N/A] 624542921
 25010601:盗宝团·冰之药剂师
 25010602:Thoarder_Male_Standard_NoWeapon_Ice_02 - [N/A] 726418097
 25010603:Thoarder_Male_Standard_NoWeapon_Ice_03 - [N/A] 2398565441
 25010604:NPC_Quest_Male_Standard_Oppo_13714 - [N/A] 50560321
 25010605:NPC_Fontaine_Male_Standard_RobberB_21418 - [N/A] 859928713
+25010606:NPC_Quest_Male_Standard_Enri_14055 - [N/A] 42107321
 25010681:Thoarder_Male_Standard_NoWeapon_Ice_01 - [N/A] 3749122441
 25010701:盗宝团空手胖
 25010702:NPC_Quest_Male_Fat_Oppo_13873 - [N/A] 2169448041
@@ -520,6 +547,7 @@
 25020104:NPC_Quest_Male_Standard_Truand_13335 - [N/A] 2313699185
 25020105:Thoarder_Male_Crossbow_01_05 - [N/A] 2794240153
 25020106:NPC_Fontaine_Male_Standard_RobberLeader_21417 - [N/A] 3178123705
+25020107:NPC_Quest_Male_Standard_Lazare_14056 - [N/A] 3978033681
 25020201:盗宝团神射手
 25020204:盗宝团神射手（行秋线）
 25020205:Thoarder_Male_Standard_Crossbow_02_04 - [N/A] 763791561
@@ -588,6 +616,7 @@
 25080281:Samurai_Ronin_02 - [N/A] 4200211249
 25080301:野伏·机巧番
 25080381:Samurai_Ronin_03 - [N/A] 2465854769
+25080390:Samurai_Ronin_05 - [N/A] 1736584545
 25080401:寄骑武士
 25080402:幕府武士（剑道）
 25080403:幕府武士（一二阶段）
@@ -598,11 +627,13 @@
 25100181:Samurai_Kairagi_01 - [N/A] 77071577
 25100182:Samurai_Kairagi_01 - [N/A] 391115545
 25100183:Samurai_Kairagi_01 - [N/A] 222568409
+25100190:Samurai_Kairagi_07 - [N/A] 2745601001
 25100201:海乱鬼-火
 25100202:Samurai_Kairagi_07 - [EN] - Pyro Kairagi
 25100281:Samurai_Kairagi_02 - [N/A] 3882445073
 25100282:Samurai_Kairagi_02 - [N/A] 753240097
 25100283:Samurai_Kairagi_02 - [N/A] 3828251937
+25100290:Samurai_Kairagi_08 - [N/A] 1886860641
 25100301:海乱鬼-雷幽灵
 25100302:海乱鬼-雷幽灵
 25100401:海乱鬼-火幽灵
@@ -674,10 +705,12 @@
 25310102:Eremite_Female_Slim_PushDagger_02 - [N/A] 1936242505
 25310181:Eremite_Female_Slim_PushDagger_01 - [N/A] 1365735873
 25310182:Eremite_Female_Slim_PushDagger_01 - [N/A] 1430105225
+25310190:Eremite_Female_Slim_PushDagger_03 - [N/A] 2670641129
 25310201:镀金旅团_双刀_冰
 25310202:镀金NPC - 萨梅尔
 25310281:Eremite_Male_Standard_Glaive_01 - [N/A] 3981952521
 25310282:Eremite_Male_Standard_Glaive_01 - [N/A] 411301145
+25310290:Eremite_Male_Standard_Glaive_03 - [N/A] 423708617
 25310301:镀金旅团_战斧_雷
 25310381:Eremite_Male_Standard_Polearm_01 - [N/A] 3592293337
 25310382:Eremite_Male_Standard_Polearm_01 - [N/A] 1324855129
@@ -702,6 +735,7 @@
 26010301:雷骗骗花
 26030101:幼岩龙蜥
 26030181:Wyrm_Rock - [N/A] 3059435841
+26030190:Wyrm_Rock_02 - [N/A] 557038713
 26040101:岩龙蜥-水
 26040102:岩龙蜥-火
 26040103:岩龙蜥-冰
@@ -734,7 +768,9 @@
 26051201:Drake_DeepSea_Water_03 - [N/A] 1100113145
 26051202:Drake_DeepSea_Water_04 - [N/A] 1628565665
 26060101:雷萤
+26060190:Cicin_Thunder_02 - [N/A] 1457632377
 26060201:水萤
+26060290:Cicin_Water_02 - [N/A] 3625213961
 26060301:冰萤
 26090101:蕈兽-小-飞-水
 26090181:Fungus_Un_Gamma_Water_01 - [N/A] 1665501025
@@ -749,6 +785,7 @@
 26090381:Fungus_Un_Delta_Wind_01 - [N/A] 2441732177
 26090390:Fungus_Un_Delta_Wind_Enemy - [N/A] 3376055609
 26090391:Fungus_Un_Delta_Wind_01_Capture - [N/A] 1573739513
+26090393:Fungus_Un_Delta_Wind_02 - [N/A] 2743236449
 26090401:蕈兽-小-转-雷
 26090481:Fungus_Trois_Epsilon_Electric_01 - [N/A] 4151812377
 26090490:Fungus_Trois_Epsilon_Electric_Enemy - [N/A] 783524481
@@ -822,6 +859,7 @@
 26160202:Aplysia_Mature_01_Land - [N/A] 2244040649
 26160301:SeaHorse_Mature_01_Sea - [N/A] 1544112625
 26160302:SeaHorse_Mature_01_Land - [N/A] 3992435993
+26160390:SeaHorse_Mature_02 - [N/A] 4085486801
 26162101:HermitCrab_Mature_02 - [N/A] 3832936073
 26162201:MantaRay_Larva_03 - [N/A] 1943296953
 26162301:Seal_Larva_02 - [N/A] 1874832521
@@ -1430,18 +1468,42 @@
 28041105:Fishable_Maritime_MachinaIustitia_05 - [N/A] 1211691881
 
 // 友军
+30010590:Partner_Slime_Electric_04 - [N/A] 1360704329
+30011290:Partner_Slime_Fire_06 - [N/A] 1945956961
 30050501:Partner_Oceanid_Tit - [N/A] 2294162793
+30050590:Partner_Monster_Oceanid_Tit_02 - [N/A] 1992834649
 30050601:Partner_Oceanid_Wigeon_02 - [N/A] 903450313
 30050701:Partner_Oceanid_Squirrel - [N/A] 2642015873
+30060490:Partner_Sylph_Ice_02 - [N/A] 3052301665
+30060690:Partner_Sylph_Fire_02 - [N/A] 2606395609
+31010290:Partner_Hili_None_02_Club - [N/A] 1348459489
+31010990:Partner_Hili_Ice_Range_03 - [N/A] 318427833
+31011090:Partner_Hili_Electric_Range_03 - [N/A] 2029584281
+31020290:Partner_Brute_None_Axe_01 - [N/A] 208842305
+31030190:Partner_Shaman_Water_02 - [N/A] 3800190729
 31040101:Partner_Hilistray_Wind_01 - [N/A] 1924270545
 32110201:Ovacua_Order_02 - [N/A] 569946161
+34010190:Partner_Defender_None_03 - [N/A] 2666244393
 34060101:Partner_MachinaIustitia_Sentry_01 - [N/A] 68219401
 34060102:Partner_MachinaIustitia_Sentry_01 - [N/A] 1581798833
 34060901:Partner_MachinaIustitia_Ruggiero_02 - [N/A] 2221802481
+34060990:Partner_MachinaIustitia_Ruggiero_04 - [N/A] 1146147913
+34065790:Partner_MachinaIustitia_Assimilator_90 - [N/A] 3382698241
+34810190:Partner_MvM_TowerFire_01 - [N/A] 2504772937
+34810191:Partner_MvM_TowerFire_02 - [N/A] 3028471225
+34810390:Partner_MvM_TowerElectric_01 - [N/A] 2883808873
+34810391:Partner_MvM_TowerElectric_02 - [N/A] 1973294081
+34810590:Partner_MvM_TowerWater_01 - [N/A] 3115241505
+34810591:Partner_MvM_TowerWater_02 - [N/A] 3145296577
+34810790:Partner_MvM_TowerIce_01 - [N/A] 941724737
+34810791:Partner_MvM_TowerIce_02 - [N/A] 766759905
+34810990:Partner_MvM_TowerWind_01 - [N/A] 98234177
+34810991:Partner_MvM_TowerWind_02 - [N/A] 1166709913
 35010201:NPC_Fontaine_Male_Standard_Sonny_5132 - [N/A] 2270561153
 35010202:NPC_Quest_Male_Standard_Rouge_21274 - [N/A] 802259057
 35010203:NPC_Quest_Male_Standard_Rocher_21161 - [N/A] 1589132441
 35010204:NPC_Quest_Male_Standard_TieChuaner_21362 - [N/A] 1978991089
+35010390:Partner_Thoarder_Male_Standard_NoWeapon_Fire_02 - [N/A] 642225153
 35010602:Thoarder_Male_Standard_NoWeapon_Ice_02 - [N/A] 2367366025
 35020201:NPC_Fontaine_Male_Standard_Blanc_5233 - [N/A] 295013961
 35020202:NPC_Fontaine_Male_Standard_Bleu_5232 - [N/A] 2091883585
@@ -1450,6 +1512,9 @@
 35060102:NPC_Fontaine_MuscleMan_Standard_Chaussivert_5273 - [N/A] 2070327977
 35060103:NPC_Quest_Muscleman_Standard_Valberry_21163 - [N/A] 2883132241
 35070101:NPC_Quest_MuscleMan_Standard_TieMing_21298 - [N/A] 1105845961
+35080390:Partner_Samurai_Ronin_05 - [N/A] 1710869545
+35100190:Partner_Samurai_Kairagi_07 - [N/A] 1725122433
+35100290:Partner_Samurai_Kairagi_08 - [N/A] 3265297905
 35110101:NPC_Fontaine_Female_Standard_Genevieve_5260 - [N/A] 465377969
 35110102:NPC_Fontaine_Female_Standard_Genevieve_5260 - [N/A] 4203920553
 35110103:NPC_Fontaine_Female_Standard_Genevieve_5260 - [N/A] 387141537
@@ -1471,10 +1536,15 @@
 35210501:NPC - Habachi哈巴奇
 35210502:NPC_Quest_MuscleMan_Standard_Bashar_13107 - [N/A] 4266344825
 35310101:镀金旅团·沙中净水（黄金梦乡）
+35310190:Partner_Eremite_Female_Slim_PushDagger_03 - [N/A] 3316783769
+35310290:Partner_Eremite_Male_Standard_Glaive_03 - [N/A] 2388024745
 35310301:镀金旅团·白日鸣雷（黄金梦乡）
 35410101:Partner_Eremite_Male_Strong_Katar_01 - [N/A] 843060329
 35410201:Partner_Eremite_Female_Standard_Longbow_01 - [N/A] 2996340361
+36030190:Partner_Wyrm_Rock_02 - [N/A] 4078935249
 36050601:Drake_DeepSea_Water_01 - [N/A] 478535833
+36060190:Partner_Cicin_Thunder_02 - [N/A] 90474689
+36060290:Partner_Cicin_Water_02 - [N/A] 4196823585
 36090190:活动-友方飞行水
 36090191:Partner_Fumgus_Un_Gamma_Water - [N/A] 3593336553
 36090192:Partner_Fumgus_Un_Gamma_Water - [N/A] 2780786345
@@ -1484,6 +1554,7 @@
 36090390:活动-友方飞行风
 36090391:Partner_Fumgus_Un_Delta_Wind - [N/A] 637837089
 36090392:Partner_Fumgus_Un_Delta_Wind - [N/A] 2589779561
+36090393:Partner_Fungus_Un_Delta_Wind_02 - [N/A] 2231278801
 36090490:活动-友方旋转雷
 36090491:Partner_Fumgus_Trois_Epsilon_Electric - [N/A] 4089561145
 36090492:Partner_Fumgus_Trois_Epsilon_Electric - [N/A] 2409750417
@@ -1505,6 +1576,7 @@
 36091090:活动-友方伸展雷
 36091091:Partner_Fumgus_Deux_Delta_Electric - [N/A] 2177474001
 36091092:Partner_Fumgus_Deux_Delta_Electric - [N/A] 1670919961
+36160390:Partner_SeaHorse_Mature_02 - [N/A] 2198861673
 38050590:Partner_Animal_Electrohercules_01 - [N/A] 2442210649
 38050591:Partner_Animal_Electrohercules_02 - [N/A] 1954661401
 38060502:Partner_Animal_Megamoth_Jungle_01 - [N/A] 113674993

Source/GrasscutterTools/Resources/zh-cn/Weapon.txt

@@ -44,6 +44,7 @@
 11512:裁叶萃光
 11513:静水流涌之辉
 11514:有乐御簾切
+11515:赦罪
 12101:训练大剑
 12201:佣兵重剑
 12301:铁影阔剑
@@ -179,6 +180,7 @@
 15419:鹮穿之喙
 15424:烈阳之嗣
 15425:静谧之曲
+15426:筑云
 15427:测距规
 15501:天空之翼
 15502:阿莫斯之弓
@@ -188,3 +190,4 @@
 15509:飞雷之弦振
 15511:猎人之径
 15512:最初的大魔术
+15513:白雨心弦

Source/GrasscutterTools/Resources/zh-tw/Avatar.txt

@@ -79,4 +79,7 @@
 1092:嘉明
 1093:閒雲
 1094:千織
+1095:希格雯
 1096:阿蕾奇諾
+1097:賽索斯
+1098:克洛琳德

Source/GrasscutterTools/Resources/zh-tw/GachaBannerPrefab.txt

@@ -0,0 +1,128 @@
+A007:初行者推薦祈願
+A008:奔行世間
+A009:杯裝之詩
+A010:黎明巡禮
+A011:南風之眷
+A012:靖妖儺舞
+A013:神鑄賦形
+A015:閃焰的駐足
+A016:初行者推薦祈願
+A017:奔行世間
+A018:閃焰的駐足
+A019:杯裝之詩
+A020:神鑄賦形
+A021:神鑄賦形
+A022:奔行世間
+A023:暫別冬都
+A024:陵藪市朝
+A027:深秘之息
+A028:浮生孰來
+A031:煙火之邀
+A032:魚龍燈晝
+A033:赤團開時
+A036:杯裝之詩
+A037:暫別冬都
+A040:陵藪市朝
+A041:浪湧之瞬
+A045:葉落風隨
+A048:白鷺之庭
+A049:焰色天河
+A052:影寂天下人
+A053:浮岳虹珠
+A061:鬼門斗宴
+A065:出塵入世
+A071:華紫櫻緋
+A076:蒼流踏花
+A081:素霓俔天
+A091:巡禦蘙薈-提納里
+A092:陵藪市朝-鍾離
+A093:神鑄賦形-獵人貫虹
+A097:靂裁冥昭-賽諾
+A098:杯裝之詩-溫迪
+A099:神鑄賦形-赤沙終末
+A101:深秘之息-阿贝多
+A102:神铸赋形-圣显绿箭
+A103:月草的赐慧-纳西妲
+A104:焰色天河-宵宫
+A105:神铸赋形-千夜飞雷
+A106:华紫樱绯-八重神子
+A107:暂别冬都-达达利亚
+A108:神铸赋形-神乐冬极
+A109:余火变相-流浪者
+A110:鬼门斗宴-荒泷一斗
+A111:神铸赋形-图莱杜拉赤角
+A112:影寂天下人-雷电将军
+A113:苍流踏花-神里绫人
+A114:神铸赋形-薙草波乱
+A115:敕诫枢谋-艾尔海森
+A116:烟火之邀-魈
+A117:神铸赋形-裁叶萃光和璞鸢
+A118:赤团开时-胡桃
+A119:素霓伣天-夜兰
+A120:神铸赋形-护摩若水
+A121:迪希雅
+A122:赛诺
+A123:苇海信标/赤沙之杖
+A124:申鹤
+A125:神里绫华
+A126:雾切之回光/息灾
+A127:纳西妲
+A128:妮露
+A129:千夜浮梦/圣显之钥
+A130:白术
+A131:甘雨
+A132:碧落之珑/阿莫斯之弓
+A133:宵宫
+A134:八重神子
+A135:飞雷之弦振/神乐之真意
+A136:艾尔海森
+A137:枫原万叶
+A138:苍古自由之誓/裁叶萃光
+A139:优菈
+A140:可莉
+A141:松籁响起之时/四风原典
+A142:珊瑚宫心海
+A143:流浪者
+A144:不灭月华/图莱杜拉的回忆
+A145:林尼
+A146:夜兰
+A147:最初的大魔术/若水
+A148:钟离
+A149:公子
+A150:贯虹之槊/冬极白星
+A151:那维莱特
+A152:胡桃
+A153:万世流涌大典/护摩之杖
+A154:莱欧斯利
+A155:温迪
+A156:金流监督/终未嗟叹之诗
+A157:芙宁娜
+A158:白术
+A159:静水流涌之辉/碧落之珑
+A160:赛诺
+A161:神里绫人
+A162:波乱月白经津/赤沙之杖
+A163:娜维娅
+A164:神里绫华
+A165:裁断/雾切之回光
+A166:雷电将军
+A167:宵宫
+A168:薙草之稻光/飞雷之弦振
+A169:闲云
+A170:纳西妲
+A171:鹤鸣余音/千夜浮梦
+A172:魈
+A173:八重神子
+A174:和璞鸢/神乐之真意
+A175:千织
+A176:荒泷一斗
+A177:有乐御簾切/赤角石溃杵
+A178:那维莱特
+A179:枫原万叶
+A180:万世流涌大典/苍古自由之誓
+A181:阿蕾奇诺
+A182:林尼
+A183:赤月之形/最初的大魔术
+A184:流浪者
+A185:白术
+A186:图莱杜拉的回忆/碧落之珑

Source/GrasscutterTools/Resources/zh-tw/GachaBannerTitle.txt

@@ -0,0 +1,53 @@
+A007:初行者推薦祈願
+A008:奔行世間
+A009:杯裝之詩
+A010:黎明巡禮
+A011:南風之眷
+A012:靖妖儺舞
+A013:神鑄賦形
+A015:閃焰的駐足
+A016:初行者推薦祈願
+A017:奔行世間
+A018:閃焰的駐足
+A019:杯裝之詩
+A020:神鑄賦形
+A021:神鑄賦形
+A022:奔行世間
+A023:暫別冬都
+A024:陵藪市朝
+A027:深秘之息
+A028:浮生孰來
+A031:煙火之邀
+A032:魚龍燈晝
+A033:赤團開時
+A036:杯裝之詩
+A037:暫別冬都
+A040:陵藪市朝
+A041:浪湧之瞬
+A045:葉落風隨
+A048:白鷺之庭
+A049:焰色天河
+A052:影寂天下人
+A053:浮嶽虹珠
+A061:鬼門鬥宴
+A065:出塵入世
+A071:華紫櫻緋
+A076:蒼流踏花
+A081:素霓俔天
+A091:巡禦翳薈
+A097:靂裁冥昭
+A0100:翩舞歈蓮
+A0103:月草的賜慧
+A0109:餘火變相
+A0115:敕誡樞謀
+A0121:烈陽爍金
+A0130:心珠循琅
+A0145:光與影的戲術
+A0151:淵海界令
+A0154:劫中泛濫
+A0157:眾水的頌詩
+A0163:刺玫的銘誓
+A0169:雲府鶴行
+A0175:千雲繪羽織
+A0181:爐邊燼影
+B001:晨風之詩

Source/GrasscutterTools/Resources/zh-tw/GachaBennerPrefab.txt

@@ -1,45 +0,0 @@
-007:初行者推薦祈願
-008:奔行世間
-009:杯裝之詩
-010:黎明巡禮
-011:南風之眷
-012:靖妖儺舞
-013:神鑄賦形
-015:閃焰的駐足
-016:初行者推薦祈願
-017:奔行世間
-018:閃焰的駐足
-019:杯裝之詩
-020:神鑄賦形
-021:神鑄賦形
-022:奔行世間
-023:暫別冬都
-024:陵藪市朝
-027:深秘之息
-028:浮生孰來
-031:煙火之邀
-032:魚龍燈晝
-033:赤團開時
-036:杯裝之詩
-037:暫別冬都
-040:陵藪市朝
-041:浪湧之瞬
-045:葉落風隨
-048:白鷺之庭
-049:焰色天河
-052:影寂天下人
-053:浮岳虹珠
-061:鬼門斗宴
-065:出塵入世
-071:華紫櫻緋
-076:蒼流踏花
-081:素霓俔天
-091:巡禦蘙薈-提納里
-092:陵藪市朝-鍾離
-093:神鑄賦形-獵人貫虹
-097:靂裁冥昭-賽諾
-098:杯裝之詩-溫迪
-099:神鑄賦形-赤沙終末
-//100:翩舞歈蓮-妮露 // Error
-101:深秘之息-阿貝多
-101:神鑄賦形-聖顯綠箭

Source/GrasscutterTools/Resources/zh-tw/GachaBennerTitle.txt

@@ -1,45 +0,0 @@
-007:初行者推薦祈願
-008:奔行世間
-009:杯裝之詩
-010:黎明巡禮
-011:南風之眷
-012:靖妖儺舞
-013:神鑄賦形
-015:閃焰的駐足
-016:初行者推薦祈願
-017:奔行世間
-018:閃焰的駐足
-019:杯裝之詩
-020:神鑄賦形
-021:神鑄賦形
-022:奔行世間
-023:暫別冬都
-024:陵藪市朝
-027:深秘之息
-028:浮生孰來
-031:煙火之邀
-032:魚龍燈晝
-033:赤團開時
-036:杯裝之詩
-037:暫別冬都
-040:陵藪市朝
-041:浪湧之瞬
-045:葉落風隨
-048:白鷺之庭
-049:焰色天河
-052:影寂天下人
-053:浮岳虹珠
-061:鬼門斗宴
-065:出塵入世
-071:華紫櫻緋
-076:蒼流踏花
-081:素霓俔天
-091:巡禦蘙薈-提納里
-092:陵藪市朝-鍾離
-093:神鑄賦形-獵人貫虹
-097:靂裁冥昭-賽諾
-098:杯裝之詩-溫迪
-099:神鑄賦形-赤沙終末
-//100:翩舞歈蓮-妮露 // Error
-101:深秘之息-阿貝多
-101:神鑄賦形-聖顯綠箭

Source/GrasscutterTools/Resources/zh-tw/Gadget.txt

@@ -271,6 +271,7 @@
 41076011:Faruzan_WindBlackHole
 41076015:Faruzan_SkillObj_WindZone_Hit
 41083009:Linette_Constellation_WindZone
+41098006:Clorinde_Constellation_1_Gadget
 42000001:釣魚的魚漂發射器
 42000002:釣魚的魚漂
 42103002:丘丘水薩滿-群療區域
@@ -790,13 +791,43 @@
 41093023:Liuyun_ElementalBurst_SmallWindHole
 41094004:Bullet_Chiori_ElementalArt_Rush_Detect
 41094006:SkillObj_Chiori_ElementalBurst_RockBomb
+41095001:Sigewinne_Extra_Bubble_Bullet
+41095002:Sigewinne_EArt_Bullet_Normal
+41095003:Sigewinne_EArt_Bullet_No_Enemy
+41095004:Sigewinne_EArt_Bullet_One_Enemy
+41095005:Sigewinne_EArt_Bullet_Normal_Shoot_NoTarget
+41095006:Sigewinne_ElementalArt_Core
+41095007:Sigewinne_Arrow_01
+41095008:Sigewinne_Arrow_02
+41095009:Sigewinne_Arrow_03
+41095010:Sigewinne_AimingArrow_WithoutWater
+41095011:Sigewinne_AimingArrow_Water
+41095012:Sigewinne_EArt_Bullet_Normal_New
+41095013:Sigewinne_Burst_Attacker
 41096003:Arlecchino_ExtraAttack_Bullet
+41097001:Sethos_Arrow_01
+41097002:Sethos_Arrow_02
+41097003:Sethos_Arrow_03
+41097004:Sethos_Arrow_04
+41097005:Sethos_AimingArrow_WithoutElec
+41097006:Sethos_AimingArrow_WithElec
+41097007:Sethos_AimingArrow_Lightning
+41097008:Sethos_AimingArrow_Lightning_Burst_01
+41097009:Sethos_AimingArrow_Lightning_Burst_02
+41097010:Sethos_AimingArrow_Lightning_Burst_03
+41097011:Sethos_AimingArrow_Lightning_Burst_04
+41098001:Clorinde_DodgeAttack_Small
+41098002:Clorinde_DodgeAttack_Medium
+41098003:Clorinde_DodgeAttack_Large
+41098004:Clorinde_ElementArt_Attack_Bullet_Penetrating
+41098005:Clorinde_ElementArt_Attack_Bullet_Standard
 42000003:Activity_Pitch_Pot_Throw_Bullet
 42000004:Activity_Pitch_Pot_Throw_Bullet_02
 42000005:BossNarzissenkreuzBattle_PlayerSkill_Bullet_1
 42000006:BossNarzissenkreuzBattle_PlayerSkill_Bullet_2
 42000007:Activity_GoalChallenge_Level03_WindZone
 42000008:Activity_GoalChallenge_Level04_RainZone
+42000010:Bullet_ActivityAbility_MVM_AvatarSkill_Asist
 42001002:史萊姆岩錐
 42001003:史萊姆氣泡-彈道
 42001004:史萊姆-冰錐
@@ -925,6 +956,7 @@
 42005021:純水精靈延遲水球生成器
 42005022:純水松鼠水波
 42005024:純水水流激光鎖定子彈
+42005026:MvM_Frog_WaterWave
 42005101:Necalevia_RangeBullet
 42005102:Necalevia_AOERangeMulti
 42005103:Necalevia_Small_RangeBullet
@@ -954,8 +986,10 @@
 42006401:飄浮靈-冰-小雪球
 42006402:飄浮靈-冰-元素微粒
 42006403:飄浮靈-冰-大雪球
+42006407:Sylph_Ice_IceBullet_02
 42006501:飄浮靈-雷-前衝碰撞子彈
 42006601:飄浮靈-火-小火球
+42006605:MvM_Sylph_Fire_FireBullet
 42006701:飄浮靈-草-子彈
 42006702:飄浮靈-草-捕捉能量彈
 42006705:飄浮靈-草-激活亡語子彈
@@ -985,6 +1019,8 @@
 42101025:大偉丘丘人丟的大物件03
 42101026:雷彈丘丘扔的雷史萊姆
 42101027:Monster_Arrow_ShootingActivity
+42101028:MvM_Hili_Electric_Arrow
+42101029:MvM_Hili_Ice_Arrow
 42102001:火斧暴徒-橫波
 42102002:火斧暴徒-縱波
 42102003:火斧暴徒-火史萊姆-著
@@ -1254,6 +1290,10 @@
 42406057:MachinaIustitia_Bradamante_Summon_Bullet
 42406059:MachinaIustitia_Bradamante_Attack02_FollowBullet2
 42406060:MachinaIustitia_Bradamante_Attack02_FollowBullet3
+42406061:MvM_MachinaIustitia_Ruggiero02_Attack02_Bullet
+42406062:MvM_MachinaIustitia_Ruggiero02_Attack02_Bullet2
+42406063:MvM_MachinaIustitia_Assimilator_NormalAttack01_Bullet
+42406064:MvM_MachinaIustitia_Assimilator_MeleeAttack01_Bullet
 42407002:MachinaIustitia_Nutcracker_Stage1_WindBullet1
 42407003:MachinaIustitia_Nutcracker_Stage1_WindBullet2
 42407004:MachinaIustitia_Nutcracker_Stage1_IceBullet
@@ -1293,6 +1333,9 @@
 42481009:FungusFighterV2_TowerPhysics_SkillBullet
 42481010:FungusFighterV2_TowerElectric_LockTarget
 42481011:FungusFighterV2_TowerWind_LockTarget
+42481012:MvM_TowerFire_FireBullet
+42481013:MvM_TowerIce_IceBullet
+42481014:MvM_TowerWindBullet
 42499001:Bullet_Alternate_01
 42501001:盜寶團投擲的飛刀
 42501002:盜寶團投擲的炸彈
@@ -1312,6 +1355,8 @@
 42501020:Thoarder_Rocky_Guitar_ElectricBottle
 42501024:Thoarder_Rocky_Guitar_ElectricBomb_Bullet
 42501026:Thoarder_ThrowingKnife_ShootingActivity
+42501027:MvM_Thoarder_MolotovCocktail
+42501028:MvM_Thoarder_Bomb_ElementalEffect_Fire
 42503001:盜寶團鏟子產出的泥巴
 42503002:卡門鏟子鏟出的泥巴
 42504001:盜寶團投出的手斧
@@ -1322,6 +1367,8 @@
 42508001:浪人手弩發射子彈
 42508002:武士衝刺攻擊摧毀創生物
 42508004:浪人衝刺子彈
+42508006:MvM_Samurai_Ronin_ShootBullet
+42508007:MvM_Samurai_RushAtk_Bullet
 42509002:傀儡將軍風屬性劍氣1
 42509003:傀儡將軍風屬性劍氣2
 42509006:傀儡將軍風分身普攻劍氣
@@ -1399,6 +1446,8 @@
 42601123:FauneAbyssale_SeaHorse_Primo_ElectronCharge_Physic
 42601125:FauneAbyssale_SeaHorse_Primo_RockGadget_Crasher
 42601128:FauneAbyssale_SeaHorse_Primo_ShuttleAttack_Bullet
+42601134:MvM_FauneAbyssale_SeaHorse_Mature_BallLightning
+42601135:MvM_FauneAbyssale_SeaHorse_Mature_WaterBullet
 42602004:急凍樹-掃射子彈
 42602005:急凍樹-小導彈
 42602006:急凍樹-大導彈
@@ -1485,6 +1534,8 @@
 42606004:水瑩—水球
 42606005:冰螢冰錐
 42606006:冰螢能量球
+42606007:MvM_Cicin_WaterBall
+42606008:MvM_Cicin_ElectricBall
 42607003:武士狗飛出去的帽子
 42607006:武士狗飛刀攻擊
 42607010:武士狗遠程劍氣攻擊
@@ -1518,6 +1569,7 @@
 42609027:Fungus_Un_Water_SuperWaterBullet
 42609028:Fungus_Trois_Ice_BlizzardPoint
 42609029:Fungus_Deux_Wind_HealingWavePoint
+42609030:MvM_Fungus_Un_Delta_Wind_BulletDecayed
 42610001:Scorpion_Sacred_SacredAttack03_Bullet
 42610002:Scorpion_Sacred_SacredAttack05_Bullet
 42610004:Scorpion_Sacred_SacredEnergy_Bullet
@@ -1890,6 +1942,12 @@
 49001023:MonsterAffix_Activity_Deathrattle_Gadget_DoomLogic
 49001025:MonsterAffix_Activity_AkaFes_RockDamage_LowWave_SingleBullet
 49001027:Activity_MultiCharacter_BulletToGround
+49001034:Gadget_RoleCombat_TracingEnergyBall
+49001036:Gadget_RoleCombat_TracingEnergyBall_Grass
+49001042:MonsterAffix_RoleCombat_DeathMatch_FieldBullet
+49001049:MonsterAffix_RoleCombat_Haunted_Bullet
+49001051:MonsterAffix_RoleCombat_Haunted_TrackGhostBullet
+49001052:MonsterAffix_RoleCombat_Backer_FieldBullet
 70220037:蜘蛛子彈
 70220053:雪山守護炮台子彈
 70220073:稻妻守護炮台子彈-雪山守護炮台子彈
@@ -1927,6 +1985,12 @@
 70291138:SceneObj_Area_Common_Property_Ani_Prop_Jamballoon_Bullet_01
 70291151:Penumbra_CannonBall_01
 70291152:Penumbra_CannonBall_02
+70291180:Penumbra_CannonBallV2_01
+70291181:Penumbra_CannonBallV2_02
+70291182:Penumbra_CannonBallV2_03
+70291185:Penumbra_CannonBallV2_04
+70291294:SceneObj_Activity_Common_Property_Ani_Prop_BulletHell_Barrage_Bullet_02
+70291295:SceneObj_Activity_Common_Property_Ani_Prop_BulletHell_Barrage_Bullet_01
 70291440:SceneObj_Activity_Common_Property_Ani_Prop_AutoTimeStop_Barrage_Bullet_03
 70291441:SceneObj_Activity_Common_Property_Ani_Prop_AutoTimeStop_Barrage_Bullet_02
 70291442:SceneObj_Activity_Common_Property_Ani_Prop_AutoTimeStop_Barrage_Bullet_01
@@ -2344,6 +2408,9 @@
 41094007:SkillObj_Chiori_Turret_Constellation
 41096001:Arlecchino_ElementalBurst_Gadget
 41096002:Arlecchino_ElementalArt_ShadowAvatar
+41098007:Clorinde_Constellation_6_Gadget
+42000011:ActivityAbility_MVM_AvatarSkill_Asist_02
+42000012:ActivityAbility_MVM_AvatarSkill_Asist_03
 42001001:史萊姆-冰錐-目標點
 42001005:史萊姆-冰霧
 42001010:史萊姆-風場虛擬體
@@ -2423,6 +2490,7 @@
 42005019:純水精靈平台傷害
 42005023:純水必殺空阻礙物
 42005025:純水挑戰爆裂機霸彈
+42005027:MvM_Frog_DeathExplode
 42005129:Narcissusborn_DartAttack_InitialPos
 42005130:Narcissusborn_EnhancedDartDartAttack_InitialPos
 42005131:Narzissenkreuz_DartAttack_InitialPos
@@ -2498,6 +2566,7 @@
 42103035:Shaman_FloorAttack01_Gadget
 42103036:Shaman_SuperJump_Area
 42103037:Shaman_Note_Buff_Gadget
+42103039:MvM_Shaman_Torrent_Area
 42201003:深淵巫師-火焰能量環繞
 42201007:深淵巫師-地火
 42201011:深淵巫師-冰錐區域
@@ -2619,6 +2688,7 @@
 42409014:MachinaIustitia_Gravitas_ImpactWave_01
 42481006:FungusFighterV2_TowerFire_SkillAOE
 42481008:FungusFighterV2_TowerIceWall
+42481015:MvM_TowerWater_Torrent_Area
 42501012:BoxMatch_Assistant_IceBomb_TargetPoint
 42501015:BoxMatch_Hatchet_FireWork_Lv1
 42501017:BoxMatch_Hatchet_FireWork_Lv2_Attack
@@ -3031,6 +3101,7 @@
 42910024:Nihil_Story_HelpSkillHandler
 42910026:Nihil_Story_HelpSkill_RushAtk
 42910032:Nihil_Story_HelpSkill_Bomb
+42910033:Nihil_DonimatAttack_Control
 43805005:Bullet_Animal_Electrohercules_ElectricBall_OnGround
 43805014:Animal_Electrohercules_Defend_Turorial
 44000002:飛行挑戰玩法：空中衝刺 前衝
@@ -3210,6 +3281,12 @@
 44000594:HideType_A_Style_InvisibleBait_Target
 44000595:HideType_A_Style_InvisibleBait_Target
 44000596:HideType_A_Style_InvisibleBait_Target
+44000597:SkillObj_Activity_AcrobaticsBattle_Lv1
+44000598:SkillObj_Activity_AcrobaticsBattle_Lv3
+44000599:SkillObj_Activity_AcrobaticsBattle_Lv4
+44000600:SkillObj_Activity_AcrobaticsBattle_Lv7
+44000601:SkillObj_Activity_AcrobaticsBattle_Lv0
+44000602:SkillObj_Activity_AcrobaticsBattle_KillCall
 49001001:$GeneralSkill_IceDamage_Prison_Center-冰牢
 49001002:$GeneralSkill_WindDamage_Vortex_Center-旋渦
 49001003:地波發射器
@@ -3223,6 +3300,23 @@
 49001020:東風快遞觸發區域強化版
 49001024:MonsterAffix_Activity_AkaFes_RockDamage_LowWave_Emitter
 49001028:MonsterAffix_Monster_Yunqi_Die_BroadCast
+49001029:Gadget_RoleCombat_ThunderArea
+49001030:Gadget_RoleCombat_ThunderArea_Stage1
+49001031:Gadget_RoleCombat_ThunderArea_Stage2
+49001032:Gadget_RoleCombat_ThunderArea_Stage3
+49001033:Gadget_RoleCombat_TracingEnergyBall_CreatorGadget
+49001035:Gadget_RoleCombat_TracingEnergyBall_Grass_CreatorGadget
+49001038:Gadget_RoleCombat_BulletToGround
+49001039:MonsterAffix_RoleCombat_DeathRattleCrystal_DamageGadget
+49001040:MonsterAffix_RoleCombat_BoomTime_LogicGadget
+49001041:MonsterAffix_RoleCombat_Yunqi_Die_BroadCast
+49001043:Gadget_RoleCombat_Bonus_FungusRaptor_Weak_Kill
+49001044:Gadget_RoleCombat_Bonus_MonolithStarchild_Weak_Kill
+49001045:Gadget_RoleCombat_Bonus_DrakeDeepSea_No_Revive
+49001046:Gadget_RoleCombat_Bonus_DrakeDeepSea_MagicBall_NoHit
+49001047:Gadget_RoleCombat_Bonus_HermitCrabPrimo_Weak_Kill
+49001048:Gadget_RoleCombat_Bonus_SeaHorsePrimo_Recover_Break
+49001050:MonsterAffix_RoleCombat_Haunted_FreeGhost
 70000012:測試用闊葉
 70020001:蒙德城天氣
 70020002:風魔龍天氣
@@ -3559,6 +3653,8 @@
 70230124:SceneObj_Area_Xm_Property_Ani_Decal_CrystalWall_01
 70230125:SceneObj_Area_Xm_Property_Ani_Decal_CrystalWall_01
 70230126:SceneObj_Area_Xm_Property_Ani_Decal_CrystalWall_01
+70230127:SceneObj_Area_Common_Property_Ani_Prop_MvM_SandTable_01
+70230128:[N/A] 3947176030
 70240001:動態擋雨物件ww01 1-動態擋雨物件
 70240002:動態擋雨物件ww01 2-動態擋雨物件
 70240003:動態擋雨物件ww02 1-動態擋雨物件
@@ -4497,8 +4593,30 @@
 70291167:SceneObj_Area_Common_Property_Ani_Prop_Jamballoon_02
 70291168:SceneObj_Penumbra_Common_Property_Ani_Prop_BladeDanceGate_01
 70291169:[N/A] 2187650446
+70291170:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291171:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonV2_01
+70291172:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonV2_02
+70291186:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTargetBall_01
+70291187:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291188:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291189:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291190:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291282:SceneObj_Quest_DimensionalCollapse_01
+70291283:SceneObj_Level_Common_AvatarObj_Ani_Quest_SgwMixtureBottle_01
+70291284:[N/A] 4156213838
+70291285:[N/A] 4072703862
+70291286:SceneObj_Level_Common_Property_Ani_Prop_CharAmuseBarrier_01
+70291287:SceneObj_Level_Common_Property_Ani_Prop_CharMasterEntrance_01
+70291288:SceneObj_Level_Common_Property_Ani_Prop_MarechausseeGate_01
+70291289:SceneObj_Area_Fd_TreasureEntry_Door_01
+70291290:SceneObj_Level_Common_Property_Ani_Build_Hiddendoor_01
+70291292:SceneObj_Level_Common_Property_Ani_Prop_CoinDummy_02
+70291293:SceneObj_Level_Common_Property_Ani_Prop_CoinDummy_01
 70291296:SceneObj_Area_Fd_ChioriDungeon_SoundController_01
 70291297:SceneObj_Area_Common_Property_Prop_DelucChallengeAirwall_02
+70291298:SceneObj_Level_Common_Property_Ani_Prop_LeaserWall_01
+70291299:SceneObj_Level_Common_Property_Ani_Prop_BulletHellCoin_01
+70291300:SceneObj_Level_Common_Property_Ani_Prop_BulletHellCoin_02
 70291301:SceneObj_Area_Common_Property_Prop_Catcafe_FollowmoveInteract_01
 70291302:SceneObj_Area_Fd_Property_Ani_Prop_FdCommonGate_01
 70291303:SceneObj_Area_Fd_Property_Ani_Prop_FdCommonGate_02
@@ -5612,6 +5730,16 @@
 70320135:SceneObj_Area_Common_Property_Prop_CharAmusementAirWall_07
 70320136:SceneObj_Area_Common_Property_Prop_CharAmusementAirWall_08
 70320137:SceneObj_Area_Common_Property_Prop_CharAmusementAirWall_09
+70320138:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_Flag_01
+70320139:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_Flag_02
+70320140:[N/A] 882392350
+70320141:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_DropCard_01
+70320142:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_DropCard_02
+70320143:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackGate_01
+70320150:[N/A] 4078867398
+70320151:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackGate_02
+70320152:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackLight_01
+70320153:[N/A] 2891105062
 70330002:煉金爐領獎台
 70330003:煉金火 小
 70330004:要打的搬運元素之火-搬運元素之火
@@ -6707,9 +6835,41 @@
 70350499:SceneObj_Area_Xm_Property_Ani_Prop_ElecTrailBulletGen_02
 70350500:Activity_Gadget_AkaFesPotion_Fire_Debuff_Driver
 70350501:SceneObj_Area_Xm_Property_Ani_Prop_FloatFarr_02
+70350503:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Podium_01
+70350504:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Phonograph_01
+70350505:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Divination_01
+70350506:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_MagicBook_01
+70350507:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_TeamEditor_01
+70350508:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_GuardEntity_01
+70350509:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_CityAxis_01
+70350510:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Entry_01
+70350511:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_LoopElevator_01
 70350512:SceneObj_Level_Common_Property_Ani_Bridge_LyFloatingBridge_01
+70350513:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_TeamEditor_02
+70350514:[N/A] 3284301342
+70350515:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_RageController_01
+70350516:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_RestQuitPoint_01
+70350517:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_CamearAdjust_01
+70350518:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_ESPManager_01
+70350520:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_AirwallAuditorium
+70350521:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_SitPointController_01
+70350522:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_01
+70350523:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_02
+70350525:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_AuditoriumEnd_01
+70350526:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_03
+70350527:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_01
 70350528:SceneObj_Area_Ly_Property_Ani_Prop_GreatFestivalV2_GuidePoint_01
 70350529:SceneObj_Area_Ly_Property_Ani_Prop_GreatFestivalV2_GuidePoint_02
+70350530:SceneObj_Level_Common_Property_Ani_Prop_LightGuideGear_01
+70350531:SceneObj_Level_Common_Property_Ani_Prop_FloorGateGear_01
+70350532:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_04
+70350533:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearDoor_01
+70350534:SceneObj_Gear_MvM_Trap
+70350535:SceneObj_Level_Common_Property_Prop_TowerRepelV3
+70350536:SceneObj_Gear_MvM_Mine
+70350537:SceneObj_Gear_Operator_MvM_Mamolu
+70350538:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_AuditorSound
+70350539:SceneObj_Gear_Operator_MvM_Mamolu_02
 70360011:膨膨果終點-氣球終點(1.1markflag版本）
 70360012:膨膨果終點2-氣球終點
 70360013:膨膨果終點3-氣球終點
@@ -8297,6 +8457,8 @@
 70711494:[N/A] 1130721848
 70711495:[N/A] 2735899096
 70711496:[N/A] 454832160
+70711497:[N/A] 2950885832
+70711498:[N/A] 505742752
 70711499:[N/A] 894963696
 70711500:[N/A] 230712120
 70711501:[N/A] 245820744
@@ -8319,11 +8481,66 @@
 70711518:[N/A] 2253302248
 70711519:[N/A] 2953437496
 70711521:[N/A] 3889181896
+70711524:[N/A] 505671616
 70711525:[N/A] 3664702656
+70711526:SceneObj_Eff_Quest_FdHotelTea_02
 70711532:[N/A] 3770495576
 70711534:[N/A] 1937340752
 70711535:[N/A] 3566751808
+70711536:[N/A] 1559943344
+70711537:[N/A] 4005836184
+70711538:[N/A] 1443263448
+70711539:[N/A] 3264946752
+70711540:[N/A] 2774305888
+70711541:[N/A] 467487816
+70711542:[N/A] 191718648
+70711543:[N/A] 379289088
+70711544:[N/A] 3265146368
+70711545:[N/A] 3112380536
+70711546:[N/A] 3293241152
+70711547:[N/A] 1649036848
+70711548:[N/A] 3579505024
+70711549:[N/A] 137682824
+70711550:[N/A] 574660032
+70711551:[N/A] 3832895152
+70711552:[N/A] 4137990640
+70711553:[N/A] 92502520
+70711554:[N/A] 1521413072
+70711555:[N/A] 1463601392
+70711556:[N/A] 3383584096
+70711557:[N/A] 205557824
+70711558:[N/A] 1171982400
+70711560:[N/A] 2051742328
+70711561:SceneObj_Item_Default_Item
+70711563:[N/A] 451175824
+70711564:[N/A] 154356784
+70711565:[N/A] 1820895784
+70711566:[N/A] 4209996104
+70711567:[N/A] 3336031008
 70711568:[CHS] - (test)巴慕恩的日记
+70711569:SceneObj_Area_Fd_Property_Prop_XgwRoom
+70711570:SceneObj_Quest_SimpleGadgetTalk
+70711571:[N/A] 2286571232
+70711572:[N/A] 79054456
+70711573:SceneObj_Quest_SimpleGadgetTalk05
+70711574:SceneObj_Item_Default_Item
+70711575:SceneObj_Item_Default_Item
+70711576:[N/A] 94595696
+70711577:[N/A] 2592892600
+70711578:[N/A] 3616900488
+70711579:SceneObj_Quest_Property_Ani_Prop_EnergyCaster_Operator_05
+70711580:[N/A] 2097752928
+70711581:SceneObj_Item_Default_Item
+70711582:[N/A] 2478379936
+70711583:[N/A] 2035742872
+70711584:[N/A] 2758548224
+70711585:SceneObj_Item_Default_Item
+70711592:SceneObj_Area_Fd_Property_Ani_Prop_ElderQuilt_02
+70711593:[N/A] 2996193296
+70711594:[N/A] 22295480
+70711595:SceneObj_SigewinneSmoke_01
+70711597:[N/A] 362532096
+70711598:[N/A] 2140889768
 70720216:火仙靈腳印-仙靈腳印
 70720219:發光仙靈腳印
 70800002:MsgBoard
@@ -9217,6 +9434,7 @@
 70950206:開啟
 70950207:解鎖
 70950208:組裝
+70950214:[N/A] 1320639990
 71000004:岩琥珀
 71000005:射擊點-射擊點狀態1
 71000006:射擊點-射擊點狀態2
@@ -9565,6 +9783,14 @@
 71700751:[N/A] 233005080
 71700752:[N/A] 3608415800
 71700753:[N/A] 946830120
+71700754:SceneObj_Area_Common_Prop_Common_Twins_Dungeonportal_01
+71700755:SceneObj_Area_Common_Prop_Common_Twins_Butterfly_01
+71700756:[N/A] 1320471632
+71700757:[N/A] 3261253664
+71700758:[N/A] 3555596624
+71700759:[N/A] 1521717744
+71700760:SceneObj_Environment_Bulletin94
+71700761:SceneObj_Environment_Bulletin95
 72000001:群玉閣-海底古神-PA
 72000002:群玉閣-海底古神-PB
 72000003:群玉閣-海底古神-PC
@@ -10178,6 +10404,7 @@
 77111013:飯店地毯-「平等對談」
 77111014:飯店地毯-「如沐風中」
 77111015:楓丹地毯-「平允方正」
+77111016:[N/A] 3138406544
 77112001:圓形的木質盾牌-家園物件
 77112002:有棱角的木質盾牌-家園物件
 77112003:特制的寶劍-家園物件
@@ -10778,6 +11005,8 @@
 77204226:「粼粼的榮彩」
 77204227:「靈感的純白」
 77204228:「健療的醇芳」
+77204229:[N/A] 3763891128
+77204230:[N/A] 2588701016
 77205001:木質長椅-家園物件
 77205002:石質的長椅-家園物件
 77205003:谷歌椅子-家園物件
@@ -11120,6 +11349,8 @@
 77215099:奇景銅像-「悠古金面」
 77215100:好夢留影神機
 77215101:慢悠悠仙像
+77215102:[N/A] 950928056
+77215103:[N/A] 2479535064
 77216001:家園路面01-家園物件
 77216002:家園路面02-家園物件
 77216003:家園路面03-家園物件
@@ -12177,6 +12408,21 @@
 71700729:北境秘史·卷三
 71700747:鹿野院平藏的留言
 71700748:「小狗商會」的收治明細
+71700762:[N/A] 976481484
+71700763:[N/A] 1459849724
+71700764:[N/A] 524159380
+71700765:[N/A] 1496186356
+71700766:[N/A] 1649628252
+71700767:[N/A] 3370696724
+71700768:[N/A] 2053389412
+71700769:[N/A] 3448013372
+71700770:[N/A] 3218519604
+71700771:[N/A] 4203305580
+71700772:[N/A] 2790292388
+71700773:[N/A] 969093148
+71700774:[N/A] 1702828196
+71700775:[N/A] 476652700
+71700776:[N/A] 1144681508
 77304001:霓裳花-2.0 家園采集物
 77304002:甜甜花-2.0 家園采集物
 77304003:塞西莉亞花-2.0 家園采集物
@@ -12234,6 +12480,7 @@
 49001017:東風快遞觸發區域
 49001019:東風快遞觸發區域強化版
 49001026:Activity_MultiCharacter_DangerArea
+49001037:Gadget_RoleCombat_DangerArea
 70220054:雪山守護機關
 70220074:稻妻守護機關-雪山守護機關
 70220113:莫娜地城移動水片-dungeon地城
@@ -12322,6 +12569,16 @@
 70291148:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTarget_05
 70291149:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTarget_06
 70291150:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTarget_01
+70291173:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_01
+70291174:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_02
+70291175:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_03
+70291176:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_04
+70291177:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_05
+70291178:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_06
+70291179:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTarget_02
+70291183:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTargetWeak_01
+70291184:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTargetBall_02
+70291291:SceneObj_Level_Common_Property_Ani_Prop_BulletHell_StaticBullet_01
 70291428:SceneObj_Area_Fd_Property_Ani_Prop_ShopRobot_01
 70291429:SceneObj_Area_Fd_Property_Ani_Prop_TrapFittingRoom_01
 70291477:SceneObj_Area_Common_Property_Ani_SpriteEffect_01
@@ -12423,6 +12680,9 @@
 70320104:SceneObj_Area_Fd_Property_Ani_Prop_GearPipe_Gear_03
 70320117:SceneObj_Level_Common_Property_Ani_Prop_CharAmuseBasket_01
 70320118:SceneObj_Level_Common_Property_Ani_Prop_CharAmuseBasket_02
+70320146:SceneObj_Level_Common_Property_Ani_Prop_SgwDungeonTruck_01
+70320147:SceneObj_Level_Common_Property_Ani_Prop_SgwDungeonTruck_02
+70320148:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackSwitcher_02
 70330081:雷導立方
 70330083:雷導立方（不可旋轉）
 70330118:鶴觀 雷導立方（不可旋轉）
@@ -12956,6 +13216,8 @@
 50004102:MonEquip_Axe_Electric_02
 50004103:MonEquip_Crossbow_01
 50004104:MonEquip_Thoarder_Rocky_Guitar
+50004105:MonEquip_Axe_01
+50004111:MonEquip_WoodenClub_01
 
 // 装备
 50010002:(test)穿模測試-Equip_Sword_Template
@@ -13015,6 +13277,7 @@
 50011512:Weapon_Sword_Metal
 50011513:Weapon_Sword_Metal
 50011514:Weapon_Sword_Metal
+50011515:Weapon_Sword_Metal
 50012101:訓練大劍-Equip_Claymore_Aniki
 50012201:傭兵重劍-Equip_Claymore_Oyaji
 50012301:鐵影闊劍-Equip_Claymore_Glaive
@@ -13159,6 +13422,7 @@
 50015419:Weapon_Bow_Metal
 50015424:Weapon_Bow_Metal
 50015425:Weapon_Bow_Metal
+50015426:Weapon_Bow_Metal
 50015427:Weapon_Bow_Metal
 50015501:天空之翼-Equip_Bow_Dvalin
 50015502:阿莫斯之弓-Equip_Bow_Amos
@@ -13171,6 +13435,7 @@
 50015509:飛雷之弦振-Equip_Bow_Narukami
 50015511:獵人之徑-Equip_Bow_Ayus
 50015512:Weapon_Bow_Metal
+50015513:Weapon_Bow_Metal
 50100001:緋煙-副武器-桿秤
 
 // 副装备
@@ -13620,6 +13885,8 @@
 70320095:SceneObj_Area_Fd_Property_Ani_Prop_FactoryJukebox_01
 70320100:SceneObj_Area_Fd_Property_Ani_Prop_ResearchConsole_01
 70320105:SceneObj_Area_Fd_Property_Ani_Prop_FDFacPipeValve_01
+70320144:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackSwitcher_01
+70320145:SceneObj_Level_Common_Property_Ani_Prop_SgwDungeonTruck_03
 70330001:煉金初始化
 70330019:岩片吸收器
 70330024:煉金爐-搬運元素之力地基
@@ -13734,6 +14001,8 @@
 70350486:SceneObj_Area_Xm_Property_Prop_CipherSwitch_04
 70350493:SceneObj_Level_Xm_Property_Ani_Prop_SlushaShellOperator_01
 70350502:SceneObj_Area_Xm_Property_Prop_CipherSwitch_05
+70350519:SceneObj_Gear_Operator_Mamolu_RoleCombat
+70350524:SceneObj_Level_Common_Property_Ani_Prop_TurntableOperator_01
 70360001:大世界隱形操作台-隱形操作台
 70360002:機關操作台
 70360003:調查線索-封印線索

Source/GrasscutterTools/Resources/zh-tw/Monsters.txt

@@ -14,6 +14,7 @@
 20010503:Slime_Electric_02_SimpleStick - [N/A] 1834387465
 20010504:Slime_Electric_02 - [N/A] 2297127161
 20010581:Slime_Electric_02 - [N/A] 3442560241
+20010590:Slime_Electric_04 - [N/A] 3609489745
 20010601:大型雷史萊姆
 20010602:大型雷史萊姆（塔防）
 20010604:大型雷史萊姆
@@ -49,6 +50,7 @@
 20011205:Slime_Fire_02_SimpleStick - [N/A] 453720297
 20011207:Slime_Fire_02 - [N/A] 1709031969
 20011281:Slime_Fire_02 - [N/A] 1865400017
+20011290:Slime_Fire_06 - [N/A] 759614481
 20011301:大型火史萊姆
 20011302:大型火史萊姆（塔防）
 20011304:大型火史萊姆
@@ -86,6 +88,7 @@
 20050501:純水之雀
 20050502:純水之雀
 20050581:Monster_Oceanid_Tit - [N/A] 2975528057
+20050590:Monster_Oceanid_Tit_02 - [N/A] 3906620841
 20050601:純水之鴨
 20050602:純水之鴨(陸地行走版）
 20050603:純水之鴨
@@ -116,10 +119,12 @@
 20060382:Sylph_Wind_01 - [N/A] 2626651433
 20060401:冰飄浮靈
 20060481:Sylph_Ice_01 - [N/A] 3638534065
+20060490:Sylph_Ice_02 - [N/A] 1165765169
 20060501:雷飄浮靈
 20060581:Sylph_Electric_01 - [N/A] 1346991849
 20060601:火飄浮靈
 20060681:Sylph_Fire_01 - [N/A] 2020892233
+20060690:Sylph_Fire_02 - [N/A] 242072433
 20060701:草飄浮靈
 20060781:Sylph_Grass_01 - [N/A] 1523065297
 21010101:丘丘人
@@ -131,6 +136,7 @@
 21010201:打手丘丘人
 21010202:Hili_None_01_Club - [N/A] 518903577
 21010281:Hili_None_01_Club - [N/A] 148649137
+21010290:Hili_None_02_Club - [N/A] 2282353529
 21010299:Hili_None_01_Club_NoAI - [N/A] 1500968553
 21010301:木盾丘丘人
 21010302:木盾丘丘人（塔防）
@@ -156,10 +162,12 @@
 21010902:冰箭丘丘人
 21010981:Hili_Ice_Range - [N/A] 1716558393
 21010982:Hili_Ice_Range_Multi - [N/A] 1237213681
+21010990:Hili_Ice_Range_03 - [N/A] 2345480137
 21011001:雷箭丘丘人
 21011002:雷箭丘丘人
 21011081:Hili_Electric_Range - [N/A] 2022453977
 21011082:Hili_Electric_Range_Multi - [N/A] 3012953161
+21011090:Hili_Electric_Range_03 - [N/A] 4254195473
 21011201:岩盾丘丘人
 21011202:岩盾丘丘人（塔防）
 21011281:Hili_None_01_RockShield - [N/A] 2602064417
@@ -184,6 +192,7 @@
 21020204:Brute_None_Axe - [N/A] 1119958809
 21020281:Brute_None_Axe - [N/A] 741150761
 21020282:Brute_None_Axe - [N/A] 1576743033
+21020290:Brute_None_Axe_01 - [N/A] 2024375625
 21020299:Brute_None_Axe_NoAI - [N/A] 4081842953
 21020301:岩盾丘丘暴徒
 21020302:岩盾丘丘暴徒（塔防）
@@ -214,6 +223,7 @@
 21030103:水丘丘薩滿
 21030104:Shaman_Water_01_LostSamachurl - [N/A] 1713314673
 21030181:Shaman_Water_01 - [N/A] 3149869785
+21030190:Shaman_Water_02 - [N/A] 1877774473
 21030201:草丘丘薩滿
 21030202:草丘丘薩滿（塔防）
 21030203:草丘丘薩滿
@@ -324,6 +334,7 @@
 24010109:遺蹟守衛
 24010181:Defender_None_01 - [N/A] 1482848121
 24010182:Defender_None_01 - [N/A] 3806686089
+24010190:Defender_None_03 - [N/A] 1203739089
 24010201:遺蹟獵者
 24010202:遺蹟獵者（塔防）
 24010281:Formathr_None - [N/A] 2103947025
@@ -380,6 +391,7 @@
 24060901:MachinaIustitia_Ruggiero_01 - [N/A] 2598421161
 24060902:MachinaIustitia_Ruggiero_02 - [N/A] 1178238353
 24060903:MachinaIustitia_Ruggiero_01 - [N/A] 4091306801
+24060990:MachinaIustitia_Ruggiero_04 - [N/A] 2442754929
 24061001:MachinaIustitia_Bradamante_01 - [N/A] 3820417257
 24061002:MachinaIustitia_Bradamante_02 - [N/A] 2286290561
 24061101:MachinaIustitia_LengthShifter_01 - [N/A] 3147408705
@@ -409,6 +421,7 @@
 24065602:MachinaIustitia_Frigate_04 - [N/A] 1620120737
 24065701:MachinaIustitia_Assimilator_03 - [N/A] 4222863585
 24065702:MachinaIustitia_Assimilator_04 - [N/A] 3834516417
+24065790:MachinaIustitia_Assimilator_90 - [N/A] 410434241
 24065801:MachinaIustitia_Ruggiero_03 - [N/A] 3392589561
 24065802:MachinaIustitia_Ruggiero_04 - [N/A] 2337120689
 24065803:MachinaIustitia_Ruggiero_05 - [N/A] 1989788129
@@ -438,14 +451,24 @@
 24069101:MachinaIustitia_LengthShifter_Codex - [N/A] 306536801
 24069201:MachinaIustitia_Excavator_Codex - [N/A] 4236769177
 24810101:FungusFighterV2_TowerFire_01 - [N/A] 1459265257
+24810190:MvM_TowerFire_01 - [N/A] 3268380201
+24810191:MvM_TowerFire_02 - [N/A] 2853693193
 24810201:FungusFighterV2_TowerFire_02 - [N/A] 1199053881
 24810301:FungusFighterV2_TowerElectric_01 - [N/A] 2345069921
+24810390:MvM_TowerElectric_01 - [N/A] 3800466761
+24810391:MvM_TowerElectric_02 - [N/A] 4010007481
 24810401:FungusFighterV2_TowerElectric_02 - [N/A] 3520636737
 24810501:FungusFighterV2_TowerWater_01 - [N/A] 2746544617
+24810590:MvM_TowerWater_01 - [N/A] 3065011249
+24810591:MvM_TowerWater_02 - [N/A] 2040948281
 24810601:FungusFighterV2_TowerWater_02 - [N/A] 3712937217
 24810701:FungusFighterV2_TowerIce_01 - [N/A] 3750011169
+24810790:MvM_TowerIce_01 - [N/A] 2546590705
+24810791:MvM_TowerIce_02 - [N/A] 1891908609
 24810801:FungusFighterV2_TowerIce_02 - [N/A] 1832843025
 24810901:FungusFighterV2_TowerWind_01 - [N/A] 3717599585
+24810990:MvM_TowerWind_01 - [N/A] 3672283377
+24810991:MvM_TowerWind_02 - [N/A] 750672833
 24811001:FungusFighterV2_TowerWind_02 - [N/A] 540068777
 24811101:FungusFighterV2_TowerPhysics_01 - [N/A] 583303081
 24920101:Balloon_SlimeBalloon_01 - [N/A] 1492263081
@@ -494,6 +517,7 @@
 25010303:NPC_Quest_Male_Standard_Oppo_13715 - [N/A] 724448633
 25010304:NPC_Quest_Male_Standard_Oppo_13777 - [N/A] 2201891417
 25010381:Thoarder_Male_Standard_NoWeapon_Fire_01 - [N/A] 933629753
+25010390:Thoarder_Male_Standard_NoWeapon_Fire_02 - [N/A] 4261880345
 25010401:盜寶團·水之藥劑師
 25010402:Thoarder_Male_Standard_NoWeapon_Water_01_02 - [N/A] 3452436881
 25010403:Thoarder_Male_Standard_NoWeapon_Water_01_02 - [N/A] 4146453193
@@ -503,12 +527,15 @@
 25010501:盜寶團·雷之藥劑師
 25010502:NPC_Quest_Male_Standard_Colter_13709 - [N/A] 1419015937
 25010503:NPC_Quest_Male_Standard_Oppo_13711 - [N/A] 3201328753
+25010504:NPC_Quest_Male_Standard_Gaston_14054 - [N/A] 2066425721
+25010505:NPC_Quest_Male_Standard_Florian_14132 - [N/A] 4179062537
 25010581:Thoarder_Male_Standard_NoWeapon_Electric_01 - [N/A] 624542921
 25010601:盜寶團·冰之藥劑師
 25010602:Thoarder_Male_Standard_NoWeapon_Ice_02 - [N/A] 726418097
 25010603:Thoarder_Male_Standard_NoWeapon_Ice_03 - [N/A] 2398565441
 25010604:NPC_Quest_Male_Standard_Oppo_13714 - [N/A] 50560321
 25010605:NPC_Fontaine_Male_Standard_RobberB_21418 - [N/A] 859928713
+25010606:NPC_Quest_Male_Standard_Enri_14055 - [N/A] 42107321
 25010681:Thoarder_Male_Standard_NoWeapon_Ice_01 - [N/A] 3749122441
 25010701:盜寶團·雜工
 25010702:NPC_Quest_Male_Fat_Oppo_13873 - [N/A] 2169448041
@@ -520,6 +547,7 @@
 25020104:NPC_Quest_Male_Standard_Truand_13335 - [N/A] 2313699185
 25020105:Thoarder_Male_Crossbow_01_05 - [N/A] 2794240153
 25020106:NPC_Fontaine_Male_Standard_RobberLeader_21417 - [N/A] 3178123705
+25020107:NPC_Quest_Male_Standard_Lazare_14056 - [N/A] 3978033681
 25020201:盜寶團神射手
 25020204:盜寶團·神射手
 25020205:Thoarder_Male_Standard_Crossbow_02_04 - [N/A] 763791561
@@ -588,6 +616,7 @@
 25080281:Samurai_Ronin_02 - [N/A] 4200211249
 25080301:浪人·暗部
 25080381:Samurai_Ronin_03 - [N/A] 2465854769
+25080390:Samurai_Ronin_05 - [N/A] 1736584545
 25080401:幕府武士
 25080402:寄騎武士
 25080403:Samurai_Hatamoto_03 - [N/A] 1581579825
@@ -598,11 +627,13 @@
 25100181:Samurai_Kairagi_01 - [N/A] 77071577
 25100182:Samurai_Kairagi_01 - [N/A] 391115545
 25100183:Samurai_Kairagi_01 - [N/A] 222568409
+25100190:Samurai_Kairagi_07 - [N/A] 2745601001
 25100201:海亂鬼-火
 25100202:Samurai_Kairagi_07 - 海亂鬼-火
 25100281:Samurai_Kairagi_02 - [N/A] 3882445073
 25100282:Samurai_Kairagi_02 - [N/A] 753240097
 25100283:Samurai_Kairagi_02 - [N/A] 3828251937
+25100290:Samurai_Kairagi_08 - [N/A] 1886860641
 25100301:海亂鬼-雷幽靈
 25100302:落武者·咒雷
 25100401:海亂鬼-火幽靈
@@ -674,10 +705,12 @@
 25310102:Eremite_Female_Slim_PushDagger_02 - [N/A] 1936242505
 25310181:Eremite_Female_Slim_PushDagger_01 - [N/A] 1365735873
 25310182:Eremite_Female_Slim_PushDagger_01 - [N/A] 1430105225
+25310190:Eremite_Female_Slim_PushDagger_03 - [N/A] 2670641129
 25310201:鍍金旅團·熾陽凝冰
 25310202:Eremite_Male_Standard_Glaive_02 - [N/A] 3503187145
 25310281:Eremite_Male_Standard_Glaive_01 - [N/A] 3981952521
 25310282:Eremite_Male_Standard_Glaive_01 - [N/A] 411301145
+25310290:Eremite_Male_Standard_Glaive_03 - [N/A] 423708617
 25310301:鍍金旅團·白日鳴雷
 25310381:Eremite_Male_Standard_Polearm_01 - [N/A] 3592293337
 25310382:Eremite_Male_Standard_Polearm_01 - [N/A] 1324855129
@@ -702,6 +735,7 @@
 26010301:雷騙騙花
 26030101:幼岩龍蜥
 26030181:Wyrm_Rock - [N/A] 3059435841
+26030190:Wyrm_Rock_02 - [N/A] 557038713
 26040101:岩龍蜥-水
 26040102:岩龍蜥-火
 26040103:岩龍蜥-冰
@@ -734,7 +768,9 @@
 26051201:Drake_DeepSea_Water_03 - [N/A] 1100113145
 26051202:Drake_DeepSea_Water_04 - [N/A] 1628565665
 26060101:雷螢
+26060190:Cicin_Thunder_02 - [N/A] 1457632377
 26060201:水螢
+26060290:Cicin_Water_02 - [N/A] 3625213961
 26060301:冰螢
 26090101:浮游水蕈獸
 26090181:Fungus_Un_Gamma_Water_01 - [N/A] 1665501025
@@ -749,6 +785,7 @@
 26090381:Fungus_Un_Delta_Wind_01 - [N/A] 2441732177
 26090390:Fungus_Un_Delta_Wind_Enemy - [N/A] 3376055609
 26090391:Fungus_Un_Delta_Wind_01_Capture - [N/A] 1573739513
+26090393:Fungus_Un_Delta_Wind_02 - [N/A] 2743236449
 26090401:旋轉冰蕈獸
 26090481:Fungus_Trois_Epsilon_Electric_01 - [N/A] 4151812377
 26090490:Fungus_Trois_Epsilon_Electric_Enemy - [N/A] 783524481
@@ -822,6 +859,7 @@
 26160202:Aplysia_Mature_01_Land - [N/A] 2244040649
 26160301:SeaHorse_Mature_01_Sea - [N/A] 1544112625
 26160302:SeaHorse_Mature_01_Land - [N/A] 3992435993
+26160390:SeaHorse_Mature_02 - [N/A] 4085486801
 26162101:HermitCrab_Mature_02 - [N/A] 3832936073
 26162201:MantaRay_Larva_03 - [N/A] 1943296953
 26162301:Seal_Larva_02 - [N/A] 1874832521
@@ -1430,18 +1468,42 @@
 28041105:Fishable_Maritime_MachinaIustitia_05 - [N/A] 1211691881
 
 // 友军
+30010590:Partner_Slime_Electric_04 - [N/A] 1360704329
+30011290:Partner_Slime_Fire_06 - [N/A] 1945956961
 30050501:Partner_Oceanid_Tit - [N/A] 2294162793
+30050590:Partner_Monster_Oceanid_Tit_02 - [N/A] 1992834649
 30050601:Partner_Oceanid_Wigeon_02 - [N/A] 903450313
 30050701:Partner_Oceanid_Squirrel - [N/A] 2642015873
+30060490:Partner_Sylph_Ice_02 - [N/A] 3052301665
+30060690:Partner_Sylph_Fire_02 - [N/A] 2606395609
+31010290:Partner_Hili_None_02_Club - [N/A] 1348459489
+31010990:Partner_Hili_Ice_Range_03 - [N/A] 318427833
+31011090:Partner_Hili_Electric_Range_03 - [N/A] 2029584281
+31020290:Partner_Brute_None_Axe_01 - [N/A] 208842305
+31030190:Partner_Shaman_Water_02 - [N/A] 3800190729
 31040101:Partner_Hilistray_Wind_01 - [N/A] 1924270545
 32110201:Ovacua_Order_02 - [N/A] 569946161
+34010190:Partner_Defender_None_03 - [N/A] 2666244393
 34060101:Partner_MachinaIustitia_Sentry_01 - [N/A] 68219401
 34060102:Partner_MachinaIustitia_Sentry_01 - [N/A] 1581798833
 34060901:Partner_MachinaIustitia_Ruggiero_02 - [N/A] 2221802481
+34060990:Partner_MachinaIustitia_Ruggiero_04 - [N/A] 1146147913
+34065790:Partner_MachinaIustitia_Assimilator_90 - [N/A] 3382698241
+34810190:Partner_MvM_TowerFire_01 - [N/A] 2504772937
+34810191:Partner_MvM_TowerFire_02 - [N/A] 3028471225
+34810390:Partner_MvM_TowerElectric_01 - [N/A] 2883808873
+34810391:Partner_MvM_TowerElectric_02 - [N/A] 1973294081
+34810590:Partner_MvM_TowerWater_01 - [N/A] 3115241505
+34810591:Partner_MvM_TowerWater_02 - [N/A] 3145296577
+34810790:Partner_MvM_TowerIce_01 - [N/A] 941724737
+34810791:Partner_MvM_TowerIce_02 - [N/A] 766759905
+34810990:Partner_MvM_TowerWind_01 - [N/A] 98234177
+34810991:Partner_MvM_TowerWind_02 - [N/A] 1166709913
 35010201:NPC_Fontaine_Male_Standard_Sonny_5132 - [N/A] 2270561153
 35010202:NPC_Quest_Male_Standard_Rouge_21274 - [N/A] 802259057
 35010203:NPC_Quest_Male_Standard_Rocher_21161 - [N/A] 1589132441
 35010204:NPC_Quest_Male_Standard_TieChuaner_21362 - [N/A] 1978991089
+35010390:Partner_Thoarder_Male_Standard_NoWeapon_Fire_02 - [N/A] 642225153
 35010602:Thoarder_Male_Standard_NoWeapon_Ice_02 - [N/A] 2367366025
 35020201:NPC_Fontaine_Male_Standard_Blanc_5233 - [N/A] 295013961
 35020202:NPC_Fontaine_Male_Standard_Bleu_5232 - [N/A] 2091883585
@@ -1450,6 +1512,9 @@
 35060102:NPC_Fontaine_MuscleMan_Standard_Chaussivert_5273 - [N/A] 2070327977
 35060103:NPC_Quest_Muscleman_Standard_Valberry_21163 - [N/A] 2883132241
 35070101:NPC_Quest_MuscleMan_Standard_TieMing_21298 - [N/A] 1105845961
+35080390:Partner_Samurai_Ronin_05 - [N/A] 1710869545
+35100190:Partner_Samurai_Kairagi_07 - [N/A] 1725122433
+35100290:Partner_Samurai_Kairagi_08 - [N/A] 3265297905
 35110101:NPC_Fontaine_Female_Standard_Genevieve_5260 - [N/A] 465377969
 35110102:NPC_Fontaine_Female_Standard_Genevieve_5260 - [N/A] 4203920553
 35110103:NPC_Fontaine_Female_Standard_Genevieve_5260 - [N/A] 387141537
@@ -1471,10 +1536,15 @@
 35210501:NPC - Habachi哈巴奇
 35210502:NPC_Quest_MuscleMan_Standard_Bashar_13107 - [N/A] 4266344825
 35310101:鍍金旅團·沙中淨水（黃金夢鄉）
+35310190:Partner_Eremite_Female_Slim_PushDagger_03 - [N/A] 3316783769
+35310290:Partner_Eremite_Male_Standard_Glaive_03 - [N/A] 2388024745
 35310301:鍍金旅團·白日鳴雷（黃金夢鄉）
 35410101:Partner_Eremite_Male_Strong_Katar_01 - [N/A] 843060329
 35410201:Partner_Eremite_Female_Standard_Longbow_01 - [N/A] 2996340361
+36030190:Partner_Wyrm_Rock_02 - [N/A] 4078935249
 36050601:Drake_DeepSea_Water_01 - [N/A] 478535833
+36060190:Partner_Cicin_Thunder_02 - [N/A] 90474689
+36060290:Partner_Cicin_Water_02 - [N/A] 4196823585
 36090190:活動-友方飛行水
 36090191:Partner_Fumgus_Un_Gamma_Water - [N/A] 3593336553
 36090192:Partner_Fumgus_Un_Gamma_Water - [N/A] 2780786345
@@ -1484,6 +1554,7 @@
 36090390:活動-友方飛行風
 36090391:Partner_Fumgus_Un_Delta_Wind - [N/A] 637837089
 36090392:Partner_Fumgus_Un_Delta_Wind - [N/A] 2589779561
+36090393:Partner_Fungus_Un_Delta_Wind_02 - [N/A] 2231278801
 36090490:活動-友方旋轉雷
 36090491:Partner_Fumgus_Trois_Epsilon_Electric - [N/A] 4089561145
 36090492:Partner_Fumgus_Trois_Epsilon_Electric - [N/A] 2409750417
@@ -1505,6 +1576,7 @@
 36091090:活動-友方伸展雷
 36091091:Partner_Fumgus_Deux_Delta_Electric - [N/A] 2177474001
 36091092:Partner_Fumgus_Deux_Delta_Electric - [N/A] 1670919961
+36160390:Partner_SeaHorse_Mature_02 - [N/A] 2198861673
 38050590:Partner_Animal_Electrohercules_01 - [N/A] 2442210649
 38050591:Partner_Animal_Electrohercules_02 - [N/A] 1954661401
 38060502:Partner_Animal_Megamoth_Jungle_01 - [N/A] 113674993

Source/GrasscutterTools/Resources/zh-tw/Weapon.txt

@@ -44,6 +44,7 @@
 11512:裁葉萃光
 11513:靜水流湧之輝
 11514:有樂御簾切
+11515:赦罪
 12101:訓練大劍
 12201:傭兵重劍
 12301:鐵影闊劍
@@ -179,6 +180,7 @@
 15419:䴉穿之喙
 15424:烈陽之嗣
 15425:靜謐之曲
+15426:築雲
 15427:測距規
 15501:天空之翼
 15502:阿莫斯之弓
@@ -188,3 +190,4 @@
 15509:飛雷之弦振
 15511:獵人之徑
 15512:最初的大魔術
+15513:白雨心弦

Source/GrasscutterTools/Utils/HighDPIUtil.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GrasscutterTools.Utils
+{
+    internal class HighDPIUtil
+    {
+        public static void SetDpiAwareness()
+        {
+            var dpiAwareness = ProcessDpiAwareness.PerMonitorDpiAware;
+            var hresult = SetProcessDpiAwareness(dpiAwareness);
+            if (hresult != 0)
+            {
+                throw new System.ComponentModel.Win32Exception(hresult);
+            }
+        }
+
+        [DllImport("shcore.dll")]
+        private static extern int SetProcessDpiAwareness(ProcessDpiAwareness value);
+
+        private enum ProcessDpiAwareness
+        {
+            DpiUnaware = 0,
+            SystemDpiAware = 1,
+            PerMonitorDpiAware = 2
+        }
+    }
+}