Use localized region name in additional display strings

Interkarma · Nov 24, 2022 · 27d2f92 · 27d2f92
1 parent dec7d3b
commit 27d2f92
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/Assets/Scripts/Game/TalkManager.cs b/Assets/Scripts/Game/TalkManager.cs
@@ -2759,7 +2759,12 @@ private void GetBuildingList()
                         {
                             BuildingInfo item;
                             item.buildingType = buildingSummary.BuildingType;
-                            item.name = BuildingNames.GetName(buildingSummary.NameSeed, buildingSummary.BuildingType, buildingSummary.FactionId, location.Name, location.RegionName);
+                            item.name = BuildingNames.GetName(
+                                buildingSummary.NameSeed,
+                                buildingSummary.BuildingType,
+                                buildingSummary.FactionId,
+                                location.Name,
+                                DaggerfallUnity.Instance.TextProvider.GetLocalizedRegionName(location.RegionIndex));
                             item.buildingKey = buildingSummary.buildingKey;
                             // Compute building position in map coordinate system
                             float xPosBuilding = blockLayout[index].rect.xpos + (int)(buildingSummary.Position.x / (BlocksFile.RMBDimension * MeshReader.GlobalScale) * ExteriorAutomap.blockSizeWidth) - GameManager.Instance.ExteriorAutomap.LocationWidth * ExteriorAutomap.blockSizeWidth * 0.5f;

diff --git a/Assets/Scripts/Internal/PlayerGPS.cs b/Assets/Scripts/Internal/PlayerGPS.cs
@@ -1220,7 +1220,7 @@ bool GetBaseBuildingDiscoveryData(int buildingKey, out DiscoveredBuilding buildi
                     buildingSummary.BuildingType,
                     buildingSummary.FactionId,
                     buildingDirectory.LocationData.Name,
-                    buildingDirectory.LocationData.RegionName);
+                    DaggerfallUnity.Instance.TextProvider.GetLocalizedRegionName(buildingDirectory.LocationData.RegionIndex));
             }
             buildingDiscoveryData.factionID = buildingSummary.FactionId;
             buildingDiscoveryData.quality = buildingSummary.Quality;

diff --git a/Assets/Scripts/Utility/MacroHelper.cs b/Assets/Scripts/Utility/MacroHelper.cs
@@ -838,7 +838,12 @@ private static string CurrentBuilding(IMacroContextProvider mcp)
             DFLocation.BuildingData buildingData = buildingInterior.BuildingData;
             PlayerGPS gps = GameManager.Instance.PlayerGPS;
             DFLocation location = gps.CurrentLocation;
-            return BuildingNames.GetName(buildingData.NameSeed, buildingData.BuildingType, buildingData.FactionId, location.Name, location.RegionName);
+            return BuildingNames.GetName(
+                buildingData.NameSeed,
+                buildingData.BuildingType,
+                buildingData.FactionId,
+                location.Name,
+                DaggerfallUnity.Instance.TextProvider.GetLocalizedRegionName(location.RegionIndex));
         }
 
         private static string PlayerPronoun(IMacroContextProvider mcp)