Skip to content

Add Zone ID #1528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions resources/fights.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,141 +4,164 @@ let gBossFightTriggers = [
{
id: 'test',
zoneRegex: /^Middle La Noscea$/,
zoneId: ZoneId.MiddleLaNoscea,
startRegex: /:You bow courteously to the striking dummy/,
endRegex: /:You bid farewell to the striking dummy/,
countdownStarts: true,
},
{
id: 'o1s',
zoneRegex: /^Deltascape V1.0 \(Savage\)$/,
zoneId: ZoneId.DeltascapeV10Savage,
startRegex: /:Alte Roite uses Wyrm Tail/,
countdownStarts: true,
},
{
id: 'o2s',
zoneRegex: /^Deltascape V2.0 \(Savage\)$/,
zoneId: ZoneId.DeltascapeV20Savage,
startRegex: /:Catastrophe uses Earthquake/,
countdownStarts: true,
},
{
id: 'o3s',
zoneRegex: /^Deltascape V3.0 \(Savage\)$/,
zoneId: ZoneId.DeltascapeV30Savage,
startRegex: /:Halicarnassus uses Critical Hit/,
countdownStarts: true,
},
{
id: 'o4s-exdeath',
zoneRegex: /^Deltascape V4.0 \(Savage\)$/,
zoneId: ZoneId.DeltascapeV40Savage,
startRegex: /:Exdeath uses Dualcast/,
endRegex: /:The limit gauge resets!/,
countdownStarts: false,
},
{
id: 'o4s-neo',
zoneRegex: /^Deltascape V4.0 \(Savage\)$/,
zoneId: ZoneId.DeltascapeV40Savage,
startRegex: /:Neo Exdeath uses Almagest/,
countdownStarts: false,
},
{
id: 'Unending Coil',
zoneRegex: /^The Unending Coil Of Bahamut \(Ultimate\)$/,
zoneId: ZoneId.TheUnendingCoilOfBahamutUltimate,
startRegex: /:Twintania:26A7:/,
countdownStarts: true,
},
{
id: 'Shinryu Ex',
zoneRegex: /^The Minstrel's Ballad: Shinryu's Domain$/,
zoneId: ZoneId.TheMinstrelsBalladShinryusDomain,
startRegex: /:Shinryu starts using Earthen Fury/,
countdownStarts: true,
},
{
id: 'o5s',
zoneRegex: /Sigmascape V1\.0 \(Savage\)/,
zoneId: ZoneId.SigmascapeV10Savage,
startRegex: /:Wroth Ghost:28B6:/,
countdownStarts: true,
},
{
id: 'o6s',
zoneRegex: /Sigmascape V2\.0 \(Savage\)/,
zoneId: ZoneId.SigmascapeV20Savage,
startRegex: /14:2829:Demon Chadarnook starts using Demonic Shear/,
countdownStarts: true,
},
{
id: 'o7s',
zoneRegex: /Sigmascape V3\.0 \(Savage\)/,
zoneId: ZoneId.SigmascapeV30Savage,
startRegex: /00:0044:[^:]*:WEAPON SYSTEMS ONLINE/,
countdownStarts: true,
},
{
id: 'o8s-kefka',
zoneRegex: /Sigmascape V4\.0 \(Savage\)/,
zoneId: ZoneId.SigmascapeV40Savage,
startRegex: / 15:........:Kefka:28C2:/,
endRegex: /:Kekfa was defeated by/,
countdownStarts: false,
},
{
id: 'o8s-god kefka',
zoneRegex: /Sigmascape V4\.0 \(Savage\)/,
zoneId: ZoneId.SigmascapeV40Savage,
startRegex: / 15:........:Kefka:28EC:/,
countdownStarts: false,
},
{
id: 'Byakko Ex',
zoneRegex: /^The Jade Stoa \(Extreme\)$/,
zoneId: ZoneId.TheJadeStoaExtreme,
startRegex: /:Byakko starts using Storm Pulse/,
countdownStarts: true,
},
{
id: 'Tsukuyomi Ex',
zoneRegex: /The Minstrel's Ballad: Tsukuyomi's Pain/,
zoneId: ZoneId.TheMinstrelsBalladTsukuyomisPain,
startRegex: /:Tsukuyomi:2BBA:/,
countdownStarts: true,
},
{
id: 'UwU',
zoneRegex: /^The Weapon's Refrain \(Ultimate\)$/,
zoneId: ZoneId.TheWeaponsRefrainUltimate,
startRegex: /:Garuda:2B53:/,
countdownStarts: true,
},
{
id: 'Suzaku Ex',
zoneRegex: /^Hells\' Kier \(Extreme\)$/,
zoneId: ZoneId.HellsKierExtreme,
startRegex: /:Suzaku:367:/,
countdownStarts: true,
},
{
id: 'Seiryu Ex',
zoneRegex: /^The Wreath Of Snakes \(Extreme\)$/,
zoneId: ZoneId.TheWreathOfSnakesExtreme,
startRegex: /:Seiryu:366:/,
countdownStarts: true,
},
{
id: 'o9s',
zoneRegex: /Alphascape V1\.0 \(Savage\)/,
zoneId: ZoneId.AlphascapeV10Savage,
startRegex: /:Chaos:316F:/,
countdownStarts: true,
},
{
id: 'o10s',
zoneRegex: /Alphascape V2\.0 \(Savage\)/,
zoneId: ZoneId.AlphascapeV20Savage,
startRegex: /:Midgardsormr:31F9:/,
countdownStarts: true,
},
{
id: 'o11s',
zoneRegex: /Alphascape V3\.0 \(Savage\)/,
zoneId: ZoneId.AlphascapeV30Savage,
startRegex: /:Omega:368:/,
countdownStarts: true,
},
{
id: 'o12s-door',
zoneRegex: /Alphascape V4\.0 \(Savage\)/,
zoneId: ZoneId.AlphascapeV40Savage,
startRegex: /:Omega-M:337D:/,
countdownStarts: false,
},
{
id: 'o12s-final',
zoneRegex: /Alphascape V4\.0 \(Savage\)/,
zoneId: ZoneId.AlphascapeV40Savage,
startRegex: /:Omega:336C:/,
countdownStarts: false,
},
Expand Down
5 changes: 4 additions & 1 deletion resources/hunt.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Auto-generated from gen_hunt_data.py
// DO NOT EDIT THIS FILE DIRECTLY

