Skip to content

Commit

Permalink
triggers build: raidboss/config: add per triggerset default output op…
Browse files Browse the repository at this point in the history
…tions (quisquous#5703)

Every once in a while people ask for ways to override or disable a
particular trigger set, so here you go.

If a trigger gets overridden from another trigger set, the overriding
trigger set's options get used instead. This is probably not what people
want, but it's consistent. 60b7179
  • Loading branch information
github-actions committed Jul 19, 2023
1 parent 89a322b commit b02be6f
Show file tree
Hide file tree
Showing 5 changed files with 202 additions and 27 deletions.
1 change: 1 addition & 0 deletions 06-ew/deepdungeon/eureka_orthos_floors_71-80.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ Options.Triggers.push({
en: 'Get Behind (Stay Behind)',
de: 'Geh nach hinten (und bleib hinten)',
cn: '去背后 (待在背后)',
ko: '뒤로 이동 (뒤에 머물기)',
},
},
},
Expand Down
119 changes: 95 additions & 24 deletions 06-ew/map/the_shifting_gymnasion_agonon.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
// TODO: ::lesser summons::
// TODO: Gymnasiou Leon: Roar - large PBAoE
// TODO: Gymnasiou Leon: Pounce - tankbuster
// TODO: Gymnasiou Megakantha: all abilities
// TODO: Gymnasiou Pithekos: all abilities
// TODO: ::greater summons::
// TODO: Gymnasiou Acheloios: Volcanic Howl - ???
// TODO: Gymnasiou Styphnolobion: all abilities
// TODO: ::elder summons::
// TODO: ::final summons::
// TODO: Narkissos: Rock Hard - ???
Expand Down Expand Up @@ -82,8 +76,18 @@ Options.Triggers.push({
netRegex: { id: '8030', source: 'Gymnasiou Leon', capture: false },
response: Responses.aoe(),
},
// TODO: Gymnasiou Leon: Roar - large PBAoE
// TODO: Gymnasiou Leon: Pounce - tankbuster
{
id: 'Shifting Gymnasion Agonon Gymnasiou Leon Roar',
type: 'StartsUsing',
netRegex: { id: '7DC9', source: 'Gymnasiou Leon', capture: false },
response: Responses.getOut('info'),
},
{
id: 'Shifting Gymnasion Agonon Gymnasiou Leon Pounce',
type: 'StartsUsing',
netRegex: { id: '7DC8', source: 'Gymnasiou Leon' },
response: Responses.tankBuster(),
},
{
id: 'Shifting Gymnasion Agonon Gymnasiou Satyros Storm Wing',
type: 'StartsUsing',
Expand Down Expand Up @@ -150,16 +154,55 @@ Options.Triggers.push({
netRegex: { id: '7DCE', source: 'Gymnasiou Tigris' },
response: Responses.tankBuster(),
},
// Gymnasiou Megakantha: Odious Atmosphere - persistent front 180 channeled cleave
// Gymnasiou Megakantha: Vine Whip - tankbuster
// Gymnasiou Megakantha: Sludge Bomb - aoe under random player?
// Gymnasiou Megakantha: Odious Air - front cone
// Gymnasiou Pithekos: Thundercall - summon adds (Ball of Levin: cast Thunder IV)
// Gymnasiou Pithekos:: Ball of Levin: Thunder IV - large PBAoE
// Gymnasiou Pithekos: Spark - donut aoe
// Gymnasiou Pithekos: Sweeping Gouge - tankbuster
// Gymnasiou Pithekos: Lightning Bolt - aoe under random player?
// Gymnasiou Pithekos: ??? - headmarker, determines where Ball of Levin will spawn? (bait to edge so Spark and Thunder IV don't overlap?)
{
id: 'Shifting Gymnasion Agonon Gymnasiou Pithekos Thundercall',
type: 'HeadMarker',
netRegex: { id: '006F' },
condition: Conditions.targetIsYou(),
alertText: (_data, _matches, output) => output.text(),
outputStrings: {
text: {
en: 'Place Marker on Wall',
},
},
},
{
id: 'Shifting Gymnasion Agonon Gymnasiou Pithekos Spark',
type: 'StartsUsing',
// This happens at the same time as Ball of Levin's Thunder IV (7DD5).
// "get in" is probably sufficient is the Thunder IV is far enough away.
netRegex: { id: '7DD8', source: 'Gymnasiou Pithekos', capture: false },
response: Responses.getIn(),
},
{
id: 'Shifting Gymnasion Agonon Gymnasiou Pithekos Sweeping Gouge',
type: 'StartsUsing',
netRegex: { id: '7DD3', source: 'Gymnasiou Pithekos' },
response: Responses.tankBuster(),
},
{
id: 'Shifting Gymnasion Agonon Gymnasiou Megakantha Vine Whip',
type: 'StartsUsing',
netRegex: { id: '7DDE', source: 'Gymnasiou Megakantha' },
response: Responses.tankBuster(),
},
{
id: 'Shifting Gymnasion Agonon Gymnasiou Megakantha Odious Atmosphere',
type: 'StartsUsing',
netRegex: { id: '7DF1', source: 'Gymnasiou Megakantha', capture: false },
alertText: (_data, _matches, output) => output.text(),
outputStrings: {
text: {
en: 'Get Behind (Stay Behind)',
},
},
},
{
id: 'Shifting Gymnasion Agonon Gymnasiou Megakantha Sludge Bomb',
type: 'StartsUsing',
netRegex: { id: '7DED', source: 'Gymnasiou Megakantha', capture: false },
response: Responses.getBehind('info'),
},
// ---------------- greater summons ----------------
{
id: 'Shifting Gymnasion Agonon Gymnasiou Acheloios Tail Swing',
Expand Down Expand Up @@ -192,6 +235,9 @@ Options.Triggers.push({
id: 'Shifting Gymnasion Agonon Gymnasiou Acheloios Quadruple Hammer',
// rotates counterclockwise after each cleave
// TODO: same rotation/pattern every time?
// FIXME: the correct way to solve this is to stand on the initial safe side
// and then rotate opposite direction of rotation 90 degrees each time.
// This should probably say "start back left (rotate CCW)" sorta thing.
type: 'StartsUsing',
netRegex: { id: '7E18', source: 'Gymnasiou Acheloios', capture: false },
alertText: (_data, _matches, output) => {
Expand Down Expand Up @@ -286,7 +332,7 @@ Options.Triggers.push({
id: 'Shifting Gymnasion Agonon Gymnasiou Sphinx Frigid Pulse',
type: 'StartsUsing',
netRegex: { id: '7E0E', source: 'Gymnasiou Sphinx', capture: false },
response: Responses.getUnder(),
response: Responses.getIn(),
},
{
id: 'Shifting Gymnasion Agonon Gymnasiou Sphinx Feather Rain',
Expand All @@ -302,11 +348,31 @@ Options.Triggers.push({
netRegex: { id: '7E09', source: 'Gymnasiou Sphinx' },
response: Responses.tankBuster(),
},
// Gymnasiou Styphnolobion: Earth Quaker - PBAoE followed by donut aoe; later does earthshakers simultaneously
// Gymnasiou Styphnolobion: Rake - tankbuster
// Gymnasiou Styphnolobion: Stone III - aoe under random players?
// Gymnasiou Styphnolobion: Earth Shaker - earth shakers on random players
// Gymnasiou Styphnolobion: Tiiimbeeer (yes, it has 3 i's and 3 e's) - raidwide
{
id: 'Shifting Gymnasion Agonon Gymnasiou Styphnolobion Rake',
type: 'StartsUsing',
netRegex: { id: '7DF5', source: 'Gymnasiou Styphnolobion' },
response: Responses.tankBuster(),
},
{
id: 'Shifting Gymnasion Agonon Gymnasiou Styphnolobion Tiiimbeeer',
type: 'StartsUsing',
netRegex: { id: '7DF6', source: 'Gymnasiou Styphnolobion', capture: false },
response: Responses.aoe(),
},
{
id: 'Shifting Gymnasion Agonon Gymnasiou Styphnolobion Earth Shaker',
type: 'StartsUsing',
netRegex: { id: '7DFB', source: 'Gymnasiou Styphnolobion' },
condition: Conditions.targetIsYou(),
response: Responses.earthshaker(),
},
{
id: 'Shifting Gymnasion Agonon Gymnasiou Styphnolobion Earth Quaker',
type: 'StartsUsing',
netRegex: { id: '7DF9', source: 'Gymnasiou Styphnolobion', capture: false },
response: Responses.getOutThenIn(),
},
// ---------------- elder summons ----------------
{
id: 'Shifting Gymnasion Agonon Lyssa Chrysine Heavy Smash',
Expand Down Expand Up @@ -472,6 +538,7 @@ Options.Triggers.push({
timelineReplace: [
{
'locale': 'de',
'missingTranslations': true,
'replaceSync': {
'Gymnasiou Acheloios': 'Gymnasiou-Acheloios',
'Gymnasiou Leon': 'Gymnasiou-Leon',
Expand All @@ -489,6 +556,7 @@ Options.Triggers.push({
},
{
'locale': 'fr',
'missingTranslations': true,
'replaceSync': {
'Gymnasiou Acheloios': 'gymnasiou achéloios',
'Gymnasiou Leon': 'gymnasiou léon',
Expand All @@ -506,6 +574,7 @@ Options.Triggers.push({
},
{
'locale': 'ja',
'missingTranslations': true,
'replaceSync': {
'Gymnasiou Acheloios': 'ギュムナシオー・アケローオス',
'Gymnasiou Leon': 'ギュムナシオー・レオン',
Expand All @@ -523,6 +592,7 @@ Options.Triggers.push({
},
{
'locale': 'cn',
'missingTranslations': true,
'replaceSync': {
'Gymnasiou Acheloios': '育体阿刻罗俄斯',
'Gymnasiou Leon': '育体雄狮',
Expand All @@ -540,6 +610,7 @@ Options.Triggers.push({
},
{
'locale': 'ko',
'missingTranslations': true,
'replaceSync': {
'Gymnasiou Acheloios': '김나시온 아켈로오스',
'Gymnasiou Leon': '김나시온 사자',
Expand Down
2 changes: 1 addition & 1 deletion 06-ew/raid/p12s.js
Original file line number Diff line number Diff line change
Expand Up @@ -1588,7 +1588,7 @@ Options.Triggers.push({
},
tanksInPartyOut: {
en: 'Tanks In (Party Out)',
de: 'Gruppe Rein (Tanks Raus)',
de: 'Tanks Rein (Gruppe Raus)',
fr: 'Tanks à l\'intérieur (Équipe à l\'extérieur',
ja: 'ボスに足元へ (パーティーは離れる)',
cn: 'T进 (小队出)',
Expand Down
5 changes: 5 additions & 0 deletions 06-ew/raid/p9s.js
Original file line number Diff line number Diff line change
Expand Up @@ -404,21 +404,25 @@ Options.Triggers.push({
en: '2: First dash, third tower',
de: '2: 1. Raus, 3. Turm',
cn: '2麻 1火3塔',
ko: '2: 1돌진, 3기둥',
},
4: {
en: '4: Second dash, last tower',
de: '4: 2. Raus, 4. Turm',
cn: '4麻 2火4塔',
ko: '4: 2돌진, 4기둥',
},
6: {
en: '6: First tower, third dash',
de: '6: 1. Turm, 3. Raus',
cn: '6麻 1塔3火',
ko: '4: 1기둥, 3돌진',
},
8: {
en: '8: Second tower, last dash',
de: '8: 2. Turm, 4. Raus',
cn: '8麻 2塔4火',
ko: '8: 2기둥, 4돌진',
},
tts: {
en: '${num}',
Expand Down Expand Up @@ -448,6 +452,7 @@ Options.Triggers.push({
en: 'Defamation on you (later)',
de: 'Ehrenstrafe auf dir (später)',
cn: '大圈点名 (稍后放置)',
ko: '광역 대상자 (나중에)',
},
},
},
Expand Down
102 changes: 100 additions & 2 deletions 06-ew/ultimate/the_omega_protocol.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,14 @@ const nearDistantOutputStrings = {
de: 'Hallo Welt: Nah',
ja: 'ニア',
cn: '近处世界',
ko: '헬로 월드: 근거리',
},
distant: {
en: 'Distant World',
de: 'Hallo Welt: Fern',
ja: 'ファー',
cn: '远处世界',
ko: '헬로 월드: 원거리',
},
};
const staffSwordMidHelper = (isEastWest, posX, posY, output) => {
Expand Down Expand Up @@ -97,6 +99,7 @@ Options.Triggers.push({
de: 'Renn: Omega Stab Schwert Ausweich-Richtung',
ja: 'オメガの杖の回避方向',
cn: '欧米茄运动会杖剑躲避方向',
ko: '코드: 오메가 지팡이 칼 회피 방향',
},
type: 'select',
options: {
Expand All @@ -105,8 +108,12 @@ Options.Triggers.push({
'Dodge Mid (by Omega-F)': 'mid',
},
cn: {
'躲远 (by Omega-M)': '远',
'躲中 (by Omega-F)': '中',
'躲远 (by Omega-M)': 'far',
'躲中 (by Omega-F)': 'mid',
},
ko: {
'멀리 (Omega-M)': 'far',
'중간 (Omega-F)': 'mid',
},
},
default: 'far',
Expand Down Expand Up @@ -2758,5 +2765,96 @@ Options.Triggers.push({
'Wave Repeater': '速射式波动炮',
},
},
{
'locale': 'ko',
'replaceSync': {
'Alpha Omega': '알파 오메가',
'Cosmo Meteor': '세계의 메테오',
'(?<!Alpha )Omega(?!-)': '오메가',
'Omega-F': '오메가 F',
'Omega-M': '오메가 M',
'Optical Unit': '광학 유닛',
'Rear Power Unit': '후면 유닛',
'Left Arm Unit': '왼팔 유닛',
'Right Arm Unit': '오른팔 유닛',
'Rocket Punch': '로켓 주먹',
},
'replaceText': {
'\\(stacks\\)': '(쉐어)',
'\\(Wild Charge\\)': '(쉐어)',
'Baits': '유도',
'Far': '멀리',
'Near(?! World)': '가까이',
'Flare': '플레어',
'Puddle': '장판',
'Stack(?!s)': '쉐어',
'Archive Peripheral': '기록 보존 장치',
'Atomic Ray': '원자 파동',
'Beyond Defense': '방패 연격 S',
'Beyond Strength': '방패 연격 G',
'Blaster': '블래스터',
'Blind Faith': '맹목적인 믿음',
'Blue Screen': '블루 스크린',
'Colossal Blow': '광역 폭파',
'Condensed Wave Cannon Kyrios': '고출력 파동포 P',
'Cosmo Arrow': '세계의 화살',
'Cosmo Dive': '세계의 강하',
'Cosmo Memory': '세계의 기억',
'Cosmo Meteor': '세계의 메테오',
'Critical Error': '치명적인 오류',
'Diffuse Wave Cannon(?! Kyrios)': '확산 파동포',
'Diffuse Wave Cannon Kyrios': '확산 파동포 P',
'Discharger': '방출',
'Efficient Bladework': '검격',
'Explosion': '폭발',
'Firewall': '방어 프로그램',
'Flame Thrower': '화염방사',
'Flash Gale': '순간 강풍',
'Guided Missile Kyrios': '유도 미사일 P',
'Hello, Distant World': '헬로 월드: 원거리',
'Hello, Near World': '헬로 월드: 근거리',
'Hello, World': '헬로 월드',
'High-powered Sniper Cannon': '저격식 고출력 파동포',
'Hyper Pulse': '초파동 광선',
'Ion Efflux': '이온 유출',
'Laser Shower': '레이저 세례',
'Latent Defect': '잠재적 오류',
'Left Arm Unit': '왼팔 유닛',
'Limitless Synergy': '연계 프로그램[리미트]',
'Magic Number': '매직 넘버',
'Optical Laser': '광학 레이저 F',
'Optimized Bladedance': '쾌검난무: 오메가',
'Optimized Blizzard III': '블리자가: 오메가',
'Optimized Fire III': '파이라: 오메가',
'Optimized Meteor': '메테오: 오메가',
'Optimized Passage of Arms': '오메가의 결의',
'Optimized Sagittarius Arrow': '궁수자리 화살: 오메가',
'Oversampled Wave Cannon': '감지식 파동포',
'Pantokrator': '전지전능',
'Party Synergy': '연계 프로그램[파티]',
'Patch': '연쇄 오류',
'Peripheral Synthesis': '출력',
'Pile Pitch': '에너지 투사',
'Program Loop': '순환 프로그램',
'Rear Lasers': '후면 레이저',
'Right Arm Unit': '오른팔 유닛',
'Run: \\*\\*\\*\\*mi\\*(?! \\()': '코드: **미*',
'Run: \\*\\*\\*\\*mi\\* \\(Delta Version\\)': '코드: **미*[델타]',
'Run: \\*\\*\\*\\*mi\\* \\(Omega Version\\)': '코드: **미*[오메가]',
'Run: \\*\\*\\*\\*mi\\* \\(Sigma Version\\)': '코드: **미*[시그마]',
'(?<! )Sniper Cannon': '저격식 파동포',
'Solar Ray': '태양 광선',
'Spotlight': '집중 조명',
'Storage Violation': '기억 오염 제거 S',
'Subject Simulation F': '형태 변경 F',
'Superliminal Steel': '칼날 연격 B',
'Swivel Cannon': '선회식 파동포',
'Synthetic Shield': '방패 장착',
'Unlimited Wave Cannon': '파동포: 리미터 해제',
'(?<! )Wave Cannon(?! Kyrios)': '파동포',
'(?<! )Wave Cannon Kyrios': '파동포 P',
'Wave Repeater': '속사식 파동포',
},
},
],
});

0 comments on commit b02be6f

Please sign in to comment.