FishParameter extractor fix

ufx · May 29, 2023 · c9d050e · c9d050e
1 parent 1aafacf
commit c9d050e
Show file tree

Hide file tree

Showing 4 changed files with 1,917 additions and 61 deletions.
diff --git a/Garland.Data/Modules/FishingSpots.cs b/Garland.Data/Modules/FishingSpots.cs
@@ -99,6 +99,10 @@ void BuildFish()
         {
             foreach (var sFishParameter in _builder.Sheet<Saint.FishParameter>())
             {
+                var fishNoteInfo = _builder.Sheet("FishingNoteInfo").First(row =>
+                {
+                    return row.Key == sFishParameter.Key;
+                });
                 var guideText = sFishParameter.Text.ToString();
                 if (string.IsNullOrEmpty(guideText))
                     continue;
@@ -108,12 +112,12 @@ void BuildFish()
                 item.fish.guide = guideText;
                 item.fish.icon = GetFishIcon((UInt16)sFishParameter.Item.GetRaw("Icon"));
 
-                /* Broke with 6.4, todo fix this, prob using the new FishingNoteInfo sheet
-                if (sFishParameter.WeatherRestricted)
+
+                if (fishNoteInfo.As<Byte>("WeatherRestriction") > 0)
                     item.fish.weatherRestricted = 1;
-                if (sFishParameter.TimeRestricted)
+                if (fishNoteInfo.As<Byte>("TimeRestriction") > 0)
                     item.fish.timeRestricted = 1;
-                */
+
 
                 var sGatheringSubCategory = (Saint.GatheringSubCategory)sFishParameter["GatheringSubCategory"];
                 if (sGatheringSubCategory != null && sGatheringSubCategory.Key > 0)