Merge pull request NightmareXIV#150 from zbee/HEAD

General `GameHelpers.Content` update

Author: Limiana

ECommons/GameHelpers/Content.cs

@@ -83,7 +83,7 @@ public static class Content
     /// </summary>
     /// <seealso cref="TerritoryHelper.GetTerritoryName" />
     private static string TerritoryNameResult =>
-        TerritoryHelper.GetTerritoryName(TerritoryID);
+        TerritoryHelper.GetTerritoryName(TerritoryID, Language.English);
 
     /// <summary>
     ///     Whether the TerritoryName came out successfully from the builder.
@@ -143,6 +143,12 @@ public static TerritoryIntendedUseEnum? TerritoryIntendedUse
     public static ContentFinderCondition? ContentFinderConditionRow =>
         TerritoryTypeRow?.ContentFinderCondition.ValueNullable;
 
+    /// <summary>
+    ///     The Row ID of the current <see cref="ContentFinderCondition" />.
+    /// </summary>
+    public static uint? ContentFinderConditionRowId =>
+        ContentFinderConditionRow?.RowId;
+
     /// <summary>
     ///     The content name of the current territory the player is in.
     /// </summary>
@@ -252,7 +258,7 @@ public static SheetContentType? ContentTypeRow
     /// <summary>
     ///     The Row ID of the current <see cref="SheetContentType" />.
     /// </summary>
-    private static uint? ContentTypeRowId =>
+    public static uint? ContentTypeRowId =>
         ContentTypeRow?.RowId;
 
     /// <summary>
@@ -327,6 +333,7 @@ _ when
                 (ContentName?.Contains("Delubrum") ?? false) ||
                 (ContentName?.Contains("Lacus") ?? false) ||
                 (ContentName?.Contains("Dalriada") ?? false) ||
+                (ContentName?.Contains("Forked Tower") ?? false) ||
                 MapID is >= 520 and <= 527 =>
                 GameHelpers.ContentType.FieldRaid,
 
@@ -372,6 +379,7 @@ private static ContentDifficulty? DetermineContentDifficulty
                     "Hard" => GameHelpers.ContentDifficulty.Hard,
                     "Extreme" => GameHelpers.ContentDifficulty.Extreme,
                     "Savage" => GameHelpers.ContentDifficulty.Savage,
+                    "Chaotic" => GameHelpers.ContentDifficulty.Chaotic,
                     _ => @default,
                 },
 

ECommons/TerritoryName.cs

@@ -1,4 +1,5 @@
 using ECommons.DalamudServices;
+using Lumina.Data;
 using Lumina.Excel.Sheets;
 using System;
 using System.Collections.Generic;
@@ -9,13 +10,13 @@ public static class TerritoryName
 {
     private static Dictionary<uint, string> Cache = [];
 
-    public static string GetTerritoryName(uint id)
+    public static string GetTerritoryName(uint id, Language? lang = null)
     {
         if(Cache.TryGetValue(id, out var val))
         {
             return val;
         }
-        var data = Svc.Data.GetExcelSheet<TerritoryType>()!.GetRowOrDefault(id);
+        var data = Svc.Data.Excel.GetSheet<TerritoryType>(lang)!.GetRowOrDefault(id);
         if(data != null)
         {
             var zoneName = data.Value.PlaceName.ValueNullable?.Name.ToString() ?? "";