API13

VariableVixen · VariableVixen · commit 85abcb045a1e · 2025-08-10T15:41:43.000-04:00
diff --git a/WoLua/Lua/Api/GameApi.cs b/WoLua/Lua/Api/GameApi.cs
@@ -124,15 +124,15 @@ public FateWrapper FindFate(string name) {
 	public unsafe bool HasMapFlag {
 		get {
 			AgentMap* map = AgentMap.Instance();
-			return map is not null && map->IsFlagMarkerSet;
+			return map is not null && map->FlagMarkerCount > 0;
 		}
 	}
 
 	[LuaDoc("Clears the player's custom map flag marker, hiding it from display.")]
 	public unsafe void ClearMapFlag() {
 		AgentMap* map = AgentMap.Instance();
 		if (map is not null)
-			map->IsFlagMarkerSet = false;
+			map->FlagMarkerCount = 0;
 	}
 
 	[LuaDoc("Sets the player's custom map flag marker to the given x/y coordinates in the current zone.",
@@ -142,7 +142,7 @@ public unsafe void SetMapFlag(float x, float y) {
 		AgentMap* map = AgentMap.Instance();
 		if (map is null)
 			return;
-		map->IsFlagMarkerSet = false;
+		map->FlagMarkerCount = 0;
 		map->SetFlagMapMarker(map->CurrentTerritoryId, map->CurrentMapId, x, y);
 	}
 
diff --git a/WoLua/Lua/Api/Script/KeysApi.cs b/WoLua/Lua/Api/Script/KeysApi.cs
@@ -1,14 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 
 using MoonSharp.Interpreter;
 
-using VariableVixen.WoLua.Lua;
 using VariableVixen.WoLua.Lua.Docs;
 
-using VariableVixen.WoLua.Lua.Api;
-
 namespace VariableVixen.WoLua.Lua.Api.Script;
 
 [MoonSharpUserData]
diff --git a/WoLua/Lua/Api/ScriptApi.cs b/WoLua/Lua/Api/ScriptApi.cs
@@ -4,10 +4,9 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.ImGuiNotification;
 
-using ImGuiNET;
-
 using MoonSharp.Interpreter;
 using MoonSharp.Interpreter.Serialization.Json;
 
diff --git a/WoLua/Lua/Api/ScriptWindowApi.cs b/WoLua/Lua/Api/ScriptWindowApi.cs
@@ -1,13 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 
-using Dalamud.Interface.Utility;
-
-using ImGuiNET;
-
 using MoonSharp.Interpreter;
 
-using VariableVixen.WoLua.Lua;
-
 namespace VariableVixen.WoLua.Lua.Api;
 
 [MoonSharpUserData]
diff --git a/WoLua/Service.cs b/WoLua/Service.cs
@@ -59,7 +59,7 @@ public Service() {
 		Hooks = new();
 		StatusLine = DtrBar.Get($"{Plugin.Name} status", StatusText.Initialising);
 		StatusLine.Tooltip = StatusText.TooltipInitialising;
-		StatusLine.OnClick = ScriptManager.Rescan;
+		StatusLine.OnClick = (DtrInteractionEvent _) => ScriptManager.Rescan();
 		StatusLine.Shown = true;
 	}
 }
diff --git a/WoLua/Ui/BaseWindow.cs b/WoLua/Ui/BaseWindow.cs
@@ -1,11 +1,10 @@
 using System.Diagnostics;
 using System.Numerics;
 
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.Windowing;
 
-using ImGuiNET;
-
 namespace VariableVixen.WoLua.Ui;
 
 internal abstract class BaseWindow: Window {
@@ -44,7 +43,7 @@ protected BaseWindow(string name, ImGuiWindowFlags flags = ImGuiWindowFlags.None
 
 	protected static void Centred(string text, uint spacing = 1) {
 		float width = ImGui.CalcTextSize(text).X;
-		float offset = ImGui.GetContentRegionAvail().X / 2 - width / 2;
+		float offset = (ImGui.GetContentRegionAvail().X / 2) - (width / 2);
 		ImGui.SetCursorPosX(offset);
 		Textline(text, spacing);
 	}
diff --git a/WoLua/Ui/DebugWindow.cs b/WoLua/Ui/DebugWindow.cs
@@ -3,14 +3,12 @@
 using System.Linq;
 using System.Numerics;
 
+using Dalamud.Bindings.ImGui;
 using Dalamud.Plugin;
 
-using ImGuiNET;
-
 using MoonSharp.Interpreter;
 
 using VariableVixen.WoLua.Lua;
-
 using VariableVixen.WoLua.Lua.Api;
 
 namespace VariableVixen.WoLua.Ui;
@@ -131,7 +129,7 @@ private static void drawScriptList() {
 			ImGui.Spacing();
 
 			if (script.Ready) {
-				ImGui.PushTextWrapPos(Width - ImGui.GetStyle().WindowPadding.X * 2);
+				ImGui.PushTextWrapPos(Width - (ImGui.GetStyle().WindowPadding.X * 2));
 
 				Textline("Globals:", 0);
 				ImGui.Indent();
diff --git a/WoLua/Ui/MainWindow.cs b/WoLua/Ui/MainWindow.cs
@@ -1,7 +1,6 @@
 using System.Diagnostics;
-using System.IO;
 
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 
 using VariableVixen.WoLua.Lua;
 
diff --git a/WoLua/WoLua.csproj b/WoLua/WoLua.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Dalamud.NET.Sdk/12.0.2">
+<Project Sdk="Dalamud.NET.Sdk/13.0.0">
 	<PropertyGroup>
 		<Product>WoLua</Product>
 		<Version>3.8.1</Version>
diff --git a/WoLua/dalamud.props b/WoLua/dalamud.props
@@ -9,45 +9,20 @@
 		<Deterministic>false</Deterministic>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
-		<DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
 	</PropertyGroup>
 
 	<Import Project="framework.props" />
 
-	<ItemGroup>
-		<Reference Include="Newtonsoft.Json">
-			<HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath>
-			<Private>False</Private>
-		</Reference>
-		<Reference Include="Dalamud">
-			<HintPath>$(DalamudLibPath)Dalamud.dll</HintPath>
-			<Private>False</Private>
-		</Reference>
-		<Reference Include="ImGui.NET">
-			<HintPath>$(DalamudLibPath)ImGui.NET.dll</HintPath>
-			<Private>False</Private>
-		</Reference>
+	<!--ItemGroup>
 		<Reference Include="ImGuiScene">
 			<HintPath>$(DalamudLibPath)ImGuiScene.dll</HintPath>
 			<Private>False</Private>
 		</Reference>
-		<Reference Include="Lumina">
-			<HintPath>$(DalamudLibPath)Lumina.dll</HintPath>
-			<Private>False</Private>
-		</Reference>
-		<Reference Include="Lumina.Excel">
-			<HintPath>$(DalamudLibPath)Lumina.Excel.dll</HintPath>
-			<Private>False</Private>
-		</Reference>
-		<Reference Include="FFXIVClientStructs">
-			<HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath>
-			<Private>False</Private>
-		</Reference>
 		<Reference Include="InteropGenerator.Runtime">
 			<HintPath>$(DalamudLibPath)InteropGenerator.Runtime.dll</HintPath>
 			<Private>False</Private>
 		</Reference>
-	</ItemGroup>
+	</ItemGroup-->
 
 	<ItemGroup>
 		<None Remove="dalamud.props" />
diff --git a/WoLua/packages.lock.json b/WoLua/packages.lock.json
@@ -4,9 +4,9 @@
     "net9.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[12.0.0, )",
-        "resolved": "12.0.0",
-        "contentHash": "J5TJLV3f16T/E2H2P17ClWjtfEBPpq3yxvqW46eN36JCm6wR+EaoaYkqG9Rm5sHqs3/nK/vKjWWyvEs/jhKoXw=="
+        "requested": "[13.0.0, )",
+        "resolved": "13.0.0",
+        "contentHash": "Mb3cUDSK/vDPQ8gQIeuCw03EMYrej1B4J44a1AvIJ9C759p9XeqdU9Hg4WgOmlnlPe0G7ILTD32PKSUpkQNa8w=="
       },
       "DotNet.ReproducibleBuilds": {
         "type": "Direct",
@@ -16,9 +16,9 @@
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[9.0.2, )",
-        "resolved": "9.0.2",
-        "contentHash": "+KFnCLVPicEq99ko0tq+ycTvNLXHw0tImmTZjPloB/DOFLPT56KLfk5aS7wbgXRPzYhXTTBYLGaABea5mke77w=="
+        "requested": "[9.0.7, )",
+        "resolved": "9.0.7",
+        "contentHash": "SZ1brSGoLnhLbE8QUZrtN6YwzN2gDT1wbx9qDBEfFFJcstiDTjJ6ygNuTPBV/K7SjGfx2YNbcJi5+ygbPOZpDg=="
       },
       "MoonSharp": {
         "type": "Direct",

Original file line number	Diff line number	Diff line change
`@@ -124,15 +124,15 @@ public FateWrapper FindFate(string name) {`
`124`	`124`	`public unsafe bool HasMapFlag {`
`125`	`125`	`get {`
`126`	`126`	`AgentMap* map = AgentMap.Instance();`
`127`		`- return map is not null && map->IsFlagMarkerSet;`
	`127`	`+ return map is not null && map->FlagMarkerCount > 0;`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`[LuaDoc("Clears the player's custom map flag marker, hiding it from display.")]`
`132`	`132`	`public unsafe void ClearMapFlag() {`
`133`	`133`	`AgentMap* map = AgentMap.Instance();`
`134`	`134`	`if (map is not null)`
`135`		`- map->IsFlagMarkerSet = false;`
	`135`	`+ map->FlagMarkerCount = 0;`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`[LuaDoc("Sets the player's custom map flag marker to the given x/y coordinates in the current zone.",`
`@@ -142,7 +142,7 @@ public unsafe void SetMapFlag(float x, float y) {`
`142`	`142`	`AgentMap* map = AgentMap.Instance();`
`143`	`143`	`if (map is null)`
`144`	`144`	`return;`
`145`		`- map->IsFlagMarkerSet = false;`
	`145`	`+ map->FlagMarkerCount = 0;`
`146`	`146`	`map->SetFlagMapMarker(map->CurrentTerritoryId, map->CurrentMapId, x, y);`
`147`	`147`	`}`
`148`	`148`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public Service() {`
`59`	`59`	`Hooks = new();`
`60`	`60`	`StatusLine = DtrBar.Get($"{Plugin.Name} status", StatusText.Initialising);`
`61`	`61`	`StatusLine.Tooltip = StatusText.TooltipInitialising;`
`62`		`- StatusLine.OnClick = ScriptManager.Rescan;`
	`62`	`+ StatusLine.OnClick = (DtrInteractionEvent _) => ScriptManager.Rescan();`
`63`	`63`	`StatusLine.Shown = true;`
`64`	`64`	`}`
`65`	`65`	`}`