diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2017-09-06 19:20:50 +0200 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2017-09-06 19:20:50 +0200 |
| commit | 9c2b01b6ddfbab25a2fc53b6204f17be2ada2133 (patch) | |
| tree | dc57715a552bb7b4b173adf4cef1674e454eeba4 | |
| parent | e9529ac4f7b7df38e61e6939ba74a0b3c28d7e62 (diff) | |
| parent | 4314507460f7826e7f29510ee816df102751e0eb (diff) | |
| download | orm-9c2b01b6ddfbab25a2fc53b6204f17be2ada2133.tar.gz orm-9c2b01b6ddfbab25a2fc53b6204f17be2ada2133.zip | |
Merge branch 'release/2.16.0' into release/2.17.0release/2.17.0
| -rw-r--r-- | api.js | 3 | ||||
| -rw-r--r-- | mappings_source.js | 10 |
2 files changed, 13 insertions, 0 deletions
@@ -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 }; @@ -69,6 +71,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"]) }); diff --git a/mappings_source.js b/mappings_source.js index 55f7e35..3d8ea4e 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", @@ -464,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", |