From 961048f8285fcd84dab75e05777c6f9f73f0c6b4 Mon Sep 17 00:00:00 2001
From: CarnifexOptimus <156172553+CarnifexOptimus@users.noreply.github.com>
Date: Fri, 14 Feb 2025 11:03:04 +0100
Subject: [PATCH] fixed obstacle maps and traps
---
BossMod/BossModReborn.csproj | 9 +-
.../Modules/Global/DeepDungeon/AutoClear.cs | 82 ++++++++++++------
BossMod/Modules/Global/DeepDungeon/Config.cs | 2 +-
.../Global/DeepDungeon/DDTrapsData.sqlite3 | Bin 0 -> 552960 bytes
BossMod/Pathfinding/ObstacleMapManager.cs | 4 +-
BossMod/System.Data.SQLite.dll | Bin 0 -> 446136 bytes
6 files changed, 66 insertions(+), 31 deletions(-)
create mode 100644 BossMod/Modules/Global/DeepDungeon/DDTrapsData.sqlite3
create mode 100644 BossMod/System.Data.SQLite.dll
diff --git a/BossMod/BossModReborn.csproj b/BossMod/BossModReborn.csproj
index 041817aa5d..798c4e155d 100644
--- a/BossMod/BossModReborn.csproj
+++ b/BossMod/BossModReborn.csproj
@@ -105,9 +105,16 @@
PreserveNewest
+
-
+
+
+
+
+ PreserveNewest
+
+
diff --git a/BossMod/Modules/Global/DeepDungeon/AutoClear.cs b/BossMod/Modules/Global/DeepDungeon/AutoClear.cs
index 9542bee46e..9c8af37a52 100644
--- a/BossMod/Modules/Global/DeepDungeon/AutoClear.cs
+++ b/BossMod/Modules/Global/DeepDungeon/AutoClear.cs
@@ -129,7 +129,7 @@ protected AutoClear(WorldState ws, int LevelCap) : base(ws)
})
);
- _trapsCurrentZone = PalacePalInterop.GetTrapLocationsForZone(ws.CurrentZone);
+ _trapsCurrentZone = DDTrapsData.GetTrapLocationsForZone(ws.CurrentZone);
LoadedFloors = JsonSerializer.Deserialize>>(GetEmbeddedResource("Walls.json"))!;
ProblematicTrapLocations = JsonSerializer.Deserialize>(GetEmbeddedResource("BadTraps.json"))!;
@@ -142,6 +142,7 @@ protected override void Dispose(bool disposing)
_subscriptions.Dispose();
_obstacles.Dispose();
base.Dispose(disposing);
+ DDTrapsData.CleanupTemporaryDatabase();
}
protected virtual void OnCastStarted(Actor actor) { }
@@ -830,45 +831,72 @@ private static bool IsBlocked(Bitmap map, Vector2 point, Vector2 origin, float m
return false;
}
- private Stream GetEmbeddedResource(string name) => Assembly.GetExecutingAssembly().GetManifestResourceStream($"BossMod.Modules.Global.DeepDungeon.{name}") ?? throw new InvalidDataException($"Missing embedded resource {name}");
+ private Stream GetEmbeddedResource(string name) => Assembly.GetExecutingAssembly().GetManifestResourceStream($"BossModReborn.Modules.Global.DeepDungeon.{name}") ?? throw new InvalidDataException($"Missing embedded resource {name}");
}
-static class PalacePalInterop
+static class DDTrapsData
{
- // TODO make an IPC for this? wouldn't work in uidev
- private static readonly string PalacePalDbFile = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "XIVLauncher", "pluginConfigs", "PalacePal", "palace-pal.data.sqlite3");
+ private const string EmbeddedDbResourceName = "BossModReborn.Modules.Global.DeepDungeon.DDTrapsData.sqlite3";
+ private static string? _tempDbFilePath;
- public static List GetTrapLocationsForZone(uint zone)
+ private static string GetTempDbFilePath()
{
- List locations = [];
+ if (_tempDbFilePath != null)
+ {
+ return _tempDbFilePath;
+ }
+
+ var tempFileName = Path.GetTempFileName() + ".sqlite3";
+ _tempDbFilePath = tempFileName;
- try
+ using (var resourceStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(EmbeddedDbResourceName))
{
- using (var connection = new SQLiteConnection($"Data Source={PalacePalDbFile}"))
+ if (resourceStream == null)
{
- connection.Open();
+ throw new FileNotFoundException($"Embedded resource '{EmbeddedDbResourceName}' not found.");
+ }
- var command = connection.CreateCommand();
- command.CommandText = @"
- select X,Z from Locations where Type = 1 and TerritoryType = $tt
- ";
- command.Parameters.AddWithValue("$tt", zone);
+ using var fileStream = new FileStream(tempFileName, FileMode.Create, FileAccess.Write);
+ resourceStream.CopyTo(fileStream);
+ }
+ return tempFileName;
+ }
- using var reader = command.ExecuteReader();
- while (reader.Read())
- {
- var x = reader.GetFloat(0);
- var z = reader.GetFloat(1);
- locations.Add(new(x, z));
- }
- }
+ public static List GetTrapLocationsForZone(uint zone)
+ {
+ List locations = [];
+ var tempDbPath = GetTempDbFilePath();
+ using (var connection = new SQLiteConnection($"Data Source={tempDbPath};Version=3;Read Only=True;"))
+ {
+ connection.Open();
- return locations;
+ var command = connection.CreateCommand();
+ command.CommandText = @"select X,Z from Locations where Type = 1 and TerritoryType = $tt";
+ command.Parameters.AddWithValue("$tt", zone);
+
+ using var reader = command.ExecuteReader();
+ while (reader.Read())
+ {
+ var x = reader.GetFloat(0);
+ var z = reader.GetFloat(1);
+ locations.Add(new(x, z));
+ }
}
- catch (SQLiteException e)
+ return locations;
+ }
+
+ public static void CleanupTemporaryDatabase()
+ {
+ if (_tempDbFilePath != null)
{
- Service.Log($"unable to load traps for zone ${zone}: ${e}");
- return [];
+ var baseTempPath = Path.GetFileNameWithoutExtension(_tempDbFilePath);
+ var tempDirPath = Path.GetDirectoryName(_tempDbFilePath) ?? "";
+
+ string[] extensions = [".sqlite3", ".sqlite3-shm", ".sqlite3-wal", ""];
+
+ for (var i = 0; i < 4; ++i)
+ File.Delete(Path.Combine(tempDirPath, baseTempPath + extensions[i]));
}
+ _tempDbFilePath = null;
}
}
diff --git a/BossMod/Modules/Global/DeepDungeon/Config.cs b/BossMod/Modules/Global/DeepDungeon/Config.cs
index e126593501..75993cf946 100644
--- a/BossMod/Modules/Global/DeepDungeon/Config.cs
+++ b/BossMod/Modules/Global/DeepDungeon/Config.cs
@@ -19,7 +19,7 @@ public enum ClearBehavior
public bool Enable = true;
[PropertyDisplay("Enable minimap")]
public bool EnableMinimap = true;
- [PropertyDisplay("Try to avoid traps", tooltip: "Avoid known trap locations sourced from PalacePal data. (Traps revealed by a Pomander of Sight will always be avoided regardless of this setting.)")]
+ [PropertyDisplay("Try to avoid traps", tooltip: "Avoid known trap locations sourced from PalacePal data. Does not need PalacePal installed since data is embedded into BMR. (Traps revealed by a Pomander of Sight will always be avoided regardless of this setting.)")]
public bool TrapHints = true;
[PropertyDisplay("Automatically navigate to Cairn of Passage")]
public bool AutoPassage = true;
diff --git a/BossMod/Modules/Global/DeepDungeon/DDTrapsData.sqlite3 b/BossMod/Modules/Global/DeepDungeon/DDTrapsData.sqlite3
new file mode 100644
index 0000000000000000000000000000000000000000..7f684d16c022ef30da14a68cf896a723ac112c1b
GIT binary patch
literal 552960
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