Skip to content

Commit

Permalink
triggers build: raidboss/oopsy: shadowbringers blu updates (#5985) 73…
Browse files Browse the repository at this point in the history 
…f07df
  • Loading branch information
github-actions committed Dec 6, 2023
1 parent 6127236 commit e8ec7c7
Show file tree
Hide file tree
Showing 13 changed files with 989 additions and 354 deletions.
419 changes: 270 additions & 149 deletions 05-shb/raid/e12s.js
View file

Large diffs are not rendered by default.

156 changes: 104 additions & 52 deletions 05-shb/raid/e4s.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ Options.Triggers.push({
id: 'EdensGateSepultureSavage',
zoneId: ZoneId.EdensGateSepultureSavage,
timelineFile: 'e4s.txt',
initData: () => {
return {
plateFracture: [],
gaolPlayers: [],
gaolPlayerCount: 0,
};
},
timelineTriggers: [
{
id: 'E4S Earthen Anguish',
Expand Down Expand Up @@ -45,7 +52,12 @@ Options.Triggers.push({
type: 'HeadMarker',
netRegex: { id: '00B9' },
condition: Conditions.targetIsYou(),
response: Responses.spread('alert'),
infoText: (_data, _matches, output) => output.text(),
outputStrings: {
text: {
en: 'Yellow Spread',
},
},
},
{
id: 'E4S Evil Earth',
Expand All @@ -69,7 +81,12 @@ Options.Triggers.push({
type: 'HeadMarker',
netRegex: { id: '00BA' },
condition: Conditions.targetIsYou(),
response: Responses.stackMarker(),
infoText: (_data, _matches, output) => output.text(),
outputStrings: {
text: {
en: 'Orange Stack',
},
},
},
{
id: 'E4S Voice of the Land',
Expand Down Expand Up @@ -252,6 +269,7 @@ Options.Triggers.push({
type: 'StartsUsing',
netRegex: { id: '4124', source: 'Titan Maximum', capture: false },
response: Responses.bigAoe(),
run: (data) => data.plateFracture = [],
},
{
id: 'E4S Earthen Fury with Bleed',
Expand All @@ -266,14 +284,7 @@ Options.Triggers.push({
netRegex: { id: '412F', source: 'Titan Maximum', capture: false },
infoText: (_data, _matches, output) => output.text(),
outputStrings: {
text: {
en: 'Left, Then Right',
de: 'Links, dann Rechts',
fr: 'À gauche, puis à droite',
ja: '左 => 右',
cn: '左 => 右',
ko: '왼쪽 => 오른쪽',
},
text: Outputs.leftThenRight,
},
},
{
Expand All @@ -282,14 +293,7 @@ Options.Triggers.push({
netRegex: { id: '4130', source: 'Titan Maximum', capture: false },
infoText: (_data, _matches, output) => output.text(),
outputStrings: {
text: {
en: 'Right, Then Left',
de: 'Rechts, dann Links',
fr: 'À droite, puis à gauche',
ja: '右 => 左',
cn: '右 => 左',
ko: '오른쪽 => 왼쪽',
},
text: Outputs.rightThenLeft,
},
},
{
Expand All @@ -299,7 +303,7 @@ Options.Triggers.push({
infoText: (_data, _matches, output) => output.text(),
outputStrings: {
text: {
en: 'Left, Stay Left',
en: 'Left => Stay Left',
de: 'Links, Links bleiben',
fr: 'À gauche, puis restez',
ja: 'ずっと左',
Expand All @@ -315,7 +319,7 @@ Options.Triggers.push({
infoText: (_data, _matches, output) => output.text(),
outputStrings: {
text: {
en: 'Right, Stay Right',
en: 'Right => Stay Right',
de: 'Rechts, Rechts bleiben',
fr: 'À droite, puis restez',
ja: 'ずっと右',
Expand All @@ -335,7 +339,12 @@ Options.Triggers.push({
type: 'HeadMarker',
netRegex: { id: '00BB' },
condition: Conditions.targetIsYou(),
response: Responses.getOut(),
alarmText: (_data, _matches, output) => output.text(),
outputStrings: {
text: {
en: 'Blue Weight',
},
},
},
{
id: 'E4S Megalith',
Expand All @@ -362,90 +371,133 @@ Options.Triggers.push({
},
},
{
id: 'E4S Granite Gaol',
id: 'E4S Granite Gaol Collect',
type: 'HeadMarker',
netRegex: { id: '00BF' },
condition: Conditions.targetIsYou(),
alertText: (_data, _matches, output) => output.text(),
run: (data, matches) => data.gaolPlayers.push(matches.target),
},
{
id: 'E4S Granite Gaol',
type: 'HeadMarker',
netRegex: { id: '00BF', capture: false },
condition: (data) => data.gaolPlayers.length === 2 && data.gaolPlayers.includes(data.me),
alarmText: (data, _matches, output) => {
const [first, second] = data.gaolPlayers;
const other = first === data.me ? second : first;
return output.text({ player: data.party.member(other) });
},
outputStrings: {
text: {
en: 'Gaol on YOU',
de: 'Gefängnis auf DIR',
fr: 'Geôle sur VOUS',
ja: '自分にジェイル',
cn: '石牢点名',
ko: '화강암 감옥 대상',
en: 'Gaol on YOU (w/${player})',
},
},
},
{
// TODO: these could be better called out
// On the first set, maybe should tell you where to put the jails,
// if it's a consistent strategy to ranged lb the jails. After that
// it could just tell you to "go right" or "go left".
// On the second set, could just say "go right" / "go front" and
// keep track of which it has seen.
id: 'E4S Plate Fracture - Front Right',
type: 'StartsUsing',
netRegex: { id: '4125', source: 'Titan Maximum', capture: false },
infoText: (_data, _matches, output) => output.text(),
durationSeconds: 6,
infoText: (data, _matches, output) => {
const last = data.plateFracture[data.plateFracture.length - 1];
if (data.plateFracture.length === 2 || last === 'backRight')
return output.left();
if (data.plateFracture.length === 1 || last === 'frontLeft')
return output.back();
return output.leftOrBack();
},
run: (data) => data.plateFracture.push('frontRight'),
outputStrings: {
text: {
en: 'GET OFF FRONT RIGHT',
leftOrBack: {
en: 'Left (or Back)',
de: 'VON VORNE RECHTS RUNTER',
fr: 'PARTEZ DE L\'AVANT DROITE',
ja: '右前壊れるよ',
cn: '破坏右前',
ko: '앞 오른쪽 피하기',
ko: '앞 오른쪽 피하기', // FIXME
},
left: Outputs.left,
back: Outputs.back,
},
},
{
id: 'E4S Plate Fracture - Back Right',
type: 'StartsUsing',
netRegex: { id: '4126', source: 'Titan Maximum', capture: false },
infoText: (_data, _matches, output) => output.text(),
durationSeconds: 6,
infoText: (data, _matches, output) => {
const last = data.plateFracture[data.plateFracture.length - 1];
if (data.plateFracture.length === 2 || last === 'frontRight')
return output.left();
if (data.plateFracture.length === 1 || last === 'backLeft')
return output.front();
return output.leftOrFront();
},
run: (data) => data.plateFracture.push('backRight'),
outputStrings: {
text: {
en: 'GET OFF BACK RIGHT',
leftOrFront: {
en: 'Left (or Front)',
de: 'VON HINTEN RECHTS RUNTER',
fr: 'PARTEZ DE L\'ARRIÈRE DROITE',
ja: '右後ろ壊れるよ',
cn: '破坏右后',
ko: '뒤 오른쪽 피하기',
ko: '뒤 오른쪽 피하기', // FIXME
},
left: Outputs.left,
front: Outputs.front,
},
},
{
id: 'E4S Plate Fracture - Back Left',
type: 'StartsUsing',
netRegex: { id: '4127', source: 'Titan Maximum', capture: false },
infoText: (_data, _matches, output) => output.text(),
durationSeconds: 6,
infoText: (data, _matches, output) => {
const last = data.plateFracture[data.plateFracture.length - 1];
if (data.plateFracture.length === 2 || last === 'frontLeft')
return output.right();
if (data.plateFracture.length === 1 || last === 'backRight')
return output.front();
return output.frontOrRight();
},
run: (data) => data.plateFracture.push('backLeft'),
outputStrings: {
text: {
en: 'GET OFF BACK LEFT',
frontOrRight: {
en: 'Right (or Front)',
de: 'VON HINTEN LINKS RUNTER',
fr: 'PARTEZ DE L\'ARRIÈRE GAUCHE',
ja: '左後ろ壊れるよ',
cn: '破坏左后',
ko: '뒤 왼쪽 피하기',
ko: '뒤 왼쪽 피하기', // FIXME
},
right: Outputs.right,
front: Outputs.front,
},
},
{
id: 'E4S Plate Fracture - Front Left',
type: 'StartsUsing',
netRegex: { id: '4128', source: 'Titan Maximum', capture: false },
infoText: (_data, _matches, output) => output.text(),
durationSeconds: 6,
infoText: (data, _matches, output) => {
const last = data.plateFracture[data.plateFracture.length - 1];
if (data.plateFracture.length === 2 || last === 'backLeft')
return output.right();
if (data.plateFracture.length === 1 || last === 'frontRight')
return output.back();
return output.backOrRight();
},
run: (data) => data.plateFracture.push('frontLeft'),
outputStrings: {
text: {
en: 'GET OFF FRONT LEFT',
backOrRight: {
en: 'Right (or Back)',
de: 'VON VORNE LINKS RUNTER',
fr: 'PARTEZ DE L\'AVANT GAUCHE',
ja: '左前壊れるよ',
cn: '破坏左前',
ko: '앞 왼쪽 피하기',
ko: '앞 왼쪽 피하기', // FIXME
},
right: Outputs.right,
back: Outputs.back,
},
},
{
Expand Down
12 changes: 6 additions & 6 deletions 05-shb/raid/e4s.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ hideall "Earthen Wheels"
1053.2 "Weight of the Land" sync / 1[56]:[^:]*:Titan:4108:/
1061.9 "Dual Earthen Fists" sync / 1[56]:[^:]*:Titan Maximum:4135:/
1065.9 "Earthen Anguish" sync / 1[56]:[^:]*:Titan:4137:/
1071.8 "Megalith?" sync / 1[56]:[^:]*:Titan Maximum:4138:/
1071.8 "Megalith" sync / 1[56]:[^:]*:Titan Maximum:4138:/
1088.0 "Tectonic Uplift" sync / 1[56]:[^:]*:Titan Maximum:4122:/ window 20,20
1100.1 "Force of the Land" sync / 1[56]:[^:]*:Titan:4107:/
1100.1 "Pulse of the Land" sync / 1[56]:[^:]*:Titan:4106:/
1108.2 "Earthen Fury" sync / 1[56]:[^:]*:Titan Maximum:4124:/
1122.3 "Rock Throw" sync / 1[56]:[^:]*:Titan Maximum:412D:/
1135.1 "Plate Fracture" sync / 1[56]:[^:]*:Titan:43EA:/
1149.2 "Plate Fracture" sync / 1[56]:[^:]*:Titan:43EA:/
1162.4 "Plate Fracture" sync / 1[56]:[^:]*:Titan:43EA:/
1135.1 "Plate Fracture 1" sync / 1[56]:[^:]*:Titan:43EA:/
1149.2 "Plate Fracture 2" sync / 1[56]:[^:]*:Titan:43EA:/
1162.4 "Plate Fracture 3" sync / 1[56]:[^:]*:Titan:43EA:/
1171.9 "Earthen Fury" sync / 1[56]:[^:]*:Titan Maximum:4124:/
1180.7 "Tumult x5" sync / 1[56]:[^:]*:Titan Maximum:412A:/ duration 6
1197.4 "Dual Earthen Fists" sync / 1[56]:[^:]*:Titan Maximum:4135:/
Expand All @@ -106,9 +106,9 @@ hideall "Earthen Wheels"
1275.1 "Force of the Land" sync / 1[56]:[^:]*:Titan:4107:/
1283.4 "Earthen Fury" sync / 1[56]:[^:]*:Titan Maximum:4124:/
1292.2 "Tumult x5" sync / 1[56]:[^:]*:Titan Maximum:412A:/ duration 6
1314.4 "Plate Fracture" sync / 1[56]:[^:]*:Titan:43EA:/
1314.4 "Plate Fracture 1" sync / 1[56]:[^:]*:Titan:43EA:/
1324.0 "Megalith" sync / 1[56]:[^:]*:Titan Maximum:4138:/
1337.7 "Plate Fracture" sync / 1[56]:[^:]*:Titan:43EA:/
1337.7 "Plate Fracture 2" sync / 1[56]:[^:]*:Titan:43EA:/
1340.7 "Pulse of the Land" sync / 1[56]:[^:]*:Titan:4106:/
1340.7 "Force of the Land" sync / 1[56]:[^:]*:Titan:4107:/
1349.1 "Earthen Fury" sync / 1[56]:[^:]*:Titan Maximum:4124:/
Expand Down
Loading

0 comments on commit e8ec7c7

Please sign in to comment.