weee

.github/workflows/release.yml

@@ -5,11 +5,11 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-# Only run this workflow when a tag is pushed when the tag starts with "v".
+# Only run this workflow when a tag is pushed when the tag starts with "v0.2.".
 on:
   push:
     tags:
-      - 'v*'
+      - 'v0.2.*'
 
 # So we can use the GitHub API to create releases with the run token.
 permissions:
@@ -35,11 +35,11 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 10.0.x
 
       - name: Download Dalamud Library
         run: |
-          wget https://goatcorp.github.io/dalamud-distrib/latest.zip -O /tmp/dalamud.zip
+          wget https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -O /tmp/dalamud.zip
           unzip /tmp/dalamud.zip -d /tmp/dalamud
 
       - name: Restore Dependencies
@@ -66,7 +66,7 @@ jobs:
           fail_on_unmatched_files: true # If the files arent found, fail the workflow and abort the release.
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Release Artifacts
           path: |
@@ -82,9 +82,7 @@ jobs:
 
           sed -i repo.json -E \
               -e 's#"AssemblyVersion": "([0-9]*\.){2,3}[0-9]*"#"AssemblyVersion": "'"$release_version"'"#g' \
-              -e 's#"TestingAssemblyVersion": "([0-9]*\.){2,3}[0-9]*"#"TestingAssemblyVersion": "'"$release_version"'"#' \
               -e 's#"DownloadLinkInstall": "[^"]*"#"DownloadLinkInstall": "'"$repo_url/releases/download/${{ github.ref_name }}/latest.zip"'"#g' \
-              -e 's#"DownloadLinkTesting": "[^"]*"#"DownloadLinkTesting": "'"$repo_url/releases/download/${{ github.ref_name }}/latest.zip"'"#g' \
               -e 's#"DownloadLinkUpdate": "[^"]*"#"DownloadLinkUpdate": "'"$repo_url/releases/download/${{ github.ref_name }}/latest.zip"'"#g'
 
           git add repo.json

.github/workflows/test.yml

@@ -23,9 +23,10 @@ jobs:
         working-directory: Ktisis/
         shell: bash
     strategy:
+      fail-fast: false
       matrix:
-        dotnet-version: [7.0.x] # Can add multiple .NET versions here to test against (For example, testing a new version of .NET before it's released)
-        dalamud-version: ["latest"] # Can add multiple Dalamud branches here to test against (For example, testing against Dalamud staging)
+        dotnet-version: [10.0.x] # Can add multiple .NET versions here to test against (For example, testing a new version of .NET before it's released)
+        dalamud-version: [""] # Can add multiple Dalamud branches here to test against - empty string means live latest.
     env:
       DALAMUD_HOME: /tmp/dalamud
       IsCI: true
@@ -43,7 +44,8 @@ jobs:
 
       - name: Download Dalamud Library
         run: |
-          wget https://goatcorp.github.io/dalamud-distrib/${{ matrix.dalamud-version }}.zip -O /tmp/dalamud.zip
+          dalamud_version="${{ matrix.dalamud-version }}"
+          wget https://goatcorp.github.io/dalamud-distrib/${dalamud_version}${dalamud_version:+/}latest.zip -O /tmp/dalamud.zip
           unzip /tmp/dalamud.zip -d /tmp/dalamud
 
       - name: Restore Dependencies
@@ -56,7 +58,7 @@ jobs:
         run: dotnet build -c Release --no-restore --nologo
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Build Artifacts
           path: Ktisis/bin/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "GLib"]
+	path = GLib
+	url = git@github.com:ktisis-tools/GLib.git

Ktisis.sln

