Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into garume/dsr-death-se…
Browse files Browse the repository at this point in the history 
…ntence-support-to-sourh-orientention
  • Loading branch information
@Garume
Garume committed Nov 16, 2024
2 parents f8e376f + 6fea0b7 commit 1b4a1d1
Show file tree
Hide file tree
Showing 75 changed files with 1,455 additions and 642 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@
[submodule "ffxiv_pictomancy"]
path = ffxiv_pictomancy
url = https://github.com/Limiana/ffxiv_pictomancy
[submodule "FFXIVClientStructs"]
path = FFXIVClientStructs
url = https://github.com/Limiana/FFXIVClientStructs
2 changes: 1 addition & 1 deletion ECommons
Submodule ECommons updated 124 files
1 change: 1 addition & 0 deletions FFXIVClientStructs
Submodule FFXIVClientStructs added at b5240a
2 changes: 1 addition & 1 deletion NightmareUI
Submodule NightmareUI updated 2 files
+5 −5 NightmareUI/ImGuiElements/WorldSelector.cs
+6 −6 NightmareUI/NuiTools.cs
40 changes: 40 additions & 0 deletions Splatoon.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScriptUpdateFileGenerator",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pictomancy", "ffxiv_pictomancy\Pictomancy\Pictomancy.csproj", "{0AEC5DEE-DBF9-46CD-B71B-A61C2BBB04BD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InteropGenerator", "FFXIVClientStructs\InteropGenerator\InteropGenerator.csproj", "{333E8025-F6AC-449C-830B-7464EB1B64F7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InteropGenerator.Runtime", "FFXIVClientStructs\InteropGenerator.Runtime\InteropGenerator.Runtime.csproj", "{0E499D05-9562-49E0-A268-DE158FD0062A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFXIVClientStructs", "FFXIVClientStructs\FFXIVClientStructs\FFXIVClientStructs.csproj", "{41E16A64-ACAE-4657-94BC-1C466A44E07A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFXIVClientStructs.Generators", "FFXIVClientStructs\FFXIVClientStructs.Generators\FFXIVClientStructs.Generators.csproj", "{A0FC5391-610E-402B-8598-0CB276E3E39A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -75,6 +83,38 @@ Global
{0AEC5DEE-DBF9-46CD-B71B-A61C2BBB04BD}.Release|Any CPU.Build.0 = Release|Any CPU
{0AEC5DEE-DBF9-46CD-B71B-A61C2BBB04BD}.Release|x64.ActiveCfg = Release|Any CPU
{0AEC5DEE-DBF9-46CD-B71B-A61C2BBB04BD}.Release|x64.Build.0 = Release|Any CPU
{333E8025-F6AC-449C-830B-7464EB1B64F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{333E8025-F6AC-449C-830B-7464EB1B64F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{333E8025-F6AC-449C-830B-7464EB1B64F7}.Debug|x64.ActiveCfg = Debug|Any CPU
{333E8025-F6AC-449C-830B-7464EB1B64F7}.Debug|x64.Build.0 = Debug|Any CPU
{333E8025-F6AC-449C-830B-7464EB1B64F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{333E8025-F6AC-449C-830B-7464EB1B64F7}.Release|Any CPU.Build.0 = Release|Any CPU
{333E8025-F6AC-449C-830B-7464EB1B64F7}.Release|x64.ActiveCfg = Release|Any CPU
{333E8025-F6AC-449C-830B-7464EB1B64F7}.Release|x64.Build.0 = Release|Any CPU
{0E499D05-9562-49E0-A268-DE158FD0062A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E499D05-9562-49E0-A268-DE158FD0062A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E499D05-9562-49E0-A268-DE158FD0062A}.Debug|x64.ActiveCfg = Debug|Any CPU
{0E499D05-9562-49E0-A268-DE158FD0062A}.Debug|x64.Build.0 = Debug|Any CPU
{0E499D05-9562-49E0-A268-DE158FD0062A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0E499D05-9562-49E0-A268-DE158FD0062A}.Release|Any CPU.Build.0 = Release|Any CPU
{0E499D05-9562-49E0-A268-DE158FD0062A}.Release|x64.ActiveCfg = Release|Any CPU
{0E499D05-9562-49E0-A268-DE158FD0062A}.Release|x64.Build.0 = Release|Any CPU
{41E16A64-ACAE-4657-94BC-1C466A44E07A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{41E16A64-ACAE-4657-94BC-1C466A44E07A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{41E16A64-ACAE-4657-94BC-1C466A44E07A}.Debug|x64.ActiveCfg = Debug|Any CPU
{41E16A64-ACAE-4657-94BC-1C466A44E07A}.Debug|x64.Build.0 = Debug|Any CPU
{41E16A64-ACAE-4657-94BC-1C466A44E07A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{41E16A64-ACAE-4657-94BC-1C466A44E07A}.Release|Any CPU.Build.0 = Release|Any CPU
{41E16A64-ACAE-4657-94BC-1C466A44E07A}.Release|x64.ActiveCfg = Release|Any CPU
{41E16A64-ACAE-4657-94BC-1C466A44E07A}.Release|x64.Build.0 = Release|Any CPU
{A0FC5391-610E-402B-8598-0CB276E3E39A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A0FC5391-610E-402B-8598-0CB276E3E39A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A0FC5391-610E-402B-8598-0CB276E3E39A}.Debug|x64.ActiveCfg = Debug|Any CPU
{A0FC5391-610E-402B-8598-0CB276E3E39A}.Debug|x64.Build.0 = Debug|Any CPU
{A0FC5391-610E-402B-8598-0CB276E3E39A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A0FC5391-610E-402B-8598-0CB276E3E39A}.Release|Any CPU.Build.0 = Release|Any CPU
{A0FC5391-610E-402B-8598-0CB276E3E39A}.Release|x64.ActiveCfg = Release|Any CPU
{A0FC5391-610E-402B-8598-0CB276E3E39A}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
6 changes: 3 additions & 3 deletions Splatoon/Gui/CGui.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ public CGui(Splatoon p)
{
this.p = p;
Svc.PluginInterface.UiBuilder.Draw += Draw;
ActionNames = Svc.Data.GetExcelSheet<Lumina.Excel.GeneratedSheets.Action>().ToDictionary(x => x.RowId, x => $"{x.RowId} | {x.Name}");
BuffNames = Svc.Data.GetExcelSheet<Lumina.Excel.GeneratedSheets.Status>().ToDictionary(x => x.RowId, x => $"{x.RowId} | {x.Name}");
ActionNames = Svc.Data.GetExcelSheet<Lumina.Excel.Sheets.Action>().ToDictionary(x => x.RowId, x => $"{x.RowId} | {x.Name}");
BuffNames = Svc.Data.GetExcelSheet<Lumina.Excel.Sheets.Status>().ToDictionary(x => x.RowId, x => $"{x.RowId} | {x.Name}");
}

public void Dispose()
Expand Down Expand Up @@ -223,7 +223,7 @@ private void HTTPExportToClipboard(Element el)

private void SetCursorTo(float refX, float refZ, float refY)
{
if (Svc.GameGui.WorldToScreen(new Vector3(refX, refZ, refY), out var screenPos))
if (Utils.WorldToScreen(new Vector3(refX, refZ, refY), out var screenPos))
{
var point = new POINT() { x = (int)screenPos.X, y = (int)screenPos.Y };
//Chat.Print(point.X + "/" + point.Y);
Expand Down
18 changes: 9 additions & 9 deletions Splatoon/Gui/CGuiDebug.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using ECommons.GameFunctions;
using ECommons.MathHelpers;
using FFXIVClientStructs.FFXIV.Client.Graphics.Environment;
using Lumina.Excel.GeneratedSheets;
using Lumina.Excel.Sheets;
using Splatoon.Memory;
using Splatoon.Utility;
using System.Globalization;
Expand Down Expand Up @@ -58,7 +58,7 @@ void DisplayDebug()
{
foreach(var x in Svc.Data.GetExcelSheet<TerritoryType>())
{
var n = x.ContentFinderCondition.Value?.Name?.ToString();
var n = x.ContentFinderCondition.ValueNullable?.Name.ToString();
if (!n.IsNullOrEmpty())
{
ImGuiEx.Text($"{n}");
Expand Down Expand Up @@ -112,7 +112,7 @@ void DisplayDebug()
{
Safe(delegate
{
s2wb = Svc.GameGui.WorldToScreen(new Vector3(s2wx, s2wz, s2wy), out Vector2 pos);
s2wb = Utils.WorldToScreen(new Vector3(s2wx, s2wz, s2wy), out Vector2 pos);
s2wrx = pos.X;
s2wry = pos.Y;
});
Expand All @@ -123,11 +123,11 @@ void DisplayDebug()
{
ImGuiEx.Text($"Player+1 distance: {Vector3.Distance(Svc.ClientState.LocalPlayer.Position, Svc.ClientState.LocalPlayer.Position + new Vector3(1, 0, 0))}");
ImGuiEx.Text($"Player+1+1 distance: {Vector3.Distance(Svc.ClientState.LocalPlayer.Position + new Vector3(1, 0, 0), Svc.ClientState.LocalPlayer.Position + new Vector3(2, 0, 0))}");
Svc.GameGui.WorldToScreen(Svc.ClientState.LocalPlayer.Position, out var v1);
Svc.GameGui.WorldToScreen(Svc.ClientState.LocalPlayer.Position + new Vector3(1, 0, 0), out var v2);
Svc.GameGui.WorldToScreen(Svc.ClientState.LocalPlayer.Position + new Vector3(2, 0, 0), out var v3);
Svc.GameGui.WorldToScreen(Svc.ClientState.LocalPlayer.Position + new Vector3(3, 0, 0), out var v4);
Svc.GameGui.WorldToScreen(Svc.ClientState.LocalPlayer.Position + new Vector3(4, 0, 0), out var v5);
Utils.WorldToScreen(Svc.ClientState.LocalPlayer.Position, out var v1);
Utils.WorldToScreen(Svc.ClientState.LocalPlayer.Position + new Vector3(1, 0, 0), out var v2);
Utils.WorldToScreen(Svc.ClientState.LocalPlayer.Position + new Vector3(2, 0, 0), out var v3);
Utils.WorldToScreen(Svc.ClientState.LocalPlayer.Position + new Vector3(3, 0, 0), out var v4);
Utils.WorldToScreen(Svc.ClientState.LocalPlayer.Position + new Vector3(4, 0, 0), out var v5);
ImGuiEx.Text($"Screen distance: {Vector2.Distance(v1, v2)}, {Vector2.Distance(v2, v3)}, {Vector2.Distance(v3, v4)}, {Vector2.Distance(v4, v5)}");
ImGui.Separator();
}
Expand Down Expand Up @@ -173,7 +173,7 @@ void DisplayDebug()
ImGuiEx.Text($"{((a is ICharacter chr) ? chr.IsCharacterVisible() : "Not a char")}");
ImGui.SameLine();
ImGui.SetCursorPosX(600f);
ImGuiEx.Text(a is ICharacter chr2 ? $"{chr2.Struct()->CharacterData.ModelCharaId.Format()}" : "Not a char");
ImGuiEx.Text(a is ICharacter chr2 ? $"{chr2.Struct()->ModelCharaId.Format()}" : "Not a char");
});
}
}
Expand Down
7 changes: 2 additions & 5 deletions Splatoon/Gui/Explorer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,11 @@ internal static void DrawGameObject(IGameObject obj)
ImGuiEx.TextCopy($"{"HP".Loc()}: {c.CurrentHp} / {c.MaxHp}");
ImGuiEx.TextCopy($"{"Name NPC ID".Loc()}: {c.NameId}");
ImGuiEx.TextWrappedCopy($"Customize: {c.Customize.Select(x => $"{x:X2}").Join(" ")}");
ImGuiEx.TextCopy($"ModelCharaId: {c.Struct()->CharacterData.ModelCharaId}");
ImGuiEx.TextCopy($"ModelCharaId_2: {c.Struct()->CharacterData.ModelCharaId_2}");
ImGuiEx.TextCopy($"ModelCharaId: {c.Struct()->ModelCharaId}");
ImGuiEx.TextCopy($"{"Visible".Loc()}: {c.IsCharacterVisible()}");
ImGuiEx.TextCopy($"VfxData: {(nint)c.Struct()->Vfx.VfxData:X16}");
ImGuiEx.TextCopy($"VfxData2: {(nint)c.Struct()->Vfx.VfxData2:X16}");
ImGuiEx.TextCopy($"Omen: {(nint)c.Struct()->Vfx.Omen:X16}");
ImGuiEx.TextCopy($"ModelSkeletonId: {(nint)c.Struct()->CharacterData.ModelSkeletonId:X16}");
ImGuiEx.TextCopy($"ModelSkeletonId2: {(nint)c.Struct()->CharacterData.ModelSkeletonId_2:X16}");
ImGuiEx.TextCopy($"TargetObject: {c.TargetObject}");
ImGuiEx.TextCopy($"TargetObjectID: {c.TargetObjectId}");
ImGuiEx.TextCopy($"EventState: {c.Struct()->EventState}");
Expand Down Expand Up @@ -128,7 +125,7 @@ internal static void DrawGameObject(IGameObject obj)
ImGuiEx.TextCopy($"Status list:".Loc());
foreach(var x in b.StatusList)
{
ImGuiEx.TextCopy($" {x.GameData.Name} ({x.StatusId.Format()}), {"Remains".Loc()} = {x.RemainingTime:F1}, Param = {x.Param}, {"Count".Loc()} = {x.StackCount}");
ImGuiEx.TextCopy($" {x.GameData.ValueNullable?.Name} ({x.StatusId.Format()}), {"Remains".Loc()} = {x.RemainingTime:F1}, Param = {x.Param}, {"Count".Loc()} = {x.StackCount}");
}
}
}
Expand Down
Loading

0 comments on commit 1b4a1d1

Please sign in to comment.