rename caerleon to black market, replace @black_market per 3003 in ma…

…ils, version
JPCodeCraft · Jan 10, 2025 · 2956780 · 2956780
1 parent 9d950fb
commit 2956780
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/AlbionDataAvalonia.Desktop/pkg/inno.iss b/AlbionDataAvalonia.Desktop/pkg/inno.iss
@@ -2,7 +2,7 @@
 #define MyAppName "Albion Free Market Data Client"
 #define MyAppPublisher "JP Code Craft"
 #define MyAppPublisherURL "https://www.albionfreemarket.com"
-#define MyAppVersion "0.10.0.0"
+#define MyAppVersion "0.10.0.1"
 #define MyAppExeName "AFMDataClient.exe"
 #define MyAppOutputDir "userdocs:Inno Setup Output"
 #define MyAppOutputBaseFilename "AFMDataClientSetup"

diff --git a/AlbionDataAvalonia/AlbionDataAvalonia.csproj b/AlbionDataAvalonia/AlbionDataAvalonia.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>0.10.0.0</Version>
+		<Version>0.10.0.1</Version>
 		<Nullable>enable</Nullable>
 		<LangVersion>latest</LangVersion>
 		<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>

diff --git a/AlbionDataAvalonia/Locations/AlbionLocations.cs b/AlbionDataAvalonia/Locations/AlbionLocations.cs
@@ -36,6 +36,7 @@ public static async Task InitializeAsync()
                 {
                     if (int.TryParse(location.Index, out var id))
                     {
+                        if (location.UniqueName == "Caerleon") location.UniqueName = "Black Market";
                         albionLocations.Add(new AlbionLocation(id, location.UniqueName.Replace(" ", ""), location.UniqueName));
                     }
                 }

diff --git a/AlbionDataAvalonia/Network/Handlers/GetMailInfosResponseHandler.cs b/AlbionDataAvalonia/Network/Handlers/GetMailInfosResponseHandler.cs
@@ -34,6 +34,7 @@ protected override async Task OnActionAsync(GetMailInfosResponse value)
 
         for (int i = 0; i < value.MailIds.Length; i++)
         {
+            if (value.LocationIds[i] == "@BLACK_MARKET") value.LocationIds[i] = "3003";
             var location = AlbionLocations.TryParse(value.LocationIds[i], out var loc) ? loc ?? AlbionLocations.Unknown : AlbionLocations.Unknown;
             var type = Enum.TryParse(typeof(AlbionMailInfoType), value.Types[i], true, out object? parsedType) ? (AlbionMailInfoType)parsedType : AlbionMailInfoType.UNKNOWN;
             AlbionMail mail = new(value.MailIds[i], location.Id, playerState.PlayerName, type, new DateTime(value.Received[i]), playerState.AlbionServer.Id, settingsManager.UserSettings.SalesTax);
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,7 @@ public static async Task InitializeAsync() @@
                     {
                         if (int.TryParse(location.Index, out var id))
                         {
+                            if (location.UniqueName == "Caerleon") location.UniqueName = "Black Market";
                             albionLocations.Add(new AlbionLocation(id, location.UniqueName.Replace(" ", ""), location.UniqueName));
                         }
                     }
@@ Expand Down @@