extract spawn location

SlashNephy · Jun 29, 2024 · d88c704 · d88c704
1 parent 05826db
commit d88c704
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/FaloopIntegration/Faloop/Model/MobReportData.cs b/FaloopIntegration/Faloop/Model/MobReportData.cs
@@ -16,6 +16,7 @@ public record Spawn(
         [property: JsonPropertyName("timestamp")] DateTime Timestamp,
         [property: JsonPropertyName("zoneId2")] string ZoneId,
         [property: JsonPropertyName("zonePoiIds")] List<int>? ZonePoiIds,
+        [property: JsonPropertyName(name: "location")] string? Location,
         [property: JsonPropertyName("reporters")] List<Reporter>? Reporters);
 
     public record Reporter([property: JsonPropertyName("name")] string Name);

diff --git a/FaloopIntegration/Faloop/Model/MockData.cs b/FaloopIntegration/Faloop/Model/MockData.cs
@@ -6,7 +6,7 @@ namespace Divination.FaloopIntegration.Faloop.Model;
 
 public static class MockData
 {
-    private static readonly MobReportData.Spawn Spawn = new(DateTime.UtcNow, "the_dravanian_hinterlands", [643], null);
+    private static readonly MobReportData.Spawn Spawn = new(DateTime.UtcNow, "the_dravanian_hinterlands", [643], null, null);
 
     public static readonly MobReportData SpawnMobReport = new(MobReportActions.Spawn,
         Ids: new(

diff --git a/FaloopIntegration/FaloopIntegration.cs b/FaloopIntegration/FaloopIntegration.cs
@@ -129,9 +129,15 @@ private void OnMobReport(MobReportData data)
                         DalamudLog.Log.Warning("OnMobReport: unknown zone id found: {ZoneId}", spawn.ZoneId);
                         return;
                     }
-                    if (!FaloopEmbedData.Locations.TryGetValue(spawn.ZonePoiIds?.FirstOrDefault() ?? default, out var location))
+
+                    string? location;
+                    if (!string.IsNullOrEmpty(spawn.Location))
+                    {
+                        location = spawn.Location;
+                    }
+                    else if (!FaloopEmbedData.Locations.TryGetValue(spawn.ZonePoiIds?.FirstOrDefault() ?? default, out location))
                     {
-                        DalamudLog.Log.Debug("OnMobReport: unknown zone poi id found: {ZonePoiId}", spawn.ZonePoiIds?.FirstOrDefault() ?? default);
+                        DalamudLog.Log.Debug("OnMobReport: unknown location found: {Spawn}", spawn);
                         if (config.SkipPendingReport)
                         {
                             return;