Merge branch 'master' of https://github.com/ufx/GarlandTools

ufx · Oct 19, 2022 · 0d1fb46 · 0d1fb46
2 parents 5d7892e + 8952c0e
commit 0d1fb46
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/Garland.Data/Modules/Locations.cs b/Garland.Data/Modules/Locations.cs
@@ -182,6 +182,8 @@ void HackApplyTownWeatherRates()
             _builder.Db.AddLocationReference(2956); // Il Mheg
             _builder.Db.AddLocationReference(2957); // The Rak'Tika Greatwood
             _builder.Db.AddLocationReference(2958); // The Tempest
+
+            _builder.Db.AddLocationReference(4043); // Island Sanctuary ( Unnamed Island
         }
 
         static string ConvertPlaceNameName(Game.PlaceName sPlaceName)

diff --git a/Garland.Data/Modules/OtherItemSources.cs b/Garland.Data/Modules/OtherItemSources.cs
@@ -89,7 +89,7 @@ public override void Start()
                     var joinedArgs = string.Join(", ", args);
                     DatabaseBuilder.PrintLine($"Error importing supplemental source '{itemName}' with args '{joinedArgs}': {ex.Message}");
                     //if (System.Diagnostics.Debugger.IsAttached)
-                        //System.Diagnostics.Debugger.Break();
+                    //System.Diagnostics.Debugger.Break();
                 }
             }
         }
@@ -100,7 +100,8 @@ void BuildOther(dynamic item, string[] sources)
             if (item.other != null)
                 throw new InvalidOperationException("item.other already exists.");
 
-            item.other = new JArray(sources);
+            if (sources.Length > 0)
+                item.other = new JArray(sources);
         }
 
         void BuildGardening(dynamic item, string[] sources)

diff --git a/Garland.Web/db/index.html b/Garland.Web/db/index.html
@@ -1528,7 +1528,7 @@ <h2 class="pointer">Aetherial Reduction <span class="right badge">{{=it.reduceTo
                         </div>
                     {{?}}
 
-                    {{?it.other}}
+                    {{?(it.other && !($.isEmptyObject(it.other)))}}
                         <div class="other subsection collapsible collapsed" data-headername="other">
                             <img src="{{=it.other[0].icon}}" class="subsection-icon">
                             <h2 class="pointer">Other <span class="right badge">{{=it.other.length}}</span></h2>

diff --git a/Garland.Web/db/js/gt.js b/Garland.Web/db/js/gt.js
@@ -7606,10 +7606,10 @@ gt.equip = {
         { icon: "images/region/Thanalan.png", name: "Thanalan", page: "Thanalan", zones: [51, 42, 43, 44, 45, 46, 427] },
         { icon: "images/region/Ishgard.png", name: "Ishgard and Surrounds", page: "Ishgard", zones: [62, 63, 2200, 2100, 2101, 2082, 2000, 2001, 2002, 1647] },
         { icon: "images/region/Gyr Abania.png", name: "Gyr Abania", page: "GyrAbania", zones: [2403, 2406, 2407, 2408] },
-        { icon: "images/region/Kugane.png", name: "Far East", page: "FarEast", zones: [513, 2412, 2409, 2410, 2411, 3534, 3662] },
-        { icon: "images/region/Ilsabard.png", name: "Ilsabard", page: "Ilsabard", zones: [3707, 3709, 3710, 2414, 2462, 2530, 2545] },
+        { icon: "images/region/Kugane.png", name: "Far East", page: "FarEast", zones: [513, 2412, 2409, 2410, 2411, 2414, 2462, 2530, 2545] },
+        { icon: "images/region/Ilsabard.png", name: "Ilsabard", page: "Ilsabard", zones: [3707, 3709, 3710, 3534, 3662] },
         { icon: "images/region/Norvrandt.png", name: "Norvrandt", page: "Norvrandt", zones: [516, 517, 2953, 2954, 2955, 2956, 2957, 2958], },
-        { icon: "images/marker/Aetheryte.png", name: "Others", page: "Others", zones: [67, 3706, 3708, 3711, 3712, 3713] }
+        { icon: "images/marker/Aetheryte.png", name: "Others", page: "Others", zones: [67, 3706, 4043, 3708, 3711, 3712, 3713] }
     ],
     weatherUpdateKey: null,
     lWeatherStart: null,

diff --git a/Garland.Web/db/js/gt.skywatcher.js b/Garland.Web/db/js/gt.skywatcher.js
@@ -9,10 +9,10 @@ gt.skywatcher = {
         { icon: "images/region/Thanalan.png", name: "Thanalan", page: "Thanalan", zones: [51, 42, 43, 44, 45, 46, 427] },
         { icon: "images/region/Ishgard.png", name: "Ishgard and Surrounds", page: "Ishgard", zones: [62, 63, 2200, 2100, 2101, 2082, 2000, 2001, 2002, 1647] },
         { icon: "images/region/Gyr Abania.png", name: "Gyr Abania", page: "GyrAbania", zones: [2403, 2406, 2407, 2408] },
-        { icon: "images/region/Kugane.png", name: "Far East", page: "FarEast", zones: [513, 2412, 2409, 2410, 2411, 3534, 3662] },
-        { icon: "images/region/Ilsabard.png", name: "Ilsabard", page: "Ilsabard", zones: [3707, 3709, 3710, 2414, 2462, 2530, 2545] },
+        { icon: "images/region/Kugane.png", name: "Far East", page: "FarEast", zones: [513, 2412, 2409, 2410, 2411, 2414, 2462, 2530, 2545] },
+        { icon: "images/region/Ilsabard.png", name: "Ilsabard", page: "Ilsabard", zones: [3707, 3709, 3710, 3534, 3662] },
         { icon: "images/region/Norvrandt.png", name: "Norvrandt", page: "Norvrandt", zones: [516, 517, 2953, 2954, 2955, 2956, 2957, 2958], },
-        { icon: "images/marker/Aetheryte.png", name: "Others", page: "Others", zones: [67, 3706, 3708, 3711, 3712, 3713] }
+        { icon: "images/marker/Aetheryte.png", name: "Others", page: "Others", zones: [67, 3706, 4043, 3708, 3711, 3712, 3713] }
     ],
     weatherUpdateKey: null,
     lWeatherStart: null,