Merge remote-tracking branch 'origin/upstream-master'

Author: ckurtz22

Output Data/xb1de_drop_tables.csv

@@ -222,6 +222,9 @@ private static void PrintUsage()
 
             Console.WriteLine("\n  DecompressIraSave - Decompresses the save file for the Torna DLC");
             Console.WriteLine("    DecompressIraSave -i <input_file> -o <output_file>");
+
+            Console.WriteLine("\n  GenerateDropTables - Generate drop tables for Xenoblade 1: DE");
+            Console.WriteLine("    GenerateDropTables -b <bdat_dir> -o <output_file>");
         }
 
         private static string GetProgramName() => Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly()?.Location ?? "");

XbTool/XbTool/CliArguments.cs

@@ -57,6 +57,10 @@ public static byte[] DecodeTexture(this ITexture texture)
                     Swizzle.Deswizzle(texture, 4);
                     decoded = Dxt.DecompressBc7(texture);
                     break;
+                case TextureFormat.R8G8B8A8_UNORM:
+                    Swizzle.Deswizzle(texture, 4, 1);
+                    decoded = texture.Data;
+                    break;
             }
 
             return decoded;

XbTool/XbTool/Common/Textures/Decode.cs

@@ -7,6 +7,7 @@ public enum TextureFormat
         BC3 = 0x44,
         BC4 = 0x49,
         BC7 = 0x4D,
-        BC6H_UF16 = 0x50
+        BC6H_UF16 = 0x50,
+        R8G8B8A8_UNORM = 0x25
     }
 }

XbTool/XbTool/Common/Textures/TextureFormat.cs

@@ -5,11 +5,13 @@ BTL_bufflist,name,Message,BTL_bufflist_ms,,0,
 BTL_crystalnamelist,name,Message,BTL_crystalnamelist_ms,,0,
 BTL_enelist,c_name_id,Message,BTL_crystalnamelist,,0,
 BTL_enelist,name,Message,BTL_enelist_ms,,0,
+BTL_enelist,resource,Reference,KP_list,,0,
 BTL_enelist*,arts*,Reference,ene_arts,,0,
 BTL_enelist*,atk*,Reference,ene_atk,,0,
 BTL_enelist*,drop_nml,Reference,drop_nmllist*,,0,
 BTL_enelist*,drop_rar,Reference,drop_rarlist*,,0,
 BTL_enelist*,drop_spr,Reference,drop_sprlist*,,0,
+BTL_enelist*,spike_state,Reference,BTL_bufflist,,0,
 BTL_GimmckBossRescue,eneID,Reference,BTL_enelist,,0,
 BTL_GimmckBossRescue,listID*,Reference,MNU_ttrl,,0,
 BTL_GimmckBossRescue,resText*,Message,BTL_GimmckBossRescue_ms,,0,
@@ -44,6 +46,7 @@ FieldLock*,S_FLG_*,Reference,MNU_scenario,,0,
 FLD_maplist,name,Message,FLD_maplist_ms,,0,
 FLD_maplist,map_fileID,Reference,SYS_filelist,,0,
 FLD_npclist,name,Message,FLD_npclist_ms,,0,
+FLD_npclist,resource,Reference,KP_list,,0,
 FLD_npclist,rlt_job,Message,FLD_npclist_ms,,0,
 FLD_npclist,rlt_lnd,Reference,landmarklist,,0,
 FLD_npclist,exc_id*,Reference,exchangelist*,,0,

XbTool/XbTool/Data/xb1de_fieldInfo.csv

@@ -42,6 +42,7 @@ public enum Task
         ExportQuests,
         ReplaceArchive,
         SdPrintTest,
+        GenerateDropTables,
         GiveMaps,
         FindInnEvents,
         PrintQuests

XbTool/XbTool/Options.cs

@@ -3,6 +3,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using XbTool.Bdat;
 using XbTool.BdatString;
 using XbTool.CodeGen;
@@ -15,6 +16,7 @@
 using XbTool.Scripting;
 using XbTool.Serialization;
 using XbTool.Types;
+using XbTool.Xb1De.Drops;
 using XbTool.Xb2;
 using XbTool.Xb2.GameData;
 
@@ -95,6 +97,9 @@ internal static void RunTask(Options options)
                     case Task.SdPrintTest:
                         SdPrintTest(options);
                         break;
+                    case Task.GenerateDropTables:
+                        GenerateDropTables(options);
+                        break;
                     case Task.GiveMaps:
                         GiveMaps(options);
                         break;
@@ -471,6 +476,16 @@ private static void SdPrintTest(Options options)
             //var localFs = new LocalFileSystem("output");
             //fs.CopyFileSystem(localFs, options.Progress);
         }
+
+        private static void GenerateDropTables(Options options)
+        {
+            if (options.BdatDir == null) throw new NullReferenceException("No bdat path was specified.");
+            if (options.Output == null) throw new NullReferenceException("No output path was specified.");
+
+            BdatStringCollection tables = GetBdatStringCollection(options);
+            DropTableGen.GenerateDropTables(tables, options.Output);
+        }
+
         private static void GiveMaps(Options options)
         {
             if (options.Input == null) throw new NullReferenceException("No input file was specified.");