let gMonster = {
const gMonster = {
'Agathos': {
'id': '4369',
'name': {
Expand Down Expand Up @@ -1767,3 +1767,6 @@ let gMonster = {
'rank': 'A',
},
};

if (typeof module !== 'undefined')
module.exports = gMonster;
7 changes: 6 additions & 1 deletion resources/territory_type.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Auto-generated from gen_territory_type.py
// DO NOT EDIT THIS FILE DIRECTLY

let gTerritoryWeather = {
const gTerritoryWeather = {
'Akh Afah Amphitheatre': 46,
'Amaurot': 105,
'Amh Araeng': 108,
Expand All @@ -14,6 +14,7 @@ let gTerritoryWeather = {
'Brayflox\'s Longstop': 37,
'Central Shroud': 3,
'Central Thanalan': 10,
'Cid\'s Memory': 123,
'Coerthas Central Highlands': 21,
'Coerthas Western Highlands': 49,
'Command Room': 14,
Expand Down Expand Up @@ -110,6 +111,7 @@ let gTerritoryWeather = {
'The Wreath of Snakes': 99,
'Thok ast Thok': 57,
'Thornmarch': 30,
'Transmission Control': 123,
'Transparency': 76,
'Ul\'dah - Steps of Nald': 7,
'Ul\'dah - Steps of Thal': 8,
Expand All @@ -121,3 +123,6 @@ let gTerritoryWeather = {
'Wolves\' Den Pier': 29,
'Yanxia': 84,
};

if (typeof module !== 'undefined')
module.exports = gTerritoryWeather;
13 changes: 10 additions & 3 deletions resources/weather_rate.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Auto-generated from gen_weather_rate.py
// DO NOT EDIT THIS FILE DIRECTLY

let gWeatherRates = {
const gWeatherRates = {
0: {
'rates': [
100,
Expand Down Expand Up @@ -1595,7 +1595,14 @@ let gWeatherRates = {
],
},
123: {
'rates': [],
'weathers': [],
'rates': [
100,
],
'weathers': [
'Delirium',
],
},
};

if (typeof module !== 'undefined')
module.exports = gWeatherRates;
Loading