Skip to content

Commit

Permalink
raidboss: add R4S Midnight Sabbath wings and guns info (OverlayPlugin…
Browse files Browse the repository at this point in the history
…#348)

add R4S Midnight Sabbath wings and guns info, When dealing this, The
previous ones didn't show the safe zone very visually. Only call:
- Cardinals => Stack With Partner
- Intercards => Spread

In this change, modify to
- Cardinals => Avoid Line + Stack With Partner 
- Intercards => Donut + Spread

It's easier to visual danger zone and find safe areas in the game.
  • Loading branch information
YuzukiTsuru authored Aug 24, 2024
1 parent 3bd720f commit c428f3b
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 15 deletions.
4 changes: 2 additions & 2 deletions resources/outputs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -766,15 +766,15 @@ export default {
de: 'Kardinal',
fr: 'Cardinaux',
ja: '十字回避',
cn: '十字',
cn: '去正点',
ko: '십자방향으로',
},
intercards: {
en: 'Intercards',
de: 'Interkardinal',
fr: 'Intercardinal',
ja: '斜めへ',
cn: '四角',
cn: '去斜角',
ko: '대각선 쪽으로',
},
north: {
Expand Down
46 changes: 33 additions & 13 deletions ui/raidboss/data/07-dt/raid/r4s.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1475,20 +1475,31 @@ const triggerSet: TriggerSet<Data> = {
? (data.midnightCardFirst ? output.cardinals!() : output.intercards!())
: (data.midnightCardFirst ? output.intercards!() : output.cardinals!());

return output.combo!({ dir: dirStr, mech: firstMechStr });
const typeStr = data.midnightFirstAdds === 'wings' ? output.wings!() : output.guns!();

return output.combo!({ dir: dirStr, type: typeStr, mech: firstMechStr });
},
outputStrings: {
combo: {
en: '${dir} => ${mech}',
de: '${dir} => ${mech}',
ja: '${dir} => ${mech}',
cn: '${dir} => ${mech}',
ko: '${dir} => ${mech}',
en: '${dir} + ${type} + ${mech}',
de: '${dir} + ${type} + ${mech}',
ja: '${dir} + ${type} + ${mech}',
cn: '${dir} + ${type} + ${mech}',
ko: '${dir} + ${type} + ${mech}',
},
guns: {
en: 'Avoid Line',
cn: '躲避直线',
},
wings: {
en: 'Donut',
cn: '月环',
},
cardinals: Outputs.cardinals,
intercards: Outputs.intercards,
partners: Outputs.stackPartner,
spread: Outputs.spread,
unknown: Outputs.unknown,
},
},
{
Expand All @@ -1509,15 +1520,25 @@ const triggerSet: TriggerSet<Data> = {
? (secondAddsOnCards ? output.cardinals!() : output.intercards!())
: (secondAddsOnCards ? output.intercards!() : output.cardinals!());

return output.combo!({ dir: dirStr, mech: secondMechStr });
const typeStr = data.midnightSecondAdds === 'wings' ? output.wings!() : output.guns!();

return output.combo!({ dir: dirStr, type: typeStr, mech: secondMechStr });
},
outputStrings: {
combo: {
en: '${dir} => ${mech}',
de: '${dir} => ${mech}',
ja: '${dir} => ${mech}',
cn: '${dir} => ${mech}',
ko: '${dir} => ${mech}',
en: '${dir} + ${type} + ${mech}',
de: '${dir} + ${type} + ${mech}',
ja: '${dir} + ${type} + ${mech}',
cn: '${dir} + ${type} + ${mech}',
ko: '${dir} + ${type} + ${mech}',
},
guns: {
en: 'Avoid Line',
cn: '躲避直线',
},
wings: {
en: 'Donut',
cn: '月环',
},
cardinals: Outputs.cardinals,
intercards: Outputs.intercards,
Expand All @@ -1526,7 +1547,6 @@ const triggerSet: TriggerSet<Data> = {
unknown: Outputs.unknown,
},
},

// Chain Lightning
{
id: 'R4S Flame Slash',
Expand Down

0 comments on commit c428f3b

Please sign in to comment.