From 545c1d8d6c3341d4aa75fc30baf8707cf53136aa Mon Sep 17 00:00:00 2001 From: schneefux Date: Tue, 8 Aug 2017 20:42:23 +0200 Subject: add missing Reza damage sources --- mappings_source.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mappings_source.js b/mappings_source.js index f783e6e..8d797ae 100644 --- a/mappings_source.js +++ b/mappings_source.js @@ -22,6 +22,13 @@ module.exports = { "Ability__Grace__AltAttack": "Grace AA", "Ability__Grace__B": "Grace B", "Ability__Grace__DefaultAttack": "Grace AA", + "Ability__Reza__DefaultAttack": "Reza AA", + "Ability__Reza__AltAttack": "Reza AA", + "Ability__Reza__CritAttack": "Reza AA", + "Ability__Reza__C_NetherformAttack": "Reza C", + "Ability__Reza__C": "Reza C", + "Buff_Reza_B_EmpoweredAttack": "Reza B", + "Buff_Reza_Perk_VolatileSparkControl": "Reza perk", "HERO_ABILITY_HERO042_A_NAME": "Grace A", "HERO_ABILITY_HERO042_B_NAME": "Grace B", "HERO_ABILITY_HERO042_C_NAME": "Grace C", -- cgit v1.3.1 From 3ad98133357a3ee2109eda5e9283217c2a0403ad Mon Sep 17 00:00:00 2001 From: schneefux Date: Tue, 15 Aug 2017 21:11:43 +0200 Subject: mapping: add crits --- mappings_source.js | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/mappings_source.js b/mappings_source.js index 8d797ae..bce7cd3 100644 --- a/mappings_source.js +++ b/mappings_source.js @@ -24,7 +24,7 @@ module.exports = { "Ability__Grace__DefaultAttack": "Grace AA", "Ability__Reza__DefaultAttack": "Reza AA", "Ability__Reza__AltAttack": "Reza AA", - "Ability__Reza__CritAttack": "Reza AA", + "Ability__Reza__CritAttack": "Reza AAcrit", "Ability__Reza__C_NetherformAttack": "Reza C", "Ability__Reza__C": "Reza C", "Buff_Reza_B_EmpoweredAttack": "Reza B", @@ -179,7 +179,7 @@ module.exports = { "Ability__Adagio__C": "Adagio C", "Ability__Alpha__AltAttack": "Alpha AA", "Ability__Alpha__B": "Alpha B", - "Ability__Alpha__CritAttack": "Alpha AA", + "Ability__Alpha__CritAttack": "Alpha AAcrit", "Ability__Alpha__Dash": "Alpha A", "Ability__Alpha__DefaultAttack": "Alpha AA", "Ability__Alpha__SelfDestruct": "Alpha C", @@ -187,23 +187,23 @@ module.exports = { "Ability__Ardan__AltAttack": "Ardan AA", "Ability__Ardan__B": "Ardan B", "Ability__Ardan__C": "Ardan C", - "Ability__Ardan__CritAttack": "Ardan AA", + "Ability__Ardan__CritAttack": "Ardan AAcrit", "Ability__Ardan__DefaultAttack": "Ardan AA", "Ability__Blackfeather__A": "Blackfeather A", "Ability__Blackfeather__AltAttack": "Blackfeather AA", "Ability__Blackfeather__B": "Blackfeather B", - "Ability__Blackfeather__CritAttack": "Blackfeather AA", + "Ability__Blackfeather__CritAttack": "Blackfeather AAcrit", "Ability__Blackfeather__DefaultAttack": "Blackfeather AA", "Ability__Catherine__A_DefaultAttack": "Catherine A", "Ability__Catherine__AltAttack": "Catherine AA", "Ability__Catherine__C": "Catherine C", - "Ability__Catherine__CritAttack": "Catherine AA", + "Ability__Catherine__CritAttack": "Catherine AAcrit", "Ability__Catherine__DefaultAttack": "Catherine AA", "Ability__Flicker__AltAttack": "Flicker AA", "Ability__Flicker__DefaultAttack": "Flicker AA", "Ability__Fortress__AltAttack": "Fortress AA", "Ability__Fortress__B": "Fortress B", - "Ability__Fortress__CritAttack": "Fortress AA", + "Ability__Fortress__CritAttack": "Fortress AAcrit", "Ability__Fortress__DefaultAttack": "Fortress AA", "Ability__Fortress__LungeAttack": "Fortress A", "Ability__FortressMinion__AltAttack": "Fortress AA", @@ -212,25 +212,25 @@ module.exports = { "Ability__Glaive__AltAttack": "Glaive AA", "Ability__Glaive__B": "Glaive B", "Ability__Glaive__C": "Glaive C", - "Ability__Glaive__CritAttack": "Glaive AA", + "Ability__Glaive__CritAttack": "Glaive AAcrit", "Ability__Glaive__DefaultAttack": "Glaive AA", "Ability__Grumpjaw__A": "Grumpjaw A", "Ability__Grumpjaw__AltAttack": "Grumpjaw AA", "Ability__Grumpjaw__B": "Grumpjaw B", "Ability__Grumpjaw__B_FrenzyAttack": "Grumpjaw B", - "Ability__Grumpjaw__CritAttack": "Grumpjaw AA", + "Ability__Grumpjaw__CritAttack": "Grumpjaw AAcrit", "Ability__Grumpjaw__DefaultAttack": "Grumpjaw AA", "Ability__Gwen__A": "Gwen A", "Ability__Idris__AltAttack": "Idris AA", "Ability__Idris__C_LeapOff": "Idris C", - "Ability__Idris__CritAttack": "Idris AA", + "Ability__Idris__CritAttack": "Idris AAcrit", "Ability__Idris__DefaultAttack": "Idris AA", "Ability__Idris__EmpoweredAttack": "Idris AA", "Ability__Item__ScoutTrap_Explode": "Scout Trap", "Ability__Joule__A": "Joule A", "Ability__Joule__AltAttack": "Joule AA", "Ability__Joule__C": "Joule C", - "Ability__Joule__CritAttack": "Joule AA", + "Ability__Joule__CritAttack": "Joule AAcrit", "Ability__Joule__DefaultAttack": "Joule AA", "Ability__Kestrel__C": "Kestrel C", "Ability__Kestrel__Trap_Detonate": "Kestrel B", @@ -238,18 +238,18 @@ module.exports = { "Ability__Koshka__AltAttack": "Koshka AA", "Ability__Koshka__B": "Koshka B", "Ability__Koshka__C": "Koshka C", - "Ability__Koshka__CritAttack": "Koshka AA", + "Ability__Koshka__CritAttack": "Koshka AAcrit", "Ability__Koshka__DefaultAttack": "Koshka AA", "Ability__Koshka__TwirlEmpoweredAttack": "Koshka B", "Ability__Krul__A": "Krul A", "Ability__Krul__AltAttack": "Krul AA", "Ability__Krul__B": "Krul B", - "Ability__Krul__CritAttack": "Krul AA", + "Ability__Krul__CritAttack": "Krul AAcrit", "Ability__Krul__DefaultAttack": "Krul AA", "Ability__Lance__A": "Lance A", "Ability__Lance__AltAttack": "Lance AA", "Ability__Lance__B": "Lance B", - "Ability__Lance__CritAttack": "Lance AA", + "Ability__Lance__CritAttack": "Lance AAcrit", "Ability__Lance__DefaultAttack": "Lance AA", "Ability__Lance__EmpoweredAttack": "Lance C", "Ability__Ozo__A1": "Ozo A", @@ -260,7 +260,7 @@ module.exports = { "Ability__Ozo__B_FinalBounce": "Ozo B", "Ability__Ozo__B_IntermediateBounce": "Ozo B", "Ability__Ozo__C_Finisher": "Ozo C", - "Ability__Ozo__CritAttack": "Ozo AA", + "Ability__Ozo__CritAttack": "Ozo AAcrit", "Ability__Ozo__DefaultAttack": "Ozo AA", "Ability__PetalMinion__AltAttack": "Petal AA", "Ability__PetalMinion__DefaultAttack": "Petal AA", @@ -270,7 +270,7 @@ module.exports = { "Ability__Phinn__A": "Phinn A", "Ability__Phinn__AltAttack": "Phinn AA", "Ability__Phinn__B": "Phinn B", - "Ability__Phinn__CritAttack": "Phinn AA", + "Ability__Phinn__CritAttack": "Phinn AAcrit", "Ability__Phinn__DefaultAttack": "Phinn AA", "Ability__Reim__AltAttack": "Reim AA", "Ability__Reim__DefaultAttack": "Reim AA", @@ -279,7 +279,7 @@ module.exports = { "Ability__Rona__B": "Rona B", "Ability__Rona__BAttackOverride": "Rona B", "Ability__Rona__B_FollowUp": "Rona B", - "Ability__Rona__CritAttack": "Rona AA", + "Ability__Rona__CritAttack": "Rona AAcrit", "Ability__Rona__DefaultAttack": "Rona AA", "Ability__Samuel__EmpoweredAttack": "Samuel AA", "Ability__SAW__B": "SAW B", @@ -287,10 +287,10 @@ module.exports = { "Ability__Taka__A": "Taka A", "Ability__Taka__AltAttack": "Taka AA", "Ability__Taka__C": "Taka C", - "Ability__Taka__CritAttack": "Taka AA", + "Ability__Taka__CritAttack": "Taka AAcrit", "Ability__Taka__DefaultAttack": "Taka AA", - "Ability__Taka__MortalStrike": "Taka AA", - "Ability__Taka__MortalStrike_Crit": "Taka AA", + "Ability__Taka__MortalStrike": "Taka perk", + "Ability__Taka__MortalStrike_Crit": "Taka perk", "*Adagio*": "Adagio", "*Alpha*": "Alpha", "*Ardan*": "Ardan", -- cgit v1.3.1 From 81e489deafd0283c1477f08d92a854c9cf671593 Mon Sep 17 00:00:00 2001 From: schneefux Date: Sun, 20 Aug 2017 12:18:40 +0200 Subject: add missing Baptiste & Reza strings --- mappings_source.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mappings_source.js b/mappings_source.js index bce7cd3..55f7e35 100644 --- a/mappings_source.js +++ b/mappings_source.js @@ -20,6 +20,7 @@ module.exports = { "Ability__Grace__A": "Grace A", "Ability__Grace__AltAttack": "Grace AA", + "Ability__Grace__CritAttack": "Grace AAcrit", "Ability__Grace__B": "Grace B", "Ability__Grace__DefaultAttack": "Grace AA", "Ability__Reza__DefaultAttack": "Reza AA", @@ -27,6 +28,12 @@ module.exports = { "Ability__Reza__CritAttack": "Reza AAcrit", "Ability__Reza__C_NetherformAttack": "Reza C", "Ability__Reza__C": "Reza C", + "Ability__Baptiste__DefaultAttack": "Baptiste AA", + "Ability__Baptiste__AltAttack": "Baptiste AA", + "Ability__Baptiste__CritAttack": "Baptiste AAcrit", + "Ability__Baptiste__EmpoweredDefaultAttack": "Baptiste perk", + "Ability__Baptiste__EmpoweredAltAttack": "Baptiste perk", + "Ability__Baptiste__EmpoweredCritAttack": "Baptiste perk", "Buff_Reza_B_EmpoweredAttack": "Reza B", "Buff_Reza_Perk_VolatileSparkControl": "Reza perk", "HERO_ABILITY_HERO042_A_NAME": "Grace A", @@ -582,5 +589,6 @@ module.exports = { "BookOfEulogies": "Book of Eulogies", "Book Of Eulogies": "Book of Eulogies", "Eve Of Harvest": "Eve of Harvest", - "Candy - VO Taunt": "Voice over Taunt" + "Candy - VO Taunt": "Voice over Taunt", + "": " " } -- cgit v1.3.1 From 6c3db60d8eb308cd92d4416ba962eedd34e3fab0 Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 21 Aug 2017 19:39:38 +0200 Subject: log TTFB --- api.js | 1 + 1 file changed, 1 insertion(+) diff --git a/api.js b/api.js index 1146f86..8d14a6b 100644 --- a/api.js +++ b/api.js @@ -69,6 +69,7 @@ module.exports.request = async (url, options, logger) => { qs: options, status: response.statusCode, connection_start: response.timings.connect, + connection_first: response.timings.response, connection_end: response.timings.end, ratelimit_remaining: parseInt(response.headers["x-ratelimit-remaining"]) }); -- cgit v1.3.1 From 2417386fd081a58dee26caf089bf707fbab47a66 Mon Sep 17 00:00:00 2001 From: schneefux Date: Fri, 25 Aug 2017 17:06:00 +0200 Subject: add custom http request timeout --- api.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api.js b/api.js index 8d14a6b..58a51d7 100644 --- a/api.js +++ b/api.js @@ -9,6 +9,7 @@ const Promise = require("bluebird"), const MADGLORY_TOKEN = process.env.MADGLORY_TOKEN, MADGLORY_URL = process.env.MADGLORY_URL || "https://api.dc01.gamelockerapp.com", + API_TIMEOUT = process.env.API_TIMEOUT || 20, // seconds ERROR_LOG = process.env.ERROR_LOG || "./errors.json"; if (MADGLORY_TOKEN == undefined) throw "Need an API token"; @@ -31,6 +32,7 @@ module.exports.request = async (url, options, logger) => { gzip: true, time: true, forever: true, + timeout: API_TIMEOUT*1000, strictSSL: true, resolveWithFullResponse: true }; -- cgit v1.3.1 From 60facc9c095ddadc24fd6e50e4fd8cb7af760ae5 Mon Sep 17 00:00:00 2001 From: schneefux Date: Fri, 25 Aug 2017 23:07:46 +0200 Subject: add missing maps --- mappings_source.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mappings_source.js b/mappings_source.js index 55f7e35..1b8d523 100644 --- a/mappings_source.js +++ b/mappings_source.js @@ -34,6 +34,9 @@ module.exports = { "Ability__Baptiste__EmpoweredDefaultAttack": "Baptiste perk", "Ability__Baptiste__EmpoweredAltAttack": "Baptiste perk", "Ability__Baptiste__EmpoweredCritAttack": "Baptiste perk", + "Buff_Baptiste_B_TetherActor": "Baptiste B", + "Buff_Baptiste_B_TetherTarget": "Baptiste B", + "Buff_Baptiste_Ultimate_DOT": "Baptiste C", "Buff_Reza_B_EmpoweredAttack": "Reza B", "Buff_Reza_Perk_VolatileSparkControl": "Reza perk", "HERO_ABILITY_HERO042_A_NAME": "Grace A", @@ -208,6 +211,7 @@ module.exports = { "Ability__Catherine__DefaultAttack": "Catherine AA", "Ability__Flicker__AltAttack": "Flicker AA", "Ability__Flicker__DefaultAttack": "Flicker AA", + "Ability__Flicker__CritAttack": "Flicker AAcrit", "Ability__Fortress__AltAttack": "Fortress AA", "Ability__Fortress__B": "Fortress B", "Ability__Fortress__CritAttack": "Fortress AAcrit", @@ -281,6 +285,7 @@ module.exports = { "Ability__Phinn__DefaultAttack": "Phinn AA", "Ability__Reim__AltAttack": "Reim AA", "Ability__Reim__DefaultAttack": "Reim AA", + "Ability__Reim__CritAttack": "Reim AAcrit", "Ability__Rona__A": "Rona A", "Ability__Rona__AltAttack": "Rona AA", "Ability__Rona__B": "Rona B", @@ -294,6 +299,9 @@ module.exports = { "Ability__Taka__A": "Taka A", "Ability__Taka__AltAttack": "Taka AA", "Ability__Taka__C": "Taka C", + "Ability__Taka__C_Talent": "Taka C Legendary", + "Ability__Taka__C_TalentB": "Taka C Legendary", + "Ability__Taka__C_TalentC": "Taka C Legendary", "Ability__Taka__CritAttack": "Taka AAcrit", "Ability__Taka__DefaultAttack": "Taka AA", "Ability__Taka__MortalStrike": "Taka perk", -- cgit v1.3.1 From 4314507460f7826e7f29510ee816df102751e0eb Mon Sep 17 00:00:00 2001 From: schneefux Date: Wed, 6 Sep 2017 19:16:41 +0200 Subject: add healing flask & spellsword --- mappings_source.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mappings_source.js b/mappings_source.js index 1b8d523..3d8ea4e 100644 --- a/mappings_source.js +++ b/mappings_source.js @@ -472,6 +472,8 @@ module.exports = { "*1005_Item_CandyShop_Taunt*": "Taunt", "*1007_Item_CandyShop_VOTaunt*": "Voice over Taunt", "*Item_HalcyonPotion*": "Halcyon Potion", + "*Item_HealingFlask*": "Healing Flask", + "*Item_Spellsword*": "Spellsword", "*Item_WeaponBlade*": "Weapon Blade", "*Item_CrystalBit*": "Crystal Bit", "*Item_SwiftShooter*": "Swift Shooter", -- cgit v1.3.1