liza/PalacePal
liza/PalacePal
1
0
Fork 0
Code Issues 9 Pull Requests Projects 1 Releases 47 Activity

Destroy splatoon elements when unloading plugin

Browse Source
This commit is contained in:
Liza 2022-10-28 20:31:33 +02:00
parent fd66fcf55e
commit 8ec3e5b5b0
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Pal.Client/Pal.Client.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework> <TargetFramework>net6.0-windows</TargetFramework>
<LangVersion>9.0</LangVersion> <LangVersion>9.0</LangVersion>
<Version>1.7.0.0</Version> <Version>1.8.0.0</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>

20
Pal.Client/Plugin.cs
View File

@ -30,6 +30,8 @@ namespace Pal.Client
{ {
private const long ON_TERRITORY_CHANGE = -2; private const long ON_TERRITORY_CHANGE = -2;
private const uint COLOR_INVISIBLE = 0; private const uint COLOR_INVISIBLE = 0;
private const string SPLATOON_TRAP_HOARD = "PalacePal.TrapHoard";
private const string SPLATOON_REGULAR_COFFERS = "PalacePal.RegularCoffers";
private readonly ConcurrentQueue<(ushort territoryId, bool success, IList<Marker> markers)> _remoteDownloads = new(); private readonly ConcurrentQueue<(ushort territoryId, bool success, IList<Marker> markers)> _remoteDownloads = new();
private readonly static Dictionary<Marker.EType, MarkerConfig> _markerConfig = new Dictionary<Marker.EType, MarkerConfig> private readonly static Dictionary<Marker.EType, MarkerConfig> _markerConfig = new Dictionary<Marker.EType, MarkerConfig>
@ -139,6 +141,16 @@ namespace Pal.Client
Service.WindowSystem.RemoveAllWindows(); Service.WindowSystem.RemoveAllWindows();
Service.RemoteApi.Dispose(); Service.RemoteApi.Dispose();
try
{
Splatoon.RemoveDynamicElements(SPLATOON_TRAP_HOARD);
Splatoon.RemoveDynamicElements(SPLATOON_REGULAR_COFFERS);
}
catch
{
// destroyed on territory change either way
}
ECommons.ECommons.Dispose(); ECommons.ECommons.Dispose();
} }
@ -319,7 +331,7 @@ namespace Pal.Client
if (recreateLayout) if (recreateLayout)
{ {
Splatoon.RemoveDynamicElements("PalacePal.TrapHoard"); Splatoon.RemoveDynamicElements(SPLATOON_TRAP_HOARD);
List<Element> elements = new List<Element>(); List<Element> elements = new List<Element>();
foreach (var marker in currentFloorMarkers) foreach (var marker in currentFloorMarkers)
@ -349,7 +361,7 @@ namespace Pal.Client
{ {
try try
{ {
Splatoon.AddDynamicElements("PalacePal.TrapHoard", elements.ToArray(), new long[] { Environment.TickCount64 + 60 * 60 * 1000, ON_TERRITORY_CHANGE }); Splatoon.AddDynamicElements(SPLATOON_TRAP_HOARD, elements.ToArray(), new long[] { Environment.TickCount64 + 60 * 60 * 1000, ON_TERRITORY_CHANGE });
} }
catch (Exception e) catch (Exception e)
{ {
@ -384,7 +396,7 @@ namespace Pal.Client
if (recreateLayout) if (recreateLayout)
{ {
Splatoon.RemoveDynamicElements("PalacePal.RegularCoffers"); Splatoon.RemoveDynamicElements(SPLATOON_REGULAR_COFFERS);
EphemeralMarkers.Clear(); EphemeralMarkers.Clear();
var config = Service.Configuration; var config = Service.Configuration;
@ -409,7 +421,7 @@ namespace Pal.Client
{ {
try try
{ {
Splatoon.AddDynamicElements("PalacePal.RegularCoffers", elements.ToArray(), new long[] { Environment.TickCount64 + 60 * 60 * 1000, ON_TERRITORY_CHANGE }); Splatoon.AddDynamicElements(SPLATOON_REGULAR_COFFERS, elements.ToArray(), new long[] { Environment.TickCount64 + 60 * 60 * 1000, ON_TERRITORY_CHANGE });
} }
catch (Exception e) catch (Exception e)
{ {