gimmicks: use bdatstringcollection instead of serialized bdatcollection

gimmicks: save reference of associated bdat item to gimmick

Author: ckurtz22

XbTool/XbTool/Gimmick/Lvb.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Text;
 using XbTool.Common;
+using XbTool.BdatString;
 
 namespace XbTool.Gimmick
 {
@@ -177,8 +178,11 @@ public class InfoEntry
         public Transform Xfrm;
         public string Name;
         public string GmkType;
+        public string Key;
         public int Id;
         public int IdInFile;
+        public MapAreaInfo ParentArea;
+        public BdatStringItem BdatItem;
 
         public InfoEntry(DataBuffer data)
         {

XbTool/XbTool/Gimmick/MapInfo.cs

@@ -37,6 +37,7 @@ public MapInfo(DataBuffer data)
                 area.LowerBound = new Point3(xLo, yLo, zLo);
                 area.UpperBound = new Point3(xHi, yHi, zHi);
                 area.Size = new Point3(xHi - xLo, yHi - yLo, zHi - zLo);
+                area.ParentMap = this;
                 data.Position = start + 72;
                 Areas[i] = area;
 
@@ -67,7 +68,7 @@ public MapAreaInfo GetContainingArea(Point3 point)
         public static Dictionary<string, MapInfo> ReadAll(IFileSystem fs)
         {
             var infos = new Dictionary<string, MapInfo>();
-            IEnumerable<string> filenames = fs.EnumerateEntries("/menu/minimap", "*.mi", SearchOptions.Default).Where(x=>x.Type == DirectoryEntryType.File).Select(x => x.FullPath);
+            IEnumerable<string> filenames = fs.EnumerateEntries("/menu/minimap", "*.mi", SearchOptions.RecurseSubdirectories).Select(x => x.FullPath);
 
             foreach (string filename in filenames)
             {
@@ -98,6 +99,7 @@ public static Dictionary<string, MapInfo> ReadAll(IFileSystem fs)
     [DebuggerDisplay("{" + nameof(DisplayName) + ", nq}")]
     public class MapAreaInfo
     {
+        public MapInfo ParentMap { get; set; }
         public MapSegmentInfo SegmentInfo { get; set; }
         public string Name { get; set; }
         public string DisplayName { get; set; }
@@ -122,6 +124,8 @@ public void AddGimmick(InfoEntry gimmick, string type)
                 Gimmicks.Add(type, new List<InfoEntry>());
             }
 
+            gimmick.ParentArea = this;
+            gimmick.Key = type;
             Gimmicks[type].Add(gimmick);
         }
 

XbTool/XbTool/Gimmick/ReadGmk.cs

@@ -5,31 +5,32 @@
 using LibHac.Fs;
 using LibHac.FsSystem;
 using XbTool.Bdat;
+using XbTool.BdatString;
 using XbTool.Common;
 using XbTool.Types;
 
 namespace XbTool.Gimmick
 {
     public static class ReadGmk
     {
-        public static MapInfo[] ReadAll(IFileSystem fs, BdatCollection tables, IProgressReport progress = null)
+        public static MapInfo[] ReadAll(IFileSystem fs, BdatStringCollection tables, IProgressReport progress = null)
         {
             progress?.LogMessage("Reading map info and gimmick sets");
             Dictionary<string, MapInfo> maps = MapInfo.ReadAll(fs);
 
-            BdatTable<FLD_maplist> mapList = tables.FLD_maplist;
-            BdatTable<MNU_MapInfo> areaList = tables.MNU_MapInfo;
+            BdatStringItem[] mapList = tables.Tables["FLD_maplist"].Items;
+            BdatStringItem[] areaList = tables.Tables["MNU_MapInfo"].Items;
 
             foreach (MapInfo mapInfo in maps.Values)
             {
-                FLD_maplist map = mapList.FirstOrDefault(x => x.resource == mapInfo.Name && x._nameID != null);
+                BdatStringItem map = mapList.FirstOrDefault(x => x["resource"].DisplayString == mapInfo.Name && x["nameID"].DisplayString != null);
                 if (map == null) continue;
-                if (map._nameID != null) mapInfo.DisplayName = map._nameID.name;
+                mapInfo.DisplayName = map["nameID"].DisplayString;
 
                 foreach (MapAreaInfo areaInfo in mapInfo.Areas)
                 {
-                    MNU_MapInfo area = areaList.FirstOrDefault(x =>
-                        x.level_name == areaInfo.Name || x.level_name2 == areaInfo.Name);
+                    BdatStringItem area = areaList.FirstOrDefault(x =>
+                        x["level_name"].DisplayString == areaInfo.Name || x["level_name2"].DisplayString == areaInfo.Name);
                     if (area == null)
                     {
                         progress?.LogMessage($"Found area {areaInfo.Name} that is not in the BDAT tables");
@@ -40,24 +41,24 @@ public static MapInfo[] ReadAll(IFileSystem fs, BdatCollection tables, IProgress
                     // These 2 maps are always the same except one has a small addition or removal.
                     // We want the map with the most objects on it, so we use the second map for
                     // Gormott (ma05a), and the first map for everywhere else.
-                    if (!string.IsNullOrWhiteSpace(area.level_name2)
-                        && area.level_name == areaInfo.Name
+                    if (!string.IsNullOrWhiteSpace(area["level_name2"].DisplayString)
+                        && area["level_name"].DisplayString == areaInfo.Name
                         && mapInfo.Name == "ma05a")
                     {
                         areaInfo.Priority = int.MaxValue;
                     }
-                    else if (!string.IsNullOrWhiteSpace(area.level_name2)
-                             && area.level_name2 == areaInfo.Name
+                    else if (!string.IsNullOrWhiteSpace(area["level_name2"].DisplayString)
+                             && area["level_name2"].DisplayString == areaInfo.Name
                              && mapInfo.Name != "ma05a")
                     {
                         areaInfo.Priority = int.MaxValue;
                     }
                     else
                     {
-                        areaInfo.Priority = area.level_priority;
+                        areaInfo.Priority = int.Parse(area["level_priority"].ValueString);
                     }
 
-                    if (area._disp_name?.name != null) areaInfo.DisplayName = area._disp_name.name;
+                    if (area["disp_name"].DisplayString != null) areaInfo.DisplayName = area["disp_name"].DisplayString;
                 }
 
                 Dictionary<string, Lvb> gimmickSet = ReadGimmickSet(fs, tables, map.Id);
@@ -67,31 +68,40 @@ public static MapInfo[] ReadAll(IFileSystem fs, BdatCollection tables, IProgress
             return maps.Values.ToArray();
         }
 
-        public static Dictionary<string, Lvb> ReadGimmickSet(IFileSystem fs, BdatCollection tables, int mapId)
+        public static Dictionary<string, Lvb> ReadGimmickSet(IFileSystem fs, BdatStringCollection tables, int mapId)
         {
-            RSC_GmkSetList setBdat = tables.RSC_GmkSetList.First(x => x.mapId == mapId);
+            BdatStringItem setBdat = tables.Tables["RSC_GmkSetList"].Items.First(x => int.Parse(x["mapId"].ValueString) == mapId);
+            IEnumerable<string> fields = setBdat.Values.Keys.Where(x => !x.Contains("_bdat"));
             Dictionary<string, FieldInfo> fieldsDict = setBdat.GetType().GetFields().ToDictionary(x => x.Name, x => x);
-            IEnumerable<FieldInfo> fields = fieldsDict.Values.Where(x => x.FieldType == typeof(string) && !x.Name.Contains("_bdat"));
             var gimmicks = new Dictionary<string, Lvb>();
 
-            foreach (FieldInfo field in fields)
+            foreach (string field in fields)
             {
-                string value = (string)field.GetValue(setBdat);
+                string value = setBdat[field].DisplayString;
                 if (value == null) continue;
                 string filename = $"/gmk/{value}.lvb";
                 if (!fs.FileExists(filename)) continue;
 
                 byte[] file = fs.ReadFile(filename);
-                var lvb = new Lvb(new DataBuffer(file, Game.XB2, 0)) { Filename = field.Name };
+                var lvb = new Lvb(new DataBuffer(file, Game.XB2, 0)) { Filename = field };
 
-                string bdatField = field.Name + "_bdat";
-                if (fieldsDict.ContainsKey(bdatField))
+                string bdatField = field + "_bdat";
+                if (setBdat.Values.ContainsKey(bdatField))
                 {
-                    string bdatName = (string)fieldsDict[bdatField].GetValue(setBdat);
-                    if (!string.IsNullOrWhiteSpace(bdatName)) lvb.BdatName = bdatName;
+                    string bdatName = setBdat[bdatField].DisplayString;
+                    if (!string.IsNullOrWhiteSpace(bdatName))
+                    {
+                        lvb.BdatName = bdatName;
+                        foreach (var gmk in lvb.Info)
+                        {
+                            gmk.BdatItem = tables[lvb.BdatName].Items.FirstOrDefault(itm => itm["name"].DisplayString == gmk.Name);
+                            if (gmk.BdatItem != null) 
+                                gmk.BdatItem.Gmk = gmk;
+                        }
+                    }
                 }
 
-                gimmicks.Add(field.Name, lvb);
+                gimmicks.Add(field, lvb);
             }
 
             return gimmicks;

XbTool/XbTool/Tasks.cs

@@ -384,7 +384,7 @@ private static void ReadGimmick(Options options)
 
             var xb2Fs = new Xb2FileSystem(options.SdPath);
 
-            BdatCollection tables = GetBdatCollection(xb2Fs, false);
+            BdatStringCollection tables = GetBdatStringCollection(options);
 
             MapInfo[] gimmicks = ReadGmk.ReadAll(xb2Fs, tables);
             ExportMap.ExportCsv(gimmicks, options.Output);
@@ -507,7 +507,7 @@ private static void GiveMaps(Options options)
                 //gmks = salvage.SelectMany(x => x.ReferencedBy).Where(x => x.Table.Name == "FLD_SalvageTable").SelectMany(x => x.ReferencedBy).Where(x => x.Table.Filename == "common_gmk").Select(x=>x.Gmk);
                 //gmks = tables["ma15a_FLD_NpcPop"].Items.Where(x => x.Id == 15178 || x.Id == 15179 || x.Id == 15180).Select(x=>x.Gmk);
                 Directory.CreateDirectory(options.Output);
-                ExportMap.Export(xb2Fs, gmks.ToList(), $"{options.Output}/{options.Input}");
+                Maps.Export(xb2Fs, gmks.ToList(), $"{options.Output}/{options.Input}");
             }
             else
             {

XbTool/XbTool/Website/Generate.cs

@@ -54,7 +54,7 @@ public static void GenerateBdatHtml(IFileSystem fs, string outDir, IProgressRepo
             }
 
             string gmkDir = Path.Combine(outDir, GmkDir);
-            MapInfo[] gimmicks = ReadGmk.ReadAll(fs, tables, progress);
+            MapInfo[] gimmicks = ReadGmk.ReadAll(fs, tablesStr, progress);
             progress.LogMessage("Writing map info and gimmick data");
             ExportMap.ExportCsv(gimmicks, gmkDir);
         }

XbTool/XbTool/Xb2/GameData/Maps.cs

@@ -82,6 +82,58 @@ public static void Export(IFileSystem fs, MapInfo[] gimmicks, BdatStringItem gim
                 }
             }
         }
+        public static void Export(IFileSystem fs, List<InfoEntry> gmks, string outDir)
+        {
+            //Directory.CreateDirectory(outDir);
+            Dictionary<MapAreaInfo, List<InfoEntry>> gmkDict = new Dictionary<MapAreaInfo, List<InfoEntry>>();
+
+            foreach (var gmk in gmks)
+            {
+                if (gmk == null || gmk.ParentArea == null)
+                    continue;
+                if (!gmkDict.ContainsKey(gmk.ParentArea))
+                    gmkDict[gmk.ParentArea] = new List<InfoEntry> { gmk };
+                else
+                    gmkDict[gmk.ParentArea].Add(gmk);
+            }
+
+
+            foreach (KeyValuePair<MapAreaInfo, List<InfoEntry>> pair in gmkDict)
+            {
+                var gmkList = pair.Value;
+                MapAreaInfo area = pair.Key;
+                MapInfo map = area.ParentMap;
+
+                float scale = 1;
+                string texPath = $"/menu/image/{area.Name}_map.wilay";
+                byte[] texBytes = fs.ReadFile(texPath);
+                var wilay = new WilayRead(texBytes);
+                LahdTexture texture = wilay.Textures[0];
+                Bitmap bitmapBase = texture.ToBitmap();
+                bitmapBase = ResizeImage(bitmapBase, (int)(bitmapBase.Width * scale), (int)(bitmapBase.Height * scale));
+
+                var outerBrush = new SolidBrush(System.Drawing.Color.Black);
+                //var backing = new SolidBrush(System.Drawing.Color.White);
+                var innerBrush = new SolidBrush(System.Drawing.Color.GreenYellow);
+                var pen = new Pen(outerBrush, 1 * scale);
+
+                bitmapBase.RotateFlip(RotateFlipType.Rotate180FlipNone);
+                var bitmap = (Bitmap)bitmapBase.Clone();
+
+                using (Graphics graphics = Graphics.FromImage(bitmap))
+                {
+                    foreach (var gmk in pair.Value)
+                    {
+                        Point2 point = area.Get2DPosition(gmk.Xfrm.Position);
+                        graphics.FillCircle(innerBrush, point.X * scale, point.Y * scale, 8 * scale);
+                        graphics.DrawCircle(pen, point.X * scale, point.Y * scale, 8 * scale);
+                    }
+                }
+                byte[] png = bitmap.ToPng();
+
+                File.WriteAllBytes(outDir + $"{map.DisplayName}-{area.DisplayName}.png", png);
+            }
+        }
         public static Bitmap ResizeImage(Image image, int width, int height)
         {
             var destRect = new Rectangle(0, 0, width, height);

XbTool/XbTool/Xb2/GameData/Quest.cs

@@ -81,7 +81,7 @@ public void OutputQuest(IFileSystem fs, string outDir, IEnumerable<string> scrip
 
                 if (StartGimmick != null)
                 {
-                    ExportMap.Export(fs, new List<InfoEntry> { StartGimmick }, Path.Combine(outDir, $"{QuestName}/Start-"));
+                    Maps.Export(fs, new List<InfoEntry> { StartGimmick }, Path.Combine(outDir, $"{QuestName}/Start-"));
                 }
 
                 int i = 1;
@@ -90,7 +90,7 @@ public void OutputQuest(IFileSystem fs, string outDir, IEnumerable<string> scrip
                     int j = 1;
                     foreach (var gmkSet in task.GetTaskGimmicks())
                     {
-                        ExportMap.Export(fs, gmkSet.Where(x=>x.Gmk != null).Select(x=>x.Gmk).ToList(), Path.Combine(outDir, $"{QuestName}/Task{i}-{j++}-"));
+                        Maps.Export(fs, gmkSet.Where(x=>x.Gmk != null).Select(x=>x.Gmk).ToList(), Path.Combine(outDir, $"{QuestName}/Task{i}-{j++}-"));
                     }
                     i++;
                 }