@@ -9,6 +9,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GLib", "GLib\GLib\GLib.csproj", "{2267C775-9220-4EF5-B146-4FBC5B7499D8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -22,6 +24,12 @@ Global
 		{13C812E9-0D42-4B95-8646-40EEBF30636F}.Release|x64.Build.0 = Release|x64
 		{13C812E9-0D42-4B95-8646-40EEBF30636F}.External|x64.ActiveCfg = External|x64
 		{13C812E9-0D42-4B95-8646-40EEBF30636F}.External|x64.Build.0 = External|x64
+		{2267C775-9220-4EF5-B146-4FBC5B7499D8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2267C775-9220-4EF5-B146-4FBC5B7499D8}.Debug|x64.Build.0 = Debug|Any CPU
+		{2267C775-9220-4EF5-B146-4FBC5B7499D8}.Release|x64.ActiveCfg = Release|Any CPU
+		{2267C775-9220-4EF5-B146-4FBC5B7499D8}.Release|x64.Build.0 = Release|Any CPU
+		{2267C775-9220-4EF5-B146-4FBC5B7499D8}.External|x64.ActiveCfg = Debug|Any CPU
+		{2267C775-9220-4EF5-B146-4FBC5B7499D8}.External|x64.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Ktisis/Camera/CameraService.cs

@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
-using Dalamud.Logging;
 using Dalamud.Game.ClientState.Objects.Types;
 
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
@@ -29,7 +28,7 @@ internal static class CameraService {
 
 			var camera = GetCameraByAddress((nint)active);
 			if (camera == null && Override != null) {
-				PluginLog.Warning("Lost track of active camera! Attempting to reset.");
+				Ktisis.Log.Warning("Lost track of active camera! Attempting to reset.");
 				Reset();
 				camera = GetCameraByAddress((nint)Services.Camera->Camera);
 			}
@@ -83,7 +82,7 @@ internal unsafe static void RemoveCamera(KtisisCamera cam) {
 			return pos;
 		}
 
-		internal static GameObject? GetTargetLock(nint addr) {
+		internal static IGameObject? GetTargetLock(nint addr) {
 			if (!Ktisis.IsInGPose || GetCameraByAddress(addr) is not KtisisCamera camera)
 				return null;
 
@@ -133,6 +132,7 @@ private static void CheckFreecam(KtisisCamera? other = null) {
 		// CameraManager wrappers
 
 		internal unsafe static void Reset() {
+			Ktisis.Log.Debug("Resetting camera");
 			CheckFreecam();
 			Override = null;
 			SetCamera(Services.Camera->Camera);
@@ -141,12 +141,14 @@ internal unsafe static void Reset() {
 		private unsafe static void SetCamera(GameCamera* camera) {
 			if (camera == null) return;
 			var mgr = CameraManager.Instance();
-			mgr->CameraArraySpan[0] = &camera->CameraBase.SceneCamera;
+			mgr->Cameras[0] = &camera->CameraBase.SceneCamera;
 		}
 
 		// Overrides
 
 		internal unsafe static void SetOverride(KtisisCamera camera) {
+			Ktisis.Log.Debug($"Setting camera to {camera.Name}");
+
 			CheckFreecam(camera);
 
 			if (camera.IsNative || !camera.IsValid()) {
@@ -164,6 +166,21 @@ internal static void Init() {
 			CameraHooks.Init();
 			EventManager.OnGPoseChange += OnGPoseChange;
 		}
+
+		internal static void ChangeCameraIndex(int offset) {
+			var camera = GetActiveCamera();
+			if (camera == null) 
+				return;
+
+			if (GetFreecam() == camera)
+				return;
+
+			var newIndex = (Cameras.FindIndex(tofind => tofind == camera) + offset) % Cameras.Count;
+			if (newIndex < 0) // loop back to start.
+				newIndex = Cameras.Count - 1; 
+
+			SetOverride(Cameras[newIndex]);
+		}
 
 		internal static void Dispose() {
 			EventManager.OnGPoseChange -= OnGPoseChange;
@@ -182,6 +199,9 @@ private unsafe static void OnGPoseChange(bool state) {
 				var active = (GPoseCamera*)Services.Camera->GetActiveCamera();
 				if (active != null) {
 					active->DistanceMax = 20;
+					active->DistanceMin = 1.5f;
+					active->YMax = -1.5f;
+					active->YMin = 1.5f;
 					active->Distance = Math.Clamp(active->Distance, 0, 20);
 				}
 			}
@@ -199,12 +219,12 @@ private unsafe static void PrepareCameraList() {
 		}
 
 		private unsafe static void DisposeCameras() {
-			PluginLog.Debug("Disposing cameras...");
+			Ktisis.Log.Debug("Disposing cameras...");
 			if (Override != null)
 				Reset();
 			foreach (var cam in Cameras)
 				cam.Dispose();
 			Cameras.Clear();
 		}
 	}
-}
+}

Ktisis/Camera/KtisisCamera.cs

@@ -72,7 +72,7 @@ public unsafe static KtisisCamera Spawn(GameCamera* clone = null) {
 		public void SetPositionLock(Vector3? pos) => CameraEdit.Position = pos;
 		public void SetOffset(Vector3? off) => CameraEdit.Offset = off;
 
-		internal GameObject? GetOrbitTarget() {
+		internal IGameObject? GetOrbitTarget() {
 			if (!Ktisis.IsInGPose) return null;
 			return CameraEdit.Orbit != null ? Services.ObjectTable.FirstOrDefault(
 				actor => actor.ObjectIndex == CameraEdit.Orbit

Ktisis/Camera/WorkCamera.cs

@@ -5,6 +5,7 @@
 using SceneCamera = FFXIVClientStructs.FFXIV.Client.Graphics.Scene.Camera;
 
 using Ktisis.Helpers;
+using Ktisis.Interface;
 using Ktisis.Structs.Input;
 
 namespace Ktisis.Camera {
@@ -60,7 +61,7 @@ internal unsafe void UpdateControl(MouseState* mouseState, KeyboardState* keySta
 			}
 
 			MoveSpeed = DefaultSpeed;
-			if (keyState != null) {
+			if (keyState != null && !Input.IsChatInputActive()) {
 				if (Ktisis.Configuration.FreecamFast.IsActive(keyState))
 					MoveSpeed *= Ktisis.Configuration.FreecamShiftMuli;
 				else if (Ktisis.Configuration.FreecamSlow.IsActive(keyState))

Ktisis/Configuration.cs

@@ -2,12 +2,13 @@
 using System.Linq;
 using System.Numerics;
 using System.Collections.Generic;
-
-using ImGuizmoNET;
+using System.IO;
 
 using Dalamud;
 using Dalamud.Configuration;
+using Dalamud.Game;
 using Dalamud.Game.ClientState.Keys;
+using Dalamud.Bindings.ImGuizmo;
 
 using Ktisis.Interface;
 using Ktisis.Localization;
@@ -65,6 +66,14 @@ public class Configuration : IPluginConfiguration {
 		public float SkeletonLineOpacityWhileUsing { get; set; } = 0.15F;
 		public float SkeletonDotRadius { get; set; } = 3.0F;
 
+		//AutoSave
+		public bool EnableAutoSave { get; set; } = false;
+		public int AutoSaveInterval { get; set; } = 60;
+		public int AutoSaveCount { get; set; } = 5;
+		public string AutoSavePath { get; set; } = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Ktisis", "PoseAutoBackup");
+		public string AutoSaveFormat { get; set; } = "AutoSave - %Date% %Time%";
+		public bool ClearAutoSavesOnExit { get; set; } = false;
+
 		// References
 		// The reference Key creates a uniqueness constraint for imgui window IDs for each reference.
 		public Dictionary<int, ReferenceInfo> References { get; set; } = new();
@@ -108,8 +117,8 @@ public bool IsBoneCategoryVisible(Category category) {
 
 		// Gizmo
 
-		public MODE GizmoMode { get; set; } = MODE.LOCAL;
-		public OPERATION GizmoOp { get; set; } = OPERATION.ROTATE;
+		public ImGuizmoMode GizmoMode { get; set; } = ImGuizmoMode.Local;
+		public ImGuizmoOperation GizmoOp { get; set; } = ImGuizmoOperation.Rotate;
 
 		public SiblingLink SiblingLink { get; set; } = SiblingLink.None;
 
@@ -138,15 +147,15 @@ public bool IsBoneCategoryVisible(Category category) {
 		public bool EnableParenting { get; set; } = true;
 
 		public bool LinkedGaze { get; set; } = true;
-		
+
 		public bool ShowToolbar { get; set; } = false;
 
 		public Dictionary<string, string> SavedDirPaths { get; set; } = new();
-		
+
 		// Camera
 
 		public float FreecamMoveSpeed { get; set; } = 0.1f;
-		
+
 		public float FreecamShiftMuli { get; set; } = 2.5f;
 		public float FreecamCtrlMuli { get; set; } = 0.25f;
 		public float FreecamUpDownMuli { get; set; } = 1f;
@@ -159,7 +168,7 @@ public bool IsBoneCategoryVisible(Category category) {
 		public Keybind FreecamRight { get; set; } = new(VirtualKey.D);
 		public Keybind FreecamUp { get; set; } = new(VirtualKey.SPACE);
 		public Keybind FreecamDown { get; set; } = new(VirtualKey.Q);
-		
+
 		public Keybind FreecamFast { get; set; } = new(VirtualKey.SHIFT);
 		public Keybind FreecamSlow { get; set; } = new(VirtualKey.CONTROL);
 

Ktisis/Data/Excel/BattleNpc.cs

@@ -0,0 +1,67 @@
+using Lumina.Excel;
+using Lumina.Excel.Sheets;
+
+using Ktisis.Data.Npc;
+using Ktisis.Structs.Actor;
+using Ktisis.Structs.Extensions;
+using Lumina.Text.ReadOnly;
+
+namespace Ktisis.Data.Excel {
+	[Sheet("BNpcBase", columnHash: 0xD5D82616)]
+	public struct BattleNpc(ExcelPage page, uint offset, uint row) : IExcelRow<BattleNpc>, INpcBase {
+		// Excel
+		public ExcelPage ExcelPage => page;
+		public uint RowOffset => offset;
+		public uint RowId => row;
+
+		public float Scale { get; set; }
+		public RowRef<ModelChara> ModelChara { get; set; }
+		private RowRef<BNpcCustomizeSheet> CustomizeSheet { get; set; }
+		private RowRef<NpcEquipment> NpcEquipment { get; set; }
+
+		public static BattleNpc Create(ExcelPage page, uint offset, uint row) {
+			return new BattleNpc(page, offset, row) {
+				Scale = page.ReadColumn<float>(4, offset),
+				ModelChara = page.ReadRowRef<ModelChara>(5, offset),
+				CustomizeSheet = page.ReadRowRef<BNpcCustomizeSheet>(6, offset),
+				NpcEquipment = page.ReadRowRef<NpcEquipment>(7, offset)
+			};
+		}
+
+		// INpcBase
+
+		public string Name { get; set; } = string.Empty;
+
+		public ushort GetModelId()
+			=> (ushort)this.ModelChara.RowId;
+
+		public Customize? GetCustomize()
+			=> this.CustomizeSheet.RowId != 0 ? this.CustomizeSheet.Value.Customize : null;
+
+		public Equipment? GetEquipment()
+			=> this.NpcEquipment.Value.Equipment;
+
+		public WeaponEquip? GetMainHand()
+			=> this.NpcEquipment.Value.MainHand;
+
+		public WeaponEquip? GetOffHand()
+			=> this.NpcEquipment.Value.OffHand;
+
+		// Customize Sheet
+
+		[Sheet("BNpcCustomize", columnHash: 0x18f060d4)]
+		private struct BNpcCustomizeSheet(ExcelPage page, uint offset, uint row) : IExcelRow<BNpcCustomizeSheet> {
+			public ExcelPage ExcelPage => page;
+			public uint RowOffset => offset;
+			public uint RowId => row;
+
+			public Customize Customize { get; set; }
+
+			public static BNpcCustomizeSheet Create(ExcelPage page, uint offset, uint row) {
+				return new BNpcCustomizeSheet(page, offset, row) {
+					Customize = page.ReadCustomize(0, offset)
+				};
+			}
+		}
+	}
+}