forked from quisquous/cactbot
-
Notifications
You must be signed in to change notification settings - Fork 78
raidboss: add support for The Merchant's Tale (Advanced) #1071
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ForestSageSarah
wants to merge
7
commits into
OverlayPlugin:main
Choose a base branch
from
ForestSageSarah:pari-of-plenty-raidboss
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+207
−0
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
2bb97f6
raidboss: add Merchant's Tale Advanced baseline
ForestSageSarah 1a77e92
raidboss: add Pari basic ability calls
ForestSageSarah 2e0a364
raidboss: add Pari False Flame safe-side calls
ForestSageSarah 0e05b13
raidboss: add Pari False Flame safe-side calls
ForestSageSarah a1ad2dc
Update ui/raidboss/data/07-dt/dungeon/the_merchants_tale_advanced.ts
ForestSageSarah c54696c
Update ui/raidboss/data/07-dt/dungeon/the_merchants_tale_advanced.ts
ForestSageSarah 994361f
Update ui/raidboss/data/07-dt/dungeon/the_merchants_tale_advanced.ts
ForestSageSarah File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
190 changes: 190 additions & 0 deletions
190
ui/raidboss/data/07-dt/dungeon/the_merchants_tale_advanced.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,190 @@ | ||
| import Conditions from '../../../../../resources/conditions'; | ||
| import { Responses } from '../../../../../resources/responses'; | ||
| import ZoneId from '../../../../../resources/zone_id'; | ||
| import { RaidbossData } from '../../../../../types/data'; | ||
| import { NetMatches } from '../../../../../types/net_matches'; | ||
| import { TriggerSet } from '../../../../../types/trigger'; | ||
|
|
||
| export interface Data extends RaidbossData { | ||
| pariChains: NetMatches['Tether'][]; | ||
| pariFalseFlameSafeHalf?: 'North' | 'South'; | ||
| } | ||
|
|
||
| const pariArenaCenterX = -760.0; | ||
|
|
||
| const pariFalseFlameRightFableflight = 'B174'; | ||
| const pariFalseFlameLeftFableflight = 'B175'; | ||
|
|
||
| const pariFalseFlameFableflightSafeHalf = ( | ||
| id: string, | ||
| x: number, | ||
| ): 'North' | 'South' | undefined => { | ||
| const threshold = 5.0; | ||
| const isEast = x > pariArenaCenterX + threshold; | ||
| const isWest = x < pariArenaCenterX - threshold; | ||
| const isLeft = id === pariFalseFlameLeftFableflight; | ||
| const isRight = id === pariFalseFlameRightFableflight; | ||
|
|
||
| if (!isEast && !isWest) | ||
| return undefined; | ||
|
|
||
| if (isEast && isRight) | ||
| return 'South'; | ||
|
|
||
| if (isEast && isLeft) | ||
| return 'North'; | ||
|
|
||
| if (isWest && isRight) | ||
| return 'North'; | ||
|
|
||
| if (isWest && isLeft) | ||
| return 'South'; | ||
|
|
||
| return undefined; | ||
| }; | ||
|
|
||
| const triggerSet: TriggerSet<Data> = { | ||
| id: 'TheMerchantsTaleAdvanced', | ||
| zoneId: ZoneId.TheMerchantsTaleAdvanced, | ||
| timelineFile: 'the_merchants_tale_advanced.txt', | ||
|
|
||
| initData: () => { | ||
| return { | ||
| pariChains: [], | ||
| pariFalseFlameSafeHalf: undefined, | ||
| }; | ||
| }, | ||
|
|
||
| triggers: [ | ||
| { | ||
| id: 'Pari Heat Burst', | ||
| type: 'StartsUsing', | ||
| netRegex: { source: 'Pari of Plenty', id: 'B1CC', capture: false }, | ||
| response: Responses.aoe(), | ||
| }, | ||
| { | ||
| id: 'Pari Fire Of Victory', | ||
| type: 'StartsUsing', | ||
| netRegex: { source: 'Pari of Plenty', id: 'B1CE' }, | ||
| response: Responses.tankCleave(), | ||
| }, | ||
| { | ||
| id: 'Pari Scouring Scorn', | ||
| type: 'StartsUsing', | ||
| netRegex: { source: 'Pari of Plenty', id: 'B1B2', capture: false }, | ||
| response: Responses.aoe(), | ||
| }, | ||
| { | ||
| id: 'Pari Doubling Center For Chains', | ||
| type: 'StartsUsing', | ||
| netRegex: { source: 'Pari of Plenty', id: 'B093', capture: false }, | ||
| durationSeconds: 4, | ||
| alertText: (_data, _matches, output) => output.centerForChains!(), | ||
| outputStrings: { | ||
| centerForChains: { | ||
| en: 'Center for Chains', | ||
| de: 'Mitte für Ketten', | ||
| fr: 'Centre pour les chaînes', | ||
| ja: '鎖は中央へ', | ||
| cn: '中间准备锁链', | ||
| ko: '사슬 중앙', | ||
| tc: '中間準備鎖鏈', | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| id: 'Pari Charmed Chains Reset', | ||
| type: 'StartsUsing', | ||
| netRegex: { source: 'Pari of Plenty', id: 'B08F', capture: false }, | ||
| run: (data) => data.pariChains = [], | ||
| }, | ||
| { | ||
| id: 'Pari Charmed Chains Tether', | ||
| type: 'Tether', | ||
| netRegex: { id: '0009' }, | ||
| condition: (data, matches) => matches.source === data.me || matches.target === data.me, | ||
| preRun: (data, matches) => { | ||
| data.pariChains.push(matches); | ||
| }, | ||
| delaySeconds: 0.3, | ||
| alertText: (data, _matches, output) => { | ||
| const chain = data.pariChains.find((chain) => | ||
| chain.source === data.me || chain.target === data.me | ||
| ); | ||
|
|
||
| if (chain === undefined) | ||
| return; | ||
|
|
||
| const partner = chain.source === data.me ? chain.target : chain.source; | ||
| return output.chainedTo!({ player: data.party.member(partner) }); | ||
| }, | ||
| run: (data) => data.pariChains = [], | ||
| outputStrings: { | ||
| chainedTo: { | ||
| en: 'Chained to ${player}', | ||
| de: 'Kette mit ${player}', | ||
| fr: 'Enchaîné à ${player}', | ||
| ja: '${player}と鎖', | ||
| cn: '与${player}连线', | ||
| ko: '${player}와 사슬', | ||
| tc: '與${player}連線', | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| id: 'Pari Burning Chains On You', | ||
| type: 'GainsEffect', | ||
| netRegex: { effectId: '301' }, | ||
| condition: Conditions.targetIsYou(), | ||
| suppressSeconds: 2, | ||
| response: Responses.breakChains(), | ||
| }, | ||
| { | ||
| id: 'Pari Sun Circlet', | ||
| type: 'StartsUsing', | ||
| netRegex: { source: 'Pari of Plenty', id: 'B187', capture: false }, | ||
| suppressSeconds: 3, | ||
| response: Responses.getUnder(), | ||
| }, | ||
| { | ||
| id: 'Pari False Flame Fableflight', | ||
| type: 'StartsUsing', | ||
| netRegex: { id: [pariFalseFlameRightFableflight, pariFalseFlameLeftFableflight] }, | ||
| durationSeconds: 10, | ||
| alertText: (data, matches, output) => { | ||
| data.pariFalseFlameSafeHalf = pariFalseFlameFableflightSafeHalf( | ||
| matches.id, | ||
| parseFloat(matches.x), | ||
| ); | ||
|
|
||
| if (data.pariFalseFlameSafeHalf === 'North') | ||
| return output.northSafe!(); | ||
|
|
||
| if (data.pariFalseFlameSafeHalf === 'South') | ||
| return output.southSafe!(); | ||
| }, | ||
| outputStrings: { | ||
| northSafe: { | ||
| en: 'North Safe', | ||
| de: 'Norden sicher', | ||
| fr: 'Nord sûr', | ||
| ja: '北安置', | ||
| cn: '北安全', | ||
| ko: '북쪽 안전', | ||
| tc: '北安全', | ||
| }, | ||
| southSafe: { | ||
| en: 'South Safe', | ||
| de: 'Süden sicher', | ||
| fr: 'Sud sûr', | ||
| ja: '南安置', | ||
| cn: '南安全', | ||
| ko: '남쪽 안전', | ||
| tc: '南安全', | ||
| }, | ||
| }, | ||
| }, | ||
| ], | ||
| }; | ||
|
|
||
| export default triggerSet; |
17 changes: 17 additions & 0 deletions
17
ui/raidboss/data/07-dt/dungeon/the_merchants_tale_advanced.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| ### THE MERCHANT'S TALE (ADVANCED) | ||
| # ZoneId: 524 | ||
|
|
||
| hideall "--Reset--" | ||
| hideall "--sync--" | ||
|
|
||
| 0.0 "--Reset--" SystemLogMessage { id: "7DE" } window 0,100000 jump 0 | ||
|
|
||
| #~~~~~~~~~~~~~~~~# | ||
| # PARI OF PLENTY # | ||
| #~~~~~~~~~~~~~~~~# | ||
|
|
||
| 1000.0 "--sync--" SystemLogMessage { id: "7DC" } window 10000,0 | ||
| 1013.0 "Heat Burst" Ability { id: "B1CC", source: "Pari of Plenty" } | ||
|
|
||
| # ALL ENCOUNTER ABILITIES | ||
| # B1CC Heat Burst | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this section intended to be a work in progress, or is this what you have for the timeline for now? If you're going to add to it over the course of the PR, great. If not, let's maybe remove the incomplete timeline for now, since otherwise it's going to look very odd to have exactly one entry and then nothing. (The boilerplate ID/hide/reset entries are fine to leave.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@JLGarber - this is a work in progress, I will update this evening with the proper timeline