From 47c5f4009eb7a14aa2b083fd191039fcaaac8fc3 Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Wed, 20 Dec 2023 16:29:37 -0800 Subject: [PATCH] resources/docs: change quisquous => OverlayPlugin --- .github/ISSUE_TEMPLATE/bug_report.md | 4 +- .github/ISSUE_TEMPLATE/feature_request.md | 6 +- .github/ISSUE_TEMPLATE/question.md | 6 +- .github/workflows/README.md | 2 +- CONTRIBUTING.md | 10 +-- LICENSE | 2 +- README.md | 12 ++-- docs/CactbotCustomization.md | 10 +-- docs/FAQ-Troubleshooting.md | 10 +-- docs/Headmarkers.md | 8 +-- docs/LogGuide.md | 2 +- docs/MemorySignatures.md | 2 +- docs/OopsyraidsyGuide.md | 14 ++-- docs/PatchUpdateChecklist.md | 8 +-- docs/RaidbossGuide.md | 56 ++++++++-------- docs/RemoteCactbot.md | 12 ++-- docs/TimelineGuide.md | 18 ++--- docs/ko-KR/CactbotCustomization.md | 12 ++-- docs/ko-KR/README.md | 6 +- docs/zh-CN/CactbotCustomization.md | 10 +-- docs/zh-CN/MemorySignatures.md | 2 +- docs/zh-CN/README.md | 8 +-- docs/zh-CN/RaidbossGuide.md | 28 ++++---- docs/zh-CN/TimelineGuide.md | 16 ++--- docs/zh-TW/CactbotCustomization.md | 6 +- eslint/cactbot-locale-order.js | 3 +- eslint/cactbot-output-strings.js | 3 +- eslint/cactbot-response-default-severities.js | 3 +- eslint/cactbot-timeline-triggers.js | 3 +- eslint/cactbot-trigger-property-order.js | 3 +- eslint/cactbot-triggerset-property-order.js | 3 +- package.json | 2 +- resources/netregexes.ts | 66 +++++++++---------- resources/regexes.ts | 60 ++++++++--------- ui/raidboss/data/03-hw/raid/a7s.txt | 1 - ui/raidboss/data/06-ew/raid/p12s.ts | 22 ++++--- ui/raidboss/raidboss_config.ts | 18 ++--- util/coverage/coverage.ts | 12 ++-- util/gen_coverage_report.ts | 2 +- 39 files changed, 241 insertions(+), 230 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 3718e32982..30535b833a 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -10,10 +10,10 @@ assignees: '' Please include as much information as possible, this information allows cactbot maintainers to diagnose (and fix!) your issue as quickly as possible. Useful Links: - - Common Issues and Workarounds: https://github.com/quisquous/cactbot#potential-errors-and-workarounds + - Common Issues and Workarounds: https://github.com/OverlayPlugin/cactbot#potential-errors-and-workarounds - ACT Discord: https://discord.gg/ahFKcmx - Before opening a new issue, please search existing issues: https://github.com/quisquous/cactbot/issues + Before opening a new issue, please search existing issues: https://github.com/OverlayPlugin/cactbot/issues --> ## Description diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index f1eff86a16..aabf7e5a4f 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -10,10 +10,10 @@ assignees: '' Please include as much information as possible, such as example behavior and motivation behind the change. Useful Links: - - Contribution Guidelines: https://github.com/quisquous/cactbot/blob/main/CONTRIBUTING.md - - Code of Conduct: https://github.com/quisquous/cactbot/blob/main/CODE_OF_CONDUCT.md + - Contribution Guidelines: https://github.com/OverlayPlugin/cactbot/blob/main/CONTRIBUTING.md + - Code of Conduct: https://github.com/OverlayPlugin/cactbot/blob/main/CODE_OF_CONDUCT.md - Before opening a new issue, please search existing issues: https://github.com/quisquous/cactbot/issues + Before opening a new issue, please search existing issues: https://github.com/OverlayPlugin/cactbot/issues Please note: Not every feature request will be added to cactbot, but hearing about what you want out of cactbot is important. Please don't be afraid to add a feature request! --> diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index cf17a16f0d..cbb67d60fb 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -8,14 +8,14 @@ assignees: '' ## Question diff --git a/.github/workflows/README.md b/.github/workflows/README.md index b8ec90e1b5..4007bf9d7e 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -10,5 +10,5 @@ These workflows should appear within pull requests as status indicators that denote "pending”, “success”, “failure”, or “error", and should contain detail links to view the workflows and their individual steps therein. Additionally, these workflow runs should be visible by clicking -the [Actions](https://github.com/quisquous/cactbot/actions) tab +the [Actions](https://github.com/OverlayPlugin/cactbot/actions) tab in the repository's menu at the top of the repository's main page. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2de2c6895d..b92f32f51c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -22,7 +22,7 @@ The code of conduct for cactbot can be found here: Please file all issues with cactbot on github, via this url: - + ## Pull Requests @@ -138,7 +138,7 @@ In order to use the main cactbot repository as your cactbot's source URL, simply enter the cactbot module's full HTML filepath instead of the HTML file included in the cactbot download. -For example, +For example, will use the latest changes for the `raidboss` module pushed to GitHub. When making changes, it may be helpful to reference your personal fork @@ -229,7 +229,7 @@ the complete list of commands being run in CI are found within and can be run locally without needing to commit changes just to test them. If it is not obvious *which* command is failing, you can click the workflow in the -[GitHub Actions](https://github.com/quisquous/cactbot/actions) +[GitHub Actions](https://github.com/OverlayPlugin/cactbot/actions) page and click `Workflow file` to see the exact list of commands being run. The majority of this file is setting up the workflow runner, and the command that is failing is most likely going to be found at the bottom, @@ -246,8 +246,8 @@ If you are wondering how to contribute to cactbot, here's a set of features that will almost always be needed: * fixing bugs -* [issues marked "help wanted"](https://github.com/quisquous/cactbot/issues?utf8=%E2%9C%93&q=label%3A%22help+wanted%22) -* [adding missing timelines](https://github.com/quisquous/cactbot/issues/414) +* [issues marked "help wanted"](https://github.com/OverlayPlugin/cactbot/issues?utf8=%E2%9C%93&q=label%3A%22help+wanted%22) +* [adding missing timelines](https://github.com/OverlayPlugin/cactbot/issues/414) * missing translations * [trigger future work](docs/RaidbossGuide.md#future-work) * [timeline future work](docs/TimelineGuide.md#future-work) diff --git a/LICENSE b/LICENSE index 1de6a9afcf..855691a7ba 100644 --- a/LICENSE +++ b/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2017-2021 https://github.com/quisquous/cactbot + Copyright 2017-2023 https://github.com/OverlayPlugin/cactbot Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index c9717c3036..522fa33a8f 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ -[![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/quisquous/cactbot/test.yml?branch=main)](https://github.com/quisquous/cactbot/actions?query=workflow%3ATest+branch%3Amain) -[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/quisquous/cactbot?color=brightgreen&sort=semver)](https://github.com/quisquous/cactbot/releases/latest) +[![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/quisquous/cactbot/test.yml?branch=main)](https://github.com/OverlayPlugin/cactbot/actions?query=workflow%3ATest+branch%3Amain) +[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/quisquous/cactbot?color=brightgreen&sort=semver)](https://github.com/OverlayPlugin/cactbot/releases/latest) 🌎 [**English**] [[简体中文](docs/zh-CN/README.md)] [[한국어](docs/ko-KR/README.md)] @@ -263,7 +263,7 @@ timeline, or come from log messages that occur in the game, similar to ACT's "Cu The overlay is designed to look and feel similar to the [BigWigs Bossmods](https://www.curseforge.com/wow/addons/big-wigs) addon for World of Warcraft. -[This page](https://quisquous.github.io/cactbot/util/coverage/coverage.html) lists +[This page](https://overlayplugin.github.io/cactbot/util/coverage/coverage.html) lists the currently supported set of content in cactbot. Support is continually added over time (patches welcome!) but a lot of old content may not be supported yet. @@ -302,10 +302,10 @@ you can start a local development server via `npm run start` and load the overlay in Chrome via `http://127.0.0.1:8080/ui/raidboss/raidemulator.html?OVERLAY_WS=ws://127.0.0.1:10501/ws` If you're developing user triggers, -you can load the overlay in Chrome via `https://quisquous.github.io/cactbot/ui/raidboss/raidemulator.html?OVERLAY_WS=ws://127.0.0.1:10501/ws` +you can load the overlay in Chrome via `https://overlayplugin.github.io/cactbot/ui/raidboss/raidemulator.html?OVERLAY_WS=ws://127.0.0.1:10501/ws` If you're trying to reproduce an issue, -you can load the overlay in Chrome via `https://quisquous.github.io/cactbot/ui/raidboss/raidemulator.html`. +you can load the overlay in Chrome via `https://overlayplugin.github.io/cactbot/ui/raidboss/raidemulator.html`. You don't need the WS Server running in this case. Once you've got the overlay loaded, you can follow these instructions to use the emulator. @@ -518,7 +518,7 @@ international (English, German, French, Japanese) version, the current Chinese version, and the current Korean version. Some translations are still a work in progress. -See the [cactbot coverage page](https://quisquous.github.io/cactbot/util/coverage/coverage.html) for more details. +See the [cactbot coverage page](https://overlayplugin.github.io/cactbot/util/coverage/coverage.html) for more details. ## Licensing, Trademarks, Copyright diff --git a/docs/CactbotCustomization.md b/docs/CactbotCustomization.md index 657fc0b666..ae41b1c003 100644 --- a/docs/CactbotCustomization.md +++ b/docs/CactbotCustomization.md @@ -184,7 +184,7 @@ ACT -> Plugins -> OverlayPlugin.dll -> your overlay -> Open DevTools. This is because they use custom elements, and they don't expose a lot of knobs to tune. If you have particular things you want to change about the timeline bars that you can't, -please feel free to submit a [github issue](https://github.com/quisquous/cactbot/issues/new/choose). +please feel free to submit a [github issue](https://github.com/OverlayPlugin/cactbot/issues/new/choose). **Warning**: cactbot makes no guarantees about preserving CSS backwards compatability. Future changes to cactbot may rearrange elements, @@ -203,7 +203,7 @@ and how long they stay on screen, and anything else. You can see readable JavaScript versions of all of the cactbot triggers -in this branch: +in this branch: This is the preferred reference to use for viewing, copying, and pasting. Triggers in the main branch or shipped in a cactbot release are often in unreadable bundles @@ -243,7 +243,7 @@ Modify the `zoneId` line to have the zone id for the zone you care about, usually from the top of the cactbot trigger file. [This file](../resources/zone_id.ts) has a list of all the zone ids. If you specify one incorrectly, you will get a warning in the OverlayPlugin log window. -Then, [copy the trigger text](https://github.com/quisquous/cactbot/tree/triggers) into this block. +Then, [copy the trigger text](https://github.com/OverlayPlugin/cactbot/tree/triggers) into this block. Edit as needed. Repeat for all the triggers you want to modify. Reload your raidboss overlay to apply your changes. @@ -266,7 +266,7 @@ you could do this via [Changing Trigger Text with the cactbot UI](#changing-trig One way to adjust this is to edit the trigger output for this trigger. You can find the original fireball #1 trigger in -[ui/raidboss/data/04-sb/ultimate/unending_coil_ultimate.js](https://github.com/quisquous/cactbot/blob/triggers/04-sb/ultimate/unending_coil_ultimate.js#:~:text=UCU%20Nael%20Fireball%201). +[ui/raidboss/data/04-sb/ultimate/unending_coil_ultimate.js](https://github.com/OverlayPlugin/cactbot/blob/triggers/04-sb/ultimate/unending_coil_ultimate.js#:~:text=UCU%20Nael%20Fireball%201). This chunk of code is what you would paste into the bottom of your user-defined js file. @@ -301,7 +301,7 @@ This edit also removed languages other than English. Currently, provoke only works for players in your alliance and not for all jobs. This example shows how to make it work for all players. The provoke trigger can be found in -[ui/raidboss/data/00-misc/general.js](https://github.com/quisquous/cactbot/blob/triggers/00-misc/general.js#:~:text=General%20Provoke). +[ui/raidboss/data/00-misc/general.js](https://github.com/OverlayPlugin/cactbot/blob/triggers/00-misc/general.js#:~:text=General%20Provoke). Here is a modified version with a different `condition` function. Because this shares the same `General Provoke` id with the built-in cactbot trigger, diff --git a/docs/FAQ-Troubleshooting.md b/docs/FAQ-Troubleshooting.md index c942593818..e241644869 100644 --- a/docs/FAQ-Troubleshooting.md +++ b/docs/FAQ-Troubleshooting.md @@ -133,7 +133,7 @@ It takes time and effort to add support for new content to cactbot. If it just came out in the last week or few, it's possible that there is not support for it yet. -Check for the latest list of supported content. +Check for the latest list of supported content. It is possible that support for content has been added to cactbot but not released. You can check the release notes for more details. @@ -248,10 +248,10 @@ If you get an error in the OverlayPlugin console similar to `System.MissingMetho If you get an error that says `Plugin Load Failure` and `The downloaded file did not contain a plugin that could be loaded`, there could be several potential issues. -- Make sure you have [installed OverlayPlugin](https://github.com/quisquous/cactbot#install-overlayplugin). +- Make sure you have [installed OverlayPlugin](https://github.com/OverlayPlugin/cactbot#install-overlayplugin). - Check your OverlayPlugin version in **Plugins** -> **Plugin Listing** -> **OverlayPlugin.dll**. If this is not the same version as [this release](https://github.com/OverlayPlugin/OverlayPlugin/releases/latest), -then remove it and re-follow the [installation instructions](https://github.com/quisquous/cactbot#install-overlayplugin). +then remove it and re-follow the [installation instructions](https://github.com/OverlayPlugin/cactbot#install-overlayplugin). - Make sure you are running x64 ACT (`Advanced Combat Tracker.exe`) and not x86 ACT (`ACTx86.exe`). - Finally, make sure you have reloaded ACT once you have installed OverlayPlugin. @@ -278,7 +278,7 @@ See: [Fixing Chat Log Problems](#fixing-chat-log-problems). ## Places to Get Help - ask in the [FFXIV ACT discord](https://discord.gg/ahFKcmx) #troubleshooting channel -- open a [github issue](https://github.com/quisquous/cactbot/issues) +- open a [github issue](https://github.com/OverlayPlugin/cactbot/issues) It is highly recommended that you ask in the FFXIV ACT discord first for most troubleshooting issues. You should also read the #troubleshooting channel pins first. @@ -312,7 +312,7 @@ upload the files there, and then attach the link. If you want to split a log to only include a particular fight, -you can use the [log splitter](https://quisquous.github.io/cactbot/util/logtools/splitter.html) +you can use the [log splitter](https://overlayplugin.github.io/cactbot/util/logtools/splitter.html) by dragging a network log file to the page and selecting the fights you want. If you are trying to debug something, it is usually better to not split the log. diff --git a/docs/Headmarkers.md b/docs/Headmarkers.md index 3d3ad96215..b4b378bd79 100644 --- a/docs/Headmarkers.md +++ b/docs/Headmarkers.md @@ -45,7 +45,7 @@ and then comparing to the expected first headmarker to calculate the offset. If the encounter does not have headmarker offsets, please use headmarker ids directly in triggers, -e.g. [p9n](https://github.com/quisquous/cactbot/blob/7b904e35c7d678013d229080c858f19d35510ac1/ui/raidboss/data/06-ew/raid/p9n.ts#L33-L38). +e.g. [p9n](https://github.com/OverlayPlugin/cactbot/blob/7b904e35c7d678013d229080c858f19d35510ac1/ui/raidboss/data/06-ew/raid/p9n.ts#L33-L38). ### Same first headmarker @@ -53,7 +53,7 @@ Most of the time, if the encounter does have headmarker offsets, the first headmarker id will always be the same. -Most trigger sets do something like [p11s](https://github.com/quisquous/cactbot/blob/3ca3589/ui/raidboss/data/06-ew/raid/p11s.ts). +Most trigger sets do something like [p11s](https://github.com/OverlayPlugin/cactbot/blob/3ca3589/ui/raidboss/data/06-ew/raid/p11s.ts). There's a helper function to set the headmarker offset if it's not found, and return the true headmarker id. @@ -108,7 +108,7 @@ In rare cases, the first headmarker is not consistent. As cactbot resets all trigger info (including recorded headmarker offset) on wipe, any trigger file must handle the first headmarker from any door boss and final boss simultaneously. -For example, [P12S](https://github.com/quisquous/cactbot/blob/4700770/ui/raidboss/data/06-ew/raid/p12s.ts#L159-L179) +For example, [P12S](https://github.com/OverlayPlugin/cactbot/blob/4700770/ui/raidboss/data/06-ew/raid/p12s.ts#L159-L179) has a door boss with two different first headmarkers (bottom left / bottom right wing) and a final boss with one first headmarker. @@ -124,7 +124,7 @@ or alternatively you can browse the Lockon table online here: +Here is some code from: ```typescript const headmarkers = { diff --git a/docs/LogGuide.md b/docs/LogGuide.md index 61b7d4e656..972d809db8 100644 --- a/docs/LogGuide.md +++ b/docs/LogGuide.md @@ -1567,7 +1567,7 @@ Interpreting these [values](https://github.com/goaaats/Dalamud/blob/4ad5bee0c621 There are a number of references for job gauge memory: - 1) [cactbot FFXIVProcess code](https://github.com/quisquous/cactbot/blob/a4d27eca3628d397cb9f5638fad97191566ed5a1/CactbotOverlay/FFXIVProcessIntl.cs#L267) + 1) [cactbot FFXIVProcess code](https://github.com/OverlayPlugin/cactbot/blob/a4d27eca3628d397cb9f5638fad97191566ed5a1/CactbotOverlay/FFXIVProcessIntl.cs#L267) 1) [Dalamud code](https://github.com/goaaats/Dalamud/blob/4ad5bee0c62128315b0a247466d28f42264c3069/Dalamud/Game/ClientState/Structs/JobGauge/NINGauge.cs#L15) Unfortunately, network data about other player's gauge is not sent. diff --git a/docs/MemorySignatures.md b/docs/MemorySignatures.md index 7b1b7a6a32..98bf1eb650 100644 --- a/docs/MemorySignatures.md +++ b/docs/MemorySignatures.md @@ -360,7 +360,7 @@ Thus, our final signature is: `488B0D????????4885C974B8488B05` The address that contains the pointer we care about is the four bytes in the question mark. -You can see this [in cactbot itself](https://github.com/quisquous/cactbot/blob/df176c4feff81bab356a8e5e6e6b453e94626320/CactbotOverlay/FFXIVProcess.cs#L189). +You can see this [in cactbot itself](https://github.com/OverlayPlugin/cactbot/blob/df176c4feff81bab356a8e5e6e6b453e94626320/CactbotOverlay/FFXIVProcess.cs#L189). It's important to do a [scan for existing memory signatures](#scan-for-existing-memory-signatures) to make sure that this signature is unique. diff --git a/docs/OopsyraidsyGuide.md b/docs/OopsyraidsyGuide.md index 1cf77b87e0..398ecf27ba 100644 --- a/docs/OopsyraidsyGuide.md +++ b/docs/OopsyraidsyGuide.md @@ -15,8 +15,8 @@ A basic oopsy file should cover: Any triggers past that are usually a bonus. -See [e12s](https://github.com/quisquous/cactbot/blob/main/ui/oopsyraidsy/data/05-shb/raid/e12s.ts) -or [TOP](https://github.com/quisquous/cactbot/blob/main/ui/oopsyraidsy/data/06-ew/ultimate/the_omega_protocol.ts) +See [e12s](https://github.com/OverlayPlugin/cactbot/blob/main/ui/oopsyraidsy/data/05-shb/raid/e12s.ts) +or [TOP](https://github.com/OverlayPlugin/cactbot/blob/main/ui/oopsyraidsy/data/06-ew/ultimate/the_omega_protocol.ts) for examples of more complicated triggers. These complicated triggers are things like: @@ -30,7 +30,7 @@ These complicated triggers are things like: ## Oopsy Mistake Severity The TypeScript type `OopsyMistakeType` has all the different types of mistakes that can be made. -See: [oopsy.d.ts](https://github.com/quisquous/cactbot/blob/main/types/oopsy.d.ts#L9). +See: [oopsy.d.ts](https://github.com/OverlayPlugin/cactbot/blob/main/types/oopsy.d.ts#L9). These each correspond with their own icon. It is very subjective what you assign to each, so don't worry about it too much. @@ -56,9 +56,9 @@ If this is filled out, then it becomes very easy to look through all the ability and move the relevant ones into the oopsy file. As an example, here is the Zeromus Extreme timeline -[ability table](https://github.com/quisquous/cactbot/blob/f15fab608d1700c7a5db6dca243dcc5b97107fab/ui/raidboss/data/06-ew/trial/zeromus-ex.txt#L142-L227) +[ability table](https://github.com/OverlayPlugin/cactbot/blob/f15fab608d1700c7a5db6dca243dcc5b97107fab/ui/raidboss/data/06-ew/trial/zeromus-ex.txt#L142-L227) and here is the -[oopsy file](https://github.com/quisquous/cactbot/blob/f15fab608d1700c7a5db6dca243dcc5b97107fab/ui/oopsyraidsy/data/06-ew/trial/zeromus-ex.ts) +[oopsy file](https://github.com/OverlayPlugin/cactbot/blob/f15fab608d1700c7a5db6dca243dcc5b97107fab/ui/oopsyraidsy/data/06-ew/trial/zeromus-ex.ts) made from that table. ## File Structure @@ -286,7 +286,7 @@ The full order of evaluation of functions in a trigger is: Oopsy has a playback viewer if you want to test it without running content. -It is hosted at . +It is hosted at . If you are [running locally with the webpack dev server](../CONTRIBUTING.md#validating-changes-via-webpack), you can also use it via . @@ -303,7 +303,7 @@ There's plenty of work that could be done to make it better if you want to contr Easier tasks: - Make the [Oopsy Viewer](#testing-oopsy) support `delaySeconds` properly -- create an oopsy `Util` library to collect helper functions like [these](https://github.com/quisquous/cactbot/blob/main/ui/oopsyraidsy/data/06-ew/dungeon/aloalo_island.ts) or [these](https://github.com/quisquous/cactbot/blob/main/ui/oopsyraidsy/data/06-ew/raid/p8s.ts) so that it isn't repeated +- create an oopsy `Util` library to collect helper functions like [these](https://github.com/OverlayPlugin/cactbot/blob/main/ui/oopsyraidsy/data/06-ew/dungeon/aloalo_island.ts) or [these](https://github.com/OverlayPlugin/cactbot/blob/main/ui/oopsyraidsy/data/06-ew/raid/p8s.ts) so that it isn't repeated - bonus: add support for a helper for "you took two of these", for cases where somebody is hit by two stacks - bonus: add support for "this person missed the stack" - make it possible to do `netRegex: { id: '1234', source: 'Mob' }` instead of `netRegex: NetRegexes.ability({ etc })` diff --git a/docs/PatchUpdateChecklist.md b/docs/PatchUpdateChecklist.md index 092c9ea599..8dbc45911e 100644 --- a/docs/PatchUpdateChecklist.md +++ b/docs/PatchUpdateChecklist.md @@ -161,7 +161,7 @@ but this always needs to be reformatted and this change should not be committed ### Update Content List `resources/content_list.ts` is a manually curated list of all content. -This is what appears on the [coverage page](https://quisquous.github.io/cactbot/util/coverage/coverage.html). +This is what appears on the [coverage page](https://overlayplugin.github.io/cactbot/util/coverage/coverage.html). It is also the ordering in the cactbot config ui, although that also sorts by expansion as well. @@ -187,7 +187,7 @@ This could theoretically be done earlier on game data too with Ghidra etc. cactbot has a number of memory signatures that it uses. (Maybe some day cactbot plugin will merge with OverlayPlugin?) -There are four signatures, which all live in [FFXIVProcessIntl.cs](https://github.com/quisquous/cactbot/blob/main/plugin/CactbotEventSource/FFXIVProcessIntl.cs). +There are four signatures, which all live in [FFXIVProcessIntl.cs](https://github.com/OverlayPlugin/cactbot/blob/main/plugin/CactbotEventSource/FFXIVProcessIntl.cs). - Charmap (information about your character) - Job Data (gauge info for your job) @@ -226,7 +226,7 @@ OverlayPlugin will also print out lines like: Even if all the signatures are found, the offsets might be incorrect. -If you add the [cactbot test overlay](https://github.com/quisquous/cactbot#test-module) +If you add the [cactbot test overlay](https://github.com/OverlayPlugin/cactbot#test-module) as an Overlay, it will give you a bunch of information from memory. The most important values are: zone, name, and job id. @@ -236,7 +236,7 @@ Here is a screenshot after the 6.5 patch where the job is broken. ![test overlay](images/newpatch_testoverlay.png) If the signatures are correct, but the offsets are wrong they need to be updated in -[FFXIVProcessIntl.cs](https://github.com/quisquous/cactbot/blob/main/plugin/CactbotEventSource/FFXIVProcessIntl.cs). +[FFXIVProcessIntl.cs](https://github.com/OverlayPlugin/cactbot/blob/main/plugin/CactbotEventSource/FFXIVProcessIntl.cs). See as an example. #### Verify basic info diff --git a/docs/RaidbossGuide.md b/docs/RaidbossGuide.md index 12dfa3949a..8bc9f3c42d 100644 --- a/docs/RaidbossGuide.md +++ b/docs/RaidbossGuide.md @@ -248,10 +248,10 @@ Timeline triggers (whose regex matches timeline text) are in their own section. id: 'id string', type: 'StartsUsing', disabled: false, - // Note: see `NetFields` from [net_fields.d.ts](https://github.com/quisquous/cactbot/blob/main/types/net_fields.d.ts) + // Note: see `NetFields` from [net_fields.d.ts](https://github.com/OverlayPlugin/cactbot/blob/main/types/net_fields.d.ts) // Note: `netRegex: NetRegexes({ id: 'some-id', source: 'some-name' })` is still supported for backwards compatibility. netRegex: { id: 'some-id', source: 'some-name' }, - // Note: prefer to use the regex helpers from [regexes.ts](https://github.com/quisquous/cactbot/blob/main/resources/regexes.ts) + // Note: prefer to use the regex helpers from [regexes.ts](https://github.com/OverlayPlugin/cactbot/blob/main/resources/regexes.ts) regex: Regexes.ability({ id: 'some-id', source: 'some-name' }), condition: function(data, matches, output) { return true if it should run }, preRun: function(data, matches, output) { do stuff.. }, @@ -322,8 +322,8 @@ The `netRegex` version matches against network log lines, while the `regex` version matches against parsed ACT log lines. More commonly, however, a regex replacement is used instead of a bare regex. -Helper functions defined in [regexes.ts](https://github.com/quisquous/cactbot/blob/main/resources/regexes.ts) -and in [netregexes.ts](https://github.com/quisquous/cactbot/blob/main/resources/netregexes.ts) +Helper functions defined in [regexes.ts](https://github.com/OverlayPlugin/cactbot/blob/main/resources/regexes.ts) +and in [netregexes.ts](https://github.com/OverlayPlugin/cactbot/blob/main/resources/netregexes.ts) take the parameters that would otherwise be extracted via match groups. From here, the functions automatically construct the regex that should be matched against. @@ -336,7 +336,7 @@ and for `regex` use the `Regexes` helper. Activates the trigger if the function returns `true`. If it does not return `true`, nothing is shown/sounded/run. If multiple functions are present on the trigger, this has first priority to run. -(Pre-made "canned" conditions are available within [conditions.ts](https://github.com/quisquous/cactbot/blob/main/resources/conditions.ts). +(Pre-made "canned" conditions are available within [conditions.ts](https://github.com/OverlayPlugin/cactbot/blob/main/resources/conditions.ts). Generally speaking it's best to use one of these if it fits the situation.) **preRun: function(data, matches, output)** @@ -376,7 +376,7 @@ A way to return infoText/alertText/alarmText/tts all from a single entrypoint. Also used by `resources/responses.ts`. Response has less priority than an explicitly specified text or tts, and so can be overridden. -(As with `regex` and `condition`, "canned" responses are available within [responses.ts](https://github.com/quisquous/cactbot/blob/main/resources/responses.ts).) +(As with `regex` and `condition`, "canned" responses are available within [responses.ts](https://github.com/OverlayPlugin/cactbot/blob/main/resources/responses.ts).) **alarmText** Displays a text popup with Alarm importance when the trigger activates. @@ -583,10 +583,10 @@ Use of these helpers makes automated testing significantly easier, and allows humans to catch errors and inconsistencies more easily when reviewing pull requests. Currently, three separate elements have pre-made structures defined: -[Condition](https://github.com/quisquous/cactbot/blob/main/resources/conditions.ts), [Regex](https://github.com/quisquous/cactbot/blob/main/resources/regexes.ts), [NetRegex](https://github.com/quisquous/cactbot/blob/main/resources/netregexes.ts), and [Response](https://github.com/quisquous/cactbot/blob/main/resources/responses.ts). +[Condition](https://github.com/OverlayPlugin/cactbot/blob/main/resources/conditions.ts), [Regex](https://github.com/OverlayPlugin/cactbot/blob/main/resources/regexes.ts), [NetRegex](https://github.com/OverlayPlugin/cactbot/blob/main/resources/netregexes.ts), and [Response](https://github.com/OverlayPlugin/cactbot/blob/main/resources/responses.ts). `Condition` functions take no arguments. Almost all `Response` functions take one optional argument, `severity`, used to determine what level of popup text to display to the user when the trigger activates. -`Regex`(`NetRegex`) functions can take several arguments [(`gainsEffect()` is a good example)](https://github.com/quisquous/cactbot/blob/0bd9095682ec15b35f880d2241be365f4bdf6a87/resources/regexes.ts#L348) depending on which log line is being matched against, +`Regex`(`NetRegex`) functions can take several arguments [(`gainsEffect()` is a good example)](https://github.com/OverlayPlugin/cactbot/blob/0bd9095682ec15b35f880d2241be365f4bdf6a87/resources/regexes.ts#L348) depending on which log line is being matched against, but generally a contributor would include the `source`, (name of the caster/user of the ability to match,) the `id`, (the hex ability ID, such as `2478`,) and whether or not the regex should capture the matches (`capture: false`.) `Regex`(`NetRegex`) functions capture by default, but standard practice is to specify non-capturing unless a trigger element requires captures. @@ -716,15 +716,15 @@ and so any PRs to translate anything missing is much appreciated. If you need help using github or git, please ask. Running `npm run coverage-report` will generate the cactbot coverage report, -which can be found online [here](https://quisquous.github.io/cactbot/util/coverage/coverage.html). +which can be found online [here](https://overlayplugin.github.io/cactbot/util/coverage/coverage.html). This report includes links to all of the missing translations: -- [missing_translations_de.html](https://quisquous.github.io/cactbot/util/coverage/missing_translations_de.html) -- [missing_translations_fr.html](https://quisquous.github.io/cactbot/util/coverage/missing_translations_fr.html) -- [missing_translations_ja.html](https://quisquous.github.io/cactbot/util/coverage/missing_translations_ja.html) -- [missing_translations_cn.html](https://quisquous.github.io/cactbot/util/coverage/missing_translations_cn.html) -- [missing_translations_ko.html](https://quisquous.github.io/cactbot/util/coverage/missing_translations_ko.html) +- [missing_translations_de.html](https://overlayplugin.github.io/cactbot/util/coverage/missing_translations_de.html) +- [missing_translations_fr.html](https://overlayplugin.github.io/cactbot/util/coverage/missing_translations_fr.html) +- [missing_translations_ja.html](https://overlayplugin.github.io/cactbot/util/coverage/missing_translations_ja.html) +- [missing_translations_cn.html](https://overlayplugin.github.io/cactbot/util/coverage/missing_translations_cn.html) +- [missing_translations_ko.html](https://overlayplugin.github.io/cactbot/util/coverage/missing_translations_ko.html) You can run `npm run util` and select find translations using the ui. You can also run `npm run util -- findTranslations -f . -l fr` @@ -756,7 +756,7 @@ where the missing translation report for Japanese says this: `ui/oopsyraidsy/dat The `text: {` part of the line is the beginning of the code that is missing the translation. The html report links above have links to the code directly. -This example corresponds to [code](https://github.com/quisquous/cactbot/blob/e47d34b/ui/oopsyraidsy/data/06-ew/raid/p4n.ts#L78-L84) like this: +This example corresponds to [code](https://github.com/OverlayPlugin/cactbot/blob/e47d34b/ui/oopsyraidsy/data/06-ew/raid/p4n.ts#L78-L84) like this: ```typescript text: { @@ -827,7 +827,7 @@ so that timelines and triggers will work in French: #### Common Replacements To avoid having to repeat common translations, -the [common_replacement.ts](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/common_replacement.ts) +the [common_replacement.ts](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/common_replacement.ts) file has a `export const commonReplacement` variable with common `replaceSync` and `replaceText` entries that are implicitly added to all raidboss trigger sets. @@ -951,7 +951,7 @@ the tests will catch that error because it expects that there are no missing tra It is not an `npm run test` error to have `missingTranslations: true` when it is not needed, but this error will show up in the find missing translations script and should be cleaned up if possible. -Missing translations are listed on the [coverage page](https://quisquous.github.io/cactbot/util/coverage/coverage.html) +Missing translations are listed on the [coverage page](https://overlayplugin.github.io/cactbot/util/coverage/coverage.html) by language. #### Escaping @@ -1018,9 +1018,9 @@ One collecting trigger collects all the lines and stores it on `data`. Another call trigger uses the same `netRegex` with a `delaySeconds` + `suppressSeconds` to make the call using that `data`. One final cleanup trigger uses the same `netRegex` with a larger `delaySeconds` + (optional) `suppressSeconds` to erase the collected information on `data`. -- [P7N Hemitheos Aero II Collect](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/06-ew/raid/p7n.ts#:~:text=id%3A%20%27P7N%20Hemitheos%20Aero%20II%20Collect%27) -- [P7N Hemitheos Aero II Call](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/06-ew/raid/p7n.ts#:~:text=id%3A%20%27P7N%20Hemitheos%20Aero%20II%20Call%27) -- [P7N Hemitheos Aero II Cleanup](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/06-ew/raid/p7n.ts#:~:text=id%3A%20%27P7N%20Hemitheos%20Aero%20II%20Cleanup%27) +- [P7N Hemitheos Aero II Collect](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/06-ew/raid/p7n.ts#:~:text=id%3A%20%27P7N%20Hemitheos%20Aero%20II%20Collect%27) +- [P7N Hemitheos Aero II Call](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/06-ew/raid/p7n.ts#:~:text=id%3A%20%27P7N%20Hemitheos%20Aero%20II%20Call%27) +- [P7N Hemitheos Aero II Cleanup](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/06-ew/raid/p7n.ts#:~:text=id%3A%20%27P7N%20Hemitheos%20Aero%20II%20Cleanup%27) Often the cleanup is combined into the call, or is put onto phase transitions or other triggers. @@ -1028,7 +1028,7 @@ Often the cleanup is combined into the call, or is put onto phase transitions or It's possible to have a single trigger do collect/call/cleanup. -See: [AAI Ketuduke Foamy Fetters Bubble Weave](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/06-ew/dungeon/another_aloalo_island.ts#:~:text=id%3A%20%27AAI%20Ketuduke%20Foamy%20Fetters%20Bubble%20Weave%27) +See: [AAI Ketuduke Foamy Fetters Bubble Weave](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/06-ew/dungeon/another_aloalo_island.ts#:~:text=id%3A%20%27AAI%20Ketuduke%20Foamy%20Fetters%20Bubble%20Weave%27) `delaySeconds` does the collecting. As long as the delay is greater than zero this will work, but you can optionally set a delay to zero once you have collected everything you need @@ -1071,7 +1071,7 @@ which emit changing position data for combatants to get an idea of when actors h and it is safe to call `getCombatants`. `CombatantMemory` (as the name implies) does come from memory and so may be slightly delayed. -See: [P10S Dividing Wings Tether](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/06-ew/raid/p10s.ts#:~:text=id%3A%20%27P10S%20Dividing%20Wings%20Tether%27) +See: [P10S Dividing Wings Tether](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/06-ew/raid/p10s.ts#:~:text=id%3A%20%27P10S%20Dividing%20Wings%20Tether%27) Some common suggestions: @@ -1089,8 +1089,8 @@ It's nice to call `Spread => Stack` and then once the spreads go off call `Stack It's both a reminder (for people lost in the sauce) but if the second call triggers on the first damage, it can tell people when it it safe to start moving and the initial mechanic has locked in. -See: [AAI Ketuduke Hydro Buff Double](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/06-ew/dungeon/another_aloalo_island.ts#:~:text=id%3A%20%27AAI%20Ketuduke%20Hydro%20Buff%20Double%27) -and [AAI Ketuduke Hydro Buff Double Followup](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/06-ew/dungeon/another_aloalo_island.ts#:~:text=id%3A%20%27AAI%20Ketuduke%20Hydro%20Buff%20Double%20Followup%27) +See: [AAI Ketuduke Hydro Buff Double](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/06-ew/dungeon/another_aloalo_island.ts#:~:text=id%3A%20%27AAI%20Ketuduke%20Hydro%20Buff%20Double%27) +and [AAI Ketuduke Hydro Buff Double Followup](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/06-ew/dungeon/another_aloalo_island.ts#:~:text=id%3A%20%27AAI%20Ketuduke%20Hydro%20Buff%20Double%20Followup%27) ### Three-step Mechanics @@ -1113,11 +1113,11 @@ The benefits of this are: - people can turn off parts of this they don't want - if final two `Second` and `Third` calls are based on ability ids of the `First` and `Second` abilities going off, then it's safe to do that movement when it goes off -See: [P12S First Wing](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/06-ew/raid/p12s.ts#:~:text=id%3A%20%27P12S%20First%20Wing%27), -[P12S Wing Collect](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/06-ew/raid/p12s.ts#:~:text=id%3A%20%27P12S%20Wing%20Collect%27), -[P12S Wing Followup](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/06-ew/raid/p12s.ts#:~:text=id%3A%20%27P12S%20Wing%20Followup%27) +See: [P12S First Wing](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/06-ew/raid/p12s.ts#:~:text=id%3A%20%27P12S%20First%20Wing%27), +[P12S Wing Collect](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/06-ew/raid/p12s.ts#:~:text=id%3A%20%27P12S%20Wing%20Collect%27), +[P12S Wing Followup](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/06-ew/raid/p12s.ts#:~:text=id%3A%20%27P12S%20Wing%20Followup%27) -See also: [AMR Moko Triple Kasumi-giri triggers](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/06-ew/dungeon/another_mount_rokkon.ts) +See also: [AMR Moko Triple Kasumi-giri triggers](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/06-ew/dungeon/another_mount_rokkon.ts) ## Future Work diff --git a/docs/RemoteCactbot.md b/docs/RemoteCactbot.md index 37a5fe93e0..0d6fefbe00 100644 --- a/docs/RemoteCactbot.md +++ b/docs/RemoteCactbot.md @@ -70,7 +70,7 @@ Going to If this is set up properly, you can select an overlay preset like `Cactbot Test` and it will give you a url to open in a browser, e.g. - + That file is a web page being served by github, but the query string tells the overlay web page to connect to your ACT instance. @@ -87,16 +87,16 @@ Unfortunately, all of the overlay html pages needs to be hosted remotely. Rather than loading local urls from your filesystem like `C:\Users\tinipoutini\cactbot\ui\raidboss\raidboss.html` you need to use github urls like -`https://quisquous.github.io/cactbot/ui/raidboss/raidboss.html`. +`https://overlayplugin.github.io/cactbot/ui/raidboss/raidboss.html`. In general, you can use the URL Generator at the bottom of the OverlayPlugin tab to generate urls for any presets. For example: -- cactbot raidboss overlay: -- rdmty DPS overlay: -- cactbot oopsy: +- cactbot raidboss overlay: +- rdmty DPS overlay: +- cactbot oopsy: ### Configure Raidboss @@ -138,7 +138,7 @@ so please only file a cactbot github issue if your raidboss party override doesn ### Troubleshooting Hints If you are looking at url in the browser like - + and you don't see any data, even though you are in game, ACT is running, and the ACT WSServer is running, then you should look at devtools. diff --git a/docs/TimelineGuide.md b/docs/TimelineGuide.md index 2dac6fc354..66e27a3bae 100644 --- a/docs/TimelineGuide.md +++ b/docs/TimelineGuide.md @@ -5,7 +5,7 @@ primarily for cactbot. ![import screenshot](images/timelineguide_timeline.png) -cactbot uses the [raidboss module](https://github.com/quisquous/cactbot#raidboss-module) +cactbot uses the [raidboss module](https://github.com/OverlayPlugin/cactbot#raidboss-module) for triggers and timelines. These are combined together so that you can make triggers that are based on actions or triggers that are based on timelines themselves. @@ -448,13 +448,13 @@ This is done by adding a `timelineTriggers` section to the triggers file. Examples: -* [Orbonne Monastery](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/04-sb/alliance/orbonne_monastery.ts) -* [T9](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/02-arr/raid/t9.ts) -* [O12 normal](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/04-sb/raid/o12n.ts) +* [Orbonne Monastery](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/04-sb/alliance/orbonne_monastery.ts) +* [T9](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/02-arr/raid/t9.ts) +* [O12 normal](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/04-sb/raid/o12n.ts) -These triggers have the [same syntax](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/README.txt) as normal triggers. +These triggers have the [same syntax](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/README.txt) as normal triggers. They still allow you to use functions if you want to return something. -You can use a [condition](https://github.com/quisquous/cactbot/blob/5a7011c662d65f44c12c2fbff255484f2d31b8ef/ui/raidboss/data/02-arr/raid/t9.js#L10) to have it only trigger for a particular job or role. +You can use a [condition](https://github.com/OverlayPlugin/cactbot/blob/5a7011c662d65f44c12c2fbff255484f2d31b8ef/ui/raidboss/data/02-arr/raid/t9.js#L10) to have it only trigger for a particular job or role. However there are a few differences: @@ -486,7 +486,7 @@ See: [user/raidboss.js](https://github.com/quisquous/cactbot-user/blob/641488590 ## Timeline Translation To support multiple languages, cactbot trigger files support a `timelineReplace` section. -You can see an example in [o12s.js](https://github.com/quisquous/cactbot/blob/ecbb723f097328c7bd0476352e5135bd5f776248/ui/raidboss/data/triggers/o12s.js#L608). +You can see an example in [o12s.js](https://github.com/OverlayPlugin/cactbot/blob/ecbb723f097328c7bd0476352e5135bd5f776248/ui/raidboss/data/triggers/o12s.js#L608). This section contains a bunch of regular expressions to replace in syncs, texts, and effects. This has two purposes. @@ -529,7 +529,7 @@ If you don't want to stream publicly, unlisted youtube videos are a good option. ### Software prerequisites * [Node.js](https://nodejs.org/en/) -* A copy of cactbot's [source code](https://github.com/quisquous/cactbot/archive/main.zip) +* A copy of cactbot's [source code](https://github.com/OverlayPlugin/cactbot/archive/main.zip) * See: [CONTRIBUTING.md](../CONTRIBUTING.md#development-workflow) ### Timeline Skeleton @@ -604,7 +604,7 @@ $ node --loader=ts-node/esm util/logtools/make_timeline.ts -f docs/logs/TheAbyss ``` `-lf` lists all of the fights and their zones. -This log file has been run through the [log splitter](https://quisquous.github.io/cactbot/util/logtools/splitter.html) +This log file has been run through the [log splitter](https://overlayplugin.github.io/cactbot/util/logtools/splitter.html) and anonymized, and so there are only three fights. You can make a timeline for a particular fight by using `-lf` with the index, e.g. `-lf 1`. diff --git a/docs/ko-KR/CactbotCustomization.md b/docs/ko-KR/CactbotCustomization.md index ed82bdbcbe..b6e5b2080a 100644 --- a/docs/ko-KR/CactbotCustomization.md +++ b/docs/ko-KR/CactbotCustomization.md @@ -144,7 +144,7 @@ ACT -> Plugins -> OverlayPlugin.dll -> 원하는 오버레이 -> 개발자 도 일부분은 사용자 요소(custom element)를 사용하고, 사용자 요소는 별도로 튜닝하는 방법을 제공하지 않기 때문입니다. 만약 수정이 불가능한 타임라인 막대에 대해 원하는 수정 사항이 있다면, -얼마든지 [Github Issue](https://github.com/quisquous/cactbot/issues/new/choose)에 글을 작성해주세요. +얼마든지 [Github Issue](https://github.com/OverlayPlugin/cactbot/issues/new/choose)에 글을 작성해주세요. **경고**: cactbot은 CSS 하위 호환 유지를 보장하지 않습니다. 나중에 cactbot에서 요소들을 재배열 할 수도 있고, @@ -210,7 +210,7 @@ Options.Triggers.push({ 이를 해결하는 방법으로는 트리거의 출력을 수정하여 조정하는 것이 있습니다. fireball #1 원본 트리거는 -[ui/raidboss/data/04-sb/ultimate/unending_coil_ultimate.js](https://github.com/quisquous/cactbot/blob/triggers/04-sb/ultimate/unending_coil_ultimate.js#:~:text=UCU%20Nael%20Fireball%201)에서 찾을 수 있습니다. +[ui/raidboss/data/04-sb/ultimate/unending_coil_ultimate.js](https://github.com/OverlayPlugin/cactbot/blob/triggers/04-sb/ultimate/unending_coil_ultimate.js#:~:text=UCU%20Nael%20Fireball%201)에서 찾을 수 있습니다. 이 코드들을 `cactbot/user/raidboss.js` 파일 아래 부분에 붙여넣습니다. @@ -242,7 +242,7 @@ Options.Triggers.push({ 지금은 도발 알림이 같은 파티나 연합 파티에 있는 경우에만 작동하고, 일부 직업에 대해서만 작동하고 있습니다. 이 예시는 어떻게 모든 플레이어에 대해 알림을 보여주도록 만들 수 있는지 보여줍니다. 도발 트리거는 -[ui/raidboss/data/00-misc/general.js](https://github.com/quisquous/cactbot/blob/triggers/00-misc/general.js#:~:text=General%20Provoke)에서 찾을 수 있습니다. +[ui/raidboss/data/00-misc/general.js](https://github.com/OverlayPlugin/cactbot/blob/triggers/00-misc/general.js#:~:text=General%20Provoke)에서 찾을 수 있습니다. 다음 예시는 `condition` 함수(function)가 수정된 버전입니다. 이 트리거는 cactbot에 내장된 트리거인 `General Provoke`와 id가 동일하기 때문에 @@ -411,7 +411,7 @@ User 폴더의 위치를 모른다면, [User 디렉토리 설정하기](#User- }); ``` -1) [데이터 목록](https://github.com/quisquous/cactbot/tree/triggers)에서 지금 수정하고 싶은 레이드나 던전의 `.js` 파일을 찾아서 여세요. 해당하는 던전의 영문명은 직접 알아내야 합니다. +1) [데이터 목록](https://github.com/OverlayPlugin/cactbot/tree/triggers)에서 지금 수정하고 싶은 레이드나 던전의 `.js` 파일을 찾아서 여세요. 해당하는 던전의 영문명은 직접 알아내야 합니다. 1) `raidboss.js` 파일에 붙여넣은 내용 중, `ZoneId.SomeId`를 지우고 그 위치에 방금 찾아서 연 `.js` 파일에 나와있는 `zoneId`를 붙여넣습니다. 예시) `e8s.js`에는 `ZoneId.EdensVerseRefulgenceSavage`가 `zoneId`로 적혀있으므로, `ZoneId.SomeId`를 지우고 `ZoneId.EdensVerseRefulgenceSavage`를 붙여넣습니다. @@ -476,7 +476,7 @@ User 폴더의 위치를 모른다면, [User 디렉토리 설정하기](#User- 1) `user` 폴더의 `raidboss.js` 파일을 편집 프로그램으로 엽니다. (메모장으로도 가능하며, 추가 프로그램을 설치할 의향이 있다면, [notepad++](https://notepad-plus-plus.org/downloads/)를 추천합니다.) 해당 파일이 없다면, 새로 만듭니다. 확장자가 js로 생성됐는지 반드시 확인하세요. -1) 수정하고 싶은 타임라인을 [데이터 목록](https://github.com/quisquous/cactbot/tree/triggers)에서 다운로드하세요. +1) 수정하고 싶은 타임라인을 [데이터 목록](https://github.com/OverlayPlugin/cactbot/tree/triggers)에서 다운로드하세요. 1) 목록에서 해당 파일을 찾습니다. 1) `Raw` 버튼을 클릭합니다. 1) 화면 우클릭 후, `다른 이름으로 저장`을 클릭하면 다운로드할 수 있습니다. @@ -494,7 +494,7 @@ User 폴더의 위치를 모른다면, [User 디렉토리 설정하기](#User- }); ``` -1) 수정하고 싶은 타임라인의 던전에 해당하는 `.js` 파일을 [데이터 목록](https://github.com/quisquous/cactbot/tree/triggers)에서 열고, 그 파일 상단에 있는 `zoneId` 값을 `ZoneId.SomeId` 대신 집어 넣습니다. 예를 들어, 절알렉 타임라인을 수정하고 있다면, `the_epic_of_alexander.js`을 열어서 그 곳에 적힌 `ZoneId.TheEpicOfAlexanderUltimate`를 `ZoneId.SomeId`를 대신해 붙여넣습니다. +1) 수정하고 싶은 타임라인의 던전에 해당하는 `.js` 파일을 [데이터 목록](https://github.com/OverlayPlugin/cactbot/tree/triggers)에서 열고, 그 파일 상단에 있는 `zoneId` 값을 `ZoneId.SomeId` 대신 집어 넣습니다. 예를 들어, 절알렉 타임라인을 수정하고 있다면, `the_epic_of_alexander.js`을 열어서 그 곳에 적힌 `ZoneId.TheEpicOfAlexanderUltimate`를 `ZoneId.SomeId`를 대신해 붙여넣습니다. 1) `timelineFile` 뒤의 `txt` 파일명을 방금 다운로드한 타임라인 `txt` 파일명으로 수정합니다. diff --git a/docs/ko-KR/README.md b/docs/ko-KR/README.md index dae7f53e69..a7dd6b7ccb 100644 --- a/docs/ko-KR/README.md +++ b/docs/ko-KR/README.md @@ -2,8 +2,8 @@ -[![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/quisquous/cactbot/test.yml?branch=main)](https://github.com/quisquous/cactbot/actions?query=workflow%3ATest+branch%3Amain) -[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/quisquous/cactbot?color=brightgreen&sort=semver)](https://github.com/quisquous/cactbot/releases/latest) +[![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/quisquous/cactbot/test.yml?branch=main)](https://github.com/OverlayPlugin/cactbot/actions?query=workflow%3ATest+branch%3Amain) +[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/quisquous/cactbot?color=brightgreen&sort=semver)](https://github.com/OverlayPlugin/cactbot/releases/latest) 🌎 [[English](../../README.md)] [[简体中文](../zh-CN/README.md)] [**한국어**] @@ -260,7 +260,7 @@ Webpack에 대해 더 자세히 알고 싶다면 텍스트와 사운드 알람은 ACT의 "커스텀 트리거" 기능과 비슷한 방식으로, 전투 타임라인이나 게임에서 찍히는 로그 메시지를 기반으로 제공됩니다. 이 모듈은 월드 오브 워크래프트의 [BigWigs Bossmods](https://www.curseforge.com/wow/addons/big-wigs) 애드온과 비슷하게 보이고 느껴지도록 디자인 되었습니다. -[이 페이지](https://quisquous.github.io/cactbot/util/coverage/coverage.html?lang=ko)에는 +[이 페이지](https://overlayplugin.github.io/cactbot/util/coverage/coverage.html?lang=ko)에는 현재 cactbot이 지원하는 컨텐츠 목록이 나열되어 있습니다. 지원하는 컨텐츠는 계속해서 늘리고 있습니다. 하지만 많은 수의 오래된 컨텐츠들이 아직 지원되지 않습니다. diff --git a/docs/zh-CN/CactbotCustomization.md b/docs/zh-CN/CactbotCustomization.md index f20723a2d9..89833c8c25 100644 --- a/docs/zh-CN/CactbotCustomization.md +++ b/docs/zh-CN/CactbotCustomization.md @@ -105,7 +105,7 @@ cactbot将按照字母顺序优先加载user文件夹中的子文件夹里的文 我们推荐使用 [Chrome DevTools](https://developers.google.com/web/tools/chrome-devtools) 以调试CSS。您可以通过 ACT -> Plugins -> OverlayPlugin.dll -> 您的悬浮窗名字 -> 启动Debug工具 按钮以开启DevTools。 -**注意**：某些组件的自定义较为困难，甚至无法进行自定义，如时间轴的进度条等。原因是，这些组件属于自定义HTML元素，且没有开放外部配置的接口。如果您有特别的需求，但是不知道如何修改，您可以提出一个 [github issue](https://github.com/quisquous/cactbot/issues/new/choose)。 +**注意**：某些组件的自定义较为困难，甚至无法进行自定义，如时间轴的进度条等。原因是，这些组件属于自定义HTML元素，且没有开放外部配置的接口。如果您有特别的需求，但是不知道如何修改，您可以提出一个 [github issue](https://github.com/OverlayPlugin/cactbot/issues/new/choose)。 **警告**：cactbot不保证CSS的向后兼容性。在以后的更改中，cactbot可能会重新组织网页结构，改变元素名称和类名称，甚至重构所有样式。因此，您需知晓您的自定义CSS有在将来出现问题的风险。 @@ -113,7 +113,7 @@ cactbot将按照字母顺序优先加载user文件夹中的子文件夹里的文 您可以通过用户自定义js文件(例如 `user/raidboss.js` 或 `user/raidboss/` 目录下的任意 `.js` 文件)自定义触发器行为。您可以修改输出文本、适用职业、文本显示的时间等等。 -您可以在[这个分支](https://github.com/quisquous/cactbot/tree/triggers)查看所有触发器的 JavaScript 版本。我们推荐您查看、拷贝并粘贴这个分支中的代码实现您自己的触发器。主分支（main）中的触发器代码基于 TypeScript 写成，无法直接在ACT或浏览器中运行；而发行版本中的代码经过了编译与混淆，对于人类来说难以阅读，因此不作推荐。 +您可以在[这个分支](https://github.com/OverlayPlugin/cactbot/tree/triggers)查看所有触发器的 JavaScript 版本。我们推荐您查看、拷贝并粘贴这个分支中的代码实现您自己的触发器。主分支（main）中的触发器代码基于 TypeScript 写成，无法直接在ACT或浏览器中运行；而发行版本中的代码经过了编译与混淆，对于人类来说难以阅读，因此不作推荐。 在您的raidboss模块用户自定义js文件中，`Options.Triggers` 是一个存放了触发器集合的列表。您可以通过此变量添加新触发器，或修改已有的触发器。若用户文件中存在与现有触发器 (cactbot官方提供的) 相同id的触发器，则会将后者完全覆盖。 @@ -135,7 +135,7 @@ Options.Triggers.push({ }); ``` -最简单的定制触发器的方式是直接复制上面那一大块代码粘贴到此文件再进行修改。您可以修改 `zoneId` 一行为您想要触发器响应的区域id，通常位于cactbot触发器文件的顶部。[该文件](../../resources/zone_id.ts)中列出了所有可用的区域id。若您定义了错误的id，OverlayPlugin的日志窗口将会输出警告信息。然后[复制触发器文本](https://github.com/quisquous/cactbot/tree/triggers)并粘贴至此，按您的喜好进行修改。当你修改完成后，重载raidboss悬浮窗以应用更改。 +最简单的定制触发器的方式是直接复制上面那一大块代码粘贴到此文件再进行修改。您可以修改 `zoneId` 一行为您想要触发器响应的区域id，通常位于cactbot触发器文件的顶部。[该文件](../../resources/zone_id.ts)中列出了所有可用的区域id。若您定义了错误的id，OverlayPlugin的日志窗口将会输出警告信息。然后[复制触发器文本](https://github.com/OverlayPlugin/cactbot/tree/triggers)并粘贴至此，按您的喜好进行修改。当你修改完成后，重载raidboss悬浮窗以应用更改。 **注意**：此方式会将原触发器完全移除，因此请在修改时不要删除任何逻辑代码。触发器均采用JavaScript编写，因此必须采用标准JavaScript语法。若您不是字面意义上的程序员，您需要格外注意这点。 @@ -145,7 +145,7 @@ Options.Triggers.push({ 若您只是想修改 `信息文本`，你可以 [通过cactbot配置界面改变触发器文本](#通过cactbot配置界面改变触发器文本) 实现。 -其中一种调整方式是编辑触发器的输出。您可以在 [ui/raidboss/data/04-sb/ultimate/unending_coil_ultimate.js](https://github.com/quisquous/cactbot/blob/triggers/04-sb/ultimate/unending_coil_ultimate.js#:~:text=UCU%20Nael%20Fireball%201) 中找到原本的 fireball #1 触发器。 +其中一种调整方式是编辑触发器的输出。您可以在 [ui/raidboss/data/04-sb/ultimate/unending_coil_ultimate.js](https://github.com/OverlayPlugin/cactbot/blob/triggers/04-sb/ultimate/unending_coil_ultimate.js#:~:text=UCU%20Nael%20Fireball%201) 中找到原本的 fireball #1 触发器。 您需要将以下的代码粘贴至您的用户自定义js文件底部。 @@ -179,7 +179,7 @@ Options.Triggers.push({ ### 例2：使挑衅提示适用于全职业 -目前，只有团队成员的挑衅会触发提示，并且不是所有职业都能收到提示。该例子展示了如何使其适用于所有职业。挑衅触发器可以在 [ui/raidboss/data/00-misc/general.js](https://github.com/quisquous/cactbot/blob/triggers/00-misc/general.js#:~:text=General%20Provoke) 中找到。 +目前，只有团队成员的挑衅会触发提示，并且不是所有职业都能收到提示。该例子展示了如何使其适用于所有职业。挑衅触发器可以在 [ui/raidboss/data/00-misc/general.js](https://github.com/OverlayPlugin/cactbot/blob/triggers/00-misc/general.js#:~:text=General%20Provoke) 中找到。 我们需要修改 `condition` 函数(function)。此处的id应当与内置的 `General Provoke` 触发器一致，才能正确覆盖同名的内置触发器。 diff --git a/docs/zh-CN/MemorySignatures.md b/docs/zh-CN/MemorySignatures.md index b60efbbee4..d026b0b286 100644 --- a/docs/zh-CN/MemorySignatures.md +++ b/docs/zh-CN/MemorySignatures.md @@ -205,7 +205,7 @@ 此签名中的问号指代的四字节地址便是我们所关心的指针的地址。 -Cactbot中也有一个可供参考的[例子](https://github.com/quisquous/cactbot/blob/df176c4feff81bab356a8e5e6e6b453e94626320/CactbotOverlay/FFXIVProcess.cs#L189)。 +Cactbot中也有一个可供参考的[例子](https://github.com/OverlayPlugin/cactbot/blob/df176c4feff81bab356a8e5e6e6b453e94626320/CactbotOverlay/FFXIVProcess.cs#L189)。 为了确保签名是唯一的，我们需要再做一次[扫描现有的内存签名](#扫描现有的内存签名)。 diff --git a/docs/zh-CN/README.md b/docs/zh-CN/README.md index d126b16f00..66439a6804 100644 --- a/docs/zh-CN/README.md +++ b/docs/zh-CN/README.md @@ -2,7 +2,7 @@ -[![GitHub 工作流程状态（分支）](https://img.shields.io/github/actions/workflow/status/quisquous/cactbot/test.yml?branch=main)](https://github.com/quisquous/cactbot/actions?query=workflow%3ATest+branch%3Amain) [![GitHub 发行版（最新的 SemVer）](https://img.shields.io/github/v/release/quisquous/cactbot?color=brightgreen\&sort=semver)](https://github.com/quisquous/cactbot/releases/latest) +[![GitHub 工作流程状态（分支）](https://img.shields.io/github/actions/workflow/status/quisquous/cactbot/test.yml?branch=main)](https://github.com/OverlayPlugin/cactbot/actions?query=workflow%3ATest+branch%3Amain) [![GitHub 发行版（最新的 SemVer）](https://img.shields.io/github/v/release/quisquous/cactbot?color=brightgreen\&sort=semver)](https://github.com/OverlayPlugin/cactbot/releases/latest) 🌎 [[English](../../README.md)] [**简体中文**] [[한국어](../ko-KR/README.md)] @@ -220,7 +220,7 @@ ThirdParty 此模块提供预知战斗事件的时间轴，以及文本和音频提示，以帮助提高团队对 raid 的意识。这些文字和声音警报一般基于战斗时间轴，或是来自游戏中发生的日志消息。简单地说，这是一个类似于 ACT 的 “自定义触发器” 的功能。该模块被设计为类似于《魔兽世界》的 [BigWigs Bossmods](https://www.curseforge.com/wow/addons/big-wigs) 插件的外观和感觉。 -[此页面](https://quisquous.github.io/cactbot/util/coverage/coverage.html) 列出了当前 cactbot 中支持的副本。我们会持续添加更多支持 (随时欢迎贡献代码！) 尽管许多旧副本仍未支持。 +[此页面](https://overlayplugin.github.io/cactbot/util/coverage/coverage.html) 列出了当前 cactbot 中支持的副本。我们会持续添加更多支持 (随时欢迎贡献代码！) 尽管许多旧副本仍未支持。 战斗时间轴原本是设计为用于 [ACT 时间轴](https://github.com/grindingcoil/act_timeline)插件的文件，不过增加了一些[扩展语法](./TimelineGuide.md)。这里是原插件的 [文档](http://dtguilds.enjin.com/forum/m/37032836/viewthread/26353492-act-timeline-plugin)。 @@ -248,10 +248,10 @@ ThirdParty 并在Chrome中访问 `http://127.0.0.1:8080/ui/raidboss/raidemulator.html?OVERLAY_WS=ws://127.0.0.1:10501/ws` 如果您正在开发用户自定义触发器， -您可以在Chrome中访问 `https://quisquous.github.io/cactbot/ui/raidboss/raidemulator.html?OVERLAY_WS=ws://127.0.0.1:10501/ws` +您可以在Chrome中访问 `https://overlayplugin.github.io/cactbot/ui/raidboss/raidemulator.html?OVERLAY_WS=ws://127.0.0.1:10501/ws` 如果您正在尝试复现一个问题， -您可以在Chrome中访问 `https://quisquous.github.io/cactbot/ui/raidboss/raidemulator.html` +您可以在Chrome中访问 `https://overlayplugin.github.io/cactbot/ui/raidboss/raidemulator.html` 在这种情况下，您不需要运行WS服务器。 成功加载网页后，继续按照以下说明使用模拟器。 diff --git a/docs/zh-CN/RaidbossGuide.md b/docs/zh-CN/RaidbossGuide.md index 8eadaf7c7f..f455c6842f 100644 --- a/docs/zh-CN/RaidbossGuide.md +++ b/docs/zh-CN/RaidbossGuide.md @@ -88,10 +88,10 @@ export default { id: 'id string', type: 'StartsUsing', disabled: false, - // 提示：参见 [net_fields.d.ts](https://github.com/quisquous/cactbot/blob/main/types/net_fields.d.ts) 中的 `NetFields` 类型。 + // 提示：参见 [net_fields.d.ts](https://github.com/OverlayPlugin/cactbot/blob/main/types/net_fields.d.ts) 中的 `NetFields` 类型。 // 提示：写成 `netRegex: NetRegexes({ id: 'some-id', source: 'some-name' })` 也是可以的，这个属性会向后兼容。 netRegex: { id: 'some-id', source: 'some-name' }, - // 提示：推荐使用 [regexes.ts](https://github.com/quisquous/cactbot/blob/main/resources/regexes.ts) 中的辅助函数。 + // 提示：推荐使用 [regexes.ts](https://github.com/OverlayPlugin/cactbot/blob/main/resources/regexes.ts) 中的辅助函数。 regex: Regexes.ability({ id: 'some-id', source: 'some-name' }), condition: function(data, matches, output) { /* 当需要激活该触发器时返回 true */ }, preRun: function(data, matches, output) { /* 触发器的预处理 */ }, @@ -139,12 +139,12 @@ export default { **netRegex / regex** 正则表达式，cactbot会将该正则表达式与每一条日志行做比对，并在匹配成功时触发当前触发器。`netRegex` 版本用于匹配网络日志行，而 `regex` 版本用于匹配普通的ACT日志行。 -更多时候，相对于直接使用正则表达式字面量，我们更加推荐使用正则替换函数。正则替换函数是指定义在 [regexes.ts](https://github.com/quisquous/cactbot/blob/main/resources/regexes.ts) 和 [netregexes.ts](https://github.com/quisquous/cactbot/blob/main/resources/netregexes.ts) 中的辅助函数，这些函数可以接受特定参数值用于匹配日志，并通过正则捕获组的方式帮助你提取未定义的参数值。换句话说，这些函数用于自动构建能够匹配指定类型的日志行的正则表达式。顾名思义，`netRegex` 使用 `NetRegexes` 辅助函数，而 `regex` 使用 `Regexes` 辅助函数。 +更多时候，相对于直接使用正则表达式字面量，我们更加推荐使用正则替换函数。正则替换函数是指定义在 [regexes.ts](https://github.com/OverlayPlugin/cactbot/blob/main/resources/regexes.ts) 和 [netregexes.ts](https://github.com/OverlayPlugin/cactbot/blob/main/resources/netregexes.ts) 中的辅助函数，这些函数可以接受特定参数值用于匹配日志，并通过正则捕获组的方式帮助你提取未定义的参数值。换句话说，这些函数用于自动构建能够匹配指定类型的日志行的正则表达式。顾名思义，`netRegex` 使用 `NetRegexes` 辅助函数，而 `regex` 使用 `Regexes` 辅助函数。 `regex` 和 `netRegex` 会使用 `timelineReplace` 中的值自动翻译到对应语言。 **condition: function(data, matches)** -当函数返回 `true` 时激活该触发器。若返回的不是 `true`，则当前触发器不会有任何响应。不管触发器对象里定义了多少函数，该函数总是第一个执行。([conditions.ts](https://github.com/quisquous/cactbot/blob/main/resources/conditions.ts) 中定义了一部分高阶条件函数。一般情况下，如果与情境相符，使用这些函数是最佳解决方案。) +当函数返回 `true` 时激活该触发器。若返回的不是 `true`，则当前触发器不会有任何响应。不管触发器对象里定义了多少函数，该函数总是第一个执行。([conditions.ts](https://github.com/OverlayPlugin/cactbot/blob/main/resources/conditions.ts) 中定义了一部分高阶条件函数。一般情况下，如果与情境相符，使用这些函数是最佳解决方案。) **preRun: function(data, matches)** 当触发器被激活时，该函数会在条件判定成功后立刻执行。 @@ -168,7 +168,7 @@ export default { 从0到1的音量数值，触发器激活时播放的音量大小。 **response** -用于返回 infoText/alertText/alarmText/tts 的快捷方法。 这些函数定义于 `resources/responses.ts`。 Response 的优先级比直接指定的文字或TTS低，因此可以被覆盖。 (如同 `regex` 和 `condition` 一样，[responses.ts](https://github.com/quisquous/cactbot/blob/main/resources/responses.ts) 中定义了一些便于使用的高阶函数。) +用于返回 infoText/alertText/alarmText/tts 的快捷方法。 这些函数定义于 `resources/responses.ts`。 Response 的优先级比直接指定的文字或TTS低，因此可以被覆盖。 (如同 `regex` 和 `condition` 一样，[responses.ts](https://github.com/OverlayPlugin/cactbot/blob/main/resources/responses.ts) 中定义了一些便于使用的高阶函数。) **alarmText** 当触发器激活时显示**警报**级别的文本。该属性一般用于高危事件，如处理失败必死无疑的机制、会导致团灭的机制，或处理失败会导致通关变得更加困难的机制等。(例如T2的亚拉戈病毒，T7的诅咒之嚎，或是O7S里奥尔特罗斯先生的石肤等)。其值可以是字符串或返回字符串的 `function(data, matches)`。 @@ -322,7 +322,7 @@ comment: { 为统一触发器构造，以及减轻翻译时的手动负担，cactbot的触发器元素广泛运用了高阶函数。诸如此类的工具函数使自动化测试更为简单，并让人们在审查拉取更改时更容易捕获错误及文本差异。 -目前我们对于元素的独立预定义结构有4种：[Condition](https://github.com/quisquous/cactbot/blob/main/resources/conditions.ts)、[Regex](https://github.com/quisquous/cactbot/blob/main/resources/regexes.ts)、[NetRegex](https://github.com/quisquous/cactbot/blob/main/resources/netregexes.ts) 以及 [Response](https://github.com/quisquous/cactbot/blob/main/resources/responses.ts)。`Condition` 函数不接受参数，而几乎所有的 `Response` 函数都接受 `severity` 参数，用于定义触发器被激活时输出的警报文本的等级。`Regex` 和 `NetRegex` 函数根据匹配的日志行，接受若干参数 [(例如 `gainsEffect()`)](https://github.com/quisquous/cactbot/blob/0bd9095682ec15b35f880d2241be365f4bdf6a87/resources/regexes.ts#L348)，不管哪种日志行一般都接受 `source` 属性 (技能的咏唱者/释放者的名称)，`id` 属性 (十六进制的技能ID，例如 `2478`)，以及正则表达式匹配时是否启用捕获组 (`capture: false`)。`Regex` 和 `NetRegex` 函数默认开启捕获组，但按惯例应当仅对依赖捕获数据的触发器开启捕获。 +目前我们对于元素的独立预定义结构有4种：[Condition](https://github.com/OverlayPlugin/cactbot/blob/main/resources/conditions.ts)、[Regex](https://github.com/OverlayPlugin/cactbot/blob/main/resources/regexes.ts)、[NetRegex](https://github.com/OverlayPlugin/cactbot/blob/main/resources/netregexes.ts) 以及 [Response](https://github.com/OverlayPlugin/cactbot/blob/main/resources/responses.ts)。`Condition` 函数不接受参数，而几乎所有的 `Response` 函数都接受 `severity` 参数，用于定义触发器被激活时输出的警报文本的等级。`Regex` 和 `NetRegex` 函数根据匹配的日志行，接受若干参数 [(例如 `gainsEffect()`)](https://github.com/OverlayPlugin/cactbot/blob/0bd9095682ec15b35f880d2241be365f4bdf6a87/resources/regexes.ts#L348)，不管哪种日志行一般都接受 `source` 属性 (技能的咏唱者/释放者的名称)，`id` 属性 (十六进制的技能ID，例如 `2478`)，以及正则表达式匹配时是否启用捕获组 (`capture: false`)。`Regex` 和 `NetRegex` 函数默认开启捕获组，但按惯例应当仅对依赖捕获数据的触发器开启捕获。 以下是使用了这三种元素的示例触发器： @@ -433,15 +433,15 @@ Cactbot在原基础上实现了一部分扩展语法。扩展语法可以在时 大部分 cactbot 开发者都使用英语游玩 FFXIV，因此我们非常感谢所有能够提交翻译的拉取请求的人们，我们也欢迎针对 github 和 git 的使用的提问。 -你可以运行 `npm run coverage-report` 以生成 cactbot 覆盖率报告，在[这里](https://quisquous.github.io/cactbot/util/coverage/coverage.html)还有当前主分支的在线版本。 +你可以运行 `npm run coverage-report` 以生成 cactbot 覆盖率报告，在[这里](https://overlayplugin.github.io/cactbot/util/coverage/coverage.html)还有当前主分支的在线版本。 覆盖率报告也包含了翻译内容的覆盖率，如： -- [德文覆盖率报告](https://quisquous.github.io/cactbot/util/coverage/missing_translations_de.html) -- [法文覆盖率报告](https://quisquous.github.io/cactbot/util/coverage/missing_translations_fr.html) -- [日文覆盖率报告](https://quisquous.github.io/cactbot/util/coverage/missing_translations_ja.html) -- [中文覆盖率报告](https://quisquous.github.io/cactbot/util/coverage/missing_translations_cn.html) -- [韩文覆盖率报告](https://quisquous.github.io/cactbot/util/coverage/missing_translations_ko.html) +- [德文覆盖率报告](https://overlayplugin.github.io/cactbot/util/coverage/missing_translations_de.html) +- [法文覆盖率报告](https://overlayplugin.github.io/cactbot/util/coverage/missing_translations_fr.html) +- [日文覆盖率报告](https://overlayplugin.github.io/cactbot/util/coverage/missing_translations_ja.html) +- [中文覆盖率报告](https://overlayplugin.github.io/cactbot/util/coverage/missing_translations_cn.html) +- [韩文覆盖率报告](https://overlayplugin.github.io/cactbot/util/coverage/missing_translations_ko.html) 待办事项：对于中国服/韩国服，更好地做法是将未公开的版本显示为无需翻译。 @@ -462,7 +462,7 @@ cactbot 中许多代码使用了 `LocaleText` 类型取代需要翻译的字符 下面是一个缺失了日语翻译的例子，测试报告会指出这个问题：`ui/oopsyraidsy/data/06-ew/raid/p4n.ts:78 [code] text: {`。其中 `text: {` 部分是缺失了日语翻译的代码起始部分。HTML 报告页面也有链接到对应代码的链接。 -这个例子取自[这里](https://github.com/quisquous/cactbot/blob/e47d34b/ui/oopsyraidsy/data/06-ew/raid/p4n.ts#L78-L84)： +这个例子取自[这里](https://github.com/OverlayPlugin/cactbot/blob/e47d34b/ui/oopsyraidsy/data/06-ew/raid/p4n.ts#L78-L84)： ```typescript text: { @@ -524,7 +524,7 @@ cactbot 中许多代码使用了 `LocaleText` 类型取代需要翻译的字符 #### 通用翻译替换 -为了避免重复翻译相似的字段很多次，[common_replacement.ts](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/common_replacement.ts) 文件定义了 `export const commonReplacement` 变量，包含了 `replaceSync` 和 `replaceText`，这个变量会隐式地包含于所有触发器集合中。 +为了避免重复翻译相似的字段很多次，[common_replacement.ts](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/common_replacement.ts) 文件定义了 `export const commonReplacement` 变量，包含了 `replaceSync` 和 `replaceText`，这个变量会隐式地包含于所有触发器集合中。 因此这些字段不需要翻译（当你尝试翻译这些文本时，`npm run test` 也会报告错误）。 diff --git a/docs/zh-CN/TimelineGuide.md b/docs/zh-CN/TimelineGuide.md index 91a64fc94e..00cd0d82e9 100644 --- a/docs/zh-CN/TimelineGuide.md +++ b/docs/zh-CN/TimelineGuide.md @@ -4,7 +4,7 @@ ![导入屏幕截图](../images/timelineguide_timeline.png) -cactbot在[raidboss模块](https://github.com/quisquous/cactbot#raidboss-module)中定义触发器和时间轴。这两者是紧密结合的，因此您既可以基于技能编写触发器，也可以基于时间轴编写触发器。 +cactbot在[raidboss模块](https://github.com/OverlayPlugin/cactbot#raidboss-module)中定义触发器和时间轴。这两者是紧密结合的，因此您既可以基于技能编写触发器，也可以基于时间轴编写触发器。 ## 目录 @@ -148,11 +148,11 @@ Cactbot的触发器文件支持添加基于时间轴的触发器。这是由于 示例: -* [乐欲之所瓯博讷修道院](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/04-sb/alliance/orbonne_monastery.ts) -* [T9](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/02-arr/raid/t9.ts) -* [O12 普通难度](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/04-sb/raid/o12n.ts) +* [乐欲之所瓯博讷修道院](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/04-sb/alliance/orbonne_monastery.ts) +* [T9](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/02-arr/raid/t9.ts) +* [O12 普通难度](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/04-sb/raid/o12n.ts) -这些触发器和普通的触发器拥有[相同的语法](https://github.com/quisquous/cactbot/blob/main/ui/raidboss/data/README.txt)。这意味着您依旧可以使用函数，返回任何您想要的东西。您也可以使用[condition](https://github.com/quisquous/cactbot/blob/5a7011c662d65f44c12c2fbff255484f2d31b8ef/ui/raidboss/data/02-arr/raid/t9.js#L10)，使其仅针对特定职业/职能激活。 +这些触发器和普通的触发器拥有[相同的语法](https://github.com/OverlayPlugin/cactbot/blob/main/ui/raidboss/data/README.txt)。这意味着您依旧可以使用函数，返回任何您想要的东西。您也可以使用[condition](https://github.com/OverlayPlugin/cactbot/blob/5a7011c662d65f44c12c2fbff255484f2d31b8ef/ui/raidboss/data/02-arr/raid/t9.js#L10)，使其仅针对特定职业/职能激活。 但是，他们之间仍然有一些区别： @@ -168,13 +168,13 @@ Cactbot默认并不包含这些配置，这个功能更适合用户自行配置 触发器文件有一个名为 `timeline` 的参数入口，这是一个数组，其中元素会添加到时间轴中。若元素都是字符串，则会直接添加。若元素是函数，那么cactbot会调用该函数，并添加其返回值至时间轴中。(但是传入函数的 `data` 参数仅包含了玩家的职能和职业，不包含其他参数。) -测试时间轴可以在盛夏农庄通过倒计时或对木人行礼后触发。另行参见：[test.js](https://github.com/quisquous/cactbot/blob/79239abda888dd7a277da0501a7d4ac60d8cf963/ui/raidboss/data/triggers/test.js#L10)。 +测试时间轴可以在盛夏农庄通过倒计时或对木人行礼后触发。另行参见：[test.js](https://github.com/OverlayPlugin/cactbot/blob/79239abda888dd7a277da0501a7d4ac60d8cf963/ui/raidboss/data/triggers/test.js#L10)。 您也可以在 **cactbot/user/raidboss.js** 文件中添加定制化的时间轴和触发器。另行参见：[user/raidboss.js](https://github.com/quisquous/cactbot-user/blob/641488590e3ea499cc3b54cc9f2f2f856dee4ad8/raidboss.js#L28)。 ## 时间轴翻译 -为支持多语言，cactbot的触发器文件中提供了 `timelineReplace` 参数。[o12s.js](https://github.com/quisquous/cactbot/blob/ecbb723f097328c7bd0476352e5135bd5f776248/ui/raidboss/data/triggers/o12s.js#L608) 是一个不错的例子。该文件的参数集中包含了许多用于替换同步正则、文字和效果名的正则表达式。这有两个目的： +为支持多语言，cactbot的触发器文件中提供了 `timelineReplace` 参数。[o12s.js](https://github.com/OverlayPlugin/cactbot/blob/ecbb723f097328c7bd0476352e5135bd5f776248/ui/raidboss/data/triggers/o12s.js#L608) 是一个不错的例子。该文件的参数集中包含了许多用于替换同步正则、文字和效果名的正则表达式。这有两个目的： 其一是为了让工具软件能为触发器自动生成正则表达式翻译。 @@ -207,7 +207,7 @@ Cactbot默认并不包含这些配置，这个功能更适合用户自行配置 * [Python 3](https://www.python.org/downloads/release/python-373/) * [Node.js](https://nodejs.org/en/) -* 一份cactbot的[源代码](https://github.com/quisquous/cactbot/archive/main.zip)拷贝 +* 一份cactbot的[源代码](https://github.com/OverlayPlugin/cactbot/archive/main.zip)拷贝 安装 Python 3 时，推荐为该系统上的所有用户安装，这种安装方式会将 Python 写入 Windows 的 PATH 变量中，使您可以从命令提示符方便地运行 Python。 diff --git a/docs/zh-TW/CactbotCustomization.md b/docs/zh-TW/CactbotCustomization.md index a88d71d373..92c6e5e9d5 100644 --- a/docs/zh-TW/CactbotCustomization.md +++ b/docs/zh-TW/CactbotCustomization.md @@ -92,7 +92,7 @@ cactbot將按照字母順序優先載入user資料夾中的子資料夾裡的檔 我們推薦使用 [Chrome DevTools](https://developers.google.com/web/tools/chrome-devtools) 以除錯CSS問題。 您可以透過 ACT -> Plugins -> OverlayPlugin.dll -> 您的懸浮窗名字 -> 啟動Debug工具 以開啟DevTools。 -**注意**：某些元件的自定義較為困難，甚至無法進行自定義，如時間軸的進度條等。 原因是，這些元件屬於自定義HTML元素，且沒有開放外部配置的介面。 如果您有特別的需求，但是不知道如何修改，您可以提出一個 [github issue](https://github.com/quisquous/cactbot/issues/new/choose)。 +**注意**：某些元件的自定義較為困難，甚至無法進行自定義，如時間軸的進度條等。 原因是，這些元件屬於自定義HTML元素，且沒有開放外部配置的介面。 如果您有特別的需求，但是不知道如何修改，您可以提出一個 [github issue](https://github.com/OverlayPlugin/cactbot/issues/new/choose)。 **警告**：cactbot不保證CSS的向後相容性。 在以後的更改中，cactbot可能會重新組織網頁結構，改變元素名稱和類名稱，甚至完全重構所有樣式。 因此，您需知曉您的自定義CSS有在將來出現問題的風險。 @@ -130,7 +130,7 @@ Options.Triggers.push({ 若您只是想修改 `資訊文字`，你可以 [透過cactbot配置介面改變觸發器文字](#changing-trigger-text-with-the-cactbot-ui) 實現。 -其中一種調整方式是編輯觸發器的輸出。 您可以在 [ui/raidboss/data/04-sb/ultimate/unending_coil_ultimate.js](https://github.com/quisquous/cactbot/blob/triggers/04-sb/ultimate/unending_coil_ultimate.js#:~:text=UCU%20Nael%20Fireball%201) 中找到原本的 fireball #1 觸發器。 +其中一種調整方式是編輯觸發器的輸出。 您可以在 [ui/raidboss/data/04-sb/ultimate/unending_coil_ultimate.js](https://github.com/OverlayPlugin/cactbot/blob/triggers/04-sb/ultimate/unending_coil_ultimate.js#:~:text=UCU%20Nael%20Fireball%201) 中找到原本的 fireball #1 觸發器。 您需要將以下的程式碼貼上至您的使用者自定義js檔案底部。 @@ -162,7 +162,7 @@ Options.Triggers.push({ ### 例2：使挑釁提示適用於全職業 -目前，只有團隊成員的挑釁會觸發提示，並且不是所有職業都能收到提示。 該例子展示了如何使其適用於所有職業。 該挑釁觸發器可以在 [ui/raidboss/data/00-misc/general.js](https://github.com/quisquous/cactbot/blob/triggers/00-misc/general.js#:~:text=General%20Provoke) 中找到。 +目前，只有團隊成員的挑釁會觸發提示，並且不是所有職業都能收到提示。 該例子展示了如何使其適用於所有職業。 該挑釁觸發器可以在 [ui/raidboss/data/00-misc/general.js](https://github.com/OverlayPlugin/cactbot/blob/triggers/00-misc/general.js#:~:text=General%20Provoke) 中找到。 我們需要修改 `condition` 函式(function)。 由於此處的id與內建的 `General Provoke` 觸發器一致，因此會覆蓋同名的內建觸發器。 diff --git a/eslint/cactbot-locale-order.js b/eslint/cactbot-locale-order.js index d2599f3f19..dc58fcbda7 100644 --- a/eslint/cactbot-locale-order.js +++ b/eslint/cactbot-locale-order.js @@ -26,7 +26,8 @@ const ruleModule = { description: 'suggest the locale object key order', category: 'Stylistic Issues', recommended: true, - url: 'https://github.com/quisquous/cactbot/blob/main/docs/RaidbossGuide.md#trigger-elements', + url: + 'https://github.com/OverlayPlugin/cactbot/blob/main/docs/RaidbossGuide.md#trigger-elements', }, fixable: 'code', schema: [ diff --git a/eslint/cactbot-output-strings.js b/eslint/cactbot-output-strings.js index 8dc6c8d045..0fc079516e 100644 --- a/eslint/cactbot-output-strings.js +++ b/eslint/cactbot-output-strings.js @@ -31,7 +31,8 @@ const ruleModule = { description: 'suggest outputStrings in cactbot', category: 'Stylistic Issues', recommended: true, - url: 'https://github.com/quisquous/cactbot/blob/main/docs/RaidbossGuide.md#trigger-elements', + url: + 'https://github.com/OverlayPlugin/cactbot/blob/main/docs/RaidbossGuide.md#trigger-elements', }, fixable: 'code', schema: [], diff --git a/eslint/cactbot-response-default-severities.js b/eslint/cactbot-response-default-severities.js index 249c005843..e510b7ac51 100644 --- a/eslint/cactbot-response-default-severities.js +++ b/eslint/cactbot-response-default-severities.js @@ -5,7 +5,8 @@ module.exports = { description: 'prevent explicit overrides where the response default is being used', category: 'Stylistic Issues', recommended: true, - url: 'https://github.com/quisquous/cactbot/blob/main/docs/RaidbossGuide.md#trigger-elements', + url: + 'https://github.com/OverlayPlugin/cactbot/blob/main/docs/RaidbossGuide.md#trigger-elements', }, fixable: 'code', schema: [], diff --git a/eslint/cactbot-timeline-triggers.js b/eslint/cactbot-timeline-triggers.js index 390136a6ea..70fd924ea3 100644 --- a/eslint/cactbot-timeline-triggers.js +++ b/eslint/cactbot-timeline-triggers.js @@ -5,7 +5,8 @@ module.exports = { description: 'prevent syntax issues within timelineTriggers', category: 'Syntax Issues', recommended: true, - url: 'https://github.com/quisquous/cactbot/blob/main/docs/RaidbossGuide.md#trigger-elements', + url: + 'https://github.com/OverlayPlugin/cactbot/blob/main/docs/RaidbossGuide.md#trigger-elements', }, schema: [], }, diff --git a/eslint/cactbot-trigger-property-order.js b/eslint/cactbot-trigger-property-order.js index 05d456be27..bdbae3bc45 100644 --- a/eslint/cactbot-trigger-property-order.js +++ b/eslint/cactbot-trigger-property-order.js @@ -7,7 +7,8 @@ module.exports = { description: 'suggest the trigger property order', category: 'Stylistic Issues', recommended: true, - url: 'https://github.com/quisquous/cactbot/blob/main/docs/RaidbossGuide.md#trigger-elements', + url: + 'https://github.com/OverlayPlugin/cactbot/blob/main/docs/RaidbossGuide.md#trigger-elements', }, fixable: 'code', schema: [ diff --git a/eslint/cactbot-triggerset-property-order.js b/eslint/cactbot-triggerset-property-order.js index 246fe6b495..0785455313 100644 --- a/eslint/cactbot-triggerset-property-order.js +++ b/eslint/cactbot-triggerset-property-order.js @@ -7,7 +7,8 @@ module.exports = { description: 'suggest the triggerSet property order', category: 'Stylistic Issues', recommended: true, - url: 'https://github.com/quisquous/cactbot/blob/main/docs/RaidbossGuide.md#trigger-elements', + url: + 'https://github.com/OverlayPlugin/cactbot/blob/main/docs/RaidbossGuide.md#trigger-elements', }, fixable: 'code', schema: [ diff --git a/package.json b/package.json index 4eab6424b0..f14ba79b0f 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "types": "./types", "repository": { "type": "git", - "url": "https://github.com/quisquous/cactbot" + "url": "https://github.com/OverlayPlugin/cactbot" }, "files": [ "./ui", diff --git a/resources/netregexes.ts b/resources/netregexes.ts index 6e4fbad23e..419c4965a3 100644 --- a/resources/netregexes.ts +++ b/resources/netregexes.ts @@ -24,7 +24,7 @@ const matchDefault = '[^|]*'; const magicTranslationString = `^^`; const magicStringRegex = /^\^\^/; -// can't simply export this, see https://github.com/quisquous/cactbot/pull/4957#discussion_r1002590589 +// can't simply export this, see https://github.com/OverlayPlugin/cactbot/pull/4957#discussion_r1002590589 const keysThatRequireTranslationAsConst = [ 'ability', 'name', @@ -357,15 +357,15 @@ export default class NetRegexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-20-0x14-networkstartscasting + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-20-0x14-networkstartscasting */ static startsUsing(params?: NetParams['StartsUsing']): CactbotBaseRegExp<'StartsUsing'> { return buildRegex('StartsUsing', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-21-0x15-networkability - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-22-0x16-networkaoeability + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-21-0x15-networkability + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-22-0x16-networkaoeability */ static ability(params?: NetParams['Ability']): CactbotBaseRegExp<'Ability'> { return parseHelper(params, 'Ability', { @@ -376,8 +376,8 @@ export default class NetRegexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-21-0x15-networkability - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-22-0x16-networkaoeability + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-21-0x15-networkability + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-22-0x16-networkaoeability * * @deprecated Use `ability` instead */ @@ -386,14 +386,14 @@ export default class NetRegexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-27-0x1b-networktargeticon-head-marker + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-27-0x1b-networktargeticon-head-marker */ static headMarker(params?: NetParams['HeadMarker']): CactbotBaseRegExp<'HeadMarker'> { return buildRegex('HeadMarker', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-03-0x03-addcombatant + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-03-0x03-addcombatant */ static addedCombatant(params?: NetParams['AddedCombatant']): CactbotBaseRegExp<'AddedCombatant'> { return parseHelper( @@ -404,7 +404,7 @@ export default class NetRegexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-03-0x03-addcombatant + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-03-0x03-addcombatant * @deprecated Use `addedCombatant` instead */ static addedCombatantFull( @@ -414,7 +414,7 @@ export default class NetRegexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-04-0x04-removecombatant + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-04-0x04-removecombatant */ static removingCombatant( params?: NetParams['RemovedCombatant'], @@ -423,7 +423,7 @@ export default class NetRegexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-26-0x1a-networkbuff + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-26-0x1a-networkbuff */ static gainsEffect(params?: NetParams['GainsEffect']): CactbotBaseRegExp<'GainsEffect'> { return buildRegex('GainsEffect', params); @@ -431,7 +431,7 @@ export default class NetRegexes { /** * Prefer gainsEffect over this function unless you really need extra data. - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-38-0x26-networkstatuseffects + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-38-0x26-networkstatuseffects */ static statusEffectExplicit( params?: NetParams['StatusEffect'], @@ -440,14 +440,14 @@ export default class NetRegexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-30-0x1e-networkbuffremove + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-30-0x1e-networkbuffremove */ static losesEffect(params?: NetParams['LosesEffect']): CactbotBaseRegExp<'LosesEffect'> { return buildRegex('LosesEffect', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-35-0x23-networktether + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-35-0x23-networktether */ static tether(params?: NetParams['Tether']): CactbotBaseRegExp<'Tether'> { return buildRegex('Tether', params); @@ -455,21 +455,21 @@ export default class NetRegexes { /** * 'target' was defeated by 'source' - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-25-0x19-networkdeath + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-25-0x19-networkdeath */ static wasDefeated(params?: NetParams['WasDefeated']): CactbotBaseRegExp<'WasDefeated'> { return buildRegex('WasDefeated', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-24-0x18-networkdot + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-24-0x18-networkdot */ static networkDoT(params?: NetParams['NetworkDoT']): CactbotBaseRegExp<'NetworkDoT'> { return buildRegex('NetworkDoT', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline */ static echo(params?: Omit): CactbotBaseRegExp<'GameLog'> { if (typeof params === 'undefined') @@ -484,7 +484,7 @@ export default class NetRegexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline */ static dialog(params?: Omit): CactbotBaseRegExp<'GameLog'> { if (typeof params === 'undefined') @@ -499,7 +499,7 @@ export default class NetRegexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline */ static message(params?: Omit): CactbotBaseRegExp<'GameLog'> { if (typeof params === 'undefined') @@ -515,14 +515,14 @@ export default class NetRegexes { /** * fields: code, name, line, capture - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline */ static gameLog(params?: NetParams['GameLog']): CactbotBaseRegExp<'GameLog'> { return buildRegex('GameLog', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline */ static gameNameLog(params?: NetParams['GameLog']): CactbotBaseRegExp<'GameLog'> { // Backwards compatability. @@ -530,42 +530,42 @@ export default class NetRegexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-12-0x0c-playerstats + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-12-0x0c-playerstats */ static statChange(params?: NetParams['PlayerStats']): CactbotBaseRegExp<'PlayerStats'> { return buildRegex('PlayerStats', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-01-0x01-changezone + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-01-0x01-changezone */ static changeZone(params?: NetParams['ChangeZone']): CactbotBaseRegExp<'ChangeZone'> { return buildRegex('ChangeZone', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-33-0x21-network6d-actor-control + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-33-0x21-network6d-actor-control */ static network6d(params?: NetParams['ActorControl']): CactbotBaseRegExp<'ActorControl'> { return buildRegex('ActorControl', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-34-0x22-networknametoggle + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-34-0x22-networknametoggle */ static nameToggle(params?: NetParams['NameToggle']): CactbotBaseRegExp<'NameToggle'> { return buildRegex('NameToggle', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-40-0x28-map + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-40-0x28-map */ static map(params?: NetParams['Map']): CactbotBaseRegExp<'Map'> { return buildRegex('Map', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-41-0x29-systemlogmessage + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-41-0x29-systemlogmessage */ static systemLogMessage( params?: NetParams['SystemLogMessage'], @@ -574,28 +574,28 @@ export default class NetRegexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-257-0x101-mapeffect + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-257-0x101-mapeffect */ static mapEffect(params?: NetParams['MapEffect']): CactbotBaseRegExp<'MapEffect'> { return buildRegex('MapEffect', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-258-0x102-fatedirector + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-258-0x102-fatedirector */ static fateDirector(params?: NetParams['FateDirector']): CactbotBaseRegExp<'FateDirector'> { return buildRegex('FateDirector', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-259-0x103-cedirector + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-259-0x103-cedirector */ static ceDirector(params?: NetParams['CEDirector']): CactbotBaseRegExp<'CEDirector'> { return buildRegex('CEDirector', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-261-0x105-combatantmemory + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-261-0x105-combatantmemory */ static combatantMemory( params?: NetParams['CombatantMemory'], @@ -604,7 +604,7 @@ export default class NetRegexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-263-0x107-startsusingextra + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-263-0x107-startsusingextra */ static startsUsingExtra( params?: NetParams['StartsUsingExtra'], @@ -613,7 +613,7 @@ export default class NetRegexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-264-0x108-abilityextra + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-264-0x108-abilityextra */ static abilityExtra( params?: NetParams['AbilityExtra'], diff --git a/resources/regexes.ts b/resources/regexes.ts index e5983bc905..6d28928672 100644 --- a/resources/regexes.ts +++ b/resources/regexes.ts @@ -346,23 +346,23 @@ export default class Regexes { static logVersion: LogDefinitionVersions = 'latest'; /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-20-0x14-networkstartscasting + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-20-0x14-networkstartscasting */ static startsUsing(params?: NetParams['StartsUsing']): CactbotBaseRegExp<'StartsUsing'> { return buildRegex('StartsUsing', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-21-0x15-networkability - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-22-0x16-networkaoeability + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-21-0x15-networkability + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-22-0x16-networkaoeability */ static ability(params?: NetParams['Ability']): CactbotBaseRegExp<'Ability'> { return buildRegex('Ability', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-21-0x15-networkability - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-22-0x16-networkaoeability + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-21-0x15-networkability + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-22-0x16-networkaoeability * * @deprecated Use `ability` instead */ @@ -371,21 +371,21 @@ export default class Regexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-27-0x1b-networktargeticon-head-marker + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-27-0x1b-networktargeticon-head-marker */ static headMarker(params?: NetParams['HeadMarker']): CactbotBaseRegExp<'HeadMarker'> { return buildRegex('HeadMarker', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-03-0x03-addcombatant + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-03-0x03-addcombatant */ static addedCombatant(params?: NetParams['AddedCombatant']): CactbotBaseRegExp<'AddedCombatant'> { return buildRegex('AddedCombatant', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-03-0x03-addcombatant + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-03-0x03-addcombatant */ static addedCombatantFull( params?: NetParams['AddedCombatant'], @@ -394,7 +394,7 @@ export default class Regexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-04-0x04-removecombatant + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-04-0x04-removecombatant */ static removingCombatant( params?: NetParams['RemovedCombatant'], @@ -403,7 +403,7 @@ export default class Regexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-26-0x1a-networkbuff + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-26-0x1a-networkbuff */ static gainsEffect(params?: NetParams['GainsEffect']): CactbotBaseRegExp<'GainsEffect'> { return buildRegex('GainsEffect', params); @@ -411,7 +411,7 @@ export default class Regexes { /** * Prefer gainsEffect over this function unless you really need extra data. - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-38-0x26-networkstatuseffects + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-38-0x26-networkstatuseffects */ static statusEffectExplicit( params?: NetParams['StatusEffect'], @@ -420,14 +420,14 @@ export default class Regexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-30-0x1e-networkbuffremove + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-30-0x1e-networkbuffremove */ static losesEffect(params?: NetParams['LosesEffect']): CactbotBaseRegExp<'LosesEffect'> { return buildRegex('LosesEffect', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-35-0x23-networktether + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-35-0x23-networktether */ static tether(params?: NetParams['Tether']): CactbotBaseRegExp<'Tether'> { return buildRegex('Tether', params); @@ -435,21 +435,21 @@ export default class Regexes { /** * 'target' was defeated by 'source' - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-25-0x19-networkdeath + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-25-0x19-networkdeath */ static wasDefeated(params?: NetParams['WasDefeated']): CactbotBaseRegExp<'WasDefeated'> { return buildRegex('WasDefeated', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-24-0x18-networkdot + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-24-0x18-networkdot */ static networkDoT(params?: NetParams['NetworkDoT']): CactbotBaseRegExp<'NetworkDoT'> { return buildRegex('NetworkDoT', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline */ static echo(params?: NetParams['GameLog']): CactbotBaseRegExp<'GameLog'> { if (typeof params === 'undefined') @@ -464,7 +464,7 @@ export default class Regexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline */ static dialog(params?: NetParams['GameLog']): CactbotBaseRegExp<'GameLog'> { if (typeof params === 'undefined') @@ -479,7 +479,7 @@ export default class Regexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline */ static message(params?: NetParams['GameLog']): CactbotBaseRegExp<'GameLog'> { if (typeof params === 'undefined') @@ -495,14 +495,14 @@ export default class Regexes { /** * fields: code, name, line, capture - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline */ static gameLog(params?: NetParams['GameLog']): CactbotBaseRegExp<'GameLog'> { return buildRegex('GameLog', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-00-0x00-logline */ static gameNameLog(params?: NetParams['GameLog']): CactbotBaseRegExp<'GameLog'> { // Backwards compatability. @@ -510,42 +510,42 @@ export default class Regexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-12-0x0c-playerstats + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-12-0x0c-playerstats */ static statChange(params?: NetParams['PlayerStats']): CactbotBaseRegExp<'PlayerStats'> { return buildRegex('PlayerStats', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-01-0x01-changezone + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-01-0x01-changezone */ static changeZone(params?: NetParams['ChangeZone']): CactbotBaseRegExp<'ChangeZone'> { return buildRegex('ChangeZone', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-33-0x21-network6d-actor-control + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-33-0x21-network6d-actor-control */ static network6d(params?: NetParams['ActorControl']): CactbotBaseRegExp<'ActorControl'> { return buildRegex('ActorControl', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-34-0x22-networknametoggle + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-34-0x22-networknametoggle */ static nameToggle(params?: NetParams['NameToggle']): CactbotBaseRegExp<'NameToggle'> { return buildRegex('NameToggle', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-40-0x28-map + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-40-0x28-map */ static map(params?: NetParams['Map']): CactbotBaseRegExp<'Map'> { return buildRegex('Map', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-41-0x29-systemlogmessage + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-41-0x29-systemlogmessage */ static systemLogMessage( params?: NetParams['SystemLogMessage'], @@ -554,14 +554,14 @@ export default class Regexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-257-0x101-mapeffect + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-257-0x101-mapeffect */ static mapEffect(params?: NetParams['MapEffect']): CactbotBaseRegExp<'MapEffect'> { return buildRegex('MapEffect', params); } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-261-0x105-combatantmemory + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-261-0x105-combatantmemory */ static combatantMemory( params?: NetParams['CombatantMemory'], @@ -570,7 +570,7 @@ export default class Regexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-263-0x107-startsusingextra + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-263-0x107-startsusingextra */ static startsUsingExtra( params?: NetParams['StartsUsingExtra'], @@ -579,7 +579,7 @@ export default class Regexes { } /** - * matches: https://github.com/quisquous/cactbot/blob/main/docs/LogGuide.md#line-264-0x108-abilityextra + * matches: https://github.com/OverlayPlugin/cactbot/blob/main/docs/LogGuide.md#line-264-0x108-abilityextra */ static abilityExtra( params?: NetParams['AbilityExtra'], diff --git a/ui/raidboss/data/03-hw/raid/a7s.txt b/ui/raidboss/data/03-hw/raid/a7s.txt index d473ec03be..b260bcd179 100644 --- a/ui/raidboss/data/03-hw/raid/a7s.txt +++ b/ui/raidboss/data/03-hw/raid/a7s.txt @@ -3,7 +3,6 @@ # Shasta's reddit: /u/shastaxc # Last Updated: 5/19/2016 -# Revised in http://github.com/quisquous/cactbot to use InCombat lines # TODO: Fix this up to conform to cactbot style guidelines # TODO: Look at whether jails are MapEffect lines? diff --git a/ui/raidboss/data/06-ew/raid/p12s.ts b/ui/raidboss/data/06-ew/raid/p12s.ts index fcbbebbc08..8a1df40795 100644 --- a/ui/raidboss/data/06-ew/raid/p12s.ts +++ b/ui/raidboss/data/06-ew/raid/p12s.ts @@ -511,16 +511,20 @@ const triggerSet: TriggerSet = { { id: 'classicalConcepts2ActualNoFlip', comment: { - en: - 'Only calls final position immediately in chosen pair order with no flip. For example, for BPOG, the blue X (crosses) will be far west. Visual', - de: - 'Nennt die endgültige Position nur sofort in der gewählten Paarreihenfolge ohne Flip.“ Bei BPOG beispielsweise befindet sich das blaue X (Kreuze) weit westlich. Visual', + en: `Only calls final position immediately in chosen pair order with no flip. + For example, for BPOG, the blue X (crosses) will be far west. + Visual`, + de: `Nennt die endgültige Position nur sofort in der gewählten Paarreihenfolge ohne Flip. + Bei BPOG beispielsweise befindet sich das blaue X (Kreuze) weit westlich. + Visual`, fr: - 'Afficher la position finale uniquement dans l\'ordre des paires choisies, sans inversion. Par exemple, pour le BPOG, le X bleu (croix) sera loin à l\'ouest. Visual', - cn: - '只报自己图案的最终位置，没有位置变换。例如，对于 BPOG 打法，蓝 X 是第一列（西面最远）。 Visual', - ko: - '선택한 도형 순서에 따른 최종 위치만 알립니다. 예시에서 파보빨초를 기준으로 파랑 X는 1열이 됩니다. Visual', + `Afficher la position finale uniquement dans l\'ordre des paires choisies, sans inversion. + Par exemple, pour le BPOG, le X bleu (croix) sera loin à l\'ouest. + Visual`, + cn: `只报自己图案的最终位置，没有位置变换。例如，对于 BPOG 打法，蓝 X 是第一列（西面最远）。 + Visual`, + ko: `선택한 도형 순서에 따른 최종 위치만 알립니다. 예시에서 파보빨초를 기준으로 파랑 X는 1열이 됩니다. + Visual`, }, name: { en: 'Classical Concepts 2: Actual only & no inversion', diff --git a/ui/raidboss/raidboss_config.ts b/ui/raidboss/raidboss_config.ts index 240d51fded..2eb39a6ba5 100644 --- a/ui/raidboss/raidboss_config.ts +++ b/ui/raidboss/raidboss_config.ts @@ -931,7 +931,7 @@ class RaidbossConfigurator { if (p0 !== undefined && p1 !== undefined && p2 !== undefined) { const div = document.createElement('div'); div.classList.add('option-input-container', 'trigger-source'); - const baseUrl = 'https://github.com/quisquous/cactbot/blob/triggers'; + const baseUrl = 'https://github.com/OverlayPlugin/cactbot/blob/triggers'; let urlFilepath; if (path.length === 3) { // 00-misc/general.js @@ -1897,14 +1897,16 @@ const templateOptions: OptionsTemplate = { type: 'html', html: { // TODO: it'd be nice if OverlayPlugin could open links on the system outside of ACT. - en: makeLink('https://quisquous.github.io/cactbot/util/coverage/coverage.html?lang=en'), - de: makeLink('https://quisquous.github.io/cactbot/util/coverage/coverage.html?lang=de'), - fr: makeLink('https://quisquous.github.io/cactbot/util/coverage/coverage.html?lang=fr'), - ja: makeLink('https://quisquous.github.io/cactbot/util/coverage/coverage.html?lang=ja'), - cn: makeLink('https://quisquous.github.io/cactbot/util/coverage/coverage.html?lang=cn'), - ko: makeLink('https://quisquous.github.io/cactbot/util/coverage/coverage.html?lang=ko'), + en: makeLink('https://overlayplugin.github.io/cactbot/util/coverage/coverage.html?lang=en'), + de: makeLink('https://overlayplugin.github.io/cactbot/util/coverage/coverage.html?lang=de'), + fr: makeLink('https://overlayplugin.github.io/cactbot/util/coverage/coverage.html?lang=fr'), + ja: makeLink('https://overlayplugin.github.io/cactbot/util/coverage/coverage.html?lang=ja'), + cn: makeLink('https://overlayplugin.github.io/cactbot/util/coverage/coverage.html?lang=cn'), + ko: makeLink('https://overlayplugin.github.io/cactbot/util/coverage/coverage.html?lang=ko'), }, - default: makeLink('https://quisquous.github.io/cactbot/util/coverage/coverage.html?lang=en'), + default: makeLink( + 'https://overlayplugin.github.io/cactbot/util/coverage/coverage.html?lang=en', + ), }, { id: 'Debug', diff --git a/util/coverage/coverage.ts b/util/coverage/coverage.ts index 4ef6ad11ce..c4f5afce39 100644 --- a/util/coverage/coverage.ts +++ b/util/coverage/coverage.ts @@ -249,17 +249,17 @@ const miscStrings = { // Description about release and latest version differences. description: { en: - 'This list may contain content that is in development and is not yet included in the latest cactbot release. Anything that is listed as covered here will be included in the next release of cactbot. If you are using the quisquous.github.io version as the url for your overlays, this list will be up to date.', + 'This list may contain content that is in development and is not yet included in the latest cactbot release. Anything that is listed as covered here will be included in the next release of cactbot. If you are using the overlayplugin.github.io version as the url for your overlays, this list will be up to date.', de: - 'Diese Liste kann Inhalte enthalten, welche momentan in Entwicklung sind uns sich noch nicht im aktuellstem Cactbot Release befinden. Alles was hier aufgelistet ist, wird sich im nächsten Release von Cactbot befinden. Wenn du quisquous.github.io version als URL für dein Overlay benutzt, sind die Inhalte in dieser Liste bereits für dich verfügbar.', + 'Diese Liste kann Inhalte enthalten, welche momentan in Entwicklung sind uns sich noch nicht im aktuellstem Cactbot Release befinden. Alles was hier aufgelistet ist, wird sich im nächsten Release von Cactbot befinden. Wenn du overlayplugin.github.io version als URL für dein Overlay benutzt, sind die Inhalte in dieser Liste bereits für dich verfügbar.', fr: - 'Cette liste peut contenir du contenu en cours de développement et qui n\'est pas encore inclus dans la dernière version de cactbot. Tout ce qui est répertorié comme couvert ici, sera inclus dans la prochaine version de cactbot. Si vous utilisez la version quisquous.github.io comme url pour vos overlays, cette liste sera à jour.', + 'Cette liste peut contenir du contenu en cours de développement et qui n\'est pas encore inclus dans la dernière version de cactbot. Tout ce qui est répertorié comme couvert ici, sera inclus dans la prochaine version de cactbot. Si vous utilisez la version overlayplugin.github.io comme url pour vos overlays, cette liste sera à jour.', ja: - 'このリストは開発中機能や最新リリースバージョンに公開されていないコンテンツを含まれています。リストに含まれているコンテンツは次バージョンに公開される予定があります。また、OverlayPluginのURL欄に「quisquous.github.io」のページのURLを入力している場合はこのリストに含まれているコンテンツと一致し、すべてのコンテンツを使えるようになります。', + 'このリストは開発中機能や最新リリースバージョンに公開されていないコンテンツを含まれています。リストに含まれているコンテンツは次バージョンに公開される予定があります。また、OverlayPluginのURL欄に「overlayplugin.github.io」のページのURLを入力している場合はこのリストに含まれているコンテンツと一致し、すべてのコンテンツを使えるようになります。', cn: - '该列表中可能存在正在开发中的功能及未发布在cactbot最新发行版中的更新内容。该列表中显示的更新将会在下一个版本的cactbot发行版中发布。若您在OverlayPlugin中使用的是「quisquous.github.io」开头的URL，则更新进度与该列表一致，即该列表中的所有内容均可用。', + '该列表中可能存在正在开发中的功能及未发布在cactbot最新发行版中的更新内容。该列表中显示的更新将会在下一个版本的cactbot发行版中发布。若您在OverlayPlugin中使用的是「overlayplugin.github.io」开头的URL，则更新进度与该列表一致，即该列表中的所有内容均可用。', ko: - '이 목록에는 아직 개발 중인 컨텐츠가 포함되어 있을 수 있고 최신 cactbot 릴리즈에 포함되어 있지 않을 수 있습니다. 여기에 나열된 컨텐츠 목록은 최소한 다음 릴리즈에는 포함되게 됩니다. 만약 quisquous.github.io 버전을 오버레이 url로 연결해서 사용하고 계시다면, 이 목록이 오버레이의 컨텐츠 커버리지와 일치합니다.', + '이 목록에는 아직 개발 중인 컨텐츠가 포함되어 있을 수 있고 최신 cactbot 릴리즈에 포함되어 있지 않을 수 있습니다. 여기에 나열된 컨텐츠 목록은 최소한 다음 릴리즈에는 포함되게 됩니다. 만약 overlayplugin.github.io 버전을 오버레이 url로 연결해서 사용하고 계시다면, 이 목록이 오버레이의 컨텐츠 커버리지와 일치합니다.', }, // Warning when generator hasn't been run. runGenerator: { diff --git a/util/gen_coverage_report.ts b/util/gen_coverage_report.ts index e34b7d9b4d..34386a7243 100644 --- a/util/gen_coverage_report.ts +++ b/util/gen_coverage_report.ts @@ -42,7 +42,7 @@ const missingOutputFileNames = { }; const basePath = () => path.dirname(path.dirname(fileURLToPath(import.meta.url))); -const baseUrl = 'https://github.com/quisquous/cactbot/blob/main'; +const baseUrl = 'https://github.com/OverlayPlugin/cactbot/blob/main'; const emptyCoverage = (): CoverageEntry => { return {