Skip to content

Commit

Permalink
raidboss: timeline netregex for sourceGroups (#6039)
Browse files Browse the repository at this point in the history
`/(?<=\w* {[^}]*source: )"\((?<source>[^)]*)\)"/`

Splits source groups into their own parameters.
This reveals some translation collision, so fix that too.

Related to #5977.
  • Loading branch information
quisquous authored Dec 15, 2023
1 parent d82b13a commit 2bec809
Show file tree
Hide file tree
Showing 20 changed files with 150 additions and 150 deletions.
20 changes: 10 additions & 10 deletions ui/raidboss/data/02-arr/raid/t9.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ hideall "--sync--"
16.6 "Ravensclaw" Ability { id: "7D5", source: "Nael deus Darnus" }

21.8 "Stardust" Ability { id: "877", source: "Nael deus Darnus" } duration 9
30.8 "--sync--" Ability { id: "7E9", source: "(Astral Debris|Umbral Debris)" }
30.8 "--sync--" Ability { id: "7E9", source: ['Astral Debris', 'Umbral Debris'] }
30.9 "Ravensbeak" Ability { id: "7D6", source: "Nael deus Darnus" } duration 13
36.2 "Raven Dive" Ability { id: "7DD", source: "Nael deus Darnus" }
40.8 "Iron Chariot" Ability { id: "7D8", source: "Nael deus Darnus" }
Expand All @@ -23,7 +23,7 @@ hideall "--sync--"

58.6 "Stardust" Ability { id: "877", source: "Nael deus Darnus" } duration 9
63.4 "Ravensclaw" Ability { id: "7D5", source: "Nael deus Darnus" }
67.6 "--sync--" Ability { id: "7E9", source: "(Astral Debris|Umbral Debris)" }
67.6 "--sync--" Ability { id: "7E9", source: ['Astral Debris', 'Umbral Debris'] }
69.4 "Lunar Dynamo" Ability { id: "7DA", source: "Nael deus Darnus" }
71.8 "Meteor Stream" Ability { id: "7DE", source: "Nael Geminus" }
74.9 "Dalamud Dive" Ability { id: "7DC", source: "Nael deus Darnus" }
Expand All @@ -32,7 +32,7 @@ hideall "--sync--"

95.0 "Stardust" Ability { id: "877", source: "Nael deus Darnus" } duration 9
96.6 "--sync--" Ability { id: "7D7", source: "Nael deus Darnus" }
104.0 "--sync--" Ability { id: "7E9", source: "(Astral Debris|Umbral Debris)" }
104.0 "--sync--" Ability { id: "7E9", source: ['Astral Debris', 'Umbral Debris'] }
107.2 "Meteor Stream" #Ability { id: "7DE", source: "Nael Geminus" }
112.3 "Meteor Stream" #Ability { id: "7DE", source: "Nael Geminus" }
115.4 "Dalamud Dive" Ability { id: "7DC", source: "Nael deus Darnus" }
Expand All @@ -42,7 +42,7 @@ hideall "--sync--"
135.5 "Stardust" Ability { id: "877", source: "Nael deus Darnus" } duration 9
140.0 "Ravensclaw" Ability { id: "7D5", source: "Nael deus Darnus" }
143.2 "--sync--" Ability { id: "7D7", source: "Nael deus Darnus" }
144.6 "--sync--" Ability { id: "7E9", source: "(Astral Debris|Umbral Debris)" }
144.6 "--sync--" Ability { id: "7E9", source: ['Astral Debris', 'Umbral Debris'] }
146.1 "Raven Dive" Ability { id: "7DD", source: "Nael deus Darnus" }
150.7 "Iron Chariot" Ability { id: "7D8", source: "Nael deus Darnus" }
152.6 "Thermionic Beam" Ability { id: "7DF", source: "Nael deus Darnus" }
Expand All @@ -51,7 +51,7 @@ hideall "--sync--"

168.6 "Stardust" Ability { id: "877", source: "Nael deus Darnus" } duration 9
177.4 "Ravensbeak" Ability { id: "7D6", source: "Nael deus Darnus" } duration 13
177.7 "--sync--" Ability { id: "7E9", source: "(Astral Debris|Umbral Debris)" }
177.7 "--sync--" Ability { id: "7E9", source: ['Astral Debris', 'Umbral Debris'] }
183.9 "Lunar Dynamo" Ability { id: "7DA", source: "Nael deus Darnus" }
186.2 "Meteor Stream" Ability { id: "7DE", source: "Nael Geminus" }
189.3 "Dalamud Dive" Ability { id: "7DC", source: "Nael deus Darnus" }
Expand All @@ -60,15 +60,15 @@ hideall "--sync--"

203.9 "Stardust" Ability { id: "877", source: "Nael deus Darnus" } duration 9
208.0 "Ravensclaw" Ability { id: "7D5", source: "Nael deus Darnus" }
213.0 "--sync--" Ability { id: "7E9", source: "(Astral Debris|Umbral Debris)" }
213.0 "--sync--" Ability { id: "7E9", source: ['Astral Debris', 'Umbral Debris'] }
217.5 "Meteor Stream" #Ability { id: "7DE", source: "Nael Geminus" }
222.6 "Meteor Stream" #Ability { id: "7DE", source: "Nael Geminus" }
225.8 "Dalamud Dive" Ability { id: "7DC", source: "Nael deus Darnus" }
234.2 "Ravensbeak" Ability { id: "7D6", source: "Nael deus Darnus" } duration 13
239.6 "Ravensclaw" Ability { id: "7D5", source: "Nael deus Darnus" }

245.8 "Stardust" Ability { id: "877", source: "Nael deus Darnus" } duration 9
254.8 "--sync--" Ability { id: "7E9", source: "(Astral Debris|Umbral Debris)" }
254.8 "--sync--" Ability { id: "7E9", source: ['Astral Debris', 'Umbral Debris'] }
255.5 "Raven Dive" Ability { id: "7DD", source: "Nael deus Darnus" }
260.1 "Iron Chariot" Ability { id: "7D8", source: "Nael deus Darnus" }
262.1 "Thermionic Beam" Ability { id: "7DF", source: "Nael deus Darnus" }
Expand All @@ -78,15 +78,15 @@ hideall "--sync--"

283.0 "Stardust" Ability { id: "877", source: "Nael deus Darnus" } duration 9
286.8 "Ravensclaw" Ability { id: "7D5", source: "Nael deus Darnus" }
292.0 "--sync--" Ability { id: "7E9", source: "(Astral Debris|Umbral Debris)" }
292.0 "--sync--" Ability { id: "7E9", source: ['Astral Debris', 'Umbral Debris'] }
294.3 "Lunar Dynamo" Ability { id: "7DA", source: "Nael deus Darnus" }
296.7 "Meteor Stream" Ability { id: "7DE", source: "Nael Geminus" }
299.9 "Dalamud Dive" Ability { id: "7DC", source: "Nael deus Darnus" }
307.9 "Ravensclaw" Ability { id: "7D5", source: "Nael deus Darnus" }

314.3 "Stardust" Ability { id: "877", source: "Nael deus Darnus" } duration 9
322.8 "Ravensbeak" Ability { id: "7D6", source: "Nael deus Darnus" }
323.3 "--sync--" Ability { id: "7E9", source: "(Astral Debris|Umbral Debris)" }
323.3 "--sync--" Ability { id: "7E9", source: ['Astral Debris', 'Umbral Debris'] }
332.0 "Meteor Stream" Ability { id: "7DE", source: "Nael Geminus" }
335.9 "--sync--" Ability { id: "7D7", source: "Nael deus Darnus" }
337.0 "Meteor Stream" Ability { id: "7DE", source: "Nael Geminus" }
Expand All @@ -95,7 +95,7 @@ hideall "--sync--"

355.0 "Stardust" Ability { id: "877", source: "Nael deus Darnus" } duration 9
358.5 "Ravensclaw" Ability { id: "7D5", source: "Nael deus Darnus" }
364.0 "--sync--" Ability { id: "7E9", source: "(Astral Debris|Umbral Debris)" }
364.0 "--sync--" Ability { id: "7E9", source: ['Astral Debris', 'Umbral Debris'] }
366.0 "Raven Dive" Ability { id: "7DD", source: "Nael deus Darnus" }
370.5 "Iron Chariot" Ability { id: "7D8", source: "Nael deus Darnus" }
372.7 "Thermionic Beam" Ability { id: "7DF", source: "Nael deus Darnus" }
Expand Down
6 changes: 3 additions & 3 deletions ui/raidboss/data/03-hw/alliance/dun_scaith.ts
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ const triggerSet: TriggerSet<Data> = {
{
'locale': 'de',
'replaceSync': {
'Aether': 'Äthersphäre',
'Aether(?!i)': 'Äthersphäre',
'Aether Collector': 'Ätherakkumulator',
'Aetherial Chakram': 'ätherisch(?:e|er|es|en) Chakram',
'Connla': 'Connla',
Expand Down Expand Up @@ -739,7 +739,7 @@ const triggerSet: TriggerSet<Data> = {
{
'locale': 'fr',
'replaceSync': {
'Aether': 'sphère éthérée',
'Aether(?!i)': 'sphère éthérée',
'Aether Collector': 'accumulateur d\'éther',
'Aetherial Chakram': 'chakram éthéré',
'Connla': 'Connla',
Expand Down Expand Up @@ -1041,7 +1041,7 @@ const triggerSet: TriggerSet<Data> = {
{
'locale': 'ko',
'replaceSync': {
'Aether': '에테르 구체',
'Aether(?!i)': '에테르 구체',
'Aether Collector': '에테르 집적기',
'Aetherial Chakram': '에테르 차크람',
'Connla': '콘라',
Expand Down
24 changes: 12 additions & 12 deletions ui/raidboss/data/03-hw/alliance/dun_scaith.txt
Original file line number Diff line number Diff line change
Expand Up @@ -121,18 +121,18 @@ hideall "--sync--"
1014.2 "Black Wind x3" # Ability { id: "1CAC", source: "Ferdiad Hollow" }
1020.3 "Sleight" Ability { id: "1C99", source: "Ferdiad Hollow" }
1028.0 "Wormhole" Ability { id: "1C9A", source: "Ferdiad Hollow" }
1028.3 "--sync--" Ability { id: "1C49", source: "(Cursing Atomos|Wailing Atomos)" }
1028.5 "Juggling Sphere" Ability { id: "1C(9F|A0)", source: "(Aether|Aetherial Chakram)" }
1030.0 "--sync--" Ability { id: "1C9[CD]", source: "(Cursing Atomos|Wailing Atomos)" }
1033.2 "Explosion" Ability { id: "1CA[12]", source: "(Aether|Aetherial Chakram)" }
1028.3 "--sync--" Ability { id: "1C49", source: ['Cursing Atomos', 'Wailing Atomos'] }
1028.5 "Juggling Sphere" Ability { id: "1C(9F|A0)", source: ['Aether', 'Aetherial Chakram'] }
1030.0 "--sync--" Ability { id: "1C9[CD]", source: ['Cursing Atomos', 'Wailing Atomos'] }
1033.2 "Explosion" Ability { id: "1CA[12]", source: ['Aether', 'Aetherial Chakram'] }
1039.2 "Jester's Reap" Ability { id: "1E41", source: "Ferdiad Hollow" }
1047.2 "Jongleur's X" Ability { id: "1C98", source: "Ferdiad Hollow" }
1052.2 "Sleight" Ability { id: "1C99", source: "Ferdiad Hollow" }
1060.5 "Wormhole" Ability { id: "1C9A", source: "Ferdiad Hollow" }
1060.8 "--sync--" Ability { id: "1C49", source: "(Cursing Atomos|Wailing Atomos)" }
1061.0 "Juggling Sphere" Ability { id: "1C(9F|A0)", source: "(Aether|Aetherial Chakram)" }
1062.5 "--sync--" Ability { id: "1C9[CD]", source: "(Cursing Atomos|Wailing Atomos)" }
1065.7 "Explosion" Ability { id: "1CA[12]", source: "(Aether|Aetherial Chakram)" }
1060.8 "--sync--" Ability { id: "1C49", source: ['Cursing Atomos', 'Wailing Atomos'] }
1061.0 "Juggling Sphere" Ability { id: "1C(9F|A0)", source: ['Aether', 'Aetherial Chakram'] }
1062.5 "--sync--" Ability { id: "1C9[CD]", source: ['Cursing Atomos', 'Wailing Atomos'] }
1065.7 "Explosion" Ability { id: "1CA[12]", source: ['Aether', 'Aetherial Chakram'] }
1069.7 "Debilitator" Ability { id: "1CA6", source: "Ferdiad Hollow" }
1079.9 "Jongleur's X" Ability { id: "1C98", source: "Ferdiad Hollow" }
1087.4 "Flameflow" Ability { id: "1CA7", source: "Ferdiad Hollow" }
Expand All @@ -155,10 +155,10 @@ hideall "--sync--"

1319.0 "Sleight" Ability { id: "1C99", source: "Ferdiad Hollow" }
1327.5 "Wormhole" Ability { id: "1C9A", source: "Ferdiad Hollow" }
1327.8 "--sync--" Ability { id: "1C49", source: "(Cursing Atomos|Wailing Atomos)" }
1328.0 "Juggling Sphere" Ability { id: "1C(9F|A0)", source: "(Aether|Aetherial Chakram)" }
1329.6 "--sync--" Ability { id: "1C9[CD]", source: "(Cursing Atomos|Wailing Atomos)" }
1333.0 "Explosion" Ability { id: "1CA[12]", source: "(Aether|Aetherial Chakram)" } window 15,15
1327.8 "--sync--" Ability { id: "1C49", source: ['Cursing Atomos', 'Wailing Atomos'] }
1328.0 "Juggling Sphere" Ability { id: "1C(9F|A0)", source: ['Aether', 'Aetherial Chakram'] }
1329.6 "--sync--" Ability { id: "1C9[CD]", source: ['Cursing Atomos', 'Wailing Atomos'] }
1333.0 "Explosion" Ability { id: "1CA[12]", source: ['Aether', 'Aetherial Chakram'] } window 15,15
1338.1 "Jester's Reap" Ability { id: "1E41", source: "Ferdiad Hollow" }
1348.8 "Black Wind" # Ability { id: "1CAC", source: "Ferdiad Hollow" }
1362.4 "Blackfire" Ability { id: "1CAA", source: "Ferdiad Hollow" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ hideall "--sync--"
360.0 "--sync--" Ability { id: "10DF", source: "Regula van Hydrus" }
361.3 "Aetherochemical Grenado" Ability { id: "10E2", source: "Magitek Turret II" }
365.0 "Magitek Slug" Ability { id: "10DB", source: "Regula van Hydrus" }
368.0 "Self-detonate?" Ability { id: "10E3", source: "(Magitek Turret I|Magitek Turret II)" }
368.0 "Self-detonate?" Ability { id: "10E3", source: ['Magitek Turret I', 'Magitek Turret II'] }
368.7 "Magitek Slug" Ability { id: "10DB", source: "Regula van Hydrus" }
372.5 "Magitek Slug" Ability { id: "10DB", source: "Regula van Hydrus" }
373.7 "--sync--" Ability { id: "10DF", source: "Regula van Hydrus" }
Expand Down
8 changes: 4 additions & 4 deletions ui/raidboss/data/03-hw/raid/a10n.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ hideall "--sync--"
56.7 "Trap" Ability { id: "(1AB0|1AB1)", source: "Lamebrix Strikebocks" } window 56.7,5
58.0 "--sync--" Ability { id: "1AA2", source: "Lamebrix Strikebocks" }
61.1 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" }
61.7 "Frostbite/Impact" Ability { id: "(1AC7|1AC6)", source: "(Blizzard Arrow|Weight of the World)" }
61.7 "Frostbite/Impact" Ability { id: "(1AC7|1AC6)", source: ['Blizzard Arrow', 'Weight of the World'] }
69.0 "Trap" Ability { id: "(1AB0|1AB1)", source: "Lamebrix Strikebocks" }
70.3 "--sync--" Ability { id: "1AA2", source: "Lamebrix Strikebocks" }
74.0 "Impact/Frostbite" Ability { id: "(1AC7|1AC6)", source: "(Blizzard Arrow|Weight of the World)" }
74.0 "Impact/Frostbite" Ability { id: "(1AC7|1AC6)", source: ['Blizzard Arrow', 'Weight of the World'] }
74.9 "Illuminati Hand Cannon" Ability { id: "1AD2", source: "Lamebrix Strikebocks" }
78.0 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" }
87.1 "Gobslash Slicetops" Ability { id: "1AD1", source: "Lamebrix Strikebocks" }
Expand Down Expand Up @@ -83,9 +83,9 @@ hideall "--sync--"
393.3 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" }
398.2 "Trap #1" Ability { id: "(1AB0|1AB1)", source: "Lamebrix Strikebocks" } window 100,2.5
402.3 "Trap #2" Ability { id: "(1AB0|1AB1)", source: "Lamebrix Strikebocks" }
403.2 "Frostbite/Impact" Ability { id: "(1AC7|1AC6)", source: "(Blizzard Arrow|Weight of the World)" }
403.2 "Frostbite/Impact" Ability { id: "(1AC7|1AC6)", source: ['Blizzard Arrow', 'Weight of the World'] }
403.6 "--sync--" Ability { id: "1AA2", source: "Lamebrix Strikebocks" }
407.3 "Impact/Frostbite" Ability { id: "(1AC7|1AC6)", source: "(Blizzard Arrow|Weight of the World)" }
407.3 "Impact/Frostbite" Ability { id: "(1AC7|1AC6)", source: ['Blizzard Arrow', 'Weight of the World'] }
408.9 "Illuminati Hand Cannon" Ability { id: "1AD2", source: "Lamebrix Strikebocks" }
418.1 "Gobslash Slicetops" Ability { id: "1AD1", source: "Lamebrix Strikebocks" }
422.1 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" }
Expand Down
4 changes: 2 additions & 2 deletions ui/raidboss/data/03-hw/raid/a3s.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ hideall "--sync--"
107.6 "Wash Away" Ability { id: "F07", source: "Living Liquid" }
109.6 "--split--"
115.8 "Fluid Strike" Ability { id: "F06", source: "Living Liquid" }
125.0 "Hand Of Prayer/Parting" Ability { id: "F0[BC]", source: "(Living Liquid|Liquid Limb)" }
125.0 "Hand Of Prayer/Parting" Ability { id: "F0[BC]", source: ['Living Liquid', 'Liquid Limb'] }
136.9 "Digititis" Ability { id: "F08", source: "Living Liquid" }
137.1 "Equal Concentration" Ability { id: "F09", source: "Liquid Limb" }
137.1 "--dps burn--" duration 27.4
Expand All @@ -47,7 +47,7 @@ hideall "--sync--"
149.2 "Fluid Strike x2" Ability { id: "F06", source: "Living Liquid" }
157.4 "Fluid Strike x2" Ability { id: "F06", source: "Living Liquid" }
164.5 "Hand Of Pain" Ability { id: "F0A", source: "Living Liquid" }
174.7 "Hand Of Prayer/Parting" Ability { id: "F0[BC]", source: "(Living Liquid|Liquid Limb)" }
174.7 "Hand Of Prayer/Parting" Ability { id: "F0[BC]", source: ['Living Liquid', 'Liquid Limb'] }
178.8 "Fluid Strike x2" Ability { id: "F06", source: "Living Liquid" }
183.8 "--sync--" Ability { id: "F28", source: "Hydrate Core" }
184.9 "--sync--" Ability { id: "F24", source: "Living Liquid" }
Expand Down
Loading

0 comments on commit 2bec809

Please sign in to comment.