diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 3bf8adbe4..9a8fa5efc 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -17,15 +17,6 @@ jobs: package-name: release-please-action default-branch: release - on-released: - if: ${{ needs.release-please.outputs.released }} - runs-on: ubuntu-latest - steps: - - name: Trigger Repo Update - uses: peter-evans/repository-dispatch@v2 - with: - event-type: new-release - build: name : build if: ${{ needs.release-please.outputs.released }} @@ -84,3 +75,12 @@ jobs: asset_path: artifact/latest.zip asset_name: latest.zip asset_content_type: application/zip + + on-released: + runs-on: ubuntu-latest + needs: release + steps: + - name: Trigger Repo Update + uses: peter-evans/repository-dispatch@v2 + with: + event-type: new-release \ No newline at end of file diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs index 647d8e2df..3a2d2c2ce 100644 --- a/RotationSolver.Basic/Helpers/ObjectHelper.cs +++ b/RotationSolver.Basic/Helpers/ObjectHelper.cs @@ -13,7 +13,7 @@ public static class ObjectHelper EventHandlerType.Quest, }; - private unsafe static BNpcBase GetObjectNPC(this GameObject obj) + public static BNpcBase GetObjectNPC(this GameObject obj) { if (obj == null) return null; return Service.GetSheet().GetRow(obj.DataId); @@ -95,6 +95,7 @@ public static bool CanInterrupt(this BattleChara b) } public static bool IsDummy(this BattleChara obj) => obj?.NameId == 541; + /// /// Is character a boss? Max HP exceeds a certain amount. /// diff --git a/RotationSolver/UI/RotationConfigWindow_Debug.cs b/RotationSolver/UI/RotationConfigWindow_Debug.cs index 3f78847d7..0cdec375b 100644 --- a/RotationSolver/UI/RotationConfigWindow_Debug.cs +++ b/RotationSolver/UI/RotationConfigWindow_Debug.cs @@ -98,7 +98,18 @@ private unsafe void DrawTargetData() ImGui.Text("NamePlate: " + b.GetNamePlateIcon().ToString()); ImGui.Text("StatusFlags: " + b.StatusFlags.ToString()); ImGui.Text("InView: " + Service.WorldToScreen(b.Position, out _).ToString()); - ImGui.Text("NameId: " + b.NameId.ToString()); + ImGui.Text("DataId: " + b.DataId.ToString()); + + var npc = b.GetObjectNPC(); + if(npc != null) + { + ImGui.Text("Unknown0: " + npc.Behavior.Value?.Unknown0.ToString()); + ImGui.Text("Unknown1: " + npc.Behavior.Value?.Unknown1.ToString()); + ImGui.Text("Condition0Type: " + npc.Behavior.Value?.Condition0Type.ToString()); + ImGui.Text("Condition0Target: " + npc.Behavior.Value?.Condition0Target.ToString()); + ImGui.Text("Condition1Type: " + npc.Behavior.Value?.Condition1Type.ToString()); + ImGui.Text("Condition1Target: " + npc.Behavior.Value?.Condition1Target.ToString()); + } foreach (var status in b.StatusList) {