@@ -18,6 +18,10 @@ type WeaponInfo = {
1818} ;
1919
2020export interface Data extends RaidbossData {
21+ readonly triggerSetConfig : {
22+ majesticMeteowrathTetherDir : 'cw' | 'ccw' ;
23+ twoWayFireballBaitDir : 'ew' | 'ns' ;
24+ } ;
2125 phase : Phase ;
2226 actorPositions : { [ id : string ] : { x : number ; y : number ; heading : number } } ;
2327 weapons : {
@@ -110,6 +114,54 @@ const ultimateTrophyWeaponsMap: (WeaponInfo | undefined)[] = [
110114const triggerSet : TriggerSet < Data > = {
111115 id : 'AacHeavyweightM3Savage' ,
112116 zoneId : ZoneId . AacHeavyweightM3Savage ,
117+ config : [
118+ {
119+ id : 'majesticMeteowrathTetherDir' ,
120+ name : {
121+ en : 'Majestic Meteowrath Tether Direction' ,
122+ ko : '분노의 챔피언 메테오 선 처리 방향' ,
123+ } ,
124+ comment : {
125+ en : 'Direction to stretch tethers during Majestic Meteowrath.' ,
126+ ko : '분노의 챔피언 메테오 선 처리 방향을 설정합니다.' ,
127+ } ,
128+ type : 'select' ,
129+ options : {
130+ en : {
131+ 'Clockwise' : 'cw' ,
132+ 'Counter Clockwise' : 'ccw' ,
133+ } ,
134+ ko : {
135+ '시계방향' : 'cw' ,
136+ '반시계방향' : 'ccw' ,
137+ } ,
138+ } ,
139+ default : 'cw' ,
140+ } ,
141+ {
142+ id : 'twoWayFireballBaitDir' ,
143+ name : {
144+ en : 'Two-Way Fireball Bait Direction' ,
145+ ko : '두 갈래 회전화염 유도 위치' ,
146+ } ,
147+ comment : {
148+ en : 'Direction to bait the two-way fireball.' ,
149+ ko : '두 갈래 회전화염 유도 방향을 설정합니다.' ,
150+ } ,
151+ type : 'select' ,
152+ options : {
153+ en : {
154+ 'East/West' : 'ew' ,
155+ 'North/South' : 'ns' ,
156+ } ,
157+ ko : {
158+ '동/서' : 'ew' ,
159+ '북/남' : 'ns' ,
160+ } ,
161+ } ,
162+ default : 'ew' ,
163+ } ,
164+ ] ,
113165 timelineFile : 'r11s.txt' ,
114166 initData : ( ) => ( {
115167 phase : 'one' ,
@@ -1371,8 +1423,10 @@ const triggerSet: TriggerSet<Data> = {
13711423 return ;
13721424
13731425 const portalDirNum = Directions . xyTo8DirNum ( actor . x , actor . y , center . x , center . y ) ;
1374- // TODO: Make config for options?
1375- const stretchDirNum = ( portalDirNum + 5 ) % 8 ;
1426+
1427+ const stretchDirNum = data . triggerSetConfig . majesticMeteowrathTetherDir === 'ccw'
1428+ ? ( portalDirNum + 3 ) % 8
1429+ : ( portalDirNum + 5 ) % 8 ;
13761430 const stretchDir = Directions . output8Dir [ stretchDirNum ] ?? 'unknown' ;
13771431 return output . stretchTetherDir ! ( { dir : output [ stretchDir ] ! ( ) } ) ;
13781432 } ,
@@ -1391,22 +1445,41 @@ const triggerSet: TriggerSet<Data> = {
13911445 type : 'StartsUsing' ,
13921446 netRegex : { id : 'B7BD' , source : 'The Tyrant' , capture : false } ,
13931447 alertText : ( data , _matches , output ) => {
1448+ const baitDir = data . triggerSetConfig . twoWayFireballBaitDir === 'ns'
1449+ ? 'northSouth'
1450+ : 'eastWest' ;
13941451 if ( data . hadEclipticTether )
1395- return output . twoWayBehind ! ( ) ;
1396- return output . twoWayFront ! ( ) ;
1452+ return output . twoWayBehind ! ( { dir : output [ baitDir ] ! ( ) } ) ;
1453+ return output . twoWayFront ! ( { dir : output [ baitDir ] ! ( ) } ) ;
13971454 } ,
13981455 outputStrings : {
1456+ eastWest : {
1457+ en : 'East/West' ,
1458+ de : 'Osten/Westen' ,
1459+ fr : 'Est/Ouest' ,
1460+ cn : '左/右' ,
1461+ ko : '동/서' ,
1462+ tc : '東/西' ,
1463+ } ,
1464+ northSouth : {
1465+ en : 'North/South' ,
1466+ de : 'Norden/Süden' ,
1467+ fr : 'Nord/Sud' ,
1468+ cn : '上/下' ,
1469+ ko : '북/남' ,
1470+ tc : '北/南' ,
1471+ } ,
13991472 twoWayFront : {
1400- en : 'East/West Line Stack, Be in Front' ,
1401- de : 'Osten/West in einer Linie Sammeln, sei vorne' ,
1402- cn : '左/右向直线分摊 ,站前方' ,
1403- ko : '동/서 직선 쉐어, 앞에 있기' ,
1473+ en : '${dir} Line Stack, Be in Front' ,
1474+ de : '${dir} in einer Linie Sammeln, sei vorne' ,
1475+ cn : '${dir}向直线分摊 ,站前方' ,
1476+ ko : '${dir} 직선 쉐어, 앞에 있기' ,
14041477 } ,
14051478 twoWayBehind : {
1406- en : 'Move; East/West Line Stack, Get behind' ,
1407- de : 'Geh Osten/West , in einer Linie Sammeln, sei hinten' ,
1408- cn : '移动; 左/右向直线分摊 ,站后方' ,
1409- ko : '이동; 동/서 직선 쉐어, 뒤로 가기' ,
1479+ en : 'Move; ${dir} Line Stack, Get behind' ,
1480+ de : 'Geh ${dir} , in einer Linie Sammeln, sei hinten' ,
1481+ cn : '移动; ${dir}向直线分摊 ,站后方' ,
1482+ ko : '이동; ${dir} 직선 쉐어, 뒤로 가기' ,
14101483 } ,
14111484 } ,
14121485 } ,
0 commit comments