7.1

AutoRetainer.sln

@@ -25,6 +25,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OtterGui", "OtterGui\OtterG
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ECommons.FileWriter", "ECommons.FileWriter\ECommons.FileWriter\ECommons.FileWriter.csproj", "{100B454B-F244-4125-BCD0-FBC78B31DC50}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFXIVClientStructs", "FFXIVClientStructs\FFXIVClientStructs\FFXIVClientStructs.csproj", "{2B58FF81-C498-422F-B71D-AA0B6880C449}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InteropGenerator", "FFXIVClientStructs\InteropGenerator\InteropGenerator.csproj", "{C61DF2C5-A7EA-404B-8812-5771794A9F9A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InteropGenerator.Runtime", "FFXIVClientStructs\InteropGenerator.Runtime\InteropGenerator.Runtime.csproj", "{C55843F5-DC64-4E9D-9D0D-085DD453C7EC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFXIVClientStructs.Generators", "FFXIVClientStructs\FFXIVClientStructs.Generators\FFXIVClientStructs.Generators.csproj", "{808935D9-D13C-49EF-92A4-EBC5A64A8F2A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,6 +105,38 @@ Global
 		{100B454B-F244-4125-BCD0-FBC78B31DC50}.Release|Any CPU.Build.0 = Release|Any CPU
 		{100B454B-F244-4125-BCD0-FBC78B31DC50}.Release|x64.ActiveCfg = Release|Any CPU
 		{100B454B-F244-4125-BCD0-FBC78B31DC50}.Release|x64.Build.0 = Release|Any CPU
+		{2B58FF81-C498-422F-B71D-AA0B6880C449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B58FF81-C498-422F-B71D-AA0B6880C449}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B58FF81-C498-422F-B71D-AA0B6880C449}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2B58FF81-C498-422F-B71D-AA0B6880C449}.Debug|x64.Build.0 = Debug|Any CPU
+		{2B58FF81-C498-422F-B71D-AA0B6880C449}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B58FF81-C498-422F-B71D-AA0B6880C449}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B58FF81-C498-422F-B71D-AA0B6880C449}.Release|x64.ActiveCfg = Release|Any CPU
+		{2B58FF81-C498-422F-B71D-AA0B6880C449}.Release|x64.Build.0 = Release|Any CPU
+		{C61DF2C5-A7EA-404B-8812-5771794A9F9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C61DF2C5-A7EA-404B-8812-5771794A9F9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C61DF2C5-A7EA-404B-8812-5771794A9F9A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C61DF2C5-A7EA-404B-8812-5771794A9F9A}.Debug|x64.Build.0 = Debug|Any CPU
+		{C61DF2C5-A7EA-404B-8812-5771794A9F9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C61DF2C5-A7EA-404B-8812-5771794A9F9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C61DF2C5-A7EA-404B-8812-5771794A9F9A}.Release|x64.ActiveCfg = Release|Any CPU
+		{C61DF2C5-A7EA-404B-8812-5771794A9F9A}.Release|x64.Build.0 = Release|Any CPU
+		{C55843F5-DC64-4E9D-9D0D-085DD453C7EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C55843F5-DC64-4E9D-9D0D-085DD453C7EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C55843F5-DC64-4E9D-9D0D-085DD453C7EC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C55843F5-DC64-4E9D-9D0D-085DD453C7EC}.Debug|x64.Build.0 = Debug|Any CPU
+		{C55843F5-DC64-4E9D-9D0D-085DD453C7EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C55843F5-DC64-4E9D-9D0D-085DD453C7EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C55843F5-DC64-4E9D-9D0D-085DD453C7EC}.Release|x64.ActiveCfg = Release|Any CPU
+		{C55843F5-DC64-4E9D-9D0D-085DD453C7EC}.Release|x64.Build.0 = Release|Any CPU
+		{808935D9-D13C-49EF-92A4-EBC5A64A8F2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{808935D9-D13C-49EF-92A4-EBC5A64A8F2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{808935D9-D13C-49EF-92A4-EBC5A64A8F2A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{808935D9-D13C-49EF-92A4-EBC5A64A8F2A}.Debug|x64.Build.0 = Debug|Any CPU
+		{808935D9-D13C-49EF-92A4-EBC5A64A8F2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{808935D9-D13C-49EF-92A4-EBC5A64A8F2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{808935D9-D13C-49EF-92A4-EBC5A64A8F2A}.Release|x64.ActiveCfg = Release|Any CPU
+		{808935D9-D13C-49EF-92A4-EBC5A64A8F2A}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

AutoRetainer/AutoRetainer.cs

@@ -82,6 +82,13 @@ public AutoRetainer(IDalamudPluginInterface pi)
         {
             P = this;
             ECommonsMain.Init(pi, this, Module.DalamudReflector);
+#if CUSTOMCS
+            PluginLog.Warning($"Using custom FFXIVClientStructs");
+            var gameVersion = DalamudReflector.TryGetDalamudStartInfo(out var ver) ? ver.GameVersion.ToString() : "unknown";
+            InteropGenerator.Runtime.Resolver.GetInstance.Setup(Svc.SigScanner.SearchBase, gameVersion, new(Svc.PluginInterface.ConfigDirectory.FullName + "/cs.json"));
+            FFXIVClientStructs.Interop.Generated.Addresses.Register();
+            InteropGenerator.Runtime.Resolver.GetInstance.Resolve();
+#endif
             PunishLibMain.Init(pi, Name, PunishOption.DefaultKoFi); // Default button
             var cnt = FFXIVInstanceMonitor.GetFFXIVCNT();
             PluginLog.Information($"FFXIV instances: {cnt}");

AutoRetainer/AutoRetainer.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<Authors>Puni.sh</Authors>
-		<Version>4.4.2.0</Version>
+		<Version>4.4.2.4</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -23,6 +23,7 @@
 		<Nullable>disable</Nullable>
 		<NoWarn>CS1591;CS0419</NoWarn>
       <Deterministic>true</Deterministic>
+      <CustomCS>true</CustomCS>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)' == 'Release'">
@@ -48,6 +49,22 @@
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 	</PropertyGroup>
 
+    <ItemGroup Condition="'$(CustomCS)' != 'true'">
+        <Reference Include="FFXIVClientStructs">
+            <HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+    </ItemGroup>
+
+    <PropertyGroup Condition="'$(CustomCS)'=='true'">
+        <DefineConstants>CUSTOMCS</DefineConstants>
+    </PropertyGroup>
+    <ItemGroup Condition="'$(CustomCS)'=='true'">
+        <ProjectReference Include="..\FFXIVClientStructs\FFXIVClientStructs\FFXIVClientStructs.csproj" />
+        <ProjectReference Include="..\FFXIVClientStructs\InteropGenerator.Runtime\InteropGenerator.Runtime.csproj" />
+        <ProjectReference Include="..\FFXIVClientStructs\InteropGenerator\InteropGenerator.csproj" />
+    </ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="DalamudPackager" Version="2.1.13" />
 		<PackageReference Include="NotificationMasterAPI" Version="1.0.0.1" />
@@ -71,10 +88,6 @@
 			<HintPath>$(DalamudLibPath)Lumina.Excel.dll</HintPath>
 			<Private>False</Private>
 		</Reference>
-		<Reference Include="FFXIVClientStructs">
-			<HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath>
-			<Private>False</Private>
-		</Reference>
 		<Reference Include="ImGuiScene">
 			<HintPath>$(DalamudLibPath)ImGuiScene.dll</HintPath>
 			<Private>False</Private>
@@ -83,6 +96,10 @@
 			<HintPath>$(DalamudLibPath)PInvoke.User32.dll</HintPath>
 			<Private>False</Private>
 		</Reference>
+      <Reference Include="Dalamud.Common">
+          <HintPath>$(DalamudLibPath)Dalamud.Common.dll</HintPath>
+          <Private>False</Private>
+      </Reference>
 	</ItemGroup>
 
 	<ItemGroup>

AutoRetainer/Helpers/Censor.cs

@@ -1,4 +1,5 @@
 using Lumina.Misc;
+using System.Xml.Linq;
 
 namespace AutoRetainer.Helpers;
 
@@ -16,6 +17,8 @@ internal static class Censor
 
     internal static string Character(string name, string world)
     {
+        name ??= string.Empty;
+        world ??= string.Empty;
         if(C.NoNames)
         {
             var n1 = Crc32.Get(Seed + name) % Adjectives.Length;
@@ -31,6 +34,7 @@ internal static string Character(string name, string world)
 
     internal static string Character(string name)
     {
+        name ??= string.Empty;
         if(C.NoNames)
         {
             if(name.Contains('@'))
@@ -50,6 +54,7 @@ internal static string Character(string name)
 
     internal static string World(string world)
     {
+        world ??= string.Empty;
         if(C.NoNames)
         {
             var w = Crc32.Get(Seed + world) % Worlds.Length;

AutoRetainer/Helpers/Utils.cs

@@ -537,20 +537,6 @@ internal static string GetAdditionalDataKey(ulong cid, string name, bool create
         return key;
     }
 
-    public static SubmarineExplorationPretty Pretty(this SubmarineExploration row)
-    {
-        return (SubmarineExplorationPretty)row;
-    }
-
-    public static SubmarineExplorationPretty GetPretty(this Lumina.Excel.ExcelSheet<SubmarineExploration> row, uint value)
-    {
-        if(row.TryGetRow(value, out var ret))
-        {
-            return ret;
-        }
-        return null;
-    }
-
     public static string UpperCaseStr(ReadOnlySeString s, sbyte article = 0)
     {
         if(article == 1)
@@ -739,7 +725,7 @@ internal static IGameObject GetEntranceAtLocation(Vector3 pos)
                 if(IsAddonReady(addon))
                 {
                     var textNode = addon->UldManager.NodeList[15]->GetAsAtkTextNode();
-                    var text = MemoryHelper.ReadSeString(&textNode->NodeText).ExtractText();
+                    var text = GenericHelpers.ReadSeString(&textNode->NodeText).ExtractText();
                     if(compare(text))
                     {
                         PluginLog.Verbose($"SelectYesno {text} addon {i} by predicate");
@@ -767,7 +753,7 @@ internal static IGameObject GetEntranceAtLocation(Vector3 pos)
                 if(IsAddonReady(addon))
                 {
                     var textNode = addon->UldManager.NodeList[15]->GetAsAtkTextNode();
-                    var text = MemoryHelper.ReadSeString(&textNode->NodeText).ExtractText().Replace(" ", "").Replace("\n", "");
+                    var text = GenericHelpers.ReadSeString(&textNode->NodeText).ExtractText().Replace(" ", "").Replace("\n", "");
                     if(text.ContainsAny(s.Select(x => x.Replace(" ", "").Replace("\n", ""))))
                     {
                         PluginLog.Verbose($"SelectYesno {s.Print()} addon {i}");

AutoRetainer/Internal/InventoryManagement/NpcSaleManager.cs

@@ -14,6 +14,8 @@ public static unsafe class NpcSaleManager
     internal static List<(uint ID, uint Quantity)> CapturedInventoryState = [];
     public static void EnqueueIfItemsPresent()
     {
+        DuoLog.Error("NpcSaleManager Unsupported");
+        return;
         if(GetValidNPC() == null) return;
         if(!C.IMEnableNpcSell) return;
         foreach(var type in InventorySpaceManager.GetAllowedToSellInventoryTypes())

AutoRetainer/Internal/Memory.cs

@@ -107,6 +107,8 @@ internal void SelectRoutePointUnsafe(int which)
         }
     }
 
+    //48 89 6C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 8B F2 8B E9
+    //let it fail for now
     private delegate void SellItemDelegate(uint a1, InventoryType a2);
     [EzHook("48 89 5C 24 ?? 48 89 6C 24 ?? 56 48 83 EC 20 8B E9", false)]
     private EzHook<SellItemDelegate> SellItemHook;

AutoRetainer/Modules/GcHandin/AutoGCHandin.cs

@@ -111,7 +111,7 @@ private static bool HandleYesno()
         {
             if(addon->YesButton->IsEnabled)
             {
-                var str = MemoryHelper.ReadSeString(&addon->PromptText->NodeText).ExtractText().Replace(" ", "");
+                var str = GenericHelpers.ReadSeString(&addon->PromptText->NodeText).ExtractText().Replace(" ", "");
                 DebugLog($"SelectYesno encountered: {str}");
                 //102434	Do you really want to trade a high-quality item?
                 if(str.Equals(Svc.Data.GetExcelSheet<Lumina.Excel.Sheets.Addon>().GetRow(102434).Text.ExtractText().Replace(" ", "")))
@@ -252,7 +252,7 @@ internal static bool IsSelectedFilterValid(AtkUnitBase* addon)
         var step1 = addon->UldManager.NodeList[14];
         var step2 = step1->GetAsAtkComponentNode()->Component->UldManager.NodeList[1];
         var step3 = step2->GetAsAtkComponentNode()->Component->UldManager.NodeList[2];
-        var text = MemoryHelper.ReadSeString(&step3->GetAsAtkTextNode()->NodeText).ExtractText();
+        var text = GenericHelpers.ReadSeString(&step3->GetAsAtkTextNode()->NodeText).ExtractText();
         //4619	Hide Armoury Chest Items
         //4618	Hide Gear Set Items
         //4617	Show All Items

AutoRetainer/Modules/GcHandin/GCContinuation.cs

@@ -56,7 +56,7 @@ public static void EnqueueDeliveryClose()
     {
         if(TryGetAddonByName<AtkUnitBase>("ShopExchangeCurrencyDialog", out var addon) && IsAddonReady(addon) && TryGetAddonByName<AtkUnitBase>("GrandCompanyExchange", out var gca) && IsAddonReady(gca))
         {
-            var num = MemoryHelper.ReadSeString(&gca->UldManager.NodeList[52]->GetAsAtkTextNode()->NodeText).ExtractText().Replace(" ", "").Replace(",", "").Replace(".", "").ParseInt();
+            var num = GenericHelpers.ReadSeString(&gca->UldManager.NodeList[52]->GetAsAtkTextNode()->NodeText).ExtractText().Replace(" ", "").Replace(",", "").Replace(".", "").ParseInt();
             if(num != null && EzThrottler.Throttle("GC SetMaxVenturesExchange"))
             {
                 var numeric = (AtkComponentNumericInput*)addon->UldManager.NodeList[8]->GetComponent();

AutoRetainer/Modules/Multi/TaskNeoHET.cs

@@ -165,19 +165,24 @@ public static bool CloseFCChest()
 
     public static IGameObject GetHouseEntranceFromMarkers(IEnumerable<uint> markers)
     {
-        var hud = AgentHUD.Instance();
+        var entrance = Svc.Objects.Where(x => x.IsTargetable && x.Name.ToString().EqualsIgnoreCaseAny([.. Lang.Entrance, Lang.ApartmentEntrance])).OrderBy(Player.DistanceTo).FirstOrDefault();
+        PluginLog.Warning($"Temporary HUD bypass is being applied");
+        return entrance;
+        /*var hud = AgentHUD.Instance();
         if(hud->MapMarkers.Where(x => x.IconId.EqualsAny(markers)).OrderBy(x => Player.DistanceTo(new Vector2(x.X, x.Z))).TryGetFirst(out var marker))
         {
             var mpos = new Vector2(marker.X, marker.Z);
             var entrance = Svc.Objects.Where(x => x.IsTargetable && x.Name.ToString().EqualsIgnoreCaseAny([.. Lang.Entrance, Lang.ApartmentEntrance])).OrderBy(x => Vector2.Distance(x.Position.ToVector2(), mpos)).FirstOrDefault(x => Vector2.Distance(mpos, x.Position.ToVector2()) < ValidPlayerToApartmentDistance);
             return entrance;
         }
-        return null;
+        return null;*/
     }
 
     public static bool IsInMarkerHousingPlot(IEnumerable<uint> markers)
     {
         if(HousingManager.Instance()->GetCurrentPlot() < 0) return false;
+        PluginLog.Warning($"Temporary HUD bypass is being applied (2)");
+        return true;
         var hud = AgentHUD.Instance();
         if(hud->MapMarkers.Where(x => x.IconId.EqualsAny(markers)).TryGetFirst(x => Player.DistanceTo(new Vector2(x.X, x.Z)) < ValidPlayerToApartmentDistance, out var marker))
         {

AutoRetainer/Modules/Voyage/VoyageCalculator/Build.cs

@@ -120,11 +120,11 @@ public RouteBuild(Items hull, Items stern, Items bow, Items bridge)
         public int OriginalSub = 0;
 
         public int OptimizedDistance = 0;
-        public List<SubmarineExplorationPretty> OptimizedRoute = [];
+        public List<SubmarineExploration> OptimizedRoute = [];
         public SubmarineBuild GetSubmarineBuild => new(this);
         public static RouteBuild Empty => new();
 
-        public int FuelCost => OptimizedRoute.Any() ? OptimizedRoute.Select(p => (int)p.Row.CeruleumTankReq).Sum() : 0;
+        public int FuelCost => OptimizedRoute.Any() ? OptimizedRoute.Select(p => (int)p.CeruleumTankReq).Sum() : 0;
 
         public string HullIdentifier => ToIdentifier((ushort)Hull);
         public string SternIdentifier => ToIdentifier((ushort)Stern);
@@ -151,7 +151,7 @@ public void ChangeMap(int newMap)
             OptimizedRoute = [];
         }
 
-        public void UpdateOptimized((int Distance, List<SubmarineExplorationPretty> Points) optimized)
+        public void UpdateOptimized((int Distance, List<SubmarineExploration> Points) optimized)
         {
             OptimizedDistance = optimized.Distance;
             OptimizedRoute = optimized.Points;
@@ -187,7 +187,7 @@ public int VoyageDamage()
             {
                 var damaged = 0;
                 foreach(var sector in OptimizedRoute)
-                    damaged += (335 + sector.Row.RankReq - PartSheet.GetRow((uint)part)!.Rank) * 7;
+                    damaged += (335 + sector.RankReq - PartSheet.GetRow((uint)part)!.Rank) * 7;
 
                 if(highestDamage < damaged)
                     highestDamage = damaged;

AutoRetainer/Modules/Voyage/VoyageCalculator/CurrentSubmarine.cs

@@ -57,7 +57,7 @@ public static void GetBestExps()
                 var best = calc.FindBestPath(x);
                 if(best != null)
                 {
-                    DuoLog.Information($"Map {x}: {best.Value.path.Select(z => $"{z}/{Svc.Data.GetExcelSheet<SubmarineExploration>().GetPretty(z).Row.Location}").Print()}, {best.Value.duration}, {best.Value.exp} / ");
+                    DuoLog.Information($"Map {x}: {best.Value.path.Select(z => $"{z}/{Svc.Data.GetExcelSheet<SubmarineExploration>().GetRowOrDefault(z)?.Location}").Print()}, {best.Value.duration}, {best.Value.exp} / ");
                 }
             }
             VoyageMain.WaitOverlay.IsProcessing = false;

AutoRetainer/Modules/Voyage/VoyageCalculator/SubmarineExplorationPretty.cs

@@ -7,38 +7,32 @@
 
 namespace AutoRetainer.Modules.Voyage.VoyageCalculator;
 
-public class SubmarineExplorationPretty
+public static class SubmarineSheetUtils
 {
-    public Vector3 Position { get; private set; }
-    public SubmarineExploration Row { get; private set; }
-
-    public SubmarineExplorationPretty(SubmarineExploration sheet)
+    public static Vector3 Position(this SubmarineExploration Row)
     {
-        sheet = Row;
-        Position = new Vector3(sheet.X, sheet.Y, sheet.Z);
+        return new(Row.X, Row.Y, Row.Z);
     }
-
-    public static implicit operator SubmarineExplorationPretty(SubmarineExploration sheet) => new(sheet);
 
-    public uint GetSurveyTime(float speed)
+    public static uint GetSurveyTime(this SubmarineExploration Row, float speed)
     {
         if(speed < 1)
             speed = 1;
         return (uint)Math.Floor(Row.SurveyDurationmin * 7000 / (speed * 100) * 60);
     }
 
-    public uint GetVoyageTime(SubmarineExploration other, float speed)
+    public static uint GetVoyageTime(this SubmarineExploration Row, SubmarineExploration other, float speed)
     {
         if(speed < 1)
             speed = 1;
-        return (uint)Math.Floor(Vector3.Distance(Position, ((SubmarineExplorationPretty)other).Position) * 3990 / (speed * 100) * 60);
+        return (uint)Math.Floor(Vector3.Distance(Row.Position(), other.Position()) * 3990 / (speed * 100) * 60);
     }
 
-    public uint GetDistance(SubmarineExploration other)
+    public static uint GetDistance(this SubmarineExploration Row, SubmarineExploration other)
     {
-        return (uint)Math.Floor(Vector3.Distance(Position, ((SubmarineExplorationPretty)other).Position) * 0.035);
+        return (uint)Math.Floor(Vector3.Distance(Row.Position(), other.Position()) * 0.035);
     }
 
-    public string ConvertDestination() => Utils.UpperCaseStr(Row.Destination);
-    public string FancyDestination() => $"[{Svc.Data.GetExcelSheet<SubmarineExploration>(ClientLanguage.Japanese).GetRow(Row.RowId).Location}] " + Utils.UpperCaseStr(Row.Destination);
+    public static string ConvertDestination(this SubmarineExploration Row) => Utils.UpperCaseStr(Row.Destination);
+    public static string FancyDestination(this SubmarineExploration Row) => $"[{Svc.Data.GetExcelSheet<SubmarineExploration>(ClientLanguage.Japanese).GetRow(Row.RowId).Location}] " + Utils.UpperCaseStr(Row.Destination);
 }

AutoRetainer/Modules/Voyage/VoyageCalculator/Voyage.cs

@@ -201,17 +201,17 @@ public static (uint Distance, List<SubmarineExploration> Points) PathWalker((Sub
 
     public static uint BestDistance(SubmarineExploration pointA, SubmarineExploration pointB)
     {
-        return pointA.Pretty().GetDistance(pointB);
+        return pointA.GetDistance(pointB);
     }
 
     public static uint VoyageTime(SubmarineExploration pointA, SubmarineExploration pointB, short speed)
     {
-        return pointA.Pretty().GetVoyageTime(pointB, speed);
+        return pointA.GetVoyageTime(pointB, speed);
     }
 
     public static uint SurveyTime(SubmarineExploration point, short speed)
     {
-        return point.Pretty().GetSurveyTime(speed);
+        return point.GetSurveyTime(speed);
     }
     #endregion
 }