diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 3ae738c51..bf5b87b14 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -ko_fi: RotationSolver +ko_fi: ArchiTed \ No newline at end of file diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 5824b1aa4..df9d0a11a 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -80,4 +80,6 @@ jobs: - name: Trigger Repo Update uses: peter-evans/repository-dispatch@v2 with: + token: ${{ secrets.PAT }} + repository: ${{ github.repository_owner }}/Dalamud_Plugins event-type: new-release diff --git a/.github/workflows/schedule-repo.yml b/.github/workflows/schedule-repo.yml deleted file mode 100644 index 4f78fd642..000000000 --- a/.github/workflows/schedule-repo.yml +++ /dev/null @@ -1,14 +0,0 @@ -on: - workflow_dispatch: - schedule: - - cron: '0 0 */1 * *' - -jobs: - sendMessage: - name: Send Message - runs-on: ubuntu-latest - steps: - - name: Trigger Repo Update - uses: peter-evans/repository-dispatch@v2 - with: - event-type: new-release diff --git a/.github/workflows/update-repo.yml b/.github/workflows/update-repo.yml deleted file mode 100644 index 77187b62c..000000000 --- a/.github/workflows/update-repo.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Update Repo - -on: - workflow_dispatch: - repository_dispatch: - types: [new-release] - -jobs: - update: - name: Update Repo - runs-on: ubuntu-latest - steps: - - uses: denoland/setup-deno@v1 - with: - deno-version: v1.x - - - uses: actions/checkout@v3 - - - name: Update Repo - run: deno run --allow-net=api.github.com,github.com,objects.githubusercontent.com,raw.githubusercontent.com --allow-write=pluginmaster.json UpdateDownloads.ts - - - name: Verify Changed files - uses: tj-actions/verify-changed-files@v13 - id: verify-changed-files - with: - files: pluginmaster.json - - - name: Commit files - if: steps.verify-changed-files.outputs.files_changed == 'true' - uses: EndBug/add-and-commit@v9 - with: - message: Update Downloads - default_author: github_actions - - - name: Push changes - if: steps.verify-changed-files.outputs.files_changed == 'true' - uses: ad-m/github-push-action@master diff --git a/README.md b/README.md index 0e3860b0b..b67ee2686 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Download it at this url: ``` -https://raw.githubusercontent.com/ArchiDog1998/RotationSolver/main/pluginmaster.json +https://raw.githubusercontent.com/ArchiDog1998/Dalamud_Plugins/main/pluginmaster.json ``` ## Brief diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs index 5d6174583..5a638b61b 100644 --- a/RotationSolver.Basic/Helpers/ObjectHelper.cs +++ b/RotationSolver.Basic/Helpers/ObjectHelper.cs @@ -182,7 +182,7 @@ public static uint GetHealthFromMulty(float mult) } /// - /// 对象距玩家的距离 + /// The distance from to the player /// /// /// diff --git a/RotationSolver/RotationSolverPlugin.cs b/RotationSolver/RotationSolverPlugin.cs index 020693f77..879c31b7d 100644 --- a/RotationSolver/RotationSolverPlugin.cs +++ b/RotationSolver/RotationSolverPlugin.cs @@ -59,8 +59,6 @@ public unsafe RotationSolverPlugin(DalamudPluginInterface pluginInterface) MajorUpdater.Enable(); OtherConfiguration.Init(); - ActionSequencerUpdater.Enable(pluginInterface.ConfigDirectory.FullName + "\\Conditions"); - SocialUpdater.Enable(); _dis.Add(new Watcher()); _dis.Add(new MovingController()); @@ -103,8 +101,6 @@ public void Dispose() _dis?.Clear(); MajorUpdater.Dispose(); - ActionSequencerUpdater.SaveFiles(); - SocialUpdater.Disable(); IconSet.Dispose(); OtherConfiguration.Save(); diff --git a/RotationSolver/UI/RotationConfigWindow_Debug.cs b/RotationSolver/UI/RotationConfigWindow_Debug.cs index 95771081f..28ce28b1e 100644 --- a/RotationSolver/UI/RotationConfigWindow_Debug.cs +++ b/RotationSolver/UI/RotationConfigWindow_Debug.cs @@ -99,7 +99,11 @@ private unsafe void DrawTargetData() { ImGui.Text("Kind: " + Service.TargetManager.Target.GetObjectKind().ToString()); ImGui.Text("SubKind: " + Service.TargetManager.Target.GetBattleNPCSubKind().ToString()); - + var owner = Service.ObjectTable.SearchById(Service.TargetManager.Target.OwnerId); + if(owner != null) + { + ImGui.Text("Owner: " + owner.Name.ToString()); + } } if (Service.TargetManager.Target is BattleChara b) { diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs index 50acb5293..d66145f7a 100644 --- a/RotationSolver/Updaters/MajorUpdater.cs +++ b/RotationSolver/Updaters/MajorUpdater.cs @@ -80,6 +80,9 @@ private static void FrameworkUpdate(Framework framework) public static void Enable() { Service.Framework.Update += FrameworkUpdate; + ActionSequencerUpdater.Enable(Service.Interface.ConfigDirectory.FullName + "\\Conditions"); + + SocialUpdater.Enable(); } static bool _work; @@ -115,5 +118,7 @@ public static void Dispose() { Service.Framework.Update -= FrameworkUpdate; PreviewUpdater.Dispose(); + ActionSequencerUpdater.SaveFiles(); + SocialUpdater.Disable(); } } diff --git a/UpdateDownloads.ts b/UpdateDownloads.ts deleted file mode 100644 index 291f8fad2..000000000 --- a/UpdateDownloads.ts +++ /dev/null @@ -1,52 +0,0 @@ -const user = "ArchiDog1998"; -const repos = [ - "RotationSolver", - "FakeName", -]; - -const clearText = (str) => { - return str - .replace(/\p{Extended_Pictographic}/gu, "") // remove emojis - .replace(/\*\*(.*)\*\*/g, "$1") // extract markdown bold text - .replace(/\[([^\)]+)\]\([^\)]+\)/g, "$1") // extract markdown link label - .split(/\r?\n/g) - .map(line => line.replace(/^#+\s+/g, "")) - .join("\n"); -}; - -const output = await Promise.all(repos.map(async (repo) => { - const res = await fetch(`https://api.github.com/repos/${user}/${repo}/releases/latest`); - const data = await res.json(); - const reses = await fetch(`https://api.github.com/repos/${user}/${repo}/releases`); - const datas = await reses.json(); - - var count = 0; - for (var i = 0; i < datas.length; i++) { - count = count + Number(datas[i].assets[0].download_count); - } - - const base = { - AssemblyVersion: data.tag_name.replace(/^v/, ""), - Changelog: clearText(data.body), - DownloadCount: count.toString(), - LastUpdate: new Date(data.published_at).valueOf() / 1000, - RepoUrl: `https://github.com/${user}/${repo}`, - DownloadLinkInstall: data.assets[0].browser_download_url, - DownloadLinkUpdate: data.assets[0].browser_download_url, - }; - - const manifestRes = await fetch(`https://raw.githubusercontent.com/${user}/${repo}/main/manifest.json`); - if (!manifestRes.ok) { - return Object.assign({ - Author: user, - Name: repo, - InternalName: repo, - - ApplicableVersion: "any", - }, base); - } - const manifest = await manifestRes.json(); - return Object.assign(manifest, base); -})); - -await Deno.writeTextFile("pluginmaster.json", JSON.stringify(output, null, 2)); \ No newline at end of file diff --git a/docs/README.md b/docs/README.md index 1eaf0258f..fc244ae6e 100644 --- a/docs/README.md +++ b/docs/README.md @@ -12,7 +12,9 @@ It is designed for `general combat`, not for savage or ultimate. So use it caref After installing [Dalamud](https://goatcorp.github.io/), input `/xlplugins` command to the chat box. Add go to`Settings` -> `Experimental` -> `Custom Plugin Repositories`, add url here. Finally, save it. -`https://raw.githubusercontent.com/ArchiDog1998/RotationSolver/main/pluginmaster.json` +``` +https://raw.githubusercontent.com/ArchiDog1998/Dalamud_Plugins/main/pluginmaster.json +``` ![Add Url](assets/image-20230129154207892.png) diff --git a/pluginmaster.json b/pluginmaster.json deleted file mode 100644 index 264f0f11f..000000000 --- a/pluginmaster.json +++ /dev/null @@ -1,44 +0,0 @@ -[ - { - "Author": "ArchiTed", - "Name": "Rotation Solver", - "InternalName": "RotationSolver", - "Description": "Based on the pve combat information in one frame, find the best action.\n\nThe `information` is almost all the information available in one frame in combat, including the status of the all players in party, the status of the hostile targets, action cooling, the number of action stack, the MP and HP of characters, the location of characters, casting action of the hostile target, combo ID, combat duration, player level, etc. In this case, opener is also a kind of information that a lot of abilities are not cooling down.\n\nThen, it will highlight the best action one the hot bar, or help you to click on it.\n\nIt is designed for general combat, not for savage or ultimate. So use it carefully.", - "ApplicableVersion": "any", - "Tags": [ - "combat", - "rotation" - ], - "CategoryTags": [ - "jobs" - ], - "DalamudApiLevel": 8, - "LoadRequiredState": 0, - "LoadSync": false, - "CanUnloadAsync": false, - "LoadPriority": 0, - "IconUrl": "https://raw.githubusercontent.com/ArchiDog1998/RotationSolver/main/docs/RotationSolverIcon_128.png", - "Punchline": "Based on the pve combat information in one frame, find the best action.", - "AcceptsFeedback": true, - "AssemblyVersion": "2.7.4", - "Changelog": "2.7.4 (2023-05-02)\n\n\nBug Fixes\n\n* add a fetch time for ping check. (476737a)\n* add a upper limit of ping, and restriction of healPotion usage (ef07570)\n* add another ping check method to refine the ping. (1e751cd)\n* changed high-end error message. (0d74a6c)\n* changed state string. (c11e8a6)\n* fixed the heal potion usage. (ef42c91)\n* fixed with auto status tank stance. (015c5ba)", - "DownloadCount": "7594", - "LastUpdate": 1683034603, - "RepoUrl": "https://github.com/ArchiDog1998/RotationSolver", - "DownloadLinkInstall": "https://github.com/ArchiDog1998/RotationSolver/releases/download/v2.7.4/latest.zip", - "DownloadLinkUpdate": "https://github.com/ArchiDog1998/RotationSolver/releases/download/v2.7.4/latest.zip" - }, - { - "Author": "ArchiDog1998", - "Name": "FakeName", - "InternalName": "FakeName", - "ApplicableVersion": "any", - "AssemblyVersion": "1.0.0.5", - "Changelog": "", - "DownloadCount": "222", - "LastUpdate": 1674699010, - "RepoUrl": "https://github.com/ArchiDog1998/FakeName", - "DownloadLinkInstall": "https://github.com/ArchiDog1998/FakeName/releases/download/v1.0.0.5/latest.zip", - "DownloadLinkUpdate": "https://github.com/ArchiDog1998/FakeName/releases/download/v1.0.0.5/latest.zip" - } -] \ No newline at end of file