diff --git a/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj b/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj index 1cdfda74e..45a39b357 100644 --- a/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj +++ b/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj @@ -25,8 +25,8 @@ - - + + all diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj index b844edd31..358e64f13 100644 --- a/Dalamud/Dalamud.csproj +++ b/Dalamud/Dalamud.csproj @@ -67,8 +67,8 @@ - - + + all diff --git a/Dalamud/Game/ClientState/JobGauge/JobGauges.cs b/Dalamud/Game/ClientState/JobGauge/JobGauges.cs index e47bead36..67429956b 100644 --- a/Dalamud/Game/ClientState/JobGauge/JobGauges.cs +++ b/Dalamud/Game/ClientState/JobGauge/JobGauges.cs @@ -28,7 +28,7 @@ private JobGauges() } /// - public unsafe IntPtr Address => (nint)(CSJobGaugeManager.Instance()->CurrentGauge); + public unsafe IntPtr Address => (nint)(&CSJobGaugeManager.Instance()->EmptyGauge); /// public T Get() where T : JobGaugeBase diff --git a/Dalamud/Game/Config/SystemConfigOption.cs b/Dalamud/Game/Config/SystemConfigOption.cs index 5305e06d9..f7e3bd3f8 100644 --- a/Dalamud/Game/Config/SystemConfigOption.cs +++ b/Dalamud/Game/Config/SystemConfigOption.cs @@ -1436,4 +1436,46 @@ public enum SystemConfigOption /// [GameConfigOption("PadButton_R3", ConfigType.String)] PadButton_R3, + + /// + /// System option with the internal name ActiveInstanceGuid. + /// This option is a String. + /// + [GameConfigOption("ActiveInstanceGuid", ConfigType.String)] + ActiveInstanceGuid, + + /// + /// System option with the internal name ActiveProductGuid. + /// This option is a String. + /// + [GameConfigOption("ActiveProductGuid", ConfigType.String)] + ActiveProductGuid, + + /// + /// System option with the internal name MsqProgress. + /// This option is a UInt. + /// + [GameConfigOption("MsqProgress", ConfigType.UInt)] + MsqProgress, + + /// + /// System option with the internal name PromptConfigUpdate. + /// This option is a UInt. + /// + [GameConfigOption("PromptConfigUpdate", ConfigType.UInt)] + PromptConfigUpdate, + + /// + /// System option with the internal name TitleScreenType. + /// This option is a UInt. + /// + [GameConfigOption("TitleScreenType", ConfigType.UInt)] + TitleScreenType, + + /// + /// System option with the internal name FirstConfigBackup. + /// This option is a UInt. + /// + [GameConfigOption("FirstConfigBackup", ConfigType.UInt)] + FirstConfigBackup, } diff --git a/Dalamud/Game/Config/UiConfigOption.cs b/Dalamud/Game/Config/UiConfigOption.cs index bf329bd6c..1a44c3afa 100644 --- a/Dalamud/Game/Config/UiConfigOption.cs +++ b/Dalamud/Game/Config/UiConfigOption.cs @@ -118,6 +118,7 @@ public enum UiConfigOption /// System option with the internal name LockonDefaultZoom_179. /// This option is a Float. /// + [Obsolete("This option won't work. Use LockonDefaultZoom.")] [GameConfigOption("LockonDefaultZoom_179", ConfigType.Float)] LockonDefaultZoom_179, @@ -3578,4 +3579,25 @@ public enum UiConfigOption /// [GameConfigOption("PadMode", ConfigType.UInt)] PadMode, + + /// + /// System option with the internal name EnableMoveTiltCharacter. + /// This option is a UInt. + /// + [GameConfigOption("EnableMoveTiltCharacter", ConfigType.UInt)] + EnableMoveTiltCharacter, + + /// + /// System option with the internal name EnableMoveTiltMountGround. + /// This option is a UInt. + /// + [GameConfigOption("EnableMoveTiltMountGround", ConfigType.UInt)] + EnableMoveTiltMountGround, + + /// + /// System option with the internal name EnableMoveTiltMountFly. + /// This option is a UInt. + /// + [GameConfigOption("EnableMoveTiltMountFly", ConfigType.UInt)] + EnableMoveTiltMountFly, } diff --git a/Dalamud/Game/Text/SeIconChar.cs b/Dalamud/Game/Text/SeIconChar.cs index 17924c671..00ffb7342 100644 --- a/Dalamud/Game/Text/SeIconChar.cs +++ b/Dalamud/Game/Text/SeIconChar.cs @@ -766,4 +766,54 @@ public enum SeIconChar /// The Japanese Eorzea time icon unicode character. /// EorzeaTimeJa = 0xE0DB, + + /// + /// The boxed, outlined number 0 icon unicode character. + /// + BoxedOutlinedNumber0 = 0xE0E0, + + /// + /// The boxed, outlined number 1 icon unicode character. + /// + BoxedOutlinedNumber1 = 0xE0E1, + + /// + /// The boxed, outlined number 2 icon unicode character. + /// + BoxedOutlinedNumber2 = 0xE0E2, + + /// + /// The boxed, outlined number 3 icon unicode character. + /// + BoxedOutlinedNumber3 = 0xE0E3, + + /// + /// The boxed, outlined number 4 icon unicode character. + /// + BoxedOutlinedNumber4 = 0xE0E4, + + /// + /// The boxed, outlined number 5 icon unicode character. + /// + BoxedOutlinedNumber5 = 0xE0E5, + + /// + /// The boxed, outlined number 6 icon unicode character. + /// + BoxedOutlinedNumber6 = 0xE0E6, + + /// + /// The boxed, outlined number 7 icon unicode character. + /// + BoxedOutlinedNumber7 = 0xE0E7, + + /// + /// The boxed, outlined number 8 icon unicode character. + /// + BoxedOutlinedNumber8 = 0xE0E8, + + /// + /// The boxed, outlined number 9 icon unicode character. + /// + BoxedOutlinedNumber9 = 0xE0E9, } diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/SeFontTestWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/SeFontTestWidget.cs index b59abbff1..69282a8e8 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/SeFontTestWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/SeFontTestWidget.cs @@ -1,6 +1,8 @@ using Dalamud.Game.Text; using ImGuiNET; +using System.Linq; + namespace Dalamud.Interface.Internal.Windows.Data.Widgets; /// @@ -28,8 +30,11 @@ public void Draw() { var specialChars = string.Empty; - for (var i = 0xE020; i <= 0xE0DB; i++) - specialChars += $"0x{i:X} - {(SeIconChar)i} - {(char)i}\n"; + var min = (char)Enum.GetValues().Min(); + var max = (char)Enum.GetValues().Max(); + + for (var i = min; i <= max; i++) + specialChars += $"0x{(int)i:X} - {(SeIconChar)i} - {i}\n"; ImGui.TextUnformatted(specialChars); } diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index fca10adca..4c8ca577d 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit fca10adcab3911c1be79cb0753987a2a02b7e058 +Subproject commit 4c8ca577d472fd806ea1fc5c957b3c52f628fa4c