From 61012014cdc1d52da857da0b0b3335f0a755145b Mon Sep 17 00:00:00 2001 From: Florian2 Date: Thu, 29 Sep 2016 21:44:50 +0200 Subject: [PATCH 001/341] Test --- tests/text.js | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 tests/text.js diff --git a/tests/text.js b/tests/text.js new file mode 100644 index 0000000..c61f3e2 --- /dev/null +++ b/tests/text.js @@ -0,0 +1,23 @@ +idrinth.text = { + getText: function (key) { + var textKey = key || ''; + var text = { + + // Texts from chat.js, function getMsg, line 933, time 29.09.15 + 'modify.fail': 'Can\'t modify that user at the moment', + 'create.fail': 'Can\'t create at the moment', + 'join.fail': 'Can\'t join at the moment', + 'join.notwork': 'Joining didn\'t work', + 'user.unknown': 'The given username for dotd.idrinth.de is unknown, do you want to register it there?', + 'login.fail': 'Login failed in an unexpected way', + 'default.error': 'Unexpected error occurred. Please contact script developers' + + ' (https://github.com/Idrinth/IDotD).' + + // Texts from , function , line , time + + + // Texts from , function , line , time + + } + } +} \ No newline at end of file From 5d0b78ae3181a79fbdccf8fc2f7d489904438c6c Mon Sep 17 00:00:00 2001 From: Ardenian Date: Thu, 29 Sep 2016 22:29:04 +0200 Subject: [PATCH 002/341] Text Collection --- src/mods/text.js | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/mods/text.js diff --git a/src/mods/text.js b/src/mods/text.js new file mode 100644 index 0000000..a984b3e --- /dev/null +++ b/src/mods/text.js @@ -0,0 +1,38 @@ +idrinth.text = { + getText: function (key) { + var textKey = key || ''; + var text = { + + // currently under progress + + // Texts from chat.js, function getMsg, line 933+, time 29.09.15 + 'modify.fail': 'Can\'t modify that user at the moment', + 'create.fail': 'Can\'t create at the moment', + 'join.fail': 'Can\'t join at the moment', + 'join.notwork': 'Joining didn\'t work', + 'user.unknown': 'The given username for dotd.idrinth.de is unknown, do you want to register it there?', + 'login.fail': 'Login failed in an unexpected way', + 'default.error': 'Unexpected error occurred. Please contact script developers' + + ' (https://github.com/Idrinth/IDotD).', + + // Texts from ui.js, function buttonMaker, line 442+ , time 29.09.15 + 'Import all manually': 'Import all manually', + 'Import favs manually': 'Import favs manually', + 'Reload game': 'Reload game', + 'Clear Raids': 'Clear Raids', + 'Reload Script': 'Reload Script', + 'Restart Raidjoin': 'Restart Raidjoin', + 'Refresh Facebook Game Login': 'Refresh Facebook Game Login', + 'NG Raid Join(slow!)': 'NG Raid Join(slow!)', + 'disable timed Autojoin': 'disable timed Autojoin', + 'enable timed Autojoin': 'enable timed Autojoin', + + 'Last raids joined:': 'Last raids joined:', + 'Enter Boss\' Name': 'Enter Boss\' Name' + + // Texts from ui.js, function buildControls, line 492, time 29.09.15 + + } + return text.hasOwnProperty(textKey) ? text[textKey] : text['default.error']; + } +} \ No newline at end of file From 4ae3c2defddd74de016200148f9aae64f99f7b3a Mon Sep 17 00:00:00 2001 From: Ardenian Date: Fri, 30 Sep 2016 12:52:54 +0200 Subject: [PATCH 003/341] collected text the user sees --- tests/text.js | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 tests/text.js diff --git a/tests/text.js b/tests/text.js deleted file mode 100644 index c61f3e2..0000000 --- a/tests/text.js +++ /dev/null @@ -1,23 +0,0 @@ -idrinth.text = { - getText: function (key) { - var textKey = key || ''; - var text = { - - // Texts from chat.js, function getMsg, line 933, time 29.09.15 - 'modify.fail': 'Can\'t modify that user at the moment', - 'create.fail': 'Can\'t create at the moment', - 'join.fail': 'Can\'t join at the moment', - 'join.notwork': 'Joining didn\'t work', - 'user.unknown': 'The given username for dotd.idrinth.de is unknown, do you want to register it there?', - 'login.fail': 'Login failed in an unexpected way', - 'default.error': 'Unexpected error occurred. Please contact script developers' - + ' (https://github.com/Idrinth/IDotD).' - - // Texts from , function , line , time - - - // Texts from , function , line , time - - } - } -} \ No newline at end of file From 472dac00e7de211e17770f2199a8a072ff79b05e Mon Sep 17 00:00:00 2001 From: Ardenian Date: Fri, 30 Sep 2016 13:42:38 +0200 Subject: [PATCH 004/341] collected text from other scripts --- src/mods/text.js | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index a984b3e..4c67292 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -5,7 +5,33 @@ // currently under progress - // Texts from chat.js, function getMsg, line 933+, time 29.09.15 + // Texts from chat.js + // TODO ? - Remove getMsg function in idrinth.chat and call text via key directly from idrinth.text + // TODO ? - Replace hardcoded strings with function calls to idrinth.text + + 'Ban User': 'Ban User', + 'Banned': 'Banned', + 'Make Moderator': 'Make Moderator', + 'Make Admin': 'Make Admin', + 'Owner': 'Owner', + 'Make User': 'Make User', + 'User': 'User', + + 'Invite to Chat ': 'Invite to Chat ', + //'User':'User', - only reminder there is something to change in chat.js + + 'Close': 'Close', + + // line 439 - only reminder there is something to change in chat.js + + 'This part of the script is optional, so logging in is unneeded for raid catching etc.': 'This part of the script is optional, so logging in is unneeded for raid catching etc.', + 'Account': 'Account', + 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.': 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.', + + "Not logged in, click to login/register": "Not logged in, click to login/register", + + + 'modify.fail': 'Can\'t modify that user at the moment', 'create.fail': 'Can\'t create at the moment', 'join.fail': 'Can\'t join at the moment', @@ -15,7 +41,8 @@ 'default.error': 'Unexpected error occurred. Please contact script developers' + ' (https://github.com/Idrinth/IDotD).', - // Texts from ui.js, function buttonMaker, line 442+ , time 29.09.15 + // Texts from ui.js + // TODO ? - Replace hardcoded strings with function calls to idrinth.text 'Import all manually': 'Import all manually', 'Import favs manually': 'Import favs manually', 'Reload game': 'Reload game', @@ -30,7 +57,6 @@ 'Last raids joined:': 'Last raids joined:', 'Enter Boss\' Name': 'Enter Boss\' Name' - // Texts from ui.js, function buildControls, line 492, time 29.09.15 } return text.hasOwnProperty(textKey) ? text[textKey] : text['default.error']; From 43099c12addb0faa57a9e86916a00c84ec73cb35 Mon Sep 17 00:00:00 2001 From: Ardenian Date: Fri, 30 Sep 2016 14:32:07 +0200 Subject: [PATCH 005/341] collected text --- src/mods/text.js | 68 ++++++++++++++++++------------------------------ 1 file changed, 26 insertions(+), 42 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index 4c67292..556534d 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -1,53 +1,37 @@ idrinth.text = { getText: function (key) { var textKey = key || ''; - var text = { - - // currently under progress - - // Texts from chat.js - // TODO ? - Remove getMsg function in idrinth.chat and call text via key directly from idrinth.text - // TODO ? - Replace hardcoded strings with function calls to idrinth.text - - 'Ban User': 'Ban User', - 'Banned': 'Banned', - 'Make Moderator': 'Make Moderator', - 'Make Admin': 'Make Admin', - 'Owner': 'Owner', - 'Make User': 'Make User', - 'User': 'User', - - 'Invite to Chat ': 'Invite to Chat ', - //'User':'User', - only reminder there is something to change in chat.js - - 'Close': 'Close', - - // line 439 - only reminder there is something to change in chat.js + var data = { + "chat.user.action.ban": "Ban user", + 'chat.user.status.banned': 'Banned', + 'chat.user.action.makeMod': 'Make Moderator', + 'chat.user.action.makeAdmin': 'Make Admin', + 'chat.user.owner': 'Owner', + 'chat.user.action.makeUser': 'Make User', + 'chat.user.user': 'User', + 'chat.user.action.invite ': 'Invite to Chat ', + 'chat.user.action.close': 'Close', + + 'chat.user.modify.fail': 'Can\'t modify that user at the moment', + 'chat.create.fail': 'Can\'t create at the moment', + 'chat.join.fail': 'Can\'t join at the moment', + 'chat.join.notwork': 'Joining didn\'t work', + 'chat.user.status.unknown': 'The given username for dotd.idrinth.de is unknown, do you want to register it there?', + 'chat.login.fail': 'Login failed in an unexpected way', + 'default.error': 'Unexpected error occurred. Please contact script developers' + + ' (https://github.com/Idrinth/IDotD).', 'This part of the script is optional, so logging in is unneeded for raid catching etc.': 'This part of the script is optional, so logging in is unneeded for raid catching etc.', 'Account': 'Account', 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.': 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.', - "Not logged in, click to login/register": "Not logged in, click to login/register", + 'raid.import.manually.all': 'Import all manually', + 'raid.import.manually.fav': 'Import favs manually', - - 'modify.fail': 'Can\'t modify that user at the moment', - 'create.fail': 'Can\'t create at the moment', - 'join.fail': 'Can\'t join at the moment', - 'join.notwork': 'Joining didn\'t work', - 'user.unknown': 'The given username for dotd.idrinth.de is unknown, do you want to register it there?', - 'login.fail': 'Login failed in an unexpected way', - 'default.error': 'Unexpected error occurred. Please contact script developers' - + ' (https://github.com/Idrinth/IDotD).', - - // Texts from ui.js - // TODO ? - Replace hardcoded strings with function calls to idrinth.text - 'Import all manually': 'Import all manually', - 'Import favs manually': 'Import favs manually', - 'Reload game': 'Reload game', - 'Clear Raids': 'Clear Raids', - 'Reload Script': 'Reload Script', + 'reload.game': 'Reload game', + 'raid.clear': 'Clear Raids', + 'reload.script': 'Reload Script', 'Restart Raidjoin': 'Restart Raidjoin', 'Refresh Facebook Game Login': 'Refresh Facebook Game Login', 'NG Raid Join(slow!)': 'NG Raid Join(slow!)', @@ -56,9 +40,9 @@ 'Last raids joined:': 'Last raids joined:', 'Enter Boss\' Name': 'Enter Boss\' Name' + } - } - return text.hasOwnProperty(textKey) ? text[textKey] : text['default.error']; + return text.hasOwnProperty(textKey) ? data[textKey] : text['default.error']; } } \ No newline at end of file From 0d57ac36b64b2f4961061ca573102e1d043e89ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 30 Sep 2016 14:44:43 +0200 Subject: [PATCH 006/341] Update text.js reorganizing --- src/mods/text.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index 556534d..337644a 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -1,7 +1,5 @@ -idrinth.text = { - getText: function (key) { - var textKey = key || ''; - var data = { +idrinth.text = { + data: { "chat.user.action.ban": "Ban user", 'chat.user.status.banned': 'Banned', 'chat.user.action.makeMod': 'Make Moderator', @@ -40,9 +38,10 @@ 'Last raids joined:': 'Last raids joined:', 'Enter Boss\' Name': 'Enter Boss\' Name' - } - - + }, + get: function (key) { + var textKey = key || ''; + var text=idrinth.text.data; return text.hasOwnProperty(textKey) ? data[textKey] : text['default.error']; } -} \ No newline at end of file +} From 82a8b63822c53c35bb8ace72bc44a852ab2fa5ac Mon Sep 17 00:00:00 2001 From: ardenian Date: Fri, 30 Sep 2016 15:55:03 +0200 Subject: [PATCH 007/341] text progress --- src/mods/text.js | 81 ++++++++++++++++++----------------- src/mods/text.js~RF9de3ad.TMP | 47 ++++++++++++++++++++ 2 files changed, 88 insertions(+), 40 deletions(-) create mode 100644 src/mods/text.js~RF9de3ad.TMP diff --git a/src/mods/text.js b/src/mods/text.js index 337644a..04a1978 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -1,47 +1,48 @@ idrinth.text = { - data: { - "chat.user.action.ban": "Ban user", - 'chat.user.status.banned': 'Banned', - 'chat.user.action.makeMod': 'Make Moderator', - 'chat.user.action.makeAdmin': 'Make Admin', - 'chat.user.owner': 'Owner', - 'chat.user.action.makeUser': 'Make User', - 'chat.user.user': 'User', - 'chat.user.action.invite ': 'Invite to Chat ', - 'chat.user.action.close': 'Close', + data: { + chat: { + ban: 'Ban User', + banned: 'Banned', + makeMod: 'Make Moderator', + makeAdmin: 'Make Admin', + owner: 'Owner', + makeUser: 'Make user', + user: 'User', + invite:'Invite to Chat ', + close: 'Close', + unknown:'The given username for dotd.idrinth.de is unknown, do you want to register it there?', + + 'modify.fail':'Can\'t modify that user at the moment', + 'join.fail':'Can\'t create at the moment', + 'join.notwork':'Joining didn\'t work', + 'chat.join.notwork': 'Joining didn\'t work', + 'chat.login.fail': 'Login failed in an unexpected way', + 'default.error': 'Unexpected error occurred. Please contact script developers' + + ' (https://github.com/Idrinth/IDotD).', + 'This part of the script is optional, so logging in is unneeded for raid catching etc.': 'This part of the script is optional, so logging in is unneeded for raid catching etc.', + 'Account': 'Account', + 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.': 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.', + "Not logged in, click to login/register": "Not logged in, click to login/register", + 'raid.import.manually.all': 'Import all manually', + 'raid.import.manually.fav': 'Import favs manually', + 'game.reload': 'Reload game', + 'raid.clear': 'Clear Raids', + 'script.reload': 'Reload Script', + 'raid.join.restart': 'Restart Raidjoin', + 'game.facebook.login.refresh': 'Refresh Facebook Game Login', + 'NG Raid Join(slow!)': 'NG Raid Join(slow!)', + 'disable timed Autojoin': 'disable timed Autojoin', + 'enable timed Autojoin': 'enable timed Autojoin', + 'Last raids joined:': 'Last raids joined:', + 'Enter Boss\' Name': 'Enter Boss\' Name' - 'chat.user.modify.fail': 'Can\'t modify that user at the moment', - 'chat.create.fail': 'Can\'t create at the moment', - 'chat.join.fail': 'Can\'t join at the moment', - 'chat.join.notwork': 'Joining didn\'t work', - 'chat.user.status.unknown': 'The given username for dotd.idrinth.de is unknown, do you want to register it there?', - 'chat.login.fail': 'Login failed in an unexpected way', - 'default.error': 'Unexpected error occurred. Please contact script developers' - + ' (https://github.com/Idrinth/IDotD).', - - 'This part of the script is optional, so logging in is unneeded for raid catching etc.': 'This part of the script is optional, so logging in is unneeded for raid catching etc.', - 'Account': 'Account', - 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.': 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.', - "Not logged in, click to login/register": "Not logged in, click to login/register", - - 'raid.import.manually.all': 'Import all manually', - 'raid.import.manually.fav': 'Import favs manually', - - 'reload.game': 'Reload game', - 'raid.clear': 'Clear Raids', - 'reload.script': 'Reload Script', - 'Restart Raidjoin': 'Restart Raidjoin', - 'Refresh Facebook Game Login': 'Refresh Facebook Game Login', - 'NG Raid Join(slow!)': 'NG Raid Join(slow!)', - 'disable timed Autojoin': 'disable timed Autojoin', - 'enable timed Autojoin': 'enable timed Autojoin', - - 'Last raids joined:': 'Last raids joined:', - 'Enter Boss\' Name': 'Enter Boss\' Name' - }, + } + + } + } get: function (key) { var textKey = key || ''; var text=idrinth.text.data; return text.hasOwnProperty(textKey) ? data[textKey] : text['default.error']; } -} +} \ No newline at end of file diff --git a/src/mods/text.js~RF9de3ad.TMP b/src/mods/text.js~RF9de3ad.TMP new file mode 100644 index 0000000..337644a --- /dev/null +++ b/src/mods/text.js~RF9de3ad.TMP @@ -0,0 +1,47 @@ +idrinth.text = { + data: { + "chat.user.action.ban": "Ban user", + 'chat.user.status.banned': 'Banned', + 'chat.user.action.makeMod': 'Make Moderator', + 'chat.user.action.makeAdmin': 'Make Admin', + 'chat.user.owner': 'Owner', + 'chat.user.action.makeUser': 'Make User', + 'chat.user.user': 'User', + 'chat.user.action.invite ': 'Invite to Chat ', + 'chat.user.action.close': 'Close', + + 'chat.user.modify.fail': 'Can\'t modify that user at the moment', + 'chat.create.fail': 'Can\'t create at the moment', + 'chat.join.fail': 'Can\'t join at the moment', + 'chat.join.notwork': 'Joining didn\'t work', + 'chat.user.status.unknown': 'The given username for dotd.idrinth.de is unknown, do you want to register it there?', + 'chat.login.fail': 'Login failed in an unexpected way', + 'default.error': 'Unexpected error occurred. Please contact script developers' + + ' (https://github.com/Idrinth/IDotD).', + + 'This part of the script is optional, so logging in is unneeded for raid catching etc.': 'This part of the script is optional, so logging in is unneeded for raid catching etc.', + 'Account': 'Account', + 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.': 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.', + "Not logged in, click to login/register": "Not logged in, click to login/register", + + 'raid.import.manually.all': 'Import all manually', + 'raid.import.manually.fav': 'Import favs manually', + + 'reload.game': 'Reload game', + 'raid.clear': 'Clear Raids', + 'reload.script': 'Reload Script', + 'Restart Raidjoin': 'Restart Raidjoin', + 'Refresh Facebook Game Login': 'Refresh Facebook Game Login', + 'NG Raid Join(slow!)': 'NG Raid Join(slow!)', + 'disable timed Autojoin': 'disable timed Autojoin', + 'enable timed Autojoin': 'enable timed Autojoin', + + 'Last raids joined:': 'Last raids joined:', + 'Enter Boss\' Name': 'Enter Boss\' Name' + }, + get: function (key) { + var textKey = key || ''; + var text=idrinth.text.data; + return text.hasOwnProperty(textKey) ? data[textKey] : text['default.error']; + } +} From 183566302f05f496f475f8c4e334f112a3c41c67 Mon Sep 17 00:00:00 2001 From: ardenian Date: Fri, 30 Sep 2016 16:00:16 +0200 Subject: [PATCH 008/341] progress --- src/mods/text.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index 04a1978..8952032 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -37,9 +37,7 @@ idrinth.text = { 'Enter Boss\' Name': 'Enter Boss\' Name' } - - } - } + }, get: function (key) { var textKey = key || ''; var text=idrinth.text.data; From 7801250cee7b212e41dc25c0166ab0a8f0da3221 Mon Sep 17 00:00:00 2001 From: ardenian Date: Fri, 30 Sep 2016 16:35:38 +0200 Subject: [PATCH 009/341] progress --- src/mods/text.js | 61 ++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index 8952032..9cd9a44 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -1,6 +1,7 @@ idrinth.text = { data: { chat: { + user:{ ban: 'Ban User', banned: 'Banned', makeMod: 'Make Moderator', @@ -8,39 +9,43 @@ idrinth.text = { owner: 'Owner', makeUser: 'Make user', user: 'User', - invite:'Invite to Chat ', + }, + button:{ close: 'Close', + invite:'Invite to Chat ', + account: 'Account', + gameReload: 'Reload game', + scriptReload: 'Reload Script', + facebookLoginRefresh: 'Refresh Facebook Game Login', + ngRaidJoin: 'NG Raid Join(slow!)', + manually: 'Import all manually', + fav: 'Import favs manually', + disableAutojoin: 'disable timed Autojoin', + enableAutojoin: 'enable timed Autojoin', + clear: 'Clear Raids', + joinRestart: 'Restart Raidjoin', + joinedLast: 'Last raids joined:', + bossName: 'Enter Boss\' Name' + }, + message:{ + optional: 'This part of the script is optional, so logging in is unneeded for raid catching etc.', + invalid: 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.', + offline: "Not logged in, click to login/register", + modifyFail:'Can\'t modify that user at the moment', + joinFail:'Can\'t create at the moment', + joinNotwork:'Joining didn\'t work', + loginFail: 'Login failed in an unexpected way', unknown:'The given username for dotd.idrinth.de is unknown, do you want to register it there?', - - 'modify.fail':'Can\'t modify that user at the moment', - 'join.fail':'Can\'t create at the moment', - 'join.notwork':'Joining didn\'t work', - 'chat.join.notwork': 'Joining didn\'t work', - 'chat.login.fail': 'Login failed in an unexpected way', - 'default.error': 'Unexpected error occurred. Please contact script developers' + }, + error:{ + errorDefault: 'Unexpected error occurred. Please contact script developers' + ' (https://github.com/Idrinth/IDotD).', - 'This part of the script is optional, so logging in is unneeded for raid catching etc.': 'This part of the script is optional, so logging in is unneeded for raid catching etc.', - 'Account': 'Account', - 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.': 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.', - "Not logged in, click to login/register": "Not logged in, click to login/register", - 'raid.import.manually.all': 'Import all manually', - 'raid.import.manually.fav': 'Import favs manually', - 'game.reload': 'Reload game', - 'raid.clear': 'Clear Raids', - 'script.reload': 'Reload Script', - 'raid.join.restart': 'Restart Raidjoin', - 'game.facebook.login.refresh': 'Refresh Facebook Game Login', - 'NG Raid Join(slow!)': 'NG Raid Join(slow!)', - 'disable timed Autojoin': 'disable timed Autojoin', - 'enable timed Autojoin': 'enable timed Autojoin', - 'Last raids joined:': 'Last raids joined:', - 'Enter Boss\' Name': 'Enter Boss\' Name' - - } - }, + } + } + }, get: function (key) { var textKey = key || ''; var text=idrinth.text.data; - return text.hasOwnProperty(textKey) ? data[textKey] : text['default.error']; + return text.hasOwnProperty(textKey) ? data[key] : text['default.error']; } } \ No newline at end of file From 0e0492717658baf2eddf5be18f79f691bf70794d Mon Sep 17 00:00:00 2001 From: ardenian Date: Fri, 30 Sep 2016 16:53:08 +0200 Subject: [PATCH 010/341] progress --- src/mods/text.js | 19 ++++++++++---- src/mods/text.js~RF9de3ad.TMP | 47 ----------------------------------- 2 files changed, 14 insertions(+), 52 deletions(-) delete mode 100644 src/mods/text.js~RF9de3ad.TMP diff --git a/src/mods/text.js b/src/mods/text.js index 9cd9a44..c545e47 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -40,12 +40,21 @@ idrinth.text = { error:{ errorDefault: 'Unexpected error occurred. Please contact script developers' + ' (https://github.com/Idrinth/IDotD).', - } + } } }, - get: function (key) { - var textKey = key || ''; - var text=idrinth.text.data; - return text.hasOwnProperty(textKey) ? data[key] : text['default.error']; + + var Get = function (key) { + var getSub(obj,keys,func) { + var key=keys.shift() + if(obj.hasOwnProperty(key)) { + if(keys.length>0) { + return func(obj[key],keys,func); + } + return obj[key]; + } + return idrinth.text.data.chat.error.errorDefault; + } + return getSub(idrinth.text.data,key.split('.'),getSub); } } \ No newline at end of file diff --git a/src/mods/text.js~RF9de3ad.TMP b/src/mods/text.js~RF9de3ad.TMP deleted file mode 100644 index 337644a..0000000 --- a/src/mods/text.js~RF9de3ad.TMP +++ /dev/null @@ -1,47 +0,0 @@ -idrinth.text = { - data: { - "chat.user.action.ban": "Ban user", - 'chat.user.status.banned': 'Banned', - 'chat.user.action.makeMod': 'Make Moderator', - 'chat.user.action.makeAdmin': 'Make Admin', - 'chat.user.owner': 'Owner', - 'chat.user.action.makeUser': 'Make User', - 'chat.user.user': 'User', - 'chat.user.action.invite ': 'Invite to Chat ', - 'chat.user.action.close': 'Close', - - 'chat.user.modify.fail': 'Can\'t modify that user at the moment', - 'chat.create.fail': 'Can\'t create at the moment', - 'chat.join.fail': 'Can\'t join at the moment', - 'chat.join.notwork': 'Joining didn\'t work', - 'chat.user.status.unknown': 'The given username for dotd.idrinth.de is unknown, do you want to register it there?', - 'chat.login.fail': 'Login failed in an unexpected way', - 'default.error': 'Unexpected error occurred. Please contact script developers' - + ' (https://github.com/Idrinth/IDotD).', - - 'This part of the script is optional, so logging in is unneeded for raid catching etc.': 'This part of the script is optional, so logging in is unneeded for raid catching etc.', - 'Account': 'Account', - 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.': 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.', - "Not logged in, click to login/register": "Not logged in, click to login/register", - - 'raid.import.manually.all': 'Import all manually', - 'raid.import.manually.fav': 'Import favs manually', - - 'reload.game': 'Reload game', - 'raid.clear': 'Clear Raids', - 'reload.script': 'Reload Script', - 'Restart Raidjoin': 'Restart Raidjoin', - 'Refresh Facebook Game Login': 'Refresh Facebook Game Login', - 'NG Raid Join(slow!)': 'NG Raid Join(slow!)', - 'disable timed Autojoin': 'disable timed Autojoin', - 'enable timed Autojoin': 'enable timed Autojoin', - - 'Last raids joined:': 'Last raids joined:', - 'Enter Boss\' Name': 'Enter Boss\' Name' - }, - get: function (key) { - var textKey = key || ''; - var text=idrinth.text.data; - return text.hasOwnProperty(textKey) ? data[textKey] : text['default.error']; - } -} From 20402998b05e6f75f59696ba46aaf53747372bb7 Mon Sep 17 00:00:00 2001 From: ardenian Date: Fri, 30 Sep 2016 17:12:48 +0200 Subject: [PATCH 011/341] editing get function of text collection --- src/mods/text.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index c545e47..a83528c 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -44,17 +44,17 @@ idrinth.text = { } }, - var Get = function (key) { - var getSub(obj,keys,func) { - var key=keys.shift() - if(obj.hasOwnProperty(key)) { - if(keys.length>0) { - return func(obj[key],keys,func); + get: function (key) { + var getSub = function (obj, keys, func) { + var key = keys.shift(); + if (obj.hasOwnProperty(key)) { + if (keys.length > 0) { + return func(obj[key], keys, func); } return obj[key]; } return idrinth.text.data.chat.error.errorDefault; - } + }; return getSub(idrinth.text.data,key.split('.'),getSub); } } \ No newline at end of file From eb092083c2a83c7993c99092ceae44cf03561e77 Mon Sep 17 00:00:00 2001 From: ardenian Date: Fri, 30 Sep 2016 17:25:34 +0200 Subject: [PATCH 012/341] added more text elements, started with replacing of chat.js --- src/mods/chat.js | 34 +++++++++++++++++----------------- src/mods/text.js | 6 +++++- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index feb6e88..e10a637 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -57,26 +57,26 @@ idrinth.chat = { var promotionModes = [ { chat: chat, - label: 'Ban User', - rank: 'Banned', + label: idrinth.text.get("user.ban"), + rank: idrinth.text.get("user.banned"), requiredRank: 3 }, { chat: chat, - label: 'Make Moderator', - rank: 'Mod', + label: idrinth.text.get("user.makeMod"), + rank: idrinth.text.get("user.mod"), requiredRank: 3 }, { chat: chat, - label: 'Make Admin', - rank: 'Owner', + label: idrinth.text.get("user.makeAdmin"), + rank: idrinth.text.get("user.owner"), requiredRank: 4 }, { chat: chat, - label: 'Make User', - rank: 'User', + label: idrinth.text.get("user.makeUser"), + rank: idrinth.text.get("user.user"), requiredRank: 3 } ]; @@ -85,8 +85,8 @@ idrinth.chat = { if ( document.getElementById ( 'idrinth-chat-tab-click-' + chatId ) && intChatId !== chat && intChatId > 1 && !( user in idrinth.chat.chatRank[chatId] ) ) { promotionModes.push ( { chat: chatId, - label: 'Invite to Chat ' + document.getElementById ( 'idrinth-chat-tab-click-' + chatId ).innerHTML, - rank: 'User', + label: idrinth.text.get("button.invite") + document.getElementById('idrinth-chat-tab-click-' + chatId).innerHTML, + rank: idrinth.text.get("user.user"), requiredRank: 1 } ); } @@ -436,7 +436,7 @@ idrinth.chat = { idrinth.chat.oldMessages = [ ]; idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 999 ); }, - ranks: [ '', 'banned', 'user', 'mod', 'owner' ], + ranks: ['', idrinth.text.get("user.banned"), idrinth.text.get("user.user"), idrinth.text.get("user.mod"), idrinth.text.get("user.owner")], applyMembers: function ( data ) { var applyMemberData = function () { var addMemberElement = function ( chat, chatId, userId ) { @@ -581,21 +581,21 @@ idrinth.chat = { children: [ { type: 'h1', - content: 'Chat' + content: idrinth.text.get("button.chat") }, { type: 'p', - content: 'This part of the script is optional, so logging in is unneeded for raid catching etc.' + content: idrinth.text.get("message.optional") }, { id: 'idrinth-chat-login', children: [ { type: 'h2', - content: 'Account' + content: idrinth.text.get("button.account") }, { type: 'p', - content: 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.' + content: idrinth.text.get("message.invalid") }, { type: 'ul', @@ -612,7 +612,7 @@ idrinth.chat = { children: [ { type: 'h2', - content: 'Join Chat' + content: idrinth.text.get("button.joinChat") }, { type: 'ul', @@ -630,7 +630,7 @@ idrinth.chat = { children: [ { type: 'h2', - content: 'Create Chat' + content: idrinth.text.get("button.createChat") }, { type: 'ul', diff --git a/src/mods/text.js b/src/mods/text.js index a83528c..7204c81 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -9,6 +9,7 @@ idrinth.text = { owner: 'Owner', makeUser: 'Make user', user: 'User', + mod:'Mod', }, button:{ close: 'Close', @@ -25,7 +26,10 @@ idrinth.text = { clear: 'Clear Raids', joinRestart: 'Restart Raidjoin', joinedLast: 'Last raids joined:', - bossName: 'Enter Boss\' Name' + bossName: 'Enter Boss\' Name', + chat: 'Chat', + createChat: 'Create Chat', + joinChat: 'Join Chat', }, message:{ optional: 'This part of the script is optional, so logging in is unneeded for raid catching etc.', From 34d5dd2737baa240981400b02920463131a89934 Mon Sep 17 00:00:00 2001 From: ardenian Date: Fri, 30 Sep 2016 17:42:30 +0200 Subject: [PATCH 013/341] a step back, chat.js reset --- src/mods/chat.js | 34 +++++++++++++++++----------------- src/mods/text.js | 4 ---- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index e10a637..feb6e88 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -57,26 +57,26 @@ idrinth.chat = { var promotionModes = [ { chat: chat, - label: idrinth.text.get("user.ban"), - rank: idrinth.text.get("user.banned"), + label: 'Ban User', + rank: 'Banned', requiredRank: 3 }, { chat: chat, - label: idrinth.text.get("user.makeMod"), - rank: idrinth.text.get("user.mod"), + label: 'Make Moderator', + rank: 'Mod', requiredRank: 3 }, { chat: chat, - label: idrinth.text.get("user.makeAdmin"), - rank: idrinth.text.get("user.owner"), + label: 'Make Admin', + rank: 'Owner', requiredRank: 4 }, { chat: chat, - label: idrinth.text.get("user.makeUser"), - rank: idrinth.text.get("user.user"), + label: 'Make User', + rank: 'User', requiredRank: 3 } ]; @@ -85,8 +85,8 @@ idrinth.chat = { if ( document.getElementById ( 'idrinth-chat-tab-click-' + chatId ) && intChatId !== chat && intChatId > 1 && !( user in idrinth.chat.chatRank[chatId] ) ) { promotionModes.push ( { chat: chatId, - label: idrinth.text.get("button.invite") + document.getElementById('idrinth-chat-tab-click-' + chatId).innerHTML, - rank: idrinth.text.get("user.user"), + label: 'Invite to Chat ' + document.getElementById ( 'idrinth-chat-tab-click-' + chatId ).innerHTML, + rank: 'User', requiredRank: 1 } ); } @@ -436,7 +436,7 @@ idrinth.chat = { idrinth.chat.oldMessages = [ ]; idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 999 ); }, - ranks: ['', idrinth.text.get("user.banned"), idrinth.text.get("user.user"), idrinth.text.get("user.mod"), idrinth.text.get("user.owner")], + ranks: [ '', 'banned', 'user', 'mod', 'owner' ], applyMembers: function ( data ) { var applyMemberData = function () { var addMemberElement = function ( chat, chatId, userId ) { @@ -581,21 +581,21 @@ idrinth.chat = { children: [ { type: 'h1', - content: idrinth.text.get("button.chat") + content: 'Chat' }, { type: 'p', - content: idrinth.text.get("message.optional") + content: 'This part of the script is optional, so logging in is unneeded for raid catching etc.' }, { id: 'idrinth-chat-login', children: [ { type: 'h2', - content: idrinth.text.get("button.account") + content: 'Account' }, { type: 'p', - content: idrinth.text.get("message.invalid") + content: 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.' }, { type: 'ul', @@ -612,7 +612,7 @@ idrinth.chat = { children: [ { type: 'h2', - content: idrinth.text.get("button.joinChat") + content: 'Join Chat' }, { type: 'ul', @@ -630,7 +630,7 @@ idrinth.chat = { children: [ { type: 'h2', - content: idrinth.text.get("button.createChat") + content: 'Create Chat' }, { type: 'ul', diff --git a/src/mods/text.js b/src/mods/text.js index 7204c81..5850344 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -3,13 +3,9 @@ idrinth.text = { chat: { user:{ ban: 'Ban User', - banned: 'Banned', makeMod: 'Make Moderator', makeAdmin: 'Make Admin', - owner: 'Owner', makeUser: 'Make user', - user: 'User', - mod:'Mod', }, button:{ close: 'Close', From b7316488296cc98af35232ef0e526cbbc6da7497 Mon Sep 17 00:00:00 2001 From: ardenian Date: Fri, 30 Sep 2016 17:48:28 +0200 Subject: [PATCH 014/341] Testing one replacement --- src/mods/chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index feb6e88..1195e2d 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -591,7 +591,7 @@ idrinth.chat = { children: [ { type: 'h2', - content: 'Account' + content: idrinth.text.get("button.account"), }, { type: 'p', From d5787ef97147f8a5e477b794fa43cd5461d61860 Mon Sep 17 00:00:00 2001 From: ardenian Date: Fri, 30 Sep 2016 17:55:21 +0200 Subject: [PATCH 015/341] testing one replacement --- src/mods/chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 1195e2d..168e0fc 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -591,7 +591,7 @@ idrinth.chat = { children: [ { type: 'h2', - content: idrinth.text.get("button.account"), + content: idrinth.text.get("chat.button.account"), }, { type: 'p', From b050007fa52cf28187f5bbf529ae5dd1c937f093 Mon Sep 17 00:00:00 2001 From: ardenian Date: Fri, 30 Sep 2016 18:37:35 +0200 Subject: [PATCH 016/341] Major text call replacements in chat.js --- src/mods/chat.js | 68 ++++++++++++++++++++++++------------------------ src/mods/text.js | 11 ++++++-- 2 files changed, 43 insertions(+), 36 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 168e0fc..a6ec33f 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -57,25 +57,25 @@ idrinth.chat = { var promotionModes = [ { chat: chat, - label: 'Ban User', + label: idrinth.text.get("chat.user.ban"), rank: 'Banned', requiredRank: 3 }, { chat: chat, - label: 'Make Moderator', + label: idrinth.text.get("chat.user.makeMod"), rank: 'Mod', requiredRank: 3 }, { chat: chat, - label: 'Make Admin', + label: idrinth.text.get("chat.user.makeAdmin"), rank: 'Owner', requiredRank: 4 }, { chat: chat, - label: 'Make User', + label: idrinth.text.get("chat.user.makeUser"), rank: 'User', requiredRank: 3 } @@ -85,7 +85,7 @@ idrinth.chat = { if ( document.getElementById ( 'idrinth-chat-tab-click-' + chatId ) && intChatId !== chat && intChatId > 1 && !( user in idrinth.chat.chatRank[chatId] ) ) { promotionModes.push ( { chat: chatId, - label: 'Invite to Chat ' + document.getElementById ( 'idrinth-chat-tab-click-' + chatId ).innerHTML, + label: idrinth.text.get("chat.ui.invite") + document.getElementById('idrinth-chat-tab-click-' + chatId).innerHTML, rank: 'User', requiredRank: 1 } ); @@ -155,10 +155,10 @@ idrinth.chat = { } }, function ( reply ) { - idrinth.core.alert ( this.getMsg ( 'modify.fail' ) ); + idrinth.core.alert ( idrinth.text.get("chat.message.modifyFail") ); }, function ( reply ) { - idrinth.core.alert ( this.getMsg ( 'modify.fail' ) ); + idrinth.core.alert ( idrinth.text.get("chat.message.modifyFail") ); }, JSON.stringify ( { chat: chat, @@ -581,21 +581,21 @@ idrinth.chat = { children: [ { type: 'h1', - content: 'Chat' + content: idrinth.text.get("chat.ui.chat") }, { type: 'p', - content: 'This part of the script is optional, so logging in is unneeded for raid catching etc.' + content: idrinth.text.get("chat.message.optional"), }, { id: 'idrinth-chat-login', children: [ { type: 'h2', - content: idrinth.text.get("chat.button.account"), + content: idrinth.text.get("chat.ui.account"), }, { type: 'p', - content: 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.' + content: idrinth.text.get("chat.message.invalid"), }, { type: 'ul', @@ -603,7 +603,7 @@ idrinth.chat = { children: [ makeInput ( 'Username' ), makeInput ( 'Password' ), - makeButton ( "Not logged in, click to login/register", "idrinth.chat.login()" ) + makeButton(idrinth.text.get("chat.message.offline"), "idrinth.chat.login()") ] } ] @@ -612,7 +612,7 @@ idrinth.chat = { children: [ { type: 'h2', - content: 'Join Chat' + content: idrinth.text.get("chat.ui.joinChat"), }, { type: 'ul', @@ -620,7 +620,7 @@ idrinth.chat = { children: [ makeInput ( 'Chat-ID' ), makeInput ( 'Chat-Password' ), - makeButton ( "Click to join additional chat", "idrinth.chat.add()" ) + makeButton(idrinth.text.get("chat.ui.createAddChat"), "idrinth.chat.add()") ] } ] @@ -630,14 +630,14 @@ idrinth.chat = { children: [ { type: 'h2', - content: 'Create Chat' + content: idrinth.text.get("chat.ui.createChat") }, { type: 'ul', css: 'settings', children: [ makeInput ( "Name" ), - makeButton ( "Click to create additional chat", "idrinth.chat.create()" ) + makeButton(idrinth.text.get("chat.ui.createAddChat"), "idrinth.chat.create()") ] } ] @@ -646,7 +646,7 @@ idrinth.chat = { children: [ { type: '#text', - content: 'More settings at ' + content: idrinth.text.get("chat.ui.moreSettings"), }, { type: 'a', @@ -672,7 +672,7 @@ idrinth.chat = { children: [ { type: '#text', - content: 'Emoticons provided by ' + content: idrinth.text.get("chat.ui.creditEmoticon") }, { type: 'a', @@ -744,29 +744,29 @@ idrinth.chat = { 'chat-service/create/', idrinth.chat.joinCallback, function ( reply ) { - idrinth.core.alert ( this.getMsg ( 'create.fail' ) ); + idrinth.core.alert( idrinth.text.get("chat.message.createFail") ); }, function ( reply ) { - idrinth.core.alert ( this.getMsg ( 'create.fail' ) ); + idrinth.core.alert( idrinth.text.get("chat.message.createFail") ); }, document.getElementById ( 'idrinth-make-chat' ).getElementsByTagName ( 'input' )[0].value ); }, joinCallback: function ( reply ) { if ( !reply ) { - idrinth.core.alert ( this.getMsg ( 'join.fail' ) ); + idrinth.core.alert( idrinth.text.get("chat.message.joinFail") ); return; } reply = JSON.parse ( reply ); if ( !reply ) { - idrinth.core.alert ( this.getMsg ( 'join.fail' ) ); + idrinth.core.alert( idrinth.text.get("chat.message.joinFail") ); return; } if ( !reply.success ) { if ( reply.message ) { idrinth.core.alert ( reply.message ); } else { - idrinth.core.alert ( this.getMsg ( 'join.notwork' ) ); + idrinth.core.alert( idrinth.text.get("chat.message.joinNotwork") ); } return; } @@ -782,10 +782,10 @@ idrinth.chat = { 'chat-service/join/', idrinth.chat.joinCallback, function ( reply ) { - idrinth.core.alert ( this.getMsg ( 'join.fail' ) ); + idrinth.core.alert ( idrinth.text.get("chat.message.joinFail") ); }, function ( reply ) { - idrinth.core.alert ( this.getMsg ( 'join.fail' ) ); + idrinth.core.alert ( idrinth.text.get("chat.message.joinFail") ); }, JSON.stringify ( { id: document.getElementById ( 'idrinth-add-chat' ).getElementsByTagName ( 'input' )[0].value, @@ -825,16 +825,16 @@ idrinth.chat = { }, loginCallback: function ( data ) { if ( !data ) { - idrinth.core.alert ( idrinth.chat.getMsg ( 'login.fail' ) ); + idrinth.core.alert ( idrinth.text.get("chat.message.loginFail")) ); return; } data = JSON.parse ( data ); if ( !data ) { - idrinth.core.alert ( idrinth.chat.getMsg ( 'login.fail' ) ); + idrinth.core.alert ( idrinth.text.get("chat.message.loginFail") ); return; } if ( !data.success && data.message && data['allow-reg'] ) { - idrinth.core.confirm ( idrinth.chat.getMsg ( 'user.unknown' ), 'idrinth.chat.register();' ); + idrinth.core.confirm( idrinth.text.get("chat.message.unknown"), 'idrinth.chat.register();'); return; } if ( !data.success && data.message ) { @@ -849,7 +849,7 @@ idrinth.chat = { idrinth.chat.join ( data.data ); return; } - idrinth.core.alert ( idrinth.chat.getMsg ( 'login.fail' ) ); + idrinth.core.alert( idrinth.text.get("chat.message.loginFail") ); }, register: function () { this.loginActions ( 'register' ); @@ -867,21 +867,21 @@ idrinth.chat = { css: 'idrinth-hovering-box', children: [ { css: 'clipboard-copy', - content: 'Copy Password&Id', + content: idrinth.text.get("chat.ui.copyIdPasswort"), type: 'li', attributes: [ { name: 'data-clipboard-text', value: element.getAttribute ( 'title' ) } ] }, { - content: 'Leave Room', + content: idrinth.text.get("chat.ui.LeaveRoom"), type: 'li', attributes: [ { name: 'onclick', value: 'idrinth.chat.useroptions(' + element.getAttribute ( 'data-id' ) + ',' + idrinth.chat.self + ',\'Leave\');this.parentNode.parentNode.removeChild(this.parentNode);' } ] }, { - content: 'Delete Room', + content: idrinth.text.get("chat.ui.deleteRoom"), type: 'li', attributes: [ { name: 'onclick', @@ -889,7 +889,7 @@ idrinth.chat = { } ] }, { type: 'li', - content: 'Close', + content: idrinth.text.get("chat.ui.close"), attributes: [ { name: 'onclick', value: 'this.parentNode.parentNode.removeChild(this.parentNode);' @@ -953,7 +953,7 @@ idrinth.chat = { 'relogin': 'chat-service/login/' }, fail = function () { - idrinth.core.alert ( this.getMsg ( 'login.fail' ) ); + idrinth.core.alert( idrinth.text.get("chat.message.loginFail") ); }, timeout = function () { window.setTimeout ( idrinth.chat.login, 1 ); diff --git a/src/mods/text.js b/src/mods/text.js index 5850344..00b6bf2 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -7,7 +7,7 @@ idrinth.text = { makeAdmin: 'Make Admin', makeUser: 'Make user', }, - button:{ + ui:{ close: 'Close', invite:'Invite to Chat ', account: 'Account', @@ -26,13 +26,20 @@ idrinth.text = { chat: 'Chat', createChat: 'Create Chat', joinChat: 'Join Chat', + createAddChat: "Click to create additional chat", + creditEmoticon: 'Emoticons provided by ', + copyIdPasswort: 'Copy Password&Id', + moreSettings: 'More settings at ', + deleteRoom: 'Delete Room', + leaveRoom: 'Leave Room', }, message:{ optional: 'This part of the script is optional, so logging in is unneeded for raid catching etc.', invalid: 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.', offline: "Not logged in, click to login/register", modifyFail:'Can\'t modify that user at the moment', - joinFail:'Can\'t create at the moment', + createFail: 'Can\'t create at the moment', + joinFail: 'Can\'t join at the moment', joinNotwork:'Joining didn\'t work', loginFail: 'Login failed in an unexpected way', unknown:'The given username for dotd.idrinth.de is unknown, do you want to register it there?', From bc231fd5f6e5e9c40591ce93b157185952cb0dac Mon Sep 17 00:00:00 2001 From: ardenian Date: Fri, 30 Sep 2016 21:45:42 +0200 Subject: [PATCH 017/341] Cleaning up text.js from mixed entries, removed --- src/mods/chat.js | 26 ++++++-------------------- src/mods/text.js | 18 ------------------ 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index a6ec33f..23c88b6 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -57,25 +57,25 @@ idrinth.chat = { var promotionModes = [ { chat: chat, - label: idrinth.text.get("chat.user.ban"), + label: 'Ban User', rank: 'Banned', requiredRank: 3 }, { chat: chat, - label: idrinth.text.get("chat.user.makeMod"), + label: 'Make Moderator', rank: 'Mod', requiredRank: 3 }, { chat: chat, - label: idrinth.text.get("chat.user.makeAdmin"), + label: 'Make Admin', rank: 'Owner', requiredRank: 4 }, { chat: chat, - label: idrinth.text.get("chat.user.makeUser"), + label: 'Make User', rank: 'User', requiredRank: 3 } @@ -85,7 +85,7 @@ idrinth.chat = { if ( document.getElementById ( 'idrinth-chat-tab-click-' + chatId ) && intChatId !== chat && intChatId > 1 && !( user in idrinth.chat.chatRank[chatId] ) ) { promotionModes.push ( { chat: chatId, - label: idrinth.text.get("chat.ui.invite") + document.getElementById('idrinth-chat-tab-click-' + chatId).innerHTML, + label: 'Invite to Chat ' + document.getElementById('idrinth-chat-tab-click-' + chatId).innerHTML, rank: 'User', requiredRank: 1 } ); @@ -874,7 +874,7 @@ idrinth.chat = { value: element.getAttribute ( 'title' ) } ] }, { - content: idrinth.text.get("chat.ui.LeaveRoom"), + content: idrinth.text.get("chat.ui.leaveRoom"), type: 'li', attributes: [ { name: 'onclick', @@ -930,20 +930,6 @@ idrinth.chat = { element.innerHTML = '>>'; } }, - getMsg: function ( key ) { - var textKey = key || ''; - var text = { - 'modify.fail': 'Can\'t modify that user at the moment', - 'create.fail': 'Can\'t create at the moment', - 'join.fail': 'Can\'t join at the moment', - 'join.notwork': 'Joining didn\'t work', - 'user.unknown': 'The given username for dotd.idrinth.de is unknown, do you want to register it there?', - 'login.fail': 'Login failed in an unexpected way', - 'default.error': 'Unexpected error occurred. Please contact script developers' - + ' (https://github.com/Idrinth/IDotD).' - }; - return text.hasOwnProperty ( textKey ) ? text[textKey] : text['default.error']; - }, loginActions: function ( key ) { var chatLogin, success, diff --git a/src/mods/text.js b/src/mods/text.js index 00b6bf2..37941d7 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -1,28 +1,10 @@ idrinth.text = { data: { chat: { - user:{ - ban: 'Ban User', - makeMod: 'Make Moderator', - makeAdmin: 'Make Admin', - makeUser: 'Make user', - }, ui:{ close: 'Close', invite:'Invite to Chat ', account: 'Account', - gameReload: 'Reload game', - scriptReload: 'Reload Script', - facebookLoginRefresh: 'Refresh Facebook Game Login', - ngRaidJoin: 'NG Raid Join(slow!)', - manually: 'Import all manually', - fav: 'Import favs manually', - disableAutojoin: 'disable timed Autojoin', - enableAutojoin: 'enable timed Autojoin', - clear: 'Clear Raids', - joinRestart: 'Restart Raidjoin', - joinedLast: 'Last raids joined:', - bossName: 'Enter Boss\' Name', chat: 'Chat', createChat: 'Create Chat', joinChat: 'Join Chat', From 527c308ff552e32f2744c3433c64da1cdf72784d Mon Sep 17 00:00:00 2001 From: ardenian Date: Fri, 30 Sep 2016 22:08:34 +0200 Subject: [PATCH 018/341] added land, minor adjustments --- src/mods/land.js | 2 +- src/mods/text.js | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/mods/land.js b/src/mods/land.js index 08cc75b..86d601b 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -70,7 +70,7 @@ idrinth.land = { } var results = baseCalculator ( getRequirements () ); if ( Object.keys ( results ).length === 0 ) { - idrinth.core.alert ( 'You lack gold to buy any more buildings at the moment.' ); + idrinth.core.alert( idrinth.text.get("land.lackgold") ); } putResults ( results ); }, diff --git a/src/mods/text.js b/src/mods/text.js index 37941d7..b72e48a 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -30,9 +30,14 @@ idrinth.text = { errorDefault: 'Unexpected error occurred. Please contact script developers' + ' (https://github.com/Idrinth/IDotD).', } - } + }, + land: { + lackGold: 'You lack gold to buy any more buildings at the moment.', + }, }, + // idrinth.text.get("ui.importFav") + get: function (key) { var getSub = function (obj, keys, func) { var key = keys.shift(); From d3ec84bad6d3e29d64d3959dd85ba8d6b867bebf Mon Sep 17 00:00:00 2001 From: ardenian Date: Fri, 30 Sep 2016 22:09:47 +0200 Subject: [PATCH 019/341] removing comments of work flow --- src/mods/text.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index b72e48a..7450975 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -35,9 +35,6 @@ idrinth.text = { lackGold: 'You lack gold to buy any more buildings at the moment.', }, }, - - // idrinth.text.get("ui.importFav") - get: function (key) { var getSub = function (obj, keys, func) { var key = keys.shift(); From e7aa949d17dbffc237f3609975d887da2a0517b0 Mon Sep 17 00:00:00 2001 From: ardenian Date: Sat, 1 Oct 2016 20:12:26 +0200 Subject: [PATCH 020/341] Added text from tiers to text.js and replacements in tier.js Added dummies for the English language class and the lang.js --- languages/English[English].json | 3 +++ src/mods/lang.js | 3 +++ src/mods/text.js | 11 +++++++++++ src/mods/tier.js | 12 ++++++------ 4 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 languages/English[English].json create mode 100644 src/mods/lang.js diff --git a/languages/English[English].json b/languages/English[English].json new file mode 100644 index 0000000..d177980 --- /dev/null +++ b/languages/English[English].json @@ -0,0 +1,3 @@ +{ + +} diff --git a/src/mods/lang.js b/src/mods/lang.js new file mode 100644 index 0000000..b59348b --- /dev/null +++ b/src/mods/lang.js @@ -0,0 +1,3 @@ +idrinth.lang = { + +} \ No newline at end of file diff --git a/src/mods/text.js b/src/mods/text.js index 7450975..b1edd89 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -34,7 +34,18 @@ idrinth.text = { land: { lackGold: 'You lack gold to buy any more buildings at the moment.', }, + tier: { + diffNormal: 'Normal', + diffHard: 'Hard', + diffLegend: 'Legend', + diffNight: 'Nightmare', + tagTop: 'Tag to screen-top', + alertNoSpaceTierbox: 'There is no space for another tier-box at the moment, please close one first.', + } }, + + // idrinth.text.get("tier.alertNoSpaceTierbox"), + get: function (key) { var getSub = function (obj, keys, func) { var key = keys.shift(); diff --git a/src/mods/tier.js b/src/mods/tier.js index 58081f0..c08ab6e 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -65,7 +65,7 @@ idrinth.tier = { return make ( key, name ); } } - idrinth.core.alert ( 'There is no space for another tier-box at the moment, please close one first.' ); + idrinth.core.alert ( idrinth.text.get("tier.alertNoSpaceTierbox") ); }, taggedSlots: { }, start: function () { @@ -185,7 +185,7 @@ idrinth.tier = { }, { type: 'button', - content: 'Tag to screen-top', + content: idrinth.text.get("tier.tagTop"), attributes: [ { name: 'onclick', @@ -216,19 +216,19 @@ idrinth.tier = { }, { type: 'th', - content: 'Normal' + content: idrinth.text.get("tier.diffNormal"), }, { type: 'th', - content: 'Hard' + content: idrinth.text.get("tier.diffHard"), }, { type: 'th', - content: 'Legend' + content: idrinth.text.get("tier.diffLegend"), }, { type: 'th', - content: 'Nightmare' + content: idrinth.text.get("tier.diffNight"), } ] } From 17987262f3c2ba91c2cb71e320f4ec49dd8f134c Mon Sep 17 00:00:00 2001 From: ardenian Date: Sun, 2 Oct 2016 18:29:39 +0200 Subject: [PATCH 021/341] Some replacements in ui.js, added to text.js --- src/mods/text.js | 29 ++++++++++++++++++++++++++++- src/mods/ui.js | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 52 insertions(+), 25 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index b1edd89..6a070d1 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -41,10 +41,37 @@ idrinth.text = { diffNight: 'Nightmare', tagTop: 'Tag to screen-top', alertNoSpaceTierbox: 'There is no space for another tier-box at the moment, please close one first.', + }, + ui: { + importMan: 'Import all manually', + importFav: 'Import favs manually', + reloadGame: 'Reload game', + clearRaids: 'Clear Raids', + reloadScript: 'Reload Script', + restartJoin: 'Restart Raidjoin', + refreshFacebookLogin: 'Refresh Facebook Game Login', + ngJoin: 'NG Raid Join(slow!)', + + enterBossName: 'Enter Boss\' Name', + enableExtCharInfo: 'Enable extended Characterinformation?', + miniLayout: 'Minimalist Layout', + moveSetLeft: 'Move settings left', + warBottomPage: 'Show war at the bottom of the page', + useGoldUp: 'Check to try and use up the gold as efficient as possible - uncheck to only use the most efficient buy in the land buy calculator', + buyTenOnce: 'Buy 10 Buildings at once?(Rec)', + millisecondsCharInfoAppears: 'Milliseconds until the extended Characterinformation disappears', + secondsToLoadGame: 'Seconds needed to load the game for joining', + enableChat: 'Enable chat(needs script reload)', + importInfo:'This script will always import the raids you manually set to be imported on the website and if it\'s enabled it will also import all raids matched by one of the faved searches provided.', + enableAutoRaidRequest: 'Enable Auto-Raid-Request for Favorites?', + idsToJoin: 'FavoriteIds to join (separate multiple by comma)', + maxPopupsFrame: 'Maximum Popups/Frames for joining raids', + timeAutoJoinRaids:'Time to automatically join raids slowly(reloads game multiple times). Format is [Hours]:[Minutes] without leading zeros, so 7:1 is fine, 07:01 is not', + getSearchFavs:'Get your search-favorites from ', } }, - // idrinth.text.get("tier.alertNoSpaceTierbox"), + // idrinth.text.get("ui.getSearchFavs") get: function (key) { var getSub = function (obj, keys, func) { diff --git a/src/mods/ui.js b/src/mods/ui.js index 1488540..c4810ee 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -439,14 +439,14 @@ idrinth.ui = { }; return [ { children: [ - buttonMaker ( 'Import all manually', 'idrinth.raids.import(\'\');' ), - buttonMaker ( 'Import favs manually', 'idrinth.raids.import(idrinth.settings.favs);' ), - buttonMaker ( 'Reload game', 'idrinth.ui.reloadGame();' ), - buttonMaker ( 'Clear Raids', 'idrinth.raids.clearAll();' ), - buttonMaker ( 'Reload Script', 'idrinth.reload();' ), - buttonMaker ( 'Restart Raidjoin', 'idrinth.raids.restartInterval();' ), - buttonMaker ( 'Refresh Facebook Game Login', 'idrinth.facebook.rejoin()', 'facebook' ), - buttonMaker ( 'NG Raid Join(slow!)', 'idrinth.newgrounds.joinRaids()', 'newgrounds' ), + buttonMaker ( idrinth.text.get("ui.importMan"), 'idrinth.raids.import(\'\');' ), + buttonMaker ( idrinth.text.get("ui.importFav"), 'idrinth.raids.import(idrinth.settings.favs);'), + buttonMaker ( idrinth.text.get("ui.reloadGame"), 'idrinth.ui.reloadGame();' ), + buttonMaker ( idrinth.text.get("ui.clearRaids"), 'idrinth.raids.clearAll();' ), + buttonMaker ( idrinth.text.get("ui.reloadScript"), 'idrinth.reload();' ), + buttonMaker ( idrinth.text.get("ui.restartJoin"), 'idrinth.raids.restartInterval();' ), + buttonMaker ( idrinth.text.get("ui.refreshFacebookLogin"), 'idrinth.facebook.rejoin()', 'facebook' ), + buttonMaker ( idrinth.text.get("ui.ngJoin"), 'idrinth.newgrounds.joinRaids()', 'newgrounds' ), buttonMaker ( idrinth.settings.alarmActive ? 'disable timed Autojoin' : 'enable timed Autojoin', 'idrinth.settings.change(\'alarmActive\',!idrinth.settings.alarmActive);this.innerHTML=idrinth.settings.alarmActive?\'disable timed Autojoin\':\'enable timed Autojoin\'', 'newgrounds' ) ] }, { @@ -466,7 +466,7 @@ idrinth.ui = { css: 'idrinth-line', children: [ { type: 'label', - content: 'Enter Boss\' Name', + content: idrinth.text.get("ui.enterBossName"), css: 'idrinth-float-half', attributes: [ { @@ -496,63 +496,63 @@ idrinth.ui = { rType: '#input', type: 'checkbox', platforms: [ 'kongregate' ], - label: 'Enable extended Characterinformation?' + label: idrinth.text.get("ui.enableExtCharInfo") }, { name: 'minimalist', rType: '#input', type: 'checkbox', - label: 'Minimalist Layout' + label: idrinth.text.get("ui.miniLayout") }, { name: 'moveLeft', rType: '#input', type: 'checkbox', - label: 'Move settings left' + label: idrinth.text.get("ui.moveSetLeft") }, { name: 'warBottom', rType: '#input', type: 'checkbox', - label: 'Show war at the bottom of the page' + label: idrinth.text.get("ui.warBottomPage") }, { name: 'landMax', rType: '#input', type: 'checkbox', - label: 'Check to try and use up the gold as efficient as possible - uncheck to only use the most efficient buy in the land buy calculator' + label: idrinth.text.get("ui.useGoldUp") }, { name: 'factor', rType: '#input', type: 'checkbox', - label: 'Buy 10 Buildings at once?(Rec)' + label: idrinth.text.get("ui.buyTenOnce") }, { name: 'timeout', rType: '#input', type: 'number', platforms: [ 'kongregate' ], - label: 'Milliseconds until the extended Characterinformation disappears' + label: idrinth.text.get("ui.millisecondsCharInfoAppears") }, { name: 'newgroundLoad', rType: '#input', type: 'number', platforms: [ 'newgrounds' ], - label: 'Seconds needed to load the game for joining' + label: idrinth.text.get("ui.secondsToLoadGame") }, { name: 'chatting', rType: '#input', type: 'checkbox', - label: 'Enable chat(needs script reload)' + label: idrinth.text.get("ui.enableChat") }, { css: 'idrinth-line', type: 'span', - content: 'This script will always import the raids you manually set to be imported on the website and if it\'s enabled it will also import all raids matched by one of the faved searches provided.' + content: idrinth.text.get("ui.importInfo") }, { name: 'raids', rType: '#input', type: 'checkbox', - label: 'Enable Auto-Raid-Request for Favorites?' + label: idrinth.text.get("ui.enableAutoRaidRequest") }, { name: 'favs', rType: '#input', type: 'text', - label: 'FavoriteIds to join (separate multiple by comma)' + label: idrinth.text.get("ui.idsToJoin") }, { name: 'isWorldServer', rType: '#input', @@ -578,19 +578,19 @@ idrinth.ui = { rType: '#input', type: 'number', platforms: [ 'dawnofthedragons', 'facebook' ], - label: 'Maximum Popups/Frames for joining raids' + label: idrinth.text.get("ui.maxPopupsFrame") }, { name: 'alarmTime', rType: '#input', type: 'text', platforms: [ 'newgrounds' ], - label: 'Time to automatically join raids slowly(reloads game multiple times). Format is [Hours]:[Minutes] without leading zeros, so 7:1 is fine, 07:01 is not' + label: idrinth.text.get("ui.timeAutoJoinRaids") }, { css: 'idrinth-line', type: 'p', children: [ { type: '#text', - content: 'Get your search-favorites from ' + content: idrinth.text.get("ui.getSearchFavs") }, { type: 'a', attributes: [ { From c59ed0dec6249d119fd76ec7925b65e97574e09b Mon Sep 17 00:00:00 2001 From: ardenian Date: Sun, 2 Oct 2016 18:33:27 +0200 Subject: [PATCH 022/341] Revert "Some replacements in ui.js, added to text.js" This reverts commit 17987262f3c2ba91c2cb71e320f4ec49dd8f134c. --- src/mods/text.js | 29 +---------------------------- src/mods/ui.js | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 25 insertions(+), 52 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index 6a070d1..b1edd89 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -41,37 +41,10 @@ idrinth.text = { diffNight: 'Nightmare', tagTop: 'Tag to screen-top', alertNoSpaceTierbox: 'There is no space for another tier-box at the moment, please close one first.', - }, - ui: { - importMan: 'Import all manually', - importFav: 'Import favs manually', - reloadGame: 'Reload game', - clearRaids: 'Clear Raids', - reloadScript: 'Reload Script', - restartJoin: 'Restart Raidjoin', - refreshFacebookLogin: 'Refresh Facebook Game Login', - ngJoin: 'NG Raid Join(slow!)', - - enterBossName: 'Enter Boss\' Name', - enableExtCharInfo: 'Enable extended Characterinformation?', - miniLayout: 'Minimalist Layout', - moveSetLeft: 'Move settings left', - warBottomPage: 'Show war at the bottom of the page', - useGoldUp: 'Check to try and use up the gold as efficient as possible - uncheck to only use the most efficient buy in the land buy calculator', - buyTenOnce: 'Buy 10 Buildings at once?(Rec)', - millisecondsCharInfoAppears: 'Milliseconds until the extended Characterinformation disappears', - secondsToLoadGame: 'Seconds needed to load the game for joining', - enableChat: 'Enable chat(needs script reload)', - importInfo:'This script will always import the raids you manually set to be imported on the website and if it\'s enabled it will also import all raids matched by one of the faved searches provided.', - enableAutoRaidRequest: 'Enable Auto-Raid-Request for Favorites?', - idsToJoin: 'FavoriteIds to join (separate multiple by comma)', - maxPopupsFrame: 'Maximum Popups/Frames for joining raids', - timeAutoJoinRaids:'Time to automatically join raids slowly(reloads game multiple times). Format is [Hours]:[Minutes] without leading zeros, so 7:1 is fine, 07:01 is not', - getSearchFavs:'Get your search-favorites from ', } }, - // idrinth.text.get("ui.getSearchFavs") + // idrinth.text.get("tier.alertNoSpaceTierbox"), get: function (key) { var getSub = function (obj, keys, func) { diff --git a/src/mods/ui.js b/src/mods/ui.js index c4810ee..1488540 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -439,14 +439,14 @@ idrinth.ui = { }; return [ { children: [ - buttonMaker ( idrinth.text.get("ui.importMan"), 'idrinth.raids.import(\'\');' ), - buttonMaker ( idrinth.text.get("ui.importFav"), 'idrinth.raids.import(idrinth.settings.favs);'), - buttonMaker ( idrinth.text.get("ui.reloadGame"), 'idrinth.ui.reloadGame();' ), - buttonMaker ( idrinth.text.get("ui.clearRaids"), 'idrinth.raids.clearAll();' ), - buttonMaker ( idrinth.text.get("ui.reloadScript"), 'idrinth.reload();' ), - buttonMaker ( idrinth.text.get("ui.restartJoin"), 'idrinth.raids.restartInterval();' ), - buttonMaker ( idrinth.text.get("ui.refreshFacebookLogin"), 'idrinth.facebook.rejoin()', 'facebook' ), - buttonMaker ( idrinth.text.get("ui.ngJoin"), 'idrinth.newgrounds.joinRaids()', 'newgrounds' ), + buttonMaker ( 'Import all manually', 'idrinth.raids.import(\'\');' ), + buttonMaker ( 'Import favs manually', 'idrinth.raids.import(idrinth.settings.favs);' ), + buttonMaker ( 'Reload game', 'idrinth.ui.reloadGame();' ), + buttonMaker ( 'Clear Raids', 'idrinth.raids.clearAll();' ), + buttonMaker ( 'Reload Script', 'idrinth.reload();' ), + buttonMaker ( 'Restart Raidjoin', 'idrinth.raids.restartInterval();' ), + buttonMaker ( 'Refresh Facebook Game Login', 'idrinth.facebook.rejoin()', 'facebook' ), + buttonMaker ( 'NG Raid Join(slow!)', 'idrinth.newgrounds.joinRaids()', 'newgrounds' ), buttonMaker ( idrinth.settings.alarmActive ? 'disable timed Autojoin' : 'enable timed Autojoin', 'idrinth.settings.change(\'alarmActive\',!idrinth.settings.alarmActive);this.innerHTML=idrinth.settings.alarmActive?\'disable timed Autojoin\':\'enable timed Autojoin\'', 'newgrounds' ) ] }, { @@ -466,7 +466,7 @@ idrinth.ui = { css: 'idrinth-line', children: [ { type: 'label', - content: idrinth.text.get("ui.enterBossName"), + content: 'Enter Boss\' Name', css: 'idrinth-float-half', attributes: [ { @@ -496,63 +496,63 @@ idrinth.ui = { rType: '#input', type: 'checkbox', platforms: [ 'kongregate' ], - label: idrinth.text.get("ui.enableExtCharInfo") + label: 'Enable extended Characterinformation?' }, { name: 'minimalist', rType: '#input', type: 'checkbox', - label: idrinth.text.get("ui.miniLayout") + label: 'Minimalist Layout' }, { name: 'moveLeft', rType: '#input', type: 'checkbox', - label: idrinth.text.get("ui.moveSetLeft") + label: 'Move settings left' }, { name: 'warBottom', rType: '#input', type: 'checkbox', - label: idrinth.text.get("ui.warBottomPage") + label: 'Show war at the bottom of the page' }, { name: 'landMax', rType: '#input', type: 'checkbox', - label: idrinth.text.get("ui.useGoldUp") + label: 'Check to try and use up the gold as efficient as possible - uncheck to only use the most efficient buy in the land buy calculator' }, { name: 'factor', rType: '#input', type: 'checkbox', - label: idrinth.text.get("ui.buyTenOnce") + label: 'Buy 10 Buildings at once?(Rec)' }, { name: 'timeout', rType: '#input', type: 'number', platforms: [ 'kongregate' ], - label: idrinth.text.get("ui.millisecondsCharInfoAppears") + label: 'Milliseconds until the extended Characterinformation disappears' }, { name: 'newgroundLoad', rType: '#input', type: 'number', platforms: [ 'newgrounds' ], - label: idrinth.text.get("ui.secondsToLoadGame") + label: 'Seconds needed to load the game for joining' }, { name: 'chatting', rType: '#input', type: 'checkbox', - label: idrinth.text.get("ui.enableChat") + label: 'Enable chat(needs script reload)' }, { css: 'idrinth-line', type: 'span', - content: idrinth.text.get("ui.importInfo") + content: 'This script will always import the raids you manually set to be imported on the website and if it\'s enabled it will also import all raids matched by one of the faved searches provided.' }, { name: 'raids', rType: '#input', type: 'checkbox', - label: idrinth.text.get("ui.enableAutoRaidRequest") + label: 'Enable Auto-Raid-Request for Favorites?' }, { name: 'favs', rType: '#input', type: 'text', - label: idrinth.text.get("ui.idsToJoin") + label: 'FavoriteIds to join (separate multiple by comma)' }, { name: 'isWorldServer', rType: '#input', @@ -578,19 +578,19 @@ idrinth.ui = { rType: '#input', type: 'number', platforms: [ 'dawnofthedragons', 'facebook' ], - label: idrinth.text.get("ui.maxPopupsFrame") + label: 'Maximum Popups/Frames for joining raids' }, { name: 'alarmTime', rType: '#input', type: 'text', platforms: [ 'newgrounds' ], - label: idrinth.text.get("ui.timeAutoJoinRaids") + label: 'Time to automatically join raids slowly(reloads game multiple times). Format is [Hours]:[Minutes] without leading zeros, so 7:1 is fine, 07:01 is not' }, { css: 'idrinth-line', type: 'p', children: [ { type: '#text', - content: idrinth.text.get("ui.getSearchFavs") + content: 'Get your search-favorites from ' }, { type: 'a', attributes: [ { From ebb94b14432cbff9d5e9d412ce136c586e7dbe98 Mon Sep 17 00:00:00 2001 From: ardenian Date: Sun, 2 Oct 2016 19:01:46 +0200 Subject: [PATCH 023/341] First lang.js awake lines --- src/mods/lang.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/mods/lang.js b/src/mods/lang.js index b59348b..d54e499 100644 --- a/src/mods/lang.js +++ b/src/mods/lang.js @@ -1,3 +1,11 @@ idrinth.lang = { - + awake: function () { + var language = window.navigator.userLanguage || window.navigator.language; + alert(language); + var file = "" ; // JSON to use, dependent on language + JSON.parse(file); + for (prop in file) { + idrinth.lang.prop = file[prop]; + } + } } \ No newline at end of file From f1a0fed5654e03ce82caeafc2ae7bb4fbfbef260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Mon, 3 Oct 2016 02:09:15 +0200 Subject: [PATCH 024/341] Update and rename English[English].json to en.json fixing code changing name to a more sensible one --- languages/English[English].json | 3 --- languages/en.json | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 languages/English[English].json create mode 100644 languages/en.json diff --git a/languages/English[English].json b/languages/English[English].json deleted file mode 100644 index d177980..0000000 --- a/languages/English[English].json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} diff --git a/languages/en.json b/languages/en.json new file mode 100644 index 0000000..0db3279 --- /dev/null +++ b/languages/en.json @@ -0,0 +1,3 @@ +{ + +} From 7e93553845531c98b4f3344698c474a0383e782c Mon Sep 17 00:00:00 2001 From: ardenian Date: Mon, 3 Oct 2016 13:32:52 +0200 Subject: [PATCH 025/341] Small naming an structure changes in text.js, tier.js and chat.js --- src/mods/chat.js | 16 ++++++++-------- src/mods/text.js | 26 ++++++++++++++------------ src/mods/tier.js | 10 +++++----- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 23c88b6..538edf3 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -754,19 +754,19 @@ idrinth.chat = { }, joinCallback: function ( reply ) { if ( !reply ) { - idrinth.core.alert( idrinth.text.get("chat.message.joinFail") ); + idrinth.core.alert( idrinth.text.get("chat.message.joinFailMoment") ); return; } reply = JSON.parse ( reply ); if ( !reply ) { - idrinth.core.alert( idrinth.text.get("chat.message.joinFail") ); + idrinth.core.alert( idrinth.text.get("chat.message.joinFailMoment") ); return; } if ( !reply.success ) { if ( reply.message ) { idrinth.core.alert ( reply.message ); } else { - idrinth.core.alert( idrinth.text.get("chat.message.joinNotwork") ); + idrinth.core.alert( idrinth.text.get("chat.message.joinFail") ); } return; } @@ -782,10 +782,10 @@ idrinth.chat = { 'chat-service/join/', idrinth.chat.joinCallback, function ( reply ) { - idrinth.core.alert ( idrinth.text.get("chat.message.joinFail") ); + idrinth.core.alert ( idrinth.text.get("chat.message.joinFailMoment") ); }, function ( reply ) { - idrinth.core.alert ( idrinth.text.get("chat.message.joinFail") ); + idrinth.core.alert ( idrinth.text.get("chat.message.joinFailMoment") ); }, JSON.stringify ( { id: document.getElementById ( 'idrinth-add-chat' ).getElementsByTagName ( 'input' )[0].value, @@ -825,12 +825,12 @@ idrinth.chat = { }, loginCallback: function ( data ) { if ( !data ) { - idrinth.core.alert ( idrinth.text.get("chat.message.loginFail")) ); + idrinth.core.alert ( idrinth.text.get("chat.message.loginFailMoment")); return; } data = JSON.parse ( data ); if ( !data ) { - idrinth.core.alert ( idrinth.text.get("chat.message.loginFail") ); + idrinth.core.alert ( idrinth.text.get("chat.message.loginFailMoment") ); return; } if ( !data.success && data.message && data['allow-reg'] ) { @@ -849,7 +849,7 @@ idrinth.chat = { idrinth.chat.join ( data.data ); return; } - idrinth.core.alert( idrinth.text.get("chat.message.loginFail") ); + idrinth.core.alert( idrinth.text.get("chat.message.loginFailMoment") ); }, register: function () { this.loginActions ( 'register' ); diff --git a/src/mods/text.js b/src/mods/text.js index b1edd89..57cc402 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -13,7 +13,7 @@ idrinth.text = { copyIdPasswort: 'Copy Password&Id', moreSettings: 'More settings at ', deleteRoom: 'Delete Room', - leaveRoom: 'Leave Room', + leaveRoom: 'Leave Room' }, message:{ optional: 'This part of the script is optional, so logging in is unneeded for raid catching etc.', @@ -21,30 +21,32 @@ idrinth.text = { offline: "Not logged in, click to login/register", modifyFail:'Can\'t modify that user at the moment', createFail: 'Can\'t create at the moment', - joinFail: 'Can\'t join at the moment', - joinNotwork:'Joining didn\'t work', + joinFailMoment: 'Can\'t join at the moment', + joinFail:'Joining didn\'t work', loginFail: 'Login failed in an unexpected way', - unknown:'The given username for dotd.idrinth.de is unknown, do you want to register it there?', + unknown:'The given username for dotd.idrinth.de is unknown, do you want to register it there?' }, error:{ - errorDefault: 'Unexpected error occurred. Please contact script developers' + default: 'Unexpected error occurred. Please contact script developers' + ' (https://github.com/Idrinth/IDotD).', } }, land: { - lackGold: 'You lack gold to buy any more buildings at the moment.', + lackGold: 'You lack gold to buy any more buildings at the moment.' }, tier: { - diffNormal: 'Normal', - diffHard: 'Hard', - diffLegend: 'Legend', - diffNight: 'Nightmare', + diff:{ + normal:'Normal', + hard:'Hard', + legend:'Legend', + night:'Nightmare' + }, tagTop: 'Tag to screen-top', - alertNoSpaceTierbox: 'There is no space for another tier-box at the moment, please close one first.', + maxBoxes: 'There is no space for another tier-box at the moment, please close one first.' } }, - // idrinth.text.get("tier.alertNoSpaceTierbox"), + // idrinth.text.get("tier.maxBoxes"), get: function (key) { var getSub = function (obj, keys, func) { diff --git a/src/mods/tier.js b/src/mods/tier.js index c08ab6e..59e87c9 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -65,7 +65,7 @@ idrinth.tier = { return make ( key, name ); } } - idrinth.core.alert ( idrinth.text.get("tier.alertNoSpaceTierbox") ); + idrinth.core.alert(idrinth.text.get("tier.maxBoxes")); }, taggedSlots: { }, start: function () { @@ -216,19 +216,19 @@ idrinth.tier = { }, { type: 'th', - content: idrinth.text.get("tier.diffNormal"), + content: idrinth.text.get("tier.diff.normal"), }, { type: 'th', - content: idrinth.text.get("tier.diffHard"), + content: idrinth.text.get("tier.diff.hard"), }, { type: 'th', - content: idrinth.text.get("tier.diffLegend"), + content: idrinth.text.get("tier.diff.legend"), }, { type: 'th', - content: idrinth.text.get("tier.diffNight"), + content: idrinth.text.get("tier.diff.night"), } ] } From f0c522b32702c13d3d4ae87f09eba062e13ddec5 Mon Sep 17 00:00:00 2001 From: ardenian Date: Mon, 3 Oct 2016 13:35:19 +0200 Subject: [PATCH 026/341] Synced for testing current commit --- src/mods/tier.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index 59e87c9..8d0c01a 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -185,7 +185,7 @@ idrinth.tier = { }, { type: 'button', - content: idrinth.text.get("tier.tagTop"), + content: 'Tag to screen-top', attributes: [ { name: 'onclick', From b865164c5a13bdc4aefa5e041117673a2eb040a2 Mon Sep 17 00:00:00 2001 From: ardenian Date: Mon, 3 Oct 2016 14:19:29 +0200 Subject: [PATCH 027/341] ui.js text replacements, work version --- src/mods/lang.js | 3 +- src/mods/text.js | 51 ++++++++++++++++++++++++++++++++-- src/mods/tier.js | 12 ++++---- src/mods/ui.js | 72 ++++++++++++++++++++++++------------------------ 4 files changed, 92 insertions(+), 46 deletions(-) diff --git a/src/mods/lang.js b/src/mods/lang.js index d54e499..7673aa1 100644 --- a/src/mods/lang.js +++ b/src/mods/lang.js @@ -1,9 +1,8 @@ idrinth.lang = { awake: function () { var language = window.navigator.userLanguage || window.navigator.language; - alert(language); var file = "" ; // JSON to use, dependent on language - JSON.parse(file); + file = JSON.parse(file); for (prop in file) { idrinth.lang.prop = file[prop]; } diff --git a/src/mods/text.js b/src/mods/text.js index 57cc402..9793c9e 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -42,11 +42,58 @@ idrinth.text = { night:'Nightmare' }, tagTop: 'Tag to screen-top', - maxBoxes: 'There is no space for another tier-box at the moment, please close one first.' + maxBoxes: 'There is no space for another tier-box at the moment, please close one first.', + disableJoining:'Disable joining for ' + }, + ui: { + button: { + ok: 'Ok', + cancel: 'Cancel', + importManually: 'Import all manually', + importFav: 'Import favs manually', + reloadGame: 'Reload game', + clearRaids: 'Clear Raids', + reloadScript: 'Reload Script', + restartRaidJoin: 'Restart Raidjoin', + refreshFBGameLogin: 'Refresh Facebook Game Login', + ngRaidJoin: 'NG Raid Join(slow!)', + calc:'Calculate', + }, + misc:{ + lastRaidsJoined: 'Last raids joined:', + enterBossName: 'Enter Boss\' Name', + settingInfo:'This script will always import the raids you manually set to be imported on the website and if it\'s enabled it will also import all raids matched by one of the faved searches provided.', + maxPopupsFrame: 'Maximum Popups/Frames for joining raids', + timeAutoJoin:'Time to automatically join raids slowly(reloads game multiple times). Format is [Hours]:[Minutes] without leading zeros, so 7:1 is fine, 07:01 is not', + getFavFrom: 'Get your search-favorites from ', + raidsearch: 'Idrinth\'s Raidsearch', + goldHour: ' gold per hour each', + availGold: 'Avaible Gold', + clickCopy: 'click to copy raid link', + }, + message: { + reloadGameFail: 'The game couldn\'t be reloaded' + }, + setting: { + enableExtendedCharInfo: 'Enable extended Characterinformation?', + minimLayout: 'Minimalist Layout', + moveSettingLeft: 'Move settings left', + warBottomPage: 'Show war at the bottom of the page', + useGoldEfficiently: 'Check to try and use up the gold as efficient as possible - uncheck to only use the most efficient buy in the land buy calculator', + tenBuildOnce: 'Buy 10 Buildings at once?(Rec)', + milliSecondsExtCharInfoDis: 'Milliseconds until the extended Characterinformation disappears', + secondsGameNeedsEnableJoining: 'Seconds needed to load the game for joining', + enableChat: 'Enable chat(needs script reload)', + enableAutoRequestFav: 'Enable Auto-Raid-Request for Favorites?', + favIdToJoin: 'FavoriteIds to join (separate multiple by comma)', + worldserver: 'Worldserver?', + disableAutoJoinSpecific: 'Disable Autojoining for specific raids', + + } } }, - // idrinth.text.get("tier.maxBoxes"), + // idrinth.text.get("ui.setting.clickCopy") get: function (key) { var getSub = function (obj, keys, func) { diff --git a/src/mods/tier.js b/src/mods/tier.js index 8d0c01a..f43e8a5 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -101,7 +101,7 @@ idrinth.tier = { rType: '#input', type: 'checkbox', id: 'idrinth-raid-may-join-list-' + data[key].name, - label: 'Disable joining for ' + data[key].name + label: idrinth.text.get("tier.disableJoining") + data[key].name } ) ); document.getElementById ( 'idrinth-raid-may-join-list' ).lastChild.setAttribute ( 'style', 'background-image:url(https://dotd.idrinth.de/static/raid-image-service/' + data[key].url + '/);' ); @@ -185,7 +185,7 @@ idrinth.tier = { }, { type: 'button', - content: 'Tag to screen-top', + content: idrinth.text.get("tier.tagTop"), attributes: [ { name: 'onclick', @@ -216,19 +216,19 @@ idrinth.tier = { }, { type: 'th', - content: idrinth.text.get("tier.diff.normal"), + content: idrinth.text.get("tier.diff.normal") }, { type: 'th', - content: idrinth.text.get("tier.diff.hard"), + content: idrinth.text.get("tier.diff.normal") }, { type: 'th', - content: idrinth.text.get("tier.diff.legend"), + content: idrinth.text.get("tier.diff.normal") }, { type: 'th', - content: idrinth.text.get("tier.diff.night"), + content: idrinth.text.get("tier.diff.normal") } ] } diff --git a/src/mods/ui.js b/src/mods/ui.js index 1488540..f21b774 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -257,14 +257,14 @@ idrinth.ui = { if ( typeof altFunc === 'string' ) { mod.children[mod.children.length - 1].children = [ { type: 'button', - content: 'Ok', + content: idrinth.text.get("ui.button.ok"), attributes: [ { name: 'onclick', value: closeFunc + altFunc } ] }, { type: 'button', - content: 'Cancel', + content: idrinth.text.get("ui.button.cancel"), attributes: [ { name: 'onclick', value: closeFunc @@ -273,7 +273,7 @@ idrinth.ui = { } else { mod.children[mod.children.length - 1].children = [ { type: 'button', - content: 'Ok', + content: idrinth.text.get("ui.button.ok"), attributes: [ { name: 'onclick', value: closeFunc @@ -377,7 +377,7 @@ idrinth.ui = { handleFrame ( document.getElementById ( 'gamefilearea' ) ); } } catch ( e ) { - idrinth.core.alert ( 'The game couldn\'t be reloaded' ); + idrinth.core.alert ( idrinth.text.get("ui.message.reloadGameFail") ); } }, updateClassesList: function ( element, add, remove ) { @@ -439,20 +439,20 @@ idrinth.ui = { }; return [ { children: [ - buttonMaker ( 'Import all manually', 'idrinth.raids.import(\'\');' ), - buttonMaker ( 'Import favs manually', 'idrinth.raids.import(idrinth.settings.favs);' ), - buttonMaker ( 'Reload game', 'idrinth.ui.reloadGame();' ), - buttonMaker ( 'Clear Raids', 'idrinth.raids.clearAll();' ), - buttonMaker ( 'Reload Script', 'idrinth.reload();' ), - buttonMaker ( 'Restart Raidjoin', 'idrinth.raids.restartInterval();' ), - buttonMaker ( 'Refresh Facebook Game Login', 'idrinth.facebook.rejoin()', 'facebook' ), - buttonMaker ( 'NG Raid Join(slow!)', 'idrinth.newgrounds.joinRaids()', 'newgrounds' ), + buttonMaker ( idrinth.text.get("ui.button.importManually"), 'idrinth.raids.import(\'\');' ), + buttonMaker ( idrinth.text.get("ui.button.importFav"), 'idrinth.raids.import(idrinth.settings.favs);' ), + buttonMaker ( idrinth.text.get("ui.button.reloadGame"), 'idrinth.ui.reloadGame();' ), + buttonMaker ( idrinth.text.get("ui.button.clearRaids"), 'idrinth.raids.clearAll();' ), + buttonMaker ( idrinth.text.get("ui.button.reloadScript"), 'idrinth.reload();' ), + buttonMaker ( idrinth.text.get("ui.button.restartRaidJoin"), 'idrinth.raids.restartInterval();' ), + buttonMaker ( idrinth.text.get("ui.button.refreshFBGameLogin"), 'idrinth.facebook.rejoin()', 'facebook' ), + buttonMaker ( idrinth.text.get("ui.button.ngRaidJoin"), 'idrinth.newgrounds.joinRaids()', 'newgrounds' ), buttonMaker ( idrinth.settings.alarmActive ? 'disable timed Autojoin' : 'enable timed Autojoin', 'idrinth.settings.change(\'alarmActive\',!idrinth.settings.alarmActive);this.innerHTML=idrinth.settings.alarmActive?\'disable timed Autojoin\':\'enable timed Autojoin\'', 'newgrounds' ) ] }, { css: 'idrinth-line', id: 'idrinth-joined-raids', - content: 'Last raids joined:', + content: idrinth.text.get("ui.misc.lastRaidsJoined"), children: [ { type: 'ul' @@ -466,7 +466,7 @@ idrinth.ui = { css: 'idrinth-line', children: [ { type: 'label', - content: 'Enter Boss\' Name', + content: idrinth.text.get("ui.misc.enterBossName"), css: 'idrinth-float-half', attributes: [ { @@ -496,68 +496,68 @@ idrinth.ui = { rType: '#input', type: 'checkbox', platforms: [ 'kongregate' ], - label: 'Enable extended Characterinformation?' + label: idrinth.text.get("ui.setting.enableExtendedCharInfo") }, { name: 'minimalist', rType: '#input', type: 'checkbox', - label: 'Minimalist Layout' + label: idrinth.text.get("ui.setting.minimLayout") }, { name: 'moveLeft', rType: '#input', type: 'checkbox', - label: 'Move settings left' + label: idrinth.text.get("ui.setting.moveSettingLeft") }, { name: 'warBottom', rType: '#input', type: 'checkbox', - label: 'Show war at the bottom of the page' + label: idrinth.text.get("ui.setting.warBottomPage") }, { name: 'landMax', rType: '#input', type: 'checkbox', - label: 'Check to try and use up the gold as efficient as possible - uncheck to only use the most efficient buy in the land buy calculator' + label: idrinth.text.get("ui.setting.useGoldEfficiently") }, { name: 'factor', rType: '#input', type: 'checkbox', - label: 'Buy 10 Buildings at once?(Rec)' + label: idrinth.text.get("ui.setting.tenBuildOnce") }, { name: 'timeout', rType: '#input', type: 'number', platforms: [ 'kongregate' ], - label: 'Milliseconds until the extended Characterinformation disappears' + label: idrinth.text.get("ui.setting.milliSecondsExtCharInfoDis") }, { name: 'newgroundLoad', rType: '#input', type: 'number', platforms: [ 'newgrounds' ], - label: 'Seconds needed to load the game for joining' + label: idrinth.text.get("ui.setting.secondsGameNeedsEnableJoining") }, { name: 'chatting', rType: '#input', type: 'checkbox', - label: 'Enable chat(needs script reload)' + label: idrinth.text.get("ui.setting.enableChat") }, { css: 'idrinth-line', type: 'span', - content: 'This script will always import the raids you manually set to be imported on the website and if it\'s enabled it will also import all raids matched by one of the faved searches provided.' + content: idrinth.text.get("ui.misc.settingInfo") }, { name: 'raids', rType: '#input', type: 'checkbox', - label: 'Enable Auto-Raid-Request for Favorites?' + label: idrinth.text.get("ui.setting.enableAutoRequestFav") }, { name: 'favs', rType: '#input', type: 'text', - label: 'FavoriteIds to join (separate multiple by comma)' + label: idrinth.text.get("ui.setting.favIdToJoin") }, { name: 'isWorldServer', rType: '#input', type: 'checkbox', - label: 'Worldserver?' + label: idrinth.text.get("ui.setting.worldserver") }, { name: 'notification#mention', rType: '#input', @@ -578,19 +578,19 @@ idrinth.ui = { rType: '#input', type: 'number', platforms: [ 'dawnofthedragons', 'facebook' ], - label: 'Maximum Popups/Frames for joining raids' + label: idrinth.text.get("ui.misc.maxPopupsFrame") }, { name: 'alarmTime', rType: '#input', type: 'text', platforms: [ 'newgrounds' ], - label: 'Time to automatically join raids slowly(reloads game multiple times). Format is [Hours]:[Minutes] without leading zeros, so 7:1 is fine, 07:01 is not' + label: idrinth.text.get("ui.misc.timeAutoJoin") }, { css: 'idrinth-line', type: 'p', children: [ { type: '#text', - content: 'Get your search-favorites from ' + content: idrinth.text.get("ui.misc.getFavFrom") }, { type: 'a', attributes: [ { @@ -600,7 +600,7 @@ idrinth.ui = { name: 'target', value: '_blank' } ], - content: 'Idrinth\'s Raidsearch' + content: idrinth.text.get("ui.misc.raidsearch") } ] } ]; }; @@ -634,7 +634,7 @@ idrinth.ui = { attributes: [ { name: 'title', - value: idrinth.land.data[label.toLowerCase ()].perHour + ' gold per hour each' + value: idrinth.land.data[label.toLowerCase()].perHour + idrinth.text.get("ui.misc.goldHour") } ] }; @@ -666,7 +666,7 @@ idrinth.ui = { type: 'tr', children: [ { type: 'th', - content: 'Avaible Gold' + content: idrinth.text.get("ui.misc.availGold") }, { type: 'td', children: [ { @@ -687,7 +687,7 @@ idrinth.ui = { type: 'td', children: [ { type: 'button', - content: 'Calculate', + content: idrinth.text.get("ui.button.calc"), attributes: [ { name: 'onclick', @@ -761,12 +761,12 @@ idrinth.ui = { }; var buildRaidJoinList = function () { return [ { - content: 'click to copy raid link', + content: idrinth.text.get("ui.setting.clickCopy"), type: 'strong' }, { id: 'idrinth-raid-link-list' }, { - content: 'Disable Autojoining for specific raids', + content: idrinth.text.get("ui.setting.disableAutoJoinSpecific"), type: 'strong' }, { id: 'idrinth-raid-may-join-list' From 6d6efdf9ffc5bbe908bf768dcdcdbb62f3ae8275 Mon Sep 17 00:00:00 2001 From: ardenian Date: Mon, 3 Oct 2016 14:33:13 +0200 Subject: [PATCH 028/341] Minor test edits in lang.js --- src/mods/lang.js | 6 +++--- src/mods/text.js | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mods/lang.js b/src/mods/lang.js index 7673aa1..2b0b130 100644 --- a/src/mods/lang.js +++ b/src/mods/lang.js @@ -1,10 +1,10 @@ idrinth.lang = { - awake: function () { + start: function () { var language = window.navigator.userLanguage || window.navigator.language; var file = "" ; // JSON to use, dependent on language file = JSON.parse(file); - for (prop in file) { - idrinth.lang.prop = file[prop]; + for (var prop in file) { + idrinth.lang[prop] = file[prop]; } } } \ No newline at end of file diff --git a/src/mods/text.js b/src/mods/text.js index 9793c9e..f981145 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -28,7 +28,7 @@ idrinth.text = { }, error:{ default: 'Unexpected error occurred. Please contact script developers' - + ' (https://github.com/Idrinth/IDotD).', + + ' (https://github.com/Idrinth/IDotD).' } }, land: { @@ -57,7 +57,7 @@ idrinth.text = { restartRaidJoin: 'Restart Raidjoin', refreshFBGameLogin: 'Refresh Facebook Game Login', ngRaidJoin: 'NG Raid Join(slow!)', - calc:'Calculate', + calc:'Calculate' }, misc:{ lastRaidsJoined: 'Last raids joined:', @@ -69,7 +69,7 @@ idrinth.text = { raidsearch: 'Idrinth\'s Raidsearch', goldHour: ' gold per hour each', availGold: 'Avaible Gold', - clickCopy: 'click to copy raid link', + clickCopy: 'click to copy raid link' }, message: { reloadGameFail: 'The game couldn\'t be reloaded' @@ -87,10 +87,10 @@ idrinth.text = { enableAutoRequestFav: 'Enable Auto-Raid-Request for Favorites?', favIdToJoin: 'FavoriteIds to join (separate multiple by comma)', worldserver: 'Worldserver?', - disableAutoJoinSpecific: 'Disable Autojoining for specific raids', - + disableAutoJoinSpecific: 'Disable Autojoining for specific raids' } } + }, // idrinth.text.get("ui.setting.clickCopy") From 10a365dd10e20cf789b13a9589e467a38ae79f15 Mon Sep 17 00:00:00 2001 From: ardenian Date: Mon, 3 Oct 2016 19:12:48 +0200 Subject: [PATCH 029/341] Changing code style to ( hopefully) correct one --- src/mods/chat.js | 880 +++++++++++++++++++++++------------------------ src/mods/lang.js | 6 +- src/mods/text.js | 48 +-- 3 files changed, 467 insertions(+), 467 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 538edf3..30d4e37 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -1,55 +1,55 @@ idrinth.chat = { self: 0, maxId: 0, - messages: [ ], - oldMessages: [ ], + messages: [], + oldMessages: [], elements: { chats: null, menu: null }, - chatRank: { }, + chatRank: {}, refreshCount: 0, refreshChats: function () { - idrinth.chat.oldMessages = JSON.parse ( JSON.stringify ( idrinth.chat.messages ) ); - idrinth.chat.messages = [ ]; - idrinth.core.ajax.runHome ( + idrinth.chat.oldMessages = JSON.parse( JSON.stringify( idrinth.chat.messages ) ); + idrinth.chat.messages = []; + idrinth.core.ajax.runHome( 'chat-service/update/', idrinth.chat.applyMessages, idrinth.chat.returnMessages, idrinth.chat.returnMessages, - JSON.stringify ( { + JSON.stringify( { maxId: idrinth.chat.maxId, messages: idrinth.chat.oldMessages } ) ); if ( idrinth.chat.refreshCount % 25 === 0 ) { - idrinth.chat.refreshMembers (); + idrinth.chat.refreshMembers(); } idrinth.chat.refreshCount++; }, refreshMembers: function () { - idrinth.core.ajax.runHome ( + idrinth.core.ajax.runHome( 'chat-service/accounts/', idrinth.chat.applyMembers, function () { - window.setTimeout ( idrinth.chat.refreshMembers, 1000 ); + window.setTimeout( idrinth.chat.refreshMembers, 1000 ); }, function () { - window.setTimeout ( idrinth.chat.refreshMembers, 1000 ); + window.setTimeout( idrinth.chat.refreshMembers, 1000 ); }, '' ); }, returnMessages: function ( data ) { - for (var count = idrinth.chat.oldMessages.length - 1; count >= 0; count--) { - idrinth.chat.messages.unshift ( idrinth.chat.oldMessages[count] ); + for ( var count = idrinth.chat.oldMessages.length - 1; count >= 0; count-- ) { + idrinth.chat.messages.unshift( idrinth.chat.oldMessages[count] ); } - idrinth.chat.oldMessages = [ ]; - window.setTimeout ( idrinth.chat.refreshChats, 999 ); + idrinth.chat.oldMessages = []; + window.setTimeout( idrinth.chat.refreshChats, 999 ); }, userclick: function ( element, user, chat ) { 'use strict'; - if ( !idrinth.chat.chatRank[chat][idrinth.chat.self] || parseInt ( user, 10 ) === parseInt ( idrinth.chat.self, 10 ) ) { + if ( !idrinth.chat.chatRank[chat][idrinth.chat.self] || parseInt( user, 10 ) === parseInt( idrinth.chat.self, 10 ) ) { return; } var getPopupContent = function ( chat, user, rankId ) { @@ -80,12 +80,12 @@ idrinth.chat = { requiredRank: 3 } ]; - for (var chatId in idrinth.chat.chatRank) { - var intChatId = parseInt ( chatId, 10 ); - if ( document.getElementById ( 'idrinth-chat-tab-click-' + chatId ) && intChatId !== chat && intChatId > 1 && !( user in idrinth.chat.chatRank[chatId] ) ) { - promotionModes.push ( { + for ( var chatId in idrinth.chat.chatRank ) { + var intChatId = parseInt( chatId, 10 ); + if ( document.getElementById( 'idrinth-chat-tab-click-' + chatId ) && intChatId !== chat && intChatId > 1 && !( user in idrinth.chat.chatRank[chatId] ) ) { + promotionModes.push( { chat: chatId, - label: 'Invite to Chat ' + document.getElementById('idrinth-chat-tab-click-' + chatId).innerHTML, + label: 'Invite to Chat ' + document.getElementById( 'idrinth-chat-tab-click-' + chatId ).innerHTML, rank: 'User', requiredRank: 1 } ); @@ -97,70 +97,70 @@ idrinth.chat = { var hasRights = function ( reqRank, ownRank ) { return reqRank <= ownRank; }; - if ( !hasRights ( node.requiredRank, ownRank ) ) { + if ( !hasRights( node.requiredRank, ownRank ) ) { return; } return { content: node.label, type: 'li', - attributes: [ { - name: 'onclick', - value: 'idrinth.chat.useroptions(' + node.chat + ',' + user + ',\'' + node.rank + '\');' - + 'this.parentNode.parentNode.removeChild(this.parentNode);' - } ] + attributes: [{ + name: 'onclick', + value: 'idrinth.chat.useroptions(' + node.chat + ',' + user + ',\'' + node.rank + '\');' + + 'this.parentNode.parentNode.removeChild(this.parentNode);' + }] }; }; - var popupContent = [ ]; - var promotionModes = getPromotionOptions ( parseInt ( chat, 10 ), user ); - for (var count = 0; count < promotionModes.length; count++) { - var tmp = promoteNode ( promotionModes[count], user, rankId ); + var popupContent = []; + var promotionModes = getPromotionOptions( parseInt( chat, 10 ), user ); + for ( var count = 0; count < promotionModes.length; count++ ) { + var tmp = promoteNode( promotionModes[count], user, rankId ); if ( tmp ) { - popupContent.push ( tmp ); + popupContent.push( tmp ); } } return popupContent; }; - var rankId = parseInt ( idrinth.chat.chatRank[chat][idrinth.chat.self], 10 ); - var popupContent = getPopupContent ( chat, user, rankId ); + var rankId = parseInt( idrinth.chat.chatRank[chat][idrinth.chat.self], 10 ); + var popupContent = getPopupContent( chat, user, rankId ); if ( popupContent.length === 0 ) { return; } - popupContent.push ( { + popupContent.push( { type: 'li', content: 'Close', - attributes: [ { - name: 'onclick', - value: 'this.parentNode.parentNode.removeChild(this.parentNode);' - } ] + attributes: [{ + name: 'onclick', + value: 'this.parentNode.parentNode.removeChild(this.parentNode);' + }] } ); - idrinth.ui.body.appendChild ( idrinth.ui.buildElement ( { + idrinth.ui.body.appendChild( idrinth.ui.buildElement( { type: 'ul', children: popupContent, css: 'idrinth-userinfo-box', - attributes: [ { - name: 'style', - value: idrinth.ui.getElementPositioning ( element ) - } ] + attributes: [{ + name: 'style', + value: idrinth.ui.getElementPositioning( element ) + }] } ) ); }, useroptions: function ( chat, user, rank ) { - idrinth.core.ajax.runHome ( + idrinth.core.ajax.runHome( 'chat-service/rank/', function ( reply ) { try { - reply = JSON.parse ( reply ); - idrinth.core.alert ( reply.message ); + reply = JSON.parse( reply ); + idrinth.core.alert( reply.message ); } catch ( e ) { - idrinth.core.log ( e ); + idrinth.core.log( e ); } }, function ( reply ) { - idrinth.core.alert ( idrinth.text.get("chat.message.modifyFail") ); + idrinth.core.alert( idrinth.text.get( "chat.message.modifyFail" ) ); }, function ( reply ) { - idrinth.core.alert ( idrinth.text.get("chat.message.modifyFail") ); + idrinth.core.alert( idrinth.text.get( "chat.message.modifyFail" ) ); }, - JSON.stringify ( { + JSON.stringify( { chat: chat, user: user, access: rank @@ -171,95 +171,95 @@ idrinth.chat = { var complexHandler = function ( message, regex, callbacks, lastField ) { var partHandler = function ( count, callbacks, text, textcontent ) { var callbackHandler = function ( textcontent, func, text ) { - var tmp = func ( text ); - for (var c2 = 0; c2 < tmp.length; c2++) { + var tmp = func( text ); + for ( var c2 = 0; c2 < tmp.length; c2++ ) { if ( tmp[c2] !== undefined ) { - textcontent.push ( tmp[c2] ); + textcontent.push( tmp[c2] ); } } return textcontent; }; if ( count % 2 === 0 && typeof callbacks[1] === 'function' ) { - textcontent = callbackHandler ( textcontent, callbacks[1], text[Math.ceil ( count / 2 )] ); - } else if ( count % 2 === 0 && text[Math.ceil ( count / 2 )] !== undefined ) { - textcontent.push ( { + textcontent = callbackHandler( textcontent, callbacks[1], text[Math.ceil( count / 2 )] ); + } else if ( count % 2 === 0 && text[Math.ceil( count / 2 )] !== undefined ) { + textcontent.push( { type: '#text', - content: text[Math.ceil ( count / 2 )] + content: text[Math.ceil( count / 2 )] } ); } else { - textcontent.push ( callbacks[0] ( matches[Math.ceil ( ( count - 1 ) / 2 )] ) ); + textcontent.push( callbacks[0]( matches[Math.ceil(( count - 1 ) / 2 )] ) ); } return textcontent; }; - var matches = message.match ( regex ); - var text = ( message.replace ( regex, '$1########$' + lastField ) ).split ( '########' ); - var textcontent = [ ]; - var length = ( matches && Array.isArray ( matches ) ? matches.length : 0 ) + ( text && Array.isArray ( text ) ? text.length : 0 ); - for (var count = 0; count < length; count++) { - textcontent = partHandler ( count, callbacks, text, textcontent ); + var matches = message.match( regex ); + var text = ( message.replace( regex, '$1########$' + lastField ) ).split( '########' ); + var textcontent = []; + var length = ( matches && Array.isArray( matches ) ? matches.length : 0 ) + ( text && Array.isArray( text ) ? text.length : 0 ); + for ( var count = 0; count < length; count++ ) { + textcontent = partHandler( count, callbacks, text, textcontent ); } return textcontent; }; var simpleHandler = function ( message, callbacks ) { if ( typeof callbacks[1] === 'function' ) { - var textcontent = [ ]; - var tmp = callbacks[1] ( message ); - for (var c2 = 0; c2 < tmp.length; c2++) { - textcontent.push ( tmp[c2] ); + var textcontent = []; + var tmp = callbacks[1]( message ); + for ( var c2 = 0; c2 < tmp.length; c2++ ) { + textcontent.push( tmp[c2] ); } return textcontent; } - return [ { - type: '#text', - content: message - } ]; + return [{ + type: '#text', + content: message + }]; }; try { - return complexHandler ( message, regex, callbacks, lastField ); + return complexHandler( message, regex, callbacks, lastField ); } catch ( e ) { - return simpleHandler ( message, callbacks ); + return simpleHandler( message, callbacks ); } }, buildEmoticons: function ( message ) { if ( !idrinth.chat.emotes.lookup ) { return message; } - var part = idrinth.core.escapeRegExp ( Object.keys ( idrinth.chat.emotes.lookup ).join ( 'TTTT' ) ); - var reg = new RegExp ( '(^| )(' + part.replace ( /TTTT/g, '|' ) + ')($| )', 'g' ); - return idrinth.chat.replaceInText ( message, reg, [ function ( match ) { - var el = idrinth.chat.emotes.positions[idrinth.chat.emotes.lookup[match.replace ( / /g, '' )]]; - return { - type: 'span', - css: 'idrinth-emoticon', - attributes: [ - { + var part = idrinth.core.escapeRegExp( Object.keys( idrinth.chat.emotes.lookup ).join( 'TTTT' ) ); + var reg = new RegExp( '(^| )(' + part.replace( /TTTT/g, '|' ) + ')($| )', 'g' ); + return idrinth.chat.replaceInText( message, reg, [function ( match ) { + var el = idrinth.chat.emotes.positions[idrinth.chat.emotes.lookup[match.replace( / /g, '' )]]; + return { + type: 'span', + css: 'idrinth-emoticon', + attributes: [ + { + name: 'style', + value: 'background-position: 0px -' + el / 8 + 'px;' + }, + { + name: 'title', + value: message + } + ], + children: [ + { + type: 'span', + attributes: [{ name: 'style', - value: 'background-position: 0px -' + el / 8 + 'px;' - }, - { - name: 'title', - value: message - } - ], - children: [ - { - type: 'span', - attributes: [ { - name: 'style', - value: 'background-position: 0px -' + el / 2 + 'px;' - } ] - } - ] - }; - } ], 3 ); + value: 'background-position: 0px -' + el / 2 + 'px;' + }] + } + ] + }; + }], 3 ); }, buildMessageText: function ( message ) { - var reg = new RegExp ( '(^|\\W)(https?://([^/ ]+)(/.*?)?)($| )', 'ig' ); - return idrinth.chat.replaceInText ( message, reg, [ + var reg = new RegExp( '(^|\\W)(https?://([^/ ]+)(/.*?)?)($| )', 'ig' ); + return idrinth.chat.replaceInText( message, reg, [ function ( match ) { return { type: 'a', - content: match.match ( /:\/\/([^\/]+?)(\/|$)/ )[1], + content: match.match( /:\/\/([^\/]+?)(\/|$)/ )[1], attributes: [ { name: 'href', @@ -275,80 +275,80 @@ idrinth.chat = { } ] }; - }, idrinth.chat.buildEmoticons ], 5 ); + }, idrinth.chat.buildEmoticons], 5 ); }, applyMessages: function ( data ) { var processMessages = function ( messages ) { var addMessages = function ( chatMessages, chatId, chatElement ) { var buildMessage = function ( message, chat, chatId, messageId ) { var getfullDateInt = function () { - function addZero ( x, n ) { - while ( x.toString ().length < n ) { + function addZero( x, n ) { + while ( x.toString().length < n ) { x = "0" + x; } return x; } - var d = new Date (); - return addZero ( d.getFullYear (), 2 ) + - addZero ( d.getMonth (), 2 ) + - addZero ( d.getDate (), 2 ) + - addZero ( d.getHours (), 2 ) + - addZero ( d.getMinutes (), 2 ) + - addZero ( d.getSeconds (), 2 ) + - addZero ( d.getMilliseconds (), 3 ); + var d = new Date(); + return addZero( d.getFullYear(), 2 ) + + addZero( d.getMonth(), 2 ) + + addZero( d.getDate(), 2 ) + + addZero( d.getHours(), 2 ) + + addZero( d.getMinutes(), 2 ) + + addZero( d.getSeconds(), 2 ) + + addZero( d.getMilliseconds(), 3 ); }; var notify = function ( message, own, chatId ) { var notActive = function ( chatId ) { try { return !idrinth.windowactive || - !( document.getElementById ( 'idrinth-chat-tab-click-' + chatId ).getAttribute ( 'class' ) ).match ( /(\s|^)active( |$)/ ) || - !( document.getElementById ( 'idrinth-chat' ).getAttribute ( 'class' ) ).match ( /(\s|^)active( |$)/ ); + !( document.getElementById( 'idrinth-chat-tab-click-' + chatId ).getAttribute( 'class' ) ).match( /(\s|^)active( |$)/ ) || + !( document.getElementById( 'idrinth-chat' ).getAttribute( 'class' ) ).match( /(\s|^)active( |$)/ ); } catch ( e ) { - idrinth.core.log ( e.getMessage ); + idrinth.core.log( e.getMessage ); return true; } }; var messageAllowed = function ( text ) { try { - return ( idrinth.settings.notification.message && text.match ( /\{[A-Z]{2}-Raid / ) === null ) || - ( idrinth.settings.notification.mention && text.match ( new RegExp ( '(\s|^)' + idrinth.core.escapeRegExp ( idrinth.chat.users[idrinth.chat.self].name ) + '(\s|$)', 'i' ) ) !== null ) || - ( idrinth.settings.notification.raid && text.match ( /\{[A-Z]{2}-Raid / ) !== null ); + return ( idrinth.settings.notification.message && text.match( /\{[A-Z]{2}-Raid / ) === null ) || + ( idrinth.settings.notification.mention && text.match( new RegExp( '(\s|^)' + idrinth.core.escapeRegExp( idrinth.chat.users[idrinth.chat.self].name ) + '(\s|$)', 'i' ) ) !== null ) || + ( idrinth.settings.notification.raid && text.match( /\{[A-Z]{2}-Raid / ) !== null ); } catch ( e ) { - idrinth.core.log ( e.getMessage ( ) ); + idrinth.core.log( e.getMessage() ); return false; } }; - if ( !own && notActive ( chatId ) && messageAllowed ( message.text ) ) { + if ( !own && notActive( chatId ) && messageAllowed( message.text ) ) { try { - idrinth.core.sendNotification ( - message.time.split ( ' ' )[1] + ' ' + document.getElementById ( 'idrinth-chat-tab-click-' + chatId ).innerHTML + ':', + idrinth.core.sendNotification( + message.time.split( ' ' )[1] + ' ' + document.getElementById( 'idrinth-chat-tab-click-' + chatId ).innerHTML + ':', idrinth.chat.users[message.user].name + ': ' + message.text ); } catch ( exception ) { - idrinth.core.log ( exception.getMessage () ); + idrinth.core.log( exception.getMessage() ); } } }; - var own = parseInt ( message.user, 10 ) === parseInt ( idrinth.chat.self, 10 ); - notify ( message, own, chatId ); - chat.appendChild ( idrinth.ui.buildElement ( + var own = parseInt( message.user, 10 ) === parseInt( idrinth.chat.self, 10 ); + notify( message, own, chatId ); + chat.appendChild( idrinth.ui.buildElement( { type: 'li', - id: 'idrinth-single-chat-message-' + messageId + ( parseInt ( messageId, 10 ) < 1 ? '-' + getfullDateInt () : '' ), + id: 'idrinth-single-chat-message-' + messageId + ( parseInt( messageId, 10 ) < 1 ? '-' + getfullDateInt() : '' ), css: own ? 'self-written ' : '', children: [ { type: 'span', css: 'time', - content: message.time.split ( ' ' )[1], - attributes: [ { - name: 'title', - value: message.time - } ] + content: message.time.split( ' ' )[1], + attributes: [{ + name: 'title', + value: message.time + }] }, { type: 'span', - css: 'user ' + idrinth.chat.ranks[parseInt ( idrinth.chat.chatRank[chatId][message.user], 10 )] + ( message.user === 0 ? ' system-message' : '' ), + css: 'user ' + idrinth.chat.ranks[parseInt( idrinth.chat.chatRank[chatId][message.user], 10 )] + ( message.user === 0 ? ' system-message' : '' ), content: idrinth.chat.users[message.user].name, attributes: [ { @@ -367,18 +367,18 @@ idrinth.chat = { }, { type: 'span', - children: idrinth.chat.buildMessageText ( message.text ) + children: idrinth.chat.buildMessageText( message.text ) } ] } ) ); }; var isNew = false; - for (var messageId in chatMessages) { - if ( parseInt ( messageId, 10 ) < 1 || !document.getElementById ( 'idrinth-single-chat-message-' + messageId ) ) { + for ( var messageId in chatMessages ) { + if ( parseInt( messageId, 10 ) < 1 || !document.getElementById( 'idrinth-single-chat-message-' + messageId ) ) { isNew = true; - buildMessage ( messages[chatId][messageId], chatElement, chatId, messageId ); - if ( parseInt ( messageId, 10 ) > parseInt ( idrinth.chat.maxId, 10 ) ) { + buildMessage( messages[chatId][messageId], chatElement, chatId, messageId ); + if ( parseInt( messageId, 10 ) > parseInt( idrinth.chat.maxId, 10 ) ) { idrinth.chat.maxId = messageId; } } @@ -387,22 +387,22 @@ idrinth.chat = { }; var setChatClass = function ( isNew, chat, chatId ) { var isActive = function ( element ) { - var cssClass = element.getAttribute ( 'class' ); - return !( !cssClass ) && !( !cssClass.match ( /(^|\s)active(\s|$)/ ) ); + var cssClass = element.getAttribute( 'class' ); + return !( !cssClass ) && !( !cssClass.match( /(^|\s)active(\s|$)/ ) ); }; - var chatActive = isActive ( document.getElementById ( 'idrinth-chat' ) ); + var chatActive = isActive( document.getElementById( 'idrinth-chat' ) ); if ( isNew && !chatActive ) { - document.getElementById ( 'idrinth-chat' ).setAttribute ( 'class', 'new-message' ); + document.getElementById( 'idrinth-chat' ).setAttribute( 'class', 'new-message' ); } - var tab = document.getElementById ( 'idrinth-chat-tab-click-' + chatId ); - var tabActive = isActive ( tab ); + var tab = document.getElementById( 'idrinth-chat-tab-click-' + chatId ); + var tabActive = isActive( tab ); if ( isNew && !tabActive ) { - tab.setAttribute ( 'class', tab.getAttribute ( 'class' ) + ' new-message' ); + tab.setAttribute( 'class', tab.getAttribute( 'class' ) + ' new-message' ); } else if ( tabActive && chatActive && chat.lastChild.scrollTop < chat.lastChild.scrollHeight ) { try { - chat.lastChild.scrollIntoView ( false ); + chat.lastChild.scrollIntoView( false ); } catch ( e ) { - idrinth.core.log ( e ); + idrinth.core.log( e ); } chat.lastChild.scrollTop = chat.lastChild.scrollHeight; } @@ -410,46 +410,46 @@ idrinth.chat = { if ( idrinth.chat.maxId === 0 ) { idrinth.chat.maxId = 1; } - for (var key in messages) { + for ( var key in messages ) { if ( - !isNaN ( parseInt ( key, 10 ) ) - && document.getElementById ( 'idrinth-chat-tab-' + key ) - && document.getElementById ( 'idrinth-chat-tab-' + key ).getElementsByTagName ( 'ul' )[1] ) { - var chat = document.getElementById ( 'idrinth-chat-tab-' + key ).getElementsByTagName ( 'ul' )[1]; - setChatClass ( addMessages ( messages[key], key, chat ), chat, key ); + !isNaN( parseInt( key, 10 ) ) + && document.getElementById( 'idrinth-chat-tab-' + key ) + && document.getElementById( 'idrinth-chat-tab-' + key ).getElementsByTagName( 'ul' )[1] ) { + var chat = document.getElementById( 'idrinth-chat-tab-' + key ).getElementsByTagName( 'ul' )[1]; + setChatClass( addMessages( messages[key], key, chat ), chat, key ); } } }; if ( !data ) { - return idrinth.chat.returnMessages ( data ); + return idrinth.chat.returnMessages( data ); } - data = JSON.parse ( data ); + data = JSON.parse( data ); if ( !data ) { - return idrinth.chat.returnMessages ( data ); + return idrinth.chat.returnMessages( data ); } if ( data.login ) { - return idrinth.chat.relogin (); + return idrinth.chat.relogin(); } if ( data.messages ) { - processMessages ( data.messages ); + processMessages( data.messages ); } - idrinth.chat.oldMessages = [ ]; - idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 999 ); + idrinth.chat.oldMessages = []; + idrinth.chat.updateTimeout = window.setTimeout( idrinth.chat.refreshChats, 999 ); }, - ranks: [ '', 'banned', 'user', 'mod', 'owner' ], + ranks: ['', 'banned', 'user', 'mod', 'owner'], applyMembers: function ( data ) { var applyMemberData = function () { var addMemberElement = function ( chat, chatId, userId ) { var usedPlatforms = ''; - for (var pkey in idrinth.chat.users[userId].platforms) { + for ( var pkey in idrinth.chat.users[userId].platforms ) { if ( idrinth.chat.users[userId].platforms[pkey] ) { usedPlatforms += pkey; } } - chat.appendChild ( idrinth.ui.buildElement ( { + chat.appendChild( idrinth.ui.buildElement( { type: 'li', - css: 'user ' + idrinth.chat.ranks[parseInt ( idrinth.chat.chatRank[chatId][userId], 10 )], - content: ( usedPlatforms === '' ? '' : '[' + usedPlatforms.toUpperCase () + '] ' ) + idrinth.chat.users[userId].name, + css: 'user ' + idrinth.chat.ranks[parseInt( idrinth.chat.chatRank[chatId][userId], 10 )], + content: ( usedPlatforms === '' ? '' : '[' + usedPlatforms.toUpperCase() + '] ' ) + idrinth.chat.users[userId].name, attributes: [ { name: 'data-id', @@ -463,33 +463,33 @@ idrinth.chat = { } ) ); }; - for (var chatId in idrinth.chat.chatRank) { - if ( document.getElementById ( 'idrinth-chat-tab-' + chatId ) ) { - var chat = document.getElementById ( 'idrinth-chat-tab-' + chatId ).getElementsByTagName ( 'ul' )[0]; + for ( var chatId in idrinth.chat.chatRank ) { + if ( document.getElementById( 'idrinth-chat-tab-' + chatId ) ) { + var chat = document.getElementById( 'idrinth-chat-tab-' + chatId ).getElementsByTagName( 'ul' )[0]; while ( chat.firstChild ) { - chat.removeChild ( chat.firstChild ); + chat.removeChild( chat.firstChild ); } - for (var userId in idrinth.chat.chatRank[chatId]) { - if ( idrinth.chat.chatRank[chatId].hasOwnProperty ( userId ) ) { - addMemberElement ( chat, chatId, userId ); + for ( var userId in idrinth.chat.chatRank[chatId] ) { + if ( idrinth.chat.chatRank[chatId].hasOwnProperty( userId ) ) { + addMemberElement( chat, chatId, userId ); } } } } }; if ( !data ) { - return idrinth.chat.returnMessages ( data ); + return idrinth.chat.returnMessages( data ); } - data = JSON.parse ( data ); + data = JSON.parse( data ); if ( !data ) { - return idrinth.chat.returnMessages ( data ); + return idrinth.chat.returnMessages( data ); } idrinth.chat.self = data.self; idrinth.chat.users = data.users; idrinth.chat.chatRank = data.members; - applyMemberData (); + applyMemberData(); }, - emotes: { }, + emotes: {}, start: function () { var build = function () { var makeInput = function ( label ) { @@ -537,165 +537,165 @@ idrinth.chat = { ] }; }; - return idrinth.ui.buildElement ( { + return idrinth.ui.buildElement( { id: 'idrinth-chat', css: 'idrinth-hovering-box' + ( !idrinth.settings.chatHiddenOnStart ? ' active' : '' ) + ( idrinth.settings.moveLeft ? ' left-sided' : '' ), children: [ { type: 'button', content: ( idrinth.settings.chatHiddenOnStart ? '<<' : '>>' ), - attributes: [ { - name: 'onclick', - value: 'idrinth.chat.openCloseChat(this);' - } ] + attributes: [{ + name: 'onclick', + value: 'idrinth.chat.openCloseChat(this);' + }] }, { type: 'ul', css: 'styles-scrollbar chat-labels', - children: [ { - type: 'li', - css: 'active', - content: "\u2699", - attributes: [ - { - name: 'onclick', - value: 'idrinth.chat.enableChat(this);' - }, - { - name: 'data-id', - value: '0' - } - ] - } ] + children: [{ + type: 'li', + css: 'active', + content: "\u2699", + attributes: [ + { + name: 'onclick', + value: 'idrinth.chat.enableChat(this);' + }, + { + name: 'data-id', + value: '0' + } + ] + }] }, { type: 'ul', css: 'chat-tabs', - children: [ { - type: 'li', - css: 'styles-scrollbar active', - attributes: [ - { - name: 'data-id', - value: '0' - } - ], - children: [ - { - type: 'h1', - content: idrinth.text.get("chat.ui.chat") - }, - { - type: 'p', - content: idrinth.text.get("chat.message.optional"), - }, { - id: 'idrinth-chat-login', - children: [ - { - type: 'h2', - content: idrinth.text.get("chat.ui.account"), - }, - { - type: 'p', - content: idrinth.text.get("chat.message.invalid"), - }, - { - type: 'ul', - css: 'settings', - children: [ - makeInput ( 'Username' ), - makeInput ( 'Password' ), - makeButton(idrinth.text.get("chat.message.offline"), "idrinth.chat.login()") - ] - } - ] - }, { - id: 'idrinth-add-chat', - children: [ - { - type: 'h2', - content: idrinth.text.get("chat.ui.joinChat"), - }, - { - type: 'ul', - css: 'settings', - children: [ - makeInput ( 'Chat-ID' ), - makeInput ( 'Chat-Password' ), - makeButton(idrinth.text.get("chat.ui.createAddChat"), "idrinth.chat.add()") - ] - } - ] - }, - { - id: 'idrinth-make-chat', - children: [ - { - type: 'h2', - content: idrinth.text.get("chat.ui.createChat") - }, - { - type: 'ul', - css: 'settings', - children: [ - makeInput ( "Name" ), - makeButton(idrinth.text.get("chat.ui.createAddChat"), "idrinth.chat.create()") - ] - } - ] - }, { - type: 'li', - children: [ - { - type: '#text', - content: idrinth.text.get("chat.ui.moreSettings"), - }, - { - type: 'a', - content: 'dotd.idrinth.de/' + idrinth.platform + '/chat/', - attributes: [ - { - name: 'target', - value: '_blank' - }, - { - name: 'href', - value: 'https://dotd.idrinth.de/' + idrinth.platform + '/chat/' - } - ] - }, - { - type: '#text', - content: '.' - } - ] - }, { - type: 'li', - children: [ - { - type: '#text', - content: idrinth.text.get("chat.ui.creditEmoticon") - }, - { - type: 'a', - content: 'emoticonshd.com', - attributes: [ - { - name: 'target', - value: '_blank' - }, - { - name: 'href', - value: 'http://emoticonshd.com/' - } - ] - }, - { - type: '#text', - content: '.' - } - ] - } - ] - } + children: [{ + type: 'li', + css: 'styles-scrollbar active', + attributes: [ + { + name: 'data-id', + value: '0' + } + ], + children: [ + { + type: 'h1', + content: idrinth.text.get( "chat.ui.chat" ) + }, + { + type: 'p', + content: idrinth.text.get( "chat.message.optional" ), + }, { + id: 'idrinth-chat-login', + children: [ + { + type: 'h2', + content: idrinth.text.get( "chat.ui.account" ), + }, + { + type: 'p', + content: idrinth.text.get( "chat.message.invalid" ), + }, + { + type: 'ul', + css: 'settings', + children: [ + makeInput( 'Username' ), + makeInput( 'Password' ), + makeButton( idrinth.text.get( "chat.message.offline" ), "idrinth.chat.login()" ) + ] + } + ] + }, { + id: 'idrinth-add-chat', + children: [ + { + type: 'h2', + content: idrinth.text.get( "chat.ui.joinChat" ), + }, + { + type: 'ul', + css: 'settings', + children: [ + makeInput( 'Chat-ID' ), + makeInput( 'Chat-Password' ), + makeButton( idrinth.text.get( "chat.ui.createAddChat" ), "idrinth.chat.add()" ) + ] + } + ] + }, + { + id: 'idrinth-make-chat', + children: [ + { + type: 'h2', + content: idrinth.text.get( "chat.ui.createChat" ) + }, + { + type: 'ul', + css: 'settings', + children: [ + makeInput( "Name" ), + makeButton( idrinth.text.get( "chat.ui.createAddChat" ), "idrinth.chat.create()" ) + ] + } + ] + }, { + type: 'li', + children: [ + { + type: '#text', + content: idrinth.text.get( "chat.ui.moreSettings" ), + }, + { + type: 'a', + content: 'dotd.idrinth.de/' + idrinth.platform + '/chat/', + attributes: [ + { + name: 'target', + value: '_blank' + }, + { + name: 'href', + value: 'https://dotd.idrinth.de/' + idrinth.platform + '/chat/' + } + ] + }, + { + type: '#text', + content: '.' + } + ] + }, { + type: 'li', + children: [ + { + type: '#text', + content: idrinth.text.get( "chat.ui.creditEmoticon" ) + }, + { + type: 'a', + content: 'emoticonshd.com', + attributes: [ + { + name: 'target', + value: '_blank' + }, + { + name: 'href', + value: 'http://emoticonshd.com/' + } + ] + }, + { + type: '#text', + content: '.' + } + ] + } + ] + } ] } ] @@ -704,31 +704,31 @@ idrinth.chat = { if ( !idrinth.settings.chatting ) { return; } - if ( !document.getElementById ( 'idrinth-chat' ) ) { - idrinth.ui.body.appendChild ( build () ); - idrinth.chat.elements.chats = document.getElementById ( 'idrinth-chat' ).getElementsByTagName ( 'ul' )[1]; - idrinth.chat.elements.menu = document.getElementById ( 'idrinth-chat' ).getElementsByTagName ( 'ul' )[0]; + if ( !document.getElementById( 'idrinth-chat' ) ) { + idrinth.ui.body.appendChild( build() ); + idrinth.chat.elements.chats = document.getElementById( 'idrinth-chat' ).getElementsByTagName( 'ul' )[1]; + idrinth.chat.elements.menu = document.getElementById( 'idrinth-chat' ).getElementsByTagName( 'ul' )[0]; } - window.setTimeout ( function () { - idrinth.core.ajax.runHome ( + window.setTimeout( function () { + idrinth.core.ajax.runHome( 'chat-service/login/', idrinth.chat.startLoginCallback, function ( reply ) { }, function ( reply ) { - window.setTimeout ( idrinth.chat.login, 1 ); + window.setTimeout( idrinth.chat.login, 1 ); }, - JSON.stringify ( { + JSON.stringify( { user: idrinth.settings.chatuser, pass: idrinth.settings.chatpass } ) ); }, 2500 ); - window.setTimeout ( function () { - idrinth.core.ajax.runHome ( + window.setTimeout( function () { + idrinth.core.ajax.runHome( 'emoticons/data/', function ( reply ) { - idrinth.chat.emotes = JSON.parse ( reply ); + idrinth.chat.emotes = JSON.parse( reply ); }, function ( reply ) { }, @@ -740,193 +740,193 @@ idrinth.chat = { }, 1 ); }, create: function () { - idrinth.core.ajax.runHome ( + idrinth.core.ajax.runHome( 'chat-service/create/', idrinth.chat.joinCallback, function ( reply ) { - idrinth.core.alert( idrinth.text.get("chat.message.createFail") ); + idrinth.core.alert( idrinth.text.get( "chat.message.createFail" ) ); }, function ( reply ) { - idrinth.core.alert( idrinth.text.get("chat.message.createFail") ); + idrinth.core.alert( idrinth.text.get( "chat.message.createFail" ) ); }, - document.getElementById ( 'idrinth-make-chat' ).getElementsByTagName ( 'input' )[0].value + document.getElementById( 'idrinth-make-chat' ).getElementsByTagName( 'input' )[0].value ); }, joinCallback: function ( reply ) { if ( !reply ) { - idrinth.core.alert( idrinth.text.get("chat.message.joinFailMoment") ); + idrinth.core.alert( idrinth.text.get( "chat.message.joinFailMoment" ) ); return; } - reply = JSON.parse ( reply ); + reply = JSON.parse( reply ); if ( !reply ) { - idrinth.core.alert( idrinth.text.get("chat.message.joinFailMoment") ); + idrinth.core.alert( idrinth.text.get( "chat.message.joinFailMoment" ) ); return; } if ( !reply.success ) { if ( reply.message ) { - idrinth.core.alert ( reply.message ); + idrinth.core.alert( reply.message ); } else { - idrinth.core.alert( idrinth.text.get("chat.message.joinFail") ); + idrinth.core.alert( idrinth.text.get( "chat.message.joinFail" ) ); } return; } - idrinth.ui.buildChat ( reply.data.id, reply.data.name, reply.data.access, reply.data.pass ); - document.getElementById ( 'idrinth-add-chat' ).getElementsByTagName ( 'input' )[0].value = ''; - document.getElementById ( 'idrinth-add-chat' ).getElementsByTagName ( 'input' )[1].value = ''; - document.getElementById ( 'idrinth-make-chat' ).getElementsByTagName ( 'input' )[0].value = ''; + idrinth.ui.buildChat( reply.data.id, reply.data.name, reply.data.access, reply.data.pass ); + document.getElementById( 'idrinth-add-chat' ).getElementsByTagName( 'input' )[0].value = ''; + document.getElementById( 'idrinth-add-chat' ).getElementsByTagName( 'input' )[1].value = ''; + document.getElementById( 'idrinth-make-chat' ).getElementsByTagName( 'input' )[0].value = ''; }, - users: { }, + users: {}, updateTimeout: null, add: function () { - idrinth.core.ajax.runHome ( + idrinth.core.ajax.runHome( 'chat-service/join/', idrinth.chat.joinCallback, function ( reply ) { - idrinth.core.alert ( idrinth.text.get("chat.message.joinFailMoment") ); + idrinth.core.alert( idrinth.text.get( "chat.message.joinFailMoment" ) ); }, function ( reply ) { - idrinth.core.alert ( idrinth.text.get("chat.message.joinFailMoment") ); + idrinth.core.alert( idrinth.text.get( "chat.message.joinFailMoment" ) ); }, - JSON.stringify ( { - id: document.getElementById ( 'idrinth-add-chat' ).getElementsByTagName ( 'input' )[0].value, - pass: document.getElementById ( 'idrinth-add-chat' ).getElementsByTagName ( 'input' )[1].value + JSON.stringify( { + id: document.getElementById( 'idrinth-add-chat' ).getElementsByTagName( 'input' )[0].value, + pass: document.getElementById( 'idrinth-add-chat' ).getElementsByTagName( 'input' )[1].value } ) ); }, send: function ( id ) { - idrinth.chat.messages.push ( { + idrinth.chat.messages.push( { chat: id, - text: document.getElementById ( 'idrinth-chat-input-' + id ).value + text: document.getElementById( 'idrinth-chat-input-' + id ).value } ); - document.getElementById ( 'idrinth-chat-input-' + id ).value = ''; + document.getElementById( 'idrinth-chat-input-' + id ).value = ''; }, join: function ( list ) { - for (var chatId in list) { - if ( !document.getElementById ( 'idrinth-chat-tab-' + chatId ) ) { - idrinth.ui.buildChat ( chatId, list[chatId].name, list[chatId].access, list[chatId].pass ); + for ( var chatId in list ) { + if ( !document.getElementById( 'idrinth-chat-tab-' + chatId ) ) { + idrinth.ui.buildChat( chatId, list[chatId].name, list[chatId].access, list[chatId].pass ); } } if ( idrinth.chat.updateTimeout ) { return; } - idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 1500 ); - idrinth.chat.refreshMembers (); + idrinth.chat.updateTimeout = window.setTimeout( idrinth.chat.refreshChats, 1500 ); + idrinth.chat.refreshMembers(); }, startLoginCallback: function ( data ) { if ( !data ) { return; } - data = JSON.parse ( data ); + data = JSON.parse( data ); if ( !data || !data.success ) { return; } - idrinth.ui.removeElement ( 'idrinth-chat-login' ); - idrinth.chat.join ( data.data ); + idrinth.ui.removeElement( 'idrinth-chat-login' ); + idrinth.chat.join( data.data ); }, loginCallback: function ( data ) { if ( !data ) { - idrinth.core.alert ( idrinth.text.get("chat.message.loginFailMoment")); + idrinth.core.alert( idrinth.text.get( "chat.message.loginFailMoment" ) ); return; } - data = JSON.parse ( data ); + data = JSON.parse( data ); if ( !data ) { - idrinth.core.alert ( idrinth.text.get("chat.message.loginFailMoment") ); + idrinth.core.alert( idrinth.text.get( "chat.message.loginFailMoment" ) ); return; } if ( !data.success && data.message && data['allow-reg'] ) { - idrinth.core.confirm( idrinth.text.get("chat.message.unknown"), 'idrinth.chat.register();'); + idrinth.core.confirm( idrinth.text.get( "chat.message.unknown" ), 'idrinth.chat.register();' ); return; } if ( !data.success && data.message ) { - idrinth.core.alert ( data.message ); + idrinth.core.alert( data.message ); return; } if ( data.success ) { - idrinth.settings.chatuser = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[0].value; - idrinth.settings.chatpass = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[1].value; - idrinth.settings.save (); - idrinth.ui.removeElement ( 'idrinth-chat-login' ); - idrinth.chat.join ( data.data ); + idrinth.settings.chatuser = document.getElementById( 'idrinth-chat-login' ).getElementsByTagName( 'input' )[0].value; + idrinth.settings.chatpass = document.getElementById( 'idrinth-chat-login' ).getElementsByTagName( 'input' )[1].value; + idrinth.settings.save(); + idrinth.ui.removeElement( 'idrinth-chat-login' ); + idrinth.chat.join( data.data ); return; } - idrinth.core.alert( idrinth.text.get("chat.message.loginFailMoment") ); + idrinth.core.alert( idrinth.text.get( "chat.message.loginFailMoment" ) ); }, register: function () { - this.loginActions ( 'register' ); + this.loginActions( 'register' ); }, login: function () { - this.loginActions ( 'login' ); + this.loginActions( 'login' ); }, relogin: function () { - this.loginActions ( 'relogin' ); + this.loginActions( 'relogin' ); }, showOptions: function ( event, element ) { - event.preventDefault (); - idrinth.ui.body.appendChild ( idrinth.ui.buildElement ( { + event.preventDefault(); + idrinth.ui.body.appendChild( idrinth.ui.buildElement( { type: 'ul', css: 'idrinth-hovering-box', - children: [ { - css: 'clipboard-copy', - content: idrinth.text.get("chat.ui.copyIdPasswort"), - type: 'li', - attributes: [ { - name: 'data-clipboard-text', - value: element.getAttribute ( 'title' ) - } ] - }, { - content: idrinth.text.get("chat.ui.leaveRoom"), - type: 'li', - attributes: [ { - name: 'onclick', - value: 'idrinth.chat.useroptions(' + element.getAttribute ( 'data-id' ) + ',' + idrinth.chat.self + ',\'Leave\');this.parentNode.parentNode.removeChild(this.parentNode);' - } ] - }, { - content: idrinth.text.get("chat.ui.deleteRoom"), - type: 'li', - attributes: [ { - name: 'onclick', - value: 'idrinth.core.ajax.runHome(\'chat-service/delete/' + element.getAttribute ( 'data-id' ) + '/\',idrinth.core.alert,idrinth.core.alert,idrinth.core.alert);this.parentNode.parentNode.removeChild(this.parentNode);' - } ] - }, { - type: 'li', - content: idrinth.text.get("chat.ui.close"), - attributes: [ { - name: 'onclick', - value: 'this.parentNode.parentNode.removeChild(this.parentNode);' - } ] - } + children: [{ + css: 'clipboard-copy', + content: idrinth.text.get( "chat.ui.copyIdPasswort" ), + type: 'li', + attributes: [{ + name: 'data-clipboard-text', + value: element.getAttribute( 'title' ) + }] + }, { + content: idrinth.text.get( "chat.ui.leaveRoom" ), + type: 'li', + attributes: [{ + name: 'onclick', + value: 'idrinth.chat.useroptions(' + element.getAttribute( 'data-id' ) + ',' + idrinth.chat.self + ',\'Leave\');this.parentNode.parentNode.removeChild(this.parentNode);' + }] + }, { + content: idrinth.text.get( "chat.ui.deleteRoom" ), + type: 'li', + attributes: [{ + name: 'onclick', + value: 'idrinth.core.ajax.runHome(\'chat-service/delete/' + element.getAttribute( 'data-id' ) + '/\',idrinth.core.alert,idrinth.core.alert,idrinth.core.alert);this.parentNode.parentNode.removeChild(this.parentNode);' + }] + }, { + type: 'li', + content: idrinth.text.get( "chat.ui.close" ), + attributes: [{ + name: 'onclick', + value: 'this.parentNode.parentNode.removeChild(this.parentNode);' + }] + } ], - attributes: [ { - name: 'style', - value: idrinth.ui.getPosition ( element ) - } ] + attributes: [{ + name: 'style', + value: idrinth.ui.getPosition( element ) + }] } ) ); }, enableChat: function ( element ) { - var tabs = document.getElementsByClassName ( 'chat-tabs' )[0].children, - labels = document.getElementsByClassName ( 'chat-labels' )[0].children; - for (var counter = 0; counter < labels.length; counter++) { - var cur = labels[counter].getAttribute ( 'class' ) + ''; - labels[counter].setAttribute ( 'class', cur.replace ( /(^|\s)active(\s|$)/, ' ' ) ); - tabs[counter].setAttribute ( 'class', '' ); - if ( tabs[counter].getAttribute ( 'data-id' ) === element.getAttribute ( 'data-id' ) ) { - tabs[counter].setAttribute ( 'class', 'active' ); + var tabs = document.getElementsByClassName( 'chat-tabs' )[0].children, + labels = document.getElementsByClassName( 'chat-labels' )[0].children; + for ( var counter = 0; counter < labels.length; counter++ ) { + var cur = labels[counter].getAttribute( 'class' ) + ''; + labels[counter].setAttribute( 'class', cur.replace( /(^|\s)active(\s|$)/, ' ' ) ); + tabs[counter].setAttribute( 'class', '' ); + if ( tabs[counter].getAttribute( 'data-id' ) === element.getAttribute( 'data-id' ) ) { + tabs[counter].setAttribute( 'class', 'active' ); } } - if ( element.hasAttribute ( 'class' ) ) { - element.setAttribute ( 'class', ( element.getAttribute ( 'class' ) ).replace ( /(^|\s)new-message(\s|$)/, ' ' ) + ' active' ); + if ( element.hasAttribute( 'class' ) ) { + element.setAttribute( 'class', ( element.getAttribute( 'class' ) ).replace( /(^|\s)new-message(\s|$)/, ' ' ) + ' active' ); } else { - element.setAttribute ( 'class', 'active' ); + element.setAttribute( 'class', 'active' ); } }, openCloseChat: function ( element ) { var chat = element.parentNode; - if ( chat.getAttribute ( 'class' ) === 'idrinth-hovering-box active' || chat.getAttribute ( 'class' ) === 'idrinth-hovering-box active left-sided' ) { - chat.setAttribute ( 'class', 'idrinth-hovering-box' + ( idrinth.settings.moveLeft ? ' left-sided' : '' ) + - ( chat.getElementsByClassName ( 'new-message' ) && chat.getElementsByClassName ( 'new-message' ).length ? ' new-message' : '' ) ); + if ( chat.getAttribute( 'class' ) === 'idrinth-hovering-box active' || chat.getAttribute( 'class' ) === 'idrinth-hovering-box active left-sided' ) { + chat.setAttribute( 'class', 'idrinth-hovering-box' + ( idrinth.settings.moveLeft ? ' left-sided' : '' ) + + ( chat.getElementsByClassName( 'new-message' ) && chat.getElementsByClassName( 'new-message' ).length ? ' new-message' : '' ) ); element.innerHTML = '<<'; } else { - chat.setAttribute ( 'class', 'idrinth-hovering-box active' + ( idrinth.settings.moveLeft ? ' left-sided' : '' ) ); + chat.setAttribute( 'class', 'idrinth-hovering-box active' + ( idrinth.settings.moveLeft ? ' left-sided' : '' ) ); element.innerHTML = '>>'; } }, @@ -939,10 +939,10 @@ idrinth.chat = { 'relogin': 'chat-service/login/' }, fail = function () { - idrinth.core.alert( idrinth.text.get("chat.message.loginFail") ); + idrinth.core.alert( idrinth.text.get( "chat.message.loginFail" ) ); }, timeout = function () { - window.setTimeout ( idrinth.chat.login, 1 ); + window.setTimeout( idrinth.chat.login, 1 ); }, headers = { user: '', @@ -955,16 +955,16 @@ idrinth.chat = { if ( key === 'relogin' ) { success = function () { - idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 1500 ); + idrinth.chat.updateTimeout = window.setTimeout( idrinth.chat.refreshChats, 1500 ); }; headers.user = idrinth.settings.chatuser; headers.pass = idrinth.settings.chatpass; } else { - chatLogin = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' ); + chatLogin = document.getElementById( 'idrinth-chat-login' ).getElementsByTagName( 'input' ); headers.user = chatLogin[0].value; headers.pass = chatLogin[1].value; success = idrinth.chat.loginCallback; } - idrinth.core.ajax.runHome ( urls[key], success, fail, timeout, JSON.stringify ( headers ) ); + idrinth.core.ajax.runHome( urls[key], success, fail, timeout, JSON.stringify( headers ) ); } }; diff --git a/src/mods/lang.js b/src/mods/lang.js index 2b0b130..dbf29df 100644 --- a/src/mods/lang.js +++ b/src/mods/lang.js @@ -1,9 +1,9 @@ idrinth.lang = { start: function () { var language = window.navigator.userLanguage || window.navigator.language; - var file = "" ; // JSON to use, dependent on language - file = JSON.parse(file); - for (var prop in file) { + var file = ""; // JSON to use, dependent on language + file = JSON.parse( file ); + for ( var prop in file ) { idrinth.lang[prop] = file[prop]; } } diff --git a/src/mods/text.js b/src/mods/text.js index f981145..0b3c41f 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -1,9 +1,9 @@ -idrinth.text = { +idrinth.text = { data: { chat: { - ui:{ + ui: { close: 'Close', - invite:'Invite to Chat ', + invite: 'Invite to Chat ', account: 'Account', chat: 'Chat', createChat: 'Create Chat', @@ -15,18 +15,18 @@ idrinth.text = { deleteRoom: 'Delete Room', leaveRoom: 'Leave Room' }, - message:{ + message: { optional: 'This part of the script is optional, so logging in is unneeded for raid catching etc.', invalid: 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.', offline: "Not logged in, click to login/register", - modifyFail:'Can\'t modify that user at the moment', + modifyFail: 'Can\'t modify that user at the moment', createFail: 'Can\'t create at the moment', joinFailMoment: 'Can\'t join at the moment', - joinFail:'Joining didn\'t work', + joinFail: 'Joining didn\'t work', loginFail: 'Login failed in an unexpected way', - unknown:'The given username for dotd.idrinth.de is unknown, do you want to register it there?' + unknown: 'The given username for dotd.idrinth.de is unknown, do you want to register it there?' }, - error:{ + error: { default: 'Unexpected error occurred. Please contact script developers' + ' (https://github.com/Idrinth/IDotD).' } @@ -35,15 +35,15 @@ idrinth.text = { lackGold: 'You lack gold to buy any more buildings at the moment.' }, tier: { - diff:{ - normal:'Normal', - hard:'Hard', - legend:'Legend', - night:'Nightmare' + diff: { + normal: 'Normal', + hard: 'Hard', + legend: 'Legend', + night: 'Nightmare' }, tagTop: 'Tag to screen-top', maxBoxes: 'There is no space for another tier-box at the moment, please close one first.', - disableJoining:'Disable joining for ' + disableJoining: 'Disable joining for ' }, ui: { button: { @@ -57,14 +57,14 @@ idrinth.text = { restartRaidJoin: 'Restart Raidjoin', refreshFBGameLogin: 'Refresh Facebook Game Login', ngRaidJoin: 'NG Raid Join(slow!)', - calc:'Calculate' + calc: 'Calculate' }, - misc:{ + misc: { lastRaidsJoined: 'Last raids joined:', enterBossName: 'Enter Boss\' Name', - settingInfo:'This script will always import the raids you manually set to be imported on the website and if it\'s enabled it will also import all raids matched by one of the faved searches provided.', + settingInfo: 'This script will always import the raids you manually set to be imported on the website and if it\'s enabled it will also import all raids matched by one of the faved searches provided.', maxPopupsFrame: 'Maximum Popups/Frames for joining raids', - timeAutoJoin:'Time to automatically join raids slowly(reloads game multiple times). Format is [Hours]:[Minutes] without leading zeros, so 7:1 is fine, 07:01 is not', + timeAutoJoin: 'Time to automatically join raids slowly(reloads game multiple times). Format is [Hours]:[Minutes] without leading zeros, so 7:1 is fine, 07:01 is not', getFavFrom: 'Get your search-favorites from ', raidsearch: 'Idrinth\'s Raidsearch', goldHour: ' gold per hour each', @@ -95,17 +95,17 @@ idrinth.text = { // idrinth.text.get("ui.setting.clickCopy") - get: function (key) { - var getSub = function (obj, keys, func) { + get: function ( key ) { + var getSub = function ( obj, keys, func ) { var key = keys.shift(); - if (obj.hasOwnProperty(key)) { - if (keys.length > 0) { - return func(obj[key], keys, func); + if ( obj.hasOwnProperty( key ) ) { + if ( keys.length > 0 ) { + return func( obj[key], keys, func ); } return obj[key]; } return idrinth.text.data.chat.error.errorDefault; }; - return getSub(idrinth.text.data,key.split('.'),getSub); + return getSub( idrinth.text.data, key.split( '.' ), getSub ); } } \ No newline at end of file From 6336ee1427794c6a890a9eac5d1f6115d2e23352 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 3 Oct 2016 20:45:59 +0300 Subject: [PATCH 030/341] Create Ironclad [Ironclad].json --- tiers/Ironclad [Ironclad].json | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Ironclad [Ironclad].json diff --git a/tiers/Ironclad [Ironclad].json b/tiers/Ironclad [Ironclad].json new file mode 100644 index 0000000..6d01c7d --- /dev/null +++ b/tiers/Ironclad [Ironclad].json @@ -0,0 +1,38 @@ +{ + "normal": { + "525000": 1, + "600000": 1, + "900000": 1, + "1200000": 2, + "1600000": 2.5, + "2500000": 3, + "3500000": 3.5 + }, + "hard": { + "656000": 1, + "750000": 1, + "1125000": 1, + "1500000": 2, + "2000000": 2.5, + "3125000": 3, + "4375000": 3.5 + }, + "legendary": { + "840000": 1, + "960000": 1, + "1440000": 1, + "1920000": 2, + "2560000": 2.5, + "4000000": 3, + "5600000": 3.5 + }, + "nightmare": { + "1050000": 1, + "1200000": 1, + "1800000": 1, + "2400000": 2, + "3200000": 2.5, + "5000000": 3, + "7000000": 3.5 + } +} From b8eba0f45626bc498fffd18c89c68b0c18e12735 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 3 Oct 2016 21:26:55 +0300 Subject: [PATCH 031/341] Create Zombie Horde [Zombies].json --- tiers/Zombie Horde [Zombies].json | 38 +++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Zombie Horde [Zombies].json diff --git a/tiers/Zombie Horde [Zombies].json b/tiers/Zombie Horde [Zombies].json new file mode 100644 index 0000000..a068d6a --- /dev/null +++ b/tiers/Zombie Horde [Zombies].json @@ -0,0 +1,38 @@ +{ + "normal": { + "113000": 1, + "630000": 1, + "855000": 1, + "1845000": 2, + "2813000": 2.5, + "6075000": 3, + "7650000": 3.5 + }, + "hard": { + "141000": 1, + "788000": 1, + "1069000": 1, + "2306000": 2, + "3516000": 2.5, + "7594000": 3, + "9563000": 3.5 + }, + "legendary": { + "180000": 1, + "1008000": 1, + "1368000": 1, + "2952000": 2, + "4500000": 2.5, + "9720000": 3, + "12240000": 3.5 + }, + "nightmare": { + "225000": 1, + "1260000": 1, + "1710000": 1, + "3690000": 2, + "5625000": 2.5, + "12150000": 3, + "15300000": 3.5 + } +} From 953d805a86e378d21954c396c46034687d6623d2 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 3 Oct 2016 21:42:09 +0300 Subject: [PATCH 032/341] Create Stein [Stein].json --- tiers/Stein [Stein].json | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Stein [Stein].json diff --git a/tiers/Stein [Stein].json b/tiers/Stein [Stein].json new file mode 100644 index 0000000..2dffa19 --- /dev/null +++ b/tiers/Stein [Stein].json @@ -0,0 +1,38 @@ +{ + "normal": { + "160000": 1, + "720000": 1, + "1200000": 1, + "1760000": 2, + "2560000": 2.5, + "5200000": 3, + "7200000": 3.5 + }, + "hard": { + "200000": 1, + "900000": 1, + "1500000": 1, + "2200000": 2, + "3200000": 2.5, + "6500000": 3, + "9000000": 3.5 + }, + "legendary": { + "256000": 1, + "1152000": 1, + "1920000": 1, + "2816000": 2, + "4096000": 2.5, + "8320000": 3, + "11520000": 3.5 + }, + "nightmare": { + "320000": 1, + "1440000": 1, + "2400000": 1, + "3520000": 2, + "5120000": 2.5, + "10400000": 3, + "14400000": 3.5 + } +} From 43372030425bd2f30af0239d0055e230b3a922a9 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 3 Oct 2016 21:54:05 +0300 Subject: [PATCH 033/341] Create Bogstench [Bogstench].json --- tiers/Bogstench [Bogstench].json | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Bogstench [Bogstench].json diff --git a/tiers/Bogstench [Bogstench].json b/tiers/Bogstench [Bogstench].json new file mode 100644 index 0000000..bf621fc --- /dev/null +++ b/tiers/Bogstench [Bogstench].json @@ -0,0 +1,38 @@ +{ + "normal": { + "68000": 1, + "405000": 1, + "585000": 1, + "1125000": 2, + "3195000": 2.5, + "8145000": 3, + "18450000": 3.5 + }, + "hard": { + "200000": 1, + "900000": 1, + "1500000": 1, + "2200000": 2, + "3200000": 2.5, + "6500000": 3, + "9000000": 3.5 + }, + "legendary": { + "84000": 1, + "506000": 1, + "731000": 1, + "1406000": 2, + "3994000": 2.5, + "10181000": 3, + "23063000": 3.5 + }, + "nightmare": { + "135000": 1, + "810000": 1, + "1170000": 1, + "2250000": 2, + "6390000": 2.5, + "16290000": 3, + "36900000": 3.5 + } +} From 3aa0c4abad05ebda84cf830157a09ae4ea75aae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 4 Oct 2016 11:06:58 +0200 Subject: [PATCH 034/341] Update README.md refs #155 --- README.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8425f70..dffb8f2 100644 --- a/README.md +++ b/README.md @@ -7,15 +7,19 @@ A script for dawn of the dragons, that works based on data provided to https://d We support Opera, Firefox and Chrome. Please make sure to update your installation of those on a regular basis, since we can't guarantee, that the script will work on outdated versions. -# Bugs, desired Features etc. +## What is it? -We prefer the usage of the [tracker](https://github.com/Idrinth/IDotD/issues) here, otherwise we do import requests from [GoogleDocs](https://docs.google.com/document/d/1ozOWQuAEKCNnt2cwQ4SZtkpYM_pvrl8Bnj0e_O1KKWs/edit) from time to time. -[Previous GoogleDoc Tickets](https://github.com/Idrinth/IDotD/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3A%22Source%20GoogleDocs%22%20) +IDotD combines a raid catcher, a way of automatically joining desired raids, with a few other tools like chatrooms with raid-sharing options within those specific rooms, looking up tiers and calculation what piece of land to buy next. -# More Information +Additionally there are a few platform specific features, for example quick information about players in the kongregate chat rooms or a timeable autojoin for newgrounds to replace the usual ones on other platforms. Most information is avaible at [this project's wiki](https://github.com/Idrinth/IDotD/wiki). -# How To Help +## Bugs, desired Features etc. + +We prefer the usage of the [tracker](https://github.com/Idrinth/IDotD/issues) here, otherwise we do import requests from [GoogleDocs](https://docs.google.com/document/d/1ozOWQuAEKCNnt2cwQ4SZtkpYM_pvrl8Bnj0e_O1KKWs/edit) from time to time. +[Previous GoogleDoc Tickets](https://github.com/Idrinth/IDotD/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3A%22Source%20GoogleDocs%22%20) + +## How To Help -We can use helpers for the following: update and improve the wiki, help coding the userscript and testing any of the branches. For any of the later two have a look athe related documentation in the wiki. \ No newline at end of file +We can use helpers for the following: update and improve the wiki, help coding the userscript and testing any of the branches. For any of the later two have a look athe related documentation in the wiki. From 157198539072f5aa62bf8b029a88cf9d1ba1ac3f Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Tue, 4 Oct 2016 15:57:41 +0300 Subject: [PATCH 035/341] Create Nalagarst [Nalagarst].json --- tiers/Nalagarst [Nalagarst].json | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 tiers/Nalagarst [Nalagarst].json diff --git a/tiers/Nalagarst [Nalagarst].json b/tiers/Nalagarst [Nalagarst].json new file mode 100644 index 0000000..15c1e66 --- /dev/null +++ b/tiers/Nalagarst [Nalagarst].json @@ -0,0 +1,34 @@ +{ + "normal": { + "280000": 1, + "630000": 1, + "910000": 2, + "1750000": 2.5, + "3500000": 3, + "12600000": 3.5 + }, + "hard": { + "350000": 1, + "788000": 1, + "1138000": 2, + "2188000": 2.5, + "4375000": 3, + "15750000": 3.5 + }, + "legendary": { + "448000": 1, + "1080000": 1, + "1456000": 2, + "2800000": 2.5, + "5600000": 3, + "20160000": 3.5 + }, + "nightmare": { + "560000": 1, + "1260000": 1, + "1820000": 2, + "3500000": 2.5, + "7000000": 3, + "25200000": 3.5 + } +} From 14491f161fa1fdfe17d51f832213cf1790cdee6d Mon Sep 17 00:00:00 2001 From: Warric Date: Tue, 4 Oct 2016 17:32:31 +0200 Subject: [PATCH 036/341] Create Euphronios [Euphronios].json adding all know raids --- tiers/Euphronios [Euphronios].json | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Euphronios [Euphronios].json diff --git a/tiers/Euphronios [Euphronios].json b/tiers/Euphronios [Euphronios].json new file mode 100644 index 0000000..f436241 --- /dev/null +++ b/tiers/Euphronios [Euphronios].json @@ -0,0 +1,38 @@ +{ + "normal": { + "68000": 1, + "405000": 1, + "585000": 1, + "1125000": 2, + "3195000": 2.5, + "8145000": 3, + "18450000": 3.5 + }, + "hard": { + "84000": 1, + "506000": 1, + "731000": 1, + "1406000": 2, + "3994000": 2.5, + "10181000": 3, + "23063000": 3.5 + }, + "legendary": { + "108000": 1, + "648000": 1, + "936000": 1, + "1800000": 2, + "5112000": 2.5, + "13032000": 3, + "29520000": 3.5 + }, + "nightmare": { + "135000": 1, + "810000": 1, + "1170000": 1, + "2250000": 2, + "6390000": 2.5, + "16290000": 3, + "36900000": 3.5 + } +} From d5889c1911c175b48ef11f3de49c017e133c9038 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Tue, 4 Oct 2016 21:19:26 +0300 Subject: [PATCH 037/341] Create Gunnar the Berserk [Gunnar].json --- tiers/Gunnar the Berserk [Gunnar].json | 38 ++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Gunnar the Berserk [Gunnar].json diff --git a/tiers/Gunnar the Berserk [Gunnar].json b/tiers/Gunnar the Berserk [Gunnar].json new file mode 100644 index 0000000..344e0f9 --- /dev/null +++ b/tiers/Gunnar the Berserk [Gunnar].json @@ -0,0 +1,38 @@ +{ + "normal": { + "630000": 1, + "720000": 1, + "1080000": 1, + "1440000": 2, + "1920000": 2.5, + "3000000": 3, + "4200000": 3.5 + }, + "hard": { + "788000": 1, + "900000": 1, + "1350000": 1, + "1800000": 2, + "2400000": 2.5, + "3750000": 3, + "5250000": 3.5 + }, + "legendary": { + "1008000": 1, + "1152000": 1, + "1728000": 1, + "2304000": 2, + "3072000": 2.5, + "4800000": 3, + "6720000": 3.5 + }, + "nightmare": { + "1260000": 1, + "1440000": 1, + "2160000": 1, + "2880000": 2, + "3840000": 2.5, + "6000000": 3, + "8400000": 3.5 + } +} From d15b2bc5f94063244af26520d605b275e8392998 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Tue, 4 Oct 2016 21:36:28 +0300 Subject: [PATCH 038/341] Create Nidhogg [Nidhogg].json --- tiers/Nidhogg [Nidhogg].json | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Nidhogg [Nidhogg].json diff --git a/tiers/Nidhogg [Nidhogg].json b/tiers/Nidhogg [Nidhogg].json new file mode 100644 index 0000000..5ccb230 --- /dev/null +++ b/tiers/Nidhogg [Nidhogg].json @@ -0,0 +1,38 @@ +{ + "normal": { + "130000": 1, + "728000": 1, + "988000": 1, + "2132000": 2, + "3250000": 2.5, + "7020000": 3, + "8840000": 3.5 + }, + "hard": { + "163000": 1, + "910000": 1, + "1235000": 1, + "2665000": 2, + "4063000": 2.5, + "8775000": 3, + "1105000": 3.5 + }, + "legendary": { + "208000": 1, + "1165000": 1, + "1581000": 1, + "3411000": 2, + "5200000": 2.5, + "11232000": 3, + "14144000": 3.5 + }, + "nightmare": { + "260000": 1, + "1456000": 1, + "1976000": 1, + "4264000": 2, + "6500000": 2.5, + "14040000": 3, + "17680000": 3.5 + } +} From cdaa0183ba937cc5c88c44df1b512296b8d2ecf7 Mon Sep 17 00:00:00 2001 From: Warric Date: Tue, 4 Oct 2016 21:12:19 +0200 Subject: [PATCH 039/341] Added known tiers --- tiers/Celeano [Celeano].json | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Celeano [Celeano].json diff --git a/tiers/Celeano [Celeano].json b/tiers/Celeano [Celeano].json new file mode 100644 index 0000000..14b183d --- /dev/null +++ b/tiers/Celeano [Celeano].json @@ -0,0 +1,38 @@ +{ + "normal":{ + "158000":1, + "180000":1, + "270000":1, + "360000":2, + "480000":2.5, + "750000":3, + "1050000":3.5 + }, + "hard":{ + "197000":1, + "225000":1, + "338000":1, + "450000":2, + "600000":2.5, + "938000":3, + "1313000":3.5 + }, + "legendary":{ + "252000":1, + "288000":1, + "432000":1, + "576000":2, + "768000":2.5, + "1200000":3, + "1680000":3.5 + }, + "nightmare":{ + "315000":1, + "360000":1, + "540000":1, + "720000":2, + "960000":2.5, + "1500000":3, + "2100000":3.5 + } +} From 6d3f05e1f1fa63974da3a55a453ad937deced32a Mon Sep 17 00:00:00 2001 From: Warric Date: Tue, 4 Oct 2016 21:17:17 +0200 Subject: [PATCH 040/341] Added known tiers --- tiers/Arachna [Arachna].json | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Arachna [Arachna].json diff --git a/tiers/Arachna [Arachna].json b/tiers/Arachna [Arachna].json new file mode 100644 index 0000000..3314b31 --- /dev/null +++ b/tiers/Arachna [Arachna].json @@ -0,0 +1,38 @@ +{ + "normal":{ + "55000":1, + "308000":1, + "418000":1, + "902000":2, + "1375000":2.5, + "2970000":3, + "3740000":3.5 + }, + "hard":{ + "69000":1, + "385000":1, + "523000":1, + "1128000":2, + "1719000":2.5, + "3713000":3, + "4675000":3.5 + }, + "legendary":{ + "88000":1, + "493000":1, + "669000":1, + "1443000":2, + "2200000":2.5, + "4752000":3, + "5984000":3.5 + }, + "nightmare":{ + "110000":1, + "616000":1, + "836000":1, + "1804000":2, + "2750000":2.5, + "5840000":3, + "7480000":3.5 + } +} From ca26683c16e1fe04e83510de8b72645936cff55e Mon Sep 17 00:00:00 2001 From: Warric Date: Tue, 4 Oct 2016 21:22:29 +0200 Subject: [PATCH 041/341] Added know tiers --- tiers/Al-Azab [Al-Azab].json | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Al-Azab [Al-Azab].json diff --git a/tiers/Al-Azab [Al-Azab].json b/tiers/Al-Azab [Al-Azab].json new file mode 100644 index 0000000..38399f7 --- /dev/null +++ b/tiers/Al-Azab [Al-Azab].json @@ -0,0 +1,38 @@ +{ + "normal":{ + "110000":1, + "495000":1, + "825000":1, + "1210000":2, + "1760000":2.5, + "3575000":3, + "4950000":3.5 + }, + "hard":{ + "138000":1, + "619000":1, + "1031000":1, + "1513000":2, + "2200000":2.5, + "4469000":3, + "6188000":3.5 + }, + "legendary":{ + "176000":1, + "792000":1, + "1320000":1, + "1936000":2, + "2816000":2.5, + "5720000":3, + "7920000":3.5 + }, + "nightmare":{ + "220000":1, + "990000":1, + "1650000":1, + "2420000":2, + "3520000":2.5, + "7150000":3, + "9900000":3.5 + } +} From 2c58bc2704fc7d6f622a0e76247784bf03937dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 5 Oct 2016 13:00:07 +0200 Subject: [PATCH 042/341] Create Kang-Gsod [Kang].json from the wiki --- tiers/Kang-Gsod [Kang].json | 38 +++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Kang-Gsod [Kang].json diff --git a/tiers/Kang-Gsod [Kang].json b/tiers/Kang-Gsod [Kang].json new file mode 100644 index 0000000..309d9f0 --- /dev/null +++ b/tiers/Kang-Gsod [Kang].json @@ -0,0 +1,38 @@ +{ + "normal": { + "190000": 1, + "855000": 1, + "1425000": 1, + "2090000": 2, + "3040000": 2.5, + "6175000": 3, + "8550000": 3.5 + }, + "hard": { + "238000": 1, + "1069000": 1, + "1781000": 1, + "2613000": 2, + "3800000": 2.5, + "7719000": 3, + "10688000": 3.5 + }, + "legendary": { + "304000": 1, + "1368000": 1, + "2280000": 1, + "3344000": 2, + "4864000": 2.5, + "9880000": 3, + "13680000": 3.5 + }, + "nightmare": { + "380000": 1, + "1710000": 1, + "2850000": 1, + "4180000": 2, + "6080000": 2.5, + "12350000": 3, + "17100000": 3.5 + }, +} From 4c78c7bcf20c145d4768bdb1e976c43114470df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 5 Oct 2016 13:06:22 +0200 Subject: [PATCH 043/341] Create Ulfrik [Ulfrik].json from wiki --- tiers/Ulfrik [Ulfrik].json | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Ulfrik [Ulfrik].json diff --git a/tiers/Ulfrik [Ulfrik].json b/tiers/Ulfrik [Ulfrik].json new file mode 100644 index 0000000..478a3fd --- /dev/null +++ b/tiers/Ulfrik [Ulfrik].json @@ -0,0 +1,38 @@ +{ + "normal": { + "75000": 1, + "450000": 1, + "650000": 1, + "1250000": 2, + "3550000": 2.5, + "9050000": 3, + "20500000": 3.5 + }, + "hard": { + "94000": 1, + "563000": 1, + "813000": 1, + "1563000": 2, + "4438000": 2.5, + "11313000": 3, + "25625000": 3.5 + }, + "legendary": { + "120000": 1, + "720000": 1, + "1040000": 1, + "2000000": 2, + "5680000": 2.5, + "14480000": 3, + "32800000": 3.5 + }, + "nightmare": { + "150000": 1, + "900000": 1, + "1300000": 1, + "2500000": 2, + "7100000": 2.5, + "18100000": 3, + "41000000": 3.5 + } +} From 2a1e8946dc9e512c5ff64a03cf8bea11852099bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 5 Oct 2016 13:18:22 +0200 Subject: [PATCH 044/341] Create Giant Dreadbloom [Dreadbloom].json from the wiki --- tiers/Giant Dreadbloom [Dreadbloom].json | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Giant Dreadbloom [Dreadbloom].json diff --git a/tiers/Giant Dreadbloom [Dreadbloom].json b/tiers/Giant Dreadbloom [Dreadbloom].json new file mode 100644 index 0000000..9cdf727 --- /dev/null +++ b/tiers/Giant Dreadbloom [Dreadbloom].json @@ -0,0 +1,38 @@ +{ + "normal": { + "135000": 1, + "810000": 1, + "1170000": 1, + "2250000": 2, + "6390000": 2.5, + "16290000": 3, + "36900000": 3.5 + }, + "hard": { + "169000": 1, + "1013000": 1, + "1463000": 1, + "2813000": 2, + "7988000": 2.5, + "20363000": 3, + "46125000": 3.5 + }, + "legendary": { + "216000": 1, + "1296000": 1, + "1872000": 1, + "3600000": 2, + "10224000": 2.5, + "26064000": 3, + "59040000": 3.5 + }, + "nightmare": { + "270000": 1, + "1620000": 1, + "2340000": 1, + "4500000": 2, + "12780000": 2.5, + "32580000": 3, + "73800000": 3.5 + } +} From 715fb88b05bdd95dbe6aabf52e837a84419457a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 5 Oct 2016 14:28:15 +0200 Subject: [PATCH 045/341] fixing files --- tiers/Nylatrix [Nylatrix].json | 3 ++- tiers/Salome the Seductress [Salome].json | 3 ++- tiers/Tuxargus [Tuxargus].json | 3 ++- tiers/Xessus of the Grim Wood [Xessus of the Grim Wood].json | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tiers/Nylatrix [Nylatrix].json b/tiers/Nylatrix [Nylatrix].json index 7557816..2936d82 100644 --- a/tiers/Nylatrix [Nylatrix].json +++ b/tiers/Nylatrix [Nylatrix].json @@ -50,4 +50,5 @@ "280000000": 9, "320000000": 10, "360000000": 11 -} + } +} \ No newline at end of file diff --git a/tiers/Salome the Seductress [Salome].json b/tiers/Salome the Seductress [Salome].json index 140e1f0..eb228e9 100644 --- a/tiers/Salome the Seductress [Salome].json +++ b/tiers/Salome the Seductress [Salome].json @@ -50,4 +50,5 @@ "93000000": 9, "107000000": 10, "120000000": 11 -} + } +} \ No newline at end of file diff --git a/tiers/Tuxargus [Tuxargus].json b/tiers/Tuxargus [Tuxargus].json index 7557816..2936d82 100644 --- a/tiers/Tuxargus [Tuxargus].json +++ b/tiers/Tuxargus [Tuxargus].json @@ -50,4 +50,5 @@ "280000000": 9, "320000000": 10, "360000000": 11 -} + } +} \ No newline at end of file diff --git a/tiers/Xessus of the Grim Wood [Xessus of the Grim Wood].json b/tiers/Xessus of the Grim Wood [Xessus of the Grim Wood].json index c143b3f..847c538 100644 --- a/tiers/Xessus of the Grim Wood [Xessus of the Grim Wood].json +++ b/tiers/Xessus of the Grim Wood [Xessus of the Grim Wood].json @@ -50,4 +50,5 @@ "70000000": 9, "80000000": 10, "90000000": 11 -} + } +} \ No newline at end of file From 8bdb6aa772d4fd3ab67a95a16b53ffe077db6e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 5 Oct 2016 14:29:19 +0200 Subject: [PATCH 046/341] fixing file --- tiers/Kang-Gsod [Kang].json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tiers/Kang-Gsod [Kang].json b/tiers/Kang-Gsod [Kang].json index 309d9f0..967b34e 100644 --- a/tiers/Kang-Gsod [Kang].json +++ b/tiers/Kang-Gsod [Kang].json @@ -34,5 +34,5 @@ "6080000": 2.5, "12350000": 3, "17100000": 3.5 - }, + } } From 40faefd005d527bd6fec9dfb92f74917190d9c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 5 Oct 2016 14:50:07 +0200 Subject: [PATCH 047/341] Create Slaughterers Six [Slaughterers].json from wiki --- tiers/Slaughterers Six [Slaughterers].json | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Slaughterers Six [Slaughterers].json diff --git a/tiers/Slaughterers Six [Slaughterers].json b/tiers/Slaughterers Six [Slaughterers].json new file mode 100644 index 0000000..6123955 --- /dev/null +++ b/tiers/Slaughterers Six [Slaughterers].json @@ -0,0 +1,38 @@ +{ + "normal": { + "1260000": 1, + "1440000": 1, + "2160000": 1, + "2880000": 2, + "3840000": 2.5, + "6000000": 3, + "8400000": 3.5 + }, + "hard": { + "1575000": 1, + "1800000": 1, + "2700000": 1, + "3600000": 2, + "4800000": 2.5, + "7500000": 3, + "10500000": 3.5 + }, + "legendary": { + "2016000": 1, + "2304000": 1, + "3456000": 1, + "4608000": 2, + "6144000": 2.5, + "9600000": 3, + "13440000": 3.5 + }, + "nightmare": { + "2520000": 1, + "2880000": 1, + "4320000": 1, + "5760000": 2, + "7680000": 2.5, + "12000000": 3, + "16800000": 3.5 + } +} From ba3243d5d2f3e732cae7265204ce57844ed9e123 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 14:40:02 +0300 Subject: [PATCH 048/341] Create Kalaxia the Far-Seer [Kalaxia].json --- tiers/Kalaxia the Far-Seer [Kalaxia].json | 34 +++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 tiers/Kalaxia the Far-Seer [Kalaxia].json diff --git a/tiers/Kalaxia the Far-Seer [Kalaxia].json b/tiers/Kalaxia the Far-Seer [Kalaxia].json new file mode 100644 index 0000000..2fc39ab --- /dev/null +++ b/tiers/Kalaxia the Far-Seer [Kalaxia].json @@ -0,0 +1,34 @@ +{ + "normal": { + "320000": 1, + "720000": 1, + "1040000": 2, + "2000000": 2.5, + "4000000": 3, + "14400000": 3.5 + }, + "hard": { + "400000": 1, + "900000": 1, + "1300000": 2, + "2500000": 2.5, + "5000000": 3, + "18000000": 3.5 + }, + "legendary": { + "515000": 1, + "1152000": 1, + "1664000": 2, + "3200000": 2.5, + "6400000": 3, + "23040000": 3.5 + }, + "nightmare": { + "640000": 1, + "1440000": 1, + "2080000": 2, + "4000000": 2.5, + "8000000": 3, + "28800000": 3.5 + } +} From 77ea37bf55547d0a339a19be32c6e9f4632c3b91 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 14:45:09 +0300 Subject: [PATCH 049/341] Create Maraak the Impaler [Maraak].json --- tiers/Maraak the Impaler [Maraak].json | 38 ++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Maraak the Impaler [Maraak].json diff --git a/tiers/Maraak the Impaler [Maraak].json b/tiers/Maraak the Impaler [Maraak].json new file mode 100644 index 0000000..a620074 --- /dev/null +++ b/tiers/Maraak the Impaler [Maraak].json @@ -0,0 +1,38 @@ +{ + "normal": { + "788000": 1, + "900000": 1, + "1350000": 1, + "1800000": 2, + "2400000": 2.5, + "3750000": 3, + "5250000": 3.5 + }, + "hard": { + "684000": 1, + "1125000": 1, + "1688000": 1, + "2250000": 2, + "3000000": 2.5, + "4688000": 3, + "6563000": 3.5 + }, + "legendary": { + "1260000": 1, + "1440000": 1, + "2160000": 1, + "2880000": 2, + "3840000": 2.5, + "6000000": 3, + "8400000": 3.5 + }, + "nightmare": { + "1575000": 1, + "1800000": 1, + "2700000": 1, + "3600000": 2, + "4800000": 2.5, + "7500000": 3, + "10500000": 3.5 + } +} From 895f133b2f13502af698fd0f89a1fca72d2f331f Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 14:51:22 +0300 Subject: [PATCH 050/341] Create Erakka-Sak [Erakka-Sak].json --- tiers/Erakka-Sak [Erakka-Sak].json | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Erakka-Sak [Erakka-Sak].json diff --git a/tiers/Erakka-Sak [Erakka-Sak].json b/tiers/Erakka-Sak [Erakka-Sak].json new file mode 100644 index 0000000..61a6364 --- /dev/null +++ b/tiers/Erakka-Sak [Erakka-Sak].json @@ -0,0 +1,38 @@ +{ + "normal": { + "155000": 1, + "868000": 1, + "1178000": 1, + "2542000": 2, + "3875000": 2.5, + "8370000": 3, + "10540000": 3.5 + }, + "hard": { + "194000": 1, + "1085000": 1, + "1473000": 1, + "3178000": 2, + "4844000": 2.5, + "10463000": 3, + "13175000": 3.5 + }, + "legendary": { + "248000": 1, + "1389000": 1, + "1885000": 1, + "4067000": 2, + "6200000": 2.5, + "13392000": 3, + "16864000": 3.5 + }, + "nightmare": { + "310000": 1, + "1736000": 1, + "2356000": 1, + "5084000": 2, + "7750000": 2.5, + "16740000": 3, + "21080000": 3.5 + } +} From 5447ffb5b48578ba8c395200772f9603280667fb Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 14:52:37 +0300 Subject: [PATCH 051/341] Update Elite Balor [E. Balor].json --- tiers/Elite Balor [E. Balor].json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tiers/Elite Balor [E. Balor].json b/tiers/Elite Balor [E. Balor].json index dcf1c47..87b221f 100644 --- a/tiers/Elite Balor [E. Balor].json +++ b/tiers/Elite Balor [E. Balor].json @@ -1,17 +1,17 @@ { "nightmare": { - "50000000": 2840, - "75000000": 5165, - "80000000": 5570, - "100000000": 7000, - "125000000": 8800, - "150000000": 9100, - "180000000": 9100, - "200000000": 10100, - "250000000": 10600, - "300000000": 11600, - "350000000": 11600, - "400000000": 12100, - "500000000": 12600 + "50000000000": 2840, + "75000000000": 5165, + "80000000000": 5570, + "100000000000": 7000, + "125000000000": 8800, + "150000000000": 9100, + "180000000000": 9100, + "200000000000": 10100, + "250000000000": 10600, + "300000000000": 11600, + "350000000000": 11600, + "400000000000": 12100, + "500000000000": 12600 } } From 8dc14b82d793f31bf3c0ae394e80ec8d8f06dc39 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 15:09:07 +0300 Subject: [PATCH 052/341] Create Wexxa the Worm-Tamer [Wexxa].json --- tiers/Wexxa the Worm-Tamer [Wexxa].json | 38 +++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Wexxa the Worm-Tamer [Wexxa].json diff --git a/tiers/Wexxa the Worm-Tamer [Wexxa].json b/tiers/Wexxa the Worm-Tamer [Wexxa].json new file mode 100644 index 0000000..8ff53fc --- /dev/null +++ b/tiers/Wexxa the Worm-Tamer [Wexxa].json @@ -0,0 +1,38 @@ +{ + "normal": { + "220000": 1, + "990000": 1, + "1650000": 1, + "2420000": 2, + "3520000": 2.5, + "7150000": 3, + "9900000": 3.5 + }, + "hard": { + "275000": 1, + "1238000": 1, + "2063000": 1, + "3025000": 2, + "4400000": 2.5, + "8938000": 3, + "12375000": 3.5 + }, + "legendary": { + "352000": 1, + "1584000": 1, + "2640000": 1, + "3872000": 2, + "5632000": 2.5, + "11440000": 3, + "15840000": 3.5 + }, + "nightmare": { + "440000": 1, + "1980000": 1, + "3300000": 1, + "4840000": 2, + "7040000": 2.5, + "14300000": 3, + "19800000": 3.5 + } +} From 8d3c9420e0beacdc884f6ed71246cd510b5d1846 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 15:14:40 +0300 Subject: [PATCH 053/341] Create Guilbert the Mad [Guilbert].json --- tiers/Guilbert the Mad [Guilbert].json | 38 ++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Guilbert the Mad [Guilbert].json diff --git a/tiers/Guilbert the Mad [Guilbert].json b/tiers/Guilbert the Mad [Guilbert].json new file mode 100644 index 0000000..3bba6ae --- /dev/null +++ b/tiers/Guilbert the Mad [Guilbert].json @@ -0,0 +1,38 @@ +{ + "normal": { + "83000": 1, + "495000": 1, + "715000": 1, + "1375000": 2, + "3905000": 2.5, + "9955000": 3, + "22550000": 3.5 + }, + "hard": { + "103000": 1, + "619000": 1, + "894000": 1, + "1719000": 2, + "4881000": 2.5, + "12444000": 3, + "28188800": 3.5 + }, + "legendary": { + "132000": 1, + "792000": 1, + "1144000": 1, + "2200000": 2, + "6248000": 2.5, + "15928000": 3, + "36080000": 3.5 + }, + "nightmare": { + "165000": 1, + "990000": 1, + "14300000": 1, + "2750000": 2, + "7810000": 2.5, + "19910000": 3, + "45100000": 3.5 + } +} From 66bc60cedc3f36b0d120538261401a2b03a54e9b Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 15:27:51 +0300 Subject: [PATCH 054/341] Create Bellarius the Guardian [Bellarius].json --- tiers/Bellarius the Guardian [Bellarius].json | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 tiers/Bellarius the Guardian [Bellarius].json diff --git a/tiers/Bellarius the Guardian [Bellarius].json b/tiers/Bellarius the Guardian [Bellarius].json new file mode 100644 index 0000000..9615633 --- /dev/null +++ b/tiers/Bellarius the Guardian [Bellarius].json @@ -0,0 +1,34 @@ +{ + "normal": { + "360000": 1, + "810000": 1, + "1170000": 2, + "2250000": 2.5, + "4500000": 3, + "16200000": 3.5 + }, + "hard": { + "450000": 1, + "1013000": 1, + "1463000": 2, + "2813000": 2.5, + "5625000": 3, + "20250000": 3.5 + }, + "legendary": { + "576000": 1, + "1296000": 1, + "1872000": 2, + "3600000": 2.5, + "7200000": 3, + "25920000": 3.5 + }, + "nightmare": { + "720000": 1, + "1620000": 1, + "2340000": 2, + "4500000": 2.5, + "9000000": 3, + "32400000": 3.5 + } +} From 131e60ce97a79992926bb7ce0593e6c246ac69e2 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 15:36:39 +0300 Subject: [PATCH 055/341] Create Headmaster Grimsly [Grimsly].json --- tiers/Headmaster Grimsly [Grimsly].json | 38 +++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Headmaster Grimsly [Grimsly].json diff --git a/tiers/Headmaster Grimsly [Grimsly].json b/tiers/Headmaster Grimsly [Grimsly].json new file mode 100644 index 0000000..6695b5e --- /dev/null +++ b/tiers/Headmaster Grimsly [Grimsly].json @@ -0,0 +1,38 @@ +{ + "normal": { + "180000": 1, + "1008000": 1, + "1368000": 1, + "2952000": 2, + "4500000": 2.5, + "9720000": 3, + "12240000": 3.5 + }, + "hard": { + "225000": 1, + "1260000": 1, + "1710000": 1, + "3690000": 2, + "5625000": 2.5, + "12150000": 3, + "15300000": 3.5 + }, + "legendary": { + "288000": 1, + "1613000": 1, + "2189000": 1, + "4723000": 2, + "7200000": 2.5, + "15552000": 3, + "19584000": 3.5 + }, + "nightmare": { + "360000": 1, + "2016000": 1, + "2736000": 1, + "5904000": 2, + "9000000": 2.5, + "19440000": 3, + "24480000": 3.5 + } +} From e3db9d75bc80683bad62e20c4b9cb073129adac4 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 16:05:09 +0300 Subject: [PATCH 056/341] Create Rift the Mauler [Rift].json --- tiers/Rift the Mauler [Rift].json | 38 +++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Rift the Mauler [Rift].json diff --git a/tiers/Rift the Mauler [Rift].json b/tiers/Rift the Mauler [Rift].json new file mode 100644 index 0000000..fbf4080 --- /dev/null +++ b/tiers/Rift the Mauler [Rift].json @@ -0,0 +1,38 @@ +{ + "normal": { + "250000": 1, + "1125000": 1, + "1875000": 1, + "2750000": 2, + "4000000": 2.5, + "8125000": 3, + "11250000": 3.5 + }, + "hard": { + "313000": 1, + "1406000": 1, + "2344000": 1, + "3438000": 2, + "5000000": 2.5, + "10156000": 3, + "14063000": 3.5 + }, + "legendary": { + "400000": 1, + "1800000": 1, + "3000000": 1, + "4400000": 2, + "6400000": 2.5, + "13000000": 3, + "18000000": 3.5 + }, + "nightmare": { + "500000": 1, + "2250000": 1, + "3750000": 1, + "5500000": 2, + "8000000": 2.5, + "16250000": 3, + "22500000": 3.5 + } +} From 98b68b5903c045b2a145173121835266fefdde77 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 16:10:36 +0300 Subject: [PATCH 057/341] Create Sisters of the Song [Sisters].json --- tiers/Sisters of the Song [Sisters].json | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Sisters of the Song [Sisters].json diff --git a/tiers/Sisters of the Song [Sisters].json b/tiers/Sisters of the Song [Sisters].json new file mode 100644 index 0000000..b30f578 --- /dev/null +++ b/tiers/Sisters of the Song [Sisters].json @@ -0,0 +1,38 @@ +{ + "normal": { + "90000": 1, + "540000": 1, + "780000": 1, + "1500000": 2, + "4260000": 2.5, + "10860000": 3, + "24600000": 3.5 + }, + "hard": { + "113000": 1, + "675000": 1, + "975000": 1, + "1875000": 2, + "5325000": 2.5, + "13575000": 3, + "30750000": 3.5 + }, + "legendary": { + "144000": 1, + "864000": 1, + "1248000": 1, + "2400000": 2, + "6816000": 2.5, + "17376000": 3, + "39360000": 3.5 + }, + "nightmare": { + "180000": 1, + "1080000": 1, + "1560000": 1, + "3000000": 2, + "8520000": 2.5, + "21720000": 3, + "49200000": 3.5 + } +} From b6abadb5e0540e44d66d75a7b2d75e7d3e247414 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 16:14:56 +0300 Subject: [PATCH 058/341] Create Mardachus the Destroyer [Mardachus].json --- .../Mardachus the Destroyer [Mardachus].json | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 tiers/Mardachus the Destroyer [Mardachus].json diff --git a/tiers/Mardachus the Destroyer [Mardachus].json b/tiers/Mardachus the Destroyer [Mardachus].json new file mode 100644 index 0000000..748924e --- /dev/null +++ b/tiers/Mardachus the Destroyer [Mardachus].json @@ -0,0 +1,34 @@ +{ + "normal": { + "440000": 1, + "990000": 1, + "1430000": 2, + "2750000": 2.5, + "5500000": 3, + "19800000": 3.5 + }, + "hard": { + "550000": 1, + "1238000": 1, + "1788000": 2, + "3438000": 2.5, + "3875000": 3, + "24750000": 3.5 + }, + "legendary": { + "680000": 1, + "1530000": 1, + "2210000": 2, + "4250000": 2.5, + "8500000": 3, + "30600000": 3.5 + }, + "nightmare": { + "880000": 1, + "1980000": 1, + "2860000": 2, + "5500000": 2.5, + "11000000": 3, + "39600000": 3.5 + } +} From 3569054729e2cbeebf5f195fa2917ce2adcf5573 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 16:18:44 +0300 Subject: [PATCH 059/341] Create Mesyra the Watcher [Mesyra].json --- tiers/Mesyra the Watcher [Mesyra].json | 38 ++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Mesyra the Watcher [Mesyra].json diff --git a/tiers/Mesyra the Watcher [Mesyra].json b/tiers/Mesyra the Watcher [Mesyra].json new file mode 100644 index 0000000..a9673e3 --- /dev/null +++ b/tiers/Mesyra the Watcher [Mesyra].json @@ -0,0 +1,38 @@ +{ + "normal": { + "150000": 1, + "900000": 1, + "1300000": 1, + "2500000": 2, + "7100000": 2.5, + "18100000": 3, + "41000000": 3.5 + }, + "hard": { + "188000": 1, + "1125000": 1, + "1625000": 1, + "3125000": 2, + "8875000": 2.5, + "22625000": 3, + "51250000": 3.5 + }, + "legendary": { + "240000": 1, + "1440000": 1, + "2080000": 1, + "4000000": 2, + "11360000": 2.5, + "28960000": 3, + "65600000": 3.5 + }, + "nightmare": { + "300000": 1, + "1800000": 1, + "2600000": 1, + "5000000": 2, + "14200000": 2.5, + "36200000": 3, + "82000000": 3.5 + } +} From 885e63cf83c13a38a36d7f2b9238236271b53d29 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 16:22:43 +0300 Subject: [PATCH 060/341] Create Nimrod the Hunter [Nimrod].json --- tiers/Nimrod the Hunter [Nimrod].json | 38 +++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Nimrod the Hunter [Nimrod].json diff --git a/tiers/Nimrod the Hunter [Nimrod].json b/tiers/Nimrod the Hunter [Nimrod].json new file mode 100644 index 0000000..cc53a41 --- /dev/null +++ b/tiers/Nimrod the Hunter [Nimrod].json @@ -0,0 +1,38 @@ +{ + "normal": { + "180000": 1, + "1080000": 1, + "1560000": 1, + "3000000": 2, + "8520000": 2.5, + "21720000": 3, + "49200000": 3.5 + }, + "hard": { + "225000": 1, + "1350000": 1, + "1950000": 1, + "3750000": 2, + "10650000": 2.5, + "27150000": 3, + "61500000": 3.5 + }, + "legendary": { + "288000": 1, + "1728000": 1, + "2496000": 1, + "4800000": 2, + "13632000": 2.5, + "34752000": 3, + "78720000": 3.5 + }, + "nightmare": { + "360000": 1, + "2160000": 1, + "3120000": 1, + "6000000": 2, + "17040000": 2.5, + "43440000": 3, + "98400000": 3.5 + } +} From 771dd23a004421291aa59add1fd69e578c55959b Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 16:27:43 +0300 Subject: [PATCH 061/341] Update Elite Kanehuar Yachu [E. Kane].json --- tiers/Elite Kanehuar Yachu [E. Kane].json | 38 +++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/tiers/Elite Kanehuar Yachu [E. Kane].json b/tiers/Elite Kanehuar Yachu [E. Kane].json index 6918c86..ecf2fed 100644 --- a/tiers/Elite Kanehuar Yachu [E. Kane].json +++ b/tiers/Elite Kanehuar Yachu [E. Kane].json @@ -1,23 +1,23 @@ { "nightmare": { - "25000000": 1260, - "36700000": 1930, - "40000000": 2230, - "45000000": 2530, - "50000000": 2830, - "55000000": 3130, - "60000000": 3950, - "65000000": 4350, - "73300000": 4750, - "75000000": 5150, - "80000000": 5550, - "90000000": 6250, - "100000000": 6950, - "125000000": 8700, - "180000000": 9000, - "200000000": 10000, - "250000000": 10500, - "350000000": 11500, - "400000000": 12000 + "25000000000": 1260, + "36700000000": 1930, + "40000000000": 2230, + "45000000000": 2530, + "50000000000": 2830, + "55000000000": 3130, + "60000000000": 3950, + "65000000000": 4350, + "73300000000": 4750, + "75000000000": 5150, + "80000000000": 5550, + "90000000000": 6250, + "100000000000": 6950, + "125000000000": 8700, + "180000000000": 9000, + "200000000000": 10000, + "250000000000": 10500, + "350000000000": 11500, + "400000000000": 12000 } } From 3167189f42b2615713c20223f6aad92243c91241 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 16:34:33 +0300 Subject: [PATCH 062/341] Create Phaedra the Deceiver [Phaedra].json --- tiers/Phaedra the Deceiver [Phaedra].json | 38 +++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Phaedra the Deceiver [Phaedra].json diff --git a/tiers/Phaedra the Deceiver [Phaedra].json b/tiers/Phaedra the Deceiver [Phaedra].json new file mode 100644 index 0000000..623aa8a --- /dev/null +++ b/tiers/Phaedra the Deceiver [Phaedra].json @@ -0,0 +1,38 @@ +{ + "normal": { + "210000": 1, + "1260000": 1, + "1820000": 1, + "3500000": 2, + "9940000": 2.5, + "25340000": 3, + "57400000": 3.5 + }, + "hard": { + "263000": 1, + "1575000": 1, + "2275000": 1, + "4375000": 2, + "12425000": 2.5, + "31675000": 3, + "71750000": 3.5 + }, + "legendary": { + "336000": 1, + "2016000": 1, + "2912000": 1, + "5600000": 2, + "15904000": 2.5, + "40544000": 3, + "91840000": 3.5 + }, + "nightmare": { + "420000": 1, + "2520000": 1, + "3640000": 1, + "7000000": 2, + "19880000": 2.5, + "50680000": 3, + "114800000": 3.5 + } +} From 34e5afff3a2669cecece1b1d43308227be6d23ce Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 16:41:28 +0300 Subject: [PATCH 063/341] Create Elite Karkata [E. Karkata].json --- tiers/Elite Karkata [E. Karkata].json | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 tiers/Elite Karkata [E. Karkata].json diff --git a/tiers/Elite Karkata [E. Karkata].json b/tiers/Elite Karkata [E. Karkata].json new file mode 100644 index 0000000..03793a9 --- /dev/null +++ b/tiers/Elite Karkata [E. Karkata].json @@ -0,0 +1,22 @@ +{ + "nightmare": { + "33300000000": 1625, + "35000000000": 1930, + "40000000000": 2230, + "45000000000": 2530, + "50000000000": 2830, + "55000000000": 3130, + "60000000000": 3950, + "66600000000": 4350, + "70000000000": 4750, + "75000000000": 5150, + "85000000000": 5550, + "90000000000": 6250, + "120000000000": 6950, + "130000000000": 8700, + "160000000000": 9000, + "225000000000": 10000, + "250000000000": 10500, + "300000000000": 11500 + } +} From 182316dda69de927d6319d8f4efad69a74f4f478 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 16:45:31 +0300 Subject: [PATCH 064/341] Create Elite 5th Terror [E. 5th Terror].json --- tiers/Elite 5th Terror [E. 5th Terror].json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 tiers/Elite 5th Terror [E. 5th Terror].json diff --git a/tiers/Elite 5th Terror [E. 5th Terror].json b/tiers/Elite 5th Terror [E. 5th Terror].json new file mode 100644 index 0000000..8d11996 --- /dev/null +++ b/tiers/Elite 5th Terror [E. 5th Terror].json @@ -0,0 +1,15 @@ +{ + "nightmare": { + "50000000000": 2800, + "80000000000": 5500, + "90000000000": 6200, + "120000000000": 7000, + "125000000000": 7600, + "150000000000": 8000, + "200000000000": 10750, + "250000000000": 11500, + "300000000000": 12000, + "400000000000": 13000, + "500000000000": 14000 + } +} From 88aee760a17d307a4625127391003d09cbace496 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 16:48:23 +0300 Subject: [PATCH 065/341] Create Elite Initiates [E. Initiates].json --- tiers/Elite Initiates [E. Initiates].json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 tiers/Elite Initiates [E. Initiates].json diff --git a/tiers/Elite Initiates [E. Initiates].json b/tiers/Elite Initiates [E. Initiates].json new file mode 100644 index 0000000..a3cd97f --- /dev/null +++ b/tiers/Elite Initiates [E. Initiates].json @@ -0,0 +1,14 @@ +{ + "nightmare": { + "30000000000": 1800, + "60000000000": 4000, + "70000000000": 4900, + "75000000000": 5300, + "80000000000": 5700, + "90000000000": 6500, + "100000000000": 7250, + "120000000000": 8800, + "150000000000": 8900, + "180000000000": 9000 + } +} From c328f94e25cbd30acc46abde7dfd42f29d7fe9e3 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 16:51:34 +0300 Subject: [PATCH 066/341] Create Elite Slitherer [E. Slitherer].json --- tiers/Elite Slitherer [E. Slitherer].json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 tiers/Elite Slitherer [E. Slitherer].json diff --git a/tiers/Elite Slitherer [E. Slitherer].json b/tiers/Elite Slitherer [E. Slitherer].json new file mode 100644 index 0000000..4b42e58 --- /dev/null +++ b/tiers/Elite Slitherer [E. Slitherer].json @@ -0,0 +1,15 @@ +{ + "nightmare": { + "25000000000": 700, + "30000000000": 1800, + "40000000000": 2500, + "50000000000": 3150, + "60000000000": 3900, + "70000000000": 4600, + "80000000000": 5500, + "90000000000": 6000, + "100000000000": 6400, + "125000000000": 7500, + "150000000000": 8000 + } +} From be773f1cd22528074e1ccd8e59a132bc1ccfc526 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 16:55:16 +0300 Subject: [PATCH 067/341] Create Elite Reaper [E. Reaper].json --- tiers/Elite Reaper [E. Reaper].json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 tiers/Elite Reaper [E. Reaper].json diff --git a/tiers/Elite Reaper [E. Reaper].json b/tiers/Elite Reaper [E. Reaper].json new file mode 100644 index 0000000..c79de66 --- /dev/null +++ b/tiers/Elite Reaper [E. Reaper].json @@ -0,0 +1,20 @@ +{ + "nightmare": { + "30000000000": 1800, + "35000000000": 2100, + "40000000000": 2500, + "45000000000": 2850, + "50000000000": 3200, + "55000000000": 3500, + "60000000000": 4000, + "65000000000": 4500, + "70000000000": 4900, + "75000000000": 5300, + "80000000000": 5700, + "90000000000": 6500, + "100000000000": 7250, + "120000000000": 8800, + "150000000000": 8900, + "180000000000": 9000 + } +} From f306ca15f6a37a121877a4ad07f9581c1dcaf440 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 6 Oct 2016 17:00:23 +0300 Subject: [PATCH 068/341] Update Balor [Balor].json --- tiers/Balor [Balor].json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tiers/Balor [Balor].json b/tiers/Balor [Balor].json index 042394a..f609bfa 100644 --- a/tiers/Balor [Balor].json +++ b/tiers/Balor [Balor].json @@ -1,11 +1,11 @@ { "nightmare": { - "8000000": 395, - "10000000": 801, - "35000000": 1354, - "50000000": 1891, - "100000000": 3304, - "150000000": 3554, - "200000000": 4006 + "8000000000": 395, + "10000000000": 801, + "35000000000": 1354, + "50000000000": 1891, + "100000000000": 3304, + "150000000000": 3554, + "200000000000": 4006 } } From 0dbdecfffb5e02deb2420292ba7cd7c0000e7674 Mon Sep 17 00:00:00 2001 From: ardenian Date: Thu, 6 Oct 2016 21:30:25 +0200 Subject: [PATCH 069/341] Minor changes in text.js and ui.js --- src/mods/text.js | 18 +++++++----------- src/mods/ui.js | 10 +++++----- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index 0b3c41f..d28b4e1 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -57,7 +57,9 @@ idrinth.text = { restartRaidJoin: 'Restart Raidjoin', refreshFBGameLogin: 'Refresh Facebook Game Login', ngRaidJoin: 'NG Raid Join(slow!)', - calc: 'Calculate' + calc: 'Calculate', + disableTimedAutoJoin: 'disable timed Autojoin', + enableTimedAutoJoin: 'enable timed Autojoin' }, misc: { lastRaidsJoined: 'Last raids joined:', @@ -71,9 +73,7 @@ idrinth.text = { availGold: 'Avaible Gold', clickCopy: 'click to copy raid link' }, - message: { - reloadGameFail: 'The game couldn\'t be reloaded' - }, + reloadGameFail: 'The game couldn\'t be reloaded', setting: { enableExtendedCharInfo: 'Enable extended Characterinformation?', minimLayout: 'Minimalist Layout', @@ -81,20 +81,16 @@ idrinth.text = { warBottomPage: 'Show war at the bottom of the page', useGoldEfficiently: 'Check to try and use up the gold as efficient as possible - uncheck to only use the most efficient buy in the land buy calculator', tenBuildOnce: 'Buy 10 Buildings at once?(Rec)', - milliSecondsExtCharInfoDis: 'Milliseconds until the extended Characterinformation disappears', - secondsGameNeedsEnableJoining: 'Seconds needed to load the game for joining', + extCharInfoDuration: 'Milliseconds until the extended Characterinformation disappears', + joiningDuration: 'Seconds needed to load the game for joining', enableChat: 'Enable chat(needs script reload)', - enableAutoRequestFav: 'Enable Auto-Raid-Request for Favorites?', + enableFavRequest: 'Enable Auto-Raid-Request for Favorites?', favIdToJoin: 'FavoriteIds to join (separate multiple by comma)', worldserver: 'Worldserver?', disableAutoJoinSpecific: 'Disable Autojoining for specific raids' } } - }, - - // idrinth.text.get("ui.setting.clickCopy") - get: function ( key ) { var getSub = function ( obj, keys, func ) { var key = keys.shift(); diff --git a/src/mods/ui.js b/src/mods/ui.js index f21b774..240fa99 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -377,7 +377,7 @@ idrinth.ui = { handleFrame ( document.getElementById ( 'gamefilearea' ) ); } } catch ( e ) { - idrinth.core.alert ( idrinth.text.get("ui.message.reloadGameFail") ); + idrinth.core.alert ( idrinth.text.get("ui.reloadGameFail") ); } }, updateClassesList: function ( element, add, remove ) { @@ -447,7 +447,7 @@ idrinth.ui = { buttonMaker ( idrinth.text.get("ui.button.restartRaidJoin"), 'idrinth.raids.restartInterval();' ), buttonMaker ( idrinth.text.get("ui.button.refreshFBGameLogin"), 'idrinth.facebook.rejoin()', 'facebook' ), buttonMaker ( idrinth.text.get("ui.button.ngRaidJoin"), 'idrinth.newgrounds.joinRaids()', 'newgrounds' ), - buttonMaker ( idrinth.settings.alarmActive ? 'disable timed Autojoin' : 'enable timed Autojoin', 'idrinth.settings.change(\'alarmActive\',!idrinth.settings.alarmActive);this.innerHTML=idrinth.settings.alarmActive?\'disable timed Autojoin\':\'enable timed Autojoin\'', 'newgrounds' ) + buttonMaker( idrinth.settings.alarmActive ? idrinth.text.get( "ui.button.disableTimedAutoJoin" ) : idrinth.text.get( "ui.button.enableTimedAutoJoin" ),'idrinth.settings.change(\'alarmActive\',!idrinth.settings.alarmActive);this.innerHTML=idrinth.settings.alarmActive?\'disable timed Autojoin\':\'enable timed Autojoin\'', 'newgrounds' ) ] }, { css: 'idrinth-line', @@ -527,13 +527,13 @@ idrinth.ui = { rType: '#input', type: 'number', platforms: [ 'kongregate' ], - label: idrinth.text.get("ui.setting.milliSecondsExtCharInfoDis") + label: idrinth.text.get( "ui.setting.extCharInfoDuration" ) }, { name: 'newgroundLoad', rType: '#input', type: 'number', platforms: [ 'newgrounds' ], - label: idrinth.text.get("ui.setting.secondsGameNeedsEnableJoining") + label: idrinth.text.get( "ui.setting.joiningDuration" ) }, { name: 'chatting', rType: '#input', @@ -547,7 +547,7 @@ idrinth.ui = { name: 'raids', rType: '#input', type: 'checkbox', - label: idrinth.text.get("ui.setting.enableAutoRequestFav") + label: idrinth.text.get( "ui.setting.enableFavRequest" ) }, { name: 'favs', rType: '#input', From b36e02e0c4f4c9d6f5022eb1f0208fddf7ed7e13 Mon Sep 17 00:00:00 2001 From: ardenian Date: Sat, 8 Oct 2016 16:59:57 +0200 Subject: [PATCH 070/341] Commit for testing --- src/mods/text.js | 22 ++++++++++------------ src/mods/ui.js | 18 +++++++++--------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index d28b4e1..2e0a1c6 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -61,18 +61,16 @@ idrinth.text = { disableTimedAutoJoin: 'disable timed Autojoin', enableTimedAutoJoin: 'enable timed Autojoin' }, - misc: { - lastRaidsJoined: 'Last raids joined:', - enterBossName: 'Enter Boss\' Name', - settingInfo: 'This script will always import the raids you manually set to be imported on the website and if it\'s enabled it will also import all raids matched by one of the faved searches provided.', - maxPopupsFrame: 'Maximum Popups/Frames for joining raids', - timeAutoJoin: 'Time to automatically join raids slowly(reloads game multiple times). Format is [Hours]:[Minutes] without leading zeros, so 7:1 is fine, 07:01 is not', - getFavFrom: 'Get your search-favorites from ', - raidsearch: 'Idrinth\'s Raidsearch', - goldHour: ' gold per hour each', - availGold: 'Avaible Gold', - clickCopy: 'click to copy raid link' - }, + lastRaidsJoined: 'Last raids joined:', + enterBossName: 'Enter Boss\' Name', + settingInfo: 'This script will always import the raids you manually set to be imported on the website and if it\'s enabled it will also import all raids matched by one of the faved searches provided.', + maxPopupsFrame: 'Maximum Popups/Frames for joining raids', + timeAutoJoin: 'Time to automatically join raids slowly(reloads game multiple times). Format is [Hours]:[Minutes] without leading zeros, so 7:1 is fine, 07:01 is not', + getFavFrom: 'Get your search-favorites from ', + raidsearch: 'Idrinth\'s Raidsearch', + goldHour: ' gold per hour each', + availGold: 'Avaible Gold', + clickCopy: 'click to copy raid link', reloadGameFail: 'The game couldn\'t be reloaded', setting: { enableExtendedCharInfo: 'Enable extended Characterinformation?', diff --git a/src/mods/ui.js b/src/mods/ui.js index 240fa99..03013fe 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -452,7 +452,7 @@ idrinth.ui = { }, { css: 'idrinth-line', id: 'idrinth-joined-raids', - content: idrinth.text.get("ui.misc.lastRaidsJoined"), + content: idrinth.text.get("ui.lastRaidsJoined"), children: [ { type: 'ul' @@ -466,7 +466,7 @@ idrinth.ui = { css: 'idrinth-line', children: [ { type: 'label', - content: idrinth.text.get("ui.misc.enterBossName"), + content: idrinth.text.get("ui.enterBossName"), css: 'idrinth-float-half', attributes: [ { @@ -542,7 +542,7 @@ idrinth.ui = { }, { css: 'idrinth-line', type: 'span', - content: idrinth.text.get("ui.misc.settingInfo") + content: idrinth.text.get("ui.settingInfo") }, { name: 'raids', rType: '#input', @@ -578,19 +578,19 @@ idrinth.ui = { rType: '#input', type: 'number', platforms: [ 'dawnofthedragons', 'facebook' ], - label: idrinth.text.get("ui.misc.maxPopupsFrame") + label: idrinth.text.get("ui.maxPopupsFrame") }, { name: 'alarmTime', rType: '#input', type: 'text', platforms: [ 'newgrounds' ], - label: idrinth.text.get("ui.misc.timeAutoJoin") + label: idrinth.text.get("ui.timeAutoJoin") }, { css: 'idrinth-line', type: 'p', children: [ { type: '#text', - content: idrinth.text.get("ui.misc.getFavFrom") + content: idrinth.text.get("ui.getFavFrom") }, { type: 'a', attributes: [ { @@ -600,7 +600,7 @@ idrinth.ui = { name: 'target', value: '_blank' } ], - content: idrinth.text.get("ui.misc.raidsearch") + content: idrinth.text.get("ui.raidsearch") } ] } ]; }; @@ -634,7 +634,7 @@ idrinth.ui = { attributes: [ { name: 'title', - value: idrinth.land.data[label.toLowerCase()].perHour + idrinth.text.get("ui.misc.goldHour") + value: idrinth.land.data[label.toLowerCase()].perHour + idrinth.text.get("ui.goldHour") } ] }; @@ -666,7 +666,7 @@ idrinth.ui = { type: 'tr', children: [ { type: 'th', - content: idrinth.text.get("ui.misc.availGold") + content: idrinth.text.get("ui.availGold") }, { type: 'td', children: [ { From 025a3787d9e14c5b5c430f76e6f29a40428850ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 8 Oct 2016 17:41:46 +0200 Subject: [PATCH 071/341] reformatting --- languages/en.json | 1 - src/mods/chat.js | 880 +++++++++++++++++++++++----------------------- src/mods/land.js | 2 +- src/mods/lang.js | 4 +- src/mods/text.js | 10 +- src/mods/tier.js | 14 +- src/mods/ui.js | 74 ++-- 7 files changed, 492 insertions(+), 493 deletions(-) diff --git a/languages/en.json b/languages/en.json index 0db3279..2c63c08 100644 --- a/languages/en.json +++ b/languages/en.json @@ -1,3 +1,2 @@ { - } diff --git a/src/mods/chat.js b/src/mods/chat.js index 30d4e37..31f979c 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -1,55 +1,55 @@ idrinth.chat = { self: 0, maxId: 0, - messages: [], - oldMessages: [], + messages: [ ], + oldMessages: [ ], elements: { chats: null, menu: null }, - chatRank: {}, + chatRank: { }, refreshCount: 0, refreshChats: function () { - idrinth.chat.oldMessages = JSON.parse( JSON.stringify( idrinth.chat.messages ) ); - idrinth.chat.messages = []; - idrinth.core.ajax.runHome( + idrinth.chat.oldMessages = JSON.parse ( JSON.stringify ( idrinth.chat.messages ) ); + idrinth.chat.messages = [ ]; + idrinth.core.ajax.runHome ( 'chat-service/update/', idrinth.chat.applyMessages, idrinth.chat.returnMessages, idrinth.chat.returnMessages, - JSON.stringify( { + JSON.stringify ( { maxId: idrinth.chat.maxId, messages: idrinth.chat.oldMessages } ) ); if ( idrinth.chat.refreshCount % 25 === 0 ) { - idrinth.chat.refreshMembers(); + idrinth.chat.refreshMembers (); } idrinth.chat.refreshCount++; }, refreshMembers: function () { - idrinth.core.ajax.runHome( + idrinth.core.ajax.runHome ( 'chat-service/accounts/', idrinth.chat.applyMembers, function () { - window.setTimeout( idrinth.chat.refreshMembers, 1000 ); + window.setTimeout ( idrinth.chat.refreshMembers, 1000 ); }, function () { - window.setTimeout( idrinth.chat.refreshMembers, 1000 ); + window.setTimeout ( idrinth.chat.refreshMembers, 1000 ); }, '' ); }, returnMessages: function ( data ) { - for ( var count = idrinth.chat.oldMessages.length - 1; count >= 0; count-- ) { - idrinth.chat.messages.unshift( idrinth.chat.oldMessages[count] ); + for (var count = idrinth.chat.oldMessages.length - 1; count >= 0; count--) { + idrinth.chat.messages.unshift ( idrinth.chat.oldMessages[count] ); } - idrinth.chat.oldMessages = []; - window.setTimeout( idrinth.chat.refreshChats, 999 ); + idrinth.chat.oldMessages = [ ]; + window.setTimeout ( idrinth.chat.refreshChats, 999 ); }, userclick: function ( element, user, chat ) { 'use strict'; - if ( !idrinth.chat.chatRank[chat][idrinth.chat.self] || parseInt( user, 10 ) === parseInt( idrinth.chat.self, 10 ) ) { + if ( !idrinth.chat.chatRank[chat][idrinth.chat.self] || parseInt ( user, 10 ) === parseInt ( idrinth.chat.self, 10 ) ) { return; } var getPopupContent = function ( chat, user, rankId ) { @@ -80,12 +80,12 @@ idrinth.chat = { requiredRank: 3 } ]; - for ( var chatId in idrinth.chat.chatRank ) { - var intChatId = parseInt( chatId, 10 ); - if ( document.getElementById( 'idrinth-chat-tab-click-' + chatId ) && intChatId !== chat && intChatId > 1 && !( user in idrinth.chat.chatRank[chatId] ) ) { - promotionModes.push( { + for (var chatId in idrinth.chat.chatRank) { + var intChatId = parseInt ( chatId, 10 ); + if ( document.getElementById ( 'idrinth-chat-tab-click-' + chatId ) && intChatId !== chat && intChatId > 1 && !( user in idrinth.chat.chatRank[chatId] ) ) { + promotionModes.push ( { chat: chatId, - label: 'Invite to Chat ' + document.getElementById( 'idrinth-chat-tab-click-' + chatId ).innerHTML, + label: 'Invite to Chat ' + document.getElementById ( 'idrinth-chat-tab-click-' + chatId ).innerHTML, rank: 'User', requiredRank: 1 } ); @@ -97,70 +97,70 @@ idrinth.chat = { var hasRights = function ( reqRank, ownRank ) { return reqRank <= ownRank; }; - if ( !hasRights( node.requiredRank, ownRank ) ) { + if ( !hasRights ( node.requiredRank, ownRank ) ) { return; } return { content: node.label, type: 'li', - attributes: [{ - name: 'onclick', - value: 'idrinth.chat.useroptions(' + node.chat + ',' + user + ',\'' + node.rank + '\');' - + 'this.parentNode.parentNode.removeChild(this.parentNode);' - }] + attributes: [ { + name: 'onclick', + value: 'idrinth.chat.useroptions(' + node.chat + ',' + user + ',\'' + node.rank + '\');' + + 'this.parentNode.parentNode.removeChild(this.parentNode);' + } ] }; }; - var popupContent = []; - var promotionModes = getPromotionOptions( parseInt( chat, 10 ), user ); - for ( var count = 0; count < promotionModes.length; count++ ) { - var tmp = promoteNode( promotionModes[count], user, rankId ); + var popupContent = [ ]; + var promotionModes = getPromotionOptions ( parseInt ( chat, 10 ), user ); + for (var count = 0; count < promotionModes.length; count++) { + var tmp = promoteNode ( promotionModes[count], user, rankId ); if ( tmp ) { - popupContent.push( tmp ); + popupContent.push ( tmp ); } } return popupContent; }; - var rankId = parseInt( idrinth.chat.chatRank[chat][idrinth.chat.self], 10 ); - var popupContent = getPopupContent( chat, user, rankId ); + var rankId = parseInt ( idrinth.chat.chatRank[chat][idrinth.chat.self], 10 ); + var popupContent = getPopupContent ( chat, user, rankId ); if ( popupContent.length === 0 ) { return; } - popupContent.push( { + popupContent.push ( { type: 'li', content: 'Close', - attributes: [{ - name: 'onclick', - value: 'this.parentNode.parentNode.removeChild(this.parentNode);' - }] + attributes: [ { + name: 'onclick', + value: 'this.parentNode.parentNode.removeChild(this.parentNode);' + } ] } ); - idrinth.ui.body.appendChild( idrinth.ui.buildElement( { + idrinth.ui.body.appendChild ( idrinth.ui.buildElement ( { type: 'ul', children: popupContent, css: 'idrinth-userinfo-box', - attributes: [{ - name: 'style', - value: idrinth.ui.getElementPositioning( element ) - }] + attributes: [ { + name: 'style', + value: idrinth.ui.getElementPositioning ( element ) + } ] } ) ); }, useroptions: function ( chat, user, rank ) { - idrinth.core.ajax.runHome( + idrinth.core.ajax.runHome ( 'chat-service/rank/', function ( reply ) { try { - reply = JSON.parse( reply ); - idrinth.core.alert( reply.message ); + reply = JSON.parse ( reply ); + idrinth.core.alert ( reply.message ); } catch ( e ) { - idrinth.core.log( e ); + idrinth.core.log ( e ); } }, function ( reply ) { - idrinth.core.alert( idrinth.text.get( "chat.message.modifyFail" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.message.modifyFail" ) ); }, function ( reply ) { - idrinth.core.alert( idrinth.text.get( "chat.message.modifyFail" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.message.modifyFail" ) ); }, - JSON.stringify( { + JSON.stringify ( { chat: chat, user: user, access: rank @@ -171,95 +171,95 @@ idrinth.chat = { var complexHandler = function ( message, regex, callbacks, lastField ) { var partHandler = function ( count, callbacks, text, textcontent ) { var callbackHandler = function ( textcontent, func, text ) { - var tmp = func( text ); - for ( var c2 = 0; c2 < tmp.length; c2++ ) { + var tmp = func ( text ); + for (var c2 = 0; c2 < tmp.length; c2++) { if ( tmp[c2] !== undefined ) { - textcontent.push( tmp[c2] ); + textcontent.push ( tmp[c2] ); } } return textcontent; }; if ( count % 2 === 0 && typeof callbacks[1] === 'function' ) { - textcontent = callbackHandler( textcontent, callbacks[1], text[Math.ceil( count / 2 )] ); - } else if ( count % 2 === 0 && text[Math.ceil( count / 2 )] !== undefined ) { - textcontent.push( { + textcontent = callbackHandler ( textcontent, callbacks[1], text[Math.ceil ( count / 2 )] ); + } else if ( count % 2 === 0 && text[Math.ceil ( count / 2 )] !== undefined ) { + textcontent.push ( { type: '#text', - content: text[Math.ceil( count / 2 )] + content: text[Math.ceil ( count / 2 )] } ); } else { - textcontent.push( callbacks[0]( matches[Math.ceil(( count - 1 ) / 2 )] ) ); + textcontent.push ( callbacks[0] ( matches[Math.ceil ( ( count - 1 ) / 2 )] ) ); } return textcontent; }; - var matches = message.match( regex ); - var text = ( message.replace( regex, '$1########$' + lastField ) ).split( '########' ); - var textcontent = []; - var length = ( matches && Array.isArray( matches ) ? matches.length : 0 ) + ( text && Array.isArray( text ) ? text.length : 0 ); - for ( var count = 0; count < length; count++ ) { - textcontent = partHandler( count, callbacks, text, textcontent ); + var matches = message.match ( regex ); + var text = ( message.replace ( regex, '$1########$' + lastField ) ).split ( '########' ); + var textcontent = [ ]; + var length = ( matches && Array.isArray ( matches ) ? matches.length : 0 ) + ( text && Array.isArray ( text ) ? text.length : 0 ); + for (var count = 0; count < length; count++) { + textcontent = partHandler ( count, callbacks, text, textcontent ); } return textcontent; }; var simpleHandler = function ( message, callbacks ) { if ( typeof callbacks[1] === 'function' ) { - var textcontent = []; - var tmp = callbacks[1]( message ); - for ( var c2 = 0; c2 < tmp.length; c2++ ) { - textcontent.push( tmp[c2] ); + var textcontent = [ ]; + var tmp = callbacks[1] ( message ); + for (var c2 = 0; c2 < tmp.length; c2++) { + textcontent.push ( tmp[c2] ); } return textcontent; } - return [{ - type: '#text', - content: message - }]; + return [ { + type: '#text', + content: message + } ]; }; try { - return complexHandler( message, regex, callbacks, lastField ); + return complexHandler ( message, regex, callbacks, lastField ); } catch ( e ) { - return simpleHandler( message, callbacks ); + return simpleHandler ( message, callbacks ); } }, buildEmoticons: function ( message ) { if ( !idrinth.chat.emotes.lookup ) { return message; } - var part = idrinth.core.escapeRegExp( Object.keys( idrinth.chat.emotes.lookup ).join( 'TTTT' ) ); - var reg = new RegExp( '(^| )(' + part.replace( /TTTT/g, '|' ) + ')($| )', 'g' ); - return idrinth.chat.replaceInText( message, reg, [function ( match ) { - var el = idrinth.chat.emotes.positions[idrinth.chat.emotes.lookup[match.replace( / /g, '' )]]; - return { - type: 'span', - css: 'idrinth-emoticon', - attributes: [ - { - name: 'style', - value: 'background-position: 0px -' + el / 8 + 'px;' - }, - { - name: 'title', - value: message - } - ], - children: [ - { - type: 'span', - attributes: [{ + var part = idrinth.core.escapeRegExp ( Object.keys ( idrinth.chat.emotes.lookup ).join ( 'TTTT' ) ); + var reg = new RegExp ( '(^| )(' + part.replace ( /TTTT/g, '|' ) + ')($| )', 'g' ); + return idrinth.chat.replaceInText ( message, reg, [ function ( match ) { + var el = idrinth.chat.emotes.positions[idrinth.chat.emotes.lookup[match.replace ( / /g, '' )]]; + return { + type: 'span', + css: 'idrinth-emoticon', + attributes: [ + { name: 'style', - value: 'background-position: 0px -' + el / 2 + 'px;' - }] - } - ] - }; - }], 3 ); + value: 'background-position: 0px -' + el / 8 + 'px;' + }, + { + name: 'title', + value: message + } + ], + children: [ + { + type: 'span', + attributes: [ { + name: 'style', + value: 'background-position: 0px -' + el / 2 + 'px;' + } ] + } + ] + }; + } ], 3 ); }, buildMessageText: function ( message ) { - var reg = new RegExp( '(^|\\W)(https?://([^/ ]+)(/.*?)?)($| )', 'ig' ); - return idrinth.chat.replaceInText( message, reg, [ + var reg = new RegExp ( '(^|\\W)(https?://([^/ ]+)(/.*?)?)($| )', 'ig' ); + return idrinth.chat.replaceInText ( message, reg, [ function ( match ) { return { type: 'a', - content: match.match( /:\/\/([^\/]+?)(\/|$)/ )[1], + content: match.match ( /:\/\/([^\/]+?)(\/|$)/ )[1], attributes: [ { name: 'href', @@ -275,80 +275,80 @@ idrinth.chat = { } ] }; - }, idrinth.chat.buildEmoticons], 5 ); + }, idrinth.chat.buildEmoticons ], 5 ); }, applyMessages: function ( data ) { var processMessages = function ( messages ) { var addMessages = function ( chatMessages, chatId, chatElement ) { var buildMessage = function ( message, chat, chatId, messageId ) { var getfullDateInt = function () { - function addZero( x, n ) { - while ( x.toString().length < n ) { + function addZero ( x, n ) { + while ( x.toString ().length < n ) { x = "0" + x; } return x; } - var d = new Date(); - return addZero( d.getFullYear(), 2 ) + - addZero( d.getMonth(), 2 ) + - addZero( d.getDate(), 2 ) + - addZero( d.getHours(), 2 ) + - addZero( d.getMinutes(), 2 ) + - addZero( d.getSeconds(), 2 ) + - addZero( d.getMilliseconds(), 3 ); + var d = new Date (); + return addZero ( d.getFullYear (), 2 ) + + addZero ( d.getMonth (), 2 ) + + addZero ( d.getDate (), 2 ) + + addZero ( d.getHours (), 2 ) + + addZero ( d.getMinutes (), 2 ) + + addZero ( d.getSeconds (), 2 ) + + addZero ( d.getMilliseconds (), 3 ); }; var notify = function ( message, own, chatId ) { var notActive = function ( chatId ) { try { return !idrinth.windowactive || - !( document.getElementById( 'idrinth-chat-tab-click-' + chatId ).getAttribute( 'class' ) ).match( /(\s|^)active( |$)/ ) || - !( document.getElementById( 'idrinth-chat' ).getAttribute( 'class' ) ).match( /(\s|^)active( |$)/ ); + !( document.getElementById ( 'idrinth-chat-tab-click-' + chatId ).getAttribute ( 'class' ) ).match ( /(\s|^)active( |$)/ ) || + !( document.getElementById ( 'idrinth-chat' ).getAttribute ( 'class' ) ).match ( /(\s|^)active( |$)/ ); } catch ( e ) { - idrinth.core.log( e.getMessage ); + idrinth.core.log ( e.getMessage ); return true; } }; var messageAllowed = function ( text ) { try { - return ( idrinth.settings.notification.message && text.match( /\{[A-Z]{2}-Raid / ) === null ) || - ( idrinth.settings.notification.mention && text.match( new RegExp( '(\s|^)' + idrinth.core.escapeRegExp( idrinth.chat.users[idrinth.chat.self].name ) + '(\s|$)', 'i' ) ) !== null ) || - ( idrinth.settings.notification.raid && text.match( /\{[A-Z]{2}-Raid / ) !== null ); + return ( idrinth.settings.notification.message && text.match ( /\{[A-Z]{2}-Raid / ) === null ) || + ( idrinth.settings.notification.mention && text.match ( new RegExp ( '(\s|^)' + idrinth.core.escapeRegExp ( idrinth.chat.users[idrinth.chat.self].name ) + '(\s|$)', 'i' ) ) !== null ) || + ( idrinth.settings.notification.raid && text.match ( /\{[A-Z]{2}-Raid / ) !== null ); } catch ( e ) { - idrinth.core.log( e.getMessage() ); + idrinth.core.log ( e.getMessage () ); return false; } }; - if ( !own && notActive( chatId ) && messageAllowed( message.text ) ) { + if ( !own && notActive ( chatId ) && messageAllowed ( message.text ) ) { try { - idrinth.core.sendNotification( - message.time.split( ' ' )[1] + ' ' + document.getElementById( 'idrinth-chat-tab-click-' + chatId ).innerHTML + ':', + idrinth.core.sendNotification ( + message.time.split ( ' ' )[1] + ' ' + document.getElementById ( 'idrinth-chat-tab-click-' + chatId ).innerHTML + ':', idrinth.chat.users[message.user].name + ': ' + message.text ); } catch ( exception ) { - idrinth.core.log( exception.getMessage() ); + idrinth.core.log ( exception.getMessage () ); } } }; - var own = parseInt( message.user, 10 ) === parseInt( idrinth.chat.self, 10 ); - notify( message, own, chatId ); - chat.appendChild( idrinth.ui.buildElement( + var own = parseInt ( message.user, 10 ) === parseInt ( idrinth.chat.self, 10 ); + notify ( message, own, chatId ); + chat.appendChild ( idrinth.ui.buildElement ( { type: 'li', - id: 'idrinth-single-chat-message-' + messageId + ( parseInt( messageId, 10 ) < 1 ? '-' + getfullDateInt() : '' ), + id: 'idrinth-single-chat-message-' + messageId + ( parseInt ( messageId, 10 ) < 1 ? '-' + getfullDateInt () : '' ), css: own ? 'self-written ' : '', children: [ { type: 'span', css: 'time', - content: message.time.split( ' ' )[1], - attributes: [{ - name: 'title', - value: message.time - }] + content: message.time.split ( ' ' )[1], + attributes: [ { + name: 'title', + value: message.time + } ] }, { type: 'span', - css: 'user ' + idrinth.chat.ranks[parseInt( idrinth.chat.chatRank[chatId][message.user], 10 )] + ( message.user === 0 ? ' system-message' : '' ), + css: 'user ' + idrinth.chat.ranks[parseInt ( idrinth.chat.chatRank[chatId][message.user], 10 )] + ( message.user === 0 ? ' system-message' : '' ), content: idrinth.chat.users[message.user].name, attributes: [ { @@ -367,18 +367,18 @@ idrinth.chat = { }, { type: 'span', - children: idrinth.chat.buildMessageText( message.text ) + children: idrinth.chat.buildMessageText ( message.text ) } ] } ) ); }; var isNew = false; - for ( var messageId in chatMessages ) { - if ( parseInt( messageId, 10 ) < 1 || !document.getElementById( 'idrinth-single-chat-message-' + messageId ) ) { + for (var messageId in chatMessages) { + if ( parseInt ( messageId, 10 ) < 1 || !document.getElementById ( 'idrinth-single-chat-message-' + messageId ) ) { isNew = true; - buildMessage( messages[chatId][messageId], chatElement, chatId, messageId ); - if ( parseInt( messageId, 10 ) > parseInt( idrinth.chat.maxId, 10 ) ) { + buildMessage ( messages[chatId][messageId], chatElement, chatId, messageId ); + if ( parseInt ( messageId, 10 ) > parseInt ( idrinth.chat.maxId, 10 ) ) { idrinth.chat.maxId = messageId; } } @@ -387,22 +387,22 @@ idrinth.chat = { }; var setChatClass = function ( isNew, chat, chatId ) { var isActive = function ( element ) { - var cssClass = element.getAttribute( 'class' ); - return !( !cssClass ) && !( !cssClass.match( /(^|\s)active(\s|$)/ ) ); + var cssClass = element.getAttribute ( 'class' ); + return !( !cssClass ) && !( !cssClass.match ( /(^|\s)active(\s|$)/ ) ); }; - var chatActive = isActive( document.getElementById( 'idrinth-chat' ) ); + var chatActive = isActive ( document.getElementById ( 'idrinth-chat' ) ); if ( isNew && !chatActive ) { - document.getElementById( 'idrinth-chat' ).setAttribute( 'class', 'new-message' ); + document.getElementById ( 'idrinth-chat' ).setAttribute ( 'class', 'new-message' ); } - var tab = document.getElementById( 'idrinth-chat-tab-click-' + chatId ); - var tabActive = isActive( tab ); + var tab = document.getElementById ( 'idrinth-chat-tab-click-' + chatId ); + var tabActive = isActive ( tab ); if ( isNew && !tabActive ) { - tab.setAttribute( 'class', tab.getAttribute( 'class' ) + ' new-message' ); + tab.setAttribute ( 'class', tab.getAttribute ( 'class' ) + ' new-message' ); } else if ( tabActive && chatActive && chat.lastChild.scrollTop < chat.lastChild.scrollHeight ) { try { - chat.lastChild.scrollIntoView( false ); + chat.lastChild.scrollIntoView ( false ); } catch ( e ) { - idrinth.core.log( e ); + idrinth.core.log ( e ); } chat.lastChild.scrollTop = chat.lastChild.scrollHeight; } @@ -410,46 +410,46 @@ idrinth.chat = { if ( idrinth.chat.maxId === 0 ) { idrinth.chat.maxId = 1; } - for ( var key in messages ) { + for (var key in messages) { if ( - !isNaN( parseInt( key, 10 ) ) - && document.getElementById( 'idrinth-chat-tab-' + key ) - && document.getElementById( 'idrinth-chat-tab-' + key ).getElementsByTagName( 'ul' )[1] ) { - var chat = document.getElementById( 'idrinth-chat-tab-' + key ).getElementsByTagName( 'ul' )[1]; - setChatClass( addMessages( messages[key], key, chat ), chat, key ); + !isNaN ( parseInt ( key, 10 ) ) + && document.getElementById ( 'idrinth-chat-tab-' + key ) + && document.getElementById ( 'idrinth-chat-tab-' + key ).getElementsByTagName ( 'ul' )[1] ) { + var chat = document.getElementById ( 'idrinth-chat-tab-' + key ).getElementsByTagName ( 'ul' )[1]; + setChatClass ( addMessages ( messages[key], key, chat ), chat, key ); } } }; if ( !data ) { - return idrinth.chat.returnMessages( data ); + return idrinth.chat.returnMessages ( data ); } - data = JSON.parse( data ); + data = JSON.parse ( data ); if ( !data ) { - return idrinth.chat.returnMessages( data ); + return idrinth.chat.returnMessages ( data ); } if ( data.login ) { - return idrinth.chat.relogin(); + return idrinth.chat.relogin (); } if ( data.messages ) { - processMessages( data.messages ); + processMessages ( data.messages ); } - idrinth.chat.oldMessages = []; - idrinth.chat.updateTimeout = window.setTimeout( idrinth.chat.refreshChats, 999 ); + idrinth.chat.oldMessages = [ ]; + idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 999 ); }, - ranks: ['', 'banned', 'user', 'mod', 'owner'], + ranks: [ '', 'banned', 'user', 'mod', 'owner' ], applyMembers: function ( data ) { var applyMemberData = function () { var addMemberElement = function ( chat, chatId, userId ) { var usedPlatforms = ''; - for ( var pkey in idrinth.chat.users[userId].platforms ) { + for (var pkey in idrinth.chat.users[userId].platforms) { if ( idrinth.chat.users[userId].platforms[pkey] ) { usedPlatforms += pkey; } } - chat.appendChild( idrinth.ui.buildElement( { + chat.appendChild ( idrinth.ui.buildElement ( { type: 'li', - css: 'user ' + idrinth.chat.ranks[parseInt( idrinth.chat.chatRank[chatId][userId], 10 )], - content: ( usedPlatforms === '' ? '' : '[' + usedPlatforms.toUpperCase() + '] ' ) + idrinth.chat.users[userId].name, + css: 'user ' + idrinth.chat.ranks[parseInt ( idrinth.chat.chatRank[chatId][userId], 10 )], + content: ( usedPlatforms === '' ? '' : '[' + usedPlatforms.toUpperCase () + '] ' ) + idrinth.chat.users[userId].name, attributes: [ { name: 'data-id', @@ -463,33 +463,33 @@ idrinth.chat = { } ) ); }; - for ( var chatId in idrinth.chat.chatRank ) { - if ( document.getElementById( 'idrinth-chat-tab-' + chatId ) ) { - var chat = document.getElementById( 'idrinth-chat-tab-' + chatId ).getElementsByTagName( 'ul' )[0]; + for (var chatId in idrinth.chat.chatRank) { + if ( document.getElementById ( 'idrinth-chat-tab-' + chatId ) ) { + var chat = document.getElementById ( 'idrinth-chat-tab-' + chatId ).getElementsByTagName ( 'ul' )[0]; while ( chat.firstChild ) { - chat.removeChild( chat.firstChild ); + chat.removeChild ( chat.firstChild ); } - for ( var userId in idrinth.chat.chatRank[chatId] ) { - if ( idrinth.chat.chatRank[chatId].hasOwnProperty( userId ) ) { - addMemberElement( chat, chatId, userId ); + for (var userId in idrinth.chat.chatRank[chatId]) { + if ( idrinth.chat.chatRank[chatId].hasOwnProperty ( userId ) ) { + addMemberElement ( chat, chatId, userId ); } } } } }; if ( !data ) { - return idrinth.chat.returnMessages( data ); + return idrinth.chat.returnMessages ( data ); } - data = JSON.parse( data ); + data = JSON.parse ( data ); if ( !data ) { - return idrinth.chat.returnMessages( data ); + return idrinth.chat.returnMessages ( data ); } idrinth.chat.self = data.self; idrinth.chat.users = data.users; idrinth.chat.chatRank = data.members; - applyMemberData(); + applyMemberData (); }, - emotes: {}, + emotes: { }, start: function () { var build = function () { var makeInput = function ( label ) { @@ -537,165 +537,165 @@ idrinth.chat = { ] }; }; - return idrinth.ui.buildElement( { + return idrinth.ui.buildElement ( { id: 'idrinth-chat', css: 'idrinth-hovering-box' + ( !idrinth.settings.chatHiddenOnStart ? ' active' : '' ) + ( idrinth.settings.moveLeft ? ' left-sided' : '' ), children: [ { type: 'button', content: ( idrinth.settings.chatHiddenOnStart ? '<<' : '>>' ), - attributes: [{ - name: 'onclick', - value: 'idrinth.chat.openCloseChat(this);' - }] + attributes: [ { + name: 'onclick', + value: 'idrinth.chat.openCloseChat(this);' + } ] }, { type: 'ul', css: 'styles-scrollbar chat-labels', - children: [{ - type: 'li', - css: 'active', - content: "\u2699", - attributes: [ - { - name: 'onclick', - value: 'idrinth.chat.enableChat(this);' - }, - { - name: 'data-id', - value: '0' - } - ] - }] + children: [ { + type: 'li', + css: 'active', + content: "\u2699", + attributes: [ + { + name: 'onclick', + value: 'idrinth.chat.enableChat(this);' + }, + { + name: 'data-id', + value: '0' + } + ] + } ] }, { type: 'ul', css: 'chat-tabs', - children: [{ - type: 'li', - css: 'styles-scrollbar active', - attributes: [ - { - name: 'data-id', - value: '0' - } - ], - children: [ - { - type: 'h1', - content: idrinth.text.get( "chat.ui.chat" ) - }, - { - type: 'p', - content: idrinth.text.get( "chat.message.optional" ), - }, { - id: 'idrinth-chat-login', - children: [ - { - type: 'h2', - content: idrinth.text.get( "chat.ui.account" ), - }, - { - type: 'p', - content: idrinth.text.get( "chat.message.invalid" ), - }, - { - type: 'ul', - css: 'settings', - children: [ - makeInput( 'Username' ), - makeInput( 'Password' ), - makeButton( idrinth.text.get( "chat.message.offline" ), "idrinth.chat.login()" ) - ] - } - ] - }, { - id: 'idrinth-add-chat', - children: [ - { - type: 'h2', - content: idrinth.text.get( "chat.ui.joinChat" ), - }, - { - type: 'ul', - css: 'settings', - children: [ - makeInput( 'Chat-ID' ), - makeInput( 'Chat-Password' ), - makeButton( idrinth.text.get( "chat.ui.createAddChat" ), "idrinth.chat.add()" ) - ] - } - ] - }, - { - id: 'idrinth-make-chat', - children: [ - { - type: 'h2', - content: idrinth.text.get( "chat.ui.createChat" ) - }, - { - type: 'ul', - css: 'settings', - children: [ - makeInput( "Name" ), - makeButton( idrinth.text.get( "chat.ui.createAddChat" ), "idrinth.chat.create()" ) - ] - } - ] - }, { - type: 'li', - children: [ - { - type: '#text', - content: idrinth.text.get( "chat.ui.moreSettings" ), - }, - { - type: 'a', - content: 'dotd.idrinth.de/' + idrinth.platform + '/chat/', - attributes: [ - { - name: 'target', - value: '_blank' - }, - { - name: 'href', - value: 'https://dotd.idrinth.de/' + idrinth.platform + '/chat/' - } - ] - }, - { - type: '#text', - content: '.' - } - ] - }, { - type: 'li', - children: [ - { - type: '#text', - content: idrinth.text.get( "chat.ui.creditEmoticon" ) - }, - { - type: 'a', - content: 'emoticonshd.com', - attributes: [ - { - name: 'target', - value: '_blank' - }, - { - name: 'href', - value: 'http://emoticonshd.com/' - } - ] - }, - { - type: '#text', - content: '.' - } - ] - } - ] - } + children: [ { + type: 'li', + css: 'styles-scrollbar active', + attributes: [ + { + name: 'data-id', + value: '0' + } + ], + children: [ + { + type: 'h1', + content: idrinth.text.get ( "chat.ui.chat" ) + }, + { + type: 'p', + content: idrinth.text.get ( "chat.message.optional" ), + }, { + id: 'idrinth-chat-login', + children: [ + { + type: 'h2', + content: idrinth.text.get ( "chat.ui.account" ), + }, + { + type: 'p', + content: idrinth.text.get ( "chat.message.invalid" ), + }, + { + type: 'ul', + css: 'settings', + children: [ + makeInput ( 'Username' ), + makeInput ( 'Password' ), + makeButton ( idrinth.text.get ( "chat.message.offline" ), "idrinth.chat.login()" ) + ] + } + ] + }, { + id: 'idrinth-add-chat', + children: [ + { + type: 'h2', + content: idrinth.text.get ( "chat.ui.joinChat" ), + }, + { + type: 'ul', + css: 'settings', + children: [ + makeInput ( 'Chat-ID' ), + makeInput ( 'Chat-Password' ), + makeButton ( idrinth.text.get ( "chat.ui.createAddChat" ), "idrinth.chat.add()" ) + ] + } + ] + }, + { + id: 'idrinth-make-chat', + children: [ + { + type: 'h2', + content: idrinth.text.get ( "chat.ui.createChat" ) + }, + { + type: 'ul', + css: 'settings', + children: [ + makeInput ( "Name" ), + makeButton ( idrinth.text.get ( "chat.ui.createAddChat" ), "idrinth.chat.create()" ) + ] + } + ] + }, { + type: 'li', + children: [ + { + type: '#text', + content: idrinth.text.get ( "chat.ui.moreSettings" ), + }, + { + type: 'a', + content: 'dotd.idrinth.de/' + idrinth.platform + '/chat/', + attributes: [ + { + name: 'target', + value: '_blank' + }, + { + name: 'href', + value: 'https://dotd.idrinth.de/' + idrinth.platform + '/chat/' + } + ] + }, + { + type: '#text', + content: '.' + } + ] + }, { + type: 'li', + children: [ + { + type: '#text', + content: idrinth.text.get ( "chat.ui.creditEmoticon" ) + }, + { + type: 'a', + content: 'emoticonshd.com', + attributes: [ + { + name: 'target', + value: '_blank' + }, + { + name: 'href', + value: 'http://emoticonshd.com/' + } + ] + }, + { + type: '#text', + content: '.' + } + ] + } + ] + } ] } ] @@ -704,31 +704,31 @@ idrinth.chat = { if ( !idrinth.settings.chatting ) { return; } - if ( !document.getElementById( 'idrinth-chat' ) ) { - idrinth.ui.body.appendChild( build() ); - idrinth.chat.elements.chats = document.getElementById( 'idrinth-chat' ).getElementsByTagName( 'ul' )[1]; - idrinth.chat.elements.menu = document.getElementById( 'idrinth-chat' ).getElementsByTagName( 'ul' )[0]; + if ( !document.getElementById ( 'idrinth-chat' ) ) { + idrinth.ui.body.appendChild ( build () ); + idrinth.chat.elements.chats = document.getElementById ( 'idrinth-chat' ).getElementsByTagName ( 'ul' )[1]; + idrinth.chat.elements.menu = document.getElementById ( 'idrinth-chat' ).getElementsByTagName ( 'ul' )[0]; } - window.setTimeout( function () { - idrinth.core.ajax.runHome( + window.setTimeout ( function () { + idrinth.core.ajax.runHome ( 'chat-service/login/', idrinth.chat.startLoginCallback, function ( reply ) { }, function ( reply ) { - window.setTimeout( idrinth.chat.login, 1 ); + window.setTimeout ( idrinth.chat.login, 1 ); }, - JSON.stringify( { + JSON.stringify ( { user: idrinth.settings.chatuser, pass: idrinth.settings.chatpass } ) ); }, 2500 ); - window.setTimeout( function () { - idrinth.core.ajax.runHome( + window.setTimeout ( function () { + idrinth.core.ajax.runHome ( 'emoticons/data/', function ( reply ) { - idrinth.chat.emotes = JSON.parse( reply ); + idrinth.chat.emotes = JSON.parse ( reply ); }, function ( reply ) { }, @@ -740,193 +740,193 @@ idrinth.chat = { }, 1 ); }, create: function () { - idrinth.core.ajax.runHome( + idrinth.core.ajax.runHome ( 'chat-service/create/', idrinth.chat.joinCallback, function ( reply ) { - idrinth.core.alert( idrinth.text.get( "chat.message.createFail" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.message.createFail" ) ); }, function ( reply ) { - idrinth.core.alert( idrinth.text.get( "chat.message.createFail" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.message.createFail" ) ); }, - document.getElementById( 'idrinth-make-chat' ).getElementsByTagName( 'input' )[0].value + document.getElementById ( 'idrinth-make-chat' ).getElementsByTagName ( 'input' )[0].value ); }, joinCallback: function ( reply ) { if ( !reply ) { - idrinth.core.alert( idrinth.text.get( "chat.message.joinFailMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.message.joinFailMoment" ) ); return; } - reply = JSON.parse( reply ); + reply = JSON.parse ( reply ); if ( !reply ) { - idrinth.core.alert( idrinth.text.get( "chat.message.joinFailMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.message.joinFailMoment" ) ); return; } if ( !reply.success ) { if ( reply.message ) { - idrinth.core.alert( reply.message ); + idrinth.core.alert ( reply.message ); } else { - idrinth.core.alert( idrinth.text.get( "chat.message.joinFail" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.message.joinFail" ) ); } return; } - idrinth.ui.buildChat( reply.data.id, reply.data.name, reply.data.access, reply.data.pass ); - document.getElementById( 'idrinth-add-chat' ).getElementsByTagName( 'input' )[0].value = ''; - document.getElementById( 'idrinth-add-chat' ).getElementsByTagName( 'input' )[1].value = ''; - document.getElementById( 'idrinth-make-chat' ).getElementsByTagName( 'input' )[0].value = ''; + idrinth.ui.buildChat ( reply.data.id, reply.data.name, reply.data.access, reply.data.pass ); + document.getElementById ( 'idrinth-add-chat' ).getElementsByTagName ( 'input' )[0].value = ''; + document.getElementById ( 'idrinth-add-chat' ).getElementsByTagName ( 'input' )[1].value = ''; + document.getElementById ( 'idrinth-make-chat' ).getElementsByTagName ( 'input' )[0].value = ''; }, - users: {}, + users: { }, updateTimeout: null, add: function () { - idrinth.core.ajax.runHome( + idrinth.core.ajax.runHome ( 'chat-service/join/', idrinth.chat.joinCallback, function ( reply ) { - idrinth.core.alert( idrinth.text.get( "chat.message.joinFailMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.message.joinFailMoment" ) ); }, function ( reply ) { - idrinth.core.alert( idrinth.text.get( "chat.message.joinFailMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.message.joinFailMoment" ) ); }, - JSON.stringify( { - id: document.getElementById( 'idrinth-add-chat' ).getElementsByTagName( 'input' )[0].value, - pass: document.getElementById( 'idrinth-add-chat' ).getElementsByTagName( 'input' )[1].value + JSON.stringify ( { + id: document.getElementById ( 'idrinth-add-chat' ).getElementsByTagName ( 'input' )[0].value, + pass: document.getElementById ( 'idrinth-add-chat' ).getElementsByTagName ( 'input' )[1].value } ) ); }, send: function ( id ) { - idrinth.chat.messages.push( { + idrinth.chat.messages.push ( { chat: id, - text: document.getElementById( 'idrinth-chat-input-' + id ).value + text: document.getElementById ( 'idrinth-chat-input-' + id ).value } ); - document.getElementById( 'idrinth-chat-input-' + id ).value = ''; + document.getElementById ( 'idrinth-chat-input-' + id ).value = ''; }, join: function ( list ) { - for ( var chatId in list ) { - if ( !document.getElementById( 'idrinth-chat-tab-' + chatId ) ) { - idrinth.ui.buildChat( chatId, list[chatId].name, list[chatId].access, list[chatId].pass ); + for (var chatId in list) { + if ( !document.getElementById ( 'idrinth-chat-tab-' + chatId ) ) { + idrinth.ui.buildChat ( chatId, list[chatId].name, list[chatId].access, list[chatId].pass ); } } if ( idrinth.chat.updateTimeout ) { return; } - idrinth.chat.updateTimeout = window.setTimeout( idrinth.chat.refreshChats, 1500 ); - idrinth.chat.refreshMembers(); + idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 1500 ); + idrinth.chat.refreshMembers (); }, startLoginCallback: function ( data ) { if ( !data ) { return; } - data = JSON.parse( data ); + data = JSON.parse ( data ); if ( !data || !data.success ) { return; } - idrinth.ui.removeElement( 'idrinth-chat-login' ); - idrinth.chat.join( data.data ); + idrinth.ui.removeElement ( 'idrinth-chat-login' ); + idrinth.chat.join ( data.data ); }, loginCallback: function ( data ) { if ( !data ) { - idrinth.core.alert( idrinth.text.get( "chat.message.loginFailMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.message.loginFailMoment" ) ); return; } - data = JSON.parse( data ); + data = JSON.parse ( data ); if ( !data ) { - idrinth.core.alert( idrinth.text.get( "chat.message.loginFailMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.message.loginFailMoment" ) ); return; } if ( !data.success && data.message && data['allow-reg'] ) { - idrinth.core.confirm( idrinth.text.get( "chat.message.unknown" ), 'idrinth.chat.register();' ); + idrinth.core.confirm ( idrinth.text.get ( "chat.message.unknown" ), 'idrinth.chat.register();' ); return; } if ( !data.success && data.message ) { - idrinth.core.alert( data.message ); + idrinth.core.alert ( data.message ); return; } if ( data.success ) { - idrinth.settings.chatuser = document.getElementById( 'idrinth-chat-login' ).getElementsByTagName( 'input' )[0].value; - idrinth.settings.chatpass = document.getElementById( 'idrinth-chat-login' ).getElementsByTagName( 'input' )[1].value; - idrinth.settings.save(); - idrinth.ui.removeElement( 'idrinth-chat-login' ); - idrinth.chat.join( data.data ); + idrinth.settings.chatuser = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[0].value; + idrinth.settings.chatpass = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[1].value; + idrinth.settings.save (); + idrinth.ui.removeElement ( 'idrinth-chat-login' ); + idrinth.chat.join ( data.data ); return; } - idrinth.core.alert( idrinth.text.get( "chat.message.loginFailMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.message.loginFailMoment" ) ); }, register: function () { - this.loginActions( 'register' ); + this.loginActions ( 'register' ); }, login: function () { - this.loginActions( 'login' ); + this.loginActions ( 'login' ); }, relogin: function () { - this.loginActions( 'relogin' ); + this.loginActions ( 'relogin' ); }, showOptions: function ( event, element ) { - event.preventDefault(); - idrinth.ui.body.appendChild( idrinth.ui.buildElement( { + event.preventDefault (); + idrinth.ui.body.appendChild ( idrinth.ui.buildElement ( { type: 'ul', css: 'idrinth-hovering-box', - children: [{ - css: 'clipboard-copy', - content: idrinth.text.get( "chat.ui.copyIdPasswort" ), - type: 'li', - attributes: [{ - name: 'data-clipboard-text', - value: element.getAttribute( 'title' ) - }] - }, { - content: idrinth.text.get( "chat.ui.leaveRoom" ), - type: 'li', - attributes: [{ - name: 'onclick', - value: 'idrinth.chat.useroptions(' + element.getAttribute( 'data-id' ) + ',' + idrinth.chat.self + ',\'Leave\');this.parentNode.parentNode.removeChild(this.parentNode);' - }] - }, { - content: idrinth.text.get( "chat.ui.deleteRoom" ), - type: 'li', - attributes: [{ - name: 'onclick', - value: 'idrinth.core.ajax.runHome(\'chat-service/delete/' + element.getAttribute( 'data-id' ) + '/\',idrinth.core.alert,idrinth.core.alert,idrinth.core.alert);this.parentNode.parentNode.removeChild(this.parentNode);' - }] - }, { - type: 'li', - content: idrinth.text.get( "chat.ui.close" ), - attributes: [{ - name: 'onclick', - value: 'this.parentNode.parentNode.removeChild(this.parentNode);' - }] - } + children: [ { + css: 'clipboard-copy', + content: idrinth.text.get ( "chat.ui.copyIdPasswort" ), + type: 'li', + attributes: [ { + name: 'data-clipboard-text', + value: element.getAttribute ( 'title' ) + } ] + }, { + content: idrinth.text.get ( "chat.ui.leaveRoom" ), + type: 'li', + attributes: [ { + name: 'onclick', + value: 'idrinth.chat.useroptions(' + element.getAttribute ( 'data-id' ) + ',' + idrinth.chat.self + ',\'Leave\');this.parentNode.parentNode.removeChild(this.parentNode);' + } ] + }, { + content: idrinth.text.get ( "chat.ui.deleteRoom" ), + type: 'li', + attributes: [ { + name: 'onclick', + value: 'idrinth.core.ajax.runHome(\'chat-service/delete/' + element.getAttribute ( 'data-id' ) + '/\',idrinth.core.alert,idrinth.core.alert,idrinth.core.alert);this.parentNode.parentNode.removeChild(this.parentNode);' + } ] + }, { + type: 'li', + content: idrinth.text.get ( "chat.ui.close" ), + attributes: [ { + name: 'onclick', + value: 'this.parentNode.parentNode.removeChild(this.parentNode);' + } ] + } ], - attributes: [{ - name: 'style', - value: idrinth.ui.getPosition( element ) - }] + attributes: [ { + name: 'style', + value: idrinth.ui.getPosition ( element ) + } ] } ) ); }, enableChat: function ( element ) { - var tabs = document.getElementsByClassName( 'chat-tabs' )[0].children, - labels = document.getElementsByClassName( 'chat-labels' )[0].children; - for ( var counter = 0; counter < labels.length; counter++ ) { - var cur = labels[counter].getAttribute( 'class' ) + ''; - labels[counter].setAttribute( 'class', cur.replace( /(^|\s)active(\s|$)/, ' ' ) ); - tabs[counter].setAttribute( 'class', '' ); - if ( tabs[counter].getAttribute( 'data-id' ) === element.getAttribute( 'data-id' ) ) { - tabs[counter].setAttribute( 'class', 'active' ); + var tabs = document.getElementsByClassName ( 'chat-tabs' )[0].children, + labels = document.getElementsByClassName ( 'chat-labels' )[0].children; + for (var counter = 0; counter < labels.length; counter++) { + var cur = labels[counter].getAttribute ( 'class' ) + ''; + labels[counter].setAttribute ( 'class', cur.replace ( /(^|\s)active(\s|$)/, ' ' ) ); + tabs[counter].setAttribute ( 'class', '' ); + if ( tabs[counter].getAttribute ( 'data-id' ) === element.getAttribute ( 'data-id' ) ) { + tabs[counter].setAttribute ( 'class', 'active' ); } } - if ( element.hasAttribute( 'class' ) ) { - element.setAttribute( 'class', ( element.getAttribute( 'class' ) ).replace( /(^|\s)new-message(\s|$)/, ' ' ) + ' active' ); + if ( element.hasAttribute ( 'class' ) ) { + element.setAttribute ( 'class', ( element.getAttribute ( 'class' ) ).replace ( /(^|\s)new-message(\s|$)/, ' ' ) + ' active' ); } else { - element.setAttribute( 'class', 'active' ); + element.setAttribute ( 'class', 'active' ); } }, openCloseChat: function ( element ) { var chat = element.parentNode; - if ( chat.getAttribute( 'class' ) === 'idrinth-hovering-box active' || chat.getAttribute( 'class' ) === 'idrinth-hovering-box active left-sided' ) { - chat.setAttribute( 'class', 'idrinth-hovering-box' + ( idrinth.settings.moveLeft ? ' left-sided' : '' ) + - ( chat.getElementsByClassName( 'new-message' ) && chat.getElementsByClassName( 'new-message' ).length ? ' new-message' : '' ) ); + if ( chat.getAttribute ( 'class' ) === 'idrinth-hovering-box active' || chat.getAttribute ( 'class' ) === 'idrinth-hovering-box active left-sided' ) { + chat.setAttribute ( 'class', 'idrinth-hovering-box' + ( idrinth.settings.moveLeft ? ' left-sided' : '' ) + + ( chat.getElementsByClassName ( 'new-message' ) && chat.getElementsByClassName ( 'new-message' ).length ? ' new-message' : '' ) ); element.innerHTML = '<<'; } else { - chat.setAttribute( 'class', 'idrinth-hovering-box active' + ( idrinth.settings.moveLeft ? ' left-sided' : '' ) ); + chat.setAttribute ( 'class', 'idrinth-hovering-box active' + ( idrinth.settings.moveLeft ? ' left-sided' : '' ) ); element.innerHTML = '>>'; } }, @@ -939,10 +939,10 @@ idrinth.chat = { 'relogin': 'chat-service/login/' }, fail = function () { - idrinth.core.alert( idrinth.text.get( "chat.message.loginFail" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.message.loginFail" ) ); }, timeout = function () { - window.setTimeout( idrinth.chat.login, 1 ); + window.setTimeout ( idrinth.chat.login, 1 ); }, headers = { user: '', @@ -955,16 +955,16 @@ idrinth.chat = { if ( key === 'relogin' ) { success = function () { - idrinth.chat.updateTimeout = window.setTimeout( idrinth.chat.refreshChats, 1500 ); + idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 1500 ); }; headers.user = idrinth.settings.chatuser; headers.pass = idrinth.settings.chatpass; } else { - chatLogin = document.getElementById( 'idrinth-chat-login' ).getElementsByTagName( 'input' ); + chatLogin = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' ); headers.user = chatLogin[0].value; headers.pass = chatLogin[1].value; success = idrinth.chat.loginCallback; } - idrinth.core.ajax.runHome( urls[key], success, fail, timeout, JSON.stringify( headers ) ); + idrinth.core.ajax.runHome ( urls[key], success, fail, timeout, JSON.stringify ( headers ) ); } }; diff --git a/src/mods/land.js b/src/mods/land.js index 86d601b..ba5217b 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -70,7 +70,7 @@ idrinth.land = { } var results = baseCalculator ( getRequirements () ); if ( Object.keys ( results ).length === 0 ) { - idrinth.core.alert( idrinth.text.get("land.lackgold") ); + idrinth.core.alert ( idrinth.text.get ( "land.lackgold" ) ); } putResults ( results ); }, diff --git a/src/mods/lang.js b/src/mods/lang.js index dbf29df..52b2f88 100644 --- a/src/mods/lang.js +++ b/src/mods/lang.js @@ -2,8 +2,8 @@ start: function () { var language = window.navigator.userLanguage || window.navigator.language; var file = ""; // JSON to use, dependent on language - file = JSON.parse( file ); - for ( var prop in file ) { + file = JSON.parse ( file ); + for (var prop in file) { idrinth.lang[prop] = file[prop]; } } diff --git a/src/mods/text.js b/src/mods/text.js index 2e0a1c6..e0a03be 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -28,7 +28,7 @@ idrinth.text = { }, error: { default: 'Unexpected error occurred. Please contact script developers' - + ' (https://github.com/Idrinth/IDotD).' + + ' (https://github.com/Idrinth/IDotD).' } }, land: { @@ -91,15 +91,15 @@ idrinth.text = { }, get: function ( key ) { var getSub = function ( obj, keys, func ) { - var key = keys.shift(); - if ( obj.hasOwnProperty( key ) ) { + var key = keys.shift (); + if ( obj.hasOwnProperty ( key ) ) { if ( keys.length > 0 ) { - return func( obj[key], keys, func ); + return func ( obj[key], keys, func ); } return obj[key]; } return idrinth.text.data.chat.error.errorDefault; }; - return getSub( idrinth.text.data, key.split( '.' ), getSub ); + return getSub ( idrinth.text.data, key.split ( '.' ), getSub ); } } \ No newline at end of file diff --git a/src/mods/tier.js b/src/mods/tier.js index f43e8a5..b887e25 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -65,7 +65,7 @@ idrinth.tier = { return make ( key, name ); } } - idrinth.core.alert(idrinth.text.get("tier.maxBoxes")); + idrinth.core.alert ( idrinth.text.get ( "tier.maxBoxes" ) ); }, taggedSlots: { }, start: function () { @@ -101,7 +101,7 @@ idrinth.tier = { rType: '#input', type: 'checkbox', id: 'idrinth-raid-may-join-list-' + data[key].name, - label: idrinth.text.get("tier.disableJoining") + data[key].name + label: idrinth.text.get ( "tier.disableJoining" ) + data[key].name } ) ); document.getElementById ( 'idrinth-raid-may-join-list' ).lastChild.setAttribute ( 'style', 'background-image:url(https://dotd.idrinth.de/static/raid-image-service/' + data[key].url + '/);' ); @@ -185,7 +185,7 @@ idrinth.tier = { }, { type: 'button', - content: idrinth.text.get("tier.tagTop"), + content: idrinth.text.get ( "tier.tagTop" ), attributes: [ { name: 'onclick', @@ -216,19 +216,19 @@ idrinth.tier = { }, { type: 'th', - content: idrinth.text.get("tier.diff.normal") + content: idrinth.text.get ( "tier.diff.normal" ) }, { type: 'th', - content: idrinth.text.get("tier.diff.normal") + content: idrinth.text.get ( "tier.diff.normal" ) }, { type: 'th', - content: idrinth.text.get("tier.diff.normal") + content: idrinth.text.get ( "tier.diff.normal" ) }, { type: 'th', - content: idrinth.text.get("tier.diff.normal") + content: idrinth.text.get ( "tier.diff.normal" ) } ] } diff --git a/src/mods/ui.js b/src/mods/ui.js index 03013fe..07bf014 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -257,14 +257,14 @@ idrinth.ui = { if ( typeof altFunc === 'string' ) { mod.children[mod.children.length - 1].children = [ { type: 'button', - content: idrinth.text.get("ui.button.ok"), + content: idrinth.text.get ( "ui.button.ok" ), attributes: [ { name: 'onclick', value: closeFunc + altFunc } ] }, { type: 'button', - content: idrinth.text.get("ui.button.cancel"), + content: idrinth.text.get ( "ui.button.cancel" ), attributes: [ { name: 'onclick', value: closeFunc @@ -273,7 +273,7 @@ idrinth.ui = { } else { mod.children[mod.children.length - 1].children = [ { type: 'button', - content: idrinth.text.get("ui.button.ok"), + content: idrinth.text.get ( "ui.button.ok" ), attributes: [ { name: 'onclick', value: closeFunc @@ -377,7 +377,7 @@ idrinth.ui = { handleFrame ( document.getElementById ( 'gamefilearea' ) ); } } catch ( e ) { - idrinth.core.alert ( idrinth.text.get("ui.reloadGameFail") ); + idrinth.core.alert ( idrinth.text.get ( "ui.reloadGameFail" ) ); } }, updateClassesList: function ( element, add, remove ) { @@ -439,20 +439,20 @@ idrinth.ui = { }; return [ { children: [ - buttonMaker ( idrinth.text.get("ui.button.importManually"), 'idrinth.raids.import(\'\');' ), - buttonMaker ( idrinth.text.get("ui.button.importFav"), 'idrinth.raids.import(idrinth.settings.favs);' ), - buttonMaker ( idrinth.text.get("ui.button.reloadGame"), 'idrinth.ui.reloadGame();' ), - buttonMaker ( idrinth.text.get("ui.button.clearRaids"), 'idrinth.raids.clearAll();' ), - buttonMaker ( idrinth.text.get("ui.button.reloadScript"), 'idrinth.reload();' ), - buttonMaker ( idrinth.text.get("ui.button.restartRaidJoin"), 'idrinth.raids.restartInterval();' ), - buttonMaker ( idrinth.text.get("ui.button.refreshFBGameLogin"), 'idrinth.facebook.rejoin()', 'facebook' ), - buttonMaker ( idrinth.text.get("ui.button.ngRaidJoin"), 'idrinth.newgrounds.joinRaids()', 'newgrounds' ), - buttonMaker( idrinth.settings.alarmActive ? idrinth.text.get( "ui.button.disableTimedAutoJoin" ) : idrinth.text.get( "ui.button.enableTimedAutoJoin" ),'idrinth.settings.change(\'alarmActive\',!idrinth.settings.alarmActive);this.innerHTML=idrinth.settings.alarmActive?\'disable timed Autojoin\':\'enable timed Autojoin\'', 'newgrounds' ) + buttonMaker ( idrinth.text.get ( "ui.button.importManually" ), 'idrinth.raids.import(\'\');' ), + buttonMaker ( idrinth.text.get ( "ui.button.importFav" ), 'idrinth.raids.import(idrinth.settings.favs);' ), + buttonMaker ( idrinth.text.get ( "ui.button.reloadGame" ), 'idrinth.ui.reloadGame();' ), + buttonMaker ( idrinth.text.get ( "ui.button.clearRaids" ), 'idrinth.raids.clearAll();' ), + buttonMaker ( idrinth.text.get ( "ui.button.reloadScript" ), 'idrinth.reload();' ), + buttonMaker ( idrinth.text.get ( "ui.button.restartRaidJoin" ), 'idrinth.raids.restartInterval();' ), + buttonMaker ( idrinth.text.get ( "ui.button.refreshFBGameLogin" ), 'idrinth.facebook.rejoin()', 'facebook' ), + buttonMaker ( idrinth.text.get ( "ui.button.ngRaidJoin" ), 'idrinth.newgrounds.joinRaids()', 'newgrounds' ), + buttonMaker ( idrinth.settings.alarmActive ? idrinth.text.get ( "ui.button.disableTimedAutoJoin" ) : idrinth.text.get ( "ui.button.enableTimedAutoJoin" ), 'idrinth.settings.change(\'alarmActive\',!idrinth.settings.alarmActive);this.innerHTML=idrinth.settings.alarmActive?\'disable timed Autojoin\':\'enable timed Autojoin\'', 'newgrounds' ) ] }, { css: 'idrinth-line', id: 'idrinth-joined-raids', - content: idrinth.text.get("ui.lastRaidsJoined"), + content: idrinth.text.get ( "ui.lastRaidsJoined" ), children: [ { type: 'ul' @@ -466,7 +466,7 @@ idrinth.ui = { css: 'idrinth-line', children: [ { type: 'label', - content: idrinth.text.get("ui.enterBossName"), + content: idrinth.text.get ( "ui.enterBossName" ), css: 'idrinth-float-half', attributes: [ { @@ -496,68 +496,68 @@ idrinth.ui = { rType: '#input', type: 'checkbox', platforms: [ 'kongregate' ], - label: idrinth.text.get("ui.setting.enableExtendedCharInfo") + label: idrinth.text.get ( "ui.setting.enableExtendedCharInfo" ) }, { name: 'minimalist', rType: '#input', type: 'checkbox', - label: idrinth.text.get("ui.setting.minimLayout") + label: idrinth.text.get ( "ui.setting.minimLayout" ) }, { name: 'moveLeft', rType: '#input', type: 'checkbox', - label: idrinth.text.get("ui.setting.moveSettingLeft") + label: idrinth.text.get ( "ui.setting.moveSettingLeft" ) }, { name: 'warBottom', rType: '#input', type: 'checkbox', - label: idrinth.text.get("ui.setting.warBottomPage") + label: idrinth.text.get ( "ui.setting.warBottomPage" ) }, { name: 'landMax', rType: '#input', type: 'checkbox', - label: idrinth.text.get("ui.setting.useGoldEfficiently") + label: idrinth.text.get ( "ui.setting.useGoldEfficiently" ) }, { name: 'factor', rType: '#input', type: 'checkbox', - label: idrinth.text.get("ui.setting.tenBuildOnce") + label: idrinth.text.get ( "ui.setting.tenBuildOnce" ) }, { name: 'timeout', rType: '#input', type: 'number', platforms: [ 'kongregate' ], - label: idrinth.text.get( "ui.setting.extCharInfoDuration" ) + label: idrinth.text.get ( "ui.setting.extCharInfoDuration" ) }, { name: 'newgroundLoad', rType: '#input', type: 'number', platforms: [ 'newgrounds' ], - label: idrinth.text.get( "ui.setting.joiningDuration" ) + label: idrinth.text.get ( "ui.setting.joiningDuration" ) }, { name: 'chatting', rType: '#input', type: 'checkbox', - label: idrinth.text.get("ui.setting.enableChat") + label: idrinth.text.get ( "ui.setting.enableChat" ) }, { css: 'idrinth-line', type: 'span', - content: idrinth.text.get("ui.settingInfo") + content: idrinth.text.get ( "ui.settingInfo" ) }, { name: 'raids', rType: '#input', type: 'checkbox', - label: idrinth.text.get( "ui.setting.enableFavRequest" ) + label: idrinth.text.get ( "ui.setting.enableFavRequest" ) }, { name: 'favs', rType: '#input', type: 'text', - label: idrinth.text.get("ui.setting.favIdToJoin") + label: idrinth.text.get ( "ui.setting.favIdToJoin" ) }, { name: 'isWorldServer', rType: '#input', type: 'checkbox', - label: idrinth.text.get("ui.setting.worldserver") + label: idrinth.text.get ( "ui.setting.worldserver" ) }, { name: 'notification#mention', rType: '#input', @@ -578,19 +578,19 @@ idrinth.ui = { rType: '#input', type: 'number', platforms: [ 'dawnofthedragons', 'facebook' ], - label: idrinth.text.get("ui.maxPopupsFrame") + label: idrinth.text.get ( "ui.maxPopupsFrame" ) }, { name: 'alarmTime', rType: '#input', type: 'text', platforms: [ 'newgrounds' ], - label: idrinth.text.get("ui.timeAutoJoin") + label: idrinth.text.get ( "ui.timeAutoJoin" ) }, { css: 'idrinth-line', type: 'p', children: [ { type: '#text', - content: idrinth.text.get("ui.getFavFrom") + content: idrinth.text.get ( "ui.getFavFrom" ) }, { type: 'a', attributes: [ { @@ -600,7 +600,7 @@ idrinth.ui = { name: 'target', value: '_blank' } ], - content: idrinth.text.get("ui.raidsearch") + content: idrinth.text.get ( "ui.raidsearch" ) } ] } ]; }; @@ -634,7 +634,7 @@ idrinth.ui = { attributes: [ { name: 'title', - value: idrinth.land.data[label.toLowerCase()].perHour + idrinth.text.get("ui.goldHour") + value: idrinth.land.data[label.toLowerCase ()].perHour + idrinth.text.get ( "ui.goldHour" ) } ] }; @@ -666,7 +666,7 @@ idrinth.ui = { type: 'tr', children: [ { type: 'th', - content: idrinth.text.get("ui.availGold") + content: idrinth.text.get ( "ui.availGold" ) }, { type: 'td', children: [ { @@ -687,7 +687,7 @@ idrinth.ui = { type: 'td', children: [ { type: 'button', - content: idrinth.text.get("ui.button.calc"), + content: idrinth.text.get ( "ui.button.calc" ), attributes: [ { name: 'onclick', @@ -761,12 +761,12 @@ idrinth.ui = { }; var buildRaidJoinList = function () { return [ { - content: idrinth.text.get("ui.setting.clickCopy"), + content: idrinth.text.get ( "ui.setting.clickCopy" ), type: 'strong' }, { id: 'idrinth-raid-link-list' }, { - content: idrinth.text.get("ui.setting.disableAutoJoinSpecific"), + content: idrinth.text.get ( "ui.setting.disableAutoJoinSpecific" ), type: 'strong' }, { id: 'idrinth-raid-may-join-list' From bb6e69deb86fdd840202af2f523f3d715bf3d47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 8 Oct 2016 17:57:33 +0200 Subject: [PATCH 072/341] removing irregular whitespace adding semi-colon --- src/mods/lang.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mods/lang.js b/src/mods/lang.js index 52b2f88..d49ee76 100644 --- a/src/mods/lang.js +++ b/src/mods/lang.js @@ -1,4 +1,4 @@ -idrinth.lang = { +idrinth.lang = { start: function () { var language = window.navigator.userLanguage || window.navigator.language; var file = ""; // JSON to use, dependent on language @@ -7,4 +7,4 @@ idrinth.lang[prop] = file[prop]; } } -} \ No newline at end of file +}; \ No newline at end of file From 3c47f3347959ec9692a1c253a2eeff08bfc9ff34 Mon Sep 17 00:00:00 2001 From: ardenian Date: Sat, 8 Oct 2016 18:04:48 +0200 Subject: [PATCH 073/341] Removing unexpected trailing commata --- src/mods/chat.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 31f979c..726a62e 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -585,17 +585,17 @@ idrinth.chat = { }, { type: 'p', - content: idrinth.text.get ( "chat.message.optional" ), + content: idrinth.text.get ( "chat.message.optional" ) }, { id: 'idrinth-chat-login', children: [ { type: 'h2', - content: idrinth.text.get ( "chat.ui.account" ), + content: idrinth.text.get ( "chat.ui.account" ) }, { type: 'p', - content: idrinth.text.get ( "chat.message.invalid" ), + content: idrinth.text.get ( "chat.message.invalid" ) }, { type: 'ul', @@ -612,7 +612,7 @@ idrinth.chat = { children: [ { type: 'h2', - content: idrinth.text.get ( "chat.ui.joinChat" ), + content: idrinth.text.get ( "chat.ui.joinChat" ) }, { type: 'ul', @@ -646,7 +646,7 @@ idrinth.chat = { children: [ { type: '#text', - content: idrinth.text.get ( "chat.ui.moreSettings" ), + content: idrinth.text.get ( "chat.ui.moreSettings" ) }, { type: 'a', From 853cf2fa9e442443ddc202f813150fed9d795961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 8 Oct 2016 18:32:35 +0200 Subject: [PATCH 074/341] building the basis of later use of language/translation files --- src/mods/lang.js | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/src/mods/lang.js b/src/mods/lang.js index d49ee76..e1b3015 100644 --- a/src/mods/lang.js +++ b/src/mods/lang.js @@ -1,10 +1,41 @@ idrinth.lang = { + /** + * if the language files have been applied correctly, this is true + * @type Boolean + */ + initialized: false, + /** + * Loads language specific code and signals it's readyness by setting + * idrinth.lang.initialized to true + * @method start + * @returns {undefined} + */ start: function () { - var language = window.navigator.userLanguage || window.navigator.language; - var file = ""; // JSON to use, dependent on language - file = JSON.parse ( file ); - for (var prop in file) { - idrinth.lang[prop] = file[prop]; + var language = idrinth.settings.language || window.navigator.userLanguage || window.navigator.language; + if ( language === 'en' ) { + idrinth.lang.initialized = true; + return; } + idrinth.core.ajax.runHome ( '', function ( file ) { + /** + * + * @param {object} to + * @param {object} from + * @param {function} func + * @returns {undefined} + */ + var applyRecursive = function ( to, from, func ) { + for (var prop in from) { + if ( from.hasOwnProperty ( prop ) ) { + if ( typeof to[prop] === 'string' && typeof from[prop] === 'string' ) { + to[prop] = file[prop]; + } else if ( typeof to[prop] === 'object' && typeof from[prop] === 'object' ) { + func ( to[prop], from[prop], func ); + } + } + } + }; + applyRecursive ( idrinth.text.data, JSON.parse ( file ), applyRecursive ); + }, idrinth.lang.start, idrinth.lang.start, null, true ); } }; \ No newline at end of file From 090d8278ba66b04353c51c7202d399c3a2750980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 8 Oct 2016 18:51:40 +0200 Subject: [PATCH 075/341] adding method headers --- src/mods/text.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/mods/text.js b/src/mods/text.js index e0a03be..6164ad7 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -89,6 +89,12 @@ idrinth.text = { } } }, + /** + * returns the translation of a provided key or an error-message if no + * matching translation is found + * @param string key + * @returns {string} + */ get: function ( key ) { var getSub = function ( obj, keys, func ) { var key = keys.shift (); @@ -102,4 +108,4 @@ idrinth.text = { }; return getSub ( idrinth.text.data, key.split ( '.' ), getSub ); } -} \ No newline at end of file +}; \ No newline at end of file From 6becb551eed345d877ff0399c7ed9037b8c4e7ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 8 Oct 2016 18:53:27 +0200 Subject: [PATCH 076/341] moving lang into text adding some more javadoc-headers --- src/mods/lang.js | 41 ----------------------------------------- src/mods/text.js | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 41 deletions(-) delete mode 100644 src/mods/lang.js diff --git a/src/mods/lang.js b/src/mods/lang.js deleted file mode 100644 index e1b3015..0000000 --- a/src/mods/lang.js +++ /dev/null @@ -1,41 +0,0 @@ -idrinth.lang = { - /** - * if the language files have been applied correctly, this is true - * @type Boolean - */ - initialized: false, - /** - * Loads language specific code and signals it's readyness by setting - * idrinth.lang.initialized to true - * @method start - * @returns {undefined} - */ - start: function () { - var language = idrinth.settings.language || window.navigator.userLanguage || window.navigator.language; - if ( language === 'en' ) { - idrinth.lang.initialized = true; - return; - } - idrinth.core.ajax.runHome ( '', function ( file ) { - /** - * - * @param {object} to - * @param {object} from - * @param {function} func - * @returns {undefined} - */ - var applyRecursive = function ( to, from, func ) { - for (var prop in from) { - if ( from.hasOwnProperty ( prop ) ) { - if ( typeof to[prop] === 'string' && typeof from[prop] === 'string' ) { - to[prop] = file[prop]; - } else if ( typeof to[prop] === 'object' && typeof from[prop] === 'object' ) { - func ( to[prop], from[prop], func ); - } - } - } - }; - applyRecursive ( idrinth.text.data, JSON.parse ( file ), applyRecursive ); - }, idrinth.lang.start, idrinth.lang.start, null, true ); - } -}; \ No newline at end of file diff --git a/src/mods/text.js b/src/mods/text.js index 6164ad7..8c69fe8 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -1,4 +1,43 @@ idrinth.text = { + /** + * if the language files have been applied correctly, this is true + * @type Boolean + */ + initialized: false, + /** + * Loads language specific code and signals it's readyness by setting + * idrinth.lang.initialized to true + * @method start + * @returns {undefined} + */ + start: function () { + var language = idrinth.settings.language || window.navigator.userLanguage || window.navigator.language; + if ( language === 'en' ) { + idrinth.lang.initialized = true; + return; + } + idrinth.core.ajax.runHome ( '', function ( file ) { + /** + * + * @param {object} to + * @param {object} from + * @param {function} func + * @returns {undefined} + */ + var applyRecursive = function ( to, from, func ) { + for (var prop in from) { + if ( from.hasOwnProperty ( prop ) ) { + if ( typeof to[prop] === 'string' && typeof from[prop] === 'string' ) { + to[prop] = file[prop]; + } else if ( typeof to[prop] === 'object' && typeof from[prop] === 'object' ) { + func ( to[prop], from[prop], func ); + } + } + } + }; + applyRecursive ( idrinth.text.data, JSON.parse ( file ), applyRecursive ); + }, idrinth.lang.start, idrinth.lang.start, null, true ); + }, data: { chat: { ui: { From 85ded78bf7fdd9f0852edb95545c4f7a2fbbb98a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 8 Oct 2016 18:55:37 +0200 Subject: [PATCH 077/341] correcting remaining references to removed lang.js --- src/mods/text.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index 8c69fe8..faab11a 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -6,7 +6,7 @@ idrinth.text = { initialized: false, /** * Loads language specific code and signals it's readyness by setting - * idrinth.lang.initialized to true + * idrinth.text.initialized to true * @method start * @returns {undefined} */ @@ -36,7 +36,7 @@ idrinth.text = { } }; applyRecursive ( idrinth.text.data, JSON.parse ( file ), applyRecursive ); - }, idrinth.lang.start, idrinth.lang.start, null, true ); + }, idrinth.text.start, idrinth.text.start, null, true ); }, data: { chat: { From e8d99aff20865f57cec404b4af83ae4a8a22369b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 8 Oct 2016 18:58:41 +0200 Subject: [PATCH 078/341] correcting remaining references to removed lang.js(2) --- src/mods/text.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/text.js b/src/mods/text.js index faab11a..08bc4dd 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -13,7 +13,7 @@ idrinth.text = { start: function () { var language = idrinth.settings.language || window.navigator.userLanguage || window.navigator.language; if ( language === 'en' ) { - idrinth.lang.initialized = true; + idrinth.text.initialized = true; return; } idrinth.core.ajax.runHome ( '', function ( file ) { From 0685ff236c88bb7b6d8ede7fb8e5c92838d8d499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 8 Oct 2016 19:31:46 +0200 Subject: [PATCH 079/341] adding a translation by default to input-labels --- src/mods/text.js | 6 +++--- src/mods/ui.js | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index 08bc4dd..8fc8e26 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -66,10 +66,10 @@ idrinth.text = { unknown: 'The given username for dotd.idrinth.de is unknown, do you want to register it there?' }, error: { - default: 'Unexpected error occurred. Please contact script developers' - + ' (https://github.com/Idrinth/IDotD).' } }, + default: 'Unexpected error occurred. Please contact script developers' + + ' (https://github.com/Idrinth/IDotD).', land: { lackGold: 'You lack gold to buy any more buildings at the moment.' }, @@ -143,7 +143,7 @@ idrinth.text = { } return obj[key]; } - return idrinth.text.data.chat.error.errorDefault; + return idrinth.text.data.error; }; return getSub ( idrinth.text.data, key.split ( '.' ), getSub ); } diff --git a/src/mods/ui.js b/src/mods/ui.js index 07bf014..4d2fe0a 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -186,12 +186,13 @@ idrinth.ui = { value: 'idrinth.settings.change(\'' + config.name + '\',this.checked)' } ); } + var translation = idrinth.text.get ( config.label ); return idrinth.ui.buildElement ( { css: 'idrinth-line' + ( config.platforms && !inArray ( idrinth.platform, config.platforms ) ? ' idrinth-hide' : '' ), children: [ { type: 'label', css: 'idrinth-float-half', - content: config.label, + content: translation === idrinth.text.data.error ? config.label : translation, attributes: [ { name: 'for', value: 'idrinth-' + config.name From 61ac39a76c001992b3e457b2fc92ac3703941355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 8 Oct 2016 19:34:01 +0200 Subject: [PATCH 080/341] error!==default --- src/mods/text.js | 2 +- src/mods/ui.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index 8fc8e26..2d3ded0 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -143,7 +143,7 @@ idrinth.text = { } return obj[key]; } - return idrinth.text.data.error; + return idrinth.text.data.default; }; return getSub ( idrinth.text.data, key.split ( '.' ), getSub ); } diff --git a/src/mods/ui.js b/src/mods/ui.js index 4d2fe0a..0a8725a 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -192,7 +192,7 @@ idrinth.ui = { children: [ { type: 'label', css: 'idrinth-float-half', - content: translation === idrinth.text.data.error ? config.label : translation, + content: translation === idrinth.text.data.default ? config.label : translation, attributes: [ { name: 'for', value: 'idrinth-' + config.name From 8755c2f3d463c78db9f4b313b73192f94fd2ae55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 8 Oct 2016 19:40:04 +0200 Subject: [PATCH 081/341] removing method calls that aren't required --- src/mods/ui.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/mods/ui.js b/src/mods/ui.js index 0a8725a..a4ab716 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -497,68 +497,68 @@ idrinth.ui = { rType: '#input', type: 'checkbox', platforms: [ 'kongregate' ], - label: idrinth.text.get ( "ui.setting.enableExtendedCharInfo" ) + label: "ui.setting.enableExtendedCharInfo" }, { name: 'minimalist', rType: '#input', type: 'checkbox', - label: idrinth.text.get ( "ui.setting.minimLayout" ) + label: "ui.setting.minimLayout" }, { name: 'moveLeft', rType: '#input', type: 'checkbox', - label: idrinth.text.get ( "ui.setting.moveSettingLeft" ) + label: "ui.setting.moveSettingLeft" }, { name: 'warBottom', rType: '#input', type: 'checkbox', - label: idrinth.text.get ( "ui.setting.warBottomPage" ) + label: "ui.setting.warBottomPage" }, { name: 'landMax', rType: '#input', type: 'checkbox', - label: idrinth.text.get ( "ui.setting.useGoldEfficiently" ) + label: "ui.setting.useGoldEfficiently" }, { name: 'factor', rType: '#input', type: 'checkbox', - label: idrinth.text.get ( "ui.setting.tenBuildOnce" ) + label: "ui.setting.tenBuildOnce" }, { name: 'timeout', rType: '#input', type: 'number', platforms: [ 'kongregate' ], - label: idrinth.text.get ( "ui.setting.extCharInfoDuration" ) + label: "ui.setting.extCharInfoDuration" }, { name: 'newgroundLoad', rType: '#input', type: 'number', platforms: [ 'newgrounds' ], - label: idrinth.text.get ( "ui.setting.joiningDuration" ) + label: "ui.setting.joiningDuration" }, { name: 'chatting', rType: '#input', type: 'checkbox', - label: idrinth.text.get ( "ui.setting.enableChat" ) + label: "ui.setting.enableChat" }, { css: 'idrinth-line', type: 'span', - content: idrinth.text.get ( "ui.settingInfo" ) + content: "ui.settingInfo" }, { name: 'raids', rType: '#input', type: 'checkbox', - label: idrinth.text.get ( "ui.setting.enableFavRequest" ) + label: "ui.setting.enableFavRequest" }, { name: 'favs', rType: '#input', type: 'text', - label: idrinth.text.get ( "ui.setting.favIdToJoin" ) + label: "ui.setting.favIdToJoin" }, { name: 'isWorldServer', rType: '#input', type: 'checkbox', - label: idrinth.text.get ( "ui.setting.worldserver" ) + label: "ui.setting.worldserver" }, { name: 'notification#mention', rType: '#input', @@ -579,13 +579,13 @@ idrinth.ui = { rType: '#input', type: 'number', platforms: [ 'dawnofthedragons', 'facebook' ], - label: idrinth.text.get ( "ui.maxPopupsFrame" ) + label: "ui.maxPopupsFrame" }, { name: 'alarmTime', rType: '#input', type: 'text', platforms: [ 'newgrounds' ], - label: idrinth.text.get ( "ui.timeAutoJoin" ) + label: "ui.timeAutoJoin" }, { css: 'idrinth-line', type: 'p', From 7ed4e0570adfdada0009e80cf60b2d345b122143 Mon Sep 17 00:00:00 2001 From: ardenian Date: Sat, 8 Oct 2016 19:55:34 +0200 Subject: [PATCH 082/341] Minor adjustements, adding some missing ones from chat.js --- src/mods/chat.js | 34 +++++++++++++++++----------------- src/mods/text.js | 16 +++++++++++----- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 726a62e..68cf860 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -57,25 +57,25 @@ idrinth.chat = { var promotionModes = [ { chat: chat, - label: 'Ban User', + label: chat.actions.banUser, rank: 'Banned', requiredRank: 3 }, { chat: chat, - label: 'Make Moderator', + label: chat.actions.makeMod, rank: 'Mod', requiredRank: 3 }, { chat: chat, - label: 'Make Admin', + label: chat.actions.makeAdmin, rank: 'Owner', requiredRank: 4 }, { chat: chat, - label: 'Make User', + label: chat.actions.makeUser, rank: 'User', requiredRank: 3 } @@ -155,10 +155,10 @@ idrinth.chat = { } }, function ( reply ) { - idrinth.core.alert ( idrinth.text.get ( "chat.message.modifyFail" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.modify" ) ); }, function ( reply ) { - idrinth.core.alert ( idrinth.text.get ( "chat.message.modifyFail" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.modify" ) ); }, JSON.stringify ( { chat: chat, @@ -744,29 +744,29 @@ idrinth.chat = { 'chat-service/create/', idrinth.chat.joinCallback, function ( reply ) { - idrinth.core.alert ( idrinth.text.get ( "chat.message.createFail" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.create" ) ); }, function ( reply ) { - idrinth.core.alert ( idrinth.text.get ( "chat.message.createFail" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.createFail" ) ); }, document.getElementById ( 'idrinth-make-chat' ).getElementsByTagName ( 'input' )[0].value ); }, joinCallback: function ( reply ) { if ( !reply ) { - idrinth.core.alert ( idrinth.text.get ( "chat.message.joinFailMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.joinMoment" ) ); return; } reply = JSON.parse ( reply ); if ( !reply ) { - idrinth.core.alert ( idrinth.text.get ( "chat.message.joinFailMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.joinMoment" ) ); return; } if ( !reply.success ) { if ( reply.message ) { idrinth.core.alert ( reply.message ); } else { - idrinth.core.alert ( idrinth.text.get ( "chat.message.joinFail" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.join" ) ); } return; } @@ -782,10 +782,10 @@ idrinth.chat = { 'chat-service/join/', idrinth.chat.joinCallback, function ( reply ) { - idrinth.core.alert ( idrinth.text.get ( "chat.message.joinFailMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.joinMoment" ) ); }, function ( reply ) { - idrinth.core.alert ( idrinth.text.get ( "chat.message.joinFailMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.joinMoment" ) ); }, JSON.stringify ( { id: document.getElementById ( 'idrinth-add-chat' ).getElementsByTagName ( 'input' )[0].value, @@ -825,12 +825,12 @@ idrinth.chat = { }, loginCallback: function ( data ) { if ( !data ) { - idrinth.core.alert ( idrinth.text.get ( "chat.message.loginFailMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.loginMoment" ) ); return; } data = JSON.parse ( data ); if ( !data ) { - idrinth.core.alert ( idrinth.text.get ( "chat.message.loginFailMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.loginMoment" ) ); return; } if ( !data.success && data.message && data['allow-reg'] ) { @@ -849,7 +849,7 @@ idrinth.chat = { idrinth.chat.join ( data.data ); return; } - idrinth.core.alert ( idrinth.text.get ( "chat.message.loginFailMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.loginMoment" ) ); }, register: function () { this.loginActions ( 'register' ); @@ -939,7 +939,7 @@ idrinth.chat = { 'relogin': 'chat-service/login/' }, fail = function () { - idrinth.core.alert ( idrinth.text.get ( "chat.message.loginFail" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.login" ) ); }, timeout = function () { window.setTimeout ( idrinth.chat.login, 1 ); diff --git a/src/mods/text.js b/src/mods/text.js index 2d3ded0..76a62c1 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -40,6 +40,12 @@ idrinth.text = { }, data: { chat: { + actions:{ + banUser: 'Ban User', + makeMod: 'Make Moderator', + makeAdmin: 'Make Admin', + makeUser: 'Make User' + }, ui: { close: 'Close', invite: 'Invite to Chat ', @@ -58,14 +64,14 @@ idrinth.text = { optional: 'This part of the script is optional, so logging in is unneeded for raid catching etc.', invalid: 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.', offline: "Not logged in, click to login/register", - modifyFail: 'Can\'t modify that user at the moment', - createFail: 'Can\'t create at the moment', - joinFailMoment: 'Can\'t join at the moment', - joinFail: 'Joining didn\'t work', - loginFail: 'Login failed in an unexpected way', unknown: 'The given username for dotd.idrinth.de is unknown, do you want to register it there?' }, error: { + modify: 'Can\'t modify that user at the moment', + create: 'Can\'t create at the moment', + joinMoment: 'Can\'t join at the moment', + join: 'Joining didn\'t work', + login: 'Login failed in an unexpected way' } }, default: 'Unexpected error occurred. Please contact script developers' From c249739aa5985dee7c2a281b646b464ce36f194e Mon Sep 17 00:00:00 2001 From: ardenian Date: Sat, 8 Oct 2016 20:03:19 +0200 Subject: [PATCH 083/341] Added Translation to makeInput and makeButton --- src/mods/chat.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 68cf860..df51426 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -493,12 +493,13 @@ idrinth.chat = { start: function () { var build = function () { var makeInput = function ( label ) { + var translation = idrinth.text.get( label ); return { type: 'li', children: [ { type: 'label', - content: label + content: translation === idrinth.text.data.default ? label : translation }, { type: 'input', @@ -517,6 +518,7 @@ idrinth.chat = { }; }; var makeButton = function ( label, onclick ) { + var translation = idrinth.text.get( label ); return { type: 'li', children: [ @@ -532,7 +534,7 @@ idrinth.chat = { value: onclick } ], - content: label + content: translation === idrinth.text.data.default ? label : translation } ] }; From aec21f220c9f7a155e842c47c0f33d1aa59588c3 Mon Sep 17 00:00:00 2001 From: ardenian Date: Sat, 8 Oct 2016 20:17:29 +0200 Subject: [PATCH 084/341] Adding missing text from ui.js, small fix in chat.js --- src/mods/chat.js | 8 ++++---- src/mods/text.js | 17 ++++++++++++----- src/mods/ui.js | 14 +++++++------- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index df51426..7a35105 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -57,25 +57,25 @@ idrinth.chat = { var promotionModes = [ { chat: chat, - label: chat.actions.banUser, + label: 'chat.actions.banUser', rank: 'Banned', requiredRank: 3 }, { chat: chat, - label: chat.actions.makeMod, + label: 'chat.actions.makeMod', rank: 'Mod', requiredRank: 3 }, { chat: chat, - label: chat.actions.makeAdmin, + label: 'chat.actions.makeAdmin', rank: 'Owner', requiredRank: 4 }, { chat: chat, - label: chat.actions.makeUser, + label: 'chat.actions.makeUser', rank: 'User', requiredRank: 3 } diff --git a/src/mods/text.js b/src/mods/text.js index 76a62c1..b110714 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -94,18 +94,20 @@ idrinth.text = { button: { ok: 'Ok', cancel: 'Cancel', - importManually: 'Import all manually', - importFav: 'Import favs manually', reloadGame: 'Reload game', clearRaids: 'Clear Raids', reloadScript: 'Reload Script', - restartRaidJoin: 'Restart Raidjoin', refreshFBGameLogin: 'Refresh Facebook Game Login', ngRaidJoin: 'NG Raid Join(slow!)', calc: 'Calculate', disableTimedAutoJoin: 'disable timed Autojoin', enableTimedAutoJoin: 'enable timed Autojoin' }, + imports:{ + manually:'Import all manually', + favs:'Import favs manually', + restart:'Restart Raidjoin' + }, lastRaidsJoined: 'Last raids joined:', enterBossName: 'Enter Boss\' Name', settingInfo: 'This script will always import the raids you manually set to be imported on the website and if it\'s enabled it will also import all raids matched by one of the faved searches provided.', @@ -118,7 +120,7 @@ idrinth.text = { clickCopy: 'click to copy raid link', reloadGameFail: 'The game couldn\'t be reloaded', setting: { - enableExtendedCharInfo: 'Enable extended Characterinformation?', + enableExtCharInfo: 'Enable extended Characterinformation?', minimLayout: 'Minimalist Layout', moveSettingLeft: 'Move settings left', warBottomPage: 'Show war at the bottom of the page', @@ -130,7 +132,12 @@ idrinth.text = { enableFavRequest: 'Enable Auto-Raid-Request for Favorites?', favIdToJoin: 'FavoriteIds to join (separate multiple by comma)', worldserver: 'Worldserver?', - disableAutoJoinSpecific: 'Disable Autojoining for specific raids' + disableAutoJoinSpecific: 'Disable Autojoining for specific raids', + chat:{ + mentionNotis: 'chat-mention notifications?', + raidNotis: 'chat-raid notifications?', + messageNotis:'chat-message notifications?', + } } } }, diff --git a/src/mods/ui.js b/src/mods/ui.js index a4ab716..0be4c81 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -440,12 +440,12 @@ idrinth.ui = { }; return [ { children: [ - buttonMaker ( idrinth.text.get ( "ui.button.importManually" ), 'idrinth.raids.import(\'\');' ), - buttonMaker ( idrinth.text.get ( "ui.button.importFav" ), 'idrinth.raids.import(idrinth.settings.favs);' ), + buttonMaker ( idrinth.text.get ( "ui.imports.manually" ), 'idrinth.raids.import(\'\');' ), + buttonMaker ( idrinth.text.get ( "ui.imports.favs" ), 'idrinth.raids.import(idrinth.settings.favs);' ), buttonMaker ( idrinth.text.get ( "ui.button.reloadGame" ), 'idrinth.ui.reloadGame();' ), buttonMaker ( idrinth.text.get ( "ui.button.clearRaids" ), 'idrinth.raids.clearAll();' ), buttonMaker ( idrinth.text.get ( "ui.button.reloadScript" ), 'idrinth.reload();' ), - buttonMaker ( idrinth.text.get ( "ui.button.restartRaidJoin" ), 'idrinth.raids.restartInterval();' ), + buttonMaker ( idrinth.text.get ( "ui.imports.restart" ), 'idrinth.raids.restartInterval();' ), buttonMaker ( idrinth.text.get ( "ui.button.refreshFBGameLogin" ), 'idrinth.facebook.rejoin()', 'facebook' ), buttonMaker ( idrinth.text.get ( "ui.button.ngRaidJoin" ), 'idrinth.newgrounds.joinRaids()', 'newgrounds' ), buttonMaker ( idrinth.settings.alarmActive ? idrinth.text.get ( "ui.button.disableTimedAutoJoin" ) : idrinth.text.get ( "ui.button.enableTimedAutoJoin" ), 'idrinth.settings.change(\'alarmActive\',!idrinth.settings.alarmActive);this.innerHTML=idrinth.settings.alarmActive?\'disable timed Autojoin\':\'enable timed Autojoin\'', 'newgrounds' ) @@ -497,7 +497,7 @@ idrinth.ui = { rType: '#input', type: 'checkbox', platforms: [ 'kongregate' ], - label: "ui.setting.enableExtendedCharInfo" + label: "ui.setting.enableExtCharInfo" }, { name: 'minimalist', rType: '#input', @@ -563,17 +563,17 @@ idrinth.ui = { name: 'notification#mention', rType: '#input', type: 'checkbox', - label: 'chat-mention notifications?' + label: 'ui.setting.chat.mentionNotis' }, { name: 'notification#raid', rType: '#input', type: 'checkbox', - label: 'chat-raid notifications?' + label: 'ui.setting.chat.raidNotis' }, { name: 'notification#message', rType: '#input', type: 'checkbox', - label: 'chat-message notifications?' + label: 'ui.setting.chat.messageNotis' }, { name: 'windows', rType: '#input', From 07f3d51cba3613a41f1ee5d8022f5ad4fa39b8e4 Mon Sep 17 00:00:00 2001 From: ardenian Date: Sat, 8 Oct 2016 20:28:07 +0200 Subject: [PATCH 085/341] Some requested changes Pull Request Review, fixes #157 --- src/mods/chat.js | 16 ++++++++-------- src/mods/text.js | 13 ++++++------- src/mods/ui.js | 6 +++--- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 7a35105..fe1540c 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -749,19 +749,19 @@ idrinth.chat = { idrinth.core.alert ( idrinth.text.get ( "chat.error.create" ) ); }, function ( reply ) { - idrinth.core.alert ( idrinth.text.get ( "chat.error.createFail" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.create" ) ); }, document.getElementById ( 'idrinth-make-chat' ).getElementsByTagName ( 'input' )[0].value ); }, joinCallback: function ( reply ) { if ( !reply ) { - idrinth.core.alert ( idrinth.text.get ( "chat.error.joinMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.join" ) ); return; } reply = JSON.parse ( reply ); if ( !reply ) { - idrinth.core.alert ( idrinth.text.get ( "chat.error.joinMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.join" ) ); return; } if ( !reply.success ) { @@ -784,10 +784,10 @@ idrinth.chat = { 'chat-service/join/', idrinth.chat.joinCallback, function ( reply ) { - idrinth.core.alert ( idrinth.text.get ( "chat.error.joinMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.join" ) ); }, function ( reply ) { - idrinth.core.alert ( idrinth.text.get ( "chat.error.joinMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.join" ) ); }, JSON.stringify ( { id: document.getElementById ( 'idrinth-add-chat' ).getElementsByTagName ( 'input' )[0].value, @@ -827,12 +827,12 @@ idrinth.chat = { }, loginCallback: function ( data ) { if ( !data ) { - idrinth.core.alert ( idrinth.text.get ( "chat.error.loginMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.login" ) ); return; } data = JSON.parse ( data ); if ( !data ) { - idrinth.core.alert ( idrinth.text.get ( "chat.error.loginMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.login" ) ); return; } if ( !data.success && data.message && data['allow-reg'] ) { @@ -851,7 +851,7 @@ idrinth.chat = { idrinth.chat.join ( data.data ); return; } - idrinth.core.alert ( idrinth.text.get ( "chat.error.loginMoment" ) ); + idrinth.core.alert ( idrinth.text.get ( "chat.error.login" ) ); }, register: function () { this.loginActions ( 'register' ); diff --git a/src/mods/text.js b/src/mods/text.js index b110714..0e6666b 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -69,9 +69,13 @@ idrinth.text = { error: { modify: 'Can\'t modify that user at the moment', create: 'Can\'t create at the moment', - joinMoment: 'Can\'t join at the moment', join: 'Joining didn\'t work', login: 'Login failed in an unexpected way' + }, + notification: { + mentionNotis: 'chat-mention notifications?', + raidNotis: 'chat-raid notifications?', + messageNotis: 'chat-message notifications?' } }, default: 'Unexpected error occurred. Please contact script developers' @@ -132,12 +136,7 @@ idrinth.text = { enableFavRequest: 'Enable Auto-Raid-Request for Favorites?', favIdToJoin: 'FavoriteIds to join (separate multiple by comma)', worldserver: 'Worldserver?', - disableAutoJoinSpecific: 'Disable Autojoining for specific raids', - chat:{ - mentionNotis: 'chat-mention notifications?', - raidNotis: 'chat-raid notifications?', - messageNotis:'chat-message notifications?', - } + disableAutoJoinSpecific: 'Disable Autojoining for specific raids' } } }, diff --git a/src/mods/ui.js b/src/mods/ui.js index 0be4c81..2c0325f 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -563,17 +563,17 @@ idrinth.ui = { name: 'notification#mention', rType: '#input', type: 'checkbox', - label: 'ui.setting.chat.mentionNotis' + label: 'chat.notification.mentionNotis' }, { name: 'notification#raid', rType: '#input', type: 'checkbox', - label: 'ui.setting.chat.raidNotis' + label: 'chat.notification.raidNotis' }, { name: 'notification#message', rType: '#input', type: 'checkbox', - label: 'ui.setting.chat.messageNotis' + label: 'chat.notification.messageNotis' }, { name: 'windows', rType: '#input', From 7674040e9b7b366f4d74b9832ca457545576b157 Mon Sep 17 00:00:00 2001 From: ardenian Date: Sat, 8 Oct 2016 20:49:55 +0200 Subject: [PATCH 086/341] correcting makeButton calls --- src/mods/chat.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index fe1540c..97248cc 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -605,7 +605,7 @@ idrinth.chat = { children: [ makeInput ( 'Username' ), makeInput ( 'Password' ), - makeButton ( idrinth.text.get ( "chat.message.offline" ), "idrinth.chat.login()" ) + makeButton ( 'chat.message.offline', "idrinth.chat.login()" ) ] } ] @@ -622,7 +622,7 @@ idrinth.chat = { children: [ makeInput ( 'Chat-ID' ), makeInput ( 'Chat-Password' ), - makeButton ( idrinth.text.get ( "chat.ui.createAddChat" ), "idrinth.chat.add()" ) + makeButton ( 'chat.ui.createAddChat', "idrinth.chat.add()" ) ] } ] @@ -639,7 +639,7 @@ idrinth.chat = { css: 'settings', children: [ makeInput ( "Name" ), - makeButton ( idrinth.text.get ( "chat.ui.createAddChat" ), "idrinth.chat.create()" ) + makeButton ( 'chat.ui.createAddChat', "idrinth.chat.create()" ) ] } ] From 619390b3c952c54c693f21a9d5a1a8dd154fc9d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 8 Oct 2016 22:02:24 +0200 Subject: [PATCH 087/341] removing clipboard.js --- src/libs/clipboard.js | 746 ------------------------------------------ src/mods/core.js | 40 ++- src/mods/raids.js | 25 +- src/stable.js | 11 +- 4 files changed, 46 insertions(+), 776 deletions(-) delete mode 100644 src/libs/clipboard.js diff --git a/src/libs/clipboard.js b/src/libs/clipboard.js deleted file mode 100644 index 478338e..0000000 --- a/src/libs/clipboard.js +++ /dev/null @@ -1,746 +0,0 @@ - -/*! - * clipboard.js v1.5.5 - * https://zenorocha.github.io/clipboard.js - * - * Licensed MIT © Zeno Rocha - */ -(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.Clipboard = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o Date: Sat, 8 Oct 2016 22:15:43 +0200 Subject: [PATCH 088/341] fixing some labels --- src/mods/tier.js | 6 +++--- src/mods/ui.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index b887e25..243c04c 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -220,15 +220,15 @@ idrinth.tier = { }, { type: 'th', - content: idrinth.text.get ( "tier.diff.normal" ) + content: idrinth.text.get ( "tier.diff.hard" ) }, { type: 'th', - content: idrinth.text.get ( "tier.diff.normal" ) + content: idrinth.text.get ( "tier.diff.legend" ) }, { type: 'th', - content: idrinth.text.get ( "tier.diff.normal" ) + content: idrinth.text.get ( "tier.diff.night" ) } ] } diff --git a/src/mods/ui.js b/src/mods/ui.js index 2c0325f..45fb515 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -762,7 +762,7 @@ idrinth.ui = { }; var buildRaidJoinList = function () { return [ { - content: idrinth.text.get ( "ui.setting.clickCopy" ), + content: idrinth.text.get ( "ui.clickCopy" ), type: 'strong' }, { id: 'idrinth-raid-link-list' From a8b03cb87d6bae339c7405b57eedc15ed5d542c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 8 Oct 2016 22:28:25 +0200 Subject: [PATCH 089/341] fixing condition to allow actual binding to happen --- src/mods/core.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/core.js b/src/mods/core.js index 854c5d6..b4a4a87 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -118,7 +118,7 @@ idrinth.core = { idrinth.core.multibind.events[event][selector] = idrinth.core.multibind.events[event][selector] ? idrinth.core.multibind.events[event][selector] : [ ]; idrinth.core.multibind.events[event][selector].push ( method ); }; - if ( idrinth.core.multibind.events[event] ) { + if ( !idrinth.core.multibind.events[event] ) { var attribute = 'idrinth.core.triggered(this,\'' + event + '\');'; //trying not to break all old code there if ( idrinth.ui.body.getAttribute ( 'on' + event ) ) { From 92d5bd1d7acbf933f74a95edfcba87eaa837eb95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 8 Oct 2016 22:31:39 +0200 Subject: [PATCH 090/341] correcting method to call on triggered event --- src/mods/core.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/core.js b/src/mods/core.js index b4a4a87..4719931 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -119,7 +119,7 @@ idrinth.core = { idrinth.core.multibind.events[event][selector].push ( method ); }; if ( !idrinth.core.multibind.events[event] ) { - var attribute = 'idrinth.core.triggered(this,\'' + event + '\');'; + var attribute = 'idrinth.core.multibind.triggered(this,\'' + event + '\');'; //trying not to break all old code there if ( idrinth.ui.body.getAttribute ( 'on' + event ) ) { attribute += idrinth.ui.body.getAttribute ( 'on' + event ); From 17074431467b66217edc414d2d7d92f7914d5204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 8 Oct 2016 23:29:11 +0200 Subject: [PATCH 091/341] bind to element target, not body element --- src/mods/core.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/core.js b/src/mods/core.js index 4719931..7b0bad2 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -119,7 +119,7 @@ idrinth.core = { idrinth.core.multibind.events[event][selector].push ( method ); }; if ( !idrinth.core.multibind.events[event] ) { - var attribute = 'idrinth.core.multibind.triggered(this,\'' + event + '\');'; + var attribute = 'idrinth.core.multibind.triggered(event.target,\'' + event + '\');'; //trying not to break all old code there if ( idrinth.ui.body.getAttribute ( 'on' + event ) ) { attribute += idrinth.ui.body.getAttribute ( 'on' + event ); From c65fe75ea8e401ec63fc3659a316062129e6648f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 8 Oct 2016 23:44:35 +0200 Subject: [PATCH 092/341] adjusting bound function for triggered elements --- src/stable.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/stable.js b/src/stable.js index b757e5a..9069445 100644 --- a/src/stable.js +++ b/src/stable.js @@ -138,10 +138,10 @@ var idrinth = { } startModules (); window.setTimeout ( function () { - idrinth.core.multibind.add ( 'click', '.clipboard-copy', function ( e ) { - e = e || window.event; - idrinth.core.copyToClipboard.element ( e.trigger ); - e.trigger.parentNode.parentNode.removeChild ( e.trigger.parentNode ); + idrinth.core.multibind.add ( 'click', '.clipboard-copy', function ( event ) { + idrinth.core.copyToClipboard.element ( this ); + this.parentNode.parentNode.removeChild ( this.parentNode ); + idrinth.core.log ( event + ' fired on ' + this ); } ); }, 1000 ); delete idrinth['start']; From 47d44f0edd57fad4a100ce5eebcbcbe52d5864d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 00:04:55 +0200 Subject: [PATCH 093/341] changing bind-handling --- src/mods/core.js | 16 ++++++++-------- src/stable.js | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/mods/core.js b/src/mods/core.js index 7b0bad2..43b6676 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -119,15 +119,15 @@ idrinth.core = { idrinth.core.multibind.events[event][selector].push ( method ); }; if ( !idrinth.core.multibind.events[event] ) { - var attribute = 'idrinth.core.multibind.triggered(event.target,\'' + event + '\');'; + idrinth.ui.body.addEventListener ( event, function () { + e = e || window.event; + idrinth.core.multibind.triggered ( e.target, e.type ); + } ); //trying not to break all old code there - if ( idrinth.ui.body.getAttribute ( 'on' + event ) ) { - attribute += idrinth.ui.body.getAttribute ( 'on' + event ); - } - if ( idrinth.ui.body['on' + event] && typeof idrinth.ui.body['on' + event] === 'function' ) { - bind ( event, 'body', idrinth.ui.body['on' + event] ); + if ( idrinth.ui.body.hasAttribute ( 'on' + event ) ) { + idrinth.ui.body.addEventListener ( event, new Function ( idrinth.ui.body.getAttribute ( 'on' + event ) ) ); + idrinth.ui.body.removeAttribute ( 'on' + event ); } - idrinth.ui.body.setAttribute ( 'on' + event, attribute ); } bind ( event, selector, method ); }, @@ -138,7 +138,7 @@ idrinth.core = { } for (var pos = 0; pos < idrinth.core.multibind.events[event][selector].length; pos++) { try { - idrinth.core.multibind.events[event][selector][pos].bind ( el, event ); + idrinth.core.multibind.events[event][selector][pos] ( el, event ); } catch ( exception ) { idrinth.core.log ( exception.getMessage () ); } diff --git a/src/stable.js b/src/stable.js index 9069445..8d55b6a 100644 --- a/src/stable.js +++ b/src/stable.js @@ -138,10 +138,10 @@ var idrinth = { } startModules (); window.setTimeout ( function () { - idrinth.core.multibind.add ( 'click', '.clipboard-copy', function ( event ) { - idrinth.core.copyToClipboard.element ( this ); - this.parentNode.parentNode.removeChild ( this.parentNode ); - idrinth.core.log ( event + ' fired on ' + this ); + idrinth.core.multibind.add ( 'click', '.clipboard-copy', function ( element, event ) { + idrinth.core.copyToClipboard.element ( element ); + element.parentNode.parentNode.removeChild ( element.parentNode ); + idrinth.core.log ( event + ' fired on ' + element ); } ); }, 1000 ); delete idrinth['start']; From 5a37e87549b0d2b3d2cfff46797ae06ac98cda12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 00:21:48 +0200 Subject: [PATCH 094/341] adding event to function --- src/mods/core.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/core.js b/src/mods/core.js index 43b6676..16c419f 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -119,7 +119,7 @@ idrinth.core = { idrinth.core.multibind.events[event][selector].push ( method ); }; if ( !idrinth.core.multibind.events[event] ) { - idrinth.ui.body.addEventListener ( event, function () { + idrinth.ui.body.addEventListener ( event, function ( e ) { e = e || window.event; idrinth.core.multibind.triggered ( e.target, e.type ); } ); From 0501baf7ca4b8763618bf616523c06d1742f58ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 00:38:59 +0200 Subject: [PATCH 095/341] improvements to element copy --- src/mods/core.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/mods/core.js b/src/mods/core.js index 16c419f..54116b4 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -79,10 +79,13 @@ idrinth.core = { return success; }, element: function ( element ) { - return idrinth.core.copyToClipboard ( - element.hasAttribute ( 'data-clipboard-text' ) - ? element.getAttribute ( 'data-clipboard-text' ) - : element.innerHTML ); + if ( element.hasAttribute ( 'data-clipboard-text' ) ) { + idrinth.core.copyToClipboard.text ( element.getAttribute ( 'data-clipboard-text' ) ); + } + if ( element.value ) { + idrinth.core.copyToClipboard.text ( element.value ); + } + return idrinth.core.copyToClipboard.text ( element.innerHTML ); } }, sendNotification: function ( title, content ) { @@ -140,7 +143,7 @@ idrinth.core = { try { idrinth.core.multibind.events[event][selector][pos] ( el, event ); } catch ( exception ) { - idrinth.core.log ( exception.getMessage () ); + idrinth.core.log ( exception.message ? exception.message : exception.getMessage () ); } } }; From 87d2d86ec2ea79b4687dc77dc6a9b99562b4c65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 00:42:18 +0200 Subject: [PATCH 096/341] adding missing returns --- src/mods/core.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mods/core.js b/src/mods/core.js index 54116b4..857c77c 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -80,10 +80,10 @@ idrinth.core = { }, element: function ( element ) { if ( element.hasAttribute ( 'data-clipboard-text' ) ) { - idrinth.core.copyToClipboard.text ( element.getAttribute ( 'data-clipboard-text' ) ); + return idrinth.core.copyToClipboard.text ( element.getAttribute ( 'data-clipboard-text' ) ); } if ( element.value ) { - idrinth.core.copyToClipboard.text ( element.value ); + return idrinth.core.copyToClipboard.text ( element.value ); } return idrinth.core.copyToClipboard.text ( element.innerHTML ); } From f7206ef86b6166b9be57a11ebdd09c3346a51c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 02:45:48 +0200 Subject: [PATCH 097/341] fixing chat action texts --- src/mods/chat.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 97248cc..48bae9e 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -100,8 +100,9 @@ idrinth.chat = { if ( !hasRights ( node.requiredRank, ownRank ) ) { return; } + var translation = idrinth.text.get ( config.label ); return { - content: node.label, + content: translation === idrinth.text.data.default ? config.label : translation, type: 'li', attributes: [ { name: 'onclick', @@ -493,7 +494,7 @@ idrinth.chat = { start: function () { var build = function () { var makeInput = function ( label ) { - var translation = idrinth.text.get( label ); + var translation = idrinth.text.get ( label ); return { type: 'li', children: [ @@ -518,7 +519,7 @@ idrinth.chat = { }; }; var makeButton = function ( label, onclick ) { - var translation = idrinth.text.get( label ); + var translation = idrinth.text.get ( label ); return { type: 'li', children: [ From 20179eb12c6bc3e30be95ca7fcdeac1e75be89d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 02:49:04 +0200 Subject: [PATCH 098/341] correcting method call --- src/mods/chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 48bae9e..f94f63b 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -901,7 +901,7 @@ idrinth.chat = { ], attributes: [ { name: 'style', - value: idrinth.ui.getPosition ( element ) + value: idrinth.ui.getElementPositioning ( element, 0, 0 ) } ] } ) ); }, From ad36c1316e59e3730ecab5cd3125c6e80133bc24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 02:52:44 +0200 Subject: [PATCH 099/341] fixes #189 fixes #137 --- src/mods/core.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mods/core.js b/src/mods/core.js index 857c77c..5c3e51d 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -37,7 +37,9 @@ idrinth.core = { requestHandler.timeout = 30000; requestHandler.ontimeout = function ( event ) { var request = ( event || window.event ).target; - timeout.bind ( request ); + if ( typeof timeout === 'function' ) { + timeout.bind ( request ); + } delete idrinth.core.ajax.active[request._url]; idrinth.core.log ( 'Request to ' + request._url + ' failed.' ); }; From b7105aa78203acc1c24396680e1867fc4e84405a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 03:04:08 +0200 Subject: [PATCH 100/341] simplyfiing the multievents --- src/mods/core.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/mods/core.js b/src/mods/core.js index 5c3e51d..8fcc7ed 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -128,11 +128,6 @@ idrinth.core = { e = e || window.event; idrinth.core.multibind.triggered ( e.target, e.type ); } ); - //trying not to break all old code there - if ( idrinth.ui.body.hasAttribute ( 'on' + event ) ) { - idrinth.ui.body.addEventListener ( event, new Function ( idrinth.ui.body.getAttribute ( 'on' + event ) ) ); - idrinth.ui.body.removeAttribute ( 'on' + event ); - } } bind ( event, selector, method ); }, From d09423e4a13f28806189b009de8cf68d38db7136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 03:11:14 +0200 Subject: [PATCH 101/341] likely fixing some data access in both land and settings --- src/mods/land.js | 4 +++- src/mods/settings.js | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/mods/land.js b/src/mods/land.js index ba5217b..db35d27 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -66,7 +66,9 @@ idrinth.land = { idrinth.settings.save (); }; for (var key in idrinth.settings.land) { - idrinth.settings.change ( 'land-' + key, parseInt ( document.getElementById ( 'idrinth-land-' + key ).value, 10 ) ); + if ( idrinth.settings.land.hasOwnProperty ( key ) ) { + idrinth.settings.change ( 'land-' + key, parseInt ( document.getElementById ( 'idrinth-land-' + key ).value, 10 ) ); + } } var results = baseCalculator ( getRequirements () ); if ( Object.keys ( results ).length === 0 ) { diff --git a/src/mods/settings.js b/src/mods/settings.js index f87f30c..1d01e50 100644 --- a/src/mods/settings.js +++ b/src/mods/settings.js @@ -91,13 +91,14 @@ idrinth.settings = { return item; }; for (var key in idrinth.settings) { - if ( key !== 'land' ) { + if ( typeof idrinth.settings[key] !== 'object' ) { idrinth.settings[key] = itemHandler ( '', key, idrinth.settings[key] ); + } else { + for (var key2 in idrinth.settings[key]) { + idrinth.settings[key][key2] = itemHandler ( key + '-', key2, idrinth.settings[key][key2] ); + } } } - for (var building in idrinth.settings.land) { - idrinth.settings.land[building] = itemHandler ( 'land-', building, idrinth.settings.land[building] ); - } } } }; \ No newline at end of file From 275b7c06593a0f0a7d818805dad368adeffdda43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 03:23:38 +0200 Subject: [PATCH 102/341] reorganizing multi-level iteration to fill settings --- src/mods/settings.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/mods/settings.js b/src/mods/settings.js index 1d01e50..742870e 100644 --- a/src/mods/settings.js +++ b/src/mods/settings.js @@ -90,15 +90,19 @@ idrinth.settings = { } return item; }; - for (var key in idrinth.settings) { - if ( typeof idrinth.settings[key] !== 'object' ) { - idrinth.settings[key] = itemHandler ( '', key, idrinth.settings[key] ); - } else { - for (var key2 in idrinth.settings[key]) { - idrinth.settings[key][key2] = itemHandler ( key + '-', key2, idrinth.settings[key][key2] ); + var objectIterator = function ( object, prefix, itemHandler, objectIterator ) { + for (var key in object) { + if ( object.hasOwnProperty ( key ) ) { + if ( typeof idrinth.settings[key] !== 'object' ) { + object[key] = itemHandler ( prefix, key, object[key] ); + } else { + object[key] = objectIterator ( object[key], prefix + key + '-', itemHandler, objectIterator ); + } } } - } + return object; + }; + objectIterator ( idrinth.settings, '', itemHandler, objectIterator ); } } }; \ No newline at end of file From e205b141858cac61b42cddb608eb76d094d0bfa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 03:24:31 +0200 Subject: [PATCH 103/341] reorganizing multi-level iteration to fill settings(2) --- src/mods/settings.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/mods/settings.js b/src/mods/settings.js index 742870e..47ea387 100644 --- a/src/mods/settings.js +++ b/src/mods/settings.js @@ -76,24 +76,24 @@ idrinth.settings = { start: function ( ) { 'use strict'; if ( window.localStorage ) { - var itemHandler = function ( prefix, key, item ) { - if ( typeof item !== 'function' ) { - var tmp = window.localStorage.getItem ( 'idrinth-dotd-' + prefix + key ); - if ( tmp ) { - if ( tmp === 'false' ) { - tmp = false; - } else if ( tmp === 'true' ) { - tmp = true; + var objectIterator = function ( object, prefix, objectIterator ) { + var itemHandler = function ( prefix, key, item ) { + if ( typeof item !== 'function' ) { + var tmp = window.localStorage.getItem ( 'idrinth-dotd-' + prefix + key ); + if ( tmp ) { + if ( tmp === 'false' ) { + tmp = false; + } else if ( tmp === 'true' ) { + tmp = true; + } + item = tmp; } - item = tmp; } - } - return item; - }; - var objectIterator = function ( object, prefix, itemHandler, objectIterator ) { + return item; + }; for (var key in object) { if ( object.hasOwnProperty ( key ) ) { - if ( typeof idrinth.settings[key] !== 'object' ) { + if ( typeof object[key] !== 'object' ) { object[key] = itemHandler ( prefix, key, object[key] ); } else { object[key] = objectIterator ( object[key], prefix + key + '-', itemHandler, objectIterator ); @@ -102,7 +102,7 @@ idrinth.settings = { } return object; }; - objectIterator ( idrinth.settings, '', itemHandler, objectIterator ); + objectIterator ( idrinth.settings, '', objectIterator ); } } }; \ No newline at end of file From 3a965ae49aa94f171a309bfd2969229b3e3d1b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 04:02:00 +0200 Subject: [PATCH 104/341] making sure the land calculation actually fills an object --- src/mods/land.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mods/land.js b/src/mods/land.js index db35d27..1411e17 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -6,10 +6,11 @@ idrinth.land = { return ( 10 + idrinth.settings.land[building] ) * idrinth.land.data[building].base; }; var results = { }; - var applyResult = function ( res, factor, nextPrice ) { + var applyResult = function ( results, res, factor, nextPrice ) { idrinth.settings.land.gold = idrinth.settings.land.gold - nextPrice () * factor / 10; results[res.key] = ( results[res.key] === undefined ? 0 : results[res.key] ) + factor; idrinth.settings.land[res.key] = idrinth.settings.land[res.key] + factor; + return results; }; var processBuildings = function ( checkElementFunc, factor, nextPrice ) { var check = function ( checkElementFunc, building, factor, res, nextPrice ) { @@ -39,7 +40,7 @@ idrinth.land = { if ( res.key === null ) { return results; } - applyResult ( res, factor, nextPrice ); + results = applyResult ( results, res, factor, nextPrice ); } idrinth.settings.save (); return results; From c688a62a08eddd4a05367da7327e7b22e1ac641f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 04:03:07 +0200 Subject: [PATCH 105/341] fixing naming --- src/mods/land.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/land.js b/src/mods/land.js index 1411e17..4211dd2 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -73,7 +73,7 @@ idrinth.land = { } var results = baseCalculator ( getRequirements () ); if ( Object.keys ( results ).length === 0 ) { - idrinth.core.alert ( idrinth.text.get ( "land.lackgold" ) ); + idrinth.core.alert ( idrinth.text.get ( "land.lackGold" ) ); } putResults ( results ); }, From 4888132eb9740ec454ec6f043f92e0e2d79b8c8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 04:17:53 +0200 Subject: [PATCH 106/341] storing land values correctly --- src/mods/land.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/land.js b/src/mods/land.js index 4211dd2..bb08205 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -68,7 +68,7 @@ idrinth.land = { }; for (var key in idrinth.settings.land) { if ( idrinth.settings.land.hasOwnProperty ( key ) ) { - idrinth.settings.change ( 'land-' + key, parseInt ( document.getElementById ( 'idrinth-land-' + key ).value, 10 ) ); + idrinth.settings.change ( 'land#' + key, parseInt ( document.getElementById ( 'idrinth-land-' + key ).value, 10 ) ); } } var results = baseCalculator ( getRequirements () ); From 26c6a78c26989ef0c1128957c16212fe6dfdde41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 04:25:20 +0200 Subject: [PATCH 107/341] providing building for price calculations --- src/mods/land.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/land.js b/src/mods/land.js index bb08205..fd54320 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -7,7 +7,7 @@ idrinth.land = { }; var results = { }; var applyResult = function ( results, res, factor, nextPrice ) { - idrinth.settings.land.gold = idrinth.settings.land.gold - nextPrice () * factor / 10; + idrinth.settings.land.gold = idrinth.settings.land.gold - nextPrice ( res.key ) * factor / 10; results[res.key] = ( results[res.key] === undefined ? 0 : results[res.key] ) + factor; idrinth.settings.land[res.key] = idrinth.settings.land[res.key] + factor; return results; From 6f9f0763add4929e4fd8404d644fd9f10c61fd57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 04:31:37 +0200 Subject: [PATCH 108/341] fixes #180 actually this just adds a check on properties, the fix was in a previous commit --- src/mods/land.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mods/land.js b/src/mods/land.js index fd54320..b84dcc5 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -60,8 +60,10 @@ idrinth.land = { }; var putResults = function ( results ) { for (var key in results) { - document.getElementById ( 'idrinth-land-' + key ).value = idrinth.settings.land[key]; - document.getElementById ( 'idrinth-land-' + key ).parentNode.nextSibling.innerHTML = '+' + results[key]; + if ( results.hasOwnProperty ( key ) ) { + document.getElementById ( 'idrinth-land-' + key ).value = idrinth.settings.land[key]; + document.getElementById ( 'idrinth-land-' + key ).parentNode.nextSibling.innerHTML = '+' + results[key]; + } } document.getElementById ( 'idrinth-land-gold' ).value = idrinth.settings.land.gold; idrinth.settings.save (); From 316c5524511a058e3ac8cf617319deef475b3219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 04:34:19 +0200 Subject: [PATCH 109/341] adds a check on properties --- src/mods/chat.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index f94f63b..18d72ae 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -81,14 +81,16 @@ idrinth.chat = { } ]; for (var chatId in idrinth.chat.chatRank) { - var intChatId = parseInt ( chatId, 10 ); - if ( document.getElementById ( 'idrinth-chat-tab-click-' + chatId ) && intChatId !== chat && intChatId > 1 && !( user in idrinth.chat.chatRank[chatId] ) ) { - promotionModes.push ( { - chat: chatId, - label: 'Invite to Chat ' + document.getElementById ( 'idrinth-chat-tab-click-' + chatId ).innerHTML, - rank: 'User', - requiredRank: 1 - } ); + if ( idrinth.chat.chatRank.hasOwnProperty ( chatId ) ) { + var intChatId = parseInt ( chatId, 10 ); + if ( document.getElementById ( 'idrinth-chat-tab-click-' + chatId ) && intChatId !== chat && intChatId > 1 && !( user in idrinth.chat.chatRank[chatId] ) ) { + promotionModes.push ( { + chat: chatId, + label: 'Invite to Chat ' + document.getElementById ( 'idrinth-chat-tab-click-' + chatId ).innerHTML, + rank: 'User', + requiredRank: 1 + } ); + } } } return promotionModes; From da0d31aea9d743d3eda29788cf68abc3d29c71cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 11:54:05 +0200 Subject: [PATCH 110/341] fixes #176 correction to the getter's code --- src/mods/settings.js | 232 +++++++++++++++++++++++-------------------- src/mods/ui.js | 22 +--- 2 files changed, 127 insertions(+), 127 deletions(-) diff --git a/src/mods/settings.js b/src/mods/settings.js index 47ea387..ad3ee84 100644 --- a/src/mods/settings.js +++ b/src/mods/settings.js @@ -1,108 +1,126 @@ -idrinth.settings = { - raids: false, - favs: '', - factor: true, - moveLeft: false, - minimalist: false, - chatHiddenOnStart: true, - names: true, - timeout: 5000, - loadtime: 5000, - windows: 3, - warBottom: false, - landMax: true, - chatting: true, - chatuser: '', - newgroundLoad: 30, - chatpass: '', - isWorldServer: false, - alarmTime: '8:0', - alarmActive: false, - bannedRaids: { }, - notification: { - mention: true, - message: true, - raid: true - }, - land: { - cornfield: 0, - stable: 0, - barn: 0, - store: 0, - pub: 0, - inn: 0, - tower: 0, - fort: 0, - castle: 0, - gold: 0 - }, - save: function ( ) { - 'use strict'; - var store = function ( prefix, list, store ) { - for (var key in list) { - if ( list.hasOwnProperty ( key ) && typeof list[key] !== 'object' && typeof list[key] !== 'function' ) { - window.localStorage.setItem ( prefix + key, list[key] ); - } else if ( list.hasOwnProperty ( key ) && typeof list[key] === 'object' ) { - store ( prefix + key + '-', list[key], store ); - } - } - }; - store ( 'idrinth-dotd-', idrinth.settings, store ); - }, - change: function ( field, value ) { - 'use strict'; - var setValue = function ( parent, field, value ) { - if ( idrinth.core.fieldIsSetting ( parent, field ) ) { - parent[field] = value; - idrinth.settings.save ( ); - return true; - } - return false; - }; - if ( !field ) { - return; - } - if ( setValue ( idrinth.settings, field, value ) ) { - return; - } - field = field.split ( '#' ); - if ( !idrinth.settings[field[0]] || !field[1] ) { - return; - } - if ( setValue ( idrinth.settings[field[0]], field[1], value ) ) { - return; - } - }, - start: function ( ) { - 'use strict'; - if ( window.localStorage ) { - var objectIterator = function ( object, prefix, objectIterator ) { - var itemHandler = function ( prefix, key, item ) { - if ( typeof item !== 'function' ) { - var tmp = window.localStorage.getItem ( 'idrinth-dotd-' + prefix + key ); - if ( tmp ) { - if ( tmp === 'false' ) { - tmp = false; - } else if ( tmp === 'true' ) { - tmp = true; - } - item = tmp; - } - } - return item; - }; - for (var key in object) { - if ( object.hasOwnProperty ( key ) ) { - if ( typeof object[key] !== 'object' ) { - object[key] = itemHandler ( prefix, key, object[key] ); - } else { - object[key] = objectIterator ( object[key], prefix + key + '-', itemHandler, objectIterator ); - } - } - } - return object; - }; - objectIterator ( idrinth.settings, '', objectIterator ); - } - } +idrinth.settings = { + raids: false, + favs: '', + factor: true, + moveLeft: false, + minimalist: false, + chatHiddenOnStart: true, + names: true, + timeout: 5000, + loadtime: 5000, + windows: 3, + warBottom: false, + landMax: true, + chatting: true, + chatuser: '', + newgroundLoad: 30, + chatpass: '', + isWorldServer: false, + alarmTime: '8:0', + alarmActive: false, + bannedRaids: { }, + notification: { + mention: true, + message: true, + raid: true + }, + land: { + cornfield: 0, + stable: 0, + barn: 0, + store: 0, + pub: 0, + inn: 0, + tower: 0, + fort: 0, + castle: 0, + gold: 0 + }, + save: function ( ) { + 'use strict'; + var store = function ( prefix, list, store ) { + for (var key in list) { + if ( list.hasOwnProperty ( key ) && typeof list[key] !== 'object' && typeof list[key] !== 'function' ) { + window.localStorage.setItem ( prefix + key, list[key] ); + } else if ( list.hasOwnProperty ( key ) && typeof list[key] === 'object' ) { + store ( prefix + key + '-', list[key], store ); + } + } + }; + store ( 'idrinth-dotd-', idrinth.settings, store ); + }, + get: function ( field ) { + 'use strict'; + var getValue = function ( parent, field ) { + if ( idrinth.core.fieldIsSetting ( parent, field ) ) { + return parent[field]; + } + return null; + }; + if ( !field ) { + return; + } + var value = getValue ( idrinth.settings, field ); + if ( value !== null && typeof value !== 'object' ) { + return value; + } + field = field.split ( '#' ); + return getValue ( idrinth.settings[field[0]], field[1] ); + }, + change: function ( field, value ) { + 'use strict'; + var setValue = function ( parent, field, value ) { + if ( idrinth.core.fieldIsSetting ( parent, field ) ) { + parent[field] = value; + idrinth.settings.save ( ); + return true; + } + return false; + }; + if ( !field ) { + return; + } + if ( setValue ( idrinth.settings, field, value ) ) { + return; + } + field = field.split ( '#' ); + if ( !idrinth.settings[field[0]] || !field[1] ) { + return; + } + if ( setValue ( idrinth.settings[field[0]], field[1], value ) ) { + return; + } + }, + start: function ( ) { + 'use strict'; + if ( window.localStorage ) { + var objectIterator = function ( object, prefix, objectIterator ) { + var itemHandler = function ( prefix, key, item ) { + if ( typeof item !== 'function' ) { + var tmp = window.localStorage.getItem ( 'idrinth-dotd-' + prefix + key ); + if ( tmp ) { + if ( tmp === 'false' ) { + tmp = false; + } else if ( tmp === 'true' ) { + tmp = true; + } + item = tmp; + } + } + return item; + }; + for (var key in object) { + if ( object.hasOwnProperty ( key ) ) { + if ( typeof object[key] !== 'object' ) { + object[key] = itemHandler ( prefix, key, object[key] ); + } else { + object[key] = objectIterator ( object[key], prefix + key + '-', itemHandler, objectIterator ); + } + } + } + return object; + }; + objectIterator ( idrinth.settings, '', objectIterator ); + } + } }; \ No newline at end of file diff --git a/src/mods/ui.js b/src/mods/ui.js index 45fb515..6173217 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -143,29 +143,11 @@ idrinth.ui = { } return list.indexOf ( value ) > -1; }; - var get = function ( field ) { - 'use strict'; - var getValue = function ( parent, field ) { - if ( idrinth.core.fieldIsSetting ( parent, field ) ) { - return parent[field]; - } - return null; - }; - if ( !field ) { - return; - } - var value = getValue ( idrinth.settings, field ); - if ( value !== null ) { - return value; - } - field = field.split ( '#' ); - return getValue ( idrinth.settings[field[0]], field[1] ); - }; var input = [ { name: 'type', value: config.type } ]; - if ( get ( config.name ) && config.type === 'checkbox' ) { + if ( idrinth.settings.get ( config.name ) && config.type === 'checkbox' ) { input.push ( { name: 'checked', value: 'checked' @@ -174,7 +156,7 @@ idrinth.ui = { if ( config.type !== 'checkbox' ) { input.push ( { name: 'value', - value: get ( config.name ) + value: idrinth.settings.get ( config.name ) } ); input.push ( { name: 'onchange', From 3569ba2df01afd74d51b548ba51e8befd92d7a3f Mon Sep 17 00:00:00 2001 From: ardenian Date: Sun, 9 Oct 2016 13:43:29 +0200 Subject: [PATCH 111/341] First changes based on #191 --- src/mods/land.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mods/land.js b/src/mods/land.js index b84dcc5..8f0a236 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -3,13 +3,13 @@ idrinth.land = { var baseCalculator = function ( checkElementFunc ) { var factor = idrinth.settings.factor ? 10 : 1; var nextPrice = function ( building ) { - return ( 10 + idrinth.settings.land[building] ) * idrinth.land.data[building].base; + return ( 10 + idrinth.settings.get("land#" + building ) ) * idrinth.land.data[building].base; }; var results = { }; var applyResult = function ( results, res, factor, nextPrice ) { - idrinth.settings.land.gold = idrinth.settings.land.gold - nextPrice ( res.key ) * factor / 10; + idrinth.settings.change("lang#gold", idrinth.settings.get( "land#gold" ) - nextPrice( res.key ) * factor / 10); results[res.key] = ( results[res.key] === undefined ? 0 : results[res.key] ) + factor; - idrinth.settings.land[res.key] = idrinth.settings.land[res.key] + factor; + idrinth.settings.change( "land#" + res.key, idrinth.settings.get( "land#" + res.key ) + factor ); return results; }; var processBuildings = function ( checkElementFunc, factor, nextPrice ) { @@ -35,7 +35,7 @@ idrinth.land = { } return res; }; - while ( idrinth.settings.land.gold >= 0 ) { + while ( idrinth.settings.get( "land#gold" ) >= 0 ) { var res = processBuildings ( checkElementFunc, factor, nextPrice ); if ( res.key === null ) { return results; @@ -50,7 +50,7 @@ idrinth.land = { return res.min === null || nextPrice ( building ) / idrinth.land.data[building].perHour < res.min; }; var useUp = function ( building, factor, res, nextPrice ) { - return nextPrice ( building ) * factor / 10 <= idrinth.settings.land.gold; + return nextPrice( building ) * factor / 10 <= idrinth.settings.get( "land#gold" ); }; var funcs = [ useUp ]; if ( idrinth.settings.landMax ) { @@ -61,14 +61,14 @@ idrinth.land = { var putResults = function ( results ) { for (var key in results) { if ( results.hasOwnProperty ( key ) ) { - document.getElementById ( 'idrinth-land-' + key ).value = idrinth.settings.land[key]; + document.getElementById ( 'idrinth-land-' + key ).value = idrinth.settings.get("land#"+key); document.getElementById ( 'idrinth-land-' + key ).parentNode.nextSibling.innerHTML = '+' + results[key]; } } - document.getElementById ( 'idrinth-land-gold' ).value = idrinth.settings.land.gold; + document.getElementById( 'idrinth-land-gold' ).value = idrinth.settings.get( "land#gold" ); idrinth.settings.save (); }; - for (var key in idrinth.settings.land) { + for (var key in idrinth.settings.get("land#")) { if ( idrinth.settings.land.hasOwnProperty ( key ) ) { idrinth.settings.change ( 'land#' + key, parseInt ( document.getElementById ( 'idrinth-land-' + key ).value, 10 ) ); } From de6cb03354ee89d4e021ff29d5802a5a03bec58c Mon Sep 17 00:00:00 2001 From: ardenian Date: Sun, 9 Oct 2016 13:57:33 +0200 Subject: [PATCH 112/341] Second changes based on #191 --- src/mods/chat.js | 22 +++++++++++----------- src/mods/land.js | 4 ++-- src/mods/text.js | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 18d72ae..f371643 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -544,11 +544,11 @@ idrinth.chat = { }; return idrinth.ui.buildElement ( { id: 'idrinth-chat', - css: 'idrinth-hovering-box' + ( !idrinth.settings.chatHiddenOnStart ? ' active' : '' ) + ( idrinth.settings.moveLeft ? ' left-sided' : '' ), + css: 'idrinth-hovering-box' + ( !idrinth.settings.get("chatHiddenOnStart") ? ' active' : '' ) + ( idrinth.settings.get("moveLeft") ? ' left-sided' : '' ), children: [ { type: 'button', - content: ( idrinth.settings.chatHiddenOnStart ? '<<' : '>>' ), + content: ( idrinth.settings.get("chatHiddenOnStart") ? '<<' : '>>' ), attributes: [ { name: 'onclick', value: 'idrinth.chat.openCloseChat(this);' @@ -706,7 +706,7 @@ idrinth.chat = { ] } ); }; - if ( !idrinth.settings.chatting ) { + if ( !idrinth.settings.get("chatting") ) { return; } if ( !document.getElementById ( 'idrinth-chat' ) ) { @@ -724,8 +724,8 @@ idrinth.chat = { window.setTimeout ( idrinth.chat.login, 1 ); }, JSON.stringify ( { - user: idrinth.settings.chatuser, - pass: idrinth.settings.chatpass + user: idrinth.settings.get("chatuser"), + pass: idrinth.settings.get("chatpass") } ) ); }, 2500 ); @@ -847,8 +847,8 @@ idrinth.chat = { return; } if ( data.success ) { - idrinth.settings.chatuser = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[0].value; - idrinth.settings.chatpass = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[1].value; + idrinth.settings.get("chatuser") = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[0].value; + idrinth.settings.get("chatpass") = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[1].value; idrinth.settings.save (); idrinth.ui.removeElement ( 'idrinth-chat-login' ); idrinth.chat.join ( data.data ); @@ -927,11 +927,11 @@ idrinth.chat = { openCloseChat: function ( element ) { var chat = element.parentNode; if ( chat.getAttribute ( 'class' ) === 'idrinth-hovering-box active' || chat.getAttribute ( 'class' ) === 'idrinth-hovering-box active left-sided' ) { - chat.setAttribute ( 'class', 'idrinth-hovering-box' + ( idrinth.settings.moveLeft ? ' left-sided' : '' ) + + chat.setAttribute ( 'class', 'idrinth-hovering-box' + ( idrinth.settings.get("moveLeft") ? ' left-sided' : '' ) + ( chat.getElementsByClassName ( 'new-message' ) && chat.getElementsByClassName ( 'new-message' ).length ? ' new-message' : '' ) ); element.innerHTML = '<<'; } else { - chat.setAttribute ( 'class', 'idrinth-hovering-box active' + ( idrinth.settings.moveLeft ? ' left-sided' : '' ) ); + chat.setAttribute ( 'class', 'idrinth-hovering-box active' + ( idrinth.settings.get("moveLeft") ? ' left-sided' : '' ) ); element.innerHTML = '>>'; } }, @@ -962,8 +962,8 @@ idrinth.chat = { success = function () { idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 1500 ); }; - headers.user = idrinth.settings.chatuser; - headers.pass = idrinth.settings.chatpass; + headers.user = idrinth.settings.get("chatuser"); + headers.pass = idrinth.settings.get("chatpass"); } else { chatLogin = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' ); headers.user = chatLogin[0].value; diff --git a/src/mods/land.js b/src/mods/land.js index 8f0a236..c12c461 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -7,7 +7,7 @@ idrinth.land = { }; var results = { }; var applyResult = function ( results, res, factor, nextPrice ) { - idrinth.settings.change("lang#gold", idrinth.settings.get( "land#gold" ) - nextPrice( res.key ) * factor / 10); + idrinth.settings.change("land#gold", idrinth.settings.get( "land#gold" ) - nextPrice( res.key ) * factor / 10); results[res.key] = ( results[res.key] === undefined ? 0 : results[res.key] ) + factor; idrinth.settings.change( "land#" + res.key, idrinth.settings.get( "land#" + res.key ) + factor ); return results; @@ -53,7 +53,7 @@ idrinth.land = { return nextPrice( building ) * factor / 10 <= idrinth.settings.get( "land#gold" ); }; var funcs = [ useUp ]; - if ( idrinth.settings.landMax ) { + if ( idrinth.settings.get("landMax") ) { funcs.push ( bestPrice ); } return funcs; diff --git a/src/mods/text.js b/src/mods/text.js index 0e6666b..c5830a6 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -11,7 +11,7 @@ idrinth.text = { * @returns {undefined} */ start: function () { - var language = idrinth.settings.language || window.navigator.userLanguage || window.navigator.language; + var language = idrinth.settings.get("language") || window.navigator.userLanguage || window.navigator.language; if ( language === 'en' ) { idrinth.text.initialized = true; return; From 8d3b5c59768c705149a518a7256237ca5c731279 Mon Sep 17 00:00:00 2001 From: ardenian Date: Sun, 9 Oct 2016 14:08:16 +0200 Subject: [PATCH 113/341] Further changes for #191 --- src/mods/core.js | 2 +- src/mods/land.js | 2 -- src/mods/raids.js | 10 +++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/mods/core.js b/src/mods/core.js index 8fcc7ed..fd3d8fc 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -7,7 +7,7 @@ idrinth.core = { }, ajax: { runHome: function ( url, success, failure, timeout, additionalHeader, isStatic ) { - var server = isStatic ? 'static' : ( idrinth.settings.isWorldServer ? 'world-' : '' ) + idrinth.platform; + var server = isStatic ? 'static' : ( idrinth.settings.get("isWorldServer") ? 'world-' : '' ) + idrinth.platform; var homeUrl = 'https://dotd.idrinth.de/' + server + ( '/' + url ).replace ( /\/\//, '/' ); idrinth.core.ajax.run ( homeUrl, success, failure, timeout, additionalHeader ); }, diff --git a/src/mods/land.js b/src/mods/land.js index c12c461..5541005 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -42,7 +42,6 @@ idrinth.land = { } results = applyResult ( results, res, factor, nextPrice ); } - idrinth.settings.save (); return results; }; var getRequirements = function () { @@ -66,7 +65,6 @@ idrinth.land = { } } document.getElementById( 'idrinth-land-gold' ).value = idrinth.settings.get( "land#gold" ); - idrinth.settings.save (); }; for (var key in idrinth.settings.get("land#")) { if ( idrinth.settings.land.hasOwnProperty ( key ) ) { diff --git a/src/mods/raids.js b/src/mods/raids.js index 40d99c4..179def7 100644 --- a/src/mods/raids.js +++ b/src/mods/raids.js @@ -80,7 +80,7 @@ idrinth.raids = { tag + 'raid_id=' + data.raidId + '&' + tag + 'difficulty=' + data.difficulty + '&' + tag + 'hash=' + data.hash + - ( idrinth.settings.isWorldServer ? '&' + tag + 'serverid=' + 2 : '' ); + ( idrinth.settings.get("isWorldServer") ? '&' + tag + 'serverid=' + 2 : '' ); } catch ( e1 ) { return false; } @@ -208,7 +208,7 @@ idrinth.raids = { var byFrame = function ( key ) { 'use strict'; var exist = document.getElementsByClassName ( 'idrinth-join-frame' ).length; - if ( exist >= idrinth.settings.windows ) { + if ( exist >= idrinth.settings.get("windows") ) { idrinth.raids.list[key].joined = false; return; } @@ -281,14 +281,14 @@ idrinth.raids = { return options; }; var reachedMax = function ( amount ) { - return amount > 99 || ( ( idrinth.platform === 'facebook' || idrinth.platform === 'dawnofthedragons' ) && amount >= idrinth.settings.windows ); + return amount > 99 || ( ( idrinth.platform === 'facebook' || idrinth.platform === 'dawnofthedragons' ) && amount >= idrinth.settings.get("windows") ); }; var handleKey = function ( added, key, options ) { var raid = idrinth.raids.list[key]; if ( !raid.joined ) { added++; options[0] ( key );//post link - if ( !idrinth.settings.bannedRaids[raid.raid] ) { + if ( !idrinth.settings.get("bannedRaids#"+raid.raid) ) { for (var count = 1; count < options.length; count++) { options[count] ( key ); } @@ -310,7 +310,7 @@ idrinth.raids = { }; if ( !join ( ) && Date.now ( ) - 60000 > idrinth.raids.requested ) { idrinth.raids.requested = Date.now ( ); - idrinth.raids.import ( idrinth.settings.raids ? idrinth.settings.favs : '-1' ); + idrinth.raids.import ( idrinth.settings.get("raids") ? idrinth.settings.get("favs") : '-1' ); } } }, From 9f43d8ad45b6467bc4e0a608f9b36144540ae5a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 14:33:12 +0200 Subject: [PATCH 114/341] reducing duplication --- src/mods/ui.js | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/src/mods/ui.js b/src/mods/ui.js index 6173217..3b5cc1a 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -236,32 +236,23 @@ idrinth.ui = { mod.children.push ( { css: 'buttons' } ); - var closeFunc = 'this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'; + var makeButton = function ( text, func ) { + return { + type: 'button', + content: idrinth.text.get ( "ui.button." + text ), + attributes: [ { + name: 'onclick', + value: 'this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);' + func + } ] + }; + }; if ( typeof altFunc === 'string' ) { - mod.children[mod.children.length - 1].children = [ { - type: 'button', - content: idrinth.text.get ( "ui.button.ok" ), - attributes: [ { - name: 'onclick', - value: closeFunc + altFunc - } ] - }, { - type: 'button', - content: idrinth.text.get ( "ui.button.cancel" ), - attributes: [ { - name: 'onclick', - value: closeFunc - } ] - } ]; + mod.children[mod.children.length - 1].children = [ + makeButton ( 'ok', altFunc ), + makeButton ( 'cancel', '' ) + ]; } else { - mod.children[mod.children.length - 1].children = [ { - type: 'button', - content: idrinth.text.get ( "ui.button.ok" ), - attributes: [ { - name: 'onclick', - value: closeFunc - } ] - } ]; + mod.children[mod.children.length - 1].children = [ makeButton ( 'ok', '' ) ]; } idrinth.ui.body.appendChild ( idrinth.ui.buildElement ( mod ) ); }, From bdbe0ca6775ef6b2bd54ed7112ee926f24ca9dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 15:12:15 +0200 Subject: [PATCH 115/341] moving from css to scss and the related url for loading --- src/mods/ui.js | 2 +- src/{script-styles.css => root.scss} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/{script-styles.css => root.scss} (100%) diff --git a/src/mods/ui.js b/src/mods/ui.js index 3b5cc1a..fd764e2 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -795,7 +795,7 @@ idrinth.ui = { value: 'stylesheet' }, { name: 'href', - value: 'https://dotd.idrinth.de###PATH###/script-styles.css?###VERSION###' + value: 'https://dotd.idrinth.de/static/userscript-styles/###RELOAD-VERSION###/' } ] } ) ); build (); diff --git a/src/script-styles.css b/src/root.scss similarity index 100% rename from src/script-styles.css rename to src/root.scss From 97666393de89937131f814c72c8dbb7270b9b811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 15:30:58 +0200 Subject: [PATCH 116/341] adding some really basic mixins --- src/root.scss | 102 +++++++++++++++++++++----------------------------- 1 file changed, 42 insertions(+), 60 deletions(-) diff --git a/src/root.scss b/src/root.scss index f9a39a6..0315379 100644 --- a/src/root.scss +++ b/src/root.scss @@ -1,13 +1,26 @@ +@mixin basic-box() { + box-sizing: border-box; + display:block; + width:100%; + height:auto; + overflow:hidden; + margin:0; + padding:0; +} +@mixin simple-square($size) { + width:$size; + height:$size; +} /** * These styles modify pages changed by the script of IDotD **/ .idrinth-hovering-box { + @include basic-box(); background: #cccccc; background: rgba(204, 204, 204, 0.9); border-radius: 2px; width: 200px; z-index: 100000; - display: block; box-shadow: 2px 2px 2px 1px rgba(0, 0, 0, 0.65); } @@ -26,23 +39,21 @@ .idrinth-emoticon { display: inline-block; - width: 16px; - height: 16px; + @include simple-square(16px); } .idrinth-emoticon > span { display: none; - width: 64px; - height: 64px; + @include simple-square(64px); position: absolute; } .idrinth-emoticon:hover > span { - display: block; + @include basic-box(); } #idrinth-raid-link-list span { - display: block; + @include basic-box(); cursor: pointer; } @@ -94,24 +105,21 @@ } #idrinth-tierlist .tier-wrapper table { - width: 100%; - box-sizing: border-box; + @include basic-box(); + display: table; } #idrinth-tierlist .tier-wrapper strong, #idrinth-tierlist .tier-wrapper span { - display: block; + @include basic-box(); } .idrinth-hovering-box .tab-activator { + @include basic-box(); float: left; border-top-left-radius: 5px; - box-sizing: border-box; border-top-right-radius: 5px; border: 1px solid #000; - display: block; - padding: 0; - margin: 0; text-align: center; cursor: pointer; } @@ -121,9 +129,7 @@ } .idrinth-hovering-box .tab-element { - padding: 0; - display:block; - margin: 0; + @include basic-box(); } #idrinth-controls { @@ -145,21 +151,15 @@ .idrinth-line, #idrinth-tierlist .tier-wrapper { - display: block; - width: 100%; - box-sizing: border-box; - height: auto; - overflow: hidden; + @include basic-box(); padding: 2px; } .idrinth-float-half { - display: block; + @include basic-box(); width: 50%; - box-sizing: border-box; float: left; padding: 2px; - margin: 0; } #idrinth-tooltip .idrinth-tooltip-header { @@ -201,10 +201,8 @@ #idrinth-chat ul, #idrinth-chat li { - display: block; - margin: 0; + @include basic-box(); padding: 1px; - box-sizing: border-box; } #idrinth-chat .chat-labels, @@ -213,13 +211,13 @@ } #idrinth-chat.active .chat-labels { + @include basic-box(); width: 3em; - display: block; float: left; } #idrinth-chat.active .chat-tabs { - display: block; + @include basic-box(); } #idrinth-chat .chat-labels li { @@ -241,9 +239,7 @@ } #idrinth-chat .chat-tabs > li.active { - display: block; - height: 100%; - overflow: hidden; + @include basic-box(); } #idrinth-chat .chat-tabs, #idrinth-chat .chat-labels { @@ -329,10 +325,7 @@ height: auto; } .idrinth-ui-menu { - margin:0; - padding:0; - overflow:hidden; - width:100%; + @include basic-box(); } #idrinth-chat .styled-scrollbar::-webkit-scrollbar, @@ -361,12 +354,9 @@ } #idrinth-chat .add-chat-box { + @include basic-box(); height: 5%; - display: block; float: left; - margin: 0; - width: 100%; - box-sizing: border-box; } #idrinth-chat > .chat-labels > li { @@ -440,23 +430,20 @@ .idrinth-userinfo-box { position: fixed; - display: block; + @include basic-box(); background: #333; color: #fff; padding: 2px; border-radius: 2px; box-shadow: 3px 3px 5px rgba(255, 255, 255, 0.9); - margin: 0; max-width: 150px; z-index: 120000; } .idrinth-userinfo-box > li { - display: block; + @include basic-box(); border-top: 1px solid #000; border-bottom: 1px solid #000; - padding: 0; - margin: 0; cursor: pointer; } @@ -480,8 +467,8 @@ #idrinth-chat > .chat-tabs li > button { min-width: 50%; max-width: 100%; + @include basic-box(); width: auto !important; - display: block; } #idrinth-chat .chat > li { @@ -516,16 +503,14 @@ } .idrinth-central-box td.traffic > span { - width: 2em; - height: 2em; - display: block; + @include basic-box(); + @include simple-square(2em); } .idrinth-central-box td.traffic > span { - width: 2em; - height: 2em; + @include basic-box(); + @include simple-square(2em); border-radius: 1em; - display: block; overflow: hidden; } @@ -625,14 +610,12 @@ td.is-os { .idrinth-join-frame { position:absolute; left:0; - width:1px; - height:1px; + @include simple-square(1px); z-index:-100; } .idrinth-circle { padding:0.2em; - width:1em; - height:1em; + @include simple-square(1em); float:right; cursor:pointer; background:#000; @@ -662,14 +645,13 @@ td.is-os { background:rgba(255,255,255,0.45); } .idrinth-tier-box > div > div { + @include basic-box(); width: 50%; float: left; padding:2px; - box-sizing: border-box; } .idrinth-tier-box > div > strong { - width: 100%; - display:block; + @include basic-box(); padding-bottom:2px; text-align:center; background:rgba(255,255,255,0.25); From 54650d70fc17ea8812ee49f7c3784cbbc9379d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 15:50:43 +0200 Subject: [PATCH 117/341] restoring some previous values --- src/root.scss | 80 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 32 deletions(-) diff --git a/src/root.scss b/src/root.scss index 0315379..ca5dda4 100644 --- a/src/root.scss +++ b/src/root.scss @@ -1,12 +1,3 @@ -@mixin basic-box() { - box-sizing: border-box; - display:block; - width:100%; - height:auto; - overflow:hidden; - margin:0; - padding:0; -} @mixin simple-square($size) { width:$size; height:$size; @@ -15,12 +6,12 @@ * These styles modify pages changed by the script of IDotD **/ .idrinth-hovering-box { - @include basic-box(); background: #cccccc; background: rgba(204, 204, 204, 0.9); border-radius: 2px; width: 200px; z-index: 100000; + display: block; box-shadow: 2px 2px 2px 1px rgba(0, 0, 0, 0.65); } @@ -49,11 +40,11 @@ } .idrinth-emoticon:hover > span { - @include basic-box(); + display: block; } #idrinth-raid-link-list span { - @include basic-box(); + display: block; cursor: pointer; } @@ -105,21 +96,24 @@ } #idrinth-tierlist .tier-wrapper table { - @include basic-box(); - display: table; + width: 100%; + box-sizing: border-box; } #idrinth-tierlist .tier-wrapper strong, #idrinth-tierlist .tier-wrapper span { - @include basic-box(); + display: block; } .idrinth-hovering-box .tab-activator { - @include basic-box(); float: left; border-top-left-radius: 5px; + box-sizing: border-box; border-top-right-radius: 5px; border: 1px solid #000; + display: block; + padding: 0; + margin: 0; text-align: center; cursor: pointer; } @@ -129,7 +123,9 @@ } .idrinth-hovering-box .tab-element { - @include basic-box(); + padding: 0; + display:block; + margin: 0; } #idrinth-controls { @@ -151,15 +147,21 @@ .idrinth-line, #idrinth-tierlist .tier-wrapper { - @include basic-box(); + display: block; + width: 100%; + box-sizing: border-box; + height: auto; + overflow: hidden; padding: 2px; } .idrinth-float-half { - @include basic-box(); + display: block; width: 50%; + box-sizing: border-box; float: left; padding: 2px; + margin: 0; } #idrinth-tooltip .idrinth-tooltip-header { @@ -201,8 +203,10 @@ #idrinth-chat ul, #idrinth-chat li { - @include basic-box(); + display: block; + margin: 0; padding: 1px; + box-sizing: border-box; } #idrinth-chat .chat-labels, @@ -211,13 +215,13 @@ } #idrinth-chat.active .chat-labels { - @include basic-box(); width: 3em; + display: block; float: left; } #idrinth-chat.active .chat-tabs { - @include basic-box(); + display: block; } #idrinth-chat .chat-labels li { @@ -239,7 +243,9 @@ } #idrinth-chat .chat-tabs > li.active { - @include basic-box(); + display: block; + height: 100%; + overflow: hidden; } #idrinth-chat .chat-tabs, #idrinth-chat .chat-labels { @@ -325,7 +331,10 @@ height: auto; } .idrinth-ui-menu { - @include basic-box(); + margin:0; + padding:0; + overflow:hidden; + width:100%; } #idrinth-chat .styled-scrollbar::-webkit-scrollbar, @@ -354,9 +363,12 @@ } #idrinth-chat .add-chat-box { - @include basic-box(); height: 5%; + display: block; float: left; + margin: 0; + width: 100%; + box-sizing: border-box; } #idrinth-chat > .chat-labels > li { @@ -430,20 +442,23 @@ .idrinth-userinfo-box { position: fixed; - @include basic-box(); + display: block; background: #333; color: #fff; padding: 2px; border-radius: 2px; box-shadow: 3px 3px 5px rgba(255, 255, 255, 0.9); + margin: 0; max-width: 150px; z-index: 120000; } .idrinth-userinfo-box > li { - @include basic-box(); + display: block; border-top: 1px solid #000; border-bottom: 1px solid #000; + padding: 0; + margin: 0; cursor: pointer; } @@ -467,8 +482,8 @@ #idrinth-chat > .chat-tabs li > button { min-width: 50%; max-width: 100%; - @include basic-box(); width: auto !important; + display: block; } #idrinth-chat .chat > li { @@ -503,14 +518,14 @@ } .idrinth-central-box td.traffic > span { - @include basic-box(); @include simple-square(2em); + display: block; } .idrinth-central-box td.traffic > span { - @include basic-box(); @include simple-square(2em); border-radius: 1em; + display: block; overflow: hidden; } @@ -645,13 +660,14 @@ td.is-os { background:rgba(255,255,255,0.45); } .idrinth-tier-box > div > div { - @include basic-box(); width: 50%; float: left; padding:2px; + box-sizing: border-box; } .idrinth-tier-box > div > strong { - @include basic-box(); + width: 100%; + display:block; padding-bottom:2px; text-align:center; background:rgba(255,255,255,0.25); From 2c507bb23f5024da71d86ce15fa74ee40a35e75d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 9 Oct 2016 16:09:26 +0200 Subject: [PATCH 118/341] refs #142 fixes #192 --- src/root.scss | 18 +----------------- src/styles/mutik.scss | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 src/styles/mutik.scss diff --git a/src/root.scss b/src/root.scss index ca5dda4..c07136b 100644 --- a/src/root.scss +++ b/src/root.scss @@ -2,6 +2,7 @@ width:$size; height:$size; } +@import "styles/mutik.scss"; /** * These styles modify pages changed by the script of IDotD **/ @@ -563,23 +564,6 @@ width: auto; } -#DRMng_main { - margin-right: 5em; - display: block; - border-right: solid 1px #444; -} - -#DRMng_status { - float: right; - text-align: right; -} - -#DRMng_onoff { - float: left; - border-left-width: 0; - border-right: solid 1px #444; -} - td.is-os { background: #f000; background: rgba(255, 0, 0, 0.5); diff --git a/src/styles/mutik.scss b/src/styles/mutik.scss new file mode 100644 index 0000000..a1671ed --- /dev/null +++ b/src/styles/mutik.scss @@ -0,0 +1,19 @@ +/** + * Adjustments to make sure mutik's new script is not broken by us +**/ +#DRMng_main { + margin-right: 5em; + display: block; + border-right: solid 1px #444; +} + +#DRMng_status { + float: right; + text-align: right; +} + +#DRMng_onoff { + float: left; + border-left-width: 0; + border-right: solid 1px #444; +} \ No newline at end of file From 812a22767526ae3898cb8a0b47dc1f5ced7bea34 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 10 Oct 2016 17:45:34 +0300 Subject: [PATCH 119/341] Create Tenebra the Shadow-Mistress [Tenebra].json --- ...Tenebra the Shadow-Mistress [Tenebra].json | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 tiers/Tenebra the Shadow-Mistress [Tenebra].json diff --git a/tiers/Tenebra the Shadow-Mistress [Tenebra].json b/tiers/Tenebra the Shadow-Mistress [Tenebra].json new file mode 100644 index 0000000..224840b --- /dev/null +++ b/tiers/Tenebra the Shadow-Mistress [Tenebra].json @@ -0,0 +1,34 @@ +{ + "normal": { + "800000": 1, + "1800000": 1, + "2600000": 2, + "5000000": 2.5, + "10000000": 3, + "36000000": 3.5 + }, + "hard": { + "1000000": 1, + "2250000": 1, + "3250000": 2, + "6250000": 2.5, + "12500000": 3, + "45000000": 3.5 + }, + "legendary": { + "1280000": 1, + "2880000": 1, + "4160000": 2, + "8000000": 2.5, + "16000000": 3, + "57600000": 3.5 + }, + "nightmare": { + "1600000": 1, + "3600000": 1, + "5200000": 2, + "10000000": 2.5, + "20000000": 3, + "72000000": 3.5 + } +} From e586b2072abf59855985dd3c1944232f72ca2657 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 10 Oct 2016 17:48:21 +0300 Subject: [PATCH 120/341] Create Valanazes the Gold [Valanazes].json --- tiers/Valanazes the Gold [Valanazes].json | 34 +++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 tiers/Valanazes the Gold [Valanazes].json diff --git a/tiers/Valanazes the Gold [Valanazes].json b/tiers/Valanazes the Gold [Valanazes].json new file mode 100644 index 0000000..ff2ede4 --- /dev/null +++ b/tiers/Valanazes the Gold [Valanazes].json @@ -0,0 +1,34 @@ +{ + "normal": { + "960000": 1, + "2160000": 1, + "3120000": 2, + "6000000": 2.5, + "12000000": 3, + "43200000": 3.5 + }, + "hard": { + "1200000": 1, + "2700000": 1, + "3900000": 2, + "7500000": 2.5, + "15000000": 3, + "54000000": 3.5 + }, + "legendary": { + "1536000": 1, + "3456000": 1, + "4992000": 2, + "9600000": 2.5, + "19200000": 3, + "69120000": 3.5 + }, + "nightmare": { + "1920000": 1, + "4320000": 1, + "6240000": 2, + "12000000": 2.5, + "24000000": 3, + "86400000": 3.5 + } +} From a13fb6043b778257a1575fb7cf4d2707c3a3a1fa Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 10 Oct 2016 17:59:06 +0300 Subject: [PATCH 121/341] Create Dragon's Lair [Lair].json --- tiers/Dragon's Lair [Lair].json | 50 +++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 tiers/Dragon's Lair [Lair].json diff --git a/tiers/Dragon's Lair [Lair].json b/tiers/Dragon's Lair [Lair].json new file mode 100644 index 0000000..3a6083d --- /dev/null +++ b/tiers/Dragon's Lair [Lair].json @@ -0,0 +1,50 @@ +{ + "normal": { + "7000000": 2, + "9000000": 4, + "10000000": 6, + "15000000": 8, + "20000000": 10, + "25000000": 12, + "30000000": 14, + "35000000": 16, + "40000000": 18, + "45000000": 20 + }, + "hard": { + "35000000": 2, + "45000000": 4, + "50000000": 6, + "75000000": 8, + "100000000": 10, + "125000000": 12, + "150000000": 14, + "175000000": 16, + "200000000": 18, + "225000000": 20 + }, + "legendary": { + "70000000": 2, + "90000000": 4, + "100000000": 6, + "150000000": 8, + "200000000": 10, + "250000000": 12, + "300000000": 14, + "350000000": 16, + "400000000": 18, + "450000000": 20 + }, + "nightmare": { + "105000000": 2, + "135000000": 4, + "150000000": 6, + "225000000": 8, + "300000000": 10, + "375000000": 12, + "450000000": 14, + "525000000": 16, + "600000000": 18, + "675000000": 20 + } +} From 2e0ed17fd694c6e5dc4c9756e3e1288ce3a85192 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 10 Oct 2016 18:15:22 +0300 Subject: [PATCH 122/341] Create Countess Serpina [Serpina].json --- tiers/Countess Serpina [Serpina].json | 54 +++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 tiers/Countess Serpina [Serpina].json diff --git a/tiers/Countess Serpina [Serpina].json b/tiers/Countess Serpina [Serpina].json new file mode 100644 index 0000000..e9482cb --- /dev/null +++ b/tiers/Countess Serpina [Serpina].json @@ -0,0 +1,54 @@ +{ + "normal": { + "2250000": 65, + "3000000": 92, + "3750000": 119, + "4500000": 146, + "5250000": 173, + "6000000": 200, + "6750000": 227, + "7500000": 264, + "8250000": 301, + "9000000": 338, + "9750000": 375 + }, + "hard": { + "3375000": 65, + "4500000": 92, + "5625000": 119, + "6750000": 146, + "7875000": 173, + "9000000": 200, + "10125000": 227, + "11250000": 264, + "12375000": 301, + "13500000": 338, + "14625000": 375 + }, + "legendary": { + "4500000": 65, + "6000000": 92, + "7550000": 119, + "9000000": 146, + "10500000": 173, + "12000000": 200, + "13500000": 227, + "15000000": 264, + "16500000": 301, + "18000000": 338, + "19500000": 375 + }, + "nightmare": { + "5625000": 65, + "7500000": 92, + "9375000": 119, + "11250000": 146, + "13125000": 173, + "15000000": 200, + "16875000": 227, + "18750000": 264, + "20625000": 301, + "22500000": 338, + "24375000": 375 + } +} From 25efad3b7f1963fec728b20d3db7f0a6a6cd3233 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 10 Oct 2016 18:18:41 +0300 Subject: [PATCH 123/341] Create Tomb Gargole [Riddler].json --- tiers/Tomb Gargole [Riddler].json | 50 +++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 tiers/Tomb Gargole [Riddler].json diff --git a/tiers/Tomb Gargole [Riddler].json b/tiers/Tomb Gargole [Riddler].json new file mode 100644 index 0000000..f0cc783 --- /dev/null +++ b/tiers/Tomb Gargole [Riddler].json @@ -0,0 +1,50 @@ +{ + "normal": { + "100000000": 7, + "200000000": 8, + "300000000": 9, + "400000000": 10, + "500000000": 11, + "600000000": 12, + "700000000": 13, + "800000000": 14, + "900000000": 15, + "1000000000": 16 + }, + "hard": { + "100000000": 7, + "200000000": 8, + "300000000": 9, + "400000000": 10, + "500000000": 11, + "600000000": 12, + "700000000": 13, + "800000000": 14, + "900000000": 15, + "1000000000": 16 + }, + "legendary": { + "100000000": 7, + "200000000": 8, + "300000000": 9, + "400000000": 10, + "500000000": 11, + "600000000": 12, + "700000000": 13, + "800000000": 14, + "900000000": 15, + "1000000000": 16 + }, + "nightmare": { + "100000000": 7, + "200000000": 8, + "300000000": 9, + "400000000": 10, + "500000000": 11, + "600000000": 12, + "700000000": 13, + "800000000": 14, + "900000000": 15, + "1000000000": 16 + } +} From 71d4a2149e562a0ad45da8d988ed4c5b9a033f1b Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 10 Oct 2016 18:23:52 +0300 Subject: [PATCH 124/341] Create The Baroness [Baroness].json --- tiers/The Baroness [Baroness].json | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/The Baroness [Baroness].json diff --git a/tiers/The Baroness [Baroness].json b/tiers/The Baroness [Baroness].json new file mode 100644 index 0000000..b5aeac8 --- /dev/null +++ b/tiers/The Baroness [Baroness].json @@ -0,0 +1,38 @@ +{ + "normal": { + "170000": 1, + "952000": 1, + "1292000": 1, + "2788000": 2, + "4250000": 2.5, + "9180000": 3, + "11560000": 3.5 + }, + "hard": { + "213000": 1, + "1190000": 1, + "1615000": 1, + "3485000": 2, + "5313000": 2.5, + "11475000": 3, + "14450000": 3.5 + }, + "legendary": { + "272000": 1, + "1523000": 1, + "2067000": 1, + "4461000": 2, + "6800000": 2.5, + "14688000": 3, + "18496000": 3.5 + }, + "nightmare": { + "340000": 1, + "1904000": 1, + "2584000": 1, + "5576000": 2, + "8500000": 2.5, + "18360000": 3, + "23120000": 3.5 + } +} From e23384c4af1c8a4c63ecd0ed33256fa635f255ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Mon, 10 Oct 2016 17:57:52 +0200 Subject: [PATCH 125/341] fixes #197 reduces loading frequency by a lot, especially if there's no war active --- src/mods/war.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mods/war.js b/src/mods/war.js index e0b8616..dcaf9ae 100644 --- a/src/mods/war.js +++ b/src/mods/war.js @@ -5,7 +5,12 @@ idrinth.war = { warTO: null, setTO: function ( ) { if ( !idrinth.war.warTO ) { - idrinth.war.warTO = window.setTimeout ( idrinth.war.getData, 1000 ); + idrinth.war.warTO = window.setTimeout ( + idrinth.war.getData, + ( idrinth.war.element.getAttribute ( 'class' ) ).match ( /(^|\s)idrinth-hide($|\s)/ ) !== null ? + 30000 : + 120000 + ); } }, getData: function () { From eb085647cfc8f199bcd190db2adc5b3891b730c8 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 10 Oct 2016 22:28:22 +0300 Subject: [PATCH 126/341] Create Deadly Clockwork Giant [Deadly Clockwork].json --- ...dly Clockwork Giant [Deadly Clockwork].json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 tiers/Deadly Clockwork Giant [Deadly Clockwork].json diff --git a/tiers/Deadly Clockwork Giant [Deadly Clockwork].json b/tiers/Deadly Clockwork Giant [Deadly Clockwork].json new file mode 100644 index 0000000..e0bce94 --- /dev/null +++ b/tiers/Deadly Clockwork Giant [Deadly Clockwork].json @@ -0,0 +1,18 @@ +{ + "nightmare": { + "167000000000": 6500, + "500000000000": 22001, + "100000000000000": 46000, + "200000000000000": 94000, + "300000000000000": 142000, + "400000000000000": 190000, + "500000000000000": 240000, + "750000000000000": 270000, + "1000000000000000": 300000, + "1500000000000000": 310000, + "2000000000000000": 320000, + "3000000000000000": 330000, + "4000000000000000": 340000, + "5000000000000000": 350000 + } +} From bc6ae7f7e8b36b788c9fee4a3349ae74da48fd8a Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 10 Oct 2016 22:36:14 +0300 Subject: [PATCH 127/341] Create Elite Undead Warrior [E. Warrior].json --- tiers/Elite Undead Warrior [E. Warrior].json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 tiers/Elite Undead Warrior [E. Warrior].json diff --git a/tiers/Elite Undead Warrior [E. Warrior].json b/tiers/Elite Undead Warrior [E. Warrior].json new file mode 100644 index 0000000..928ed8a --- /dev/null +++ b/tiers/Elite Undead Warrior [E. Warrior].json @@ -0,0 +1,14 @@ +{ + "nightmare": { + "10000000000": 300, + "20000000000": 700, + "30000000000": 1800, + "40000000000": 2500, + "50000000000": 3150, + "60000000000": 3900, + "70000000000": 4600, + "80000000000": 5500, + "90000000000": 6000, + "100000000000": 6400 + } +} From 903b851e376c1a5a636effb817dc9d5c698e8c66 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 10 Oct 2016 22:39:01 +0300 Subject: [PATCH 128/341] Create Elite Devourer [Devourer].json --- tiers/Elite Devourer [Devourer].json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 tiers/Elite Devourer [Devourer].json diff --git a/tiers/Elite Devourer [Devourer].json b/tiers/Elite Devourer [Devourer].json new file mode 100644 index 0000000..958e654 --- /dev/null +++ b/tiers/Elite Devourer [Devourer].json @@ -0,0 +1,18 @@ +{ + "nightmare": { + "15000000000": 400, + "20000000000": 550, + "25000000000": 700, + "30000000000": 1000, + "40000000000": 1400, + "50000000000": 1800, + "60000000000": 2400, + "70000000000": 2900, + "80000000000": 3400, + "90000000000": 4000, + "100000000000": 4550, + "120000000000": 5500, + "150000000000": 6000, + "200000000000": 7000 + } +} From bb0f16188a3eba989cc5845d5e90abebc7e4f212 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 10 Oct 2016 22:41:30 +0300 Subject: [PATCH 129/341] Create Elite Funny Bones [].json --- tiers/Elite Funny Bones [].json | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 tiers/Elite Funny Bones [].json diff --git a/tiers/Elite Funny Bones [].json b/tiers/Elite Funny Bones [].json new file mode 100644 index 0000000..5dd64ec --- /dev/null +++ b/tiers/Elite Funny Bones [].json @@ -0,0 +1,13 @@ +{ + "nightmare": { + "10000000000": 300, + "20000000000": 700, + "25000000000": 1200, + "50000000000": 3000, + "75000000000": 4850, + "80000000000": 5400, + "100000000000": 6350, + "125000000000": 7200, + "150000000000": 8000 + } +} From c73d0c75f4437e0033822d289484eedd707e6e1f Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 10 Oct 2016 22:53:19 +0300 Subject: [PATCH 130/341] Create Soul Collector [Collector].json --- tiers/Soul Collector [Collector].json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 tiers/Soul Collector [Collector].json diff --git a/tiers/Soul Collector [Collector].json b/tiers/Soul Collector [Collector].json new file mode 100644 index 0000000..f8fa288 --- /dev/null +++ b/tiers/Soul Collector [Collector].json @@ -0,0 +1,19 @@ +{ + "nightmare": { + "124000000": 22, + "200000000": 46, + "654000000": 113, + "1000000000": 185, + "2500000000": 230, + "3200000000": 295, + "4500000000": 340, + "5000000000": 425, + "7500000000": 488, + "10000000000": 600, + "15000000000": 725, + "20000000000": 860, + "25000000000": 910, + "30000000000": 1010 + "40000000000": 1100 + } +} From af269ea7569cc06aae092f3499a556b013fc40f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 11 Oct 2016 11:17:59 +0200 Subject: [PATCH 131/341] reorganizing text keys --- src/mods/land.js | 2 +- src/mods/text.js | 90 +++++++++++++++++++++++++----------------------- src/mods/tier.js | 4 +-- src/mods/ui.js | 59 +++++++++++++++---------------- 4 files changed, 79 insertions(+), 76 deletions(-) diff --git a/src/mods/land.js b/src/mods/land.js index b84dcc5..d9c26a1 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -75,7 +75,7 @@ idrinth.land = { } var results = baseCalculator ( getRequirements () ); if ( Object.keys ( results ).length === 0 ) { - idrinth.core.alert ( idrinth.text.get ( "land.lackGold" ) ); + idrinth.core.alert ( idrinth.text.get ( "land.lack" ) ); } putResults ( results ); }, diff --git a/src/mods/text.js b/src/mods/text.js index 0e6666b..ebfe02b 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -10,7 +10,7 @@ idrinth.text = { * @method start * @returns {undefined} */ - start: function () { + start: function ( ) { var language = idrinth.settings.language || window.navigator.userLanguage || window.navigator.language; if ( language === 'en' ) { idrinth.text.initialized = true; @@ -40,7 +40,7 @@ idrinth.text = { }, data: { chat: { - actions:{ + actions: { banUser: 'Ban User', makeMod: 'Make Moderator', makeAdmin: 'Make Admin', @@ -81,63 +81,65 @@ idrinth.text = { default: 'Unexpected error occurred. Please contact script developers' + ' (https://github.com/Idrinth/IDotD).', land: { - lackGold: 'You lack gold to buy any more buildings at the moment.' + lack: 'You lack gold to buy any more buildings at the moment.', + hour: ' gold per hour each', + calc: 'Calculate', + avaible: 'Avaible Gold' }, tier: { + search: 'Enter Boss\' Name', diff: { normal: 'Normal', hard: 'Hard', legend: 'Legend', night: 'Nightmare' }, - tagTop: 'Tag to screen-top', - maxBoxes: 'There is no space for another tier-box at the moment, please close one first.', - disableJoining: 'Disable joining for ' + tag: 'Tag to screen-top', + maxBoxes: 'There is no space for another tier-box at the moment, please close one first.' + }, + raids: { + lastJoined: 'Last raids joined:', + clear: 'Clear Raids', + disableJoining: 'Disable joining for ', + clickCopy: 'click to copy raid link', + imports: { + manually: 'Import all manually', + favs: 'Import favs manually', + restart: 'Restart Raidjoin' + } + }, + button: { + ok: 'Ok', + cancel: 'Cancel', + reloadGame: 'Reload game', + reloadScript: 'Reload Script', + refreshFBGameLogin: 'Refresh Facebook Game Login', + ngRaidJoin: 'NG Raid Join(slow!)', + disableTimedAutoJoin: 'disable timed Autojoin', + enableTimedAutoJoin: 'enable timed Autojoin' + }, + setting: { + enableExtCharInfo: 'Enable extended Characterinformation?', + minimLayout: 'Minimalist Layout', + moveSettingLeft: 'Move settings left', + warBottomPage: 'Show war at the bottom of the page', + useGoldEfficiently: 'Check to try and use up the gold as efficient as possible - uncheck to only use the most efficient buy in the land buy calculator', + tenBuildOnce: 'Buy 10 Buildings at once?(Rec)', + extCharInfoDuration: 'Milliseconds until the extended Characterinformation disappears', + joiningDuration: 'Seconds needed to load the game for joining', + enableChat: 'Enable chat(needs script reload)', + enableFavRequest: 'Enable Auto-Raid-Request for Favorites?', + favIdToJoin: 'FavoriteIds to join (separate multiple by comma)', + worldserver: 'Worldserver?', + disableAutoJoinSpecific: 'Disable Autojoining for specific raids' }, ui: { - button: { - ok: 'Ok', - cancel: 'Cancel', - reloadGame: 'Reload game', - clearRaids: 'Clear Raids', - reloadScript: 'Reload Script', - refreshFBGameLogin: 'Refresh Facebook Game Login', - ngRaidJoin: 'NG Raid Join(slow!)', - calc: 'Calculate', - disableTimedAutoJoin: 'disable timed Autojoin', - enableTimedAutoJoin: 'enable timed Autojoin' - }, - imports:{ - manually:'Import all manually', - favs:'Import favs manually', - restart:'Restart Raidjoin' - }, - lastRaidsJoined: 'Last raids joined:', - enterBossName: 'Enter Boss\' Name', settingInfo: 'This script will always import the raids you manually set to be imported on the website and if it\'s enabled it will also import all raids matched by one of the faved searches provided.', maxPopupsFrame: 'Maximum Popups/Frames for joining raids', timeAutoJoin: 'Time to automatically join raids slowly(reloads game multiple times). Format is [Hours]:[Minutes] without leading zeros, so 7:1 is fine, 07:01 is not', getFavFrom: 'Get your search-favorites from ', raidsearch: 'Idrinth\'s Raidsearch', - goldHour: ' gold per hour each', - availGold: 'Avaible Gold', - clickCopy: 'click to copy raid link', reloadGameFail: 'The game couldn\'t be reloaded', - setting: { - enableExtCharInfo: 'Enable extended Characterinformation?', - minimLayout: 'Minimalist Layout', - moveSettingLeft: 'Move settings left', - warBottomPage: 'Show war at the bottom of the page', - useGoldEfficiently: 'Check to try and use up the gold as efficient as possible - uncheck to only use the most efficient buy in the land buy calculator', - tenBuildOnce: 'Buy 10 Buildings at once?(Rec)', - extCharInfoDuration: 'Milliseconds until the extended Characterinformation disappears', - joiningDuration: 'Seconds needed to load the game for joining', - enableChat: 'Enable chat(needs script reload)', - enableFavRequest: 'Enable Auto-Raid-Request for Favorites?', - favIdToJoin: 'FavoriteIds to join (separate multiple by comma)', - worldserver: 'Worldserver?', - disableAutoJoinSpecific: 'Disable Autojoining for specific raids' - } } }, /** @@ -148,7 +150,7 @@ idrinth.text = { */ get: function ( key ) { var getSub = function ( obj, keys, func ) { - var key = keys.shift (); + var key = keys.shift ( ); if ( obj.hasOwnProperty ( key ) ) { if ( keys.length > 0 ) { return func ( obj[key], keys, func ); diff --git a/src/mods/tier.js b/src/mods/tier.js index 243c04c..b311017 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -101,7 +101,7 @@ idrinth.tier = { rType: '#input', type: 'checkbox', id: 'idrinth-raid-may-join-list-' + data[key].name, - label: idrinth.text.get ( "tier.disableJoining" ) + data[key].name + label: idrinth.text.get ( "raids.disableJoining" ) + data[key].name } ) ); document.getElementById ( 'idrinth-raid-may-join-list' ).lastChild.setAttribute ( 'style', 'background-image:url(https://dotd.idrinth.de/static/raid-image-service/' + data[key].url + '/);' ); @@ -185,7 +185,7 @@ idrinth.tier = { }, { type: 'button', - content: idrinth.text.get ( "tier.tagTop" ), + content: idrinth.text.get ( "tier.tag" ), attributes: [ { name: 'onclick', diff --git a/src/mods/ui.js b/src/mods/ui.js index fd764e2..f226b91 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -239,7 +239,7 @@ idrinth.ui = { var makeButton = function ( text, func ) { return { type: 'button', - content: idrinth.text.get ( "ui.button." + text ), + content: idrinth.text.get ( "button." + text ), attributes: [ { name: 'onclick', value: 'this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);' + func @@ -413,20 +413,21 @@ idrinth.ui = { }; return [ { children: [ - buttonMaker ( idrinth.text.get ( "ui.imports.manually" ), 'idrinth.raids.import(\'\');' ), - buttonMaker ( idrinth.text.get ( "ui.imports.favs" ), 'idrinth.raids.import(idrinth.settings.favs);' ), - buttonMaker ( idrinth.text.get ( "ui.button.reloadGame" ), 'idrinth.ui.reloadGame();' ), - buttonMaker ( idrinth.text.get ( "ui.button.clearRaids" ), 'idrinth.raids.clearAll();' ), - buttonMaker ( idrinth.text.get ( "ui.button.reloadScript" ), 'idrinth.reload();' ), - buttonMaker ( idrinth.text.get ( "ui.imports.restart" ), 'idrinth.raids.restartInterval();' ), - buttonMaker ( idrinth.text.get ( "ui.button.refreshFBGameLogin" ), 'idrinth.facebook.rejoin()', 'facebook' ), - buttonMaker ( idrinth.text.get ( "ui.button.ngRaidJoin" ), 'idrinth.newgrounds.joinRaids()', 'newgrounds' ), - buttonMaker ( idrinth.settings.alarmActive ? idrinth.text.get ( "ui.button.disableTimedAutoJoin" ) : idrinth.text.get ( "ui.button.enableTimedAutoJoin" ), 'idrinth.settings.change(\'alarmActive\',!idrinth.settings.alarmActive);this.innerHTML=idrinth.settings.alarmActive?\'disable timed Autojoin\':\'enable timed Autojoin\'', 'newgrounds' ) + buttonMaker ( idrinth.text.get ( "raids.imports.manually" ), 'idrinth.raids.import(\'\');' ), + buttonMaker ( idrinth.text.get ( "raids.imports.favs" ), 'idrinth.raids.import(idrinth.settings.favs);' ), + buttonMaker ( idrinth.text.get ( "button.reloadGame" ), 'idrinth.ui.reloadGame();' ), + buttonMaker ( idrinth.text.get ( "raids.clear" ), 'idrinth.raids.clearAll();' ), + buttonMaker ( idrinth.text.get ( "button.reloadScript" ), 'idrinth.reload();' ), + buttonMaker ( idrinth.text.get ( "raids.imports.restart" ), 'idrinth.raids.restartInterval();' ), + buttonMaker ( idrinth.text.get ( "button.refreshFBGameLogin" ), 'idrinth.facebook.rejoin()', 'facebook' ), + buttonMaker ( idrinth.text.get ( "button.ngRaidJoin" ), 'idrinth.newgrounds.joinRaids()', 'newgrounds' ), + buttonMaker ( idrinth.settings.alarmActive ? idrinth.text.get ( "button.disableTimedAutoJoin" ) : idrinth.text.get ( "button.enableTimedAutoJoin" ), + 'idrinth.settings.change(\'alarmActive\',!idrinth.settings.alarmActive);this.innerHTML=idrinth.settings.alarmActive?idrinth.text.get ( "button.disableTimedAutoJoin" ):"button.enableTimedAutoJoin"', 'newgrounds' ) ] }, { css: 'idrinth-line', id: 'idrinth-joined-raids', - content: idrinth.text.get ( "ui.lastRaidsJoined" ), + content: idrinth.text.get ( "raids.lastJoined" ), children: [ { type: 'ul' @@ -440,7 +441,7 @@ idrinth.ui = { css: 'idrinth-line', children: [ { type: 'label', - content: idrinth.text.get ( "ui.enterBossName" ), + content: idrinth.text.get ( "tier.search" ), css: 'idrinth-float-half', attributes: [ { @@ -470,49 +471,49 @@ idrinth.ui = { rType: '#input', type: 'checkbox', platforms: [ 'kongregate' ], - label: "ui.setting.enableExtCharInfo" + label: "setting.enableExtCharInfo" }, { name: 'minimalist', rType: '#input', type: 'checkbox', - label: "ui.setting.minimLayout" + label: "setting.minimLayout" }, { name: 'moveLeft', rType: '#input', type: 'checkbox', - label: "ui.setting.moveSettingLeft" + label: "setting.moveSettingLeft" }, { name: 'warBottom', rType: '#input', type: 'checkbox', - label: "ui.setting.warBottomPage" + label: "setting.warBottomPage" }, { name: 'landMax', rType: '#input', type: 'checkbox', - label: "ui.setting.useGoldEfficiently" + label: "setting.useGoldEfficiently" }, { name: 'factor', rType: '#input', type: 'checkbox', - label: "ui.setting.tenBuildOnce" + label: "setting.tenBuildOnce" }, { name: 'timeout', rType: '#input', type: 'number', platforms: [ 'kongregate' ], - label: "ui.setting.extCharInfoDuration" + label: "setting.extCharInfoDuration" }, { name: 'newgroundLoad', rType: '#input', type: 'number', platforms: [ 'newgrounds' ], - label: "ui.setting.joiningDuration" + label: "setting.joiningDuration" }, { name: 'chatting', rType: '#input', type: 'checkbox', - label: "ui.setting.enableChat" + label: "setting.enableChat" }, { css: 'idrinth-line', type: 'span', @@ -521,17 +522,17 @@ idrinth.ui = { name: 'raids', rType: '#input', type: 'checkbox', - label: "ui.setting.enableFavRequest" + label: "setting.enableFavRequest" }, { name: 'favs', rType: '#input', type: 'text', - label: "ui.setting.favIdToJoin" + label: "setting.favIdToJoin" }, { name: 'isWorldServer', rType: '#input', type: 'checkbox', - label: "ui.setting.worldserver" + label: "setting.worldserver" }, { name: 'notification#mention', rType: '#input', @@ -608,7 +609,7 @@ idrinth.ui = { attributes: [ { name: 'title', - value: idrinth.land.data[label.toLowerCase ()].perHour + idrinth.text.get ( "ui.goldHour" ) + value: idrinth.land.data[label.toLowerCase ()].perHour + idrinth.text.get ( "land.hour" ) } ] }; @@ -640,7 +641,7 @@ idrinth.ui = { type: 'tr', children: [ { type: 'th', - content: idrinth.text.get ( "ui.availGold" ) + content: idrinth.text.get ( "land.avaible" ) }, { type: 'td', children: [ { @@ -661,7 +662,7 @@ idrinth.ui = { type: 'td', children: [ { type: 'button', - content: idrinth.text.get ( "ui.button.calc" ), + content: idrinth.text.get ( "land.calc" ), attributes: [ { name: 'onclick', @@ -735,12 +736,12 @@ idrinth.ui = { }; var buildRaidJoinList = function () { return [ { - content: idrinth.text.get ( "ui.clickCopy" ), + content: idrinth.text.get ( "raids.clickCopy" ), type: 'strong' }, { id: 'idrinth-raid-link-list' }, { - content: idrinth.text.get ( "ui.setting.disableAutoJoinSpecific" ), + content: idrinth.text.get ( "setting.disableAutoJoinSpecific" ), type: 'strong' }, { id: 'idrinth-raid-may-join-list' From eeeced168ef20dde1578e55aefff84ffe25739f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 11 Oct 2016 12:59:38 +0200 Subject: [PATCH 132/341] reorganizing text keys providing default adding handling of ###LANG### to add defautl language --- languages/en.json | 2 - src/languages/en.json | 101 ++++++++++++++++++++++++++++++++++++++++ src/mods/chat.js | 26 +++++------ src/mods/text.js | 105 +----------------------------------------- src/mods/ui.js | 8 ++-- 5 files changed, 119 insertions(+), 123 deletions(-) delete mode 100644 languages/en.json create mode 100644 src/languages/en.json diff --git a/languages/en.json b/languages/en.json deleted file mode 100644 index 2c63c08..0000000 --- a/languages/en.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} diff --git a/src/languages/en.json b/src/languages/en.json new file mode 100644 index 0000000..1dcdb19 --- /dev/null +++ b/src/languages/en.json @@ -0,0 +1,101 @@ +{ + "chat": { + "actions": { + "banUser": "Ban User", + "makeMod": "Make Moderator", + "makeAdmin": "Make Admin", + "makeUser": "Make User", + "close": "Close", + "invite": "Invite to Chat ", + "createChat": "Create Chat", + "joinChat": "Join Chat", + "createAddChat": "Click to create additional chat", + "copyIdPasswort": "Copy Password&Id", + "deleteRoom": "Delete Room", + "leaveRoom": "Leave Room" + }, + "texts": { + "settings": "More settings at ", + "account": "Account", + "title": "Chat", + "creditEmoticon": "Emoticons provided by ", + "optional": "This part of the script is optional, so logging in is unneeded for raid catching etc.", + "invalid": "This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.", + "offline": "Not logged in, click to login/register" + }, + "error": { + "modify": "Can't modify that user at the moment", + "create": "Can't create at the moment", + "join": "Joining didn't work", + "login": "Login failed in an unexpected way", + "unknown": "The given username for dotd.idrinth.de is unknown, do you want to register it there?" + }, + "notification": { + "mention": "chat-mention notifications?", + "raid": "chat-raid notifications?", + "message": "chat-message notifications?" + } + }, + "default": "Unexpected error occurred. Please contact script developers (https://github.com/Idrinth/IDotD).", + "land": { + "lack": "You lack gold to buy any more buildings at the moment.", + "hour": " gold per hour each", + "calc": "Calculate", + "avaible": "Avaible Gold" + }, + "tier": { + "search": "Enter Boss' Name", + "diff": { + "normal": "Normal", + "hard": "Hard", + "legend": "Legend", + "night": "Nightmare" + }, + "tag": "Tag to screen-top", + "maxBoxes": "There is no space for another tier-box at the moment, please close one first." + }, + "raids": { + "lastJoined": "Last raids joined", + "clear": "Clear Raids", + "disableJoining": "Disable joining for ", + "clickCopy": "click to copy raid link", + "imports": { + "manually": "Import all manually", + "favs": "Import favs manually", + "restart": "Restart Raidjoin" + }, + "disableSpecific": "Disable Autojoining for specific raids" + }, + "button": { + "ok": "Ok", + "cancel": "Cancel", + "reloadGame": "Reload game", + "reloadScript": "Reload Script", + "refreshFBGameLogin": "Refresh Facebook Game Login", + "ngRaidJoin": "NG Raid Join(slow!)", + "disableTimedAutoJoin": "disable timed Autojoin", + "enableTimedAutoJoin": "enable timed Autojoin" + }, + "setting": { + "enableExtCharInfo": "Enable extended Characterinformation?", + "minimLayout": "Minimalist Layout", + "moveSettingLeft": "Move settings left", + "warBottomPage": "Show war at the bottom of the page", + "useGoldEfficiently": "Check to try and use up the gold as efficient as possible - uncheck to only use the most efficient buy in the land buy calculator", + "tenBuildOnce": "Buy 10 Buildings at once?(Rec)", + "extCharInfoDuration": "Milliseconds until the extended Characterinformation disappears", + "joiningDuration": "Seconds needed to load the game for joining", + "enableChat": "Enable chat(needs script reload)", + "enableFavRequest": "Enable Auto-Raid-Request for Favorites?", + "favIdToJoin": "FavoriteIds to join (separate multiple by comma)", + "worldserver": "Worldserver?" + }, + "ui": { + "settingInfo": "This script will always import the raids you manually set to be imported on the website and if it's enabled it will also import all raids matched by one of the faved searches provided.", + "maxPopupsFrame": "Maximum Popups/Frames for joining raids", + "timeAutoJoin": "Time to automatically join raids slowly(reloads game multiple times). Format is [Hours]:[Minutes] without leading zeros, so 7:1 is fine, 07:01 is not", + "getFavFrom": "Get your search-favorites from ", + "raidsearch": "Idrinth's Raidsearch", + "reloadGameFail": "The game couldn't be reloaded" + } +} \ No newline at end of file diff --git a/src/mods/chat.js b/src/mods/chat.js index 18d72ae..a20cf84 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -586,7 +586,7 @@ idrinth.chat = { children: [ { type: 'h1', - content: idrinth.text.get ( "chat.ui.chat" ) + content: idrinth.text.get ( "chat.texts.title" ) }, { type: 'p', @@ -596,7 +596,7 @@ idrinth.chat = { children: [ { type: 'h2', - content: idrinth.text.get ( "chat.ui.account" ) + content: idrinth.text.get ( "chat.texts.account" ) }, { type: 'p', @@ -617,7 +617,7 @@ idrinth.chat = { children: [ { type: 'h2', - content: idrinth.text.get ( "chat.ui.joinChat" ) + content: idrinth.text.get ( "chat.actions.joinChat" ) }, { type: 'ul', @@ -625,7 +625,7 @@ idrinth.chat = { children: [ makeInput ( 'Chat-ID' ), makeInput ( 'Chat-Password' ), - makeButton ( 'chat.ui.createAddChat', "idrinth.chat.add()" ) + makeButton ( 'chat.actions.createAddChat', "idrinth.chat.add()" ) ] } ] @@ -635,14 +635,14 @@ idrinth.chat = { children: [ { type: 'h2', - content: idrinth.text.get ( "chat.ui.createChat" ) + content: idrinth.text.get ( "chat.actions.createChat" ) }, { type: 'ul', css: 'settings', children: [ makeInput ( "Name" ), - makeButton ( 'chat.ui.createAddChat', "idrinth.chat.create()" ) + makeButton ( 'chat.actions.createAddChat', "idrinth.chat.create()" ) ] } ] @@ -651,7 +651,7 @@ idrinth.chat = { children: [ { type: '#text', - content: idrinth.text.get ( "chat.ui.moreSettings" ) + content: idrinth.text.get ( "chat.text.settings" ) }, { type: 'a', @@ -677,7 +677,7 @@ idrinth.chat = { children: [ { type: '#text', - content: idrinth.text.get ( "chat.ui.creditEmoticon" ) + content: idrinth.text.get ( "chat.creditEmoticon" ) }, { type: 'a', @@ -839,7 +839,7 @@ idrinth.chat = { return; } if ( !data.success && data.message && data['allow-reg'] ) { - idrinth.core.confirm ( idrinth.text.get ( "chat.message.unknown" ), 'idrinth.chat.register();' ); + idrinth.core.confirm ( idrinth.text.get ( "chat.error.unknown" ), 'idrinth.chat.register();' ); return; } if ( !data.success && data.message ) { @@ -872,21 +872,21 @@ idrinth.chat = { css: 'idrinth-hovering-box', children: [ { css: 'clipboard-copy', - content: idrinth.text.get ( "chat.ui.copyIdPasswort" ), + content: idrinth.text.get ( "chat.actions.copyIdPasswort" ), type: 'li', attributes: [ { name: 'data-clipboard-text', value: element.getAttribute ( 'title' ) } ] }, { - content: idrinth.text.get ( "chat.ui.leaveRoom" ), + content: idrinth.text.get ( "chat.actions.leaveRoom" ), type: 'li', attributes: [ { name: 'onclick', value: 'idrinth.chat.useroptions(' + element.getAttribute ( 'data-id' ) + ',' + idrinth.chat.self + ',\'Leave\');this.parentNode.parentNode.removeChild(this.parentNode);' } ] }, { - content: idrinth.text.get ( "chat.ui.deleteRoom" ), + content: idrinth.text.get ( "chat.actions.deleteRoom" ), type: 'li', attributes: [ { name: 'onclick', @@ -894,7 +894,7 @@ idrinth.chat = { } ] }, { type: 'li', - content: idrinth.text.get ( "chat.ui.close" ), + content: idrinth.text.get ( "chat.actions.close" ), attributes: [ { name: 'onclick', value: 'this.parentNode.parentNode.removeChild(this.parentNode);' diff --git a/src/mods/text.js b/src/mods/text.js index ebfe02b..55e1b07 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -38,110 +38,7 @@ idrinth.text = { applyRecursive ( idrinth.text.data, JSON.parse ( file ), applyRecursive ); }, idrinth.text.start, idrinth.text.start, null, true ); }, - data: { - chat: { - actions: { - banUser: 'Ban User', - makeMod: 'Make Moderator', - makeAdmin: 'Make Admin', - makeUser: 'Make User' - }, - ui: { - close: 'Close', - invite: 'Invite to Chat ', - account: 'Account', - chat: 'Chat', - createChat: 'Create Chat', - joinChat: 'Join Chat', - createAddChat: "Click to create additional chat", - creditEmoticon: 'Emoticons provided by ', - copyIdPasswort: 'Copy Password&Id', - moreSettings: 'More settings at ', - deleteRoom: 'Delete Room', - leaveRoom: 'Leave Room' - }, - message: { - optional: 'This part of the script is optional, so logging in is unneeded for raid catching etc.', - invalid: 'This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.', - offline: "Not logged in, click to login/register", - unknown: 'The given username for dotd.idrinth.de is unknown, do you want to register it there?' - }, - error: { - modify: 'Can\'t modify that user at the moment', - create: 'Can\'t create at the moment', - join: 'Joining didn\'t work', - login: 'Login failed in an unexpected way' - }, - notification: { - mentionNotis: 'chat-mention notifications?', - raidNotis: 'chat-raid notifications?', - messageNotis: 'chat-message notifications?' - } - }, - default: 'Unexpected error occurred. Please contact script developers' - + ' (https://github.com/Idrinth/IDotD).', - land: { - lack: 'You lack gold to buy any more buildings at the moment.', - hour: ' gold per hour each', - calc: 'Calculate', - avaible: 'Avaible Gold' - }, - tier: { - search: 'Enter Boss\' Name', - diff: { - normal: 'Normal', - hard: 'Hard', - legend: 'Legend', - night: 'Nightmare' - }, - tag: 'Tag to screen-top', - maxBoxes: 'There is no space for another tier-box at the moment, please close one first.' - }, - raids: { - lastJoined: 'Last raids joined:', - clear: 'Clear Raids', - disableJoining: 'Disable joining for ', - clickCopy: 'click to copy raid link', - imports: { - manually: 'Import all manually', - favs: 'Import favs manually', - restart: 'Restart Raidjoin' - } - }, - button: { - ok: 'Ok', - cancel: 'Cancel', - reloadGame: 'Reload game', - reloadScript: 'Reload Script', - refreshFBGameLogin: 'Refresh Facebook Game Login', - ngRaidJoin: 'NG Raid Join(slow!)', - disableTimedAutoJoin: 'disable timed Autojoin', - enableTimedAutoJoin: 'enable timed Autojoin' - }, - setting: { - enableExtCharInfo: 'Enable extended Characterinformation?', - minimLayout: 'Minimalist Layout', - moveSettingLeft: 'Move settings left', - warBottomPage: 'Show war at the bottom of the page', - useGoldEfficiently: 'Check to try and use up the gold as efficient as possible - uncheck to only use the most efficient buy in the land buy calculator', - tenBuildOnce: 'Buy 10 Buildings at once?(Rec)', - extCharInfoDuration: 'Milliseconds until the extended Characterinformation disappears', - joiningDuration: 'Seconds needed to load the game for joining', - enableChat: 'Enable chat(needs script reload)', - enableFavRequest: 'Enable Auto-Raid-Request for Favorites?', - favIdToJoin: 'FavoriteIds to join (separate multiple by comma)', - worldserver: 'Worldserver?', - disableAutoJoinSpecific: 'Disable Autojoining for specific raids' - }, - ui: { - settingInfo: 'This script will always import the raids you manually set to be imported on the website and if it\'s enabled it will also import all raids matched by one of the faved searches provided.', - maxPopupsFrame: 'Maximum Popups/Frames for joining raids', - timeAutoJoin: 'Time to automatically join raids slowly(reloads game multiple times). Format is [Hours]:[Minutes] without leading zeros, so 7:1 is fine, 07:01 is not', - getFavFrom: 'Get your search-favorites from ', - raidsearch: 'Idrinth\'s Raidsearch', - reloadGameFail: 'The game couldn\'t be reloaded', - } - }, + data: JSON.parse ( '###LANG###' ), /** * returns the translation of a provided key or an error-message if no * matching translation is found diff --git a/src/mods/ui.js b/src/mods/ui.js index f226b91..02e9b43 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -537,17 +537,17 @@ idrinth.ui = { name: 'notification#mention', rType: '#input', type: 'checkbox', - label: 'chat.notification.mentionNotis' + label: 'chat.notification.mention' }, { name: 'notification#raid', rType: '#input', type: 'checkbox', - label: 'chat.notification.raidNotis' + label: 'chat.notification.raid' }, { name: 'notification#message', rType: '#input', type: 'checkbox', - label: 'chat.notification.messageNotis' + label: 'chat.notification.message' }, { name: 'windows', rType: '#input', @@ -741,7 +741,7 @@ idrinth.ui = { }, { id: 'idrinth-raid-link-list' }, { - content: idrinth.text.get ( "setting.disableAutoJoinSpecific" ), + content: idrinth.text.get ( "raids.disableSpecific" ), type: 'strong' }, { id: 'idrinth-raid-may-join-list' From 5c4e72b2b9274c260644a4df21fceb0a73003c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 11 Oct 2016 13:12:30 +0200 Subject: [PATCH 133/341] some headers added for #135 fixes #199 --- src/mods/text.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mods/text.js b/src/mods/text.js index 55e1b07..f71adc8 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -7,7 +7,6 @@ idrinth.text = { /** * Loads language specific code and signals it's readyness by setting * idrinth.text.initialized to true - * @method start * @returns {undefined} */ start: function ( ) { @@ -38,6 +37,10 @@ idrinth.text = { applyRecursive ( idrinth.text.data, JSON.parse ( file ), applyRecursive ); }, idrinth.text.start, idrinth.text.start, null, true ); }, + /** + * See languages/en.json for an example + * @type {object} + */ data: JSON.parse ( '###LANG###' ), /** * returns the translation of a provided key or an error-message if no From 0c1c97934e9efdd6732cad124750424d478a7f78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 11 Oct 2016 13:35:10 +0200 Subject: [PATCH 134/341] adding some missing headers correcting url for language retrieval adding setting for language --- src/mods/settings.js | 1 + src/mods/text.js | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/mods/settings.js b/src/mods/settings.js index ad3ee84..f01d641 100644 --- a/src/mods/settings.js +++ b/src/mods/settings.js @@ -19,6 +19,7 @@ idrinth.settings = { alarmTime: '8:0', alarmActive: false, bannedRaids: { }, + language: 'en', notification: { mention: true, message: true, diff --git a/src/mods/text.js b/src/mods/text.js index f71adc8..9f77f1b 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -15,7 +15,7 @@ idrinth.text = { idrinth.text.initialized = true; return; } - idrinth.core.ajax.runHome ( '', function ( file ) { + idrinth.core.ajax.runHome ( 'lang-service/', function ( file ) { /** * * @param {object} to @@ -49,6 +49,13 @@ idrinth.text = { * @returns {string} */ get: function ( key ) { + /** + * + * @param {object} obj + * @param {Array} keys + * @param {function} func + * @returns {string} + */ var getSub = function ( obj, keys, func ) { var key = keys.shift ( ); if ( obj.hasOwnProperty ( key ) ) { From 5e16bf7338530396cc548aa5a1f975d3bb3d4c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 11 Oct 2016 13:36:45 +0200 Subject: [PATCH 135/341] adding support for branches --- src/mods/text.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/text.js b/src/mods/text.js index 9f77f1b..7fbd3cb 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -15,7 +15,7 @@ idrinth.text = { idrinth.text.initialized = true; return; } - idrinth.core.ajax.runHome ( 'lang-service/', function ( file ) { + idrinth.core.ajax.runHome ( 'lang-service/###RELOAD-VERSION###/', function ( file ) { /** * * @param {object} to From 62c0a290a787f0895dc790fe449c1fa653062007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 11 Oct 2016 15:35:14 +0200 Subject: [PATCH 136/341] correcting some labels fixes #201 --- src/mods/chat.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index a20cf84..1bb2544 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -590,7 +590,7 @@ idrinth.chat = { }, { type: 'p', - content: idrinth.text.get ( "chat.message.optional" ) + content: idrinth.text.get ( "chat.texts.optional" ) }, { id: 'idrinth-chat-login', children: [ @@ -600,7 +600,7 @@ idrinth.chat = { }, { type: 'p', - content: idrinth.text.get ( "chat.message.invalid" ) + content: idrinth.text.get ( "chat.texts.invalid" ) }, { type: 'ul', @@ -608,7 +608,7 @@ idrinth.chat = { children: [ makeInput ( 'Username' ), makeInput ( 'Password' ), - makeButton ( 'chat.message.offline', "idrinth.chat.login()" ) + makeButton ( 'chat.texts.offline', "idrinth.chat.login()" ) ] } ] @@ -677,7 +677,7 @@ idrinth.chat = { children: [ { type: '#text', - content: idrinth.text.get ( "chat.creditEmoticon" ) + content: idrinth.text.get ( "chat.texts.creditEmoticon" ) }, { type: 'a', From 567d948e757b8119d79d4f708662cdf0ecb59839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 11 Oct 2016 15:40:08 +0200 Subject: [PATCH 137/341] correcting typo --- src/mods/chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 1bb2544..b70228d 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -651,7 +651,7 @@ idrinth.chat = { children: [ { type: '#text', - content: idrinth.text.get ( "chat.text.settings" ) + content: idrinth.text.get ( "chat.texts.settings" ) }, { type: 'a', From bd3ccfd1b752e04470344633d414dd680db63769 Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 17:17:20 +0200 Subject: [PATCH 138/341] Major changes based on ticked #191, should fixes #191 Update to current version of IDotd --- src/mods/chat.js | 11 +++++------ src/mods/land.js | 2 +- src/mods/text.js | 2 +- src/mods/tier.js | 4 ++-- src/mods/ui.js | 20 ++++++++++---------- src/mods/war.js | 2 +- src/stable.js | 4 ++-- 7 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index b761d0a..7f8470f 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -313,9 +313,9 @@ idrinth.chat = { }; var messageAllowed = function ( text ) { try { - return ( idrinth.settings.notification.message && text.match ( /\{[A-Z]{2}-Raid / ) === null ) || - ( idrinth.settings.notification.mention && text.match ( new RegExp ( '(\s|^)' + idrinth.core.escapeRegExp ( idrinth.chat.users[idrinth.chat.self].name ) + '(\s|$)', 'i' ) ) !== null ) || - ( idrinth.settings.notification.raid && text.match ( /\{[A-Z]{2}-Raid / ) !== null ); + return ( idrinth.settings.get("notification.message") && text.match ( /\{[A-Z]{2}-Raid / ) === null ) || + ( idrinth.settings.get("notification.mention") && text.match ( new RegExp ( '(\s|^)' + idrinth.core.escapeRegExp ( idrinth.chat.users[idrinth.chat.self].name ) + '(\s|$)', 'i' ) ) !== null ) || + ( idrinth.settings.("notification.raid") && text.match ( /\{[A-Z]{2}-Raid / ) !== null ); } catch ( e ) { idrinth.core.log ( e.getMessage () ); return false; @@ -847,9 +847,8 @@ idrinth.chat = { return; } if ( data.success ) { - idrinth.settings.get("chatuser") = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[0].value; - idrinth.settings.get("chatpass") = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[1].value; - idrinth.settings.save (); + idrinth.settings.change(("chatuser"), document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[0].value); + idrinth.settings.change(("chatpass"), document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[1].value); idrinth.ui.removeElement ( 'idrinth-chat-login' ); idrinth.chat.join ( data.data ); return; diff --git a/src/mods/land.js b/src/mods/land.js index 19a6470..5450e60 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -1,7 +1,7 @@ idrinth.land = { calculate: function () { var baseCalculator = function ( checkElementFunc ) { - var factor = idrinth.settings.factor ? 10 : 1; + var factor = idrinth.settings.get("factor") ? 10 : 1; var nextPrice = function ( building ) { return ( 10 + idrinth.settings.get("land#" + building ) ) * idrinth.land.data[building].base; }; diff --git a/src/mods/text.js b/src/mods/text.js index 7fbd3cb..fd44a41 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -10,7 +10,7 @@ idrinth.text = { * @returns {undefined} */ start: function ( ) { - var language = idrinth.settings.language || window.navigator.userLanguage || window.navigator.language; + var language = idrinth.settings.get("language") || window.navigator.userLanguage || window.navigator.language; if ( language === 'en' ) { idrinth.text.initialized = true; return; diff --git a/src/mods/tier.js b/src/mods/tier.js index b311017..0391a92 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -94,8 +94,8 @@ idrinth.tier = { if ( data ) { idrinth.tier.list = data; for (var key in data) { - if ( data[key].name && idrinth.settings.bannedRaids[data[key].name] === undefined ) { - idrinth.settings.bannedRaids[data[key].name] = false; + if ( data[key].name && idrinth.settings.get("bannedRaids#"+"data#"+"key.name") === undefined ) { + idrinth.settings.get("bannedRaids#"+"data#"+"key.name") = false; document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { name: 'bannedRaids#' + data[key].name, rType: '#input', diff --git a/src/mods/ui.js b/src/mods/ui.js index 02e9b43..555a195 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -277,7 +277,7 @@ idrinth.ui = { } idrinth.names.isHovering = false; var name = idrinth.names.parse ( element ).toLowerCase ( ); - if ( idrinth.settings.names && idrinth.ui.tooltip && idrinth.names.users[name] ) { + if ( idrinth.settings.get("names") && idrinth.ui.tooltip && idrinth.names.users[name] ) { window.clearTimeout ( idrinth.ui.tooltipTO ); idrinth.ui.tooltip.setAttribute ( 'style', idrinth.ui.getElementPositioning ( element, -200, -100 ) ); tooltip ( idrinth.names.users[name].kongregate, idrinth.ui.tooltip.firstChild, false ); @@ -294,7 +294,7 @@ idrinth.ui = { } }, setTooltipTimeout: function () { - idrinth.ui.tooltipTO = window.setTimeout ( idrinth.ui.hideTooltip, idrinth.settings.timeout ? idrinth.settings.timeout : 5000 ); + idrinth.ui.tooltipTO = window.setTimeout ( idrinth.ui.hideTooltip, idrinth.settings.get("timeout") ? idrinth.settings.get("timeout") : 5000 ); }, hideTooltip: function () { if ( idrinth.names.isHovering ) { @@ -305,10 +305,10 @@ idrinth.ui = { openCloseSettings: function ( ) { 'use strict'; var toRemove = [ ( idrinth.ui.controls.getAttribute ( 'class' ) ).match ( /(^|\s)inactive($|\s)/ ) ? 'inactive' : 'active' ]; - if ( !idrinth.settings.moveLeft ) { + if ( !idrinth.settings.get("moveLeft") ) { toRemove.push ( 'left-sided' ); } - if ( !idrinth.settings.minimalist ) { + if ( !idrinth.settings.get("minimalist") ) { toRemove.push ( 'small' ); } idrinth.ui.updateClassesList ( idrinth.ui.controls, [ 'active', 'inactive', 'left-sided', 'small' ], toRemove ); @@ -414,15 +414,15 @@ idrinth.ui = { return [ { children: [ buttonMaker ( idrinth.text.get ( "raids.imports.manually" ), 'idrinth.raids.import(\'\');' ), - buttonMaker ( idrinth.text.get ( "raids.imports.favs" ), 'idrinth.raids.import(idrinth.settings.favs);' ), + buttonMaker ( idrinth.text.get ( "raids.imports.favs" ), 'idrinth.raids.import(idrinth.settings.get("favs"));' ), buttonMaker ( idrinth.text.get ( "button.reloadGame" ), 'idrinth.ui.reloadGame();' ), buttonMaker ( idrinth.text.get ( "raids.clear" ), 'idrinth.raids.clearAll();' ), buttonMaker ( idrinth.text.get ( "button.reloadScript" ), 'idrinth.reload();' ), buttonMaker ( idrinth.text.get ( "raids.imports.restart" ), 'idrinth.raids.restartInterval();' ), buttonMaker ( idrinth.text.get ( "button.refreshFBGameLogin" ), 'idrinth.facebook.rejoin()', 'facebook' ), buttonMaker ( idrinth.text.get ( "button.ngRaidJoin" ), 'idrinth.newgrounds.joinRaids()', 'newgrounds' ), - buttonMaker ( idrinth.settings.alarmActive ? idrinth.text.get ( "button.disableTimedAutoJoin" ) : idrinth.text.get ( "button.enableTimedAutoJoin" ), - 'idrinth.settings.change(\'alarmActive\',!idrinth.settings.alarmActive);this.innerHTML=idrinth.settings.alarmActive?idrinth.text.get ( "button.disableTimedAutoJoin" ):"button.enableTimedAutoJoin"', 'newgrounds' ) + buttonMaker ( idrinth.settings.get("alarmActive") ? idrinth.text.get ( "button.disableTimedAutoJoin" ) : idrinth.text.get ( "button.enableTimedAutoJoin" ), + 'idrinth.settings.change(\'alarmActive\',!idrinth.settings.get("alarmActive"));this.innerHTML=idrinth.settings.get("alarmActive") ? idrinth.text.get ( "button.disableTimedAutoJoin" ):"button.enableTimedAutoJoin"', 'newgrounds' ) ] }, { css: 'idrinth-line', @@ -594,7 +594,7 @@ idrinth.ui = { attributes: [ { name: 'value', - value: idrinth.settings.land[label.toLowerCase ()] + value: idrinth.settings.get("land#"+label.toLowerCase ()) }, { name: 'type', @@ -650,7 +650,7 @@ idrinth.ui = { attributes: [ { name: 'value', - value: idrinth.settings.land.gold + value: idrinth.settings.get("land#gold") }, { name: 'type', @@ -781,7 +781,7 @@ idrinth.ui = { } ] } ); idrinth.ui.controls = idrinth.ui.buildElement ( { - css: 'idrinth-hovering-box idrinth-controls-overwrite inactive' + ( idrinth.settings.moveLeft ? ' left-sided' : '' ) + ( idrinth.settings.minimalist ? ' small' : '' ), + css: 'idrinth-hovering-box idrinth-controls-overwrite inactive' + ( idrinth.settings.get("moveLeft") ? ' left-sided' : '' ) + ( idrinth.settings.get("minimalist") ? ' small' : '' ), id: 'idrinth-controls', children: children } ); diff --git a/src/mods/war.js b/src/mods/war.js index dcaf9ae..af4cb41 100644 --- a/src/mods/war.js +++ b/src/mods/war.js @@ -43,7 +43,7 @@ idrinth.war = { if ( toggle === true ) { removeClasses.push ( 'idrinth-hide' ); addClasses.push ( "bottom" ); - if ( !idrinth.settings.warBottom ) { + if ( !idrinth.settings.get("warBottom") ) { removeClasses.push ( "bottom" ); } } else { diff --git a/src/stable.js b/src/stable.js index 8d55b6a..b362535 100644 --- a/src/stable.js +++ b/src/stable.js @@ -41,7 +41,7 @@ var idrinth = { }, alarmCheck: function () { var now = new Date (); - if ( idrinth.settings.alarmActive && now.getHours () + ':' + now.getMinutes () === idrinth.settings.alarmTime ) { + if ( idrinth.settings.get("alarmActive") && now.getHours () + ':' + now.getMinutes () === idrinth.settings.get("alarmTime") ) { window.setTimeout ( idrinth.newgrounds.joinRaids, 1 ); } window.setTimeout ( idrinth.newgrounds.alarmCheck, 60000 ); @@ -85,7 +85,7 @@ var idrinth = { idrinth.raids.join.messages.trying ( key ); idrinth.newgrounds.join (); }, - idrinth.settings.newgroundLoad * 1000 ); + idrinth.settings.change(idrinth.settings.get("newgroundLoad"),idrinth.settings.get("newgroundLoad") * 1000 )); } }, clearTimeout: function ( timeout ) { From fc3d1482310004ce812adc1731d0cd86e565acf9 Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 17:22:28 +0200 Subject: [PATCH 139/341] Fixing one wrong replacement of #191 --- src/stable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stable.js b/src/stable.js index b362535..98a7670 100644 --- a/src/stable.js +++ b/src/stable.js @@ -85,7 +85,7 @@ var idrinth = { idrinth.raids.join.messages.trying ( key ); idrinth.newgrounds.join (); }, - idrinth.settings.change(idrinth.settings.get("newgroundLoad"),idrinth.settings.get("newgroundLoad") * 1000 )); + idrinth.settings.newgroundLoad * 1000 ); } }, clearTimeout: function ( timeout ) { From 2ca8a689e6c2a55354467b311489d22383a4c2b0 Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 17:23:23 +0200 Subject: [PATCH 140/341] Fixing one wrong replacement of #191 --- src/stable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stable.js b/src/stable.js index 98a7670..0cf34db 100644 --- a/src/stable.js +++ b/src/stable.js @@ -85,7 +85,7 @@ var idrinth = { idrinth.raids.join.messages.trying ( key ); idrinth.newgrounds.join (); }, - idrinth.settings.newgroundLoad * 1000 ); + idrinth.settings.get("newgroundLoad") * 1000 ); } }, clearTimeout: function ( timeout ) { From 6f96b89dd0041cf646b688c1a2d1587fe865690c Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 19:54:23 +0200 Subject: [PATCH 141/341] fixing issues in chat.js --- src/mods/chat.js | 6 +++--- src/mods/tier.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 7f8470f..38163f2 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -313,9 +313,9 @@ idrinth.chat = { }; var messageAllowed = function ( text ) { try { - return ( idrinth.settings.get("notification.message") && text.match ( /\{[A-Z]{2}-Raid / ) === null ) || - ( idrinth.settings.get("notification.mention") && text.match ( new RegExp ( '(\s|^)' + idrinth.core.escapeRegExp ( idrinth.chat.users[idrinth.chat.self].name ) + '(\s|$)', 'i' ) ) !== null ) || - ( idrinth.settings.("notification.raid") && text.match ( /\{[A-Z]{2}-Raid / ) !== null ); + return ( idrinth.settings.get("notification#message") && text.match ( /\{[A-Z]{2}-Raid / ) === null ) || + ( idrinth.settings.get("notification#mention") && text.match ( new RegExp ( '(\s|^)' + idrinth.core.escapeRegExp ( idrinth.chat.users[idrinth.chat.self].name ) + '(\s|$)', 'i' ) ) !== null ) || + ( idrinth.settings.("notification#raid") && text.match ( /\{[A-Z]{2}-Raid / ) !== null ); } catch ( e ) { idrinth.core.log ( e.getMessage () ); return false; diff --git a/src/mods/tier.js b/src/mods/tier.js index 0391a92..d6ae443 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -94,8 +94,8 @@ idrinth.tier = { if ( data ) { idrinth.tier.list = data; for (var key in data) { - if ( data[key].name && idrinth.settings.get("bannedRaids#"+"data#"+"key.name") === undefined ) { - idrinth.settings.get("bannedRaids#"+"data#"+"key.name") = false; + if ( data[key].name && idrinth.settings.get("bannedRaids#"+"data#"+"key#name") === undefined ) { + idrinth.settings.get("bannedRaids#"+"data#"+"key#name") = false; document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { name: 'bannedRaids#' + data[key].name, rType: '#input', From d3bc26b29f877198ddd1c100bd20995e0abf1e6c Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Tue, 11 Oct 2016 21:02:36 +0300 Subject: [PATCH 142/341] Rename Elite Funny Bones [].json to Elite Funny Bones [E. Funny Bones].json --- ...unny Bones [].json => Elite Funny Bones [E. Funny Bones].json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tiers/{Elite Funny Bones [].json => Elite Funny Bones [E. Funny Bones].json} (100%) diff --git a/tiers/Elite Funny Bones [].json b/tiers/Elite Funny Bones [E. Funny Bones].json similarity index 100% rename from tiers/Elite Funny Bones [].json rename to tiers/Elite Funny Bones [E. Funny Bones].json From cfbcbf246d2b124c54e1a04db358040ec0b6ba14 Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 20:14:32 +0200 Subject: [PATCH 143/341] Fixes in tier.js for #191 --- src/mods/tier.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index d6ae443..49c6454 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -94,8 +94,8 @@ idrinth.tier = { if ( data ) { idrinth.tier.list = data; for (var key in data) { - if ( data[key].name && idrinth.settings.get("bannedRaids#"+"data#"+"key#name") === undefined ) { - idrinth.settings.get("bannedRaids#"+"data#"+"key#name") = false; + if ( data[key].name && idrinth.settings.get( "bannedRaids#" + data[key.name] ) === undefined ) { + idrinth.settings.get( "bannedRaids#" + data[key.name] ) = false; document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { name: 'bannedRaids#' + data[key].name, rType: '#input', From 477dd43ff7252d5f48d9a1233b07a75a6c6c0cc3 Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 20:22:25 +0200 Subject: [PATCH 144/341] fixes in land.js for #191 --- src/mods/land.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/land.js b/src/mods/land.js index 5450e60..619bf8a 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -67,7 +67,7 @@ idrinth.land = { document.getElementById( 'idrinth-land-gold' ).value = idrinth.settings.get( "land#gold" ); }; for (var key in idrinth.settings.get("land#")) { - if ( idrinth.settings.land.hasOwnProperty ( key ) ) { + if ( idrinth.settings.get("land#"+hasOwnProperty ( key )) ) { idrinth.settings.change ( 'land#' + key, parseInt ( document.getElementById ( 'idrinth-land-' + key ).value, 10 ) ); } } From 82c9f3b6ee235a1866c3178bfbec8cec30be2f42 Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 20:34:38 +0200 Subject: [PATCH 145/341] Fixed syntax error in chat.js, #191 --- src/mods/chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 38163f2..8f630c2 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -315,7 +315,7 @@ idrinth.chat = { try { return ( idrinth.settings.get("notification#message") && text.match ( /\{[A-Z]{2}-Raid / ) === null ) || ( idrinth.settings.get("notification#mention") && text.match ( new RegExp ( '(\s|^)' + idrinth.core.escapeRegExp ( idrinth.chat.users[idrinth.chat.self].name ) + '(\s|$)', 'i' ) ) !== null ) || - ( idrinth.settings.("notification#raid") && text.match ( /\{[A-Z]{2}-Raid / ) !== null ); + ( idrinth.settings.get("notification#raid") && text.match ( /\{[A-Z]{2}-Raid / ) !== null ); } catch ( e ) { idrinth.core.log ( e.getMessage () ); return false; From 80906bb764106e877a0311c06d864dbb907b3b26 Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 20:39:29 +0200 Subject: [PATCH 146/341] fixes in tier.js, #191 --- src/mods/tier.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index 49c6454..49a3d6e 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -95,7 +95,7 @@ idrinth.tier = { idrinth.tier.list = data; for (var key in data) { if ( data[key].name && idrinth.settings.get( "bannedRaids#" + data[key.name] ) === undefined ) { - idrinth.settings.get( "bannedRaids#" + data[key.name] ) = false; + idrinth.settings.change( idrinth.settings.get( "bannedRaids#" + data[key.name] ), false );; document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { name: 'bannedRaids#' + data[key].name, rType: '#input', From fdd20c953c5fc2327408aece47258fdc3e4b9e5a Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 20:46:13 +0200 Subject: [PATCH 147/341] fixes in tier.js, #191 --- src/mods/tier.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index 49a3d6e..81e30bb 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -95,7 +95,7 @@ idrinth.tier = { idrinth.tier.list = data; for (var key in data) { if ( data[key].name && idrinth.settings.get( "bannedRaids#" + data[key.name] ) === undefined ) { - idrinth.settings.change( idrinth.settings.get( "bannedRaids#" + data[key.name] ), false );; + idrinth.settings.get( "bannedRaids" + data[key].name ) = false; document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { name: 'bannedRaids#' + data[key].name, rType: '#input', From 82d2df4cb661b6b40fd29476fa92ddfc244f8258 Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 20:48:17 +0200 Subject: [PATCH 148/341] fixes in tier.js, #191 --- src/mods/tier.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index 81e30bb..e4aea6a 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -95,7 +95,7 @@ idrinth.tier = { idrinth.tier.list = data; for (var key in data) { if ( data[key].name && idrinth.settings.get( "bannedRaids#" + data[key.name] ) === undefined ) { - idrinth.settings.get( "bannedRaids" + data[key].name ) = false; + idrinth.settings.change( idrinth.setting.get("bannedRaids" + data[key].name), false); document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { name: 'bannedRaids#' + data[key].name, rType: '#input', From 795a0157c63a785dae46009c8dc53aa60b14e50e Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 20:52:59 +0200 Subject: [PATCH 149/341] fixing a mistake in raids.js, #191 --- src/mods/raids.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/raids.js b/src/mods/raids.js index 179def7..9a20a2b 100644 --- a/src/mods/raids.js +++ b/src/mods/raids.js @@ -288,7 +288,7 @@ idrinth.raids = { if ( !raid.joined ) { added++; options[0] ( key );//post link - if ( !idrinth.settings.get("bannedRaids#"+raid.raid) ) { + if ( !idrinth.settings.get("bannedRaids"+raid.raid) ) { for (var count = 1; count < options.length; count++) { options[count] ( key ); } From bd9c7996160daffd1b0e3fad8705383d269c6ef2 Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 20:59:22 +0200 Subject: [PATCH 150/341] fixing array mistakes, #191 --- src/mods/land.js | 2 +- src/mods/tier.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mods/land.js b/src/mods/land.js index 619bf8a..b156f5d 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -9,7 +9,7 @@ idrinth.land = { var applyResult = function ( results, res, factor, nextPrice ) { idrinth.settings.change("land#gold", idrinth.settings.get( "land#gold" ) - nextPrice( res.key ) * factor / 10); results[res.key] = ( results[res.key] === undefined ? 0 : results[res.key] ) + factor; - idrinth.settings.change( "land#" + res.key, idrinth.settings.get( "land#" + res.key ) + factor ); + idrinth.settings.change( "land" + res.key, idrinth.settings.get( "land" + res.key ) + factor ); return results; }; var processBuildings = function ( checkElementFunc, factor, nextPrice ) { diff --git a/src/mods/tier.js b/src/mods/tier.js index e4aea6a..726c043 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -94,7 +94,7 @@ idrinth.tier = { if ( data ) { idrinth.tier.list = data; for (var key in data) { - if ( data[key].name && idrinth.settings.get( "bannedRaids#" + data[key.name] ) === undefined ) { + if ( data[key].name && idrinth.settings.get( "bannedRaids" + data[key.name] ) === undefined ) { idrinth.settings.change( idrinth.setting.get("bannedRaids" + data[key].name), false); document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { name: 'bannedRaids#' + data[key].name, From ce7e045bd8d262255730b2eca8e3b696fc9cdfe6 Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 21:04:40 +0200 Subject: [PATCH 151/341] land.js change func fixes, #191 --- src/mods/land.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mods/land.js b/src/mods/land.js index b156f5d..e882c71 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -7,9 +7,9 @@ idrinth.land = { }; var results = { }; var applyResult = function ( results, res, factor, nextPrice ) { - idrinth.settings.change("land#gold", idrinth.settings.get( "land#gold" ) - nextPrice( res.key ) * factor / 10); + idrinth.settings.change( idrinth.settings.get( "land#gold" ), idrinth.settings.get( "land#gold" ) - nextPrice( res.key ) * factor / 10 ); results[res.key] = ( results[res.key] === undefined ? 0 : results[res.key] ) + factor; - idrinth.settings.change( "land" + res.key, idrinth.settings.get( "land" + res.key ) + factor ); + idrinth.settings.change( idrinth.settings.get( "land" + res.key ), idrinth.settings.get( "land" + res.key ) + factor ); return results; }; var processBuildings = function ( checkElementFunc, factor, nextPrice ) { From 69654c8c1e21d79d6144d16f626d297a56787a10 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Tue, 11 Oct 2016 22:20:36 +0300 Subject: [PATCH 152/341] Create Frogmen-Assassins [Frog-Men].json --- tiers/Frogmen-Assassins [Frog-Men].json | 70 +++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 tiers/Frogmen-Assassins [Frog-Men].json diff --git a/tiers/Frogmen-Assassins [Frog-Men].json b/tiers/Frogmen-Assassins [Frog-Men].json new file mode 100644 index 0000000..bc527b4 --- /dev/null +++ b/tiers/Frogmen-Assassins [Frog-Men].json @@ -0,0 +1,70 @@ +{ + "normal": { + "400000000": 60, + "500000000": 66, + "600000000": 72, + "700000000": 78, + "800000000": 84, + "900000000": 90, + "1000000000": 96, + "1250000000": 120, + "1500000000": 144, + "1750000000": 168, + "2000000000": 192, + "2250000000": 216, + "2500000000": 240, + "2750000000": 264, + "3000000000": 288 + }, + "hard": { + "400000000": 60, + "500000000": 66, + "600000000": 72, + "700000000": 78, + "800000000": 84, + "900000000": 90, + "1000000000": 96, + "1250000000": 120, + "1500000000": 144, + "1750000000": 168, + "2000000000": 192, + "2250000000": 216, + "2500000000": 240, + "2750000000": 264, + "3000000000": 288 + }, + "legendary": { + "400000000": 60, + "500000000": 66, + "600000000": 72, + "700000000": 78, + "800000000": 84, + "900000000": 90, + "1000000000": 96, + "1250000000": 120, + "1500000000": 144, + "1750000000": 168, + "2000000000": 192, + "2250000000": 216, + "2500000000": 240, + "2750000000": 264, + "3000000000": 288 + }, + "nightmare": { + "400000000": 60, + "500000000": 66, + "600000000": 72, + "700000000": 78, + "800000000": 84, + "900000000": 90, + "1000000000": 96, + "1250000000": 120, + "1500000000": 144, + "1750000000": 168, + "2000000000": 192, + "2250000000": 216, + "2500000000": 240, + "2750000000": 264, + "3000000000": 288 + } +} From 56a6ba7672f2cc5670c6f790f3516edc8cb000f3 Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 21:23:41 +0200 Subject: [PATCH 153/341] further syntax fixes, #191 --- src/mods/land.js | 4 ++-- src/mods/raids.js | 2 +- src/mods/tier.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mods/land.js b/src/mods/land.js index e882c71..1dd4b23 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -7,9 +7,9 @@ idrinth.land = { }; var results = { }; var applyResult = function ( results, res, factor, nextPrice ) { - idrinth.settings.change( idrinth.settings.get( "land#gold" ), idrinth.settings.get( "land#gold" ) - nextPrice( res.key ) * factor / 10 ); + idrinth.settings.change( "land#gold", idrinth.settings.get( "land#gold" ) - nextPrice( res.key ) * factor / 10 ); results[res.key] = ( results[res.key] === undefined ? 0 : results[res.key] ) + factor; - idrinth.settings.change( idrinth.settings.get( "land" + res.key ), idrinth.settings.get( "land" + res.key ) + factor ); + idrinth.settings.change( "land#" + res.key, idrinth.settings.get( "land#" + res.key ) + factor ); return results; }; var processBuildings = function ( checkElementFunc, factor, nextPrice ) { diff --git a/src/mods/raids.js b/src/mods/raids.js index 9a20a2b..179def7 100644 --- a/src/mods/raids.js +++ b/src/mods/raids.js @@ -288,7 +288,7 @@ idrinth.raids = { if ( !raid.joined ) { added++; options[0] ( key );//post link - if ( !idrinth.settings.get("bannedRaids"+raid.raid) ) { + if ( !idrinth.settings.get("bannedRaids#"+raid.raid) ) { for (var count = 1; count < options.length; count++) { options[count] ( key ); } diff --git a/src/mods/tier.js b/src/mods/tier.js index 726c043..71263b6 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -94,8 +94,8 @@ idrinth.tier = { if ( data ) { idrinth.tier.list = data; for (var key in data) { - if ( data[key].name && idrinth.settings.get( "bannedRaids" + data[key.name] ) === undefined ) { - idrinth.settings.change( idrinth.setting.get("bannedRaids" + data[key].name), false); + if ( data[key].name && idrinth.settings.get( "bannedRaids#" + data[key.name] ) === undefined ) { + idrinth.settings.change( "bannedRaids#" + data[key].name, false); document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { name: 'bannedRaids#' + data[key].name, rType: '#input', From 934c68c6bcd6c869c501d2d5ff70656bf81a3d12 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Tue, 11 Oct 2016 22:29:01 +0300 Subject: [PATCH 154/341] Create Thaltherda [Thaltherda].json --- tiers/Thaltherda [Thaltherda].json | 42 ++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 tiers/Thaltherda [Thaltherda].json diff --git a/tiers/Thaltherda [Thaltherda].json b/tiers/Thaltherda [Thaltherda].json new file mode 100644 index 0000000..c598f07 --- /dev/null +++ b/tiers/Thaltherda [Thaltherda].json @@ -0,0 +1,42 @@ +{ + "normal": { + "120000000": 48, + "180000000": 52, + "225000000": 56, + "240000000": 60, + "300000000": 64, + "500000000": 70, + "750000000": 84, + "1000000000": 108 + }, + "hard": { + "120000000": 48, + "180000000": 52, + "225000000": 56, + "240000000": 60, + "300000000": 64, + "500000000": 70, + "750000000": 84, + "1000000000": 108 + }, + "legendary": { + "120000000": 48, + "180000000": 52, + "225000000": 56, + "240000000": 60, + "300000000": 64, + "500000000": 70, + "750000000": 84, + "1000000000": 108 + }, + "nightmare": { + "120000000": 48, + "180000000": 52, + "225000000": 56, + "240000000": 60, + "300000000": 64, + "500000000": 70, + "750000000": 84, + "1000000000": 108 + } +} From b74671068240f141f8167ee9820202ef97a95c7d Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Tue, 11 Oct 2016 22:31:11 +0300 Subject: [PATCH 155/341] Create Hurkus [Hurkus].json --- tiers/Hurkus [Hurkus].json | 42 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 tiers/Hurkus [Hurkus].json diff --git a/tiers/Hurkus [Hurkus].json b/tiers/Hurkus [Hurkus].json new file mode 100644 index 0000000..31e6f4d --- /dev/null +++ b/tiers/Hurkus [Hurkus].json @@ -0,0 +1,42 @@ +{ + "normal": { + "90000000": 26, + "135000000": 54, + "150000000": 72, + "180000000": 84, + "225000000": 100, + "300000000": 118, + "550000000": 142, + "900000000": 160 + }, + "hard": { + "90000000": 26, + "135000000": 54, + "150000000": 72, + "180000000": 84, + "225000000": 100, + "300000000": 118, + "550000000": 142, + "900000000": 160 + }, + "legendary": { + "90000000": 26, + "135000000": 54, + "150000000": 72, + "180000000": 84, + "225000000": 100, + "300000000": 118, + "550000000": 142, + "900000000": 160 + }, + "nightmare": { + "90000000": 26, + "135000000": 54, + "150000000": 72, + "180000000": 84, + "225000000": 100, + "300000000": 118, + "550000000": 142, + "900000000": 160 + } +} From 4c9890a9d9fba0280c6c7135c0a0eddcc0436d61 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Tue, 11 Oct 2016 22:40:10 +0300 Subject: [PATCH 156/341] Create Malleus [Malleus].json --- tiers/Malleus [Malleus].json | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 tiers/Malleus [Malleus].json diff --git a/tiers/Malleus [Malleus].json b/tiers/Malleus [Malleus].json new file mode 100644 index 0000000..73d45bd --- /dev/null +++ b/tiers/Malleus [Malleus].json @@ -0,0 +1,46 @@ +{ + "normal": { + "100000000": 22, + "150000000": 56, + "225000000": 78, + "300000000": 84, + "375000000": 96, + "450000000": 104, + "525000000": 116, + "600000000": 128, + "900000000": 156 + }, + "hard": { + "100000000": 22, + "150000000": 56, + "225000000": 78, + "300000000": 84, + "375000000": 96, + "450000000": 104, + "525000000": 116, + "600000000": 128, + "900000000": 156 + }, + "legendary": { + "100000000": 22, + "150000000": 56, + "225000000": 78, + "300000000": 84, + "375000000": 96, + "450000000": 104, + "525000000": 116, + "600000000": 128, + "900000000": 156 + }, + "nightmare": { + "100000000": 22, + "150000000": 56, + "225000000": 78, + "300000000": 84, + "375000000": 96, + "450000000": 104, + "525000000": 116, + "600000000": 128, + "900000000": 156 + } +} From 77c48b9e478a6ecd159ab569e6d66f931d4aa2c6 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Tue, 11 Oct 2016 22:45:34 +0300 Subject: [PATCH 157/341] Create Fog Of Wars [Zugen].json --- tiers/Fog Of Wars [Zugen].json | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 tiers/Fog Of Wars [Zugen].json diff --git a/tiers/Fog Of Wars [Zugen].json b/tiers/Fog Of Wars [Zugen].json new file mode 100644 index 0000000..edc7ea3 --- /dev/null +++ b/tiers/Fog Of Wars [Zugen].json @@ -0,0 +1,13 @@ +{ + "nightmare": { + "120000000": 48, + "180000000": 52, + "225000000": 56, + "240000000": 60, + "300000000": 72, + "400000000": 80, + "750000000": 98, + "1000000000": 116, + "1500000000": 186 + } +} From 16aaf854596857c1f4bdb4a0b94a9b8715935b23 Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 21:46:00 +0200 Subject: [PATCH 158/341] small fix, fixes #191, in tier.js --- src/mods/tier.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index 71263b6..8aba259 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -94,7 +94,7 @@ idrinth.tier = { if ( data ) { idrinth.tier.list = data; for (var key in data) { - if ( data[key].name && idrinth.settings.get( "bannedRaids#" + data[key.name] ) === undefined ) { + if ( data[key].name && idrinth.settings.get( "bannedRaids#" + data[key].name ) === undefined ) { idrinth.settings.change( "bannedRaids#" + data[key].name, false); document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { name: 'bannedRaids#' + data[key].name, From acd1e06a17d8dab32badfb67525d29f86a03c304 Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 21:49:27 +0200 Subject: [PATCH 159/341] fixes #191, small fix in chat.js --- src/mods/chat.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 8f630c2..0f281bd 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -847,8 +847,8 @@ idrinth.chat = { return; } if ( data.success ) { - idrinth.settings.change(("chatuser"), document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[0].value); - idrinth.settings.change(("chatpass"), document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[1].value); + idrinth.settings.change("chatuser", document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[0].value); + idrinth.settings.change("chatpass", document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[1].value); idrinth.ui.removeElement ( 'idrinth-chat-login' ); idrinth.chat.join ( data.data ); return; From a3052960def6ff2e3be301061b18533daf62182d Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Tue, 11 Oct 2016 22:56:10 +0300 Subject: [PATCH 160/341] Create Fog Of Wars [Gulkinari].json --- tiers/Fog Of Wars [Gulkinari].json | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 tiers/Fog Of Wars [Gulkinari].json diff --git a/tiers/Fog Of Wars [Gulkinari].json b/tiers/Fog Of Wars [Gulkinari].json new file mode 100644 index 0000000..cf10903 --- /dev/null +++ b/tiers/Fog Of Wars [Gulkinari].json @@ -0,0 +1,13 @@ +{ + "nightmare": { + "90000000": 24, + "135000000": 50, + "150000000": 66, + "1800000000": 78, + "2250000000": 82, + "3000000000": 106, + "5500000000": 116, + "9000000000": 140, + "15000000000": 204 + } +} From f1fdd1d55869b5ebfdf282bf8729cc56c6bdb2aa Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 22:00:46 +0200 Subject: [PATCH 161/341] #191, saving input login in variable --- src/mods/chat.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 0f281bd..afd7678 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -847,8 +847,10 @@ idrinth.chat = { return; } if ( data.success ) { - idrinth.settings.change("chatuser", document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[0].value); - idrinth.settings.change("chatpass", document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[1].value); + var login = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[0].value; + idrinth.settings.change( "chatuser", login ); + login = document.getElementById( 'idrinth-chat-login' ).getElementsByTagName( 'input' )[1].value; + idrinth.settings.change("chatpass", login); idrinth.ui.removeElement ( 'idrinth-chat-login' ); idrinth.chat.join ( data.data ); return; From bfbe17e3f837e8acfee694faf7c87776c4e4ab88 Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 22:07:52 +0200 Subject: [PATCH 162/341] improving previous commit, #191, saving login in variable --- src/mods/chat.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index afd7678..40c52e5 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -847,10 +847,9 @@ idrinth.chat = { return; } if ( data.success ) { - var login = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' )[0].value; - idrinth.settings.change( "chatuser", login ); - login = document.getElementById( 'idrinth-chat-login' ).getElementsByTagName( 'input' )[1].value; - idrinth.settings.change("chatpass", login); + var login = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' ); + idrinth.settings.change( "chatuser", login[0].value ); + idrinth.settings.change( "chatpass", login[1].value ); idrinth.ui.removeElement ( 'idrinth-chat-login' ); idrinth.chat.join ( data.data ); return; From a13c426dda97b17545e5d6376978185b73afcd90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 11 Oct 2016 22:16:09 +0200 Subject: [PATCH 163/341] reformatting --- src/mods/chat.js | 28 ++++++------ src/mods/core.js | 2 +- src/mods/land.js | 22 ++++----- src/mods/raids.js | 10 ++--- src/mods/text.js | 2 +- src/mods/tier.js | 4 +- src/mods/ui.js | 16 +++---- src/mods/war.js | 2 +- src/stable.js | 4 +- tiers/Al-Azab [Al-Azab].json | 64 +++++++++++++-------------- tiers/Arachna [Arachna].json | 64 +++++++++++++-------------- tiers/Celeano [Celeano].json | 64 +++++++++++++-------------- tiers/Fog Of Wars [Zugen].json | 2 +- tiers/Soul Collector [Collector].json | 2 +- 14 files changed, 143 insertions(+), 143 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 40c52e5..ae23ec6 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -313,9 +313,9 @@ idrinth.chat = { }; var messageAllowed = function ( text ) { try { - return ( idrinth.settings.get("notification#message") && text.match ( /\{[A-Z]{2}-Raid / ) === null ) || - ( idrinth.settings.get("notification#mention") && text.match ( new RegExp ( '(\s|^)' + idrinth.core.escapeRegExp ( idrinth.chat.users[idrinth.chat.self].name ) + '(\s|$)', 'i' ) ) !== null ) || - ( idrinth.settings.get("notification#raid") && text.match ( /\{[A-Z]{2}-Raid / ) !== null ); + return ( idrinth.settings.get ( "notification#message" ) && text.match ( /\{[A-Z]{2}-Raid / ) === null ) || + ( idrinth.settings.get ( "notification#mention" ) && text.match ( new RegExp ( '(\s|^)' + idrinth.core.escapeRegExp ( idrinth.chat.users[idrinth.chat.self].name ) + '(\s|$)', 'i' ) ) !== null ) || + ( idrinth.settings.get ( "notification#raid" ) && text.match ( /\{[A-Z]{2}-Raid / ) !== null ); } catch ( e ) { idrinth.core.log ( e.getMessage () ); return false; @@ -544,11 +544,11 @@ idrinth.chat = { }; return idrinth.ui.buildElement ( { id: 'idrinth-chat', - css: 'idrinth-hovering-box' + ( !idrinth.settings.get("chatHiddenOnStart") ? ' active' : '' ) + ( idrinth.settings.get("moveLeft") ? ' left-sided' : '' ), + css: 'idrinth-hovering-box' + ( !idrinth.settings.get ( "chatHiddenOnStart" ) ? ' active' : '' ) + ( idrinth.settings.get ( "moveLeft" ) ? ' left-sided' : '' ), children: [ { type: 'button', - content: ( idrinth.settings.get("chatHiddenOnStart") ? '<<' : '>>' ), + content: ( idrinth.settings.get ( "chatHiddenOnStart" ) ? '<<' : '>>' ), attributes: [ { name: 'onclick', value: 'idrinth.chat.openCloseChat(this);' @@ -706,7 +706,7 @@ idrinth.chat = { ] } ); }; - if ( !idrinth.settings.get("chatting") ) { + if ( !idrinth.settings.get ( "chatting" ) ) { return; } if ( !document.getElementById ( 'idrinth-chat' ) ) { @@ -724,8 +724,8 @@ idrinth.chat = { window.setTimeout ( idrinth.chat.login, 1 ); }, JSON.stringify ( { - user: idrinth.settings.get("chatuser"), - pass: idrinth.settings.get("chatpass") + user: idrinth.settings.get ( "chatuser" ), + pass: idrinth.settings.get ( "chatpass" ) } ) ); }, 2500 ); @@ -848,8 +848,8 @@ idrinth.chat = { } if ( data.success ) { var login = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' ); - idrinth.settings.change( "chatuser", login[0].value ); - idrinth.settings.change( "chatpass", login[1].value ); + idrinth.settings.change ( "chatuser", login[0].value ); + idrinth.settings.change ( "chatpass", login[1].value ); idrinth.ui.removeElement ( 'idrinth-chat-login' ); idrinth.chat.join ( data.data ); return; @@ -927,11 +927,11 @@ idrinth.chat = { openCloseChat: function ( element ) { var chat = element.parentNode; if ( chat.getAttribute ( 'class' ) === 'idrinth-hovering-box active' || chat.getAttribute ( 'class' ) === 'idrinth-hovering-box active left-sided' ) { - chat.setAttribute ( 'class', 'idrinth-hovering-box' + ( idrinth.settings.get("moveLeft") ? ' left-sided' : '' ) + + chat.setAttribute ( 'class', 'idrinth-hovering-box' + ( idrinth.settings.get ( "moveLeft" ) ? ' left-sided' : '' ) + ( chat.getElementsByClassName ( 'new-message' ) && chat.getElementsByClassName ( 'new-message' ).length ? ' new-message' : '' ) ); element.innerHTML = '<<'; } else { - chat.setAttribute ( 'class', 'idrinth-hovering-box active' + ( idrinth.settings.get("moveLeft") ? ' left-sided' : '' ) ); + chat.setAttribute ( 'class', 'idrinth-hovering-box active' + ( idrinth.settings.get ( "moveLeft" ) ? ' left-sided' : '' ) ); element.innerHTML = '>>'; } }, @@ -962,8 +962,8 @@ idrinth.chat = { success = function () { idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 1500 ); }; - headers.user = idrinth.settings.get("chatuser"); - headers.pass = idrinth.settings.get("chatpass"); + headers.user = idrinth.settings.get ( "chatuser" ); + headers.pass = idrinth.settings.get ( "chatpass" ); } else { chatLogin = document.getElementById ( 'idrinth-chat-login' ).getElementsByTagName ( 'input' ); headers.user = chatLogin[0].value; diff --git a/src/mods/core.js b/src/mods/core.js index fd3d8fc..55a24a0 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -7,7 +7,7 @@ idrinth.core = { }, ajax: { runHome: function ( url, success, failure, timeout, additionalHeader, isStatic ) { - var server = isStatic ? 'static' : ( idrinth.settings.get("isWorldServer") ? 'world-' : '' ) + idrinth.platform; + var server = isStatic ? 'static' : ( idrinth.settings.get ( "isWorldServer" ) ? 'world-' : '' ) + idrinth.platform; var homeUrl = 'https://dotd.idrinth.de/' + server + ( '/' + url ).replace ( /\/\//, '/' ); idrinth.core.ajax.run ( homeUrl, success, failure, timeout, additionalHeader ); }, diff --git a/src/mods/land.js b/src/mods/land.js index 1dd4b23..d121ea4 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -1,15 +1,15 @@ idrinth.land = { calculate: function () { var baseCalculator = function ( checkElementFunc ) { - var factor = idrinth.settings.get("factor") ? 10 : 1; + var factor = idrinth.settings.get ( "factor" ) ? 10 : 1; var nextPrice = function ( building ) { - return ( 10 + idrinth.settings.get("land#" + building ) ) * idrinth.land.data[building].base; + return ( 10 + idrinth.settings.get ( "land#" + building ) ) * idrinth.land.data[building].base; }; var results = { }; var applyResult = function ( results, res, factor, nextPrice ) { - idrinth.settings.change( "land#gold", idrinth.settings.get( "land#gold" ) - nextPrice( res.key ) * factor / 10 ); + idrinth.settings.change ( "land#gold", idrinth.settings.get ( "land#gold" ) - nextPrice ( res.key ) * factor / 10 ); results[res.key] = ( results[res.key] === undefined ? 0 : results[res.key] ) + factor; - idrinth.settings.change( "land#" + res.key, idrinth.settings.get( "land#" + res.key ) + factor ); + idrinth.settings.change ( "land#" + res.key, idrinth.settings.get ( "land#" + res.key ) + factor ); return results; }; var processBuildings = function ( checkElementFunc, factor, nextPrice ) { @@ -35,7 +35,7 @@ idrinth.land = { } return res; }; - while ( idrinth.settings.get( "land#gold" ) >= 0 ) { + while ( idrinth.settings.get ( "land#gold" ) >= 0 ) { var res = processBuildings ( checkElementFunc, factor, nextPrice ); if ( res.key === null ) { return results; @@ -49,10 +49,10 @@ idrinth.land = { return res.min === null || nextPrice ( building ) / idrinth.land.data[building].perHour < res.min; }; var useUp = function ( building, factor, res, nextPrice ) { - return nextPrice( building ) * factor / 10 <= idrinth.settings.get( "land#gold" ); + return nextPrice ( building ) * factor / 10 <= idrinth.settings.get ( "land#gold" ); }; var funcs = [ useUp ]; - if ( idrinth.settings.get("landMax") ) { + if ( idrinth.settings.get ( "landMax" ) ) { funcs.push ( bestPrice ); } return funcs; @@ -60,14 +60,14 @@ idrinth.land = { var putResults = function ( results ) { for (var key in results) { if ( results.hasOwnProperty ( key ) ) { - document.getElementById ( 'idrinth-land-' + key ).value = idrinth.settings.get("land#"+key); + document.getElementById ( 'idrinth-land-' + key ).value = idrinth.settings.get ( "land#" + key ); document.getElementById ( 'idrinth-land-' + key ).parentNode.nextSibling.innerHTML = '+' + results[key]; } } - document.getElementById( 'idrinth-land-gold' ).value = idrinth.settings.get( "land#gold" ); + document.getElementById ( 'idrinth-land-gold' ).value = idrinth.settings.get ( "land#gold" ); }; - for (var key in idrinth.settings.get("land#")) { - if ( idrinth.settings.get("land#"+hasOwnProperty ( key )) ) { + for (var key in idrinth.settings.get ( "land#" )) { + if ( idrinth.settings.get ( "land#" + hasOwnProperty ( key ) ) ) { idrinth.settings.change ( 'land#' + key, parseInt ( document.getElementById ( 'idrinth-land-' + key ).value, 10 ) ); } } diff --git a/src/mods/raids.js b/src/mods/raids.js index 179def7..7cfa4c0 100644 --- a/src/mods/raids.js +++ b/src/mods/raids.js @@ -80,7 +80,7 @@ idrinth.raids = { tag + 'raid_id=' + data.raidId + '&' + tag + 'difficulty=' + data.difficulty + '&' + tag + 'hash=' + data.hash + - ( idrinth.settings.get("isWorldServer") ? '&' + tag + 'serverid=' + 2 : '' ); + ( idrinth.settings.get ( "isWorldServer" ) ? '&' + tag + 'serverid=' + 2 : '' ); } catch ( e1 ) { return false; } @@ -208,7 +208,7 @@ idrinth.raids = { var byFrame = function ( key ) { 'use strict'; var exist = document.getElementsByClassName ( 'idrinth-join-frame' ).length; - if ( exist >= idrinth.settings.get("windows") ) { + if ( exist >= idrinth.settings.get ( "windows" ) ) { idrinth.raids.list[key].joined = false; return; } @@ -281,14 +281,14 @@ idrinth.raids = { return options; }; var reachedMax = function ( amount ) { - return amount > 99 || ( ( idrinth.platform === 'facebook' || idrinth.platform === 'dawnofthedragons' ) && amount >= idrinth.settings.get("windows") ); + return amount > 99 || ( ( idrinth.platform === 'facebook' || idrinth.platform === 'dawnofthedragons' ) && amount >= idrinth.settings.get ( "windows" ) ); }; var handleKey = function ( added, key, options ) { var raid = idrinth.raids.list[key]; if ( !raid.joined ) { added++; options[0] ( key );//post link - if ( !idrinth.settings.get("bannedRaids#"+raid.raid) ) { + if ( !idrinth.settings.get ( "bannedRaids#" + raid.raid ) ) { for (var count = 1; count < options.length; count++) { options[count] ( key ); } @@ -310,7 +310,7 @@ idrinth.raids = { }; if ( !join ( ) && Date.now ( ) - 60000 > idrinth.raids.requested ) { idrinth.raids.requested = Date.now ( ); - idrinth.raids.import ( idrinth.settings.get("raids") ? idrinth.settings.get("favs") : '-1' ); + idrinth.raids.import ( idrinth.settings.get ( "raids" ) ? idrinth.settings.get ( "favs" ) : '-1' ); } } }, diff --git a/src/mods/text.js b/src/mods/text.js index fd44a41..ab20894 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -10,7 +10,7 @@ idrinth.text = { * @returns {undefined} */ start: function ( ) { - var language = idrinth.settings.get("language") || window.navigator.userLanguage || window.navigator.language; + var language = idrinth.settings.get ( "language" ) || window.navigator.userLanguage || window.navigator.language; if ( language === 'en' ) { idrinth.text.initialized = true; return; diff --git a/src/mods/tier.js b/src/mods/tier.js index 8aba259..e02a65e 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -94,8 +94,8 @@ idrinth.tier = { if ( data ) { idrinth.tier.list = data; for (var key in data) { - if ( data[key].name && idrinth.settings.get( "bannedRaids#" + data[key].name ) === undefined ) { - idrinth.settings.change( "bannedRaids#" + data[key].name, false); + if ( data[key].name && idrinth.settings.get ( "bannedRaids#" + data[key].name ) === undefined ) { + idrinth.settings.change ( "bannedRaids#" + data[key].name, false ); document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { name: 'bannedRaids#' + data[key].name, rType: '#input', diff --git a/src/mods/ui.js b/src/mods/ui.js index 555a195..6fa20b5 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -277,7 +277,7 @@ idrinth.ui = { } idrinth.names.isHovering = false; var name = idrinth.names.parse ( element ).toLowerCase ( ); - if ( idrinth.settings.get("names") && idrinth.ui.tooltip && idrinth.names.users[name] ) { + if ( idrinth.settings.get ( "names" ) && idrinth.ui.tooltip && idrinth.names.users[name] ) { window.clearTimeout ( idrinth.ui.tooltipTO ); idrinth.ui.tooltip.setAttribute ( 'style', idrinth.ui.getElementPositioning ( element, -200, -100 ) ); tooltip ( idrinth.names.users[name].kongregate, idrinth.ui.tooltip.firstChild, false ); @@ -294,7 +294,7 @@ idrinth.ui = { } }, setTooltipTimeout: function () { - idrinth.ui.tooltipTO = window.setTimeout ( idrinth.ui.hideTooltip, idrinth.settings.get("timeout") ? idrinth.settings.get("timeout") : 5000 ); + idrinth.ui.tooltipTO = window.setTimeout ( idrinth.ui.hideTooltip, idrinth.settings.get ( "timeout" ) ? idrinth.settings.get ( "timeout" ) : 5000 ); }, hideTooltip: function () { if ( idrinth.names.isHovering ) { @@ -305,10 +305,10 @@ idrinth.ui = { openCloseSettings: function ( ) { 'use strict'; var toRemove = [ ( idrinth.ui.controls.getAttribute ( 'class' ) ).match ( /(^|\s)inactive($|\s)/ ) ? 'inactive' : 'active' ]; - if ( !idrinth.settings.get("moveLeft") ) { + if ( !idrinth.settings.get ( "moveLeft" ) ) { toRemove.push ( 'left-sided' ); } - if ( !idrinth.settings.get("minimalist") ) { + if ( !idrinth.settings.get ( "minimalist" ) ) { toRemove.push ( 'small' ); } idrinth.ui.updateClassesList ( idrinth.ui.controls, [ 'active', 'inactive', 'left-sided', 'small' ], toRemove ); @@ -421,7 +421,7 @@ idrinth.ui = { buttonMaker ( idrinth.text.get ( "raids.imports.restart" ), 'idrinth.raids.restartInterval();' ), buttonMaker ( idrinth.text.get ( "button.refreshFBGameLogin" ), 'idrinth.facebook.rejoin()', 'facebook' ), buttonMaker ( idrinth.text.get ( "button.ngRaidJoin" ), 'idrinth.newgrounds.joinRaids()', 'newgrounds' ), - buttonMaker ( idrinth.settings.get("alarmActive") ? idrinth.text.get ( "button.disableTimedAutoJoin" ) : idrinth.text.get ( "button.enableTimedAutoJoin" ), + buttonMaker ( idrinth.settings.get ( "alarmActive" ) ? idrinth.text.get ( "button.disableTimedAutoJoin" ) : idrinth.text.get ( "button.enableTimedAutoJoin" ), 'idrinth.settings.change(\'alarmActive\',!idrinth.settings.get("alarmActive"));this.innerHTML=idrinth.settings.get("alarmActive") ? idrinth.text.get ( "button.disableTimedAutoJoin" ):"button.enableTimedAutoJoin"', 'newgrounds' ) ] }, { @@ -594,7 +594,7 @@ idrinth.ui = { attributes: [ { name: 'value', - value: idrinth.settings.get("land#"+label.toLowerCase ()) + value: idrinth.settings.get ( "land#" + label.toLowerCase () ) }, { name: 'type', @@ -650,7 +650,7 @@ idrinth.ui = { attributes: [ { name: 'value', - value: idrinth.settings.get("land#gold") + value: idrinth.settings.get ( "land#gold" ) }, { name: 'type', @@ -781,7 +781,7 @@ idrinth.ui = { } ] } ); idrinth.ui.controls = idrinth.ui.buildElement ( { - css: 'idrinth-hovering-box idrinth-controls-overwrite inactive' + ( idrinth.settings.get("moveLeft") ? ' left-sided' : '' ) + ( idrinth.settings.get("minimalist") ? ' small' : '' ), + css: 'idrinth-hovering-box idrinth-controls-overwrite inactive' + ( idrinth.settings.get ( "moveLeft" ) ? ' left-sided' : '' ) + ( idrinth.settings.get ( "minimalist" ) ? ' small' : '' ), id: 'idrinth-controls', children: children } ); diff --git a/src/mods/war.js b/src/mods/war.js index af4cb41..3e9c0cc 100644 --- a/src/mods/war.js +++ b/src/mods/war.js @@ -43,7 +43,7 @@ idrinth.war = { if ( toggle === true ) { removeClasses.push ( 'idrinth-hide' ); addClasses.push ( "bottom" ); - if ( !idrinth.settings.get("warBottom") ) { + if ( !idrinth.settings.get ( "warBottom" ) ) { removeClasses.push ( "bottom" ); } } else { diff --git a/src/stable.js b/src/stable.js index 0cf34db..bd1c1ec 100644 --- a/src/stable.js +++ b/src/stable.js @@ -41,7 +41,7 @@ var idrinth = { }, alarmCheck: function () { var now = new Date (); - if ( idrinth.settings.get("alarmActive") && now.getHours () + ':' + now.getMinutes () === idrinth.settings.get("alarmTime") ) { + if ( idrinth.settings.get ( "alarmActive" ) && now.getHours () + ':' + now.getMinutes () === idrinth.settings.get ( "alarmTime" ) ) { window.setTimeout ( idrinth.newgrounds.joinRaids, 1 ); } window.setTimeout ( idrinth.newgrounds.alarmCheck, 60000 ); @@ -85,7 +85,7 @@ var idrinth = { idrinth.raids.join.messages.trying ( key ); idrinth.newgrounds.join (); }, - idrinth.settings.get("newgroundLoad") * 1000 ); + idrinth.settings.get ( "newgroundLoad" ) * 1000 ); } }, clearTimeout: function ( timeout ) { diff --git a/tiers/Al-Azab [Al-Azab].json b/tiers/Al-Azab [Al-Azab].json index 38399f7..6a1e8af 100644 --- a/tiers/Al-Azab [Al-Azab].json +++ b/tiers/Al-Azab [Al-Azab].json @@ -1,38 +1,38 @@ { - "normal":{ - "110000":1, - "495000":1, - "825000":1, - "1210000":2, - "1760000":2.5, - "3575000":3, - "4950000":3.5 + "normal": { + "110000": 1, + "495000": 1, + "825000": 1, + "1210000": 2, + "1760000": 2.5, + "3575000": 3, + "4950000": 3.5 }, - "hard":{ - "138000":1, - "619000":1, - "1031000":1, - "1513000":2, - "2200000":2.5, - "4469000":3, - "6188000":3.5 + "hard": { + "138000": 1, + "619000": 1, + "1031000": 1, + "1513000": 2, + "2200000": 2.5, + "4469000": 3, + "6188000": 3.5 }, - "legendary":{ - "176000":1, - "792000":1, - "1320000":1, - "1936000":2, - "2816000":2.5, - "5720000":3, - "7920000":3.5 + "legendary": { + "176000": 1, + "792000": 1, + "1320000": 1, + "1936000": 2, + "2816000": 2.5, + "5720000": 3, + "7920000": 3.5 }, - "nightmare":{ - "220000":1, - "990000":1, - "1650000":1, - "2420000":2, - "3520000":2.5, - "7150000":3, - "9900000":3.5 + "nightmare": { + "220000": 1, + "990000": 1, + "1650000": 1, + "2420000": 2, + "3520000": 2.5, + "7150000": 3, + "9900000": 3.5 } } diff --git a/tiers/Arachna [Arachna].json b/tiers/Arachna [Arachna].json index 3314b31..08b8107 100644 --- a/tiers/Arachna [Arachna].json +++ b/tiers/Arachna [Arachna].json @@ -1,38 +1,38 @@ { - "normal":{ - "55000":1, - "308000":1, - "418000":1, - "902000":2, - "1375000":2.5, - "2970000":3, - "3740000":3.5 + "normal": { + "55000": 1, + "308000": 1, + "418000": 1, + "902000": 2, + "1375000": 2.5, + "2970000": 3, + "3740000": 3.5 }, - "hard":{ - "69000":1, - "385000":1, - "523000":1, - "1128000":2, - "1719000":2.5, - "3713000":3, - "4675000":3.5 + "hard": { + "69000": 1, + "385000": 1, + "523000": 1, + "1128000": 2, + "1719000": 2.5, + "3713000": 3, + "4675000": 3.5 }, - "legendary":{ - "88000":1, - "493000":1, - "669000":1, - "1443000":2, - "2200000":2.5, - "4752000":3, - "5984000":3.5 + "legendary": { + "88000": 1, + "493000": 1, + "669000": 1, + "1443000": 2, + "2200000": 2.5, + "4752000": 3, + "5984000": 3.5 }, - "nightmare":{ - "110000":1, - "616000":1, - "836000":1, - "1804000":2, - "2750000":2.5, - "5840000":3, - "7480000":3.5 + "nightmare": { + "110000": 1, + "616000": 1, + "836000": 1, + "1804000": 2, + "2750000": 2.5, + "5840000": 3, + "7480000": 3.5 } } diff --git a/tiers/Celeano [Celeano].json b/tiers/Celeano [Celeano].json index 14b183d..14ff291 100644 --- a/tiers/Celeano [Celeano].json +++ b/tiers/Celeano [Celeano].json @@ -1,38 +1,38 @@ { - "normal":{ - "158000":1, - "180000":1, - "270000":1, - "360000":2, - "480000":2.5, - "750000":3, - "1050000":3.5 + "normal": { + "158000": 1, + "180000": 1, + "270000": 1, + "360000": 2, + "480000": 2.5, + "750000": 3, + "1050000": 3.5 }, - "hard":{ - "197000":1, - "225000":1, - "338000":1, - "450000":2, - "600000":2.5, - "938000":3, - "1313000":3.5 + "hard": { + "197000": 1, + "225000": 1, + "338000": 1, + "450000": 2, + "600000": 2.5, + "938000": 3, + "1313000": 3.5 }, - "legendary":{ - "252000":1, - "288000":1, - "432000":1, - "576000":2, - "768000":2.5, - "1200000":3, - "1680000":3.5 + "legendary": { + "252000": 1, + "288000": 1, + "432000": 1, + "576000": 2, + "768000": 2.5, + "1200000": 3, + "1680000": 3.5 }, - "nightmare":{ - "315000":1, - "360000":1, - "540000":1, - "720000":2, - "960000":2.5, - "1500000":3, - "2100000":3.5 + "nightmare": { + "315000": 1, + "360000": 1, + "540000": 1, + "720000": 2, + "960000": 2.5, + "1500000": 3, + "2100000": 3.5 } } diff --git a/tiers/Fog Of Wars [Zugen].json b/tiers/Fog Of Wars [Zugen].json index edc7ea3..fc74ead 100644 --- a/tiers/Fog Of Wars [Zugen].json +++ b/tiers/Fog Of Wars [Zugen].json @@ -1,5 +1,5 @@ { - "nightmare": { + "nightmare": { "120000000": 48, "180000000": 52, "225000000": 56, diff --git a/tiers/Soul Collector [Collector].json b/tiers/Soul Collector [Collector].json index f8fa288..17b98f8 100644 --- a/tiers/Soul Collector [Collector].json +++ b/tiers/Soul Collector [Collector].json @@ -13,7 +13,7 @@ "15000000000": 725, "20000000000": 860, "25000000000": 910, - "30000000000": 1010 + "30000000000": 1010, "40000000000": 1100 } } From c1958f4b0f58aad2b3e9f8042120bc05c1fac699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 11 Oct 2016 23:26:16 +0200 Subject: [PATCH 164/341] splitting condition to make sure not joinig raids might work --- src/mods/tier.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index e02a65e..00e7a12 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -94,8 +94,10 @@ idrinth.tier = { if ( data ) { idrinth.tier.list = data; for (var key in data) { - if ( data[key].name && idrinth.settings.get ( "bannedRaids#" + data[key].name ) === undefined ) { - idrinth.settings.change ( "bannedRaids#" + data[key].name, false ); + if ( data[key].name ) { + if ( idrinth.settings.get ( "bannedRaids#" + data[key].name ) === undefined ) { + idrinth.settings.change ( "bannedRaids#" + data[key].name, false ); + } document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { name: 'bannedRaids#' + data[key].name, rType: '#input', From 5416dfa052e85eb2173f0145a1a447f15ab0208f Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Wed, 12 Oct 2016 17:44:09 +0300 Subject: [PATCH 165/341] Create Fog Of Wars [Verkiteia].json --- tiers/Fog Of Wars [Verkiteia].json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 tiers/Fog Of Wars [Verkiteia].json diff --git a/tiers/Fog Of Wars [Verkiteia].json b/tiers/Fog Of Wars [Verkiteia].json new file mode 100644 index 0000000..bbd6178 --- /dev/null +++ b/tiers/Fog Of Wars [Verkiteia].json @@ -0,0 +1,14 @@ +{ +"nightmare":{ + "100000":22, + "175000":68, + "250000":84, + "300000":98, + "375000":110, + "450000":122, + "525000":136, + "600000":154, + "900000":168, + "1500000":216 + } +} From 48d9392540171256d9ff8fd9781964e0d940b5d4 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Wed, 12 Oct 2016 17:51:05 +0300 Subject: [PATCH 166/341] Create Fog Of Wars [Cannibals].json --- tiers/Fog Of Wars [Cannibals].json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 tiers/Fog Of Wars [Cannibals].json diff --git a/tiers/Fog Of Wars [Cannibals].json b/tiers/Fog Of Wars [Cannibals].json new file mode 100644 index 0000000..fa24a91 --- /dev/null +++ b/tiers/Fog Of Wars [Cannibals].json @@ -0,0 +1,15 @@ +{ +"nightmare":{ + "250000":62, + "300000":86, + "375000":96, + "480000":110, + "580000":132, + "660000":154, + "900000":168, + "1500000":204, + "2000000":244, + "2800000":316, + "3500000":436 + } +} From 0a2799f3a6b24e2be971eac971bd81da0e52620f Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Wed, 12 Oct 2016 18:11:44 +0300 Subject: [PATCH 167/341] Create Adastros of the Kavala [Adrastos].json --- tiers/Adastros of the Kavala [Adrastos].json | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 tiers/Adastros of the Kavala [Adrastos].json diff --git a/tiers/Adastros of the Kavala [Adrastos].json b/tiers/Adastros of the Kavala [Adrastos].json new file mode 100644 index 0000000..7aff583 --- /dev/null +++ b/tiers/Adastros of the Kavala [Adrastos].json @@ -0,0 +1,30 @@ +{ +"nightmare":{ + "8000":10, + "16500":15, + "25500":20, + "35000":25, + "45000":30, + "55500":35, + "66500":40, + "78000":45, + "90000":50, + "102500":55, + "115500":60, + "129000":65, + "143000":70, + "157500":75, + "172500":80, + "188000":85, + "204000":90, + "220500":95, + "237500":100, + "255500":105, + "273500":110, + "291500":115, + "310500":120, + "330000":125, + "350000":130, + "1000000":150 + } +} From 50cbc38dbfa13a504183d0746c335b985319f897 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 13 Oct 2016 12:55:54 +0300 Subject: [PATCH 168/341] Create AP Minizone Raid [Darkness].json --- tiers/AP Minizone Raid [Darkness].json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 tiers/AP Minizone Raid [Darkness].json diff --git a/tiers/AP Minizone Raid [Darkness].json b/tiers/AP Minizone Raid [Darkness].json new file mode 100644 index 0000000..ec102fe --- /dev/null +++ b/tiers/AP Minizone Raid [Darkness].json @@ -0,0 +1,15 @@ +{ + "nightmare":{ + "100000":11, + "250000":26, + "500000":53, + "750000":83, + "1000000":114, + "1500000":175, + "2000000":236, + "2500000":298, + "3000000":358, + "4000000":448, + "5000000":508 + } +} From 3c29fea21209591b22ea24301c207ff05bbef683 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 13 Oct 2016 13:07:20 +0300 Subject: [PATCH 169/341] Create Prince Obyron [Obyron].json --- tiers/Prince Obyron [Obyron].json | 38 +++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Prince Obyron [Obyron].json diff --git a/tiers/Prince Obyron [Obyron].json b/tiers/Prince Obyron [Obyron].json new file mode 100644 index 0000000..83c8705 --- /dev/null +++ b/tiers/Prince Obyron [Obyron].json @@ -0,0 +1,38 @@ +{ + "normal":{ + "1575000":1, + "1800000":1, + "2700000":1, + "3600000":2, + "4800000":2.5, + "7500000":3, + "10500000":3.5 + }, + "hard":{ + "1969000":1, + "2250000":1, + "3375000":1, + "4500000":2, + "6000000":2.5, + "9375000":3, + "13125000":3.5 + }, + "legendary":{ + "2520000":1, + "2880000":1, + "4320000":1, + "5760000":2, + "7680000":2.5, + "12000000":3, + "16800000":3.5 + }, + "nightmare":{ + "3150000":1, + "3600000":1, + "5400000":1, + "7200000":2, + "9600000":2.5, + "15000000":3, + "21000000":3.5 + } +} From a93a8db7d2e5a76a8e3e1c5b99b8a27d2d3dcc5f Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 13 Oct 2016 13:17:50 +0300 Subject: [PATCH 170/341] Create Rhalmarius the Despoiler [Rhalmarius].json --- tiers/Rhalmarius the Despoiler [Rhalmarius].json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 tiers/Rhalmarius the Despoiler [Rhalmarius].json diff --git a/tiers/Rhalmarius the Despoiler [Rhalmarius].json b/tiers/Rhalmarius the Despoiler [Rhalmarius].json new file mode 100644 index 0000000..be53de3 --- /dev/null +++ b/tiers/Rhalmarius the Despoiler [Rhalmarius].json @@ -0,0 +1,14 @@ +{ + "normal":{ + "5000000":30 + }, + "hard":{ + "12500000":30 + }, + "legendary":{ + "31250000":30 + }, + "nightmare":{ + "39060000":30 + } +} From 5d22244c64ef85f056ec726004fd3ca2a93d23ff Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 13 Oct 2016 13:40:28 +0300 Subject: [PATCH 171/341] Create Grundus [Grundus].json --- tiers/Grundus [Grundus].json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 tiers/Grundus [Grundus].json diff --git a/tiers/Grundus [Grundus].json b/tiers/Grundus [Grundus].json new file mode 100644 index 0000000..5467f2a --- /dev/null +++ b/tiers/Grundus [Grundus].json @@ -0,0 +1,14 @@ +{ + "normal":{ + "8000000":34 + }, + "hard":{ + "16000000":34 + }, + "legendary":{ + "40000000":34 + }, + "nightmare":{ + "60000000":34 + } +} From ce595e0e2edfe1e54ee199a4a65a40dc48180c6f Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 13 Oct 2016 13:54:24 +0300 Subject: [PATCH 172/341] Create Felendis and Shaoquin [Banhammer Bros].json --- ...elendis and Shaoquin [Banhammer Bros].json | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Felendis and Shaoquin [Banhammer Bros].json diff --git a/tiers/Felendis and Shaoquin [Banhammer Bros].json b/tiers/Felendis and Shaoquin [Banhammer Bros].json new file mode 100644 index 0000000..c1a8a32 --- /dev/null +++ b/tiers/Felendis and Shaoquin [Banhammer Bros].json @@ -0,0 +1,38 @@ +{ + "normal":{ + "884000":1, + "3976000":1, + "6627000":1, + "9720000":2, + "14138000":2.5, + "28179000":3, + "39764000":3.5 + }, + "hard":{ + "1098000":1, + "4943000":1, + "8239000":1, + "12083000":2, + "17576000":2.5, + "35700000":3, + "49431000":3.5 + }, + "legendary":{ + "1416000":1, + "6371000":1, + "10618000":1, + "15573000":2, + "22651000":2.5, + "46010000":3, + "63706000":3.5 + }, + "nightmare":{ + "1776000":1, + "7992000":1, + "13320000":1, + "19536000":2, + "28416000":2.5, + "57720000":3, + "79921000":3.5 + } +} From d2e9da24f878607c80f0c7bb1764a27945971e9b Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 13 Oct 2016 14:00:10 +0300 Subject: [PATCH 173/341] Create Groblar [Groblar].json --- tiers/Groblar [Groblar].json | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Groblar [Groblar].json diff --git a/tiers/Groblar [Groblar].json b/tiers/Groblar [Groblar].json new file mode 100644 index 0000000..e5bee04 --- /dev/null +++ b/tiers/Groblar [Groblar].json @@ -0,0 +1,38 @@ +{ + "normal":{ + "315000":1, + "360000":1, + "540000":1, + "720000":2, + "960000":2.5, + "1500000":3, + "2100000":3.5 + }, + "hard":{ + "394000":1, + "450000":1, + "675000":1, + "900000":2, + "1200000":2.5, + "1875000":3, + "2625000":3.5 + }, + "legendary":{ + "504000":1, + "576000":1, + "864000":1, + "1152000":2, + "1536000":2.5, + "2400000":3, + "3360000":3.5 + }, + "nightmare":{ + "630000":1, + "720000":1, + "1080000":1, + "1440000":2, + "1920000":2.5, + "3000000":3, + "4200000":3.5 + } +} From 40d77ee416a7b31f485b9a41866d7e3d7cfe22b8 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 13 Oct 2016 14:04:40 +0300 Subject: [PATCH 174/341] Create Deathglare [Deathglare].json --- tiers/Deathglare [Deathglare].json | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Deathglare [Deathglare].json diff --git a/tiers/Deathglare [Deathglare].json b/tiers/Deathglare [Deathglare].json new file mode 100644 index 0000000..142f654 --- /dev/null +++ b/tiers/Deathglare [Deathglare].json @@ -0,0 +1,38 @@ +{ + "normal":{ + "113000":1, + "630000":1, + "855000":1, + "1845000":2, + "2813000":2.5, + "6075000":3, + "7650000":3.5 + }, + "hard":{ + "141000":1, + "788000":1, + "1069000":1, + "2306000":2, + "3516000":2.5, + "7594000":3, + "9563000":3.5 + }, + "legendary":{ + "180000":1, + "1008000":1, + "1368000":1, + "2952000":2, + "4500000":2.5, + "9720000":3, + "12240000":3.5 + }, + "nightmare":{ + "225000":1, + "1260000":1, + "1710000":1, + "3690000":2, + "5625000":2.5, + "12150000":3, + "15300000":3.5 + } +} From 9072815655c4a6691fc027a5ad6f6185ac6c57d0 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 13 Oct 2016 14:18:03 +0300 Subject: [PATCH 175/341] Create Ragetalon [Ragetalon].json --- tiers/Ragetalon [Ragetalon].json | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Ragetalon [Ragetalon].json diff --git a/tiers/Ragetalon [Ragetalon].json b/tiers/Ragetalon [Ragetalon].json new file mode 100644 index 0000000..0c97b30 --- /dev/null +++ b/tiers/Ragetalon [Ragetalon].json @@ -0,0 +1,38 @@ +{ + "normal":{ + "220000":1, + "990000":1, + "1650000":1, + "2420000":2, + "3520000":2.5, + "7150000":3, + "9900000":3.5 + }, + "hard":{ + "275000":1, + "1238000":1, + "2063000":1, + "3025000":2, + "4400000":2.5, + "8938000":3, + "12375000":3.5 + }, + "legendary":{ + "352000":1, + "1584000":1, + "2640000":1, + "3872000":2, + "5632000":2.5, + "11440000":3, + "15840000":3.5 + }, + "nightmare":{ + "440000":1, + "1980000":1, + "3300000":1, + "4840000":2, + "7040000":2.5, + "14300000":3, + "19800000":3.5 + } +} From ce01c9a8662ffd7f2f83dc7cba5651845a448c68 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 13 Oct 2016 14:45:50 +0300 Subject: [PATCH 176/341] Create Gladiators [Gladiators].json --- tiers/Gladiators [Gladiators].json | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Gladiators [Gladiators].json diff --git a/tiers/Gladiators [Gladiators].json b/tiers/Gladiators [Gladiators].json new file mode 100644 index 0000000..8b2fa46 --- /dev/null +++ b/tiers/Gladiators [Gladiators].json @@ -0,0 +1,38 @@ +{ + "normal":{ + "630000":1, + "720000":1, + "1080000":1, + "1440000":2, + "1920000":2.5, + "3000000":3, + "4200000":3.5 + }, + "hard":{ + "788000":1, + "900000":1, + "1350000":1, + "1800000":2, + "2400000":2.5, + "3750000":3, + "5250000":3.5 + }, + "legendary":{ + "1008000":1, + "1152000":1, + "1728000":1, + "2304000":2, + "3072000":2.5, + "4800000":3, + "6720000":3.5 + }, + "nightmare":{ + "1260000":1, + "1440000":1, + "2160000":1, + "2880000":2, + "3840000":2.5, + "6000000":3, + "8400000":3.5 + } +} From 4b6f9fe59444c561d386db5a3a130d1cfc5568a0 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 13 Oct 2016 14:52:25 +0300 Subject: [PATCH 177/341] Create Tetrarchos [Tetrarchos].json --- tiers/Tetrarchos [Tetrarchos].json | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Tetrarchos [Tetrarchos].json diff --git a/tiers/Tetrarchos [Tetrarchos].json b/tiers/Tetrarchos [Tetrarchos].json new file mode 100644 index 0000000..3aecbba --- /dev/null +++ b/tiers/Tetrarchos [Tetrarchos].json @@ -0,0 +1,38 @@ +{ + "normal":{ + "225000":1, + "1260000":1, + "1710000":1, + "3690000":2, + "5625000":2.5, + "12150000":3, + "15300000":3.5 + }, + "hard":{ + "281000":1, + "1575000":1, + "2138000":1, + "4613000":2, + "7031000":2.5, + "15188000":3, + "19125000":3.5 + }, + "legendary":{ + "285000":1, + "1596000":1, + "2166000":1, + "4674000":2, + "7125000":2.5, + "15390000":3, + "19380000":3.5 + }, + "nightmare":{ + "450000":1, + "2520000":1, + "3420000":1, + "7380000":2, + "11250000":2.5, + "24300000":3, + "30600000":3.5 + } +} From e43fe21f5bddf305d84b4dffc31b11e063c95fd8 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 13 Oct 2016 15:12:07 +0300 Subject: [PATCH 178/341] Create Scuttlegore [Scuttlegore].json --- tiers/Scuttlegore [Scuttlegore].json | 38 ++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Scuttlegore [Scuttlegore].json diff --git a/tiers/Scuttlegore [Scuttlegore].json b/tiers/Scuttlegore [Scuttlegore].json new file mode 100644 index 0000000..a61f90d --- /dev/null +++ b/tiers/Scuttlegore [Scuttlegore].json @@ -0,0 +1,38 @@ +{ + "normal":{ + "440000":1, + "1980000":1, + "3300000":1, + "4840000":2, + "7040000":2.5, + "14300000":3, + "19800000":3.5 + }, + "hard":{ + "550000":1, + "2475000":1, + "4125000":1, + "6050000":2, + "8800000":2.5, + "17875000":3, + "24750000":3.5 + }, + "legendary":{ + "704000":1, + "3168000":1, + "5280000":1, + "7744000":2, + "11264000":2.5, + "22880000":3, + "31680000":3.5 + }, + "nightmare":{ + "880000":1, + "3960000":1, + "6600000":1, + "9680000":2, + "14080000":2.5, + "28600000":3, + "39600000":3.5 + } +} From a09155f4f03d497eba398325c9cfda54eadf8b23 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 13 Oct 2016 15:15:40 +0300 Subject: [PATCH 179/341] Create Tithrasia [Tithrasia].json --- tiers/Tithrasia [Tithrasia].json | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Tithrasia [Tithrasia].json diff --git a/tiers/Tithrasia [Tithrasia].json b/tiers/Tithrasia [Tithrasia].json new file mode 100644 index 0000000..86dd332 --- /dev/null +++ b/tiers/Tithrasia [Tithrasia].json @@ -0,0 +1,38 @@ +{ + "normal":{ + "945000":1, + "1080000":1, + "1620000":1, + "2160000":2, + "2880000":2.5, + "4500000":3, + "6300000":3.5 + }, + "hard":{ + "1181000":1, + "1350000":1, + "2025000":1, + "2700000":2, + "3600000":2.5, + "5625000":3, + "7875000":3.5 + }, + "legendary":{ + "1512000":1, + "1728000":1, + "2592000":1, + "3456000":2, + "4608000":2.5, + "72000000":3, + "10080000":3.5 + }, + "nightmare":{ + "1890000":1, + "2160000":1, + "3240000":1, + "4320000":2, + "5760000":2.5, + "9000000":3, + "12600000":3.5 + } +} From ea35fb7da07aa034aa5b136890566bd6c20760a6 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 13 Oct 2016 15:39:35 +0300 Subject: [PATCH 180/341] Create The Black Moon Pack [Black Moon].json --- tiers/The Black Moon Pack [Black Moon].json | 38 +++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/The Black Moon Pack [Black Moon].json diff --git a/tiers/The Black Moon Pack [Black Moon].json b/tiers/The Black Moon Pack [Black Moon].json new file mode 100644 index 0000000..1669ec2 --- /dev/null +++ b/tiers/The Black Moon Pack [Black Moon].json @@ -0,0 +1,38 @@ +{ + "normal":{ + "338000":1, + "1890000":1, + "2565000":1, + "5535000":2, + "8438000":2.5, + "18225000":3, + "22950000":3.5 + }, + "hard":{ + "422000":1, + "2363000":1, + "3206000":1, + "6919000":2, + "10547000":2.5, + "22781000":3, + "28688000":3.5 + }, + "legendary":{ + "540000":1, + "3024000":1, + "4104000":1, + "8856000":2, + "13500000":2.5, + "29160000":3, + "36720000":3.5 + }, + "nightmare":{ + "675000":1, + "3780000":1, + "5130000":1, + "11070000":2, + "16875000":2.5, + "36450000":3, + "45900000":3.5 + } +} From 1f9ae7c1a71f0a2531422d8120e117609540a42d Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 13 Oct 2016 15:43:17 +0300 Subject: [PATCH 181/341] Create Varlachleth [Varlachleth].json --- tiers/Varlachleth [Varlachleth].json | 38 ++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Varlachleth [Varlachleth].json diff --git a/tiers/Varlachleth [Varlachleth].json b/tiers/Varlachleth [Varlachleth].json new file mode 100644 index 0000000..155c005 --- /dev/null +++ b/tiers/Varlachleth [Varlachleth].json @@ -0,0 +1,38 @@ +{ + "normal":{ + "660000":1, + "2970000":1, + "4950000":1, + "7260000":2, + "10560000":2.5, + "21450000":3, + "29700000":3.5 + }, + "hard":{ + "825000":1, + "3713000":1, + "6188000":1, + "9075000":2, + "13200000":2.5, + "26813000":3, + "37125000":3.5 + }, + "legendary":{ + "1056000":1, + "4752000":1, + "7920000":1, + "11616000":2, + "16896000":2.5, + "34320000":3, + "47520000":3.5 + }, + "nightmare":{ + "1320000":1, + "5940000":1, + "9900000":1, + "14520000":2, + "21120000":2.5, + "42900000":3, + "59400000":3.5 + } +} From eeef5ed5974bed18a79cd4dbe1a83bb7ea29d8f7 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Fri, 14 Oct 2016 17:03:18 +0300 Subject: [PATCH 182/341] Update AP Minizone Raid [Darkness].json --- tiers/AP Minizone Raid [Darkness].json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tiers/AP Minizone Raid [Darkness].json b/tiers/AP Minizone Raid [Darkness].json index ec102fe..b8aff10 100644 --- a/tiers/AP Minizone Raid [Darkness].json +++ b/tiers/AP Minizone Raid [Darkness].json @@ -1,15 +1,15 @@ { "nightmare":{ - "100000":11, - "250000":26, - "500000":53, - "750000":83, - "1000000":114, - "1500000":175, - "2000000":236, - "2500000":298, - "3000000":358, - "4000000":448, - "5000000":508 + "200000000":11, + "300000000":26, + "500000000":53, + "750000000":83, + "1000000000":114, + "1500000000":175, + "2000000000":236, + "2500000000":298, + "3000000000":358, + "4000000000":448, + "5000000000":508 } } From 947f49307964a88008de04feca9d5978f436ea96 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Fri, 14 Oct 2016 17:36:24 +0300 Subject: [PATCH 183/341] Create Lunatics [Lunatics].json --- tiers/Lunatics [Lunatics].json | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Lunatics [Lunatics].json diff --git a/tiers/Lunatics [Lunatics].json b/tiers/Lunatics [Lunatics].json new file mode 100644 index 0000000..087bf62 --- /dev/null +++ b/tiers/Lunatics [Lunatics].json @@ -0,0 +1,38 @@ +{ + "normal":{ + "450000":1, + "2520000":1, + "3420000":1, + "7380000":2, + "11250000":2.5, + "24300000":3, + "30600000":3.5 + }, + "hard":{ + "563000":1, + "3150000":1, + "4275000":1, + "9225000":2, + "14063000":2.5, + "30375000":3, + "38250000":3.5 + }, + "legendary":{ + "720000":1, + "4032000":1, + "5472000":1, + "11808000":2, + "18000000":2.5, + "38880000":3, + "48960000":3.5 + }, + "nightmare":{ + "900000":1, + "5040000":1, + "6840000":1, + "14760000":2, + "22500000":2.5, + "48600000":3, + "61200000":3.5 + } +} From bf5bd62db09fa98da8e167ef46214ef6d4ee0741 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Fri, 14 Oct 2016 17:44:15 +0300 Subject: [PATCH 184/341] Create Agony [Agony].json --- tiers/Agony [Agony].json | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tiers/Agony [Agony].json diff --git a/tiers/Agony [Agony].json b/tiers/Agony [Agony].json new file mode 100644 index 0000000..ffdd6d9 --- /dev/null +++ b/tiers/Agony [Agony].json @@ -0,0 +1,38 @@ +{ + "normal":{ + "105000":1, + "630000":1, + "910000":1, + "1750000":2, + "4970000":2.5, + "12670000":3, + "28700000":3.5 + }, + "hard":{ + "131000":1, + "788000":1, + "1138000":1, + "2188000":2, + "6213000":2.5, + "15838000":3, + "35875000":3.5 + }, + "legendary":{ + "168000":1, + "1008000":1, + "1456000":1, + "2800000":2, + "7952000":2.5, + "20272000":3, + "45920000":3.5 + }, + "nightmare":{ + "210000":1, + "1260000":1, + "1820000":1, + "3500000":2, + "9940000":2.5, + "25340000":3, + "57400000":3.5 + } +} From 181101fa1edc765fb053ba5ce541d2610fd7413c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 15 Oct 2016 11:31:52 +0200 Subject: [PATCH 185/341] prevents memeber updates from starting a second timeout-chain for chat updates if they fail fixes #212 --- src/mods/chat.js | 113 ++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 60 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index ae23ec6..4ccd131 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -28,16 +28,61 @@ idrinth.chat = { idrinth.chat.refreshCount++; }, refreshMembers: function () { + var applyMembers = function ( data ) { + var applyMemberData = function () { + var addMemberElement = function ( chat, chatId, userId ) { + var usedPlatforms = ''; + for (var pkey in idrinth.chat.users[userId].platforms) { + if ( idrinth.chat.users[userId].platforms[pkey] ) { + usedPlatforms += pkey; + } + } + chat.appendChild ( idrinth.ui.buildElement ( { + type: 'li', + css: 'user ' + idrinth.chat.ranks[parseInt ( idrinth.chat.chatRank[chatId][userId], 10 )], + content: ( usedPlatforms === '' ? '' : '[' + usedPlatforms.toUpperCase () + '] ' ) + idrinth.chat.users[userId].name, + attributes: [ + { + name: 'data-id', + value: userId + }, + { + name: 'onclick', + value: 'idrinth.chat.userclick(this,' + userId + ', ' + chatId + ')' + } + ] + } + ) ); + }; + for (var chatId in idrinth.chat.chatRank) { + if ( document.getElementById ( 'idrinth-chat-tab-' + chatId ) ) { + var chat = document.getElementById ( 'idrinth-chat-tab-' + chatId ).getElementsByTagName ( 'ul' )[0]; + while ( chat.firstChild ) { + chat.removeChild ( chat.firstChild ); + } + for (var userId in idrinth.chat.chatRank[chatId]) { + if ( idrinth.chat.chatRank[chatId].hasOwnProperty ( userId ) ) { + addMemberElement ( chat, chatId, userId ); + } + } + } + } + }; + if ( !data ) { + return; + } + data = JSON.parse ( data ); + if ( !data ) { + return; + } + idrinth.chat.self = data.self; + idrinth.chat.users = data.users; + idrinth.chat.chatRank = data.members; + applyMemberData (); + }; idrinth.core.ajax.runHome ( 'chat-service/accounts/', - idrinth.chat.applyMembers, - function () { - window.setTimeout ( idrinth.chat.refreshMembers, 1000 ); - }, - function () { - window.setTimeout ( idrinth.chat.refreshMembers, 1000 ); - }, - '' + applyMembers ); }, returnMessages: function ( data ) { @@ -440,58 +485,6 @@ idrinth.chat = { idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 999 ); }, ranks: [ '', 'banned', 'user', 'mod', 'owner' ], - applyMembers: function ( data ) { - var applyMemberData = function () { - var addMemberElement = function ( chat, chatId, userId ) { - var usedPlatforms = ''; - for (var pkey in idrinth.chat.users[userId].platforms) { - if ( idrinth.chat.users[userId].platforms[pkey] ) { - usedPlatforms += pkey; - } - } - chat.appendChild ( idrinth.ui.buildElement ( { - type: 'li', - css: 'user ' + idrinth.chat.ranks[parseInt ( idrinth.chat.chatRank[chatId][userId], 10 )], - content: ( usedPlatforms === '' ? '' : '[' + usedPlatforms.toUpperCase () + '] ' ) + idrinth.chat.users[userId].name, - attributes: [ - { - name: 'data-id', - value: userId - }, - { - name: 'onclick', - value: 'idrinth.chat.userclick(this,' + userId + ', ' + chatId + ')' - } - ] - } - ) ); - }; - for (var chatId in idrinth.chat.chatRank) { - if ( document.getElementById ( 'idrinth-chat-tab-' + chatId ) ) { - var chat = document.getElementById ( 'idrinth-chat-tab-' + chatId ).getElementsByTagName ( 'ul' )[0]; - while ( chat.firstChild ) { - chat.removeChild ( chat.firstChild ); - } - for (var userId in idrinth.chat.chatRank[chatId]) { - if ( idrinth.chat.chatRank[chatId].hasOwnProperty ( userId ) ) { - addMemberElement ( chat, chatId, userId ); - } - } - } - } - }; - if ( !data ) { - return idrinth.chat.returnMessages ( data ); - } - data = JSON.parse ( data ); - if ( !data ) { - return idrinth.chat.returnMessages ( data ); - } - idrinth.chat.self = data.self; - idrinth.chat.users = data.users; - idrinth.chat.chatRank = data.members; - applyMemberData (); - }, emotes: { }, start: function () { var build = function () { From 21b62eea53f73536724242d0edc3a2824918cef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 15 Oct 2016 11:46:10 +0200 Subject: [PATCH 186/341] some cleanups, making method a private function instead --- src/mods/chat.js | 440 +++++++++++++++++++++++------------------------ 1 file changed, 220 insertions(+), 220 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 4ccd131..ffeb7c3 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -10,80 +10,239 @@ idrinth.chat = { chatRank: { }, refreshCount: 0, refreshChats: function () { - idrinth.chat.oldMessages = JSON.parse ( JSON.stringify ( idrinth.chat.messages ) ); - idrinth.chat.messages = [ ]; - idrinth.core.ajax.runHome ( - 'chat-service/update/', - idrinth.chat.applyMessages, - idrinth.chat.returnMessages, - idrinth.chat.returnMessages, - JSON.stringify ( { - maxId: idrinth.chat.maxId, - messages: idrinth.chat.oldMessages - } ) - ); - if ( idrinth.chat.refreshCount % 25 === 0 ) { - idrinth.chat.refreshMembers (); - } - idrinth.chat.refreshCount++; - }, - refreshMembers: function () { - var applyMembers = function ( data ) { - var applyMemberData = function () { - var addMemberElement = function ( chat, chatId, userId ) { - var usedPlatforms = ''; - for (var pkey in idrinth.chat.users[userId].platforms) { - if ( idrinth.chat.users[userId].platforms[pkey] ) { - usedPlatforms += pkey; - } - } - chat.appendChild ( idrinth.ui.buildElement ( { - type: 'li', - css: 'user ' + idrinth.chat.ranks[parseInt ( idrinth.chat.chatRank[chatId][userId], 10 )], - content: ( usedPlatforms === '' ? '' : '[' + usedPlatforms.toUpperCase () + '] ' ) + idrinth.chat.users[userId].name, - attributes: [ - { - name: 'data-id', - value: userId - }, - { - name: 'onclick', - value: 'idrinth.chat.userclick(this,' + userId + ', ' + chatId + ')' + var applyMessages = function ( data ) { + var processMessages = function ( messages ) { + var addMessages = function ( chatMessages, chatId, chatElement ) { + var buildMessage = function ( message, chat, chatId, messageId ) { + var getfullDateInt = function () { + function addZero ( x, n ) { + while ( x.toString ().length < n ) { + x = "0" + x; + } + return x; } - ] + var d = new Date (); + return addZero ( d.getFullYear (), 2 ) + + addZero ( d.getMonth (), 2 ) + + addZero ( d.getDate (), 2 ) + + addZero ( d.getHours (), 2 ) + + addZero ( d.getMinutes (), 2 ) + + addZero ( d.getSeconds (), 2 ) + + addZero ( d.getMilliseconds (), 3 ); + }; + var notify = function ( message, own, chatId ) { + var notActive = function ( chatId ) { + try { + return !idrinth.windowactive || + !( document.getElementById ( 'idrinth-chat-tab-click-' + chatId ).getAttribute ( 'class' ) ).match ( /(\s|^)active( |$)/ ) || + !( document.getElementById ( 'idrinth-chat' ).getAttribute ( 'class' ) ).match ( /(\s|^)active( |$)/ ); + } catch ( e ) { + idrinth.core.log ( e.getMessage ); + return true; + } + }; + var messageAllowed = function ( text ) { + try { + return ( idrinth.settings.get ( "notification#message" ) && text.match ( /\{[A-Z]{2}-Raid / ) === null ) || + ( idrinth.settings.get ( "notification#mention" ) && text.match ( new RegExp ( '(\s|^)' + idrinth.core.escapeRegExp ( idrinth.chat.users[idrinth.chat.self].name ) + '(\s|$)', 'i' ) ) !== null ) || + ( idrinth.settings.get ( "notification#raid" ) && text.match ( /\{[A-Z]{2}-Raid / ) !== null ); + } catch ( e ) { + idrinth.core.log ( e.getMessage () ); + return false; + } + }; + if ( !own && notActive ( chatId ) && messageAllowed ( message.text ) ) { + try { + idrinth.core.sendNotification ( + message.time.split ( ' ' )[1] + ' ' + document.getElementById ( 'idrinth-chat-tab-click-' + chatId ).innerHTML + ':', + idrinth.chat.users[message.user].name + ': ' + message.text + ); + } catch ( exception ) { + idrinth.core.log ( exception.getMessage () ); + } + } + }; + var own = parseInt ( message.user, 10 ) === parseInt ( idrinth.chat.self, 10 ); + notify ( message, own, chatId ); + chat.appendChild ( idrinth.ui.buildElement ( + { + type: 'li', + id: 'idrinth-single-chat-message-' + messageId + ( parseInt ( messageId, 10 ) < 1 ? '-' + getfullDateInt () : '' ), + css: own ? 'self-written ' : '', + children: [ + { + type: 'span', + css: 'time', + content: message.time.split ( ' ' )[1], + attributes: [ { + name: 'title', + value: message.time + } ] + }, + { + type: 'span', + css: 'user ' + idrinth.chat.ranks[parseInt ( idrinth.chat.chatRank[chatId][message.user], 10 )] + ( message.user === 0 ? ' system-message' : '' ), + content: idrinth.chat.users[message.user].name, + attributes: [ + { + name: 'data-id', + value: message.user + }, + { + name: 'onclick', + value: 'idrinth.chat.userclick(this,' + message.user + ',' + chatId + ')' + } + ] + }, + { + type: '#text', + content: ':' + }, + { + type: 'span', + children: idrinth.chat.buildMessageText ( message.text ) + } + ] + } + ) ); + }; + var isNew = false; + for (var messageId in chatMessages) { + if ( parseInt ( messageId, 10 ) < 1 || !document.getElementById ( 'idrinth-single-chat-message-' + messageId ) ) { + isNew = true; + buildMessage ( messages[chatId][messageId], chatElement, chatId, messageId ); + if ( parseInt ( messageId, 10 ) > parseInt ( idrinth.chat.maxId, 10 ) ) { + idrinth.chat.maxId = messageId; + } + } } - ) ); + return isNew; }; - for (var chatId in idrinth.chat.chatRank) { - if ( document.getElementById ( 'idrinth-chat-tab-' + chatId ) ) { - var chat = document.getElementById ( 'idrinth-chat-tab-' + chatId ).getElementsByTagName ( 'ul' )[0]; - while ( chat.firstChild ) { - chat.removeChild ( chat.firstChild ); - } - for (var userId in idrinth.chat.chatRank[chatId]) { - if ( idrinth.chat.chatRank[chatId].hasOwnProperty ( userId ) ) { - addMemberElement ( chat, chatId, userId ); - } + var setChatClass = function ( isNew, chat, chatId ) { + var isActive = function ( element ) { + var cssClass = element.getAttribute ( 'class' ); + return !( !cssClass ) && !( !cssClass.match ( /(^|\s)active(\s|$)/ ) ); + }; + var chatActive = isActive ( document.getElementById ( 'idrinth-chat' ) ); + if ( isNew && !chatActive ) { + document.getElementById ( 'idrinth-chat' ).setAttribute ( 'class', 'new-message' ); + } + var tab = document.getElementById ( 'idrinth-chat-tab-click-' + chatId ); + var tabActive = isActive ( tab ); + if ( isNew && !tabActive ) { + tab.setAttribute ( 'class', tab.getAttribute ( 'class' ) + ' new-message' ); + } else if ( tabActive && chatActive && chat.lastChild.scrollTop < chat.lastChild.scrollHeight ) { + try { + chat.lastChild.scrollIntoView ( false ); + } catch ( e ) { + idrinth.core.log ( e ); } + chat.lastChild.scrollTop = chat.lastChild.scrollHeight; + } + }; + if ( idrinth.chat.maxId === 0 ) { + idrinth.chat.maxId = 1; + } + for (var key in messages) { + if ( + !isNaN ( parseInt ( key, 10 ) ) + && document.getElementById ( 'idrinth-chat-tab-' + key ) + && document.getElementById ( 'idrinth-chat-tab-' + key ).getElementsByTagName ( 'ul' )[1] ) { + var chat = document.getElementById ( 'idrinth-chat-tab-' + key ).getElementsByTagName ( 'ul' )[1]; + setChatClass ( addMessages ( messages[key], key, chat ), chat, key ); } } }; if ( !data ) { - return; + return idrinth.chat.returnMessages ( data ); } data = JSON.parse ( data ); if ( !data ) { - return; + return idrinth.chat.returnMessages ( data ); + } + if ( data.login ) { + return idrinth.chat.relogin (); } - idrinth.chat.self = data.self; - idrinth.chat.users = data.users; - idrinth.chat.chatRank = data.members; - applyMemberData (); + if ( data.messages ) { + processMessages ( data.messages ); + } + idrinth.chat.oldMessages = [ ]; + idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 999 ); + }; + var refreshMembers = function () { + var applyMembers = function ( data ) { + var applyMemberData = function () { + var addMemberElement = function ( chat, chatId, userId ) { + var usedPlatforms = ''; + for (var pkey in idrinth.chat.users[userId].platforms) { + if ( idrinth.chat.users[userId].platforms[pkey] ) { + usedPlatforms += pkey; + } + } + chat.appendChild ( idrinth.ui.buildElement ( { + type: 'li', + css: 'user ' + idrinth.chat.ranks[parseInt ( idrinth.chat.chatRank[chatId][userId], 10 )], + content: ( usedPlatforms === '' ? '' : '[' + usedPlatforms.toUpperCase () + '] ' ) + idrinth.chat.users[userId].name, + attributes: [ + { + name: 'data-id', + value: userId + }, + { + name: 'onclick', + value: 'idrinth.chat.userclick(this,' + userId + ', ' + chatId + ')' + } + ] + } + ) ); + }; + for (var chatId in idrinth.chat.chatRank) { + if ( document.getElementById ( 'idrinth-chat-tab-' + chatId ) ) { + var chat = document.getElementById ( 'idrinth-chat-tab-' + chatId ).getElementsByTagName ( 'ul' )[0]; + while ( chat.firstChild ) { + chat.removeChild ( chat.firstChild ); + } + for (var userId in idrinth.chat.chatRank[chatId]) { + if ( idrinth.chat.chatRank[chatId].hasOwnProperty ( userId ) ) { + addMemberElement ( chat, chatId, userId ); + } + } + } + } + }; + if ( !data ) { + return; + } + data = JSON.parse ( data ); + if ( !data ) { + return; + } + idrinth.chat.self = data.self; + idrinth.chat.users = data.users; + idrinth.chat.chatRank = data.members; + applyMemberData (); + }; + idrinth.core.ajax.runHome ( + 'chat-service/accounts/', + applyMembers + ); }; + idrinth.chat.oldMessages = JSON.parse ( JSON.stringify ( idrinth.chat.messages ) ); + idrinth.chat.messages = [ ]; idrinth.core.ajax.runHome ( - 'chat-service/accounts/', - applyMembers + 'chat-service/update/', + applyMessages, + idrinth.chat.returnMessages, + idrinth.chat.returnMessages, + JSON.stringify ( { + maxId: idrinth.chat.maxId, + messages: idrinth.chat.oldMessages + } ) ); + if ( idrinth.chat.refreshCount % 25 === 0 ) { + refreshMembers (); + } + idrinth.chat.refreshCount++; }, returnMessages: function ( data ) { for (var count = idrinth.chat.oldMessages.length - 1; count >= 0; count--) { @@ -147,9 +306,9 @@ idrinth.chat = { if ( !hasRights ( node.requiredRank, ownRank ) ) { return; } - var translation = idrinth.text.get ( config.label ); + var translation = idrinth.text.get ( node.label ); return { - content: translation === idrinth.text.data.default ? config.label : translation, + content: translation === idrinth.text.data.default ? node.label : translation, type: 'li', attributes: [ { name: 'onclick', @@ -325,165 +484,6 @@ idrinth.chat = { }; }, idrinth.chat.buildEmoticons ], 5 ); }, - applyMessages: function ( data ) { - var processMessages = function ( messages ) { - var addMessages = function ( chatMessages, chatId, chatElement ) { - var buildMessage = function ( message, chat, chatId, messageId ) { - var getfullDateInt = function () { - function addZero ( x, n ) { - while ( x.toString ().length < n ) { - x = "0" + x; - } - return x; - } - var d = new Date (); - return addZero ( d.getFullYear (), 2 ) + - addZero ( d.getMonth (), 2 ) + - addZero ( d.getDate (), 2 ) + - addZero ( d.getHours (), 2 ) + - addZero ( d.getMinutes (), 2 ) + - addZero ( d.getSeconds (), 2 ) + - addZero ( d.getMilliseconds (), 3 ); - }; - var notify = function ( message, own, chatId ) { - var notActive = function ( chatId ) { - try { - return !idrinth.windowactive || - !( document.getElementById ( 'idrinth-chat-tab-click-' + chatId ).getAttribute ( 'class' ) ).match ( /(\s|^)active( |$)/ ) || - !( document.getElementById ( 'idrinth-chat' ).getAttribute ( 'class' ) ).match ( /(\s|^)active( |$)/ ); - } catch ( e ) { - idrinth.core.log ( e.getMessage ); - return true; - } - }; - var messageAllowed = function ( text ) { - try { - return ( idrinth.settings.get ( "notification#message" ) && text.match ( /\{[A-Z]{2}-Raid / ) === null ) || - ( idrinth.settings.get ( "notification#mention" ) && text.match ( new RegExp ( '(\s|^)' + idrinth.core.escapeRegExp ( idrinth.chat.users[idrinth.chat.self].name ) + '(\s|$)', 'i' ) ) !== null ) || - ( idrinth.settings.get ( "notification#raid" ) && text.match ( /\{[A-Z]{2}-Raid / ) !== null ); - } catch ( e ) { - idrinth.core.log ( e.getMessage () ); - return false; - } - }; - if ( !own && notActive ( chatId ) && messageAllowed ( message.text ) ) { - try { - idrinth.core.sendNotification ( - message.time.split ( ' ' )[1] + ' ' + document.getElementById ( 'idrinth-chat-tab-click-' + chatId ).innerHTML + ':', - idrinth.chat.users[message.user].name + ': ' + message.text - ); - } catch ( exception ) { - idrinth.core.log ( exception.getMessage () ); - } - } - }; - var own = parseInt ( message.user, 10 ) === parseInt ( idrinth.chat.self, 10 ); - notify ( message, own, chatId ); - chat.appendChild ( idrinth.ui.buildElement ( - { - type: 'li', - id: 'idrinth-single-chat-message-' + messageId + ( parseInt ( messageId, 10 ) < 1 ? '-' + getfullDateInt () : '' ), - css: own ? 'self-written ' : '', - children: [ - { - type: 'span', - css: 'time', - content: message.time.split ( ' ' )[1], - attributes: [ { - name: 'title', - value: message.time - } ] - }, - { - type: 'span', - css: 'user ' + idrinth.chat.ranks[parseInt ( idrinth.chat.chatRank[chatId][message.user], 10 )] + ( message.user === 0 ? ' system-message' : '' ), - content: idrinth.chat.users[message.user].name, - attributes: [ - { - name: 'data-id', - value: message.user - }, - { - name: 'onclick', - value: 'idrinth.chat.userclick(this,' + message.user + ',' + chatId + ')' - } - ] - }, - { - type: '#text', - content: ':' - }, - { - type: 'span', - children: idrinth.chat.buildMessageText ( message.text ) - } - ] - } - ) ); - }; - var isNew = false; - for (var messageId in chatMessages) { - if ( parseInt ( messageId, 10 ) < 1 || !document.getElementById ( 'idrinth-single-chat-message-' + messageId ) ) { - isNew = true; - buildMessage ( messages[chatId][messageId], chatElement, chatId, messageId ); - if ( parseInt ( messageId, 10 ) > parseInt ( idrinth.chat.maxId, 10 ) ) { - idrinth.chat.maxId = messageId; - } - } - } - return isNew; - }; - var setChatClass = function ( isNew, chat, chatId ) { - var isActive = function ( element ) { - var cssClass = element.getAttribute ( 'class' ); - return !( !cssClass ) && !( !cssClass.match ( /(^|\s)active(\s|$)/ ) ); - }; - var chatActive = isActive ( document.getElementById ( 'idrinth-chat' ) ); - if ( isNew && !chatActive ) { - document.getElementById ( 'idrinth-chat' ).setAttribute ( 'class', 'new-message' ); - } - var tab = document.getElementById ( 'idrinth-chat-tab-click-' + chatId ); - var tabActive = isActive ( tab ); - if ( isNew && !tabActive ) { - tab.setAttribute ( 'class', tab.getAttribute ( 'class' ) + ' new-message' ); - } else if ( tabActive && chatActive && chat.lastChild.scrollTop < chat.lastChild.scrollHeight ) { - try { - chat.lastChild.scrollIntoView ( false ); - } catch ( e ) { - idrinth.core.log ( e ); - } - chat.lastChild.scrollTop = chat.lastChild.scrollHeight; - } - }; - if ( idrinth.chat.maxId === 0 ) { - idrinth.chat.maxId = 1; - } - for (var key in messages) { - if ( - !isNaN ( parseInt ( key, 10 ) ) - && document.getElementById ( 'idrinth-chat-tab-' + key ) - && document.getElementById ( 'idrinth-chat-tab-' + key ).getElementsByTagName ( 'ul' )[1] ) { - var chat = document.getElementById ( 'idrinth-chat-tab-' + key ).getElementsByTagName ( 'ul' )[1]; - setChatClass ( addMessages ( messages[key], key, chat ), chat, key ); - } - } - }; - if ( !data ) { - return idrinth.chat.returnMessages ( data ); - } - data = JSON.parse ( data ); - if ( !data ) { - return idrinth.chat.returnMessages ( data ); - } - if ( data.login ) { - return idrinth.chat.relogin (); - } - if ( data.messages ) { - processMessages ( data.messages ); - } - idrinth.chat.oldMessages = [ ]; - idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 999 ); - }, ranks: [ '', 'banned', 'user', 'mod', 'owner' ], emotes: { }, start: function () { From ccf48a851872d0c39d396f2fd66c803713884118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 15 Oct 2016 12:35:20 +0200 Subject: [PATCH 187/341] fixes #96 fixes #76 make sure the raid data is actually loaded --- src/mods/settings.js | 126 ++++++++++++++++++++++++------------------- 1 file changed, 71 insertions(+), 55 deletions(-) diff --git a/src/mods/settings.js b/src/mods/settings.js index f01d641..074b226 100644 --- a/src/mods/settings.js +++ b/src/mods/settings.js @@ -1,54 +1,43 @@ idrinth.settings = { - raids: false, - favs: '', - factor: true, - moveLeft: false, - minimalist: false, - chatHiddenOnStart: true, - names: true, - timeout: 5000, - loadtime: 5000, - windows: 3, - warBottom: false, - landMax: true, - chatting: true, - chatuser: '', - newgroundLoad: 30, - chatpass: '', - isWorldServer: false, - alarmTime: '8:0', - alarmActive: false, - bannedRaids: { }, - language: 'en', - notification: { - mention: true, - message: true, - raid: true - }, - land: { - cornfield: 0, - stable: 0, - barn: 0, - store: 0, - pub: 0, - inn: 0, - tower: 0, - fort: 0, - castle: 0, - gold: 0 - }, - save: function ( ) { - 'use strict'; - var store = function ( prefix, list, store ) { - for (var key in list) { - if ( list.hasOwnProperty ( key ) && typeof list[key] !== 'object' && typeof list[key] !== 'function' ) { - window.localStorage.setItem ( prefix + key, list[key] ); - } else if ( list.hasOwnProperty ( key ) && typeof list[key] === 'object' ) { - store ( prefix + key + '-', list[key], store ); - } - } - }; - store ( 'idrinth-dotd-', idrinth.settings, store ); + data: { + raids: false, + favs: '', + factor: true, + moveLeft: false, + minimalist: false, + chatHiddenOnStart: true, + names: true, + timeout: 5000, + loadtime: 5000, + windows: 3, + warBottom: false, + landMax: true, + chatting: true, + chatuser: '', + newgroundLoad: 30, + chatpass: '', + isWorldServer: false, + alarmTime: '8:0', + alarmActive: false, + bannedRaids: { }, + language: 'en', + notification: { + mention: true, + message: true, + raid: true + }, + land: { + cornfield: 0, + stable: 0, + barn: 0, + store: 0, + pub: 0, + inn: 0, + tower: 0, + fort: 0, + castle: 0, + gold: 0 + } }, get: function ( field ) { 'use strict'; @@ -61,27 +50,30 @@ idrinth.settings = { if ( !field ) { return; } - var value = getValue ( idrinth.settings, field ); + var value = getValue ( idrinth.settings.data, field ); if ( value !== null && typeof value !== 'object' ) { return value; } field = field.split ( '#' ); - return getValue ( idrinth.settings[field[0]], field[1] ); + return getValue ( idrinth.settings.data[field[0]], field[1] ); }, change: function ( field, value ) { 'use strict'; var setValue = function ( parent, field, value ) { if ( idrinth.core.fieldIsSetting ( parent, field ) ) { parent[field] = value; - idrinth.settings.save ( ); return true; } return false; }; + var store = function ( ) { + window.localStorage.setItem ( 'idotd', JSON.stringify ( idrinth.settings.data ) ); + }; if ( !field ) { return; } if ( setValue ( idrinth.settings, field, value ) ) { + store (); return; } field = field.split ( '#' ); @@ -89,12 +81,29 @@ idrinth.settings = { return; } if ( setValue ( idrinth.settings[field[0]], field[1], value ) ) { + store (); return; } }, start: function ( ) { 'use strict'; - if ( window.localStorage ) { + var getCurrent = function () { + var data = JSON.parse ( window.localStorage.getItem ( 'idotd' ) ); + var apply = function ( to, from, apply ) { + for (var key in from) { + if ( from.hasOwnProperty ( key ) ) { + if ( typeof from[key] === 'object' ) { + to[key] = typeof to[key] === 'object' ? to[key] : { }; + apply ( to[key], from[key] ); + } else { + to[key] = from[key]; + } + } + } + }; + apply ( idrinth.settings.data, data, apply ); + }; + var getOld = function () { var objectIterator = function ( object, prefix, objectIterator ) { var itemHandler = function ( prefix, key, item ) { if ( typeof item !== 'function' ) { @@ -121,7 +130,14 @@ idrinth.settings = { } return object; }; - objectIterator ( idrinth.settings, '', objectIterator ); + objectIterator ( idrinth.settings.data, '', objectIterator ); + }; + if ( window.localStorage ) { + if ( window.localStorage.getItem ( 'idotd' ) ) { + getCurrent (); + } else { + getOld (); + } } } }; \ No newline at end of file From 1535f97f0a445a78a3bff554f126329f7f555501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 15 Oct 2016 12:44:35 +0200 Subject: [PATCH 188/341] correcting storage object --- src/mods/settings.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mods/settings.js b/src/mods/settings.js index 074b226..9b27092 100644 --- a/src/mods/settings.js +++ b/src/mods/settings.js @@ -72,15 +72,15 @@ idrinth.settings = { if ( !field ) { return; } - if ( setValue ( idrinth.settings, field, value ) ) { + if ( setValue ( idrinth.settings.data, field, value ) ) { store (); return; } field = field.split ( '#' ); - if ( !idrinth.settings[field[0]] || !field[1] ) { + if ( !idrinth.settings.data[field[0]] || !field[1] ) { return; } - if ( setValue ( idrinth.settings[field[0]], field[1], value ) ) { + if ( setValue ( idrinth.settings.data[field[0]], field[1], value ) ) { store (); return; } @@ -116,6 +116,7 @@ idrinth.settings = { } item = tmp; } + // window.localStorage.removeItem ( 'idrinth-dotd-' + prefix + key ); } return item; }; From 214148974a4dff482df422ccb6a942a785dc7bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 15 Oct 2016 12:52:30 +0200 Subject: [PATCH 189/341] making sure banned rsids can be saved --- src/mods/tier.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index 00e7a12..52aaa94 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -93,10 +93,20 @@ idrinth.tier = { data = JSON.parse ( data ); if ( data ) { idrinth.tier.list = data; + var create = function ( field, value ) { + 'use strict'; + field = field.split ( '#' ); + if ( !field[1] ) { + idrinth.settings.data[field[0]] = value; + } else { + idrinth.settings.data[field[0]][field[1]] = value; + } + window.localStorage.setItem ( 'idotd', JSON.stringify ( idrinth.settings.data ) ); + }; for (var key in data) { if ( data[key].name ) { if ( idrinth.settings.get ( "bannedRaids#" + data[key].name ) === undefined ) { - idrinth.settings.change ( "bannedRaids#" + data[key].name, false ); + create ( "bannedRaids#" + data[key].name, false ); } document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { name: 'bannedRaids#' + data[key].name, From ca737ff076e11001f1c61e115ed2685191ff86b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 15 Oct 2016 12:55:12 +0200 Subject: [PATCH 190/341] simplifiing storage --- src/mods/tier.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index 52aaa94..8bd8338 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -96,17 +96,13 @@ idrinth.tier = { var create = function ( field, value ) { 'use strict'; field = field.split ( '#' ); - if ( !field[1] ) { - idrinth.settings.data[field[0]] = value; - } else { - idrinth.settings.data[field[0]][field[1]] = value; - } + idrinth.settings.data.bannedRaids[field[1]] = value; window.localStorage.setItem ( 'idotd', JSON.stringify ( idrinth.settings.data ) ); }; for (var key in data) { if ( data[key].name ) { if ( idrinth.settings.get ( "bannedRaids#" + data[key].name ) === undefined ) { - create ( "bannedRaids#" + data[key].name, false ); + create ( data[key].name, false ); } document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { name: 'bannedRaids#' + data[key].name, From 09769f24de79169a612cc71c8289e79c69b4b14a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 15 Oct 2016 13:03:02 +0200 Subject: [PATCH 191/341] restructuring building/creation of banned raids list --- src/mods/tier.js | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index 8bd8338..ceeca4d 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -68,11 +68,11 @@ idrinth.tier = { idrinth.core.alert ( idrinth.text.get ( "tier.maxBoxes" ) ); }, taggedSlots: { }, - start: function () { + start: function ( ) { 'use strict'; var pos = 1; while ( 0 < window.innerWidth - 140 * ( pos + 1 ) ) { - this.taggedSlots[( pos * 140 ).toString ()] = null; + this.taggedSlots[( pos * 140 ).toString ( )] = null; pos++; } idrinth.core.ajax.runHome ( @@ -93,26 +93,25 @@ idrinth.tier = { data = JSON.parse ( data ); if ( data ) { idrinth.tier.list = data; - var create = function ( field, value ) { + var create = function ( name, url ) { 'use strict'; - field = field.split ( '#' ); - idrinth.settings.data.bannedRaids[field[1]] = value; - window.localStorage.setItem ( 'idotd', JSON.stringify ( idrinth.settings.data ) ); + if ( !idrinth.settings.bannedRaids[name] ) { + idrinth.settings.data.bannedRaids[name] = false; + window.localStorage.setItem ( 'idotd', JSON.stringify ( idrinth.settings.data ) ); + } + document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { + name: 'bannedRaids#' + name, + rType: '#input', + type: 'checkbox', + id: 'idrinth-raid-may-join-list-' + name, + label: idrinth.text.get ( "raids.disableJoining" ) + name + } ) ); + document.getElementById ( 'idrinth-raid-may-join-list' ).lastChild.setAttribute ( 'style', + 'background-image:url(https://dotd.idrinth.de/static/raid-image-service/' + url + '/);' ); }; for (var key in data) { if ( data[key].name ) { - if ( idrinth.settings.get ( "bannedRaids#" + data[key].name ) === undefined ) { - create ( data[key].name, false ); - } - document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { - name: 'bannedRaids#' + data[key].name, - rType: '#input', - type: 'checkbox', - id: 'idrinth-raid-may-join-list-' + data[key].name, - label: idrinth.text.get ( "raids.disableJoining" ) + data[key].name - } ) ); - document.getElementById ( 'idrinth-raid-may-join-list' ).lastChild.setAttribute ( 'style', - 'background-image:url(https://dotd.idrinth.de/static/raid-image-service/' + data[key].url + '/);' ); + create ( data[key].name, data[key].url ); } } } else { @@ -123,7 +122,6 @@ idrinth.tier = { var clearInnerHtml = function ( elem ) { elem.innerHTML = ''; }; - var makeList = function ( list ) { var makeField = function ( listKey, difficulty, ic ) { var ln = { From b77f0d09f214230588dfc0b2484b85ded7f4f56b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 15 Oct 2016 13:06:05 +0200 Subject: [PATCH 192/341] now checking correct object --- src/mods/tier.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index ceeca4d..9ef4cc6 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -95,7 +95,7 @@ idrinth.tier = { idrinth.tier.list = data; var create = function ( name, url ) { 'use strict'; - if ( !idrinth.settings.bannedRaids[name] ) { + if ( !idrinth.settings.data.bannedRaids[name] ) { idrinth.settings.data.bannedRaids[name] = false; window.localStorage.setItem ( 'idotd', JSON.stringify ( idrinth.settings.data ) ); } From ba598be6edad7ee32a743584a87eb385f575d98f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 15 Oct 2016 13:16:45 +0200 Subject: [PATCH 193/341] removing old settings --- src/mods/settings.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/mods/settings.js b/src/mods/settings.js index 9b27092..f61df8e 100644 --- a/src/mods/settings.js +++ b/src/mods/settings.js @@ -47,14 +47,23 @@ idrinth.settings = { } return null; }; + var remove = function ( key ) { + try { + window.localStorage.removeItem ( key ); + } catch ( e ) { + //not really relevant + } + }; if ( !field ) { return; } var value = getValue ( idrinth.settings.data, field ); if ( value !== null && typeof value !== 'object' ) { + remove ( 'idrinth-dotd-' + field ); return value; } field = field.split ( '#' ); + remove ( 'idrinth-dotd-' + field[0] + '-' + field[1] ); return getValue ( idrinth.settings.data[field[0]], field[1] ); }, change: function ( field, value ) { @@ -116,7 +125,6 @@ idrinth.settings = { } item = tmp; } - // window.localStorage.removeItem ( 'idrinth-dotd-' + prefix + key ); } return item; }; From 30a51757e0c91fd45e01bae3c9fcac8ffcb0aa67 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sat, 15 Oct 2016 17:49:05 +0300 Subject: [PATCH 194/341] Create Hammer [Hammer].json #214 Create tier raid with new Split tier-rewards --- tiers/Hammer [Hammer].json | 206 +++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100644 tiers/Hammer [Hammer].json diff --git a/tiers/Hammer [Hammer].json b/tiers/Hammer [Hammer].json new file mode 100644 index 0000000..58c30f1 --- /dev/null +++ b/tiers/Hammer [Hammer].json @@ -0,0 +1,206 @@ +{ + "normal":{ + "550000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "3080000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "4180000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "9020000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "13750000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "29700000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "37400000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +} + }, + "hard":{ + "688000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "3850000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "5225000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "11275000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "17188000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "37125000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "46750000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +} + }, + "legendary":{ + "880000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "4928000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "6688000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "14432000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "22000000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "47520000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "59480000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +} + }, + "nightmare":{ + "1100000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "6160000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "8360000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "18040000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "27500000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "59400000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "74800000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +} + } +} From c1c01f257bb8f5a08ee670d2da1e9ca2853f3d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 15 Oct 2016 16:53:29 +0200 Subject: [PATCH 195/341] Update Hammer [Hammer].json adjusting formatting --- tiers/Hammer [Hammer].json | 336 ++++++++++++++++++------------------- 1 file changed, 168 insertions(+), 168 deletions(-) diff --git a/tiers/Hammer [Hammer].json b/tiers/Hammer [Hammer].json index 58c30f1..d9eff29 100644 --- a/tiers/Hammer [Hammer].json +++ b/tiers/Hammer [Hammer].json @@ -1,206 +1,206 @@ { "normal":{ "550000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "3080000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "4180000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "9020000":{ - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "13750000":{ - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "29700000":{ - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "37400000":{ - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -} + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, "hard":{ "688000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "3850000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "5225000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "11275000":{ - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "17188000":{ - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "37125000":{ - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "46750000":{ - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -} + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, "legendary":{ "880000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "4928000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "6688000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "14432000":{ - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "22000000":{ - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "47520000":{ - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "59480000":{ - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -} + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, "nightmare":{ "1100000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "6160000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "8360000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "18040000":{ - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "27500000":{ - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "59400000":{ - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, "74800000":{ - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -} + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } From 3dd041e5ab8cdf78fe316a40956889cfb383c629 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sat, 15 Oct 2016 18:47:32 +0300 Subject: [PATCH 196/341] Split tier-rewards #214 --- tiers/Dirthax [Dirthax].json | 206 +++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100644 tiers/Dirthax [Dirthax].json diff --git a/tiers/Dirthax [Dirthax].json b/tiers/Dirthax [Dirthax].json new file mode 100644 index 0000000..19d8526 --- /dev/null +++ b/tiers/Dirthax [Dirthax].json @@ -0,0 +1,206 @@ +{ + "normal":{ + "1100000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "4950000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "8250000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "12100000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "17600000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "35750000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "49500000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +} + }, + "hard":{ + "1375000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "6188000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "10313000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "15125000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "22000000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "44688000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "61875000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +} + }, + "legendary":{ + "1760000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "7920000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "13200000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "19360000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "28160000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "57200000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "79200000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +} + }, + "nightmare":{ + "2200000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "9900000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "16500000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "24200000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "35200000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "71500000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "99000000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +} + } +} From 1881b2ed1b7cb370ac0e8bdc2cd99a98ba37dc0b Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sat, 15 Oct 2016 18:57:17 +0300 Subject: [PATCH 197/341] Split tier-rewards #214, Elite Gladiators --- ...' Elite Gladiators [Elite Gladiators].json | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 tiers/Batiatus' Elite Gladiators [Elite Gladiators].json diff --git a/tiers/Batiatus' Elite Gladiators [Elite Gladiators].json b/tiers/Batiatus' Elite Gladiators [Elite Gladiators].json new file mode 100644 index 0000000..125d510 --- /dev/null +++ b/tiers/Batiatus' Elite Gladiators [Elite Gladiators].json @@ -0,0 +1,67 @@ +{ +"nightmare":{ + "15000000":{ + "epic": 2, + "legendary": 4, + "uncommon": 6, + "common": 8, + "stats": null +}, + "18000000":{ + "epic": 3, + "legendary": 5, + "uncommon": 7, + "common": 9, + "stats": null +}, + "21000000":{ + "epic": 4, + "legendary": 6, + "uncommon": 8, + "common": 10, + "stats": null +}, + "24000000":{ + "epic": 5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "27000000":{ + "epic": 6, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "30000000":{ + "epic": 7, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "33000000":{ + "epic": 8, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "36000000":{ + "epic": 9, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "39000000":{ + "epic": 10, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +} + } +} From 4a3599f22c7d041b4d2b6bc0191f5090cc588ff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 15 Oct 2016 23:56:25 +0200 Subject: [PATCH 198/341] Create de.json just starting with the german translations for testing purposes --- src/languages/de.json | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/languages/de.json diff --git a/src/languages/de.json b/src/languages/de.json new file mode 100644 index 0000000..0635327 --- /dev/null +++ b/src/languages/de.json @@ -0,0 +1,21 @@ +{ + "chat": { + "actions": { + "banUser": "Nutzer bannen", + "makeMod": "Moderator ernennen", + "makeAdmin": "Admin ernennen", + "makeUser": "Nutzer ernennen", + "close": "Schließen", + "createChat": "Chat erstellen", + "joinChat": "Chat beitreten", + "createAddChat": "Weiteren Chat erstellen", + "copyIdPasswort": "Password&Id kopieren", + "deleteRoom": "Raum löschen", + "leaveRoom": "Raum verlassen" + }, + "texts": { + "settings": "Weitere Einstellungen auf ", + }, + }, + "default": "Unexpected error occurred. Please contact script developers (https://github.com/Idrinth/IDotD)." +} From 681d9fd39021212f386117b47a382dcd67b7b988 Mon Sep 17 00:00:00 2001 From: ardenian Date: Sun, 16 Oct 2016 14:01:06 +0200 Subject: [PATCH 199/341] test commit for displaying type --- src/mods/tier.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mods/tier.js b/src/mods/tier.js index 9ef4cc6..396cedf 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -185,6 +185,10 @@ idrinth.tier = { value: 'https://dotd.idrinth.de/static/raid-image-service/' + idrinth.tier.list[list[count]].url + '/' } ] }, + { + type: 'label', + content: boss.types + }, { type: 'strong', content: idrinth.tier.list[list[count]].name From 21379ae240c6aac43fde9cbbe8c6426483522590 Mon Sep 17 00:00:00 2001 From: ardenian Date: Sun, 16 Oct 2016 14:10:42 +0200 Subject: [PATCH 200/341] reset changes --- src/mods/tier.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index 396cedf..9ef4cc6 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -185,10 +185,6 @@ idrinth.tier = { value: 'https://dotd.idrinth.de/static/raid-image-service/' + idrinth.tier.list[list[count]].url + '/' } ] }, - { - type: 'label', - content: boss.types - }, { type: 'strong', content: idrinth.tier.list[list[count]].name From e05981e40167122b299e26deaaf7d3be00ae5c4c Mon Sep 17 00:00:00 2001 From: ardenian Date: Sun, 16 Oct 2016 15:08:52 +0200 Subject: [PATCH 201/341] Adding a raid's types information to the tier tab. fixes #149. --- src/mods/tier.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mods/tier.js b/src/mods/tier.js index 9ef4cc6..3a546c0 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -203,6 +203,11 @@ idrinth.tier = { } ] }, + { + type: 'label', + content: idrinth.tier.list[list[count]].types.join(', ') + + }, { type: 'span', content: 'AP: ' + idrinth.ui.formatNumber ( idrinth.tier.list[list[count]].ap ) From 2838f0c9c5113234f2696f93ba2a39d8ce955abd Mon Sep 17 00:00:00 2001 From: ardenian Date: Sun, 16 Oct 2016 15:13:07 +0200 Subject: [PATCH 202/341] changing label to span --- src/mods/tier.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index 3a546c0..2d5aee8 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -204,7 +204,7 @@ idrinth.tier = { ] }, { - type: 'label', + type: 'span', content: idrinth.tier.list[list[count]].types.join(', ') }, From 445c9efb2869e5d10fe2eef4a7c1133f2dc85768 Mon Sep 17 00:00:00 2001 From: ardenian Date: Mon, 17 Oct 2016 14:29:44 +0200 Subject: [PATCH 203/341] Moved types under the boss name, as shown in the example Removed white space --- src/mods/tier.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index 2d5aee8..c54c8ee 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -189,6 +189,10 @@ idrinth.tier = { type: 'strong', content: idrinth.tier.list[list[count]].name }, + { + type: 'span', + content: idrinth.tier.list[list[count]].types.join( ', ' ) + }, { type: 'button', content: idrinth.text.get ( "tier.tag" ), @@ -203,11 +207,6 @@ idrinth.tier = { } ] }, - { - type: 'span', - content: idrinth.tier.list[list[count]].types.join(', ') - - }, { type: 'span', content: 'AP: ' + idrinth.ui.formatNumber ( idrinth.tier.list[list[count]].ap ) From 68129710c72ce47e0b37156ab2846d2a20e8dcbc Mon Sep 17 00:00:00 2001 From: Ardenian Date: Tue, 18 Oct 2016 14:24:49 +0200 Subject: [PATCH 204/341] Update tier.js Fixing code style --- src/mods/tier.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index c54c8ee..4cd17bf 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -191,7 +191,7 @@ idrinth.tier = { }, { type: 'span', - content: idrinth.tier.list[list[count]].types.join( ', ' ) + content: idrinth.tier.list[list[count]].types.join ( ', ' ) }, { type: 'button', @@ -293,4 +293,4 @@ idrinth.tier = { } makeList ( result ); } -}; \ No newline at end of file +}; From 8b87b3e234a09a42ac6f6938b97af4912ee446f1 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Tue, 18 Oct 2016 17:00:48 +0300 Subject: [PATCH 205/341] Create gr.json --- src/languages/gr.json | 101 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 src/languages/gr.json diff --git a/src/languages/gr.json b/src/languages/gr.json new file mode 100644 index 0000000..d9afae6 --- /dev/null +++ b/src/languages/gr.json @@ -0,0 +1,101 @@ +{ + "chat": { + "actions": { + "banUser": "Τιμωρία Χρήστη", + "makeMod": "Make Moderator", + "makeAdmin": "Make Admin", + "makeUser": "Make User", + "close": "Κλείσιμο", + "invite": "Προσκάλεσε στη συζήτηση ", + "createChat": "Δημιουργία συζητήσεως", + "joinChat": "Εισαγωγή στη συζήτηση", + "createAddChat": "Πάτησε για δημιουργία επιπλέον συζητήσεως", + "copyIdPasswort": "Αντιγραφή Κωδικών Πρόσβασης&Χρήστη", + "deleteRoom": "Διαγραφή χώρου", + "leaveRoom": "Αποχώρηση χώρου" + }, + "texts": { + "settings": "Περισσότερες επιλογές στο ", + "account": "Λογαριασμός", + "title": "Συζήτηση", + "creditEmoticon": "Emoticons provided by ", + "optional": "This part of the script is optional, so logging in is unneeded for raid catching etc.", + "invalid": "This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.", + "offline": "Not logged in, click to login/register" + }, + "error": { + "modify": "Can't modify that user at the moment", + "create": "Can't create at the moment", + "join": "Joining didn't work", + "login": "Login failed in an unexpected way", + "unknown": "The given username for dotd.idrinth.de is unknown, do you want to register it there?" + }, + "notification": { + "mention": "chat-mention notifications?", + "raid": "chat-raid notifications?", + "message": "chat-message notifications?" + } + }, + "default": "Unexpected error occurred. Please contact script developers (https://github.com/Idrinth/IDotD).", + "land": { + "lack": "You lack gold to buy any more buildings at the moment.", + "hour": " gold per hour each", + "calc": "Calculate", + "avaible": "Avaible Gold" + }, + "tier": { + "search": "Enter Boss' Name", + "diff": { + "normal": "Normal", + "hard": "Hard", + "legend": "Legend", + "night": "Nightmare" + }, + "tag": "Tag to screen-top", + "maxBoxes": "There is no space for another tier-box at the moment, please close one first." + }, + "raids": { + "lastJoined": "Last raids joined", + "clear": "Clear Raids", + "disableJoining": "Disable joining for ", + "clickCopy": "click to copy raid link", + "imports": { + "manually": "Import all manually", + "favs": "Import favs manually", + "restart": "Restart Raidjoin" + }, + "disableSpecific": "Disable Autojoining for specific raids" + }, + "button": { + "ok": "Ok", + "cancel": "Cancel", + "reloadGame": "Reload game", + "reloadScript": "Reload Script", + "refreshFBGameLogin": "Refresh Facebook Game Login", + "ngRaidJoin": "NG Raid Join(slow!)", + "disableTimedAutoJoin": "disable timed Autojoin", + "enableTimedAutoJoin": "enable timed Autojoin" + }, + "setting": { + "enableExtCharInfo": "Enable extended Characterinformation?", + "minimLayout": "Minimalist Layout", + "moveSettingLeft": "Move settings left", + "warBottomPage": "Show war at the bottom of the page", + "useGoldEfficiently": "Check to try and use up the gold as efficient as possible - uncheck to only use the most efficient buy in the land buy calculator", + "tenBuildOnce": "Buy 10 Buildings at once?(Rec)", + "extCharInfoDuration": "Milliseconds until the extended Characterinformation disappears", + "joiningDuration": "Seconds needed to load the game for joining", + "enableChat": "Enable chat(needs script reload)", + "enableFavRequest": "Enable Auto-Raid-Request for Favorites?", + "favIdToJoin": "FavoriteIds to join (separate multiple by comma)", + "worldserver": "Worldserver?" + }, + "ui": { + "settingInfo": "This script will always import the raids you manually set to be imported on the website and if it's enabled it will also import all raids matched by one of the faved searches provided.", + "maxPopupsFrame": "Maximum Popups/Frames for joining raids", + "timeAutoJoin": "Time to automatically join raids slowly(reloads game multiple times). Format is [Hours]:[Minutes] without leading zeros, so 7:1 is fine, 07:01 is not", + "getFavFrom": "Get your search-favorites from ", + "raidsearch": "Idrinth's Raidsearch", + "reloadGameFail": "The game couldn't be reloaded" + } +} From 63acc55f8ad937fab1357d61cffd8e206a21d853 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Wed, 19 Oct 2016 18:00:06 +0300 Subject: [PATCH 206/341] Create Apoc Demon [Apoc Demon].json, #214 --- tiers/Apoc Demon [Apoc Demon].json | 81 ++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 tiers/Apoc Demon [Apoc Demon].json diff --git a/tiers/Apoc Demon [Apoc Demon].json b/tiers/Apoc Demon [Apoc Demon].json new file mode 100644 index 0000000..ef7db0a --- /dev/null +++ b/tiers/Apoc Demon [Apoc Demon].json @@ -0,0 +1,81 @@ +{ + "nightmare":{ + "12000000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "24000000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "36000000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "40000000":{ + "epic": 4, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "60000000":{ + "epic": 5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "80000000":{ + "epic": 6, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "100000000":{ + "epic": 7, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "120000000":{ + "epic": 8, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "140000000":{ + "epic": 9, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "160000000":{ + "epic": 10, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "180000000":{ + "epic": 11, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +} + } +} From 5b086dc935476b85e13117f7c392e48c63f31030 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 20 Oct 2016 15:40:41 +0300 Subject: [PATCH 207/341] Update gr.json --- src/languages/gr.json | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/languages/gr.json b/src/languages/gr.json index d9afae6..52986ef 100644 --- a/src/languages/gr.json +++ b/src/languages/gr.json @@ -2,9 +2,9 @@ "chat": { "actions": { "banUser": "Τιμωρία Χρήστη", - "makeMod": "Make Moderator", - "makeAdmin": "Make Admin", - "makeUser": "Make User", + "makeMod": "Κάνε Συντονιστή", + "makeAdmin": "Κάνε Διαχειριστή", + "makeUser": "Κάνε Χρήστη", "close": "Κλείσιμο", "invite": "Προσκάλεσε στη συζήτηση ", "createChat": "Δημιουργία συζητήσεως", @@ -19,16 +19,16 @@ "account": "Λογαριασμός", "title": "Συζήτηση", "creditEmoticon": "Emoticons provided by ", - "optional": "This part of the script is optional, so logging in is unneeded for raid catching etc.", + "optional": "Πεδίο προαιρετικό, δεν χρειάζεται να εισέλθετε.", "invalid": "This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.", - "offline": "Not logged in, click to login/register" + "offline": "Δεν έχει γίνει σύνδεση, πατήστε Εισαγωγή/Εγγραφή" }, "error": { - "modify": "Can't modify that user at the moment", - "create": "Can't create at the moment", - "join": "Joining didn't work", - "login": "Login failed in an unexpected way", - "unknown": "The given username for dotd.idrinth.de is unknown, do you want to register it there?" + "modify": "Δεν μπορεί να γίνει μεταβολή του χρήστη", + "create": "Δεν μπορεί να γίνει δημιουργία", + "join": "Αποτυχία εγγραφής", + "login": "Η σύνδεση απέτυχε", + "unknown": "Το όνομα χρήστη για την σελίδα dotd.idrinth.de είναι άγνωστο., θέλετε να κάνετε εγγραφή;" }, "notification": { "mention": "chat-mention notifications?", @@ -36,22 +36,22 @@ "message": "chat-message notifications?" } }, - "default": "Unexpected error occurred. Please contact script developers (https://github.com/Idrinth/IDotD).", + "default": "Προέκυψε απρόσμενο σφάλμα. Παρακαλώ επικοινωνήστε με τους διαχειριστές (https://github.com/Idrinth/IDotD).", "land": { - "lack": "You lack gold to buy any more buildings at the moment.", - "hour": " gold per hour each", - "calc": "Calculate", - "avaible": "Avaible Gold" + "lack": "Λόγω ελλείψεως χρυσού δεν μπορεί να γίνει αγορά κτιρίων.", + "hour": " χρυσός ανά ώρα έκαστο", + "calc": "Υπολογισμός", + "avaible": "Διαθέσιμος χρυσός" }, "tier": { - "search": "Enter Boss' Name", + "search": "Εισαγωγή ονόματος", "diff": { - "normal": "Normal", - "hard": "Hard", - "legend": "Legend", - "night": "Nightmare" + "normal": "Κανονικό", + "hard": "Δύσκολο", + "legend": "Θρυλικό", + "night": "Εφιαλτικό" }, - "tag": "Tag to screen-top", + "tag": "Προσθήκη στην οθόμη", "maxBoxes": "There is no space for another tier-box at the moment, please close one first." }, "raids": { From 9521d34803cac12740f9fc6b88f68908ec6d08fb Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sat, 22 Oct 2016 17:38:00 +0300 Subject: [PATCH 208/341] Create Drakontos, The First Terror [Drakontos].json --- ...akontos, The First Terror [Drakontos].json | 214 ++++++++++++++++++ 1 file changed, 214 insertions(+) create mode 100644 tiers/Drakontos, The First Terror [Drakontos].json diff --git a/tiers/Drakontos, The First Terror [Drakontos].json b/tiers/Drakontos, The First Terror [Drakontos].json new file mode 100644 index 0000000..204f250 --- /dev/null +++ b/tiers/Drakontos, The First Terror [Drakontos].json @@ -0,0 +1,214 @@ +{ + "nightmare":{ + "100000":{ + "epic": 15, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "200000":{ + "epic": 30, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "300000":{ + "epic": 35, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "500000":{ + "epic": 45, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "1000000":{ + "epic": 90, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "1500000":{ + "epic": 121, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "2000000":{ + "epic": 152, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "2500000":{ + "epic": 182, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "3000000":{ + "epic": 213, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "4000000":{ + "epic": 244, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "5000000":{ + "epic": 450, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "6000000":{ + "epic": 461, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "7000000":{ + "epic": 472, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "8000000":{ + "epic": 488, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "9000000":{ + "epic": 504, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "10000000":{ + "epic": 570, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "12500000":{ + "epic": 606, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "15000000":{ + "epic": 661, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "20000000":{ + "epic": 762, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "25000000":{ + "epic": 837, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "30000000":{ + "epic": 938, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "40000000":{ + "epic": 1014, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "50000000":{ + "epic": 1215, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "60000000":{ + "epic": 1316, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "70000000":{ + "epic": 1517, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "80000000":{ + "epic": 1718, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "90000000":{ + "epic": 1919, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "100000000":{ + "epic": 2045, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "150000000":{ + "epic": 2280, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "20000000":{ + "epic": 2640, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +} + } +} From 24535cf308535b45ca26db60c7db2a4724c0e006 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sat, 22 Oct 2016 17:43:11 +0300 Subject: [PATCH 209/341] Create Ascendant's Echo [Ascendant's Echo].json --- .../Ascendant's Echo [Ascendant's Echo].json | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 tiers/Ascendant's Echo [Ascendant's Echo].json diff --git a/tiers/Ascendant's Echo [Ascendant's Echo].json b/tiers/Ascendant's Echo [Ascendant's Echo].json new file mode 100644 index 0000000..f05831a --- /dev/null +++ b/tiers/Ascendant's Echo [Ascendant's Echo].json @@ -0,0 +1,88 @@ +{ + "nightmare":{ + "100000":{ + "epic": 11, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "250000":{ + "epic": 22, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "500000":{ + "epic": 48, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "1000000":{ + "epic": 94, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "1500000":{ + "epic": 140, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "2000000":{ + "epic": 186, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "3000000":{ + "epic": 277, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "5000000":{ + "epic": 328, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "7500000":{ + "epic": 444, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "10000000":{ + "epic": 480, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "15000000":{ + "epic": 581, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "18000000":{ + "epic": 612, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +} + } +} From e68ab87a601c3f98c55877619c43f93f0a781662 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sat, 22 Oct 2016 18:00:08 +0300 Subject: [PATCH 210/341] Create The Sight of Solus [Sight of Solus].json --- .../The Sight of Solus [Sight of Solus].json | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 tiers/The Sight of Solus [Sight of Solus].json diff --git a/tiers/The Sight of Solus [Sight of Solus].json b/tiers/The Sight of Solus [Sight of Solus].json new file mode 100644 index 0000000..13d0ab6 --- /dev/null +++ b/tiers/The Sight of Solus [Sight of Solus].json @@ -0,0 +1,67 @@ +{ + "nightmare":{ + "100000":{ + "epic": 10, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "300000":{ + "epic": 25, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "500000":{ + "epic": 45, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "1000000":{ + "epic": 91, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "3000000":{ + "epic": 273, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "5000000":{ + "epic": 325, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "7000000":{ + "epic": 377, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "8000000":{ + "epic": 428, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "10000000":{ + "epic": 480, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +} + } +} From 3c8b25ea33cada6d04e3edeb95354a5aec6c9376 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sat, 22 Oct 2016 18:57:58 +0300 Subject: [PATCH 211/341] Update AP Minizone Raid [Darkness].json --- tiers/AP Minizone Raid [Darkness].json | 90 ++++++++++++++++++++++---- 1 file changed, 78 insertions(+), 12 deletions(-) diff --git a/tiers/AP Minizone Raid [Darkness].json b/tiers/AP Minizone Raid [Darkness].json index b8aff10..112ad92 100644 --- a/tiers/AP Minizone Raid [Darkness].json +++ b/tiers/AP Minizone Raid [Darkness].json @@ -1,15 +1,81 @@ { - "nightmare":{ - "200000000":11, - "300000000":26, - "500000000":53, - "750000000":83, - "1000000000":114, - "1500000000":175, - "2000000000":236, - "2500000000":298, - "3000000000":358, - "4000000000":448, - "5000000000":508 + "nightmare":{ + "200000000":{ + "epic": 11, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "300000000":{ + "epic": 26, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "500000000":{ + "epic": 53, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "750000000":{ + "epic": 83, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "1000000000":{ + "epic": 114, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "1500000000":{ + "epic": 175, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "2000000000":{ + "epic": 236, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "2500000000":{ + "epic": 298, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "3000000000":{ + "epic": 358, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "4000000000":{ + "epic": 448, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +}, + "5000000000":{ + "epic": 508, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null +} } } From a7b4baf5b4c580fadb7829af1a76f20866dc320c Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sun, 23 Oct 2016 09:58:04 +0300 Subject: [PATCH 212/341] Update Ascendant's Echo [Ascendant's Echo].json --- .../Ascendant's Echo [Ascendant's Echo].json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tiers/Ascendant's Echo [Ascendant's Echo].json b/tiers/Ascendant's Echo [Ascendant's Echo].json index f05831a..e6dfc3c 100644 --- a/tiers/Ascendant's Echo [Ascendant's Echo].json +++ b/tiers/Ascendant's Echo [Ascendant's Echo].json @@ -1,83 +1,83 @@ { "nightmare":{ - "100000":{ + "100000000":{ "epic": 11, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "250000":{ + "250000000":{ "epic": 22, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "500000":{ + "500000000":{ "epic": 48, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "1000000":{ + "1000000000":{ "epic": 94, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "1500000":{ + "1500000000":{ "epic": 140, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "2000000":{ + "2000000000":{ "epic": 186, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "3000000":{ + "3000000000":{ "epic": 277, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "5000000":{ + "5000000000":{ "epic": 328, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "7500000":{ + "7500000000":{ "epic": 444, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "10000000":{ + "10000000000":{ "epic": 480, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "15000000":{ + "15000000000":{ "epic": 581, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "18000000":{ + "18000000000":{ "epic": 612, "legendary": null, "uncommon": null, From f5b9c2868ab6e2bc7f0ccfa48ccebf5bcd95fb12 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sun, 23 Oct 2016 10:01:30 +0300 Subject: [PATCH 213/341] Update Drakontos, The First Terror [Drakontos].json --- ...akontos, The First Terror [Drakontos].json | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/tiers/Drakontos, The First Terror [Drakontos].json b/tiers/Drakontos, The First Terror [Drakontos].json index 204f250..fa3168d 100644 --- a/tiers/Drakontos, The First Terror [Drakontos].json +++ b/tiers/Drakontos, The First Terror [Drakontos].json @@ -1,209 +1,209 @@ { "nightmare":{ - "100000":{ + "100000000":{ "epic": 15, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "200000":{ + "200000000":{ "epic": 30, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "300000":{ + "300000000":{ "epic": 35, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "500000":{ + "500000000":{ "epic": 45, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "1000000":{ + "1000000000":{ "epic": 90, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "1500000":{ + "1500000000":{ "epic": 121, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "2000000":{ + "2000000000":{ "epic": 152, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "2500000":{ + "2500000000":{ "epic": 182, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "3000000":{ + "3000000000":{ "epic": 213, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "4000000":{ + "4000000000":{ "epic": 244, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "5000000":{ + "5000000000":{ "epic": 450, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "6000000":{ + "6000000000":{ "epic": 461, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "7000000":{ + "7000000000":{ "epic": 472, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "8000000":{ + "8000000000":{ "epic": 488, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "9000000":{ + "9000000000":{ "epic": 504, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "10000000":{ + "10000000000":{ "epic": 570, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "12500000":{ + "12500000000":{ "epic": 606, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "15000000":{ + "15000000000":{ "epic": 661, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "20000000":{ + "20000000000":{ "epic": 762, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "25000000":{ + "25000000000":{ "epic": 837, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "30000000":{ + "30000000000":{ "epic": 938, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "40000000":{ + "40000000000":{ "epic": 1014, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "50000000":{ + "50000000000":{ "epic": 1215, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "60000000":{ + "60000000000":{ "epic": 1316, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "70000000":{ + "70000000000":{ "epic": 1517, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "80000000":{ + "80000000000":{ "epic": 1718, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "90000000":{ + "90000000000":{ "epic": 1919, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "100000000":{ + "100000000000":{ "epic": 2045, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "150000000":{ + "150000000000":{ "epic": 2280, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "20000000":{ + "20000000000":{ "epic": 2640, "legendary": null, "uncommon": null, From 76baf0401485980870b21863b422e57b29f97963 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sun, 23 Oct 2016 10:13:24 +0300 Subject: [PATCH 214/341] Update The Sight of Solus [Sight of Solus].json --- tiers/The Sight of Solus [Sight of Solus].json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tiers/The Sight of Solus [Sight of Solus].json b/tiers/The Sight of Solus [Sight of Solus].json index 13d0ab6..27802d8 100644 --- a/tiers/The Sight of Solus [Sight of Solus].json +++ b/tiers/The Sight of Solus [Sight of Solus].json @@ -1,62 +1,62 @@ { "nightmare":{ - "100000":{ + "100000000":{ "epic": 10, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "300000":{ + "300000000":{ "epic": 25, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "500000":{ + "500000000":{ "epic": 45, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "1000000":{ + "1000000000":{ "epic": 91, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "3000000":{ + "3000000000":{ "epic": 273, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "5000000":{ + "5000000000":{ "epic": 325, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "7000000":{ + "7000000000":{ "epic": 377, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "8000000":{ + "8000000000":{ "epic": 428, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "10000000":{ + "10000000000":{ "epic": 480, "legendary": null, "uncommon": null, From af3b08e52ebe121a130ff3109c7e1c10a07854c0 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sun, 23 Oct 2016 10:31:04 +0300 Subject: [PATCH 215/341] Update Agony [Agony].json --- tiers/Agony [Agony].json | 225 ++++++++++++++++++++++++++++++++++----- 1 file changed, 197 insertions(+), 28 deletions(-) diff --git a/tiers/Agony [Agony].json b/tiers/Agony [Agony].json index ffdd6d9..c4f862d 100644 --- a/tiers/Agony [Agony].json +++ b/tiers/Agony [Agony].json @@ -1,38 +1,207 @@ { "normal":{ - "105000":1, - "630000":1, - "910000":1, - "1750000":2, - "4970000":2.5, - "12670000":3, - "28700000":3.5 + "105000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null }, + "630000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "910000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1750000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4970000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "12670000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "28700000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +}, + "hard":{ - "131000":1, - "788000":1, - "1138000":1, - "2188000":2, - "6213000":2.5, - "15838000":3, - "35875000":3.5 + "131000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null }, + "788000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1138000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2188000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "6213000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15838000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "35875000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +}, + "legendary":{ - "168000":1, - "1008000":1, - "1456000":1, - "2800000":2, - "7952000":2.5, - "20272000":3, - "45920000":3.5 + "168000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null }, + "1008000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1456000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2800000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7952000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20272000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "45920000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +}, "nightmare":{ - "210000":1, - "1260000":1, - "1820000":1, - "3500000":2, - "9940000":2.5, - "25340000":3, - "57400000":3.5 + "210000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1260000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1820000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3500000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "9940000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25340000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "57400000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null } } From 2abaf6d5c7ce862ec5578bfc68313ee69aedaa0e Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sun, 23 Oct 2016 10:37:11 +0300 Subject: [PATCH 216/341] Update Agony [Agony].json --- tiers/Agony [Agony].json | 1 + 1 file changed, 1 insertion(+) diff --git a/tiers/Agony [Agony].json b/tiers/Agony [Agony].json index c4f862d..1179136 100644 --- a/tiers/Agony [Agony].json +++ b/tiers/Agony [Agony].json @@ -204,4 +204,5 @@ "common": null, "stats": null } + } } From 8377dba82d10ff63a25306fbcb7da7c481beef60 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sun, 23 Oct 2016 10:49:04 +0300 Subject: [PATCH 217/341] Update Lunatics [Lunatics].json --- tiers/Lunatics [Lunatics].json | 225 +++++++++++++++++++++++++++++---- 1 file changed, 197 insertions(+), 28 deletions(-) diff --git a/tiers/Lunatics [Lunatics].json b/tiers/Lunatics [Lunatics].json index 087bf62..417c12e 100644 --- a/tiers/Lunatics [Lunatics].json +++ b/tiers/Lunatics [Lunatics].json @@ -1,38 +1,207 @@ { "normal":{ - "450000":1, - "2520000":1, - "3420000":1, - "7380000":2, - "11250000":2.5, - "24300000":3, - "30600000":3.5 + "450000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null }, + "2520000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3420000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7380000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "11250000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "24300000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30600000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +}, + "hard":{ - "563000":1, - "3150000":1, - "4275000":1, - "9225000":2, - "14063000":2.5, - "30375000":3, - "38250000":3.5 + "563000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null }, + "3150000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4275000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "9225000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "14063000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30375000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "38250000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +}, + "legendary":{ - "720000":1, - "4032000":1, - "5472000":1, - "11808000":2, - "18000000":2.5, - "38880000":3, - "48960000":3.5 + "720000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null }, + "4032000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5472000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "11808000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "18000000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "38880000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "48960000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +}, "nightmare":{ - "900000":1, - "5040000":1, - "6840000":1, - "14760000":2, - "22500000":2.5, - "48600000":3, - "61200000":3.5 + "900000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5040000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "6840000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "14760000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "22500000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "48600000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "61200000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null } } From b977c9ee9fdc39e07b9177067a5cf2ea2bbf7ae4 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sun, 23 Oct 2016 11:45:58 +0300 Subject: [PATCH 218/341] Create Unholy Rite [Unholy Rite].json --- tiers/Unholy Rite [Unholy Rite].json | 130 +++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 tiers/Unholy Rite [Unholy Rite].json diff --git a/tiers/Unholy Rite [Unholy Rite].json b/tiers/Unholy Rite [Unholy Rite].json new file mode 100644 index 0000000..e963f15 --- /dev/null +++ b/tiers/Unholy Rite [Unholy Rite].json @@ -0,0 +1,130 @@ +{ + + "nightmare":{ + "50000000":{ + "epic": 10, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "100000000":{ + "epic": 25, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "200000000":{ + "epic": 34, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "300000000":{ + "epic": 45, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "500000000":{ + "epic": 60, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "750000000":{ + "epic": 85, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000":{ + "epic": 111, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1500000000":{ + "epic": 162, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2000000000":{ + "epic": 212, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2500000000":{ + "epic": 264, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000000":{ + "epic": 331, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4000000000":{ + "epic": 381, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000":{ + "epic": 433, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7500000000":{ + "epic": 485, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000":{ + "epic": 541, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000":{ + "epic": 624, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000":{ + "epic": 707, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25000000000":{ + "epic": 815, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +} From 39f8e25c3a238c29080c4807cc889631cc58991c Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 24 Oct 2016 17:45:42 +0300 Subject: [PATCH 219/341] Update Lunatics [Lunatics].json From 5dc19b16ac9c9600e939d4822c8523d0161b8b3d Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 24 Oct 2016 18:00:14 +0300 Subject: [PATCH 220/341] Create Jershan'thurn's Portal [Jershan'thurn].json --- ...ershan'thurn's Portal [Jershan'thurn].json | 179 ++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 tiers/Jershan'thurn's Portal [Jershan'thurn].json diff --git a/tiers/Jershan'thurn's Portal [Jershan'thurn].json b/tiers/Jershan'thurn's Portal [Jershan'thurn].json new file mode 100644 index 0000000..e2fd9a2 --- /dev/null +++ b/tiers/Jershan'thurn's Portal [Jershan'thurn].json @@ -0,0 +1,179 @@ +{ + + "nightmare":{ + "100000":{ + "epic": 6, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "200000":{ + "epic": 16, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "400000":{ + "epic": 32, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "500000":{ + "epic": 50, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "800000":{ + "epic": 84, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "900000":{ + "epic": 95, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000":{ + "epic": 117, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1250000":{ + "epic": 177, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1500000":{ + "epic": 208, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1750000":{ + "epic": 228, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2000000":{ + "epic": 239, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2500000":{ + "epic": 270, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000":{ + "epic": 306, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4000000":{ + "epic": 368, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000":{ + "epic": 430, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "6000000":{ + "epic": 492, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "8000000":{ + "epic": 556, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000":{ + "epic": 605, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "12500000":{ + "epic": 640, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000":{ + "epic": 705, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000":{ + "epic": 790, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25000000":{ + "epic": 860, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30000000":{ + "epic": 915, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "40000000":{ + "epic": 1040, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "50000000":{ + "epic": 1150, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +} From c6498d2369f8e02d96164a64a2aaf8819ff45bae Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Tue, 25 Oct 2016 15:21:42 +0300 Subject: [PATCH 221/341] Create Lost [Lost].json --- tiers/Lost [Lost].json | 74 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 tiers/Lost [Lost].json diff --git a/tiers/Lost [Lost].json b/tiers/Lost [Lost].json new file mode 100644 index 0000000..1749871 --- /dev/null +++ b/tiers/Lost [Lost].json @@ -0,0 +1,74 @@ +{ + + "nightmare":{ + "500000":{ + "epic": 25, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000":{ + "epic": 71, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2000000":{ + "epic": 142, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000":{ + "epic": 223, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4000000":{ + "epic": 309, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000":{ + "epic": 391, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7500000":{ + "epic": 598, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000":{ + "epic": 785, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000":{ + "epic": 930, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000":{ + "epic": 1015, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +} From 5aa6cc7c99e14b9d82a60aa8d1d68bcb7db98214 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Tue, 25 Oct 2016 15:30:29 +0300 Subject: [PATCH 222/341] Create Lord Hoton the Usurper [Lord Hoton].json --- .../Lord Hoton the Usurper [Lord Hoton].json | 109 ++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 tiers/Lord Hoton the Usurper [Lord Hoton].json diff --git a/tiers/Lord Hoton the Usurper [Lord Hoton].json b/tiers/Lord Hoton the Usurper [Lord Hoton].json new file mode 100644 index 0000000..f4a95c4 --- /dev/null +++ b/tiers/Lord Hoton the Usurper [Lord Hoton].json @@ -0,0 +1,109 @@ +{ + + "nightmare":{ + "1000000":{ + "epic": 71, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2000000":{ + "epic": 148, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000":{ + "epic": 219, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4000000":{ + "epic": 256, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000":{ + "epic": 299, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "6000000":{ + "epic": 318, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7000000":{ + "epic": 337, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "8000000":{ + "epic": 356, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "9000000":{ + "epic": 390, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000":{ + "epic": 427, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "12500000":{ + "epic": 446, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000":{ + "epic": 474, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "17500000":{ + "epic": 496, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000":{ + "epic": 539, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25000000":{ + "epic": 586, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +} From 062324e8f8d42007ffd7d154f54064e0963345c8 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Tue, 25 Oct 2016 15:37:11 +0300 Subject: [PATCH 223/341] Update Unholy Rite [Unholy Rite].json --- tiers/Unholy Rite [Unholy Rite].json | 72 ++++------------------------ 1 file changed, 8 insertions(+), 64 deletions(-) diff --git a/tiers/Unholy Rite [Unholy Rite].json b/tiers/Unholy Rite [Unholy Rite].json index e963f15..4c45020 100644 --- a/tiers/Unholy Rite [Unholy Rite].json +++ b/tiers/Unholy Rite [Unholy Rite].json @@ -1,89 +1,33 @@ { "nightmare":{ - "50000000":{ - "epic": 10, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "100000000":{ - "epic": 25, + "2000000000":{ + "epic": 212, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "200000000":{ - "epic": 34, + "2500000000":{ + "epic": 264, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "300000000":{ - "epic": 45, + "3000000000":{ + "epic": 331, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "500000000":{ - "epic": 60, + "4000000000":{ + "epic": 381, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "750000000":{ - "epic": 85, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1000000000":{ - "epic": 111, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1500000000":{ - "epic": 162, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2000000000":{ - "epic": 212, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2500000000":{ - "epic": 264, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3000000000":{ - "epic": 331, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4000000000":{ - "epic": 381, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null }, "5000000000":{ "epic": 433, From 2a2a68248e3e5722b6b0ea0bb15db4c25e9ed34f Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Tue, 25 Oct 2016 19:46:53 +0300 Subject: [PATCH 224/341] Create Beastman Stampede [Stampede].json --- tiers/Beastman Stampede [Stampede].json | 102 ++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 tiers/Beastman Stampede [Stampede].json diff --git a/tiers/Beastman Stampede [Stampede].json b/tiers/Beastman Stampede [Stampede].json new file mode 100644 index 0000000..e305893 --- /dev/null +++ b/tiers/Beastman Stampede [Stampede].json @@ -0,0 +1,102 @@ +{ + + "nightmare":{ + "1000000":{ + "epic": 24, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000":{ + "epic": 156, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000":{ + "epic": 635, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000":{ + "epic": 790, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000":{ + "epic": 941, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000":{ + "epic": 1062, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25000000000":{ + "epic": 1168, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30000000000":{ + "epic": 1259, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "40000000000":{ + "epic": 1335, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "50000000000":{ + "epic": 1606, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "60000000000":{ + "epic": 1757, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "80000000000":{ + "epic": 2298, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "100000000000":{ + "epic": 2810, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "150000000000":{ + "epic": 3030, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +} From 61f61a636a1ec48e2794959ec9aae972cfe878df Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Tue, 25 Oct 2016 19:51:29 +0300 Subject: [PATCH 225/341] Create Hullbore Wyrms [Hullbore Wyrms].json --- tiers/Hullbore Wyrms [Hullbore Wyrms].json | 130 +++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 tiers/Hullbore Wyrms [Hullbore Wyrms].json diff --git a/tiers/Hullbore Wyrms [Hullbore Wyrms].json b/tiers/Hullbore Wyrms [Hullbore Wyrms].json new file mode 100644 index 0000000..d0e7e7e --- /dev/null +++ b/tiers/Hullbore Wyrms [Hullbore Wyrms].json @@ -0,0 +1,130 @@ +{ + + "nightmare":{ + "500000":{ + "epic": 10, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000":{ + "epic": 25, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2000000":{ + "epic": 34, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000":{ + "epic": 45, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000":{ + "epic": 60, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7500000":{ + "epic": 85, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000":{ + "epic": 111, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1500000000":{ + "epic": 162, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2000000000":{ + "epic": 215, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2500000000":{ + "epic": 266, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000000":{ + "epic": 332, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4000000000":{ + "epic": 383, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000":{ + "epic": 435, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7500000000":{ + "epic": 485, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000":{ + "epic": 545, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000":{ + "epic": 630, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000":{ + "epic": 715, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25000000000":{ + "epic": 825, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +} From adc76dd1375302743cfa08743273e19394d5d75c Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sun, 30 Oct 2016 17:37:46 +0200 Subject: [PATCH 226/341] Update Lunatics [Lunatics].json --- tiers/Lunatics [Lunatics].json | 1 + 1 file changed, 1 insertion(+) diff --git a/tiers/Lunatics [Lunatics].json b/tiers/Lunatics [Lunatics].json index 417c12e..362c154 100644 --- a/tiers/Lunatics [Lunatics].json +++ b/tiers/Lunatics [Lunatics].json @@ -204,4 +204,5 @@ "common": null, "stats": null } + } } From bac423d5ba20b256c709b7254e96a27c8ccd2aac Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sun, 30 Oct 2016 17:39:26 +0200 Subject: [PATCH 227/341] Update Jershan'thurn's Portal [Jershan'thurn].json --- tiers/Jershan'thurn's Portal [Jershan'thurn].json | 1 + 1 file changed, 1 insertion(+) diff --git a/tiers/Jershan'thurn's Portal [Jershan'thurn].json b/tiers/Jershan'thurn's Portal [Jershan'thurn].json index e2fd9a2..a455efe 100644 --- a/tiers/Jershan'thurn's Portal [Jershan'thurn].json +++ b/tiers/Jershan'thurn's Portal [Jershan'thurn].json @@ -177,3 +177,4 @@ "stats": null } } +} From 621d813aa7df4bbc63898576375bb31ff583f0dc Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sun, 30 Oct 2016 17:40:24 +0200 Subject: [PATCH 228/341] Update Lord Hoton the Usurper [Lord Hoton].json --- tiers/Lord Hoton the Usurper [Lord Hoton].json | 1 + 1 file changed, 1 insertion(+) diff --git a/tiers/Lord Hoton the Usurper [Lord Hoton].json b/tiers/Lord Hoton the Usurper [Lord Hoton].json index f4a95c4..ba37127 100644 --- a/tiers/Lord Hoton the Usurper [Lord Hoton].json +++ b/tiers/Lord Hoton the Usurper [Lord Hoton].json @@ -107,3 +107,4 @@ "stats": null } } +} From cb30a713967c838a4f8939d2a86aae873812b4b1 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sun, 30 Oct 2016 17:40:56 +0200 Subject: [PATCH 229/341] Update Unholy Rite [Unholy Rite].json --- tiers/Unholy Rite [Unholy Rite].json | 1 + 1 file changed, 1 insertion(+) diff --git a/tiers/Unholy Rite [Unholy Rite].json b/tiers/Unholy Rite [Unholy Rite].json index 4c45020..f914384 100644 --- a/tiers/Unholy Rite [Unholy Rite].json +++ b/tiers/Unholy Rite [Unholy Rite].json @@ -72,3 +72,4 @@ "stats": null } } +} From 4687dc793200a19d3073246b7c57110beb2d1e1e Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sun, 30 Oct 2016 17:44:50 +0200 Subject: [PATCH 230/341] Update Hullbore Wyrms [Hullbore Wyrms].json --- tiers/Hullbore Wyrms [Hullbore Wyrms].json | 37 +++++++++++----------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/tiers/Hullbore Wyrms [Hullbore Wyrms].json b/tiers/Hullbore Wyrms [Hullbore Wyrms].json index d0e7e7e..8528f3a 100644 --- a/tiers/Hullbore Wyrms [Hullbore Wyrms].json +++ b/tiers/Hullbore Wyrms [Hullbore Wyrms].json @@ -1,126 +1,126 @@ { "nightmare":{ - "500000":{ + "500000000":{ "epic": 10, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "1000000":{ + "1000000000":{ "epic": 25, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "2000000":{ + "2000000000":{ "epic": 34, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "3000000":{ + "3000000000":{ "epic": 45, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "5000000":{ + "5000000000":{ "epic": 60, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "7500000":{ + "7500000000":{ "epic": 85, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "1000000000":{ + "1000000000000":{ "epic": 111, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "1500000000":{ + "1500000000000":{ "epic": 162, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "2000000000":{ + "2000000000000":{ "epic": 215, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "2500000000":{ + "2500000000000":{ "epic": 266, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "3000000000":{ + "3000000000000":{ "epic": 332, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "4000000000":{ + "4000000000000":{ "epic": 383, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "5000000000":{ + "5000000000000":{ "epic": 435, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "7500000000":{ + "7500000000000":{ "epic": 485, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "10000000000":{ + "10000000000000":{ "epic": 545, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "15000000000":{ + "15000000000000":{ "epic": 630, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "20000000000":{ + "20000000000000":{ "epic": 715, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "25000000000":{ + "25000000000000":{ "epic": 825, "legendary": null, "uncommon": null, @@ -128,3 +128,4 @@ "stats": null } } +} From 8505d16356fbd058c08ee57c8ca9fadba479ca15 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sun, 30 Oct 2016 17:45:28 +0200 Subject: [PATCH 231/341] Update Beastman Stampede [Stampede].json --- tiers/Beastman Stampede [Stampede].json | 1 + 1 file changed, 1 insertion(+) diff --git a/tiers/Beastman Stampede [Stampede].json b/tiers/Beastman Stampede [Stampede].json index e305893..0173e60 100644 --- a/tiers/Beastman Stampede [Stampede].json +++ b/tiers/Beastman Stampede [Stampede].json @@ -100,3 +100,4 @@ "stats": null } } +} From fdc5c2d597978066af3bfcc2b62351d247ef6aae Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Sun, 30 Oct 2016 17:45:52 +0200 Subject: [PATCH 232/341] Update Lost [Lost].json --- tiers/Lost [Lost].json | 1 + 1 file changed, 1 insertion(+) diff --git a/tiers/Lost [Lost].json b/tiers/Lost [Lost].json index 1749871..1b61be4 100644 --- a/tiers/Lost [Lost].json +++ b/tiers/Lost [Lost].json @@ -72,3 +72,4 @@ "stats": null } } +} From ca0194e0ed83b58b10179ab7421fef0608cd1891 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 31 Oct 2016 16:04:09 +0200 Subject: [PATCH 233/341] Update Beastman Stampede [Stampede].json --- tiers/Beastman Stampede [Stampede].json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tiers/Beastman Stampede [Stampede].json b/tiers/Beastman Stampede [Stampede].json index 0173e60..530e2fd 100644 --- a/tiers/Beastman Stampede [Stampede].json +++ b/tiers/Beastman Stampede [Stampede].json @@ -1,7 +1,7 @@ { "nightmare":{ - "1000000":{ + "100000000":{ "epic": 24, "legendary": null, "uncommon": null, From 03f7d7338ac1dfd2dab25337d04eb48032ec3be9 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 31 Oct 2016 16:16:05 +0200 Subject: [PATCH 234/341] Update Jershan'thurn's Portal [Jershan'thurn].json --- ...ershan'thurn's Portal [Jershan'thurn].json | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/tiers/Jershan'thurn's Portal [Jershan'thurn].json b/tiers/Jershan'thurn's Portal [Jershan'thurn].json index a455efe..a577be2 100644 --- a/tiers/Jershan'thurn's Portal [Jershan'thurn].json +++ b/tiers/Jershan'thurn's Portal [Jershan'thurn].json @@ -1,168 +1,168 @@ { "nightmare":{ - "100000":{ + "100000000":{ "epic": 6, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "200000":{ + "200000000":{ "epic": 16, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "400000":{ + "400000000":{ "epic": 32, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "500000":{ + "500000000":{ "epic": 50, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "800000":{ + "800000000":{ "epic": 84, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "900000":{ + "900000000":{ "epic": 95, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "1000000":{ + "1000000000":{ "epic": 117, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "1250000":{ + "1250000000":{ "epic": 177, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "1500000":{ + "1500000000":{ "epic": 208, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "1750000":{ + "1750000000":{ "epic": 228, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "2000000":{ + "2000000000":{ "epic": 239, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "2500000":{ + "2500000000":{ "epic": 270, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "3000000":{ + "3000000000":{ "epic": 306, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "4000000":{ + "4000000000":{ "epic": 368, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "5000000":{ + "5000000000":{ "epic": 430, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "6000000":{ + "6000000000":{ "epic": 492, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "8000000":{ + "8000000000":{ "epic": 556, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "10000000":{ + "10000000000":{ "epic": 605, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "12500000":{ + "12500000000":{ "epic": 640, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "15000000":{ + "15000000000":{ "epic": 705, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "20000000":{ + "20000000000":{ "epic": 790, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "25000000":{ + "25000000000":{ "epic": 860, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "30000000":{ + "30000000000":{ "epic": 915, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "40000000":{ + "40000000000":{ "epic": 1040, "legendary": null, "uncommon": null, From f644fadb99f52744bdb712181f9c976d31f84f2f Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 31 Oct 2016 16:18:03 +0200 Subject: [PATCH 235/341] Update Lord Hoton the Usurper [Lord Hoton].json --- .../Lord Hoton the Usurper [Lord Hoton].json | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tiers/Lord Hoton the Usurper [Lord Hoton].json b/tiers/Lord Hoton the Usurper [Lord Hoton].json index ba37127..1ebd11b 100644 --- a/tiers/Lord Hoton the Usurper [Lord Hoton].json +++ b/tiers/Lord Hoton the Usurper [Lord Hoton].json @@ -1,105 +1,105 @@ { "nightmare":{ - "1000000":{ + "1000000000":{ "epic": 71, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "2000000":{ + "2000000000":{ "epic": 148, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "3000000":{ + "3000000000":{ "epic": 219, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "4000000":{ + "4000000000":{ "epic": 256, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "5000000":{ + "5000000000":{ "epic": 299, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "6000000":{ + "6000000000":{ "epic": 318, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "7000000":{ + "7000000000":{ "epic": 337, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "8000000":{ + "8000000000":{ "epic": 356, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "9000000":{ + "9000000000":{ "epic": 390, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "10000000":{ + "10000000000":{ "epic": 427, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "12500000":{ + "12500000000":{ "epic": 446, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "15000000":{ + "15000000000":{ "epic": 474, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "17500000":{ + "17500000000":{ "epic": 496, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "20000000":{ + "20000000000":{ "epic": 539, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "25000000":{ + "25000000000":{ "epic": 586, "legendary": null, "uncommon": null, From 440c562c28520bcd74d1bc7d554c7d7821eec58e Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 31 Oct 2016 16:23:57 +0200 Subject: [PATCH 236/341] Update Hullbore Wyrms [Hullbore Wyrms].json --- tiers/Hullbore Wyrms [Hullbore Wyrms].json | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tiers/Hullbore Wyrms [Hullbore Wyrms].json b/tiers/Hullbore Wyrms [Hullbore Wyrms].json index 8528f3a..2613bab 100644 --- a/tiers/Hullbore Wyrms [Hullbore Wyrms].json +++ b/tiers/Hullbore Wyrms [Hullbore Wyrms].json @@ -1,126 +1,126 @@ { "nightmare":{ - "500000000":{ + "50000000":{ "epic": 10, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "1000000000":{ + "100000000":{ "epic": 25, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "2000000000":{ + "200000000":{ "epic": 34, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "3000000000":{ + "300000000":{ "epic": 45, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "5000000000":{ + "500000000":{ "epic": 60, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "7500000000":{ + "750000000":{ "epic": 85, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "1000000000000":{ + "1000000000":{ "epic": 111, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "1500000000000":{ + "1500000000":{ "epic": 162, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "2000000000000":{ + "2000000000":{ "epic": 215, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "2500000000000":{ + "2500000000":{ "epic": 266, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "3000000000000":{ + "3000000000":{ "epic": 332, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "4000000000000":{ + "4000000000":{ "epic": 383, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "5000000000000":{ + "5000000000":{ "epic": 435, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "7500000000000":{ + "7500000000":{ "epic": 485, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "10000000000000":{ + "10000000000":{ "epic": 545, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "15000000000000":{ + "15000000000":{ "epic": 630, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "20000000000000":{ + "20000000000":{ "epic": 715, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "25000000000000":{ + "25000000000":{ "epic": 825, "legendary": null, "uncommon": null, From 1d12b3ba386da7e69241d83bbad8149c747aa9dd Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 31 Oct 2016 16:26:56 +0200 Subject: [PATCH 237/341] Update Lost [Lost].json --- tiers/Lost [Lost].json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tiers/Lost [Lost].json b/tiers/Lost [Lost].json index 1b61be4..22b8933 100644 --- a/tiers/Lost [Lost].json +++ b/tiers/Lost [Lost].json @@ -1,70 +1,70 @@ { "nightmare":{ - "500000":{ + "500000000":{ "epic": 25, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "1000000":{ + "1000000000":{ "epic": 71, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "2000000":{ + "2000000000":{ "epic": 142, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "3000000":{ + "3000000000":{ "epic": 223, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "4000000":{ + "4000000000":{ "epic": 309, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "5000000":{ + "5000000000":{ "epic": 391, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "7500000":{ + "7500000000":{ "epic": 598, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "10000000":{ + "10000000000":{ "epic": 785, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "15000000":{ + "15000000000":{ "epic": 930, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "20000000":{ + "20000000000":{ "epic": 1015, "legendary": null, "uncommon": null, From c4d4e60507eb7cd9f551eb45f1d119f930450b98 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 31 Oct 2016 16:39:21 +0200 Subject: [PATCH 238/341] Create Bloodsuckers [Bloodsuckers].json --- tiers/Bloodsuckers [Bloodsuckers].json | 67 ++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 tiers/Bloodsuckers [Bloodsuckers].json diff --git a/tiers/Bloodsuckers [Bloodsuckers].json b/tiers/Bloodsuckers [Bloodsuckers].json new file mode 100644 index 0000000..4820072 --- /dev/null +++ b/tiers/Bloodsuckers [Bloodsuckers].json @@ -0,0 +1,67 @@ +{ + "nightmare":{ + "1000000000":{ + "epic": 18, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000":{ + "epic": 47, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000":{ + "epic": 78, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1500000000":{ + "epic": 99, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2000000000":{ + "epic": 120, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2500000000":{ + "epic": 170, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000":{ + "epic": 250, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7500000000":{ + "epic": 300, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000":{ + "epic": 350, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +} +} From 598dc181061f9eb64772dec2d1f8ab431b7042f6 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 31 Oct 2016 16:56:11 +0200 Subject: [PATCH 239/341] Update Bloodsuckers [Bloodsuckers].json --- tiers/Bloodsuckers [Bloodsuckers].json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tiers/Bloodsuckers [Bloodsuckers].json b/tiers/Bloodsuckers [Bloodsuckers].json index 4820072..e75942f 100644 --- a/tiers/Bloodsuckers [Bloodsuckers].json +++ b/tiers/Bloodsuckers [Bloodsuckers].json @@ -1,13 +1,13 @@ { "nightmare":{ - "1000000000":{ + "100000000":{ "epic": 18, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "5000000000":{ + "500000000":{ "epic": 47, "legendary": null, "uncommon": null, From 0bded8a4c3392d1839371e9e6e00c9b6765b4082 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 31 Oct 2016 17:21:07 +0200 Subject: [PATCH 240/341] Create Elite Bloodsuckers [E. Bloodsuckers].json --- .../Elite Bloodsuckers [E. Bloodsuckers].json | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 tiers/Elite Bloodsuckers [E. Bloodsuckers].json diff --git a/tiers/Elite Bloodsuckers [E. Bloodsuckers].json b/tiers/Elite Bloodsuckers [E. Bloodsuckers].json new file mode 100644 index 0000000..f8d1ddd --- /dev/null +++ b/tiers/Elite Bloodsuckers [E. Bloodsuckers].json @@ -0,0 +1,81 @@ +{ + "nightmare":{ + "10000000000":{ + "epic": 300, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000":{ + "epic": 700, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30000000000":{ + "epic": 1800, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "40000000000":{ + "epic": 2500, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "50000000000":{ + "epic": 3150, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "60000000000":{ + "epic": 3900, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "70000000000":{ + "epic": 4600, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "80000000000":{ + "epic": 5500, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "90000000000":{ + "epic": 6000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "100000000000":{ + "epic": 6400, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "120000000000":{ + "epic": 7500, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +} +} From 0fd4cb0f671f2fa858053ccc077abfcb3dec8245 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 31 Oct 2016 17:29:48 +0200 Subject: [PATCH 241/341] Create Reaper Mantis [Mantis].json --- tiers/Reaper Mantis [Mantis].json | 123 ++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 tiers/Reaper Mantis [Mantis].json diff --git a/tiers/Reaper Mantis [Mantis].json b/tiers/Reaper Mantis [Mantis].json new file mode 100644 index 0000000..fcb1e89 --- /dev/null +++ b/tiers/Reaper Mantis [Mantis].json @@ -0,0 +1,123 @@ +{ + "nightmare":{ + "100000000":{ + "epic": 6, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "500000000":{ + "epic": 49, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000":{ + "epic": 231, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1500000000":{ + "epic": 411, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2000000000":{ + "epic": 472, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2500000000":{ + "epic": 532, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000000":{ + "epic": 618, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4000000000":{ + "epic": 779, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000":{ + "epic": 905, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "6000000000":{ + "epic": 1026, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "8000000000":{ + "epic": 1148, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000":{ + "epic": 1215, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "12500000000":{ + "epic": 1308, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000":{ + "epic": 1465, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000":{ + "epic": 1625, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25000000000":{ + "epic": 1780, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30000000000":{ + "epic": 1880, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +} +} From f10d9820b433847b88528f5f122b62cb5f1bfc05 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 31 Oct 2016 17:32:30 +0200 Subject: [PATCH 242/341] Create Initiates of the Abyss [Initiates].json --- tiers/Initiates of the Abyss [Initiates].json | 123 ++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 tiers/Initiates of the Abyss [Initiates].json diff --git a/tiers/Initiates of the Abyss [Initiates].json b/tiers/Initiates of the Abyss [Initiates].json new file mode 100644 index 0000000..fcb1e89 --- /dev/null +++ b/tiers/Initiates of the Abyss [Initiates].json @@ -0,0 +1,123 @@ +{ + "nightmare":{ + "100000000":{ + "epic": 6, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "500000000":{ + "epic": 49, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000":{ + "epic": 231, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1500000000":{ + "epic": 411, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2000000000":{ + "epic": 472, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2500000000":{ + "epic": 532, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000000":{ + "epic": 618, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4000000000":{ + "epic": 779, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000":{ + "epic": 905, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "6000000000":{ + "epic": 1026, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "8000000000":{ + "epic": 1148, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000":{ + "epic": 1215, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "12500000000":{ + "epic": 1308, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000":{ + "epic": 1465, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000":{ + "epic": 1625, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25000000000":{ + "epic": 1780, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30000000000":{ + "epic": 1880, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +} +} From 50f22d88ba41be6688a7e141dc94b11123537331 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 31 Oct 2016 17:46:03 +0200 Subject: [PATCH 243/341] Create Engine of the Ancients [Engine of the Ancients].json --- ...the Ancients [Engine of the Ancients].json | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 tiers/Engine of the Ancients [Engine of the Ancients].json diff --git a/tiers/Engine of the Ancients [Engine of the Ancients].json b/tiers/Engine of the Ancients [Engine of the Ancients].json new file mode 100644 index 0000000..b9a15b9 --- /dev/null +++ b/tiers/Engine of the Ancients [Engine of the Ancients].json @@ -0,0 +1,60 @@ +{ + "nightmare":{ + "100000000":{ + "epic": 25, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000":{ + "epic": 91, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000":{ + "epic": 450, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000":{ + "epic": 550, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000":{ + "epic": 661, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000":{ + "epic": 762, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25000000000":{ + "epic": 838, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30000000000":{ + "epic": 939, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +} +} From 1bd706f640b8c25a42e02592e11f377bfe43bcf4 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Thu, 3 Nov 2016 20:56:52 +0200 Subject: [PATCH 244/341] Create Konungar [Konungar].json --- tiers/Konungar [Konungar].json | 141 +++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 tiers/Konungar [Konungar].json diff --git a/tiers/Konungar [Konungar].json b/tiers/Konungar [Konungar].json new file mode 100644 index 0000000..8312fb0 --- /dev/null +++ b/tiers/Konungar [Konungar].json @@ -0,0 +1,141 @@ +{ + "nightmare": + { + "500000000": + { + "epic": 24, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000": + { + "epic": 50, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2000000000": + { + "epic": 140, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000000": + { + "epic": 240, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000": + { + "epic": 420, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "8000000000": + { + "epic": 750, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000": + { + "epic": 900, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000": + { + "epic": 1100, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000": + { + "epic": 1300, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30000000000": + { + "epic": 1539, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "40000000000": + { + "epic": 1740, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "50000000000": + { + "epic": 1920, + "legendary": null, + "uncommon": null, + "common": null, + "stats": 100 + }, + "75000000000": + { + "epic": 2080, + "legendary": null, + "uncommon": null, + "common": null, + "stats": 300 + }, + "100000000000": + { + "epic": 2700, + "legendary": null, + "uncommon": null, + "common": null, + "stats": 700 + }, + "150000000000": + { + "epic": 3100, + "legendary": null, + "uncommon": null, + "common": null, + "stats": 825 + }, + "200000000000": + { + "epic": 3300, + "legendary": null, + "uncommon": null, + "common": null, + "stats": 925 + }, + "300000000000": + { + "epic": 3709, + "legendary": null, + "uncommon": null, + "common": null, + "stats": 1003 + } + } +} From 3ca18833c696cb9673b7fc092343d753b8ff5517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 4 Nov 2016 10:24:10 +0100 Subject: [PATCH 245/341] reformatting to make #225 mergeable --- tiers/AP Minizone Raid [Darkness].json | 96 ++--- tiers/Adastros of the Kavala [Adrastos].json | 54 +-- tiers/Agony [Agony].json | 148 ++++--- tiers/Apoc Demon [Apoc Demon].json | 102 ++--- .../Ascendant's Echo [Ascendant's Echo].json | 126 +++--- ...' Elite Gladiators [Elite Gladiators].json | 128 +++--- tiers/Beastman Stampede [Stampede].json | 169 ++++---- tiers/Bloodsuckers [Bloodsuckers].json | 78 ++-- tiers/Deathglare [Deathglare].json | 64 +-- tiers/Dirthax [Dirthax].json | 400 +++++++++--------- ...akontos, The First Terror [Drakontos].json | 368 ++++++++-------- .../Elite Bloodsuckers [E. Bloodsuckers].json | 106 ++--- ...the Ancients [Engine of the Ancients].json | 34 +- ...elendis and Shaoquin [Banhammer Bros].json | 64 +-- tiers/Fog Of Wars [Cannibals].json | 24 +- tiers/Fog Of Wars [Verkiteia].json | 22 +- tiers/Gladiators [Gladiators].json | 64 +-- tiers/Groblar [Groblar].json | 64 +-- tiers/Grundus [Grundus].json | 16 +- tiers/Hammer [Hammer].json | 64 +-- tiers/Hullbore Wyrms [Hullbore Wyrms].json | 115 +++-- tiers/Initiates of the Abyss [Initiates].json | 70 +-- ...ershan'thurn's Portal [Jershan'thurn].json | 303 +++++++------ tiers/Konungar [Konungar].json | 276 ++++++------ .../Lord Hoton the Usurper [Lord Hoton].json | 173 ++++---- tiers/Lost [Lost].json | 93 ++-- tiers/Lunatics [Lunatics].json | 148 ++++--- tiers/Prince Obyron [Obyron].json | 64 +-- tiers/Ragetalon [Ragetalon].json | 64 +-- tiers/Reaper Mantis [Mantis].json | 70 +-- ...Rhalmarius the Despoiler [Rhalmarius].json | 16 +- tiers/Scuttlegore [Scuttlegore].json | 64 +-- tiers/Tetrarchos [Tetrarchos].json | 64 +-- tiers/The Black Moon Pack [Black Moon].json | 64 +-- .../The Sight of Solus [Sight of Solus].json | 88 ++-- tiers/Tithrasia [Tithrasia].json | 64 +-- tiers/Unholy Rite [Unholy Rite].json | 103 +++-- tiers/Varlachleth [Varlachleth].json | 64 +-- 38 files changed, 2042 insertions(+), 2052 deletions(-) diff --git a/tiers/AP Minizone Raid [Darkness].json b/tiers/AP Minizone Raid [Darkness].json index 112ad92..af0eb34 100644 --- a/tiers/AP Minizone Raid [Darkness].json +++ b/tiers/AP Minizone Raid [Darkness].json @@ -1,81 +1,81 @@ { - "nightmare":{ - "200000000":{ + "nightmare": { + "200000000": { "epic": 11, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "300000000":{ + }, + "300000000": { "epic": 26, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "500000000":{ + }, + "500000000": { "epic": 53, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "750000000":{ + }, + "750000000": { "epic": 83, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "1000000000":{ + }, + "1000000000": { "epic": 114, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "1500000000":{ - "epic": 175, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "2000000000":{ - "epic": 236, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "2500000000":{ - "epic": 298, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "3000000000":{ - "epic": 358, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "4000000000":{ - "epic": 448, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "5000000000":{ + }, + "1500000000": { + "epic": 175, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2000000000": { + "epic": 236, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2500000000": { + "epic": 298, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000000": { + "epic": 358, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4000000000": { + "epic": 448, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000": { "epic": 508, "legendary": null, "uncommon": null, "common": null, "stats": null -} + } } } diff --git a/tiers/Adastros of the Kavala [Adrastos].json b/tiers/Adastros of the Kavala [Adrastos].json index 7aff583..98cade8 100644 --- a/tiers/Adastros of the Kavala [Adrastos].json +++ b/tiers/Adastros of the Kavala [Adrastos].json @@ -1,30 +1,30 @@ { -"nightmare":{ - "8000":10, - "16500":15, - "25500":20, - "35000":25, - "45000":30, - "55500":35, - "66500":40, - "78000":45, - "90000":50, - "102500":55, - "115500":60, - "129000":65, - "143000":70, - "157500":75, - "172500":80, - "188000":85, - "204000":90, - "220500":95, - "237500":100, - "255500":105, - "273500":110, - "291500":115, - "310500":120, - "330000":125, - "350000":130, - "1000000":150 + "nightmare": { + "8000": 10, + "16500": 15, + "25500": 20, + "35000": 25, + "45000": 30, + "55500": 35, + "66500": 40, + "78000": 45, + "90000": 50, + "102500": 55, + "115500": 60, + "129000": 65, + "143000": 70, + "157500": 75, + "172500": 80, + "188000": 85, + "204000": 90, + "220500": 95, + "237500": 100, + "255500": 105, + "273500": 110, + "291500": 115, + "310500": 120, + "330000": 125, + "350000": 130, + "1000000": 150 } } diff --git a/tiers/Agony [Agony].json b/tiers/Agony [Agony].json index 1179136..d6dd7e4 100644 --- a/tiers/Agony [Agony].json +++ b/tiers/Agony [Agony].json @@ -1,208 +1,206 @@ { - "normal":{ - "105000":{ + "normal": { + "105000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "630000":{ + }, + "630000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "910000":{ + }, + "910000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1750000":{ + }, + "1750000": { "epic": 2, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "4970000":{ + }, + "4970000": { "epic": 2.5, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "12670000":{ + }, + "12670000": { "epic": 3, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "28700000":{ + }, + "28700000": { "epic": 3.5, "legendary": null, "uncommon": null, "common": null, "stats": null - } -}, - - "hard":{ - "131000":{ + } + }, + "hard": { + "131000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "788000":{ + }, + "788000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1138000":{ + }, + "1138000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "2188000":{ + }, + "2188000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "6213000":{ + }, + "6213000": { "epic": 2.5, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "15838000":{ + }, + "15838000": { "epic": 3, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "35875000":{ + }, + "35875000": { "epic": 3.5, "legendary": null, "uncommon": null, "common": null, "stats": null - } -}, - - "legendary":{ - "168000":{ + } + }, + "legendary": { + "168000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1008000":{ + }, + "1008000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1456000":{ + }, + "1456000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "2800000":{ + }, + "2800000": { "epic": 2, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "7952000":{ + }, + "7952000": { "epic": 2.5, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "20272000":{ + }, + "20272000": { "epic": 3, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "45920000":{ + }, + "45920000": { "epic": 3.5, "legendary": null, "uncommon": null, "common": null, "stats": null - } -}, - "nightmare":{ - "210000":{ + } + }, + "nightmare": { + "210000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1260000":{ + }, + "1260000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1820000":{ + }, + "1820000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "3500000":{ + }, + "3500000": { "epic": 2, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "9940000":{ + }, + "9940000": { "epic": 2.5, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "25340000":{ - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "57400000":{ - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } + }, + "25340000": { + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "57400000": { + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } diff --git a/tiers/Apoc Demon [Apoc Demon].json b/tiers/Apoc Demon [Apoc Demon].json index ef7db0a..6dc4667 100644 --- a/tiers/Apoc Demon [Apoc Demon].json +++ b/tiers/Apoc Demon [Apoc Demon].json @@ -1,81 +1,81 @@ { - "nightmare":{ - "12000000":{ + "nightmare": { + "12000000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "24000000":{ + }, + "24000000": { "epic": 2, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "36000000":{ + }, + "36000000": { "epic": 3, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "40000000":{ + }, + "40000000": { "epic": 4, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "60000000":{ + }, + "60000000": { "epic": 5, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "80000000":{ + }, + "80000000": { "epic": 6, "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "100000000":{ - "epic": 7, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "120000000":{ - "epic": 8, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "140000000":{ - "epic": 9, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "160000000":{ - "epic": 10, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "180000000":{ - "epic": 11, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -} + "uncommon": null, + "common": null, + "stats": null + }, + "100000000": { + "epic": 7, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "120000000": { + "epic": 8, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "140000000": { + "epic": 9, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "160000000": { + "epic": 10, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "180000000": { + "epic": 11, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } diff --git a/tiers/Ascendant's Echo [Ascendant's Echo].json b/tiers/Ascendant's Echo [Ascendant's Echo].json index e6dfc3c..0d54651 100644 --- a/tiers/Ascendant's Echo [Ascendant's Echo].json +++ b/tiers/Ascendant's Echo [Ascendant's Echo].json @@ -1,88 +1,88 @@ { - "nightmare":{ - "100000000":{ + "nightmare": { + "100000000": { "epic": 11, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "250000000":{ + }, + "250000000": { "epic": 22, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "500000000":{ + }, + "500000000": { "epic": 48, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "1000000000":{ + }, + "1000000000": { "epic": 94, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "1500000000":{ + }, + "1500000000": { "epic": 140, "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "2000000000":{ - "epic": 186, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "3000000000":{ - "epic": 277, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "5000000000":{ - "epic": 328, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "7500000000":{ - "epic": 444, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "10000000000":{ - "epic": 480, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "15000000000":{ - "epic": 581, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "18000000000":{ - "epic": 612, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -} + "uncommon": null, + "common": null, + "stats": null + }, + "2000000000": { + "epic": 186, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000000": { + "epic": 277, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000": { + "epic": 328, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7500000000": { + "epic": 444, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000": { + "epic": 480, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000": { + "epic": 581, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "18000000000": { + "epic": 612, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } diff --git a/tiers/Batiatus' Elite Gladiators [Elite Gladiators].json b/tiers/Batiatus' Elite Gladiators [Elite Gladiators].json index 125d510..855616a 100644 --- a/tiers/Batiatus' Elite Gladiators [Elite Gladiators].json +++ b/tiers/Batiatus' Elite Gladiators [Elite Gladiators].json @@ -1,67 +1,67 @@ { -"nightmare":{ - "15000000":{ - "epic": 2, - "legendary": 4, - "uncommon": 6, - "common": 8, - "stats": null -}, - "18000000":{ - "epic": 3, - "legendary": 5, - "uncommon": 7, - "common": 9, - "stats": null -}, - "21000000":{ - "epic": 4, - "legendary": 6, - "uncommon": 8, - "common": 10, - "stats": null -}, - "24000000":{ - "epic": 5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "27000000":{ - "epic": 6, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "30000000":{ - "epic": 7, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "33000000":{ - "epic": 8, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "36000000":{ - "epic": 9, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "39000000":{ - "epic": 10, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -} + "nightmare": { + "15000000": { + "epic": 2, + "legendary": 4, + "uncommon": 6, + "common": 8, + "stats": null + }, + "18000000": { + "epic": 3, + "legendary": 5, + "uncommon": 7, + "common": 9, + "stats": null + }, + "21000000": { + "epic": 4, + "legendary": 6, + "uncommon": 8, + "common": 10, + "stats": null + }, + "24000000": { + "epic": 5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "27000000": { + "epic": 6, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30000000": { + "epic": 7, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "33000000": { + "epic": 8, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "36000000": { + "epic": 9, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "39000000": { + "epic": 10, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } diff --git a/tiers/Beastman Stampede [Stampede].json b/tiers/Beastman Stampede [Stampede].json index 530e2fd..95d91a8 100644 --- a/tiers/Beastman Stampede [Stampede].json +++ b/tiers/Beastman Stampede [Stampede].json @@ -1,103 +1,102 @@ { - - "nightmare":{ - "100000000":{ + "nightmare": { + "100000000": { "epic": 24, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1000000000":{ + }, + "1000000000": { "epic": 156, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "5000000000":{ + }, + "5000000000": { "epic": 635, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "10000000000":{ - "epic": 790, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000":{ - "epic": 941, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000":{ - "epic": 1062, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "25000000000":{ - "epic": 1168, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "30000000000":{ - "epic": 1259, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "40000000000":{ - "epic": 1335, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "50000000000":{ - "epic": 1606, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "60000000000":{ - "epic": 1757, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "80000000000":{ - "epic": 2298, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "100000000000":{ - "epic": 2810, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "150000000000":{ - "epic": 3030, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null + }, + "10000000000": { + "epic": 790, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000": { + "epic": 941, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000": { + "epic": 1062, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25000000000": { + "epic": 1168, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30000000000": { + "epic": 1259, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "40000000000": { + "epic": 1335, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "50000000000": { + "epic": 1606, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "60000000000": { + "epic": 1757, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "80000000000": { + "epic": 2298, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "100000000000": { + "epic": 2810, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "150000000000": { + "epic": 3030, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } -} diff --git a/tiers/Bloodsuckers [Bloodsuckers].json b/tiers/Bloodsuckers [Bloodsuckers].json index e75942f..241b671 100644 --- a/tiers/Bloodsuckers [Bloodsuckers].json +++ b/tiers/Bloodsuckers [Bloodsuckers].json @@ -1,67 +1,67 @@ { - "nightmare":{ - "100000000":{ + "nightmare": { + "100000000": { "epic": 18, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "500000000":{ + }, + "500000000": { "epic": 47, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1000000000":{ + }, + "1000000000": { "epic": 78, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1500000000":{ + }, + "1500000000": { "epic": 99, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "2000000000":{ + }, + "2000000000": { "epic": 120, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "2500000000":{ - "epic": 170, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000":{ - "epic": 250, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "7500000000":{ - "epic": 300, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000":{ - "epic": 350, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null + }, + "2500000000": { + "epic": 170, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000": { + "epic": 250, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7500000000": { + "epic": 300, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000": { + "epic": 350, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } -} diff --git a/tiers/Deathglare [Deathglare].json b/tiers/Deathglare [Deathglare].json index 142f654..a068d6a 100644 --- a/tiers/Deathglare [Deathglare].json +++ b/tiers/Deathglare [Deathglare].json @@ -1,38 +1,38 @@ { - "normal":{ - "113000":1, - "630000":1, - "855000":1, - "1845000":2, - "2813000":2.5, - "6075000":3, - "7650000":3.5 + "normal": { + "113000": 1, + "630000": 1, + "855000": 1, + "1845000": 2, + "2813000": 2.5, + "6075000": 3, + "7650000": 3.5 }, - "hard":{ - "141000":1, - "788000":1, - "1069000":1, - "2306000":2, - "3516000":2.5, - "7594000":3, - "9563000":3.5 + "hard": { + "141000": 1, + "788000": 1, + "1069000": 1, + "2306000": 2, + "3516000": 2.5, + "7594000": 3, + "9563000": 3.5 }, - "legendary":{ - "180000":1, - "1008000":1, - "1368000":1, - "2952000":2, - "4500000":2.5, - "9720000":3, - "12240000":3.5 + "legendary": { + "180000": 1, + "1008000": 1, + "1368000": 1, + "2952000": 2, + "4500000": 2.5, + "9720000": 3, + "12240000": 3.5 }, - "nightmare":{ - "225000":1, - "1260000":1, - "1710000":1, - "3690000":2, - "5625000":2.5, - "12150000":3, - "15300000":3.5 + "nightmare": { + "225000": 1, + "1260000": 1, + "1710000": 1, + "3690000": 2, + "5625000": 2.5, + "12150000": 3, + "15300000": 3.5 } } diff --git a/tiers/Dirthax [Dirthax].json b/tiers/Dirthax [Dirthax].json index 19d8526..25f61dd 100644 --- a/tiers/Dirthax [Dirthax].json +++ b/tiers/Dirthax [Dirthax].json @@ -1,206 +1,206 @@ { - "normal":{ - "1100000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "4950000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "8250000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "12100000":{ - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "17600000":{ - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "35750000":{ - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "49500000":{ - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -} + "normal": { + "1100000": { + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4950000": { + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "8250000": { + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "12100000": { + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "17600000": { + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "35750000": { + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "49500000": { + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, - "hard":{ - "1375000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "6188000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "10313000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "15125000":{ - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "22000000":{ - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "44688000":{ - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "61875000":{ - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -} + "hard": { + "1375000": { + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "6188000": { + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10313000": { + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15125000": { + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "22000000": { + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "44688000": { + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "61875000": { + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, - "legendary":{ - "1760000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "7920000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "13200000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "19360000":{ - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "28160000":{ - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "57200000":{ - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "79200000":{ - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -} + "legendary": { + "1760000": { + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7920000": { + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "13200000": { + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "19360000": { + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "28160000": { + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "57200000": { + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "79200000": { + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, - "nightmare":{ - "2200000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "9900000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "16500000":{ - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "24200000":{ - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "35200000":{ - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "71500000":{ - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "99000000":{ - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -} + "nightmare": { + "2200000": { + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "9900000": { + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "16500000": { + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "24200000": { + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "35200000": { + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "71500000": { + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "99000000": { + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } diff --git a/tiers/Drakontos, The First Terror [Drakontos].json b/tiers/Drakontos, The First Terror [Drakontos].json index fa3168d..1dd31de 100644 --- a/tiers/Drakontos, The First Terror [Drakontos].json +++ b/tiers/Drakontos, The First Terror [Drakontos].json @@ -1,214 +1,214 @@ { - "nightmare":{ - "100000000":{ + "nightmare": { + "100000000": { "epic": 15, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "200000000":{ + }, + "200000000": { "epic": 30, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "300000000":{ + }, + "300000000": { "epic": 35, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "500000000":{ + }, + "500000000": { "epic": 45, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "1000000000":{ + }, + "1000000000": { "epic": 90, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "1500000000":{ + }, + "1500000000": { "epic": 121, "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "2000000000":{ - "epic": 152, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "2500000000":{ - "epic": 182, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "3000000000":{ - "epic": 213, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "4000000000":{ - "epic": 244, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "5000000000":{ - "epic": 450, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "6000000000":{ - "epic": 461, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "7000000000":{ - "epic": 472, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "8000000000":{ - "epic": 488, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "9000000000":{ - "epic": 504, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "10000000000":{ - "epic": 570, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "12500000000":{ - "epic": 606, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "15000000000":{ - "epic": 661, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "20000000000":{ - "epic": 762, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "25000000000":{ - "epic": 837, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "30000000000":{ - "epic": 938, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "40000000000":{ - "epic": 1014, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "50000000000":{ - "epic": 1215, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "60000000000":{ - "epic": 1316, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "70000000000":{ - "epic": 1517, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "80000000000":{ - "epic": 1718, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "90000000000":{ - "epic": 1919, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "100000000000":{ - "epic": 2045, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "150000000000":{ - "epic": 2280, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "20000000000":{ - "epic": 2640, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -} + "uncommon": null, + "common": null, + "stats": null + }, + "2000000000": { + "epic": 152, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2500000000": { + "epic": 182, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000000": { + "epic": 213, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4000000000": { + "epic": 244, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000": { + "epic": 450, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "6000000000": { + "epic": 461, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7000000000": { + "epic": 472, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "8000000000": { + "epic": 488, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "9000000000": { + "epic": 504, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000": { + "epic": 570, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "12500000000": { + "epic": 606, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000": { + "epic": 661, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000": { + "epic": 762, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25000000000": { + "epic": 837, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30000000000": { + "epic": 938, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "40000000000": { + "epic": 1014, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "50000000000": { + "epic": 1215, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "60000000000": { + "epic": 1316, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "70000000000": { + "epic": 1517, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "80000000000": { + "epic": 1718, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "90000000000": { + "epic": 1919, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "100000000000": { + "epic": 2045, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "150000000000": { + "epic": 2280, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000": { + "epic": 2640, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } diff --git a/tiers/Elite Bloodsuckers [E. Bloodsuckers].json b/tiers/Elite Bloodsuckers [E. Bloodsuckers].json index f8d1ddd..f22708e 100644 --- a/tiers/Elite Bloodsuckers [E. Bloodsuckers].json +++ b/tiers/Elite Bloodsuckers [E. Bloodsuckers].json @@ -1,81 +1,81 @@ { - "nightmare":{ - "10000000000":{ + "nightmare": { + "10000000000": { "epic": 300, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "20000000000":{ + }, + "20000000000": { "epic": 700, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "30000000000":{ + }, + "30000000000": { "epic": 1800, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "40000000000":{ + }, + "40000000000": { "epic": 2500, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "50000000000":{ + }, + "50000000000": { "epic": 3150, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "60000000000":{ - "epic": 3900, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "70000000000":{ - "epic": 4600, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "80000000000":{ - "epic": 5500, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "90000000000":{ - "epic": 6000, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "100000000000":{ - "epic": 6400, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "120000000000":{ - "epic": 7500, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null + }, + "60000000000": { + "epic": 3900, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "70000000000": { + "epic": 4600, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "80000000000": { + "epic": 5500, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "90000000000": { + "epic": 6000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "100000000000": { + "epic": 6400, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "120000000000": { + "epic": 7500, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } -} diff --git a/tiers/Engine of the Ancients [Engine of the Ancients].json b/tiers/Engine of the Ancients [Engine of the Ancients].json index b9a15b9..5dd3530 100644 --- a/tiers/Engine of the Ancients [Engine of the Ancients].json +++ b/tiers/Engine of the Ancients [Engine of the Ancients].json @@ -1,60 +1,60 @@ { - "nightmare":{ - "100000000":{ + "nightmare": { + "100000000": { "epic": 25, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1000000000":{ + }, + "1000000000": { "epic": 91, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "5000000000":{ + }, + "5000000000": { "epic": 450, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "10000000000":{ + }, + "10000000000": { "epic": 550, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "15000000000":{ + }, + "15000000000": { "epic": 661, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "20000000000":{ + }, + "20000000000": { "epic": 762, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "25000000000":{ + }, + "25000000000": { "epic": 838, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "30000000000":{ + }, + "30000000000": { "epic": 939, "legendary": null, "uncommon": null, "common": null, "stats": null + } } } -} diff --git a/tiers/Felendis and Shaoquin [Banhammer Bros].json b/tiers/Felendis and Shaoquin [Banhammer Bros].json index c1a8a32..30807c3 100644 --- a/tiers/Felendis and Shaoquin [Banhammer Bros].json +++ b/tiers/Felendis and Shaoquin [Banhammer Bros].json @@ -1,38 +1,38 @@ { - "normal":{ - "884000":1, - "3976000":1, - "6627000":1, - "9720000":2, - "14138000":2.5, - "28179000":3, - "39764000":3.5 + "normal": { + "884000": 1, + "3976000": 1, + "6627000": 1, + "9720000": 2, + "14138000": 2.5, + "28179000": 3, + "39764000": 3.5 }, - "hard":{ - "1098000":1, - "4943000":1, - "8239000":1, - "12083000":2, - "17576000":2.5, - "35700000":3, - "49431000":3.5 + "hard": { + "1098000": 1, + "4943000": 1, + "8239000": 1, + "12083000": 2, + "17576000": 2.5, + "35700000": 3, + "49431000": 3.5 }, - "legendary":{ - "1416000":1, - "6371000":1, - "10618000":1, - "15573000":2, - "22651000":2.5, - "46010000":3, - "63706000":3.5 + "legendary": { + "1416000": 1, + "6371000": 1, + "10618000": 1, + "15573000": 2, + "22651000": 2.5, + "46010000": 3, + "63706000": 3.5 }, - "nightmare":{ - "1776000":1, - "7992000":1, - "13320000":1, - "19536000":2, - "28416000":2.5, - "57720000":3, - "79921000":3.5 + "nightmare": { + "1776000": 1, + "7992000": 1, + "13320000": 1, + "19536000": 2, + "28416000": 2.5, + "57720000": 3, + "79921000": 3.5 } } diff --git a/tiers/Fog Of Wars [Cannibals].json b/tiers/Fog Of Wars [Cannibals].json index fa24a91..64abb85 100644 --- a/tiers/Fog Of Wars [Cannibals].json +++ b/tiers/Fog Of Wars [Cannibals].json @@ -1,15 +1,15 @@ { -"nightmare":{ - "250000":62, - "300000":86, - "375000":96, - "480000":110, - "580000":132, - "660000":154, - "900000":168, - "1500000":204, - "2000000":244, - "2800000":316, - "3500000":436 + "nightmare": { + "250000": 62, + "300000": 86, + "375000": 96, + "480000": 110, + "580000": 132, + "660000": 154, + "900000": 168, + "1500000": 204, + "2000000": 244, + "2800000": 316, + "3500000": 436 } } diff --git a/tiers/Fog Of Wars [Verkiteia].json b/tiers/Fog Of Wars [Verkiteia].json index bbd6178..fd5691e 100644 --- a/tiers/Fog Of Wars [Verkiteia].json +++ b/tiers/Fog Of Wars [Verkiteia].json @@ -1,14 +1,14 @@ { -"nightmare":{ - "100000":22, - "175000":68, - "250000":84, - "300000":98, - "375000":110, - "450000":122, - "525000":136, - "600000":154, - "900000":168, - "1500000":216 + "nightmare": { + "100000": 22, + "175000": 68, + "250000": 84, + "300000": 98, + "375000": 110, + "450000": 122, + "525000": 136, + "600000": 154, + "900000": 168, + "1500000": 216 } } diff --git a/tiers/Gladiators [Gladiators].json b/tiers/Gladiators [Gladiators].json index 8b2fa46..344e0f9 100644 --- a/tiers/Gladiators [Gladiators].json +++ b/tiers/Gladiators [Gladiators].json @@ -1,38 +1,38 @@ { - "normal":{ - "630000":1, - "720000":1, - "1080000":1, - "1440000":2, - "1920000":2.5, - "3000000":3, - "4200000":3.5 + "normal": { + "630000": 1, + "720000": 1, + "1080000": 1, + "1440000": 2, + "1920000": 2.5, + "3000000": 3, + "4200000": 3.5 }, - "hard":{ - "788000":1, - "900000":1, - "1350000":1, - "1800000":2, - "2400000":2.5, - "3750000":3, - "5250000":3.5 + "hard": { + "788000": 1, + "900000": 1, + "1350000": 1, + "1800000": 2, + "2400000": 2.5, + "3750000": 3, + "5250000": 3.5 }, - "legendary":{ - "1008000":1, - "1152000":1, - "1728000":1, - "2304000":2, - "3072000":2.5, - "4800000":3, - "6720000":3.5 + "legendary": { + "1008000": 1, + "1152000": 1, + "1728000": 1, + "2304000": 2, + "3072000": 2.5, + "4800000": 3, + "6720000": 3.5 }, - "nightmare":{ - "1260000":1, - "1440000":1, - "2160000":1, - "2880000":2, - "3840000":2.5, - "6000000":3, - "8400000":3.5 + "nightmare": { + "1260000": 1, + "1440000": 1, + "2160000": 1, + "2880000": 2, + "3840000": 2.5, + "6000000": 3, + "8400000": 3.5 } } diff --git a/tiers/Groblar [Groblar].json b/tiers/Groblar [Groblar].json index e5bee04..fbb7c20 100644 --- a/tiers/Groblar [Groblar].json +++ b/tiers/Groblar [Groblar].json @@ -1,38 +1,38 @@ { - "normal":{ - "315000":1, - "360000":1, - "540000":1, - "720000":2, - "960000":2.5, - "1500000":3, - "2100000":3.5 + "normal": { + "315000": 1, + "360000": 1, + "540000": 1, + "720000": 2, + "960000": 2.5, + "1500000": 3, + "2100000": 3.5 }, - "hard":{ - "394000":1, - "450000":1, - "675000":1, - "900000":2, - "1200000":2.5, - "1875000":3, - "2625000":3.5 + "hard": { + "394000": 1, + "450000": 1, + "675000": 1, + "900000": 2, + "1200000": 2.5, + "1875000": 3, + "2625000": 3.5 }, - "legendary":{ - "504000":1, - "576000":1, - "864000":1, - "1152000":2, - "1536000":2.5, - "2400000":3, - "3360000":3.5 + "legendary": { + "504000": 1, + "576000": 1, + "864000": 1, + "1152000": 2, + "1536000": 2.5, + "2400000": 3, + "3360000": 3.5 }, - "nightmare":{ - "630000":1, - "720000":1, - "1080000":1, - "1440000":2, - "1920000":2.5, - "3000000":3, - "4200000":3.5 + "nightmare": { + "630000": 1, + "720000": 1, + "1080000": 1, + "1440000": 2, + "1920000": 2.5, + "3000000": 3, + "4200000": 3.5 } } diff --git a/tiers/Grundus [Grundus].json b/tiers/Grundus [Grundus].json index 5467f2a..1ee03ec 100644 --- a/tiers/Grundus [Grundus].json +++ b/tiers/Grundus [Grundus].json @@ -1,14 +1,14 @@ { - "normal":{ - "8000000":34 + "normal": { + "8000000": 34 }, - "hard":{ - "16000000":34 + "hard": { + "16000000": 34 }, - "legendary":{ - "40000000":34 + "legendary": { + "40000000": 34 }, - "nightmare":{ - "60000000":34 + "nightmare": { + "60000000": 34 } } diff --git a/tiers/Hammer [Hammer].json b/tiers/Hammer [Hammer].json index d9eff29..a74c236 100644 --- a/tiers/Hammer [Hammer].json +++ b/tiers/Hammer [Hammer].json @@ -1,48 +1,48 @@ { - "normal":{ - "550000":{ + "normal": { + "550000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "3080000":{ + "3080000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "4180000":{ + "4180000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "9020000":{ + "9020000": { "epic": 2, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "13750000":{ + "13750000": { "epic": 2.5, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "29700000":{ + "29700000": { "epic": 3, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "37400000":{ + "37400000": { "epic": 3.5, "legendary": null, "uncommon": null, @@ -50,50 +50,50 @@ "stats": null } }, - "hard":{ - "688000":{ + "hard": { + "688000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "3850000":{ + "3850000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "5225000":{ + "5225000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "11275000":{ + "11275000": { "epic": 2, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "17188000":{ + "17188000": { "epic": 2.5, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "37125000":{ + "37125000": { "epic": 3, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "46750000":{ + "46750000": { "epic": 3.5, "legendary": null, "uncommon": null, @@ -101,50 +101,50 @@ "stats": null } }, - "legendary":{ - "880000":{ + "legendary": { + "880000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "4928000":{ + "4928000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "6688000":{ + "6688000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "14432000":{ + "14432000": { "epic": 2, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "22000000":{ + "22000000": { "epic": 2.5, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "47520000":{ + "47520000": { "epic": 3, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "59480000":{ + "59480000": { "epic": 3.5, "legendary": null, "uncommon": null, @@ -152,50 +152,50 @@ "stats": null } }, - "nightmare":{ - "1100000":{ + "nightmare": { + "1100000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "6160000":{ + "6160000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "8360000":{ + "8360000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "18040000":{ + "18040000": { "epic": 2, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "27500000":{ + "27500000": { "epic": 2.5, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "59400000":{ + "59400000": { "epic": 3, "legendary": null, "uncommon": null, "common": null, "stats": null }, - "74800000":{ + "74800000": { "epic": 3.5, "legendary": null, "uncommon": null, diff --git a/tiers/Hullbore Wyrms [Hullbore Wyrms].json b/tiers/Hullbore Wyrms [Hullbore Wyrms].json index 2613bab..5b5d8ad 100644 --- a/tiers/Hullbore Wyrms [Hullbore Wyrms].json +++ b/tiers/Hullbore Wyrms [Hullbore Wyrms].json @@ -1,131 +1,130 @@ { - - "nightmare":{ - "50000000":{ + "nightmare": { + "50000000": { "epic": 10, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "100000000":{ + }, + "100000000": { "epic": 25, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "200000000":{ + }, + "200000000": { "epic": 34, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "300000000":{ + }, + "300000000": { "epic": 45, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "500000000":{ + }, + "500000000": { "epic": 60, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "750000000":{ + }, + "750000000": { "epic": 85, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1000000000":{ + }, + "1000000000": { "epic": 111, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1500000000":{ + }, + "1500000000": { "epic": 162, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "2000000000":{ + }, + "2000000000": { "epic": 215, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "2500000000":{ + }, + "2500000000": { "epic": 266, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "3000000000":{ + }, + "3000000000": { "epic": 332, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "4000000000":{ + }, + "4000000000": { "epic": 383, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "5000000000":{ + }, + "5000000000": { "epic": 435, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "7500000000":{ + }, + "7500000000": { "epic": 485, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "10000000000":{ - "epic": 545, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000":{ - "epic": 630, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000":{ - "epic": 715, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "25000000000":{ - "epic": 825, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null + }, + "10000000000": { + "epic": 545, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000": { + "epic": 630, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000": { + "epic": 715, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25000000000": { + "epic": 825, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } -} diff --git a/tiers/Initiates of the Abyss [Initiates].json b/tiers/Initiates of the Abyss [Initiates].json index fcb1e89..7007af1 100644 --- a/tiers/Initiates of the Abyss [Initiates].json +++ b/tiers/Initiates of the Abyss [Initiates].json @@ -1,123 +1,123 @@ { - "nightmare":{ - "100000000":{ + "nightmare": { + "100000000": { "epic": 6, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "500000000":{ + }, + "500000000": { "epic": 49, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1000000000":{ + }, + "1000000000": { "epic": 231, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1500000000":{ + }, + "1500000000": { "epic": 411, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "2000000000":{ + }, + "2000000000": { "epic": 472, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "2500000000":{ + }, + "2500000000": { "epic": 532, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "3000000000":{ + }, + "3000000000": { "epic": 618, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "4000000000":{ + }, + "4000000000": { "epic": 779, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "5000000000":{ + }, + "5000000000": { "epic": 905, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "6000000000":{ + }, + "6000000000": { "epic": 1026, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "8000000000":{ + }, + "8000000000": { "epic": 1148, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "10000000000":{ + }, + "10000000000": { "epic": 1215, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "12500000000":{ + }, + "12500000000": { "epic": 1308, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "15000000000":{ + }, + "15000000000": { "epic": 1465, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "20000000000":{ + }, + "20000000000": { "epic": 1625, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "25000000000":{ + }, + "25000000000": { "epic": 1780, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "30000000000":{ + }, + "30000000000": { "epic": 1880, "legendary": null, "uncommon": null, "common": null, "stats": null + } } } -} diff --git a/tiers/Jershan'thurn's Portal [Jershan'thurn].json b/tiers/Jershan'thurn's Portal [Jershan'thurn].json index a577be2..bb2fd48 100644 --- a/tiers/Jershan'thurn's Portal [Jershan'thurn].json +++ b/tiers/Jershan'thurn's Portal [Jershan'thurn].json @@ -1,180 +1,179 @@ { - - "nightmare":{ - "100000000":{ + "nightmare": { + "100000000": { "epic": 6, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "200000000":{ + }, + "200000000": { "epic": 16, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "400000000":{ + }, + "400000000": { "epic": 32, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "500000000":{ + }, + "500000000": { "epic": 50, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "800000000":{ + }, + "800000000": { "epic": 84, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "900000000":{ - "epic": 95, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1000000000":{ - "epic": 117, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1250000000":{ - "epic": 177, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1500000000":{ - "epic": 208, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1750000000":{ - "epic": 228, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2000000000":{ - "epic": 239, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2500000000":{ - "epic": 270, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3000000000":{ - "epic": 306, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4000000000":{ - "epic": 368, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000":{ - "epic": 430, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "6000000000":{ - "epic": 492, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "8000000000":{ - "epic": 556, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000":{ - "epic": 605, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "12500000000":{ - "epic": 640, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000":{ - "epic": 705, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000":{ - "epic": 790, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "25000000000":{ - "epic": 860, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "30000000000":{ - "epic": 915, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "40000000000":{ - "epic": 1040, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "50000000":{ - "epic": 1150, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null + }, + "900000000": { + "epic": 95, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000": { + "epic": 117, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1250000000": { + "epic": 177, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1500000000": { + "epic": 208, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1750000000": { + "epic": 228, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2000000000": { + "epic": 239, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2500000000": { + "epic": 270, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000000": { + "epic": 306, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4000000000": { + "epic": 368, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000": { + "epic": 430, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "6000000000": { + "epic": 492, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "8000000000": { + "epic": 556, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000": { + "epic": 605, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "12500000000": { + "epic": 640, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000": { + "epic": 705, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000": { + "epic": 790, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25000000000": { + "epic": 860, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30000000000": { + "epic": 915, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "40000000000": { + "epic": 1040, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "50000000": { + "epic": 1150, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } -} diff --git a/tiers/Konungar [Konungar].json b/tiers/Konungar [Konungar].json index 8312fb0..97e2e8c 100644 --- a/tiers/Konungar [Konungar].json +++ b/tiers/Konungar [Konungar].json @@ -1,141 +1,141 @@ { "nightmare": - { - "500000000": - { - "epic": 24, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1000000000": - { - "epic": 50, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2000000000": - { - "epic": 140, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3000000000": - { - "epic": 240, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000": - { - "epic": 420, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "8000000000": - { - "epic": 750, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000": - { - "epic": 900, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000": - { - "epic": 1100, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000": - { - "epic": 1300, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "30000000000": - { - "epic": 1539, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "40000000000": - { - "epic": 1740, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "50000000000": - { - "epic": 1920, - "legendary": null, - "uncommon": null, - "common": null, - "stats": 100 - }, - "75000000000": - { - "epic": 2080, - "legendary": null, - "uncommon": null, - "common": null, - "stats": 300 - }, - "100000000000": - { - "epic": 2700, - "legendary": null, - "uncommon": null, - "common": null, - "stats": 700 - }, - "150000000000": - { - "epic": 3100, - "legendary": null, - "uncommon": null, - "common": null, - "stats": 825 - }, - "200000000000": - { - "epic": 3300, - "legendary": null, - "uncommon": null, - "common": null, - "stats": 925 - }, - "300000000000": - { - "epic": 3709, - "legendary": null, - "uncommon": null, - "common": null, - "stats": 1003 - } - } + { + "500000000": + { + "epic": 24, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000": + { + "epic": 50, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2000000000": + { + "epic": 140, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000000": + { + "epic": 240, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000": + { + "epic": 420, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "8000000000": + { + "epic": 750, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000": + { + "epic": 900, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000": + { + "epic": 1100, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000": + { + "epic": 1300, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30000000000": + { + "epic": 1539, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "40000000000": + { + "epic": 1740, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "50000000000": + { + "epic": 1920, + "legendary": null, + "uncommon": null, + "common": null, + "stats": 100 + }, + "75000000000": + { + "epic": 2080, + "legendary": null, + "uncommon": null, + "common": null, + "stats": 300 + }, + "100000000000": + { + "epic": 2700, + "legendary": null, + "uncommon": null, + "common": null, + "stats": 700 + }, + "150000000000": + { + "epic": 3100, + "legendary": null, + "uncommon": null, + "common": null, + "stats": 825 + }, + "200000000000": + { + "epic": 3300, + "legendary": null, + "uncommon": null, + "common": null, + "stats": 925 + }, + "300000000000": + { + "epic": 3709, + "legendary": null, + "uncommon": null, + "common": null, + "stats": 1003 + } + } } diff --git a/tiers/Lord Hoton the Usurper [Lord Hoton].json b/tiers/Lord Hoton the Usurper [Lord Hoton].json index 1ebd11b..2ca018f 100644 --- a/tiers/Lord Hoton the Usurper [Lord Hoton].json +++ b/tiers/Lord Hoton the Usurper [Lord Hoton].json @@ -1,110 +1,109 @@ { - - "nightmare":{ - "1000000000":{ + "nightmare": { + "1000000000": { "epic": 71, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "2000000000":{ + }, + "2000000000": { "epic": 148, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "3000000000":{ + }, + "3000000000": { "epic": 219, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "4000000000":{ + }, + "4000000000": { "epic": 256, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "5000000000":{ - "epic": 299, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "6000000000":{ - "epic": 318, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "7000000000":{ - "epic": 337, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "8000000000":{ - "epic": 356, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "9000000000":{ - "epic": 390, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000":{ - "epic": 427, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "12500000000":{ - "epic": 446, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000":{ - "epic": 474, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "17500000000":{ - "epic": 496, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000":{ - "epic": 539, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "25000000000":{ - "epic": 586, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null + }, + "5000000000": { + "epic": 299, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "6000000000": { + "epic": 318, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7000000000": { + "epic": 337, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "8000000000": { + "epic": 356, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "9000000000": { + "epic": 390, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000": { + "epic": 427, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "12500000000": { + "epic": 446, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000": { + "epic": 474, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "17500000000": { + "epic": 496, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000": { + "epic": 539, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25000000000": { + "epic": 586, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } -} diff --git a/tiers/Lost [Lost].json b/tiers/Lost [Lost].json index 22b8933..fb64163 100644 --- a/tiers/Lost [Lost].json +++ b/tiers/Lost [Lost].json @@ -1,75 +1,74 @@ { - - "nightmare":{ - "500000000":{ + "nightmare": { + "500000000": { "epic": 25, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1000000000":{ + }, + "1000000000": { "epic": 71, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "2000000000":{ + }, + "2000000000": { "epic": 142, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "3000000000":{ + }, + "3000000000": { "epic": 223, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "4000000000":{ + }, + "4000000000": { "epic": 309, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "5000000000":{ - "epic": 391, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "7500000000":{ - "epic": 598, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000":{ - "epic": 785, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000":{ - "epic": 930, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000":{ - "epic": 1015, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null + }, + "5000000000": { + "epic": 391, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7500000000": { + "epic": 598, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000": { + "epic": 785, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000": { + "epic": 930, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000": { + "epic": 1015, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } -} diff --git a/tiers/Lunatics [Lunatics].json b/tiers/Lunatics [Lunatics].json index 362c154..06e7af1 100644 --- a/tiers/Lunatics [Lunatics].json +++ b/tiers/Lunatics [Lunatics].json @@ -1,208 +1,206 @@ { - "normal":{ - "450000":{ + "normal": { + "450000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "2520000":{ + }, + "2520000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "3420000":{ + }, + "3420000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "7380000":{ + }, + "7380000": { "epic": 2, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "11250000":{ + }, + "11250000": { "epic": 2.5, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "24300000":{ + }, + "24300000": { "epic": 3, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "30600000":{ + }, + "30600000": { "epic": 3.5, "legendary": null, "uncommon": null, "common": null, "stats": null - } -}, - - "hard":{ - "563000":{ + } + }, + "hard": { + "563000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "3150000":{ + }, + "3150000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "4275000":{ + }, + "4275000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "9225000":{ + }, + "9225000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "14063000":{ + }, + "14063000": { "epic": 2.5, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "30375000":{ + }, + "30375000": { "epic": 3, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "38250000":{ + }, + "38250000": { "epic": 3.5, "legendary": null, "uncommon": null, "common": null, "stats": null - } -}, - - "legendary":{ - "720000":{ + } + }, + "legendary": { + "720000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "4032000":{ + }, + "4032000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "5472000":{ + }, + "5472000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "11808000":{ + }, + "11808000": { "epic": 2, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "18000000":{ + }, + "18000000": { "epic": 2.5, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "38880000":{ + }, + "38880000": { "epic": 3, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "48960000":{ + }, + "48960000": { "epic": 3.5, "legendary": null, "uncommon": null, "common": null, "stats": null - } -}, - "nightmare":{ - "900000":{ + } + }, + "nightmare": { + "900000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "5040000":{ + }, + "5040000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "6840000":{ + }, + "6840000": { "epic": 1, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "14760000":{ + }, + "14760000": { "epic": 2, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "22500000":{ + }, + "22500000": { "epic": 2.5, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "48600000":{ - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "61200000":{ - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null + }, + "48600000": { + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "61200000": { + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } - } } diff --git a/tiers/Prince Obyron [Obyron].json b/tiers/Prince Obyron [Obyron].json index 83c8705..b89eb2c 100644 --- a/tiers/Prince Obyron [Obyron].json +++ b/tiers/Prince Obyron [Obyron].json @@ -1,38 +1,38 @@ { - "normal":{ - "1575000":1, - "1800000":1, - "2700000":1, - "3600000":2, - "4800000":2.5, - "7500000":3, - "10500000":3.5 + "normal": { + "1575000": 1, + "1800000": 1, + "2700000": 1, + "3600000": 2, + "4800000": 2.5, + "7500000": 3, + "10500000": 3.5 }, - "hard":{ - "1969000":1, - "2250000":1, - "3375000":1, - "4500000":2, - "6000000":2.5, - "9375000":3, - "13125000":3.5 + "hard": { + "1969000": 1, + "2250000": 1, + "3375000": 1, + "4500000": 2, + "6000000": 2.5, + "9375000": 3, + "13125000": 3.5 }, - "legendary":{ - "2520000":1, - "2880000":1, - "4320000":1, - "5760000":2, - "7680000":2.5, - "12000000":3, - "16800000":3.5 + "legendary": { + "2520000": 1, + "2880000": 1, + "4320000": 1, + "5760000": 2, + "7680000": 2.5, + "12000000": 3, + "16800000": 3.5 }, - "nightmare":{ - "3150000":1, - "3600000":1, - "5400000":1, - "7200000":2, - "9600000":2.5, - "15000000":3, - "21000000":3.5 + "nightmare": { + "3150000": 1, + "3600000": 1, + "5400000": 1, + "7200000": 2, + "9600000": 2.5, + "15000000": 3, + "21000000": 3.5 } } diff --git a/tiers/Ragetalon [Ragetalon].json b/tiers/Ragetalon [Ragetalon].json index 0c97b30..8ff53fc 100644 --- a/tiers/Ragetalon [Ragetalon].json +++ b/tiers/Ragetalon [Ragetalon].json @@ -1,38 +1,38 @@ { - "normal":{ - "220000":1, - "990000":1, - "1650000":1, - "2420000":2, - "3520000":2.5, - "7150000":3, - "9900000":3.5 + "normal": { + "220000": 1, + "990000": 1, + "1650000": 1, + "2420000": 2, + "3520000": 2.5, + "7150000": 3, + "9900000": 3.5 }, - "hard":{ - "275000":1, - "1238000":1, - "2063000":1, - "3025000":2, - "4400000":2.5, - "8938000":3, - "12375000":3.5 + "hard": { + "275000": 1, + "1238000": 1, + "2063000": 1, + "3025000": 2, + "4400000": 2.5, + "8938000": 3, + "12375000": 3.5 }, - "legendary":{ - "352000":1, - "1584000":1, - "2640000":1, - "3872000":2, - "5632000":2.5, - "11440000":3, - "15840000":3.5 + "legendary": { + "352000": 1, + "1584000": 1, + "2640000": 1, + "3872000": 2, + "5632000": 2.5, + "11440000": 3, + "15840000": 3.5 }, - "nightmare":{ - "440000":1, - "1980000":1, - "3300000":1, - "4840000":2, - "7040000":2.5, - "14300000":3, - "19800000":3.5 + "nightmare": { + "440000": 1, + "1980000": 1, + "3300000": 1, + "4840000": 2, + "7040000": 2.5, + "14300000": 3, + "19800000": 3.5 } } diff --git a/tiers/Reaper Mantis [Mantis].json b/tiers/Reaper Mantis [Mantis].json index fcb1e89..7007af1 100644 --- a/tiers/Reaper Mantis [Mantis].json +++ b/tiers/Reaper Mantis [Mantis].json @@ -1,123 +1,123 @@ { - "nightmare":{ - "100000000":{ + "nightmare": { + "100000000": { "epic": 6, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "500000000":{ + }, + "500000000": { "epic": 49, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1000000000":{ + }, + "1000000000": { "epic": 231, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "1500000000":{ + }, + "1500000000": { "epic": 411, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "2000000000":{ + }, + "2000000000": { "epic": 472, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "2500000000":{ + }, + "2500000000": { "epic": 532, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "3000000000":{ + }, + "3000000000": { "epic": 618, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "4000000000":{ + }, + "4000000000": { "epic": 779, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "5000000000":{ + }, + "5000000000": { "epic": 905, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "6000000000":{ + }, + "6000000000": { "epic": 1026, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "8000000000":{ + }, + "8000000000": { "epic": 1148, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "10000000000":{ + }, + "10000000000": { "epic": 1215, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "12500000000":{ + }, + "12500000000": { "epic": 1308, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "15000000000":{ + }, + "15000000000": { "epic": 1465, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "20000000000":{ + }, + "20000000000": { "epic": 1625, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "25000000000":{ + }, + "25000000000": { "epic": 1780, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "30000000000":{ + }, + "30000000000": { "epic": 1880, "legendary": null, "uncommon": null, "common": null, "stats": null + } } } -} diff --git a/tiers/Rhalmarius the Despoiler [Rhalmarius].json b/tiers/Rhalmarius the Despoiler [Rhalmarius].json index be53de3..b0af842 100644 --- a/tiers/Rhalmarius the Despoiler [Rhalmarius].json +++ b/tiers/Rhalmarius the Despoiler [Rhalmarius].json @@ -1,14 +1,14 @@ { - "normal":{ - "5000000":30 + "normal": { + "5000000": 30 }, - "hard":{ - "12500000":30 + "hard": { + "12500000": 30 }, - "legendary":{ - "31250000":30 + "legendary": { + "31250000": 30 }, - "nightmare":{ - "39060000":30 + "nightmare": { + "39060000": 30 } } diff --git a/tiers/Scuttlegore [Scuttlegore].json b/tiers/Scuttlegore [Scuttlegore].json index a61f90d..b65ae52 100644 --- a/tiers/Scuttlegore [Scuttlegore].json +++ b/tiers/Scuttlegore [Scuttlegore].json @@ -1,38 +1,38 @@ { - "normal":{ - "440000":1, - "1980000":1, - "3300000":1, - "4840000":2, - "7040000":2.5, - "14300000":3, - "19800000":3.5 + "normal": { + "440000": 1, + "1980000": 1, + "3300000": 1, + "4840000": 2, + "7040000": 2.5, + "14300000": 3, + "19800000": 3.5 }, - "hard":{ - "550000":1, - "2475000":1, - "4125000":1, - "6050000":2, - "8800000":2.5, - "17875000":3, - "24750000":3.5 + "hard": { + "550000": 1, + "2475000": 1, + "4125000": 1, + "6050000": 2, + "8800000": 2.5, + "17875000": 3, + "24750000": 3.5 }, - "legendary":{ - "704000":1, - "3168000":1, - "5280000":1, - "7744000":2, - "11264000":2.5, - "22880000":3, - "31680000":3.5 + "legendary": { + "704000": 1, + "3168000": 1, + "5280000": 1, + "7744000": 2, + "11264000": 2.5, + "22880000": 3, + "31680000": 3.5 }, - "nightmare":{ - "880000":1, - "3960000":1, - "6600000":1, - "9680000":2, - "14080000":2.5, - "28600000":3, - "39600000":3.5 + "nightmare": { + "880000": 1, + "3960000": 1, + "6600000": 1, + "9680000": 2, + "14080000": 2.5, + "28600000": 3, + "39600000": 3.5 } } diff --git a/tiers/Tetrarchos [Tetrarchos].json b/tiers/Tetrarchos [Tetrarchos].json index 3aecbba..4cfbbad 100644 --- a/tiers/Tetrarchos [Tetrarchos].json +++ b/tiers/Tetrarchos [Tetrarchos].json @@ -1,38 +1,38 @@ { - "normal":{ - "225000":1, - "1260000":1, - "1710000":1, - "3690000":2, - "5625000":2.5, - "12150000":3, - "15300000":3.5 + "normal": { + "225000": 1, + "1260000": 1, + "1710000": 1, + "3690000": 2, + "5625000": 2.5, + "12150000": 3, + "15300000": 3.5 }, - "hard":{ - "281000":1, - "1575000":1, - "2138000":1, - "4613000":2, - "7031000":2.5, - "15188000":3, - "19125000":3.5 + "hard": { + "281000": 1, + "1575000": 1, + "2138000": 1, + "4613000": 2, + "7031000": 2.5, + "15188000": 3, + "19125000": 3.5 }, - "legendary":{ - "285000":1, - "1596000":1, - "2166000":1, - "4674000":2, - "7125000":2.5, - "15390000":3, - "19380000":3.5 + "legendary": { + "285000": 1, + "1596000": 1, + "2166000": 1, + "4674000": 2, + "7125000": 2.5, + "15390000": 3, + "19380000": 3.5 }, - "nightmare":{ - "450000":1, - "2520000":1, - "3420000":1, - "7380000":2, - "11250000":2.5, - "24300000":3, - "30600000":3.5 + "nightmare": { + "450000": 1, + "2520000": 1, + "3420000": 1, + "7380000": 2, + "11250000": 2.5, + "24300000": 3, + "30600000": 3.5 } } diff --git a/tiers/The Black Moon Pack [Black Moon].json b/tiers/The Black Moon Pack [Black Moon].json index 1669ec2..bf675af 100644 --- a/tiers/The Black Moon Pack [Black Moon].json +++ b/tiers/The Black Moon Pack [Black Moon].json @@ -1,38 +1,38 @@ { - "normal":{ - "338000":1, - "1890000":1, - "2565000":1, - "5535000":2, - "8438000":2.5, - "18225000":3, - "22950000":3.5 + "normal": { + "338000": 1, + "1890000": 1, + "2565000": 1, + "5535000": 2, + "8438000": 2.5, + "18225000": 3, + "22950000": 3.5 }, - "hard":{ - "422000":1, - "2363000":1, - "3206000":1, - "6919000":2, - "10547000":2.5, - "22781000":3, - "28688000":3.5 + "hard": { + "422000": 1, + "2363000": 1, + "3206000": 1, + "6919000": 2, + "10547000": 2.5, + "22781000": 3, + "28688000": 3.5 }, - "legendary":{ - "540000":1, - "3024000":1, - "4104000":1, - "8856000":2, - "13500000":2.5, - "29160000":3, - "36720000":3.5 + "legendary": { + "540000": 1, + "3024000": 1, + "4104000": 1, + "8856000": 2, + "13500000": 2.5, + "29160000": 3, + "36720000": 3.5 }, - "nightmare":{ - "675000":1, - "3780000":1, - "5130000":1, - "11070000":2, - "16875000":2.5, - "36450000":3, - "45900000":3.5 + "nightmare": { + "675000": 1, + "3780000": 1, + "5130000": 1, + "11070000": 2, + "16875000": 2.5, + "36450000": 3, + "45900000": 3.5 } } diff --git a/tiers/The Sight of Solus [Sight of Solus].json b/tiers/The Sight of Solus [Sight of Solus].json index 27802d8..c5aca63 100644 --- a/tiers/The Sight of Solus [Sight of Solus].json +++ b/tiers/The Sight of Solus [Sight of Solus].json @@ -1,67 +1,67 @@ { - "nightmare":{ - "100000000":{ + "nightmare": { + "100000000": { "epic": 10, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "300000000":{ + }, + "300000000": { "epic": 25, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "500000000":{ + }, + "500000000": { "epic": 45, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "1000000000":{ + }, + "1000000000": { "epic": 91, "legendary": null, "uncommon": null, "common": null, "stats": null -}, - "3000000000":{ - "epic": 273, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "5000000000":{ - "epic": 325, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "7000000000":{ - "epic": 377, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "8000000000":{ - "epic": 428, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -}, - "10000000000":{ - "epic": 480, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null -} + }, + "3000000000": { + "epic": 273, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000": { + "epic": 325, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7000000000": { + "epic": 377, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "8000000000": { + "epic": 428, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000": { + "epic": 480, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } diff --git a/tiers/Tithrasia [Tithrasia].json b/tiers/Tithrasia [Tithrasia].json index 86dd332..e0a178b 100644 --- a/tiers/Tithrasia [Tithrasia].json +++ b/tiers/Tithrasia [Tithrasia].json @@ -1,38 +1,38 @@ { - "normal":{ - "945000":1, - "1080000":1, - "1620000":1, - "2160000":2, - "2880000":2.5, - "4500000":3, - "6300000":3.5 + "normal": { + "945000": 1, + "1080000": 1, + "1620000": 1, + "2160000": 2, + "2880000": 2.5, + "4500000": 3, + "6300000": 3.5 }, - "hard":{ - "1181000":1, - "1350000":1, - "2025000":1, - "2700000":2, - "3600000":2.5, - "5625000":3, - "7875000":3.5 + "hard": { + "1181000": 1, + "1350000": 1, + "2025000": 1, + "2700000": 2, + "3600000": 2.5, + "5625000": 3, + "7875000": 3.5 }, - "legendary":{ - "1512000":1, - "1728000":1, - "2592000":1, - "3456000":2, - "4608000":2.5, - "72000000":3, - "10080000":3.5 + "legendary": { + "1512000": 1, + "1728000": 1, + "2592000": 1, + "3456000": 2, + "4608000": 2.5, + "72000000": 3, + "10080000": 3.5 }, - "nightmare":{ - "1890000":1, - "2160000":1, - "3240000":1, - "4320000":2, - "5760000":2.5, - "9000000":3, - "12600000":3.5 + "nightmare": { + "1890000": 1, + "2160000": 1, + "3240000": 1, + "4320000": 2, + "5760000": 2.5, + "9000000": 3, + "12600000": 3.5 } } diff --git a/tiers/Unholy Rite [Unholy Rite].json b/tiers/Unholy Rite [Unholy Rite].json index f914384..ba2ce60 100644 --- a/tiers/Unholy Rite [Unholy Rite].json +++ b/tiers/Unholy Rite [Unholy Rite].json @@ -1,75 +1,74 @@ { - - "nightmare":{ - "2000000000":{ + "nightmare": { + "2000000000": { "epic": 212, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "2500000000":{ + }, + "2500000000": { "epic": 264, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "3000000000":{ + }, + "3000000000": { "epic": 331, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "4000000000":{ + }, + "4000000000": { "epic": 381, "legendary": null, "uncommon": null, "common": null, "stats": null - }, - "5000000000":{ - "epic": 433, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "7500000000":{ - "epic": 485, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000":{ - "epic": 541, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000":{ - "epic": 624, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000":{ - "epic": 707, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "25000000000":{ - "epic": 815, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null + }, + "5000000000": { + "epic": 433, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7500000000": { + "epic": 485, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000": { + "epic": 541, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000": { + "epic": 624, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000": { + "epic": 707, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25000000000": { + "epic": 815, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } -} diff --git a/tiers/Varlachleth [Varlachleth].json b/tiers/Varlachleth [Varlachleth].json index 155c005..b8ab25b 100644 --- a/tiers/Varlachleth [Varlachleth].json +++ b/tiers/Varlachleth [Varlachleth].json @@ -1,38 +1,38 @@ { - "normal":{ - "660000":1, - "2970000":1, - "4950000":1, - "7260000":2, - "10560000":2.5, - "21450000":3, - "29700000":3.5 + "normal": { + "660000": 1, + "2970000": 1, + "4950000": 1, + "7260000": 2, + "10560000": 2.5, + "21450000": 3, + "29700000": 3.5 }, - "hard":{ - "825000":1, - "3713000":1, - "6188000":1, - "9075000":2, - "13200000":2.5, - "26813000":3, - "37125000":3.5 + "hard": { + "825000": 1, + "3713000": 1, + "6188000": 1, + "9075000": 2, + "13200000": 2.5, + "26813000": 3, + "37125000": 3.5 }, - "legendary":{ - "1056000":1, - "4752000":1, - "7920000":1, - "11616000":2, - "16896000":2.5, - "34320000":3, - "47520000":3.5 + "legendary": { + "1056000": 1, + "4752000": 1, + "7920000": 1, + "11616000": 2, + "16896000": 2.5, + "34320000": 3, + "47520000": 3.5 }, - "nightmare":{ - "1320000":1, - "5940000":1, - "9900000":1, - "14520000":2, - "21120000":2.5, - "42900000":3, - "59400000":3.5 + "nightmare": { + "1320000": 1, + "5940000": 1, + "9900000": 1, + "14520000": 2, + "21120000": 2.5, + "42900000": 3, + "59400000": 3.5 } } From b2bda532029530e959eba7d7baf2f9cc2fabe7a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 4 Nov 2016 10:59:19 +0100 Subject: [PATCH 246/341] Adding example for campaign structure for refs #147 --- campaigns/Monsters-and-Magma.json | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 campaigns/Monsters-and-Magma.json diff --git a/campaigns/Monsters-and-Magma.json b/campaigns/Monsters-and-Magma.json new file mode 100644 index 0000000..ad004b0 --- /dev/null +++ b/campaigns/Monsters-and-Magma.json @@ -0,0 +1,34 @@ +{ + "name": "Monsters and Magma", + "map": null, + "nodes": { + "Imryx's Whelps": { + "image": null, + "tiers": {} + } + }, + "challenges": { + "Speed Run": { + "drawback": "Campaign Length -50%", + "benefit": "+20% Guild Reputation" + }, + "Hailstorm": { + "drawback": "Nodes have an additional prefix", + "benefit": "+20% Guild Experience" + }, + "Fatigued": { + "drawback": "-45% player damage", + "benefit": "3 additional special loot slots at the end" + }, + "Endurance Run": { + "drawback": "Node timers are set to 4h", + "benefit": "Endloot contains Molten Troves" + } + }, + "prefixes": { + "Regenerating": "Raid health grows 1% of total raid health every 10 mins, starts when health drops below 50% first time", + "Chilling": "Chance to freeze your buttons for few seconds, disrupts long clicks", + "Vengeful": "Members of named class (e.g. Voidwalker, Luminary) do 20% less damage", + "Curse": "Chance to add one of the following curses for 5min (can each stack up to 3 times) that will follow you from node to node:\n10% chance to miss target per curse\n20% reduction to legion bonus per curse\n10% reduction to total attack damage per curse" + } +} From 3bbb79af7e8094a4ce26c59246cfb17d4f535198 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Fri, 4 Nov 2016 18:02:30 +0200 Subject: [PATCH 247/341] Update Jershan'thurn's Portal [Jershan'thurn].json --- tiers/Jershan'thurn's Portal [Jershan'thurn].json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tiers/Jershan'thurn's Portal [Jershan'thurn].json b/tiers/Jershan'thurn's Portal [Jershan'thurn].json index bb2fd48..e15e32f 100644 --- a/tiers/Jershan'thurn's Portal [Jershan'thurn].json +++ b/tiers/Jershan'thurn's Portal [Jershan'thurn].json @@ -168,7 +168,7 @@ "common": null, "stats": null }, - "50000000": { + "50000000000": { "epic": 1150, "legendary": null, "uncommon": null, From 360be08b294e2d39cf8135c673ebd704b3f3ac57 Mon Sep 17 00:00:00 2001 From: ardenian Date: Fri, 4 Nov 2016 23:05:40 +0100 Subject: [PATCH 248/341] de.json language files, requires check --- src/languages/de.json | 101 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 src/languages/de.json diff --git a/src/languages/de.json b/src/languages/de.json new file mode 100644 index 0000000..87f8b2e --- /dev/null +++ b/src/languages/de.json @@ -0,0 +1,101 @@ +{ + "chat": { + "actions": { + "banUser": "Ban Benutzer", + "makeMod": "Promote zu Moderator", + "makeAdmin": "Promote zu Admin", + "makeUser": "Promote zu Benutzer", + "close": "Schlieen", + "invite": "Zum Chat einladen ", + "createChat": "Chat erstellen", + "joinChat": "Chat beitreten", + "createAddChat": "Klicke, um neuen Chat zu erstellen", + "copyIdPasswort": "Kopiere Passwort&Id", + "deleteRoom": "Raum lschen", + "leaveRoom": "Raum verlassen" + }, + "texts": { + "settings": "Mehr Einstellungen bei ", + "account": "Account", + "title": "Chat", + "creditEmoticon": "Emoticons bereitgestellt durch ", + "optional": "Dieser Teil des Skripts ist optional, einloggen ist nicht ntig, um beispielsweise Raids beizutreten", + "invalid": "Sie sollten nicht Ihre Login-Daten, wie Name oder Passwort der Website oder des Spiels, benutzen - der angezeigte Name kann nach der Registrierung angepasst werden.", + "offline": "Sie sind nicht eingeloggt, bitte registrieren oder loggen Sie sich ein" + }, + "error": { + "modify": "Konnte Benutzer nicht modifizieren", + "create": "Erstellung fehlgeschlagen", + "join": "Beitritt fehlgeschlagen", + "login": "Login auf unerwartete Weise fehlgeschlagen", + "unknown": "Der eingegebene Benutzername ist dotd.idrinth.de nicht bekannt, mchten Sie sich dort registrieren?" + }, + "notification": { + "mention": "chat-mention notifications?", + "raid": "chat-raid notifications?", + "message": "chat-message notifications?" + } + }, + "default": "Unexpected error occurred. Please contact script developers (https://github.com/Idrinth/IDotD).", + "land": { + "lack": "Sie haben nicht genug Gold, um Gebude zu kaufen.", + "hour": " Gold pro Stunde jeweils", + "calc": "Berechne", + "avaible": "Verfgbares Gold" + }, + "tier": { + "search": "Geben Sie den Namen des Bosses ein", + "diff": { + "normal": "Normal", + "hard": "Hard", + "legend": "Legend", + "night": "Nightmare" + }, + "tag": "Tag to screen-top", + "maxBoxes": "Es gibt keinen Platz fr eine weitere Tierbox , bitte Schlieen Sie eine." + }, + "raids": { + "lastJoined": "Letzte beigetretene Raids", + "clear": "Lsche Raids", + "disableJoining": "Deaktiviere Beitreten der Raids ", + "clickCopy": "Klicke, um Raidlink zu kopieren", + "imports": { + "manually": "Importiere alle manuell", + "favs": "Importiere Favoriten manuell", + "restart": "Starte das Beitreten von Raids neu" + }, + "disableSpecific": "Deaktiviere automatisches Beitreten fr bestimmte Raids" + }, + "button": { + "ok": "Ok", + "cancel": "Schlieen", + "reloadGame": "Game neuladen", + "reloadScript": "Skript neuladen", + "refreshFBGameLogin": "Erneuere Facebook Login", + "ngRaidJoin": "NG Raid Beitritt ( langsam!)", + "disableTimedAutoJoin": "Deaktiviere zeitlich-automatisches Beitreten", + "enableTimedAutoJoin": "Aktiviere zeitlich-automatisches Beitreten" + }, + "setting": { + "enableExtCharInfo": "Aktiviere erweiterte Charakterinformation?", + "minimLayout": "Minimiertes Layout", + "moveSettingLeft": "Einstellungen nach links", + "warBottomPage": "Stelle War am unteren Rand der Seite dar", + "useGoldEfficiently": "Aktivieren, um so viel Gold wie mglich zum Kaufen zu verwenden - deaktivieren, um nur die effizienteste Mglichkeit aus dem Calculator zu kaufen", + "tenBuildOnce": "Kaufe 10 Gebude auf einmal ( empfohlen)", + "extCharInfoDuration": "Millisekunden bevor die erweiterte Charakterinformation verschwindet", + "joiningDuration": "Sekunden, die das Spiel zum Laden braucht, bevor man Raids beitreten kann", + "enableChat": "Chat aktivieren ( bentigt Neustart des Skripts)", + "enableFavRequest": "Aktiviere automatische Nachfrage fr Raids fr Favoriten?", + "favIdToJoin": "Favorisierte Ids zum beitreten ( mehrere mit Komma trennen)", + "worldserver": "Worldserver?" + }, + "ui": { + "settingInfo": "Dieses Skript wird immer alle Raids importieren, die Sie manuell auf der Website festgelegt haben und, falls aktiviert, wird es auch alle Favouriten aus Suchergebnissen importieren.", + "maxPopupsFrame": "Maximale Popups/Frames beim Beitreten von Raids", + "timeAutoJoin": "Zeit, um langsam automatisch Raids beizutreten ( ldt Spiel mehrere Male neu). Format ist [Hours]:[Minutes] ohne anfhrende Nullen, also 7:1 ist gut, 07:01 ist schlecht", + "getFavFrom": "Bekomme Suchfavoriten aus ", + "raidsearch": "Idrinth's Raidsearch", + "reloadGameFail": "Das Spiel konnte nicht neu gestartet werden" + } +} \ No newline at end of file From f135c83aba9caabd1366ce30a76c4b918a478472 Mon Sep 17 00:00:00 2001 From: Theodotos Date: Thu, 10 Nov 2016 09:10:58 +0200 Subject: [PATCH 249/341] Update Deadly Clockwork Giant [Deadly Clockwork].json --- ...ly Clockwork Giant [Deadly Clockwork].json | 112 +++++++++++++++--- 1 file changed, 98 insertions(+), 14 deletions(-) diff --git a/tiers/Deadly Clockwork Giant [Deadly Clockwork].json b/tiers/Deadly Clockwork Giant [Deadly Clockwork].json index e0bce94..de3d213 100644 --- a/tiers/Deadly Clockwork Giant [Deadly Clockwork].json +++ b/tiers/Deadly Clockwork Giant [Deadly Clockwork].json @@ -1,18 +1,102 @@ { "nightmare": { - "167000000000": 6500, - "500000000000": 22001, - "100000000000000": 46000, - "200000000000000": 94000, - "300000000000000": 142000, - "400000000000000": 190000, - "500000000000000": 240000, - "750000000000000": 270000, - "1000000000000000": 300000, - "1500000000000000": 310000, - "2000000000000000": 320000, - "3000000000000000": 330000, - "4000000000000000": 340000, - "5000000000000000": 350000 + "167000000000":{ + "epic": 6500, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "500000000000":{ + "epic": 22001, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000000":{ + "epic": 46000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2000000000000":{ + "epic": 94000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000000000":{ + "epic": 142000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4000000000000":{ + "epic": 192000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000000":{ + "epic":240000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7500000000000":{ + "epic": 270000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000000":{ + "epic": 300000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000000":{ + "epic": 310000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000000":{ + "epic": 320000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30000000000000":{ + "epic": 330000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "40000000000000":{ + "epic": 340000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "50000000000000":{ + "epic": 350000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } From bda548db38306a0c742789f1b51a91ad6cc3733b Mon Sep 17 00:00:00 2001 From: Ardenian Date: Thu, 10 Nov 2016 20:32:32 +0100 Subject: [PATCH 250/341] Update de.json Fixing required changes, ref #228, fixes #228 --- src/languages/de.json | 70 +++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/languages/de.json b/src/languages/de.json index 87f8b2e..f621a2d 100644 --- a/src/languages/de.json +++ b/src/languages/de.json @@ -5,21 +5,21 @@ "makeMod": "Promote zu Moderator", "makeAdmin": "Promote zu Admin", "makeUser": "Promote zu Benutzer", - "close": "Schlieen", - "invite": "Zum Chat einladen ", + "close": "Schließen", + "invite": "Zu Chat einladen ", "createChat": "Chat erstellen", "joinChat": "Chat beitreten", "createAddChat": "Klicke, um neuen Chat zu erstellen", "copyIdPasswort": "Kopiere Passwort&Id", - "deleteRoom": "Raum lschen", + "deleteRoom": "Raum löschen", "leaveRoom": "Raum verlassen" }, "texts": { - "settings": "Mehr Einstellungen bei ", + "settings": "Mehr Einstellungen auf ", "account": "Account", "title": "Chat", - "creditEmoticon": "Emoticons bereitgestellt durch ", - "optional": "Dieser Teil des Skripts ist optional, einloggen ist nicht ntig, um beispielsweise Raids beizutreten", + "creditEmoticon": "Emoticons erstellt durch ", + "optional": "Dieser Teil des Skripts ist optional, einloggen ist nicht nötig, um beispielsweise Raids beizutreten", "invalid": "Sie sollten nicht Ihre Login-Daten, wie Name oder Passwort der Website oder des Spiels, benutzen - der angezeigte Name kann nach der Registrierung angepasst werden.", "offline": "Sie sind nicht eingeloggt, bitte registrieren oder loggen Sie sich ein" }, @@ -28,20 +28,20 @@ "create": "Erstellung fehlgeschlagen", "join": "Beitritt fehlgeschlagen", "login": "Login auf unerwartete Weise fehlgeschlagen", - "unknown": "Der eingegebene Benutzername ist dotd.idrinth.de nicht bekannt, mchten Sie sich dort registrieren?" + "unknown": "Der eingegebene Benutzername ist dotd.idrinth.de nicht bekannt, möchten Sie sich dort registrieren?" }, "notification": { - "mention": "chat-mention notifications?", - "raid": "chat-raid notifications?", - "message": "chat-message notifications?" + "mention": "Benachrichtigungen bei Erwähnung im Chat?", + "raid": "Benachrichtigung, wenn ein Raid gepostet wird?", + "message": "Benachrichtigungen für Chat-Nachrichten?" } }, - "default": "Unexpected error occurred. Please contact script developers (https://github.com/Idrinth/IDotD).", + "default": "Ein unerwareteter Fehler ist eingetreten. Bitte kontaktiere den Entwickler auf (https://github.com/Idrinth/IDotD).", "land": { - "lack": "Sie haben nicht genug Gold, um Gebude zu kaufen.", - "hour": " Gold pro Stunde jeweils", + "lack": "Sie haben nicht genug Gold, um Gebäude zu kaufen.", + "hour": " Gold pro Stunde und Gebäude", "calc": "Berechne", - "avaible": "Verfgbares Gold" + "avaible": "Verfügbares Gold" }, "tier": { "search": "Geben Sie den Namen des Bosses ein", @@ -51,51 +51,51 @@ "legend": "Legend", "night": "Nightmare" }, - "tag": "Tag to screen-top", - "maxBoxes": "Es gibt keinen Platz fr eine weitere Tierbox , bitte Schlieen Sie eine." + "tag": "An den oberen Bildschirmrand anheften", + "maxBoxes": "Es gibt keinen Platz für eine weitere Tierbox , bitte schließe eine." }, "raids": { - "lastJoined": "Letzte beigetretene Raids", - "clear": "Lsche Raids", - "disableJoining": "Deaktiviere Beitreten der Raids ", + "lastJoined": "Zuletzt beigetretene Raids", + "clear": "Lösche Raids", + "disableJoining": "Beitreten der Raids deaktivieren", "clickCopy": "Klicke, um Raidlink zu kopieren", "imports": { - "manually": "Importiere alle manuell", - "favs": "Importiere Favoriten manuell", + "manually": "Importiere alle Raids manuell", + "favs": "Importiere favorisierte Raids manuell", "restart": "Starte das Beitreten von Raids neu" }, - "disableSpecific": "Deaktiviere automatisches Beitreten fr bestimmte Raids" + "disableSpecific": "Deaktiviere automatisches Beitreten für bestimmte Raids" }, "button": { "ok": "Ok", - "cancel": "Schlieen", - "reloadGame": "Game neuladen", - "reloadScript": "Skript neuladen", - "refreshFBGameLogin": "Erneuere Facebook Login", + "cancel": "Abbrechen", + "reloadGame": "Lade Spiel neu", + "reloadScript": "Lade Skript neu", + "refreshFBGameLogin": "Erneuere Facebook Game Login", "ngRaidJoin": "NG Raid Beitritt ( langsam!)", - "disableTimedAutoJoin": "Deaktiviere zeitlich-automatisches Beitreten", - "enableTimedAutoJoin": "Aktiviere zeitlich-automatisches Beitreten" + "disableTimedAutoJoin": "Deaktiviere geplantes Beitreten", + "enableTimedAutoJoin": "Aktiviere geplantes Beitreten" }, "setting": { "enableExtCharInfo": "Aktiviere erweiterte Charakterinformation?", "minimLayout": "Minimiertes Layout", "moveSettingLeft": "Einstellungen nach links", "warBottomPage": "Stelle War am unteren Rand der Seite dar", - "useGoldEfficiently": "Aktivieren, um so viel Gold wie mglich zum Kaufen zu verwenden - deaktivieren, um nur die effizienteste Mglichkeit aus dem Calculator zu kaufen", - "tenBuildOnce": "Kaufe 10 Gebude auf einmal ( empfohlen)", + "useGoldEfficiently": "Aktivieren, um so viel Gold wie möglich zum Kaufen zu verwenden - deaktivieren, um nur die effizienteste Möglichkeit aus dem Calculator zu kaufen", + "tenBuildOnce": "Kaufe 10 Gebäude auf einmal ( empfohlen)", "extCharInfoDuration": "Millisekunden bevor die erweiterte Charakterinformation verschwindet", "joiningDuration": "Sekunden, die das Spiel zum Laden braucht, bevor man Raids beitreten kann", - "enableChat": "Chat aktivieren ( bentigt Neustart des Skripts)", - "enableFavRequest": "Aktiviere automatische Nachfrage fr Raids fr Favoriten?", + "enableChat": "Chat aktivieren ( benötigt Neustart des Skripts)", + "enableFavRequest": "Aktiviere automatische Nachfrage für Raids für Favoriten?", "favIdToJoin": "Favorisierte Ids zum beitreten ( mehrere mit Komma trennen)", "worldserver": "Worldserver?" }, "ui": { "settingInfo": "Dieses Skript wird immer alle Raids importieren, die Sie manuell auf der Website festgelegt haben und, falls aktiviert, wird es auch alle Favouriten aus Suchergebnissen importieren.", "maxPopupsFrame": "Maximale Popups/Frames beim Beitreten von Raids", - "timeAutoJoin": "Zeit, um langsam automatisch Raids beizutreten ( ldt Spiel mehrere Male neu). Format ist [Hours]:[Minutes] ohne anfhrende Nullen, also 7:1 ist gut, 07:01 ist schlecht", + "timeAutoJoin": "Zeit, um langsam automatisch Raids beizutreten ( lädt Spiel mehrere Male neu). Format ist [Stunden]:[Minuten] ohne anführende Nullen, also 7:1 ist gut, 07:01 ist schlecht", "getFavFrom": "Bekomme Suchfavoriten aus ", - "raidsearch": "Idrinth's Raidsearch", + "raidsearch": "Idrinths Raidsearch", "reloadGameFail": "Das Spiel konnte nicht neu gestartet werden" } -} \ No newline at end of file +} From 2da2cfd1a131b11b40e719f0c1ba8e35658089e7 Mon Sep 17 00:00:00 2001 From: Ardenian Date: Thu, 10 Nov 2016 20:43:42 +0100 Subject: [PATCH 251/341] Update de.json --- src/languages/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/de.json b/src/languages/de.json index f621a2d..1eff388 100644 --- a/src/languages/de.json +++ b/src/languages/de.json @@ -36,7 +36,7 @@ "message": "Benachrichtigungen für Chat-Nachrichten?" } }, - "default": "Ein unerwareteter Fehler ist eingetreten. Bitte kontaktiere den Entwickler auf (https://github.com/Idrinth/IDotD).", + "default": "Ein unerwareteter Fehler ist eingetreten. Bitte kontaktiere die Entwickler (https://github.com/Idrinth/IDotD).", "land": { "lack": "Sie haben nicht genug Gold, um Gebäude zu kaufen.", "hour": " Gold pro Stunde und Gebäude", From 230783fac307306698e750163903fa55a19b6a18 Mon Sep 17 00:00:00 2001 From: Ardenian Date: Mon, 14 Nov 2016 15:01:58 +0100 Subject: [PATCH 252/341] Update de.json Fixing requested changes --- src/languages/de.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/languages/de.json b/src/languages/de.json index 1eff388..4b8f3e8 100644 --- a/src/languages/de.json +++ b/src/languages/de.json @@ -1,16 +1,16 @@ { "chat": { "actions": { - "banUser": "Ban Benutzer", - "makeMod": "Promote zu Moderator", - "makeAdmin": "Promote zu Admin", - "makeUser": "Promote zu Benutzer", + "banUser": "Benutzer bannen", + "makeMod": "Zu Moderator befördern", + "makeAdmin": "Zu Admin befördern", + "makeUser": "Zu Benutzer degradieren", "close": "Schließen", "invite": "Zu Chat einladen ", "createChat": "Chat erstellen", "joinChat": "Chat beitreten", "createAddChat": "Klicke, um neuen Chat zu erstellen", - "copyIdPasswort": "Kopiere Passwort&Id", + "copyIdPasswort": "Passwort&Id kopieren", "deleteRoom": "Raum löschen", "leaveRoom": "Raum verlassen" }, @@ -47,9 +47,9 @@ "search": "Geben Sie den Namen des Bosses ein", "diff": { "normal": "Normal", - "hard": "Hard", - "legend": "Legend", - "night": "Nightmare" + "hard": "Hart", + "legend": "Legendär", + "night": "Alptraum" }, "tag": "An den oberen Bildschirmrand anheften", "maxBoxes": "Es gibt keinen Platz für eine weitere Tierbox , bitte schließe eine." From c1a4630c378637902249a1d895cd37121c7c0718 Mon Sep 17 00:00:00 2001 From: Theodotos Date: Mon, 14 Nov 2016 20:51:25 +0200 Subject: [PATCH 253/341] Create Satyr Party Crashers [Crashers].json --- tiers/Satyr Party Crashers [Crashers].json | 122 +++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 tiers/Satyr Party Crashers [Crashers].json diff --git a/tiers/Satyr Party Crashers [Crashers].json b/tiers/Satyr Party Crashers [Crashers].json new file mode 100644 index 0000000..9dc3645 --- /dev/null +++ b/tiers/Satyr Party Crashers [Crashers].json @@ -0,0 +1,122 @@ +{ + "nightmare":{ + "1000000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "100000000":{ + "epic": 15, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "500000000":{ + "epic": 121, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000":{ + "epic": 242, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2000000000":{ + "epic": 484, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000000":{ + "epic": 606, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4000000000":{ + "epic": 758, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000":{ + "epic": 910, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7000000000":{ + "epic": 1062, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000":{ + "epic": 1222, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "12500000000":{ + "epic": 1375, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000":{ + "epic": 1530, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000":{ + "epic": 1690, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25000000000":{ + "epic": 1850, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30000000000":{ + "epic": 2010, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "40000000000":{ + "epic": 2014, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "50000000000":{ + "epic": 2410, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +} From 658a04f040710d20518f2580fa51f21aa43cfdaa Mon Sep 17 00:00:00 2001 From: Theodotos Date: Mon, 14 Nov 2016 20:54:03 +0200 Subject: [PATCH 254/341] Update Satyr Party Crashers [Crashers].json --- tiers/Satyr Party Crashers [Crashers].json | 1 + 1 file changed, 1 insertion(+) diff --git a/tiers/Satyr Party Crashers [Crashers].json b/tiers/Satyr Party Crashers [Crashers].json index 9dc3645..42e6acf 100644 --- a/tiers/Satyr Party Crashers [Crashers].json +++ b/tiers/Satyr Party Crashers [Crashers].json @@ -120,3 +120,4 @@ "stats": null } } +} From 4bcc819dfb89d3b801aa1543d98e29e0b424f027 Mon Sep 17 00:00:00 2001 From: Theodotos Date: Wed, 16 Nov 2016 18:00:02 +0200 Subject: [PATCH 255/341] Create Deadly Bastion [Deadly Bastion].json --- tiers/Deadly Bastion [Deadly Bastion].json | 124 +++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 tiers/Deadly Bastion [Deadly Bastion].json diff --git a/tiers/Deadly Bastion [Deadly Bastion].json b/tiers/Deadly Bastion [Deadly Bastion].json new file mode 100644 index 0000000..b5916fb --- /dev/null +++ b/tiers/Deadly Bastion [Deadly Bastion].json @@ -0,0 +1,124 @@ +{ + + "nightmare":{ + "130000000000":{ + "epic": 4200, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "167000000000":{ + "epic": 6500, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "500000000000":{ + "epic": 22000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "750000000000":{ + "epic": 33500, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000000":{ + "epic": 46000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1500000000000":{ + "epic": 69500, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2000000000000":{ + "epic": 94000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3000000000000":{ + "epic": 142000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4000000000000":{ + "epic": 190000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5000000000000":{ + "epic": 240000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7500000000000":{ + "epic": 270000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "10000000000000":{ + "epic": 300000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "15000000000000":{ + "epic": 310000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "20000000000000":{ + "epic": 320000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "30000000000000":{ + "epic": 330000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "40000000000000":{ + "epic": 340000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "50000000000000":{ + "epic": 350000, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } +} +} From bfb6431706028d6df4330ae542f4263adf68fcde Mon Sep 17 00:00:00 2001 From: Theodotos Date: Wed, 16 Nov 2016 18:06:25 +0200 Subject: [PATCH 256/341] Rename Deadly Bastion [Deadly Bastion].json to Deadly Bastion of Blood [Deadly Bastion].json --- ...astion].json => Deadly Bastion of Blood [Deadly Bastion].json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tiers/{Deadly Bastion [Deadly Bastion].json => Deadly Bastion of Blood [Deadly Bastion].json} (100%) diff --git a/tiers/Deadly Bastion [Deadly Bastion].json b/tiers/Deadly Bastion of Blood [Deadly Bastion].json similarity index 100% rename from tiers/Deadly Bastion [Deadly Bastion].json rename to tiers/Deadly Bastion of Blood [Deadly Bastion].json From 242dda47c675a63b3b9d80f3d31a4ded6b43c6bd Mon Sep 17 00:00:00 2001 From: Theodotos Date: Thu, 17 Nov 2016 16:16:41 +0200 Subject: [PATCH 257/341] Update Aberrant Strength Potion [Strength Potion].json --- ...ant Strength Potion [Strength Potion].json | 256 +++++++++++++++--- 1 file changed, 224 insertions(+), 32 deletions(-) diff --git a/tiers/Aberrant Strength Potion [Strength Potion].json b/tiers/Aberrant Strength Potion [Strength Potion].json index be55597..77cbb8c 100644 --- a/tiers/Aberrant Strength Potion [Strength Potion].json +++ b/tiers/Aberrant Strength Potion [Strength Potion].json @@ -1,42 +1,234 @@ { "normal": { - "50000000": 1, - "100000000": 5, - "200000000": 7, - "300000000": 10, - "400000000": 13, - "500000000": 15, - "750000000": 17, - "1000000000": 20 + "50000000": { + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "100000000": { + "epic": 5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "200000000": { + "epic": 7, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "300000000": { + "epic": 10, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "400000000": { + "epic": 13, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "500000000": { + "epic": 15, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "750000000": { + "epic": 17, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000": { + "epic": 20, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, "hard": { - "50000000": 1, - "100000000": 5, - "200000000": 7, - "300000000": 10, - "400000000": 13, - "500000000": 15, - "750000000": 17, - "1000000000": 20 + "50000000": { + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "100000000": { + "epic": 5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "200000000": { + "epic": 7, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "300000000": { + "epic": 10, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "400000000": { + "epic": 13, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "500000000": { + "epic": 15, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "750000000": { + "epic": 17, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000": { + "epic": 20, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, "legendary": { - "50000000": 1, - "100000000": 5, - "200000000": 7, - "300000000": 10, - "400000000": 13, - "500000000": 15, - "750000000": 17, - "1000000000": 20 + "50000000": { + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "100000000": { + "epic": 5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "200000000": { + "epic": 7, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "300000000": { + "epic": 10, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "400000000": { + "epic": 13, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "500000000": { + "epic": 15, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "750000000": { + "epic": 17, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000": { + "epic": 20, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, "nightmare": { - "50000000": 1, - "100000000": 5, - "200000000": 7, - "300000000": 10, - "400000000": 13, - "500000000": 15, - "750000000": 17, - "1000000000": 20 + "50000000": { + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "100000000": { + "epic": 5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "200000000": { + "epic": 7, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "300000000": { + "epic": 10, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "400000000": { + "epic": 13, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "500000000": { + "epic": 15, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "750000000": { + "epic": 17, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000": { + "epic": 20, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } From 3803f6a3b043d8a4858203630018ffb1a5020c8d Mon Sep 17 00:00:00 2001 From: Theodotos Date: Thu, 17 Nov 2016 16:22:40 +0200 Subject: [PATCH 258/341] Update Adastros of the Kavala [Adrastos].json --- tiers/Adastros of the Kavala [Adrastos].json | 208 +++++++++++++++--- 1 file changed, 182 insertions(+), 26 deletions(-) diff --git a/tiers/Adastros of the Kavala [Adrastos].json b/tiers/Adastros of the Kavala [Adrastos].json index 98cade8..fd85ad5 100644 --- a/tiers/Adastros of the Kavala [Adrastos].json +++ b/tiers/Adastros of the Kavala [Adrastos].json @@ -1,30 +1,186 @@ { "nightmare": { - "8000": 10, - "16500": 15, - "25500": 20, - "35000": 25, - "45000": 30, - "55500": 35, - "66500": 40, - "78000": 45, - "90000": 50, - "102500": 55, - "115500": 60, - "129000": 65, - "143000": 70, - "157500": 75, - "172500": 80, - "188000": 85, - "204000": 90, - "220500": 95, - "237500": 100, - "255500": 105, - "273500": 110, - "291500": 115, - "310500": 120, - "330000": 125, - "350000": 130, - "1000000": 150 + "8000000": { + "epic": 10, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "16500000": { + "epic": 15, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "25500000": { + "epic": 20, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "35000000": { + "epic": 25, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "45000000": { + "epic": 30, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "55500000": { + "epic": 35, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "66500000": { + "epic": 40, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "78000000": { + "epic": 45, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "90000000": { + "epic": 50, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "102500000": { + "epic": 55, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "115500000": { + "epic": 60, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "129000000": { + "epic": 65, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "143000000": { + "epic": 70, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "157500000": { + "epic": 75, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "172500000": { + "epic": 80, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "188000000": { + "epic": 85, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "204000000": { + "epic": 90, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "220500000": { + "epic": 95, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "237500000": { + "epic": 100, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "255500000": { + "epic": 105, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "273500000": { + "epic": 110, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "291500000": { + "epic": 115, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "310500000": { + "epic": 120, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "330000000": { + "epic": 125, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "350000000": { + "epic": 130, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000000": { + "epic": 150, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } From 3b95671b8d8d161330f4980a745cd188af71c777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 20 Nov 2016 11:27:53 +0100 Subject: [PATCH 259/341] fixes #231 replacing a use of a getter that was never intended to work --- src/mods/core.js | 11 +++++++++-- src/mods/land.js | 2 +- src/mods/settings.js | 28 +++++++++++++++++++++++----- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/mods/core.js b/src/mods/core.js index 55a24a0..1ad4515 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -2,8 +2,15 @@ idrinth.core = { escapeRegExp: function ( str ) { return str.replace ( /[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&" ); }, - fieldIsSetting: function ( parent, field ) { - return parent && typeof parent === 'object' && field && parent.hasOwnProperty ( field ) && typeof parent[field] !== 'object' && typeof parent[field] !== 'function'; + /** + * + * @param {object} parent + * @param {string} field + * @param {Boolean} allowObjects + * @returns {Boolean} + */ + fieldIsSetting: function ( parent, field, allowObjects ) { + return parent && typeof parent === 'object' && field && parent.hasOwnProperty ( field ) && ( typeof parent[field] !== 'object' || allowObjects ) && typeof parent[field] !== 'function'; }, ajax: { runHome: function ( url, success, failure, timeout, additionalHeader, isStatic ) { diff --git a/src/mods/land.js b/src/mods/land.js index d121ea4..9d93103 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -66,7 +66,7 @@ idrinth.land = { } document.getElementById ( 'idrinth-land-gold' ).value = idrinth.settings.get ( "land#gold" ); }; - for (var key in idrinth.settings.get ( "land#" )) { + for (var key in idrinth.settings.get ( "land", true )) { if ( idrinth.settings.get ( "land#" + hasOwnProperty ( key ) ) ) { idrinth.settings.change ( 'land#' + key, parseInt ( document.getElementById ( 'idrinth-land-' + key ).value, 10 ) ); } diff --git a/src/mods/settings.js b/src/mods/settings.js index f61df8e..f2a7483 100644 --- a/src/mods/settings.js +++ b/src/mods/settings.js @@ -39,14 +39,32 @@ idrinth.settings = { gold: 0 } }, - get: function ( field ) { + /** + * + * @param {string} field + * @param {Boolean} allowObject + * @returns {int|string|object} + */ + get: function ( field, allowObject ) { 'use strict'; - var getValue = function ( parent, field ) { - if ( idrinth.core.fieldIsSetting ( parent, field ) ) { + /** + * + * @param {object} parent + * @param {string} field + * @param {Boolean} allowObject + * @returns {int|string|object} + */ + var getValue = function ( parent, field, allowObject ) { + if ( idrinth.core.fieldIsSetting ( parent, field, allowObject ) ) { return parent[field]; } return null; }; + /** + * + * @param {string} key + * @returns {undefined} + */ var remove = function ( key ) { try { window.localStorage.removeItem ( key ); @@ -57,14 +75,14 @@ idrinth.settings = { if ( !field ) { return; } - var value = getValue ( idrinth.settings.data, field ); + var value = getValue ( idrinth.settings.data, field, allowObject ); if ( value !== null && typeof value !== 'object' ) { remove ( 'idrinth-dotd-' + field ); return value; } field = field.split ( '#' ); remove ( 'idrinth-dotd-' + field[0] + '-' + field[1] ); - return getValue ( idrinth.settings.data[field[0]], field[1] ); + return getValue ( idrinth.settings.data[field[0]], field[1], allowObject ); }, change: function ( field, value ) { 'use strict'; From a78620a966b9d4997c8c70cf99e876bc96d9beca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 20 Nov 2016 12:32:13 +0100 Subject: [PATCH 260/341] correcting condition --- src/mods/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/settings.js b/src/mods/settings.js index f2a7483..33c2b84 100644 --- a/src/mods/settings.js +++ b/src/mods/settings.js @@ -76,7 +76,7 @@ idrinth.settings = { return; } var value = getValue ( idrinth.settings.data, field, allowObject ); - if ( value !== null && typeof value !== 'object' ) { + if ( value !== null && ( typeof value !== 'object' || allowObject ) ) { remove ( 'idrinth-dotd-' + field ); return value; } From fa24002b0cae6b4e1e9b26083151525fb4c7c4eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 20 Nov 2016 12:35:06 +0100 Subject: [PATCH 261/341] fiing another condition --- src/mods/land.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/land.js b/src/mods/land.js index 9d93103..1c7a979 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -67,7 +67,7 @@ idrinth.land = { document.getElementById ( 'idrinth-land-gold' ).value = idrinth.settings.get ( "land#gold" ); }; for (var key in idrinth.settings.get ( "land", true )) { - if ( idrinth.settings.get ( "land#" + hasOwnProperty ( key ) ) ) { + if ( idrinth.settings.get ( "land#" + key ) ) { idrinth.settings.change ( 'land#' + key, parseInt ( document.getElementById ( 'idrinth-land-' + key ).value, 10 ) ); } } From 4a0df106312c1de8002a4dc53517e7d6466a972f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sun, 20 Nov 2016 12:45:50 +0100 Subject: [PATCH 262/341] removing blocking condition --- src/mods/land.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mods/land.js b/src/mods/land.js index 1c7a979..c0a6686 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -67,9 +67,7 @@ idrinth.land = { document.getElementById ( 'idrinth-land-gold' ).value = idrinth.settings.get ( "land#gold" ); }; for (var key in idrinth.settings.get ( "land", true )) { - if ( idrinth.settings.get ( "land#" + key ) ) { - idrinth.settings.change ( 'land#' + key, parseInt ( document.getElementById ( 'idrinth-land-' + key ).value, 10 ) ); - } + idrinth.settings.change ( 'land#' + key, parseInt ( document.getElementById ( 'idrinth-land-' + key ).value, 10 ) ); } var results = baseCalculator ( getRequirements () ); if ( Object.keys ( results ).length === 0 ) { From f69aee5b3f0f6e9dd7025d4d713f038e95a90fb2 Mon Sep 17 00:00:00 2001 From: Theodotos Date: Sat, 26 Nov 2016 20:41:26 +0200 Subject: [PATCH 263/341] Update Al-Azab [Al-Azab].json --- tiers/Al-Azab [Al-Azab].json | 224 ++++++++++++++++++++++++++++++----- 1 file changed, 196 insertions(+), 28 deletions(-) diff --git a/tiers/Al-Azab [Al-Azab].json b/tiers/Al-Azab [Al-Azab].json index 6a1e8af..ee87d50 100644 --- a/tiers/Al-Azab [Al-Azab].json +++ b/tiers/Al-Azab [Al-Azab].json @@ -1,38 +1,206 @@ { "normal": { - "110000": 1, - "495000": 1, - "825000": 1, - "1210000": 2, - "1760000": 2.5, - "3575000": 3, - "4950000": 3.5 + "110000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "495000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "825000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1210000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1760000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3575000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4950000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, "hard": { - "138000": 1, - "619000": 1, - "1031000": 1, - "1513000": 2, - "2200000": 2.5, - "4469000": 3, - "6188000": 3.5 + "138000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "619000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1031000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1513000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2200000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4469000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "6188000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, "legendary": { - "176000": 1, - "792000": 1, - "1320000": 1, - "1936000": 2, - "2816000": 2.5, - "5720000": 3, - "7920000": 3.5 + "176000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "792000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1320000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1936000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2816000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5720000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7920000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, "nightmare": { - "220000": 1, - "990000": 1, - "1650000": 1, - "2420000": 2, - "3520000": 2.5, - "7150000": 3, - "9900000": 3.5 + "220000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "990000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1650000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2420000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3520000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7150000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "9900000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } From c6bbd001f4a715799ab2177a0df2f74deddfe46b Mon Sep 17 00:00:00 2001 From: Theodotos Date: Sat, 26 Nov 2016 21:17:40 +0200 Subject: [PATCH 264/341] Update Arachna [Arachna].json --- tiers/Arachna [Arachna].json | 224 ++++++++++++++++++++++++++++++----- 1 file changed, 196 insertions(+), 28 deletions(-) diff --git a/tiers/Arachna [Arachna].json b/tiers/Arachna [Arachna].json index 08b8107..b8f80f6 100644 --- a/tiers/Arachna [Arachna].json +++ b/tiers/Arachna [Arachna].json @@ -1,38 +1,206 @@ { "normal": { - "55000": 1, - "308000": 1, - "418000": 1, - "902000": 2, - "1375000": 2.5, - "2970000": 3, - "3740000": 3.5 + "55000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "308000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "418000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "902000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1375000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2970000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3740000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, "hard": { - "69000": 1, - "385000": 1, - "523000": 1, - "1128000": 2, - "1719000": 2.5, - "3713000": 3, - "4675000": 3.5 + "69000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "385000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "523000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1128000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1719000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "3713000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4675000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, "legendary": { - "88000": 1, - "493000": 1, - "669000": 1, - "1443000": 2, - "2200000": 2.5, - "4752000": 3, - "5984000": 3.5 + "88000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "493000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "669000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1443000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2200000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "4752000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5984000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, "nightmare": { - "110000": 1, - "616000": 1, - "836000": 1, - "1804000": 2, - "2750000": 2.5, - "5840000": 3, - "7480000": 3.5 + "110000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "616000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "836000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1804000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "2750000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "5840000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "7480000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } From 2a6a7345486c8d40d3d573ec6ca9d59d0cbf3ad0 Mon Sep 17 00:00:00 2001 From: Theodotos Date: Sat, 26 Nov 2016 21:25:23 +0200 Subject: [PATCH 265/341] Update Ataxes [Ataxes].json --- tiers/Ataxes [Ataxes].json | 224 ++++++++++++++++++++++++++++++++----- 1 file changed, 196 insertions(+), 28 deletions(-) diff --git a/tiers/Ataxes [Ataxes].json b/tiers/Ataxes [Ataxes].json index 648484b..eb1ca88 100644 --- a/tiers/Ataxes [Ataxes].json +++ b/tiers/Ataxes [Ataxes].json @@ -1,38 +1,206 @@ { "normal": { - "105000": 1, - "120000": 1, - "180000": 1, - "240000": 2, - "320000": 2.5, - "500000": 3, - "700000": 3.5 + "105000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "120000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "180000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "240000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "320000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "500000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "700000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, "hard": { - "131000": 1, - "150000": 1, - "225000": 1, - "300000": 2, - "400000": 2.5, - "625000": 3, - "875000": 3.5 + "131000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "150000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "225000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "300000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "400000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "625000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "875000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, "legendary": { - "168000": 1, - "192000": 1, - "288000": 1, - "384000": 2, - "512000": 2.5, - "800000": 3, - "1120000": 3.5 + "168000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "192000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "288000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "384000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "512000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "800000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1120000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } }, "nightmare": { - "210000": 1, - "240000": 1, - "360000": 1, - "480000": 2, - "640000": 2.5, - "1000000": 3, - "1400000": 3.5 + "210000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "240000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "360000":{ + "epic": 1, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "480000":{ + "epic": 2, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "640000":{ + "epic": 2.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1000000":{ + "epic": 3, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + }, + "1400000":{ + "epic": 3.5, + "legendary": null, + "uncommon": null, + "common": null, + "stats": null + } } } From 23c2e52bda7d6c37f32be6b5b84a12558286183e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 29 Nov 2016 11:06:13 +0100 Subject: [PATCH 266/341] Update README.md fixing some links --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index dffb8f2..8ed2040 100644 --- a/README.md +++ b/README.md @@ -13,13 +13,13 @@ IDotD combines a raid catcher, a way of automatically joining desired raids, wit Additionally there are a few platform specific features, for example quick information about players in the kongregate chat rooms or a timeable autojoin for newgrounds to replace the usual ones on other platforms. -Most information is avaible at [this project's wiki](https://github.com/Idrinth/IDotD/wiki). +Most information is avaible at [this project's wiki](https://idotd.github.io/). ## Bugs, desired Features etc. -We prefer the usage of the [tracker](https://github.com/Idrinth/IDotD/issues) here, otherwise we do import requests from [GoogleDocs](https://docs.google.com/document/d/1ozOWQuAEKCNnt2cwQ4SZtkpYM_pvrl8Bnj0e_O1KKWs/edit) from time to time. -[Previous GoogleDoc Tickets](https://github.com/Idrinth/IDotD/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3A%22Source%20GoogleDocs%22%20) +We prefer the usage of the [tracker](https://github.com/IDotD/Userscript/issues) here, otherwise we do import requests from [GoogleDocs](https://docs.google.com/document/d/1ozOWQuAEKCNnt2cwQ4SZtkpYM_pvrl8Bnj0e_O1KKWs/edit) from time to time. +[Previous GoogleDoc Tickets](https://github.com/IDotD/Userscript/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3A%22Source%20GoogleDocs%22%20) ## How To Help -We can use helpers for the following: update and improve the wiki, help coding the userscript and testing any of the branches. For any of the later two have a look athe related documentation in the wiki. +We can use helpers for the following: update and improve the wiki, help coding the userscript and testing any of the branches. For any of the later two have a look at the related documentation in the wiki. From b0b27849a2576368229bb22a6ff0454fd8d2d82c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 29 Nov 2016 11:11:15 +0100 Subject: [PATCH 267/341] removing content that was moved to other repositories --- campaigns/Monsters-and-Magma.json | 34 --- src/languages/de.json | 101 --------- src/languages/en.json | 101 --------- src/languages/gr.json | 101 --------- tiers/AP Minizone Raid [Darkness].json | 81 ------- ...ant Strength Potion [Strength Potion].json | 42 ---- tiers/Adastros of the Kavala [Adrastos].json | 30 --- tiers/Agony [Agony].json | 206 ----------------- tiers/Al-Azab [Al-Azab].json | 38 ---- tiers/Apoc Demon [Apoc Demon].json | 81 ------- tiers/Arachna [Arachna].json | 38 ---- .../Ascendant's Echo [Ascendant's Echo].json | 88 ------- tiers/Ataxes [Ataxes].json | 38 ---- tiers/Bad Blood [Bad Blood].json | 50 ---- tiers/Badland Ambusher [Badlands].json | 98 -------- tiers/Balor [Balor].json | 11 - ...' Elite Gladiators [Elite Gladiators].json | 67 ------ tiers/Beastman Stampede [Stampede].json | 102 --------- tiers/Bellarius the Guardian [Bellarius].json | 34 --- tiers/Blood Dancer [Blood Dancer].json | 58 ----- tiers/Bloodmane [Bloodmane].json | 38 ---- tiers/Bloodsuckers [Bloodsuckers].json | 67 ------ tiers/Bloody Alice [Alice].json | 38 ---- tiers/Bogstench [Bogstench].json | 38 ---- tiers/Briareus the Butcher [Briareus].json | 38 ---- .../Burbata the Spine-Crusher [Burbata].json | 50 ---- tiers/Caracalla [Caracalla].json | 70 ------ tiers/Celeano [Celeano].json | 38 ---- tiers/Centurion Marius [Marius].json | 50 ---- tiers/Chieftain Horgrak [Horgrak].json | 38 ---- tiers/Clockwork Dragon [Clock Dragon].json | 62 ----- tiers/Clockwork Giant [Clockwork Giant].json | 46 ---- tiers/Corrupted Wilds [Corrupted Wilds].json | 90 -------- tiers/Count Siculus' Phantom [Siculus].json | 42 ---- tiers/Countess Serpina [Serpina].json | 54 ----- tiers/Damned Shade [Shade].json | 50 ---- tiers/Damned Shade [War Shade].json | 50 ---- tiers/Dar'Hed'Nal [Dar'Hed'Nal].json | 114 ---------- ...ly Clockwork Giant [Deadly Clockwork].json | 18 -- tiers/Deathglare [Deathglare].json | 38 ---- tiers/Dirthax [Dirthax].json | 206 ----------------- tiers/Doomglare [Doomglare].json | 114 ---------- tiers/Doppelganger [Doppelganger].json | 46 ---- tiers/Draconic Dreams [D. Dreams].json | 110 --------- tiers/Dragon's Lair [Lair].json | 50 ---- ...ake's Fire Elemental [Fire Elemental].json | 62 ----- ...akontos, The First Terror [Drakontos].json | 214 ------------------ tiers/Drulcharus [Drulcharus].json | 50 ---- tiers/Drunken Ragunt [Ragunt].json | 46 ---- tiers/Elite 5th Terror [E. 5th Terror].json | 15 -- tiers/Elite Balor [E. Balor].json | 17 -- .../Elite Bloodsuckers [E. Bloodsuckers].json | 81 ------- tiers/Elite Butcher [E. Butcher].json | 46 ---- tiers/Elite Caster [E. Caster].json | 70 ------ tiers/Elite Devourer [Devourer].json | 18 -- tiers/Elite Funny Bones [E. Funny Bones].json | 13 -- tiers/Elite Initiates [E. Initiates].json | 14 -- tiers/Elite Kanehuar Yachu [E. Kane].json | 23 -- tiers/Elite Karkata [E. Karkata].json | 22 -- tiers/Elite Killers [E. Killers].json | 54 ----- tiers/Elite Lady Cecile [E. Lady Cecile].json | 90 -------- tiers/Elite Malleus [E. Malleus].json | 78 ------- tiers/Elite Mangler [E. Mangler].json | 78 ------- tiers/Elite Murderer [E. Murderer].json | 70 ------ tiers/Elite Reaper [E. Reaper].json | 20 -- tiers/Elite Riders [E. Riders].json | 82 ------- tiers/Elite Slitherer [E. Slitherer].json | 15 -- tiers/Elite Undead Warrior [E. Warrior].json | 14 -- tiers/Elite Whispers [E. Whispers].json | 74 ------ ...the Ancients [Engine of the Ancients].json | 60 ----- tiers/Engines of War [Engines of War].json | 106 --------- tiers/Erakka-Sak [Erakka-Sak].json | 38 ---- tiers/Erebus [Erebus].json | 38 ---- tiers/Euphronios [Euphronios].json | 38 ---- .../Euryino, The Fifth Terror [Euryino].json | 122 ---------- tiers/Faetouched Dragon [Fae Dragon].json | 70 ------ ...elendis and Shaoquin [Banhammer Bros].json | 38 ---- tiers/Fog Of Wars [Cannibals].json | 15 -- tiers/Fog Of Wars [Gulkinari].json | 13 -- tiers/Fog Of Wars [Verkiteia].json | 14 -- tiers/Fog Of Wars [Zugen].json | 13 -- tiers/Frogmen-Assassins [Frog-Men].json | 70 ------ tiers/Frost the Snow Dragon [Snow Drag].json | 42 ---- tiers/Gataalli Huxac [Gataalli].json | 86 ------- tiers/General Grune [Grune].json | 38 ---- tiers/General Korxun [Korxun].json | 46 ---- tiers/Ghostly Alchemist [Alchemist].json | 58 ----- tiers/Giant Dreadbloom [Dreadbloom].json | 38 ---- tiers/Gigantomachy [Gigantomachy].json | 54 ----- tiers/Gladiators [Gladiators].json | 38 ---- tiers/Gravlok [Gravlok].json | 38 ---- tiers/Green Killers [Green Killers].json | 58 ----- tiers/Groblar [Groblar].json | 38 ---- tiers/Grotesque Hybrid [Hybrid].json | 122 ---------- tiers/Grundus [Grundus].json | 14 -- tiers/Guilbert the Mad [Guilbert].json | 38 ---- tiers/Gunnar the Berserk [Gunnar].json | 38 ---- tiers/Hammer [Hammer].json | 206 ----------------- tiers/Hargamesh [Hargamesh].json | 38 ---- tiers/Headmaster Grimsly [Grimsly].json | 38 ---- tiers/Hellemental [Hellemental].json | 70 ------ tiers/Horthania the Grey [Horthania].json | 110 --------- tiers/Hullbore Wyrms [Hullbore Wyrms].json | 130 ----------- tiers/Hurkus [Hurkus].json | 42 ---- tiers/Hydra [Hydra].json | 38 ---- tiers/Imryx the Incinerator [Imryx].json | 126 ----------- tiers/Initiates of the Abyss [Initiates].json | 123 ---------- tiers/Ironclad [Ironclad].json | 38 ---- tiers/Jack [Jack].json | 50 ---- tiers/Jack's Revenge [Jack's Revenge].json | 34 --- ...ershan'thurn's Portal [Jershan'thurn].json | 179 --------------- .../Jormungan the Sea-Storm [Jormungan].json | 122 ---------- tiers/Kalaxia the Far-Seer [Kalaxia].json | 34 --- tiers/Kanehuar Yachu [Kanehuar Yachu].json | 78 ------- tiers/Kang-Gsod [Kang].json | 38 ---- tiers/Karkata [Karkata].json | 106 --------- tiers/Kerberos [Kerberos].json | 38 ---- tiers/Keron the Sky-Shaker [Keron].json | 114 ---------- tiers/Konungar [Konungar].json | 141 ------------ ...unara of the Bloody Waves [Kr'xunara].json | 58 ----- tiers/Krasgore [Krasgore].json | 54 ----- tiers/Krugnug [Krugnug].json | 50 ---- tiers/Leonine [Leonine].json | 50 ---- .../Lord Hoton the Usurper [Lord Hoton].json | 109 --------- tiers/Lost [Lost].json | 74 ------ tiers/Lunatics [Lunatics].json | 206 ----------------- tiers/Lurking Horror [Lurking Horror].json | 38 ---- ...r the Tri-Eyed [Malchar the Tri-Eyed].json | 54 ----- tiers/Malleus [Malleus].json | 46 ---- tiers/Maraak the Impaler [Maraak].json | 38 ---- tiers/Marble Colossus [Colossus].json | 58 ----- .../Mardachus the Destroyer [Mardachus].json | 34 --- tiers/Master Ninja Bakku [Bakku].json | 58 ----- tiers/Mazalu [Mazalu].json | 38 ---- tiers/Mestr Rekkr Rematch [Rekkr II].json | 46 ---- tiers/Mesyra the Watcher [Mesyra].json | 38 ---- tiers/Murgrux the Mangler [Murgrux].json | 62 ----- ...ux the Devourer [N'rlux the Devourer].json | 110 --------- tiers/Nalagarst [Nalagarst].json | 34 --- tiers/Nereidon the Sea Slayer [Nereidon].json | 46 ---- tiers/Nidhogg [Nidhogg].json | 38 ---- tiers/Nimrod the Hunter [Nimrod].json | 38 ---- tiers/Nylatrix [Nylatrix].json | 54 ----- tiers/Paracoprion [Paracoprion].json | 114 ---------- tiers/Phaedra the Deceiver [Phaedra].json | 38 ---- tiers/Prince Obyron [Obyron].json | 38 ---- tiers/Prison of Fear [Fear].json | 102 --------- tiers/Qwiladrian Sporeforms [Sporeforms].json | 78 ------- tiers/Qwiladrian Stormship [Stormship].json | 90 -------- tiers/Ragetalon [Ragetalon].json | 38 ---- tiers/Rannveig [Rannveig].json | 58 ----- tiers/Reaper Mantis [Mantis].json | 123 ---------- tiers/Red Snow [Red Snow].json | 126 ----------- ...Rhalmarius the Despoiler [Rhalmarius].json | 14 -- tiers/Rift the Mauler [Rift].json | 38 ---- tiers/Rudaru the Axe Master [Rudaru].json | 30 --- tiers/Ruzzik the Slayer [Ruzzik].json | 74 ------ tiers/Salome the Seductress [Salome].json | 54 ----- tiers/Scuttlegore [Scuttlegore].json | 38 ---- tiers/Scylla [Scylla].json | 38 ---- tiers/Shaar the Reaver [Shaar].json | 50 ---- tiers/Shadow [Shadow].json | 50 ---- tiers/Sir Cai [Sir Cai].json | 38 ---- tiers/Sisters of the Song [Sisters].json | 38 ---- tiers/Slaughterers Six [Slaughterers].json | 38 ---- tiers/Soul Collector [Collector].json | 19 -- tiers/Stein [Stein].json | 38 ---- tiers/Tainted Erebus [Tainted].json | 38 ---- ...Tenebra the Shadow-Mistress [Tenebra].json | 34 --- tiers/Teremarthu [Teremarthu].json | 50 ---- tiers/Tetrarchos [Tetrarchos].json | 38 ---- tiers/Thaltherda [Thaltherda].json | 42 ---- tiers/The Baroness [Baroness].json | 38 ---- tiers/The Bash Brothers [B. Brothers.json | 54 ----- tiers/The Black Moon Pack [Black Moon].json | 38 ---- tiers/The Bog Bodies [Bog Bodies].json | 114 ---------- tiers/The Frozen Spire [Frozen Spire].json | 46 ---- tiers/The Haunted Forest [Forest].json | 94 -------- .../The Sight of Solus [Sight of Solus].json | 67 ------ ...The Thaw of Elvigar [Thaw of Elvigar].json | 82 ------- tiers/Thratu's Abomination [Abomination].json | 110 --------- tiers/Tisiphone the Vengeful [Tisiphone].json | 54 ----- tiers/Tithrasia [Tithrasia].json | 38 ---- tiers/Tomb Gargole [Riddler].json | 50 ---- .../Trekex's Amphibious Assault [Trekex].json | 122 ---------- tiers/Tuxargus [Tuxargus].json | 54 ----- tiers/Tyranthius [Tyranthius].json | 34 --- tiers/Ulfrik [Ulfrik].json | 38 ---- tiers/Unholy Rite [Unholy Rite].json | 74 ------ tiers/Valanazes the Gold [Valanazes].json | 34 --- tiers/Valley of Death [Valley of Death].json | 70 ------ tiers/Valtrias [Valtrias].json | 54 ----- tiers/Varlachleth [Varlachleth].json | 38 ---- tiers/Vineborn Behemoth [Behemoth].json | 126 ----------- tiers/Vortex Abomination [Vortex].json | 66 ------ tiers/Way Warden [Way Warden].json | 118 ---------- tiers/Wexxa the Worm-Tamer [Wexxa].json | 38 ---- tiers/Xerkara [Xerkara].json | 50 ---- ...e Grim Wood [Xessus of the Grim Wood].json | 54 ----- .../Yule Present Bearer [Present Bearer].json | 74 ------ .../Yule Punishment Bearer [Punishment].json | 66 ------ tiers/Yydian's Sanctuary [Yydian].json | 50 ---- tiers/Z'ralk'thalat [Z'ralk'thalat].json | 50 ---- tiers/Zombie Horde [Zombies].json | 38 ---- 204 files changed, 12522 deletions(-) delete mode 100644 campaigns/Monsters-and-Magma.json delete mode 100644 src/languages/de.json delete mode 100644 src/languages/en.json delete mode 100644 src/languages/gr.json delete mode 100644 tiers/AP Minizone Raid [Darkness].json delete mode 100644 tiers/Aberrant Strength Potion [Strength Potion].json delete mode 100644 tiers/Adastros of the Kavala [Adrastos].json delete mode 100644 tiers/Agony [Agony].json delete mode 100644 tiers/Al-Azab [Al-Azab].json delete mode 100644 tiers/Apoc Demon [Apoc Demon].json delete mode 100644 tiers/Arachna [Arachna].json delete mode 100644 tiers/Ascendant's Echo [Ascendant's Echo].json delete mode 100644 tiers/Ataxes [Ataxes].json delete mode 100644 tiers/Bad Blood [Bad Blood].json delete mode 100644 tiers/Badland Ambusher [Badlands].json delete mode 100644 tiers/Balor [Balor].json delete mode 100644 tiers/Batiatus' Elite Gladiators [Elite Gladiators].json delete mode 100644 tiers/Beastman Stampede [Stampede].json delete mode 100644 tiers/Bellarius the Guardian [Bellarius].json delete mode 100644 tiers/Blood Dancer [Blood Dancer].json delete mode 100644 tiers/Bloodmane [Bloodmane].json delete mode 100644 tiers/Bloodsuckers [Bloodsuckers].json delete mode 100644 tiers/Bloody Alice [Alice].json delete mode 100644 tiers/Bogstench [Bogstench].json delete mode 100644 tiers/Briareus the Butcher [Briareus].json delete mode 100644 tiers/Burbata the Spine-Crusher [Burbata].json delete mode 100644 tiers/Caracalla [Caracalla].json delete mode 100644 tiers/Celeano [Celeano].json delete mode 100644 tiers/Centurion Marius [Marius].json delete mode 100644 tiers/Chieftain Horgrak [Horgrak].json delete mode 100644 tiers/Clockwork Dragon [Clock Dragon].json delete mode 100644 tiers/Clockwork Giant [Clockwork Giant].json delete mode 100644 tiers/Corrupted Wilds [Corrupted Wilds].json delete mode 100644 tiers/Count Siculus' Phantom [Siculus].json delete mode 100644 tiers/Countess Serpina [Serpina].json delete mode 100644 tiers/Damned Shade [Shade].json delete mode 100644 tiers/Damned Shade [War Shade].json delete mode 100644 tiers/Dar'Hed'Nal [Dar'Hed'Nal].json delete mode 100644 tiers/Deadly Clockwork Giant [Deadly Clockwork].json delete mode 100644 tiers/Deathglare [Deathglare].json delete mode 100644 tiers/Dirthax [Dirthax].json delete mode 100644 tiers/Doomglare [Doomglare].json delete mode 100644 tiers/Doppelganger [Doppelganger].json delete mode 100644 tiers/Draconic Dreams [D. Dreams].json delete mode 100644 tiers/Dragon's Lair [Lair].json delete mode 100644 tiers/Drake's Fire Elemental [Fire Elemental].json delete mode 100644 tiers/Drakontos, The First Terror [Drakontos].json delete mode 100644 tiers/Drulcharus [Drulcharus].json delete mode 100644 tiers/Drunken Ragunt [Ragunt].json delete mode 100644 tiers/Elite 5th Terror [E. 5th Terror].json delete mode 100644 tiers/Elite Balor [E. Balor].json delete mode 100644 tiers/Elite Bloodsuckers [E. Bloodsuckers].json delete mode 100644 tiers/Elite Butcher [E. Butcher].json delete mode 100644 tiers/Elite Caster [E. Caster].json delete mode 100644 tiers/Elite Devourer [Devourer].json delete mode 100644 tiers/Elite Funny Bones [E. Funny Bones].json delete mode 100644 tiers/Elite Initiates [E. Initiates].json delete mode 100644 tiers/Elite Kanehuar Yachu [E. Kane].json delete mode 100644 tiers/Elite Karkata [E. Karkata].json delete mode 100644 tiers/Elite Killers [E. Killers].json delete mode 100644 tiers/Elite Lady Cecile [E. Lady Cecile].json delete mode 100644 tiers/Elite Malleus [E. Malleus].json delete mode 100644 tiers/Elite Mangler [E. Mangler].json delete mode 100644 tiers/Elite Murderer [E. Murderer].json delete mode 100644 tiers/Elite Reaper [E. Reaper].json delete mode 100644 tiers/Elite Riders [E. Riders].json delete mode 100644 tiers/Elite Slitherer [E. Slitherer].json delete mode 100644 tiers/Elite Undead Warrior [E. Warrior].json delete mode 100644 tiers/Elite Whispers [E. Whispers].json delete mode 100644 tiers/Engine of the Ancients [Engine of the Ancients].json delete mode 100644 tiers/Engines of War [Engines of War].json delete mode 100644 tiers/Erakka-Sak [Erakka-Sak].json delete mode 100644 tiers/Erebus [Erebus].json delete mode 100644 tiers/Euphronios [Euphronios].json delete mode 100644 tiers/Euryino, The Fifth Terror [Euryino].json delete mode 100644 tiers/Faetouched Dragon [Fae Dragon].json delete mode 100644 tiers/Felendis and Shaoquin [Banhammer Bros].json delete mode 100644 tiers/Fog Of Wars [Cannibals].json delete mode 100644 tiers/Fog Of Wars [Gulkinari].json delete mode 100644 tiers/Fog Of Wars [Verkiteia].json delete mode 100644 tiers/Fog Of Wars [Zugen].json delete mode 100644 tiers/Frogmen-Assassins [Frog-Men].json delete mode 100644 tiers/Frost the Snow Dragon [Snow Drag].json delete mode 100644 tiers/Gataalli Huxac [Gataalli].json delete mode 100644 tiers/General Grune [Grune].json delete mode 100644 tiers/General Korxun [Korxun].json delete mode 100644 tiers/Ghostly Alchemist [Alchemist].json delete mode 100644 tiers/Giant Dreadbloom [Dreadbloom].json delete mode 100644 tiers/Gigantomachy [Gigantomachy].json delete mode 100644 tiers/Gladiators [Gladiators].json delete mode 100644 tiers/Gravlok [Gravlok].json delete mode 100644 tiers/Green Killers [Green Killers].json delete mode 100644 tiers/Groblar [Groblar].json delete mode 100644 tiers/Grotesque Hybrid [Hybrid].json delete mode 100644 tiers/Grundus [Grundus].json delete mode 100644 tiers/Guilbert the Mad [Guilbert].json delete mode 100644 tiers/Gunnar the Berserk [Gunnar].json delete mode 100644 tiers/Hammer [Hammer].json delete mode 100644 tiers/Hargamesh [Hargamesh].json delete mode 100644 tiers/Headmaster Grimsly [Grimsly].json delete mode 100644 tiers/Hellemental [Hellemental].json delete mode 100644 tiers/Horthania the Grey [Horthania].json delete mode 100644 tiers/Hullbore Wyrms [Hullbore Wyrms].json delete mode 100644 tiers/Hurkus [Hurkus].json delete mode 100644 tiers/Hydra [Hydra].json delete mode 100644 tiers/Imryx the Incinerator [Imryx].json delete mode 100644 tiers/Initiates of the Abyss [Initiates].json delete mode 100644 tiers/Ironclad [Ironclad].json delete mode 100644 tiers/Jack [Jack].json delete mode 100644 tiers/Jack's Revenge [Jack's Revenge].json delete mode 100644 tiers/Jershan'thurn's Portal [Jershan'thurn].json delete mode 100644 tiers/Jormungan the Sea-Storm [Jormungan].json delete mode 100644 tiers/Kalaxia the Far-Seer [Kalaxia].json delete mode 100644 tiers/Kanehuar Yachu [Kanehuar Yachu].json delete mode 100644 tiers/Kang-Gsod [Kang].json delete mode 100644 tiers/Karkata [Karkata].json delete mode 100644 tiers/Kerberos [Kerberos].json delete mode 100644 tiers/Keron the Sky-Shaker [Keron].json delete mode 100644 tiers/Konungar [Konungar].json delete mode 100644 tiers/Kr'xunara of the Bloody Waves [Kr'xunara].json delete mode 100644 tiers/Krasgore [Krasgore].json delete mode 100644 tiers/Krugnug [Krugnug].json delete mode 100644 tiers/Leonine [Leonine].json delete mode 100644 tiers/Lord Hoton the Usurper [Lord Hoton].json delete mode 100644 tiers/Lost [Lost].json delete mode 100644 tiers/Lunatics [Lunatics].json delete mode 100644 tiers/Lurking Horror [Lurking Horror].json delete mode 100644 tiers/Malchar the Tri-Eyed [Malchar the Tri-Eyed].json delete mode 100644 tiers/Malleus [Malleus].json delete mode 100644 tiers/Maraak the Impaler [Maraak].json delete mode 100644 tiers/Marble Colossus [Colossus].json delete mode 100644 tiers/Mardachus the Destroyer [Mardachus].json delete mode 100644 tiers/Master Ninja Bakku [Bakku].json delete mode 100644 tiers/Mazalu [Mazalu].json delete mode 100644 tiers/Mestr Rekkr Rematch [Rekkr II].json delete mode 100644 tiers/Mesyra the Watcher [Mesyra].json delete mode 100644 tiers/Murgrux the Mangler [Murgrux].json delete mode 100644 tiers/N'rlux the Devourer [N'rlux the Devourer].json delete mode 100644 tiers/Nalagarst [Nalagarst].json delete mode 100644 tiers/Nereidon the Sea Slayer [Nereidon].json delete mode 100644 tiers/Nidhogg [Nidhogg].json delete mode 100644 tiers/Nimrod the Hunter [Nimrod].json delete mode 100644 tiers/Nylatrix [Nylatrix].json delete mode 100644 tiers/Paracoprion [Paracoprion].json delete mode 100644 tiers/Phaedra the Deceiver [Phaedra].json delete mode 100644 tiers/Prince Obyron [Obyron].json delete mode 100644 tiers/Prison of Fear [Fear].json delete mode 100644 tiers/Qwiladrian Sporeforms [Sporeforms].json delete mode 100644 tiers/Qwiladrian Stormship [Stormship].json delete mode 100644 tiers/Ragetalon [Ragetalon].json delete mode 100644 tiers/Rannveig [Rannveig].json delete mode 100644 tiers/Reaper Mantis [Mantis].json delete mode 100644 tiers/Red Snow [Red Snow].json delete mode 100644 tiers/Rhalmarius the Despoiler [Rhalmarius].json delete mode 100644 tiers/Rift the Mauler [Rift].json delete mode 100644 tiers/Rudaru the Axe Master [Rudaru].json delete mode 100644 tiers/Ruzzik the Slayer [Ruzzik].json delete mode 100644 tiers/Salome the Seductress [Salome].json delete mode 100644 tiers/Scuttlegore [Scuttlegore].json delete mode 100644 tiers/Scylla [Scylla].json delete mode 100644 tiers/Shaar the Reaver [Shaar].json delete mode 100644 tiers/Shadow [Shadow].json delete mode 100644 tiers/Sir Cai [Sir Cai].json delete mode 100644 tiers/Sisters of the Song [Sisters].json delete mode 100644 tiers/Slaughterers Six [Slaughterers].json delete mode 100644 tiers/Soul Collector [Collector].json delete mode 100644 tiers/Stein [Stein].json delete mode 100644 tiers/Tainted Erebus [Tainted].json delete mode 100644 tiers/Tenebra the Shadow-Mistress [Tenebra].json delete mode 100644 tiers/Teremarthu [Teremarthu].json delete mode 100644 tiers/Tetrarchos [Tetrarchos].json delete mode 100644 tiers/Thaltherda [Thaltherda].json delete mode 100644 tiers/The Baroness [Baroness].json delete mode 100644 tiers/The Bash Brothers [B. Brothers.json delete mode 100644 tiers/The Black Moon Pack [Black Moon].json delete mode 100644 tiers/The Bog Bodies [Bog Bodies].json delete mode 100644 tiers/The Frozen Spire [Frozen Spire].json delete mode 100644 tiers/The Haunted Forest [Forest].json delete mode 100644 tiers/The Sight of Solus [Sight of Solus].json delete mode 100644 tiers/The Thaw of Elvigar [Thaw of Elvigar].json delete mode 100644 tiers/Thratu's Abomination [Abomination].json delete mode 100644 tiers/Tisiphone the Vengeful [Tisiphone].json delete mode 100644 tiers/Tithrasia [Tithrasia].json delete mode 100644 tiers/Tomb Gargole [Riddler].json delete mode 100644 tiers/Trekex's Amphibious Assault [Trekex].json delete mode 100644 tiers/Tuxargus [Tuxargus].json delete mode 100644 tiers/Tyranthius [Tyranthius].json delete mode 100644 tiers/Ulfrik [Ulfrik].json delete mode 100644 tiers/Unholy Rite [Unholy Rite].json delete mode 100644 tiers/Valanazes the Gold [Valanazes].json delete mode 100644 tiers/Valley of Death [Valley of Death].json delete mode 100644 tiers/Valtrias [Valtrias].json delete mode 100644 tiers/Varlachleth [Varlachleth].json delete mode 100644 tiers/Vineborn Behemoth [Behemoth].json delete mode 100644 tiers/Vortex Abomination [Vortex].json delete mode 100644 tiers/Way Warden [Way Warden].json delete mode 100644 tiers/Wexxa the Worm-Tamer [Wexxa].json delete mode 100644 tiers/Xerkara [Xerkara].json delete mode 100644 tiers/Xessus of the Grim Wood [Xessus of the Grim Wood].json delete mode 100644 tiers/Yule Present Bearer [Present Bearer].json delete mode 100644 tiers/Yule Punishment Bearer [Punishment].json delete mode 100644 tiers/Yydian's Sanctuary [Yydian].json delete mode 100644 tiers/Z'ralk'thalat [Z'ralk'thalat].json delete mode 100644 tiers/Zombie Horde [Zombies].json diff --git a/campaigns/Monsters-and-Magma.json b/campaigns/Monsters-and-Magma.json deleted file mode 100644 index ad004b0..0000000 --- a/campaigns/Monsters-and-Magma.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "Monsters and Magma", - "map": null, - "nodes": { - "Imryx's Whelps": { - "image": null, - "tiers": {} - } - }, - "challenges": { - "Speed Run": { - "drawback": "Campaign Length -50%", - "benefit": "+20% Guild Reputation" - }, - "Hailstorm": { - "drawback": "Nodes have an additional prefix", - "benefit": "+20% Guild Experience" - }, - "Fatigued": { - "drawback": "-45% player damage", - "benefit": "3 additional special loot slots at the end" - }, - "Endurance Run": { - "drawback": "Node timers are set to 4h", - "benefit": "Endloot contains Molten Troves" - } - }, - "prefixes": { - "Regenerating": "Raid health grows 1% of total raid health every 10 mins, starts when health drops below 50% first time", - "Chilling": "Chance to freeze your buttons for few seconds, disrupts long clicks", - "Vengeful": "Members of named class (e.g. Voidwalker, Luminary) do 20% less damage", - "Curse": "Chance to add one of the following curses for 5min (can each stack up to 3 times) that will follow you from node to node:\n10% chance to miss target per curse\n20% reduction to legion bonus per curse\n10% reduction to total attack damage per curse" - } -} diff --git a/src/languages/de.json b/src/languages/de.json deleted file mode 100644 index 535a748..0000000 --- a/src/languages/de.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "chat": { - "actions": { - "banUser": "Benutzer bannen", - "makeMod": "Zu Moderator befördern", - "makeAdmin": "Zu Admin befördern", - "makeUser": "Zu Benutzer degradieren", - "close": "Schließen", - "invite": "Zu Chat einladen ", - "createChat": "Chat erstellen", - "joinChat": "Chat beitreten", - "createAddChat": "Klicke, um neuen Chat zu erstellen", - "copyIdPasswort": "Passwort&Id kopieren", - "deleteRoom": "Raum löschen", - "leaveRoom": "Raum verlassen" - }, - "texts": { - "settings": "Mehr Einstellungen auf ", - "account": "Account", - "title": "Chat", - "creditEmoticon": "Emoticons erstellt durch ", - "optional": "Dieser Teil des Skripts ist optional, einloggen ist nicht nötig, um beispielsweise Raids beizutreten", - "invalid": "Sie sollten nicht Ihre Login-Daten, wie Name oder Passwort der Website oder des Spiels, benutzen - der angezeigte Name kann nach der Registrierung angepasst werden.", - "offline": "Sie sind nicht eingeloggt, bitte registrieren oder loggen Sie sich ein" - }, - "error": { - "modify": "Konnte Benutzer nicht modifizieren", - "create": "Erstellung fehlgeschlagen", - "join": "Beitritt fehlgeschlagen", - "login": "Login auf unerwartete Weise fehlgeschlagen", - "unknown": "Der eingegebene Benutzername ist dotd.idrinth.de nicht bekannt, möchten Sie sich dort registrieren?" - }, - "notification": { - "mention": "Benachrichtigungen bei Erwähnung im Chat?", - "raid": "Benachrichtigung, wenn ein Raid gepostet wird?", - "message": "Benachrichtigungen für Chat-Nachrichten?" - } - }, - "default": "Ein unerwareteter Fehler ist eingetreten. Bitte kontaktiere die Entwickler (https://github.com/Idrinth/IDotD).", - "land": { - "lack": "Sie haben nicht genug Gold, um Gebäude zu kaufen.", - "hour": " Gold pro Stunde und Gebäude", - "calc": "Berechne", - "avaible": "Verfügbares Gold" - }, - "tier": { - "search": "Geben Sie den Namen des Bosses ein", - "diff": { - "normal": "Normal", - "hard": "Hart", - "legend": "Legendär", - "night": "Alptraum" - }, - "tag": "An den oberen Bildschirmrand anheften", - "maxBoxes": "Es gibt keinen Platz für eine weitere Tierbox , bitte schließe eine." - }, - "raids": { - "lastJoined": "Zuletzt beigetretene Raids", - "clear": "Lösche Raids", - "disableJoining": "Beitreten der Raids deaktivieren", - "clickCopy": "Klicke, um Raidlink zu kopieren", - "imports": { - "manually": "Importiere alle Raids manuell", - "favs": "Importiere favorisierte Raids manuell", - "restart": "Starte das Beitreten von Raids neu" - }, - "disableSpecific": "Deaktiviere automatisches Beitreten für bestimmte Raids" - }, - "button": { - "ok": "Ok", - "cancel": "Abbrechen", - "reloadGame": "Lade Spiel neu", - "reloadScript": "Lade Skript neu", - "refreshFBGameLogin": "Erneuere Facebook Game Login", - "ngRaidJoin": "NG Raid Beitritt ( langsam!)", - "disableTimedAutoJoin": "Deaktiviere geplantes Beitreten", - "enableTimedAutoJoin": "Aktiviere geplantes Beitreten" - }, - "setting": { - "enableExtCharInfo": "Aktiviere erweiterte Charakterinformation?", - "minimLayout": "Minimiertes Layout", - "moveSettingLeft": "Einstellungen nach links", - "warBottomPage": "Stelle War am unteren Rand der Seite dar", - "useGoldEfficiently": "Aktivieren, um so viel Gold wie möglich zum Kaufen zu verwenden - deaktivieren, um nur die effizienteste Möglichkeit aus dem Calculator zu kaufen", - "tenBuildOnce": "Kaufe 10 Gebäude auf einmal ( empfohlen)", - "extCharInfoDuration": "Millisekunden bevor die erweiterte Charakterinformation verschwindet", - "joiningDuration": "Sekunden, die das Spiel zum Laden braucht, bevor man Raids beitreten kann", - "enableChat": "Chat aktivieren ( benötigt Neustart des Skripts)", - "enableFavRequest": "Aktiviere automatische Nachfrage für Raids für Favoriten?", - "favIdToJoin": "Favorisierte Ids zum beitreten ( mehrere mit Komma trennen)", - "worldserver": "Worldserver?" - }, - "ui": { - "settingInfo": "Dieses Skript wird immer alle Raids importieren, die Sie manuell auf der Website festgelegt haben und, falls aktiviert, wird es auch alle Favouriten aus Suchergebnissen importieren.", - "maxPopupsFrame": "Maximale Popups/Frames beim Beitreten von Raids", - "timeAutoJoin": "Zeit, um langsam automatisch Raids beizutreten ( lädt Spiel mehrere Male neu). Format ist [Stunden]:[Minuten] ohne anführende Nullen, also 7:1 ist gut, 07:01 ist schlecht", - "getFavFrom": "Bekomme Suchfavoriten aus ", - "raidsearch": "Idrinths Raidsearch", - "reloadGameFail": "Das Spiel konnte nicht neu gestartet werden" - } -} diff --git a/src/languages/en.json b/src/languages/en.json deleted file mode 100644 index 1dcdb19..0000000 --- a/src/languages/en.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "chat": { - "actions": { - "banUser": "Ban User", - "makeMod": "Make Moderator", - "makeAdmin": "Make Admin", - "makeUser": "Make User", - "close": "Close", - "invite": "Invite to Chat ", - "createChat": "Create Chat", - "joinChat": "Join Chat", - "createAddChat": "Click to create additional chat", - "copyIdPasswort": "Copy Password&Id", - "deleteRoom": "Delete Room", - "leaveRoom": "Leave Room" - }, - "texts": { - "settings": "More settings at ", - "account": "Account", - "title": "Chat", - "creditEmoticon": "Emoticons provided by ", - "optional": "This part of the script is optional, so logging in is unneeded for raid catching etc.", - "invalid": "This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.", - "offline": "Not logged in, click to login/register" - }, - "error": { - "modify": "Can't modify that user at the moment", - "create": "Can't create at the moment", - "join": "Joining didn't work", - "login": "Login failed in an unexpected way", - "unknown": "The given username for dotd.idrinth.de is unknown, do you want to register it there?" - }, - "notification": { - "mention": "chat-mention notifications?", - "raid": "chat-raid notifications?", - "message": "chat-message notifications?" - } - }, - "default": "Unexpected error occurred. Please contact script developers (https://github.com/Idrinth/IDotD).", - "land": { - "lack": "You lack gold to buy any more buildings at the moment.", - "hour": " gold per hour each", - "calc": "Calculate", - "avaible": "Avaible Gold" - }, - "tier": { - "search": "Enter Boss' Name", - "diff": { - "normal": "Normal", - "hard": "Hard", - "legend": "Legend", - "night": "Nightmare" - }, - "tag": "Tag to screen-top", - "maxBoxes": "There is no space for another tier-box at the moment, please close one first." - }, - "raids": { - "lastJoined": "Last raids joined", - "clear": "Clear Raids", - "disableJoining": "Disable joining for ", - "clickCopy": "click to copy raid link", - "imports": { - "manually": "Import all manually", - "favs": "Import favs manually", - "restart": "Restart Raidjoin" - }, - "disableSpecific": "Disable Autojoining for specific raids" - }, - "button": { - "ok": "Ok", - "cancel": "Cancel", - "reloadGame": "Reload game", - "reloadScript": "Reload Script", - "refreshFBGameLogin": "Refresh Facebook Game Login", - "ngRaidJoin": "NG Raid Join(slow!)", - "disableTimedAutoJoin": "disable timed Autojoin", - "enableTimedAutoJoin": "enable timed Autojoin" - }, - "setting": { - "enableExtCharInfo": "Enable extended Characterinformation?", - "minimLayout": "Minimalist Layout", - "moveSettingLeft": "Move settings left", - "warBottomPage": "Show war at the bottom of the page", - "useGoldEfficiently": "Check to try and use up the gold as efficient as possible - uncheck to only use the most efficient buy in the land buy calculator", - "tenBuildOnce": "Buy 10 Buildings at once?(Rec)", - "extCharInfoDuration": "Milliseconds until the extended Characterinformation disappears", - "joiningDuration": "Seconds needed to load the game for joining", - "enableChat": "Enable chat(needs script reload)", - "enableFavRequest": "Enable Auto-Raid-Request for Favorites?", - "favIdToJoin": "FavoriteIds to join (separate multiple by comma)", - "worldserver": "Worldserver?" - }, - "ui": { - "settingInfo": "This script will always import the raids you manually set to be imported on the website and if it's enabled it will also import all raids matched by one of the faved searches provided.", - "maxPopupsFrame": "Maximum Popups/Frames for joining raids", - "timeAutoJoin": "Time to automatically join raids slowly(reloads game multiple times). Format is [Hours]:[Minutes] without leading zeros, so 7:1 is fine, 07:01 is not", - "getFavFrom": "Get your search-favorites from ", - "raidsearch": "Idrinth's Raidsearch", - "reloadGameFail": "The game couldn't be reloaded" - } -} \ No newline at end of file diff --git a/src/languages/gr.json b/src/languages/gr.json deleted file mode 100644 index 52986ef..0000000 --- a/src/languages/gr.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "chat": { - "actions": { - "banUser": "Τιμωρία Χρήστη", - "makeMod": "Κάνε Συντονιστή", - "makeAdmin": "Κάνε Διαχειριστή", - "makeUser": "Κάνε Χρήστη", - "close": "Κλείσιμο", - "invite": "Προσκάλεσε στη συζήτηση ", - "createChat": "Δημιουργία συζητήσεως", - "joinChat": "Εισαγωγή στη συζήτηση", - "createAddChat": "Πάτησε για δημιουργία επιπλέον συζητήσεως", - "copyIdPasswort": "Αντιγραφή Κωδικών Πρόσβασης&Χρήστη", - "deleteRoom": "Διαγραφή χώρου", - "leaveRoom": "Αποχώρηση χώρου" - }, - "texts": { - "settings": "Περισσότερες επιλογές στο ", - "account": "Λογαριασμός", - "title": "Συζήτηση", - "creditEmoticon": "Emoticons provided by ", - "optional": "Πεδίο προαιρετικό, δεν χρειάζεται να εισέλθετε.", - "invalid": "This should not be the data for logging in on the related gaming site and the login does not need to match your ingame name - you can set a display name after the registration.", - "offline": "Δεν έχει γίνει σύνδεση, πατήστε Εισαγωγή/Εγγραφή" - }, - "error": { - "modify": "Δεν μπορεί να γίνει μεταβολή του χρήστη", - "create": "Δεν μπορεί να γίνει δημιουργία", - "join": "Αποτυχία εγγραφής", - "login": "Η σύνδεση απέτυχε", - "unknown": "Το όνομα χρήστη για την σελίδα dotd.idrinth.de είναι άγνωστο., θέλετε να κάνετε εγγραφή;" - }, - "notification": { - "mention": "chat-mention notifications?", - "raid": "chat-raid notifications?", - "message": "chat-message notifications?" - } - }, - "default": "Προέκυψε απρόσμενο σφάλμα. Παρακαλώ επικοινωνήστε με τους διαχειριστές (https://github.com/Idrinth/IDotD).", - "land": { - "lack": "Λόγω ελλείψεως χρυσού δεν μπορεί να γίνει αγορά κτιρίων.", - "hour": " χρυσός ανά ώρα έκαστο", - "calc": "Υπολογισμός", - "avaible": "Διαθέσιμος χρυσός" - }, - "tier": { - "search": "Εισαγωγή ονόματος", - "diff": { - "normal": "Κανονικό", - "hard": "Δύσκολο", - "legend": "Θρυλικό", - "night": "Εφιαλτικό" - }, - "tag": "Προσθήκη στην οθόμη", - "maxBoxes": "There is no space for another tier-box at the moment, please close one first." - }, - "raids": { - "lastJoined": "Last raids joined", - "clear": "Clear Raids", - "disableJoining": "Disable joining for ", - "clickCopy": "click to copy raid link", - "imports": { - "manually": "Import all manually", - "favs": "Import favs manually", - "restart": "Restart Raidjoin" - }, - "disableSpecific": "Disable Autojoining for specific raids" - }, - "button": { - "ok": "Ok", - "cancel": "Cancel", - "reloadGame": "Reload game", - "reloadScript": "Reload Script", - "refreshFBGameLogin": "Refresh Facebook Game Login", - "ngRaidJoin": "NG Raid Join(slow!)", - "disableTimedAutoJoin": "disable timed Autojoin", - "enableTimedAutoJoin": "enable timed Autojoin" - }, - "setting": { - "enableExtCharInfo": "Enable extended Characterinformation?", - "minimLayout": "Minimalist Layout", - "moveSettingLeft": "Move settings left", - "warBottomPage": "Show war at the bottom of the page", - "useGoldEfficiently": "Check to try and use up the gold as efficient as possible - uncheck to only use the most efficient buy in the land buy calculator", - "tenBuildOnce": "Buy 10 Buildings at once?(Rec)", - "extCharInfoDuration": "Milliseconds until the extended Characterinformation disappears", - "joiningDuration": "Seconds needed to load the game for joining", - "enableChat": "Enable chat(needs script reload)", - "enableFavRequest": "Enable Auto-Raid-Request for Favorites?", - "favIdToJoin": "FavoriteIds to join (separate multiple by comma)", - "worldserver": "Worldserver?" - }, - "ui": { - "settingInfo": "This script will always import the raids you manually set to be imported on the website and if it's enabled it will also import all raids matched by one of the faved searches provided.", - "maxPopupsFrame": "Maximum Popups/Frames for joining raids", - "timeAutoJoin": "Time to automatically join raids slowly(reloads game multiple times). Format is [Hours]:[Minutes] without leading zeros, so 7:1 is fine, 07:01 is not", - "getFavFrom": "Get your search-favorites from ", - "raidsearch": "Idrinth's Raidsearch", - "reloadGameFail": "The game couldn't be reloaded" - } -} diff --git a/tiers/AP Minizone Raid [Darkness].json b/tiers/AP Minizone Raid [Darkness].json deleted file mode 100644 index af0eb34..0000000 --- a/tiers/AP Minizone Raid [Darkness].json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "nightmare": { - "200000000": { - "epic": 11, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "300000000": { - "epic": 26, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "500000000": { - "epic": 53, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "750000000": { - "epic": 83, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1000000000": { - "epic": 114, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1500000000": { - "epic": 175, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2000000000": { - "epic": 236, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2500000000": { - "epic": 298, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3000000000": { - "epic": 358, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4000000000": { - "epic": 448, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000": { - "epic": 508, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Aberrant Strength Potion [Strength Potion].json b/tiers/Aberrant Strength Potion [Strength Potion].json deleted file mode 100644 index be55597..0000000 --- a/tiers/Aberrant Strength Potion [Strength Potion].json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "normal": { - "50000000": 1, - "100000000": 5, - "200000000": 7, - "300000000": 10, - "400000000": 13, - "500000000": 15, - "750000000": 17, - "1000000000": 20 - }, - "hard": { - "50000000": 1, - "100000000": 5, - "200000000": 7, - "300000000": 10, - "400000000": 13, - "500000000": 15, - "750000000": 17, - "1000000000": 20 - }, - "legendary": { - "50000000": 1, - "100000000": 5, - "200000000": 7, - "300000000": 10, - "400000000": 13, - "500000000": 15, - "750000000": 17, - "1000000000": 20 - }, - "nightmare": { - "50000000": 1, - "100000000": 5, - "200000000": 7, - "300000000": 10, - "400000000": 13, - "500000000": 15, - "750000000": 17, - "1000000000": 20 - } -} diff --git a/tiers/Adastros of the Kavala [Adrastos].json b/tiers/Adastros of the Kavala [Adrastos].json deleted file mode 100644 index 98cade8..0000000 --- a/tiers/Adastros of the Kavala [Adrastos].json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "nightmare": { - "8000": 10, - "16500": 15, - "25500": 20, - "35000": 25, - "45000": 30, - "55500": 35, - "66500": 40, - "78000": 45, - "90000": 50, - "102500": 55, - "115500": 60, - "129000": 65, - "143000": 70, - "157500": 75, - "172500": 80, - "188000": 85, - "204000": 90, - "220500": 95, - "237500": 100, - "255500": 105, - "273500": 110, - "291500": 115, - "310500": 120, - "330000": 125, - "350000": 130, - "1000000": 150 - } -} diff --git a/tiers/Agony [Agony].json b/tiers/Agony [Agony].json deleted file mode 100644 index d6dd7e4..0000000 --- a/tiers/Agony [Agony].json +++ /dev/null @@ -1,206 +0,0 @@ -{ - "normal": { - "105000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "630000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "910000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1750000": { - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4970000": { - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "12670000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "28700000": { - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - }, - "hard": { - "131000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "788000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1138000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2188000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "6213000": { - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15838000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "35875000": { - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - }, - "legendary": { - "168000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1008000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1456000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2800000": { - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "7952000": { - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20272000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "45920000": { - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - }, - "nightmare": { - "210000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1260000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1820000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3500000": { - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "9940000": { - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "25340000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "57400000": { - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Al-Azab [Al-Azab].json b/tiers/Al-Azab [Al-Azab].json deleted file mode 100644 index 6a1e8af..0000000 --- a/tiers/Al-Azab [Al-Azab].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "110000": 1, - "495000": 1, - "825000": 1, - "1210000": 2, - "1760000": 2.5, - "3575000": 3, - "4950000": 3.5 - }, - "hard": { - "138000": 1, - "619000": 1, - "1031000": 1, - "1513000": 2, - "2200000": 2.5, - "4469000": 3, - "6188000": 3.5 - }, - "legendary": { - "176000": 1, - "792000": 1, - "1320000": 1, - "1936000": 2, - "2816000": 2.5, - "5720000": 3, - "7920000": 3.5 - }, - "nightmare": { - "220000": 1, - "990000": 1, - "1650000": 1, - "2420000": 2, - "3520000": 2.5, - "7150000": 3, - "9900000": 3.5 - } -} diff --git a/tiers/Apoc Demon [Apoc Demon].json b/tiers/Apoc Demon [Apoc Demon].json deleted file mode 100644 index 6dc4667..0000000 --- a/tiers/Apoc Demon [Apoc Demon].json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "nightmare": { - "12000000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "24000000": { - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "36000000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "40000000": { - "epic": 4, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "60000000": { - "epic": 5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "80000000": { - "epic": 6, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "100000000": { - "epic": 7, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "120000000": { - "epic": 8, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "140000000": { - "epic": 9, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "160000000": { - "epic": 10, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "180000000": { - "epic": 11, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Arachna [Arachna].json b/tiers/Arachna [Arachna].json deleted file mode 100644 index 08b8107..0000000 --- a/tiers/Arachna [Arachna].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "55000": 1, - "308000": 1, - "418000": 1, - "902000": 2, - "1375000": 2.5, - "2970000": 3, - "3740000": 3.5 - }, - "hard": { - "69000": 1, - "385000": 1, - "523000": 1, - "1128000": 2, - "1719000": 2.5, - "3713000": 3, - "4675000": 3.5 - }, - "legendary": { - "88000": 1, - "493000": 1, - "669000": 1, - "1443000": 2, - "2200000": 2.5, - "4752000": 3, - "5984000": 3.5 - }, - "nightmare": { - "110000": 1, - "616000": 1, - "836000": 1, - "1804000": 2, - "2750000": 2.5, - "5840000": 3, - "7480000": 3.5 - } -} diff --git a/tiers/Ascendant's Echo [Ascendant's Echo].json b/tiers/Ascendant's Echo [Ascendant's Echo].json deleted file mode 100644 index 0d54651..0000000 --- a/tiers/Ascendant's Echo [Ascendant's Echo].json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "nightmare": { - "100000000": { - "epic": 11, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "250000000": { - "epic": 22, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "500000000": { - "epic": 48, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1000000000": { - "epic": 94, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1500000000": { - "epic": 140, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2000000000": { - "epic": 186, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3000000000": { - "epic": 277, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000": { - "epic": 328, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "7500000000": { - "epic": 444, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000": { - "epic": 480, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000": { - "epic": 581, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "18000000000": { - "epic": 612, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Ataxes [Ataxes].json b/tiers/Ataxes [Ataxes].json deleted file mode 100644 index 648484b..0000000 --- a/tiers/Ataxes [Ataxes].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "105000": 1, - "120000": 1, - "180000": 1, - "240000": 2, - "320000": 2.5, - "500000": 3, - "700000": 3.5 - }, - "hard": { - "131000": 1, - "150000": 1, - "225000": 1, - "300000": 2, - "400000": 2.5, - "625000": 3, - "875000": 3.5 - }, - "legendary": { - "168000": 1, - "192000": 1, - "288000": 1, - "384000": 2, - "512000": 2.5, - "800000": 3, - "1120000": 3.5 - }, - "nightmare": { - "210000": 1, - "240000": 1, - "360000": 1, - "480000": 2, - "640000": 2.5, - "1000000": 3, - "1400000": 3.5 - } -} diff --git a/tiers/Bad Blood [Bad Blood].json b/tiers/Bad Blood [Bad Blood].json deleted file mode 100644 index 8452e7a..0000000 --- a/tiers/Bad Blood [Bad Blood].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "100000000": "1.0", - "250000000": "2.0", - "500000000": "5.0", - "800000000": "10.0", - "1000000000": "13.0", - "1250000000": "17.0", - "1500000000": "22.0", - "2000000000": "26.0", - "2500000000": "30.0", - "5000000000": "49.0" - }, - "hard": { - "100000000": "1.0", - "250000000": "2.0", - "500000000": "5.0", - "800000000": "10.0", - "1000000000": "13.0", - "1250000000": "17.0", - "1500000000": "22.0", - "2000000000": "26.0", - "2500000000": "30.0", - "5000000000": "49.0" - }, - "legendary": { - "100000000": "1.0", - "250000000": "2.0", - "500000000": "5.0", - "800000000": "10.0", - "1000000000": "13.0", - "1250000000": "17.0", - "1500000000": "22.0", - "2000000000": "26.0", - "2500000000": "30.0", - "5000000000": "49.0" - }, - "nightmare": { - "100000000": "1.0", - "250000000": "2.0", - "500000000": "5.0", - "800000000": "10.0", - "1000000000": "13.0", - "1250000000": "17.0", - "1500000000": "22.0", - "2000000000": "26.0", - "2500000000": "30.0", - "5000000000": "49.0" - } -} \ No newline at end of file diff --git a/tiers/Badland Ambusher [Badlands].json b/tiers/Badland Ambusher [Badlands].json deleted file mode 100644 index 4dee621..0000000 --- a/tiers/Badland Ambusher [Badlands].json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "normal": { - "1000000000": "37.0", - "1250000000": "56.0", - "1500000000": "65.0", - "1750000000": "70.0", - "2000000000": "74.0", - "2250000000": "77.0", - "2500000000": "84.0", - "2750000000": "87.0", - "3000000000": "93.0", - "4000000000": "109.0", - "5000000000": "130.0", - "6000000000": "147.0", - "8000000000": "168.0", - "10000000000": "180.0", - "12500000000": "194.0", - "15000000000": "212.0", - "20000000000": "235.0", - "25000000000": "253.0", - "30000000000": "269.0", - "35000000000": "287.0", - "40000000000": "304.0", - "50000000000": "335.0" - }, - "hard": { - "1000000000": "37.0", - "1250000000": "56.0", - "1500000000": "65.0", - "1750000000": "70.0", - "2000000000": "74.0", - "2250000000": "77.0", - "2500000000": "84.0", - "2750000000": "87.0", - "3000000000": "93.0", - "4000000000": "109.0", - "5000000000": "130.0", - "6000000000": "147.0", - "8000000000": "168.0", - "10000000000": "180.0", - "12500000000": "194.0", - "15000000000": "212.0", - "20000000000": "235.0", - "25000000000": "253.0", - "30000000000": "269.0", - "35000000000": "287.0", - "40000000000": "304.0", - "50000000000": "335.0" - }, - "legendary": { - "1000000000": "37.0", - "1250000000": "56.0", - "1500000000": "65.0", - "1750000000": "70.0", - "2000000000": "74.0", - "2250000000": "77.0", - "2500000000": "84.0", - "2750000000": "87.0", - "3000000000": "93.0", - "4000000000": "109.0", - "5000000000": "130.0", - "6000000000": "147.0", - "8000000000": "168.0", - "10000000000": "180.0", - "12500000000": "194.0", - "15000000000": "212.0", - "20000000000": "235.0", - "25000000000": "253.0", - "30000000000": "269.0", - "35000000000": "287.0", - "40000000000": "304.0", - "50000000000": "335.0" - }, - "nightmare": { - "1000000000": "37.0", - "1250000000": "56.0", - "1500000000": "65.0", - "1750000000": "70.0", - "2000000000": "74.0", - "2250000000": "77.0", - "2500000000": "84.0", - "2750000000": "87.0", - "3000000000": "93.0", - "4000000000": "109.0", - "5000000000": "130.0", - "6000000000": "147.0", - "8000000000": "168.0", - "10000000000": "180.0", - "12500000000": "194.0", - "15000000000": "212.0", - "20000000000": "235.0", - "25000000000": "253.0", - "30000000000": "269.0", - "35000000000": "287.0", - "40000000000": "304.0", - "50000000000": "335.0" - } -} \ No newline at end of file diff --git a/tiers/Balor [Balor].json b/tiers/Balor [Balor].json deleted file mode 100644 index f609bfa..0000000 --- a/tiers/Balor [Balor].json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "nightmare": { - "8000000000": 395, - "10000000000": 801, - "35000000000": 1354, - "50000000000": 1891, - "100000000000": 3304, - "150000000000": 3554, - "200000000000": 4006 - } -} diff --git a/tiers/Batiatus' Elite Gladiators [Elite Gladiators].json b/tiers/Batiatus' Elite Gladiators [Elite Gladiators].json deleted file mode 100644 index 855616a..0000000 --- a/tiers/Batiatus' Elite Gladiators [Elite Gladiators].json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "nightmare": { - "15000000": { - "epic": 2, - "legendary": 4, - "uncommon": 6, - "common": 8, - "stats": null - }, - "18000000": { - "epic": 3, - "legendary": 5, - "uncommon": 7, - "common": 9, - "stats": null - }, - "21000000": { - "epic": 4, - "legendary": 6, - "uncommon": 8, - "common": 10, - "stats": null - }, - "24000000": { - "epic": 5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "27000000": { - "epic": 6, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "30000000": { - "epic": 7, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "33000000": { - "epic": 8, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "36000000": { - "epic": 9, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "39000000": { - "epic": 10, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Beastman Stampede [Stampede].json b/tiers/Beastman Stampede [Stampede].json deleted file mode 100644 index 95d91a8..0000000 --- a/tiers/Beastman Stampede [Stampede].json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "nightmare": { - "100000000": { - "epic": 24, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1000000000": { - "epic": 156, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000": { - "epic": 635, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000": { - "epic": 790, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000": { - "epic": 941, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000": { - "epic": 1062, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "25000000000": { - "epic": 1168, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "30000000000": { - "epic": 1259, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "40000000000": { - "epic": 1335, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "50000000000": { - "epic": 1606, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "60000000000": { - "epic": 1757, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "80000000000": { - "epic": 2298, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "100000000000": { - "epic": 2810, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "150000000000": { - "epic": 3030, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Bellarius the Guardian [Bellarius].json b/tiers/Bellarius the Guardian [Bellarius].json deleted file mode 100644 index 9615633..0000000 --- a/tiers/Bellarius the Guardian [Bellarius].json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "normal": { - "360000": 1, - "810000": 1, - "1170000": 2, - "2250000": 2.5, - "4500000": 3, - "16200000": 3.5 - }, - "hard": { - "450000": 1, - "1013000": 1, - "1463000": 2, - "2813000": 2.5, - "5625000": 3, - "20250000": 3.5 - }, - "legendary": { - "576000": 1, - "1296000": 1, - "1872000": 2, - "3600000": 2.5, - "7200000": 3, - "25920000": 3.5 - }, - "nightmare": { - "720000": 1, - "1620000": 1, - "2340000": 2, - "4500000": 2.5, - "9000000": 3, - "32400000": 3.5 - } -} diff --git a/tiers/Blood Dancer [Blood Dancer].json b/tiers/Blood Dancer [Blood Dancer].json deleted file mode 100644 index 349bb52..0000000 --- a/tiers/Blood Dancer [Blood Dancer].json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "normal": { - "250000000": "4.0", - "500000000": "14.0", - "750000000": "19.0", - "1000000000": "25.0", - "1500000000": "30.0", - "2000000000": "40.0", - "2500000000": "54.0", - "3000000000": "63.0", - "3500000000": "65.0", - "4000000000": "70.0", - "5000000000": "90.0", - "8000000000": "112.0" - }, - "hard": { - "250000000": "4.0", - "500000000": "14.0", - "750000000": "19.0", - "1000000000": "25.0", - "1500000000": "30.0", - "2000000000": "40.0", - "2500000000": "54.0", - "3000000000": "63.0", - "3500000000": "65.0", - "4000000000": "70.0", - "5000000000": "90.0", - "8000000000": "112.0" - }, - "legendary": { - "250000000": "4.0", - "500000000": "14.0", - "750000000": "19.0", - "1000000000": "25.0", - "1500000000": "30.0", - "2000000000": "40.0", - "2500000000": "54.0", - "3000000000": "63.0", - "3500000000": "65.0", - "4000000000": "70.0", - "5000000000": "90.0", - "8000000000": "112.0" - }, - "nightmare": { - "250000000": "4.0", - "500000000": "14.0", - "750000000": "19.0", - "1000000000": "25.0", - "1500000000": "30.0", - "2000000000": "40.0", - "2500000000": "54.0", - "3000000000": "63.0", - "3500000000": "65.0", - "4000000000": "70.0", - "5000000000": "90.0", - "8000000000": "112.0" - } -} \ No newline at end of file diff --git a/tiers/Bloodmane [Bloodmane].json b/tiers/Bloodmane [Bloodmane].json deleted file mode 100644 index 99af0b5..0000000 --- a/tiers/Bloodmane [Bloodmane].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "368000": 1, - "420000": 1, - "630000": 1, - "840000": 2, - "1120000": 2.5, - "1750000": 3, - "2450000": 3.5 - }, - "hard": { - "459000": 1, - "525000": 1, - "788000": 1, - "1050000": 2, - "1400000": 2.5, - "2188000": 3, - "3063000": 3.5 - }, - "legendary": { - "588000": 1, - "672000": 1, - "1008000": 1, - "1344000": 2, - "1792000": 2.5, - "2800000": 3, - "3920000": 3.5 - }, - "nightmare": { - "735000": 1, - "840000": 1, - "1260000": 1, - "1680000": 2, - "2240000": 2.5, - "3500000": 3, - "4900000": 3.5 - } -} diff --git a/tiers/Bloodsuckers [Bloodsuckers].json b/tiers/Bloodsuckers [Bloodsuckers].json deleted file mode 100644 index 241b671..0000000 --- a/tiers/Bloodsuckers [Bloodsuckers].json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "nightmare": { - "100000000": { - "epic": 18, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "500000000": { - "epic": 47, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1000000000": { - "epic": 78, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1500000000": { - "epic": 99, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2000000000": { - "epic": 120, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2500000000": { - "epic": 170, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000": { - "epic": 250, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "7500000000": { - "epic": 300, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000": { - "epic": 350, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Bloody Alice [Alice].json b/tiers/Bloody Alice [Alice].json deleted file mode 100644 index b5aa1ff..0000000 --- a/tiers/Bloody Alice [Alice].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "38000": 1, - "210000": 1, - "285000": 1, - "615000": 2, - "938000": 2.5, - "2025000": 3, - "2550000": 3.5 - }, - "hard": { - "47000": 1, - "263000": 1, - "356000": 1, - "769000": 2, - "1172000": 2.5, - "2531000": 3, - "3188000": 3.5 - }, - "legendary": { - "60000": 1, - "336000": 1, - "456000": 1, - "984000": 2, - "1500000": 2.5, - "3240000": 3, - "4080000": 3.5 - }, - "nightmare": { - "70000": 1, - "420000": 1, - "570000": 1, - "1230000": 2, - "1875000": 2.5, - "4050000": 3, - "5100000": 3.5 - } -} diff --git a/tiers/Bogstench [Bogstench].json b/tiers/Bogstench [Bogstench].json deleted file mode 100644 index bf621fc..0000000 --- a/tiers/Bogstench [Bogstench].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "68000": 1, - "405000": 1, - "585000": 1, - "1125000": 2, - "3195000": 2.5, - "8145000": 3, - "18450000": 3.5 - }, - "hard": { - "200000": 1, - "900000": 1, - "1500000": 1, - "2200000": 2, - "3200000": 2.5, - "6500000": 3, - "9000000": 3.5 - }, - "legendary": { - "84000": 1, - "506000": 1, - "731000": 1, - "1406000": 2, - "3994000": 2.5, - "10181000": 3, - "23063000": 3.5 - }, - "nightmare": { - "135000": 1, - "810000": 1, - "1170000": 1, - "2250000": 2, - "6390000": 2.5, - "16290000": 3, - "36900000": 3.5 - } -} diff --git a/tiers/Briareus the Butcher [Briareus].json b/tiers/Briareus the Butcher [Briareus].json deleted file mode 100644 index cdff263..0000000 --- a/tiers/Briareus the Butcher [Briareus].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "263000": 1, - "300000": 1, - "450000": 1, - "600000": 2, - "800000": 2.5, - "1250000": 3, - "1750000": 3.5 - }, - "hard": { - "315000": 1, - "360000": 1, - "540000": 1, - "720000": 2, - "960000": 2.5, - "1500000": 3, - "2100000": 3.5 - }, - "legendary": { - "368000": 1, - "420000": 1, - "630000": 1, - "840000": 2, - "1120000": 2.5, - "1750000": 3, - "2450000": 3.5 - }, - "nightmare": { - "473000": 1, - "540000": 1, - "810000": 1, - "1080000": 2, - "1440000": 2.5, - "2250000": 3, - "3150000": 3.5 - } -} diff --git a/tiers/Burbata the Spine-Crusher [Burbata].json b/tiers/Burbata the Spine-Crusher [Burbata].json deleted file mode 100644 index 5553522..0000000 --- a/tiers/Burbata the Spine-Crusher [Burbata].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "hard": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "legendary": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "nightmare": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - } -} \ No newline at end of file diff --git a/tiers/Caracalla [Caracalla].json b/tiers/Caracalla [Caracalla].json deleted file mode 100644 index ffd7baa..0000000 --- a/tiers/Caracalla [Caracalla].json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "normal": { - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0", - "1250000000": "20.0", - "1500000000": "24.0", - "1750000000": "28.0", - "2000000000": "32.0", - "2250000000": "36.0", - "2500000000": "40.0", - "2750000000": "44.0", - "3000000000": "48.0" - }, - "hard": { - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0", - "1250000000": "20.0", - "1500000000": "24.0", - "1750000000": "28.0", - "2000000000": "32.0", - "2250000000": "36.0", - "2500000000": "40.0", - "2750000000": "44.0", - "3000000000": "48.0" - }, - "legendary": { - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0", - "1250000000": "20.0", - "1500000000": "24.0", - "1750000000": "28.0", - "2000000000": "32.0", - "2250000000": "36.0", - "2500000000": "40.0", - "2750000000": "44.0", - "3000000000": "48.0" - }, - "nightmare": { - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0", - "1250000000": "20.0", - "1500000000": "24.0", - "1750000000": "28.0", - "2000000000": "32.0", - "2250000000": "36.0", - "2500000000": "40.0", - "2750000000": "44.0", - "3000000000": "48.0" - } -} \ No newline at end of file diff --git a/tiers/Celeano [Celeano].json b/tiers/Celeano [Celeano].json deleted file mode 100644 index 14ff291..0000000 --- a/tiers/Celeano [Celeano].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "158000": 1, - "180000": 1, - "270000": 1, - "360000": 2, - "480000": 2.5, - "750000": 3, - "1050000": 3.5 - }, - "hard": { - "197000": 1, - "225000": 1, - "338000": 1, - "450000": 2, - "600000": 2.5, - "938000": 3, - "1313000": 3.5 - }, - "legendary": { - "252000": 1, - "288000": 1, - "432000": 1, - "576000": 2, - "768000": 2.5, - "1200000": 3, - "1680000": 3.5 - }, - "nightmare": { - "315000": 1, - "360000": 1, - "540000": 1, - "720000": 2, - "960000": 2.5, - "1500000": 3, - "2100000": 3.5 - } -} diff --git a/tiers/Centurion Marius [Marius].json b/tiers/Centurion Marius [Marius].json deleted file mode 100644 index 5553522..0000000 --- a/tiers/Centurion Marius [Marius].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "hard": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "legendary": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "nightmare": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - } -} \ No newline at end of file diff --git a/tiers/Chieftain Horgrak [Horgrak].json b/tiers/Chieftain Horgrak [Horgrak].json deleted file mode 100644 index 108963a..0000000 --- a/tiers/Chieftain Horgrak [Horgrak].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "8000": 1, - "9000": 1, - "14000": 1, - "18000": 2, - "24000": 2.5, - "38000": 3, - "53000": 3.5 - }, - "hard": { - "10000": 1, - "11000": 1, - "17000": 1, - "23000": 2, - "30000": 2.5, - "47000": 3, - "66000": 3.5 - }, - "legendary": { - "13000": 1, - "14000": 1, - "22000": 1, - "29000": 2, - "38000": 2.5, - "60000": 3, - "84000": 3.5 - }, - "nightmare": { - "16000": 1, - "18000": 1, - "27000": 1, - "36000": 2, - "48000": 2.5, - "75000": 3, - "105000": 3.5 - } -} diff --git a/tiers/Clockwork Dragon [Clock Dragon].json b/tiers/Clockwork Dragon [Clock Dragon].json deleted file mode 100644 index 6e5d1b6..0000000 --- a/tiers/Clockwork Dragon [Clock Dragon].json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "normal": { - "300000000": "56.0", - "400000000": "66.0", - "750000000": "94.0", - "1000000000": "118.0", - "1500000000": "192.0", - "2000000000": "226.0", - "2500000000": "254.0", - "3000000000": "270.0", - "4000000000": "290.0", - "5000000000": "360.0", - "6000000000": "368.0", - "8000000000": "400.0", - "10000000000": "460.0" - }, - "hard": { - "300000000": "56.0", - "400000000": "66.0", - "750000000": "94.0", - "1000000000": "118.0", - "1500000000": "192.0", - "2000000000": "226.0", - "2500000000": "254.0", - "3000000000": "270.0", - "4000000000": "290.0", - "5000000000": "360.0", - "6000000000": "368.0", - "8000000000": "400.0", - "10000000000": "460.0" - }, - "legendary": { - "300000000": "56.0", - "400000000": "66.0", - "750000000": "94.0", - "1000000000": "118.0", - "1500000000": "192.0", - "2000000000": "226.0", - "2500000000": "254.0", - "3000000000": "270.0", - "4000000000": "290.0", - "5000000000": "360.0", - "6000000000": "368.0", - "8000000000": "400.0", - "10000000000": "460.0" - }, - "nightmare": { - "300000000": "56.0", - "400000000": "66.0", - "750000000": "94.0", - "1000000000": "118.0", - "1500000000": "192.0", - "2000000000": "226.0", - "2500000000": "254.0", - "3000000000": "270.0", - "4000000000": "290.0", - "5000000000": "360.0", - "6000000000": "368.0", - "8000000000": "400.0", - "10000000000": "460.0" - } -} \ No newline at end of file diff --git a/tiers/Clockwork Giant [Clockwork Giant].json b/tiers/Clockwork Giant [Clockwork Giant].json deleted file mode 100644 index 5d3543a..0000000 --- a/tiers/Clockwork Giant [Clockwork Giant].json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "normal": { - "100000000": 1, - "200000000": 2, - "750000000": 3, - "1250000000": 4, - "1500000000": 5, - "2000000000": 8, - "2500000000": 10, - "3750000000": 12, - "5000000000": 15 - }, - "hard": { - "100000000": 1, - "200000000": 2, - "750000000": 3, - "1250000000": 4, - "1500000000": 5, - "2000000000": 8, - "2500000000": 10, - "3750000000": 12, - "5000000000": 15 - }, - "legendary": { - "100000000": 1, - "200000000": 2, - "750000000": 3, - "1250000000": 4, - "1500000000": 5, - "2000000000": 8, - "2500000000": 10, - "3750000000": 12, - "5000000000": 15 - }, - "nightmare": { - "100000000": 1, - "200000000": 2, - "750000000": 3, - "1250000000": 4, - "1500000000": 5, - "2000000000": 8, - "2500000000": 10, - "3750000000": 12, - "5000000000": 15 - } -} diff --git a/tiers/Corrupted Wilds [Corrupted Wilds].json b/tiers/Corrupted Wilds [Corrupted Wilds].json deleted file mode 100644 index 53ef933..0000000 --- a/tiers/Corrupted Wilds [Corrupted Wilds].json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "normal": { - "750000000": "5.0", - "1000000000": "10.0", - "1500000000": "15.0", - "2000000000": "22.0", - "2500000000": "28.0", - "3000000000": "37.0", - "4000000000": "42.0", - "5000000000": "47.0", - "6000000000": "52.0", - "7000000000": "57.0", - "8000000000": "62.0", - "9000000000": "67.0", - "10000000000": "72.0", - "12500000000": "77.0", - "15000000000": "82.0", - "17500000000": "87.0", - "20000000000": "93.0", - "25000000000": "100.0", - "30000000000": "107.0", - "40000000000": "120.0" - }, - "hard": { - "750000000": "5.0", - "1000000000": "10.0", - "1500000000": "15.0", - "2000000000": "22.0", - "2500000000": "28.0", - "3000000000": "37.0", - "4000000000": "42.0", - "5000000000": "47.0", - "6000000000": "52.0", - "7000000000": "57.0", - "8000000000": "62.0", - "9000000000": "67.0", - "10000000000": "72.0", - "12500000000": "77.0", - "15000000000": "82.0", - "17500000000": "87.0", - "20000000000": "93.0", - "25000000000": "100.0", - "30000000000": "107.0", - "40000000000": "120.0" - }, - "legendary": { - "750000000": "5.0", - "1000000000": "10.0", - "1500000000": "15.0", - "2000000000": "22.0", - "2500000000": "28.0", - "3000000000": "37.0", - "4000000000": "42.0", - "5000000000": "47.0", - "6000000000": "52.0", - "7000000000": "57.0", - "8000000000": "62.0", - "9000000000": "67.0", - "10000000000": "72.0", - "12500000000": "77.0", - "15000000000": "82.0", - "17500000000": "87.0", - "20000000000": "93.0", - "25000000000": "100.0", - "30000000000": "107.0", - "40000000000": "120.0" - }, - "nightmare": { - "750000000": "5.0", - "1000000000": "10.0", - "1500000000": "15.0", - "2000000000": "22.0", - "2500000000": "28.0", - "3000000000": "37.0", - "4000000000": "42.0", - "5000000000": "47.0", - "6000000000": "52.0", - "7000000000": "57.0", - "8000000000": "62.0", - "9000000000": "67.0", - "10000000000": "72.0", - "12500000000": "77.0", - "15000000000": "82.0", - "17500000000": "87.0", - "20000000000": "93.0", - "25000000000": "100.0", - "30000000000": "107.0", - "40000000000": "120.0" - } -} \ No newline at end of file diff --git a/tiers/Count Siculus' Phantom [Siculus].json b/tiers/Count Siculus' Phantom [Siculus].json deleted file mode 100644 index 2df9378..0000000 --- a/tiers/Count Siculus' Phantom [Siculus].json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "normal": { - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0", - "2000000000": "32.0" - }, - "hard": { - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0", - "2000000000": "32.0" - }, - "legendary": { - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0", - "2000000000": "32.0" - }, - "nightmare": { - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0", - "2000000000": "32.0" - } -} \ No newline at end of file diff --git a/tiers/Countess Serpina [Serpina].json b/tiers/Countess Serpina [Serpina].json deleted file mode 100644 index e9482cb..0000000 --- a/tiers/Countess Serpina [Serpina].json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "normal": { - "2250000": 65, - "3000000": 92, - "3750000": 119, - "4500000": 146, - "5250000": 173, - "6000000": 200, - "6750000": 227, - "7500000": 264, - "8250000": 301, - "9000000": 338, - "9750000": 375 - }, - "hard": { - "3375000": 65, - "4500000": 92, - "5625000": 119, - "6750000": 146, - "7875000": 173, - "9000000": 200, - "10125000": 227, - "11250000": 264, - "12375000": 301, - "13500000": 338, - "14625000": 375 - }, - "legendary": { - "4500000": 65, - "6000000": 92, - "7550000": 119, - "9000000": 146, - "10500000": 173, - "12000000": 200, - "13500000": 227, - "15000000": 264, - "16500000": 301, - "18000000": 338, - "19500000": 375 - }, - "nightmare": { - "5625000": 65, - "7500000": 92, - "9375000": 119, - "11250000": 146, - "13125000": 173, - "15000000": 200, - "16875000": 227, - "18750000": 264, - "20625000": 301, - "22500000": 338, - "24375000": 375 - } -} diff --git a/tiers/Damned Shade [Shade].json b/tiers/Damned Shade [Shade].json deleted file mode 100644 index f6a160d..0000000 --- a/tiers/Damned Shade [Shade].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "250000000": "14.0", - "500000000": "41.0", - "1000000000": "61.0", - "1500000000": "93.0", - "2000000000": "125.0", - "2500000000": "167.0", - "5000000000": "263.0", - "7500000000": "297.0", - "10000000000": "347.0", - "15000000000": "383.0" - }, - "hard": { - "250000000": "14.0", - "500000000": "41.0", - "1000000000": "61.0", - "1500000000": "93.0", - "2000000000": "125.0", - "2500000000": "167.0", - "5000000000": "263.0", - "7500000000": "297.0", - "10000000000": "347.0", - "15000000000": "383.0" - }, - "legendary": { - "250000000": "14.0", - "500000000": "41.0", - "1000000000": "61.0", - "1500000000": "93.0", - "2000000000": "125.0", - "2500000000": "167.0", - "5000000000": "263.0", - "7500000000": "297.0", - "10000000000": "347.0", - "15000000000": "383.0" - }, - "nightmare": { - "250000000": "14.0", - "500000000": "41.0", - "1000000000": "61.0", - "1500000000": "93.0", - "2000000000": "125.0", - "2500000000": "167.0", - "5000000000": "263.0", - "7500000000": "297.0", - "10000000000": "347.0", - "15000000000": "383.0" - } -} \ No newline at end of file diff --git a/tiers/Damned Shade [War Shade].json b/tiers/Damned Shade [War Shade].json deleted file mode 100644 index c2d0f5d..0000000 --- a/tiers/Damned Shade [War Shade].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "250000000": 14, - "500000000": 41, - "1000000000": 61, - "1500000000": 93, - "2000000000": 125, - "2500000000": 167, - "5000000000": 263, - "7500000000": 297, - "10000000000": 347, - "15000000000": 383 - }, - "hard": { - "250000000": 14, - "500000000": 41, - "1000000000": 61, - "1500000000": 93, - "2000000000": 125, - "2500000000": 167, - "5000000000": 263, - "7500000000": 297, - "10000000000": 347, - "15000000000": 383 - }, - "legendary": { - "250000000": 14, - "500000000": 41, - "1000000000": 61, - "1500000000": 93, - "2000000000": 125, - "2500000000": 167, - "5000000000": 263, - "7500000000": 297, - "10000000000": 347, - "15000000000": 383 - }, - "nightmare": { - "250000000": 14, - "500000000": 41, - "1000000000": 61, - "1500000000": 93, - "2000000000": 125, - "2500000000": 167, - "5000000000": 263, - "7500000000": 297, - "10000000000": 347, - "15000000000": 383 - } -} diff --git a/tiers/Dar'Hed'Nal [Dar'Hed'Nal].json b/tiers/Dar'Hed'Nal [Dar'Hed'Nal].json deleted file mode 100644 index f72a1db..0000000 --- a/tiers/Dar'Hed'Nal [Dar'Hed'Nal].json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "normal": { - "8000000": "2", - "17000000": "3", - "26000000": "4", - "35000000": "5", - "45000000": "6", - "56000000": "7", - "67000000": "8", - "78000000": "9", - "90000000": "10", - "103000000": "11", - "116000000": "12", - "129000000": "13", - "143000000": "14", - "157000000": "15", - "173000000": "16", - "188000000": "17", - "202000000": "18", - "220000000": "19", - "238000000": "20", - "255000000": "21", - "270000000": "22", - "293000000": "23", - "311000000": "24", - "330000000": "25", - "350000000": "26", - "1000000000": "30" - }, - "hard": { - "8000000": "2", - "17000000": "3", - "26000000": "4", - "35000000": "5", - "45000000": "6", - "56000000": "7", - "67000000": "8", - "78000000": "9", - "90000000": "10", - "103000000": "11", - "116000000": "12", - "129000000": "13", - "143000000": "14", - "157000000": "15", - "173000000": "16", - "188000000": "17", - "202000000": "18", - "220000000": "19", - "238000000": "20", - "255000000": "21", - "270000000": "22", - "293000000": "23", - "311000000": "24", - "330000000": "25", - "350000000": "26", - "1000000000": "30" - }, - "legendary": { - "8000000": "2", - "17000000": "3", - "26000000": "4", - "35000000": "5", - "45000000": "6", - "56000000": "7", - "67000000": "8", - "78000000": "9", - "90000000": "10", - "103000000": "11", - "116000000": "12", - "129000000": "13", - "143000000": "14", - "157000000": "15", - "173000000": "16", - "188000000": "17", - "202000000": "18", - "220000000": "19", - "238000000": "20", - "255000000": "21", - "270000000": "22", - "293000000": "23", - "311000000": "24", - "330000000": "25", - "350000000": "26", - "1000000000": "30" - }, - "nightmare": { - "8000000": "2", - "17000000": "3", - "26000000": "4", - "35000000": "5", - "45000000": "6", - "56000000": "7", - "67000000": "8", - "78000000": "9", - "90000000": "10", - "103000000": "11", - "116000000": "12", - "129000000": "13", - "143000000": "14", - "157000000": "15", - "173000000": "16", - "188000000": "17", - "202000000": "18", - "220000000": "19", - "238000000": "20", - "255000000": "21", - "270000000": "22", - "293000000": "23", - "311000000": "24", - "330000000": "25", - "350000000": "26", - "1000000000": "30" - } -} diff --git a/tiers/Deadly Clockwork Giant [Deadly Clockwork].json b/tiers/Deadly Clockwork Giant [Deadly Clockwork].json deleted file mode 100644 index e0bce94..0000000 --- a/tiers/Deadly Clockwork Giant [Deadly Clockwork].json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "nightmare": { - "167000000000": 6500, - "500000000000": 22001, - "100000000000000": 46000, - "200000000000000": 94000, - "300000000000000": 142000, - "400000000000000": 190000, - "500000000000000": 240000, - "750000000000000": 270000, - "1000000000000000": 300000, - "1500000000000000": 310000, - "2000000000000000": 320000, - "3000000000000000": 330000, - "4000000000000000": 340000, - "5000000000000000": 350000 - } -} diff --git a/tiers/Deathglare [Deathglare].json b/tiers/Deathglare [Deathglare].json deleted file mode 100644 index a068d6a..0000000 --- a/tiers/Deathglare [Deathglare].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "113000": 1, - "630000": 1, - "855000": 1, - "1845000": 2, - "2813000": 2.5, - "6075000": 3, - "7650000": 3.5 - }, - "hard": { - "141000": 1, - "788000": 1, - "1069000": 1, - "2306000": 2, - "3516000": 2.5, - "7594000": 3, - "9563000": 3.5 - }, - "legendary": { - "180000": 1, - "1008000": 1, - "1368000": 1, - "2952000": 2, - "4500000": 2.5, - "9720000": 3, - "12240000": 3.5 - }, - "nightmare": { - "225000": 1, - "1260000": 1, - "1710000": 1, - "3690000": 2, - "5625000": 2.5, - "12150000": 3, - "15300000": 3.5 - } -} diff --git a/tiers/Dirthax [Dirthax].json b/tiers/Dirthax [Dirthax].json deleted file mode 100644 index 25f61dd..0000000 --- a/tiers/Dirthax [Dirthax].json +++ /dev/null @@ -1,206 +0,0 @@ -{ - "normal": { - "1100000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4950000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "8250000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "12100000": { - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "17600000": { - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "35750000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "49500000": { - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - }, - "hard": { - "1375000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "6188000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10313000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15125000": { - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "22000000": { - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "44688000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "61875000": { - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - }, - "legendary": { - "1760000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "7920000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "13200000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "19360000": { - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "28160000": { - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "57200000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "79200000": { - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - }, - "nightmare": { - "2200000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "9900000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "16500000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "24200000": { - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "35200000": { - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "71500000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "99000000": { - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Doomglare [Doomglare].json b/tiers/Doomglare [Doomglare].json deleted file mode 100644 index dce23f9..0000000 --- a/tiers/Doomglare [Doomglare].json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "normal": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26, - "1000000000": 30 - }, - "hard": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26, - "1000000000": 30 - }, - "legendary": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26, - "1000000000": 30 - }, - "nightmare": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26, - "1000000000": 30 - } -} diff --git a/tiers/Doppelganger [Doppelganger].json b/tiers/Doppelganger [Doppelganger].json deleted file mode 100644 index 7eb0622..0000000 --- a/tiers/Doppelganger [Doppelganger].json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "normal": { - "100000000": "1.0", - "250000000": "2.0", - "500000000": "7.0", - "750000000": "12.0", - "1000000000": "18.0", - "1250000000": "20.0", - "1500000000": "25.0", - "2000000000": "31.0", - "2500000000": "35.0" - }, - "hard": { - "100000000": "1.0", - "250000000": "2.0", - "500000000": "7.0", - "750000000": "12.0", - "1000000000": "18.0", - "1250000000": "20.0", - "1500000000": "25.0", - "2000000000": "31.0", - "2500000000": "35.0" - }, - "legendary": { - "100000000": "1.0", - "250000000": "2.0", - "500000000": "7.0", - "750000000": "12.0", - "1000000000": "18.0", - "1250000000": "20.0", - "1500000000": "25.0", - "2000000000": "31.0", - "2500000000": "35.0" - }, - "nightmare": { - "100000000": "1.0", - "250000000": "2.0", - "500000000": "7.0", - "750000000": "12.0", - "1000000000": "18.0", - "1250000000": "20.0", - "1500000000": "25.0", - "2000000000": "31.0", - "2500000000": "35.0" - } -} \ No newline at end of file diff --git a/tiers/Draconic Dreams [D. Dreams].json b/tiers/Draconic Dreams [D. Dreams].json deleted file mode 100644 index fd1b18b..0000000 --- a/tiers/Draconic Dreams [D. Dreams].json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "normal": { - "1000000000": "15.0", - "1500000000": "23.0", - "2000000000": "31.0", - "2500000000": "40.0", - "3000000000": "48.0", - "4000000000": "57.0", - "5000000000": "65.0", - "6000000000": "69.0", - "7000000000": "74.0", - "8000000000": "78.0", - "9000000000": "86.0", - "10000000000": "94.0", - "12500000000": "98.0", - "15000000000": "103.0", - "17500000000": "110.0", - "20000000000": "117.0", - "25000000000": "126.0", - "30000000000": "134.0", - "40000000000": "150.0", - "50000000000": "198.0", - "60000000000": "236.0", - "70000000000": "273.0", - "80000000000": "311.0", - "90000000000": "348.0", - "100000000000": "398.0" - }, - "hard": { - "1000000000": "15.0", - "1500000000": "23.0", - "2000000000": "31.0", - "2500000000": "40.0", - "3000000000": "48.0", - "4000000000": "57.0", - "5000000000": "65.0", - "6000000000": "69.0", - "7000000000": "74.0", - "8000000000": "78.0", - "9000000000": "86.0", - "10000000000": "94.0", - "12500000000": "98.0", - "15000000000": "103.0", - "17500000000": "110.0", - "20000000000": "117.0", - "25000000000": "126.0", - "30000000000": "134.0", - "40000000000": "150.0", - "50000000000": "198.0", - "60000000000": "236.0", - "70000000000": "273.0", - "80000000000": "311.0", - "90000000000": "348.0", - "100000000000": "398.0" - }, - "legendary": { - "1000000000": "15.0", - "1500000000": "23.0", - "2000000000": "31.0", - "2500000000": "40.0", - "3000000000": "48.0", - "4000000000": "57.0", - "5000000000": "65.0", - "6000000000": "69.0", - "7000000000": "74.0", - "8000000000": "78.0", - "9000000000": "86.0", - "10000000000": "94.0", - "12500000000": "98.0", - "15000000000": "103.0", - "17500000000": "110.0", - "20000000000": "117.0", - "25000000000": "126.0", - "30000000000": "134.0", - "40000000000": "150.0", - "50000000000": "198.0", - "60000000000": "236.0", - "70000000000": "273.0", - "80000000000": "311.0", - "90000000000": "348.0", - "100000000000": "398.0" - }, - "nightmare": { - "1000000000": "15.0", - "1500000000": "23.0", - "2000000000": "31.0", - "2500000000": "40.0", - "3000000000": "48.0", - "4000000000": "57.0", - "5000000000": "65.0", - "6000000000": "69.0", - "7000000000": "74.0", - "8000000000": "78.0", - "9000000000": "86.0", - "10000000000": "94.0", - "12500000000": "98.0", - "15000000000": "103.0", - "17500000000": "110.0", - "20000000000": "117.0", - "25000000000": "126.0", - "30000000000": "134.0", - "40000000000": "150.0", - "50000000000": "198.0", - "60000000000": "236.0", - "70000000000": "273.0", - "80000000000": "311.0", - "90000000000": "348.0", - "100000000000": "398.0" - } -} \ No newline at end of file diff --git a/tiers/Dragon's Lair [Lair].json b/tiers/Dragon's Lair [Lair].json deleted file mode 100644 index 3a6083d..0000000 --- a/tiers/Dragon's Lair [Lair].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "7000000": 2, - "9000000": 4, - "10000000": 6, - "15000000": 8, - "20000000": 10, - "25000000": 12, - "30000000": 14, - "35000000": 16, - "40000000": 18, - "45000000": 20 - }, - "hard": { - "35000000": 2, - "45000000": 4, - "50000000": 6, - "75000000": 8, - "100000000": 10, - "125000000": 12, - "150000000": 14, - "175000000": 16, - "200000000": 18, - "225000000": 20 - }, - "legendary": { - "70000000": 2, - "90000000": 4, - "100000000": 6, - "150000000": 8, - "200000000": 10, - "250000000": 12, - "300000000": 14, - "350000000": 16, - "400000000": 18, - "450000000": 20 - }, - "nightmare": { - "105000000": 2, - "135000000": 4, - "150000000": 6, - "225000000": 8, - "300000000": 10, - "375000000": 12, - "450000000": 14, - "525000000": 16, - "600000000": 18, - "675000000": 20 - } -} diff --git a/tiers/Drake's Fire Elemental [Fire Elemental].json b/tiers/Drake's Fire Elemental [Fire Elemental].json deleted file mode 100644 index 45f926b..0000000 --- a/tiers/Drake's Fire Elemental [Fire Elemental].json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "normal": { - "200000000": 8, - "300000000": 12, - "500000000": 16, - "750000000": 21, - "1000000000": 25, - "1500000000": 33, - "2000000000": 42, - "2500000000": 48, - "3000000000": 54, - "4000000000": 63, - "5000000000": 71, - "7500000000": 81, - "10000000000": 90 - }, - "hard": { - "200000000": 8, - "300000000": 12, - "500000000": 16, - "750000000": 21, - "1000000000": 25, - "1500000000": 33, - "2000000000": 42, - "2500000000": 48, - "3000000000": 54, - "4000000000": 63, - "5000000000": 71, - "7500000000": 81, - "10000000000": 90 - }, - "legendary": { - "200000000": 8, - "300000000": 12, - "500000000": 16, - "750000000": 21, - "1000000000": 25, - "1500000000": 33, - "2000000000": 42, - "2500000000": 48, - "3000000000": 54, - "4000000000": 63, - "5000000000": 71, - "7500000000": 81, - "10000000000": 90 - }, - "nightmare": { - "200000000": 8, - "300000000": 12, - "500000000": 16, - "750000000": 21, - "1000000000": 25, - "1500000000": 33, - "2000000000": 42, - "2500000000": 48, - "3000000000": 54, - "4000000000": 63, - "5000000000": 71, - "7500000000": 81, - "10000000000": 90 - } -} diff --git a/tiers/Drakontos, The First Terror [Drakontos].json b/tiers/Drakontos, The First Terror [Drakontos].json deleted file mode 100644 index 1dd31de..0000000 --- a/tiers/Drakontos, The First Terror [Drakontos].json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "nightmare": { - "100000000": { - "epic": 15, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "200000000": { - "epic": 30, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "300000000": { - "epic": 35, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "500000000": { - "epic": 45, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1000000000": { - "epic": 90, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1500000000": { - "epic": 121, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2000000000": { - "epic": 152, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2500000000": { - "epic": 182, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3000000000": { - "epic": 213, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4000000000": { - "epic": 244, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000": { - "epic": 450, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "6000000000": { - "epic": 461, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "7000000000": { - "epic": 472, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "8000000000": { - "epic": 488, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "9000000000": { - "epic": 504, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000": { - "epic": 570, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "12500000000": { - "epic": 606, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000": { - "epic": 661, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000": { - "epic": 762, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "25000000000": { - "epic": 837, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "30000000000": { - "epic": 938, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "40000000000": { - "epic": 1014, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "50000000000": { - "epic": 1215, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "60000000000": { - "epic": 1316, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "70000000000": { - "epic": 1517, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "80000000000": { - "epic": 1718, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "90000000000": { - "epic": 1919, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "100000000000": { - "epic": 2045, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "150000000000": { - "epic": 2280, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000": { - "epic": 2640, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Drulcharus [Drulcharus].json b/tiers/Drulcharus [Drulcharus].json deleted file mode 100644 index 9a6e9b1..0000000 --- a/tiers/Drulcharus [Drulcharus].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "60.0", - "5000000000": "90.0", - "8000000000": "100.0" - }, - "hard": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "60.0", - "5000000000": "90.0", - "8000000000": "100.0" - }, - "legendary": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "60.0", - "5000000000": "90.0", - "8000000000": "100.0" - }, - "nightmare": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "60.0", - "5000000000": "90.0", - "8000000000": "100.0" - } -} \ No newline at end of file diff --git a/tiers/Drunken Ragunt [Ragunt].json b/tiers/Drunken Ragunt [Ragunt].json deleted file mode 100644 index d3dc6fe..0000000 --- a/tiers/Drunken Ragunt [Ragunt].json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "normal": { - "225000000": "11.0", - "310000000": "13.0", - "400000000": "17.0", - "510000000": "19.0", - "750000000": "23.0", - "1000000000": "27.0", - "1500000000": "37.0", - "2500000000": "39.0", - "5000000000": "61.0" - }, - "hard": { - "225000000": "11.0", - "310000000": "13.0", - "400000000": "17.0", - "510000000": "19.0", - "750000000": "23.0", - "1000000000": "27.0", - "1500000000": "37.0", - "2500000000": "39.0", - "5000000000": "61.0" - }, - "legendary": { - "225000000": "11.0", - "310000000": "13.0", - "400000000": "17.0", - "510000000": "19.0", - "750000000": "23.0", - "1000000000": "27.0", - "1500000000": "37.0", - "2500000000": "39.0", - "5000000000": "61.0" - }, - "nightmare": { - "225000000": "11.0", - "310000000": "13.0", - "400000000": "17.0", - "510000000": "19.0", - "750000000": "23.0", - "1000000000": "27.0", - "1500000000": "37.0", - "2500000000": "39.0", - "5000000000": "61.0" - } -} \ No newline at end of file diff --git a/tiers/Elite 5th Terror [E. 5th Terror].json b/tiers/Elite 5th Terror [E. 5th Terror].json deleted file mode 100644 index 8d11996..0000000 --- a/tiers/Elite 5th Terror [E. 5th Terror].json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "nightmare": { - "50000000000": 2800, - "80000000000": 5500, - "90000000000": 6200, - "120000000000": 7000, - "125000000000": 7600, - "150000000000": 8000, - "200000000000": 10750, - "250000000000": 11500, - "300000000000": 12000, - "400000000000": 13000, - "500000000000": 14000 - } -} diff --git a/tiers/Elite Balor [E. Balor].json b/tiers/Elite Balor [E. Balor].json deleted file mode 100644 index 87b221f..0000000 --- a/tiers/Elite Balor [E. Balor].json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "nightmare": { - "50000000000": 2840, - "75000000000": 5165, - "80000000000": 5570, - "100000000000": 7000, - "125000000000": 8800, - "150000000000": 9100, - "180000000000": 9100, - "200000000000": 10100, - "250000000000": 10600, - "300000000000": 11600, - "350000000000": 11600, - "400000000000": 12100, - "500000000000": 12600 - } -} diff --git a/tiers/Elite Bloodsuckers [E. Bloodsuckers].json b/tiers/Elite Bloodsuckers [E. Bloodsuckers].json deleted file mode 100644 index f22708e..0000000 --- a/tiers/Elite Bloodsuckers [E. Bloodsuckers].json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "nightmare": { - "10000000000": { - "epic": 300, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000": { - "epic": 700, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "30000000000": { - "epic": 1800, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "40000000000": { - "epic": 2500, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "50000000000": { - "epic": 3150, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "60000000000": { - "epic": 3900, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "70000000000": { - "epic": 4600, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "80000000000": { - "epic": 5500, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "90000000000": { - "epic": 6000, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "100000000000": { - "epic": 6400, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "120000000000": { - "epic": 7500, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Elite Butcher [E. Butcher].json b/tiers/Elite Butcher [E. Butcher].json deleted file mode 100644 index 30406f9..0000000 --- a/tiers/Elite Butcher [E. Butcher].json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "normal": { - "10000000000": "300.0", - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2350.0", - "45000000000": "2650.0", - "50000000000": "3200.0" - }, - "hard": { - "10000000000": "300.0", - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2350.0", - "45000000000": "2650.0", - "50000000000": "3200.0" - }, - "legendary": { - "10000000000": "300.0", - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2350.0", - "45000000000": "2650.0", - "50000000000": "3200.0" - }, - "nightmare": { - "10000000000": "300.0", - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2350.0", - "45000000000": "2650.0", - "50000000000": "3200.0" - } -} \ No newline at end of file diff --git a/tiers/Elite Caster [E. Caster].json b/tiers/Elite Caster [E. Caster].json deleted file mode 100644 index 1220388..0000000 --- a/tiers/Elite Caster [E. Caster].json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "normal": { - "10000000000": "300.0", - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2350.0", - "45000000000": "2650.0", - "50000000000": "3000.0", - "55000000000": "3400.0", - "60000000000": "3900.0", - "70000000000": "4400.0", - "80000000000": "5000.0", - "90000000000": "5600.0", - "100000000000": "6200.0" - }, - "hard": { - "10000000000": "300.0", - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2350.0", - "45000000000": "2650.0", - "50000000000": "3000.0", - "55000000000": "3400.0", - "60000000000": "3900.0", - "70000000000": "4400.0", - "80000000000": "5000.0", - "90000000000": "5600.0", - "100000000000": "6200.0" - }, - "legendary": { - "10000000000": "300.0", - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2350.0", - "45000000000": "2650.0", - "50000000000": "3000.0", - "55000000000": "3400.0", - "60000000000": "3900.0", - "70000000000": "4400.0", - "80000000000": "5000.0", - "90000000000": "5600.0", - "100000000000": "6200.0" - }, - "nightmare": { - "10000000000": "300.0", - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2350.0", - "45000000000": "2650.0", - "50000000000": "3000.0", - "55000000000": "3400.0", - "60000000000": "3900.0", - "70000000000": "4400.0", - "80000000000": "5000.0", - "90000000000": "5600.0", - "100000000000": "6200.0" - } -} \ No newline at end of file diff --git a/tiers/Elite Devourer [Devourer].json b/tiers/Elite Devourer [Devourer].json deleted file mode 100644 index 958e654..0000000 --- a/tiers/Elite Devourer [Devourer].json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "nightmare": { - "15000000000": 400, - "20000000000": 550, - "25000000000": 700, - "30000000000": 1000, - "40000000000": 1400, - "50000000000": 1800, - "60000000000": 2400, - "70000000000": 2900, - "80000000000": 3400, - "90000000000": 4000, - "100000000000": 4550, - "120000000000": 5500, - "150000000000": 6000, - "200000000000": 7000 - } -} diff --git a/tiers/Elite Funny Bones [E. Funny Bones].json b/tiers/Elite Funny Bones [E. Funny Bones].json deleted file mode 100644 index 5dd64ec..0000000 --- a/tiers/Elite Funny Bones [E. Funny Bones].json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "nightmare": { - "10000000000": 300, - "20000000000": 700, - "25000000000": 1200, - "50000000000": 3000, - "75000000000": 4850, - "80000000000": 5400, - "100000000000": 6350, - "125000000000": 7200, - "150000000000": 8000 - } -} diff --git a/tiers/Elite Initiates [E. Initiates].json b/tiers/Elite Initiates [E. Initiates].json deleted file mode 100644 index a3cd97f..0000000 --- a/tiers/Elite Initiates [E. Initiates].json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "nightmare": { - "30000000000": 1800, - "60000000000": 4000, - "70000000000": 4900, - "75000000000": 5300, - "80000000000": 5700, - "90000000000": 6500, - "100000000000": 7250, - "120000000000": 8800, - "150000000000": 8900, - "180000000000": 9000 - } -} diff --git a/tiers/Elite Kanehuar Yachu [E. Kane].json b/tiers/Elite Kanehuar Yachu [E. Kane].json deleted file mode 100644 index ecf2fed..0000000 --- a/tiers/Elite Kanehuar Yachu [E. Kane].json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "nightmare": { - "25000000000": 1260, - "36700000000": 1930, - "40000000000": 2230, - "45000000000": 2530, - "50000000000": 2830, - "55000000000": 3130, - "60000000000": 3950, - "65000000000": 4350, - "73300000000": 4750, - "75000000000": 5150, - "80000000000": 5550, - "90000000000": 6250, - "100000000000": 6950, - "125000000000": 8700, - "180000000000": 9000, - "200000000000": 10000, - "250000000000": 10500, - "350000000000": 11500, - "400000000000": 12000 - } -} diff --git a/tiers/Elite Karkata [E. Karkata].json b/tiers/Elite Karkata [E. Karkata].json deleted file mode 100644 index 03793a9..0000000 --- a/tiers/Elite Karkata [E. Karkata].json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "nightmare": { - "33300000000": 1625, - "35000000000": 1930, - "40000000000": 2230, - "45000000000": 2530, - "50000000000": 2830, - "55000000000": 3130, - "60000000000": 3950, - "66600000000": 4350, - "70000000000": 4750, - "75000000000": 5150, - "85000000000": 5550, - "90000000000": 6250, - "120000000000": 6950, - "130000000000": 8700, - "160000000000": 9000, - "225000000000": 10000, - "250000000000": 10500, - "300000000000": 11500 - } -} diff --git a/tiers/Elite Killers [E. Killers].json b/tiers/Elite Killers [E. Killers].json deleted file mode 100644 index bc9042d..0000000 --- a/tiers/Elite Killers [E. Killers].json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "normal": { - "10000000000": "300.0", - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2350.0", - "45000000000": "2650.0", - "50000000000": "3000.0", - "55000000000": "3400.0", - "60000000000": "3900.0" - }, - "hard": { - "10000000000": "300.0", - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2350.0", - "45000000000": "2650.0", - "50000000000": "3000.0", - "55000000000": "3400.0", - "60000000000": "3900.0" - }, - "legendary": { - "10000000000": "300.0", - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2350.0", - "45000000000": "2650.0", - "50000000000": "3000.0", - "55000000000": "3400.0", - "60000000000": "3900.0" - }, - "nightmare": { - "10000000000": "300.0", - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2350.0", - "45000000000": "2650.0", - "50000000000": "3000.0", - "55000000000": "3400.0", - "60000000000": "3900.0" - } -} \ No newline at end of file diff --git a/tiers/Elite Lady Cecile [E. Lady Cecile].json b/tiers/Elite Lady Cecile [E. Lady Cecile].json deleted file mode 100644 index 811eeb8..0000000 --- a/tiers/Elite Lady Cecile [E. Lady Cecile].json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "normal": { - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1600.0", - "35000000000": "1900.0", - "40000000000": "2200.0", - "45000000000": "2500.0", - "50000000000": "2800.0", - "55000000000": "3100.0", - "60000000000": "3900.0", - "65000000000": "4300.0", - "70000000000": "4700.0", - "75000000000": "5100.0", - "80000000000": "5500.0", - "90000000000": "6200.0", - "100000000000": "6900.0", - "120000000000": "8300.0", - "150000000000": "8800.0", - "200000000000": "9200.0", - "240000000000": "10000.0", - "300000000000": "11000.0" - }, - "hard": { - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1600.0", - "35000000000": "1900.0", - "40000000000": "2200.0", - "45000000000": "2500.0", - "50000000000": "2800.0", - "55000000000": "3100.0", - "60000000000": "3900.0", - "65000000000": "4300.0", - "70000000000": "4700.0", - "75000000000": "5100.0", - "80000000000": "5500.0", - "90000000000": "6200.0", - "100000000000": "6900.0", - "120000000000": "8300.0", - "150000000000": "8800.0", - "200000000000": "9200.0", - "240000000000": "10000.0", - "300000000000": "11000.0" - }, - "legendary": { - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1600.0", - "35000000000": "1900.0", - "40000000000": "2200.0", - "45000000000": "2500.0", - "50000000000": "2800.0", - "55000000000": "3100.0", - "60000000000": "3900.0", - "65000000000": "4300.0", - "70000000000": "4700.0", - "75000000000": "5100.0", - "80000000000": "5500.0", - "90000000000": "6200.0", - "100000000000": "6900.0", - "120000000000": "8300.0", - "150000000000": "8800.0", - "200000000000": "9200.0", - "240000000000": "10000.0", - "300000000000": "11000.0" - }, - "nightmare": { - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1600.0", - "35000000000": "1900.0", - "40000000000": "2200.0", - "45000000000": "2500.0", - "50000000000": "2800.0", - "55000000000": "3100.0", - "60000000000": "3900.0", - "65000000000": "4300.0", - "70000000000": "4700.0", - "75000000000": "5100.0", - "80000000000": "5500.0", - "90000000000": "6200.0", - "100000000000": "6900.0", - "120000000000": "8300.0", - "150000000000": "8800.0", - "200000000000": "9200.0", - "240000000000": "10000.0", - "300000000000": "11000.0" - } -} \ No newline at end of file diff --git a/tiers/Elite Malleus [E. Malleus].json b/tiers/Elite Malleus [E. Malleus].json deleted file mode 100644 index 188797b..0000000 --- a/tiers/Elite Malleus [E. Malleus].json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "normal": { - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2400.0", - "45000000000": "2800.0", - "50000000000": "3150.0", - "55000000000": "3500.0", - "60000000000": "3900.0", - "65000000000": "4500.0", - "70000000000": "5100.0", - "75000000000": "5700.0", - "80000000000": "6100.0", - "90000000000": "6900.0", - "100000000000": "7800.0", - "150000000000": "8400.0", - "200000000000": "9000.0" - }, - "hard": { - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2400.0", - "45000000000": "2800.0", - "50000000000": "3150.0", - "55000000000": "3500.0", - "60000000000": "3900.0", - "65000000000": "4500.0", - "70000000000": "5100.0", - "75000000000": "5700.0", - "80000000000": "6100.0", - "90000000000": "6900.0", - "100000000000": "7800.0", - "150000000000": "8400.0", - "200000000000": "9000.0" - }, - "legendary": { - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2400.0", - "45000000000": "2800.0", - "50000000000": "3150.0", - "55000000000": "3500.0", - "60000000000": "3900.0", - "65000000000": "4500.0", - "70000000000": "5100.0", - "75000000000": "5700.0", - "80000000000": "6100.0", - "90000000000": "6900.0", - "100000000000": "7800.0", - "150000000000": "8400.0", - "200000000000": "9000.0" - }, - "nightmare": { - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2400.0", - "45000000000": "2800.0", - "50000000000": "3150.0", - "55000000000": "3500.0", - "60000000000": "3900.0", - "65000000000": "4500.0", - "70000000000": "5100.0", - "75000000000": "5700.0", - "80000000000": "6100.0", - "90000000000": "6900.0", - "100000000000": "7800.0", - "150000000000": "8400.0", - "200000000000": "9000.0" - } -} \ No newline at end of file diff --git a/tiers/Elite Mangler [E. Mangler].json b/tiers/Elite Mangler [E. Mangler].json deleted file mode 100644 index 8fc7849..0000000 --- a/tiers/Elite Mangler [E. Mangler].json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "normal": { - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2400.0", - "45000000000": "2800.0", - "50000000000": "3150.0", - "55000000000": "3500.0", - "60000000000": "3900.0", - "65000000000": "4500.0", - "70000000000": "5100.0", - "75000000000": "5700.0", - "80000000000": "6200.0", - "90000000000": "6700.0", - "100000000000": "7200.0", - "125000000000": "7650.0", - "150000000000": "8000.0" - }, - "hard": { - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2400.0", - "45000000000": "2800.0", - "50000000000": "3150.0", - "55000000000": "3500.0", - "60000000000": "3900.0", - "65000000000": "4500.0", - "70000000000": "5100.0", - "75000000000": "5700.0", - "80000000000": "6200.0", - "90000000000": "6700.0", - "100000000000": "7200.0", - "125000000000": "7650.0", - "150000000000": "8000.0" - }, - "legendary": { - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2400.0", - "45000000000": "2800.0", - "50000000000": "3150.0", - "55000000000": "3500.0", - "60000000000": "3900.0", - "65000000000": "4500.0", - "70000000000": "5100.0", - "75000000000": "5700.0", - "80000000000": "6200.0", - "90000000000": "6700.0", - "100000000000": "7200.0", - "125000000000": "7650.0", - "150000000000": "8000.0" - }, - "nightmare": { - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2400.0", - "45000000000": "2800.0", - "50000000000": "3150.0", - "55000000000": "3500.0", - "60000000000": "3900.0", - "65000000000": "4500.0", - "70000000000": "5100.0", - "75000000000": "5700.0", - "80000000000": "6200.0", - "90000000000": "6700.0", - "100000000000": "7200.0", - "125000000000": "7650.0", - "150000000000": "8000.0" - } -} \ No newline at end of file diff --git a/tiers/Elite Murderer [E. Murderer].json b/tiers/Elite Murderer [E. Murderer].json deleted file mode 100644 index c50115c..0000000 --- a/tiers/Elite Murderer [E. Murderer].json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "normal": { - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "37500000000": "2300.0", - "45000000000": "2800.0", - "50000000000": "3150.0", - "55000000000": "3500.0", - "60000000000": "3900.0", - "65000000000": "4500.0", - "70000000000": "5100.0", - "75000000000": "5700.0", - "80000000000": "6000.0", - "90000000000": "6300.0", - "100000000000": "6500.0" - }, - "hard": { - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "37500000000": "2300.0", - "45000000000": "2800.0", - "50000000000": "3150.0", - "55000000000": "3500.0", - "60000000000": "3900.0", - "65000000000": "4500.0", - "70000000000": "5100.0", - "75000000000": "5700.0", - "80000000000": "6000.0", - "90000000000": "6300.0", - "100000000000": "6500.0" - }, - "legendary": { - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "37500000000": "2300.0", - "45000000000": "2800.0", - "50000000000": "3150.0", - "55000000000": "3500.0", - "60000000000": "3900.0", - "65000000000": "4500.0", - "70000000000": "5100.0", - "75000000000": "5700.0", - "80000000000": "6000.0", - "90000000000": "6300.0", - "100000000000": "6500.0" - }, - "nightmare": { - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "37500000000": "2300.0", - "45000000000": "2800.0", - "50000000000": "3150.0", - "55000000000": "3500.0", - "60000000000": "3900.0", - "65000000000": "4500.0", - "70000000000": "5100.0", - "75000000000": "5700.0", - "80000000000": "6000.0", - "90000000000": "6300.0", - "100000000000": "6500.0" - } -} \ No newline at end of file diff --git a/tiers/Elite Reaper [E. Reaper].json b/tiers/Elite Reaper [E. Reaper].json deleted file mode 100644 index c79de66..0000000 --- a/tiers/Elite Reaper [E. Reaper].json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "nightmare": { - "30000000000": 1800, - "35000000000": 2100, - "40000000000": 2500, - "45000000000": 2850, - "50000000000": 3200, - "55000000000": 3500, - "60000000000": 4000, - "65000000000": 4500, - "70000000000": 4900, - "75000000000": 5300, - "80000000000": 5700, - "90000000000": 6500, - "100000000000": 7250, - "120000000000": 8800, - "150000000000": 8900, - "180000000000": 9000 - } -} diff --git a/tiers/Elite Riders [E. Riders].json b/tiers/Elite Riders [E. Riders].json deleted file mode 100644 index a8aad80..0000000 --- a/tiers/Elite Riders [E. Riders].json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "normal": { - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2400.0", - "45000000000": "2800.0", - "50000000000": "3150.0", - "55000000000": "3500.0", - "60000000000": "3900.0", - "65000000000": "4500.0", - "70000000000": "5100.0", - "75000000000": "5700.0", - "80000000000": "6300.0", - "90000000000": "6700.0", - "100000000000": "7200.0", - "125000000000": "7650.0", - "150000000000": "8000.0" - }, - "hard": { - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2400.0", - "45000000000": "2800.0", - "50000000000": "3150.0", - "55000000000": "3500.0", - "60000000000": "3900.0", - "65000000000": "4500.0", - "70000000000": "5100.0", - "75000000000": "5700.0", - "80000000000": "6300.0", - "90000000000": "6700.0", - "100000000000": "7200.0", - "125000000000": "7650.0", - "150000000000": "8000.0" - }, - "legendary": { - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2400.0", - "45000000000": "2800.0", - "50000000000": "3150.0", - "55000000000": "3500.0", - "60000000000": "3900.0", - "65000000000": "4500.0", - "70000000000": "5100.0", - "75000000000": "5700.0", - "80000000000": "6300.0", - "90000000000": "6700.0", - "100000000000": "7200.0", - "125000000000": "7650.0", - "150000000000": "8000.0" - }, - "nightmare": { - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2400.0", - "45000000000": "2800.0", - "50000000000": "3150.0", - "55000000000": "3500.0", - "60000000000": "3900.0", - "65000000000": "4500.0", - "70000000000": "5100.0", - "75000000000": "5700.0", - "80000000000": "6300.0", - "90000000000": "6700.0", - "100000000000": "7200.0", - "125000000000": "7650.0", - "150000000000": "8000.0" - } -} \ No newline at end of file diff --git a/tiers/Elite Slitherer [E. Slitherer].json b/tiers/Elite Slitherer [E. Slitherer].json deleted file mode 100644 index 4b42e58..0000000 --- a/tiers/Elite Slitherer [E. Slitherer].json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "nightmare": { - "25000000000": 700, - "30000000000": 1800, - "40000000000": 2500, - "50000000000": 3150, - "60000000000": 3900, - "70000000000": 4600, - "80000000000": 5500, - "90000000000": 6000, - "100000000000": 6400, - "125000000000": 7500, - "150000000000": 8000 - } -} diff --git a/tiers/Elite Undead Warrior [E. Warrior].json b/tiers/Elite Undead Warrior [E. Warrior].json deleted file mode 100644 index 928ed8a..0000000 --- a/tiers/Elite Undead Warrior [E. Warrior].json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "nightmare": { - "10000000000": 300, - "20000000000": 700, - "30000000000": 1800, - "40000000000": 2500, - "50000000000": 3150, - "60000000000": 3900, - "70000000000": 4600, - "80000000000": 5500, - "90000000000": 6000, - "100000000000": 6400 - } -} diff --git a/tiers/Elite Whispers [E. Whispers].json b/tiers/Elite Whispers [E. Whispers].json deleted file mode 100644 index 4c4e7eb..0000000 --- a/tiers/Elite Whispers [E. Whispers].json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "normal": { - "10000000000": "300.0", - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2350.0", - "45000000000": "2650.0", - "50000000000": "3000.0", - "55000000000": "3400.0", - "60000000000": "3900.0", - "70000000000": "4800.0", - "80000000000": "5400.0", - "90000000000": "6000.0", - "100000000000": "6300.0", - "125000000000": "6600.0" - }, - "hard": { - "10000000000": "300.0", - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2350.0", - "45000000000": "2650.0", - "50000000000": "3000.0", - "55000000000": "3400.0", - "60000000000": "3900.0", - "70000000000": "4800.0", - "80000000000": "5400.0", - "90000000000": "6000.0", - "100000000000": "6300.0", - "125000000000": "6600.0" - }, - "legendary": { - "10000000000": "300.0", - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2350.0", - "45000000000": "2650.0", - "50000000000": "3000.0", - "55000000000": "3400.0", - "60000000000": "3900.0", - "70000000000": "4800.0", - "80000000000": "5400.0", - "90000000000": "6000.0", - "100000000000": "6300.0", - "125000000000": "6600.0" - }, - "nightmare": { - "10000000000": "300.0", - "15000000000": "500.0", - "20000000000": "750.0", - "25000000000": "1250.0", - "30000000000": "1750.0", - "35000000000": "2050.0", - "40000000000": "2350.0", - "45000000000": "2650.0", - "50000000000": "3000.0", - "55000000000": "3400.0", - "60000000000": "3900.0", - "70000000000": "4800.0", - "80000000000": "5400.0", - "90000000000": "6000.0", - "100000000000": "6300.0", - "125000000000": "6600.0" - } -} \ No newline at end of file diff --git a/tiers/Engine of the Ancients [Engine of the Ancients].json b/tiers/Engine of the Ancients [Engine of the Ancients].json deleted file mode 100644 index 5dd3530..0000000 --- a/tiers/Engine of the Ancients [Engine of the Ancients].json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "nightmare": { - "100000000": { - "epic": 25, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1000000000": { - "epic": 91, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000": { - "epic": 450, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000": { - "epic": 550, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000": { - "epic": 661, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000": { - "epic": 762, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "25000000000": { - "epic": 838, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "30000000000": { - "epic": 939, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Engines of War [Engines of War].json b/tiers/Engines of War [Engines of War].json deleted file mode 100644 index 820d8aa..0000000 --- a/tiers/Engines of War [Engines of War].json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "normal": { - "100000000": "1.0", - "200000000": "2.0", - "300000000": "3.0", - "500000000": "5.0", - "1000000000": "10.0", - "1500000000": "15.0", - "2000000000": "22.0", - "2500000000": "28.0", - "3000000000": "37.0", - "4000000000": "42.0", - "5000000000": "47.0", - "6000000000": "52.0", - "7000000000": "57.0", - "8000000000": "63.0", - "9000000000": "68.0", - "10000000000": "73.0", - "12500000000": "78.0", - "15000000000": "83.0", - "17500000000": "88.0", - "20000000000": "95.0", - "25000000000": "101.0", - "30000000000": "108.0", - "35000000000": "115.0", - "40000000000": "121.0" - }, - "hard": { - "100000000": "1.0", - "200000000": "2.0", - "300000000": "3.0", - "500000000": "5.0", - "1000000000": "10.0", - "1500000000": "15.0", - "2000000000": "22.0", - "2500000000": "28.0", - "3000000000": "37.0", - "4000000000": "42.0", - "5000000000": "47.0", - "6000000000": "52.0", - "7000000000": "57.0", - "8000000000": "63.0", - "9000000000": "68.0", - "10000000000": "73.0", - "12500000000": "78.0", - "15000000000": "83.0", - "17500000000": "88.0", - "20000000000": "95.0", - "25000000000": "101.0", - "30000000000": "108.0", - "35000000000": "115.0", - "40000000000": "121.0" - }, - "legendary": { - "100000000": "1.0", - "200000000": "2.0", - "300000000": "3.0", - "500000000": "5.0", - "1000000000": "10.0", - "1500000000": "15.0", - "2000000000": "22.0", - "2500000000": "28.0", - "3000000000": "37.0", - "4000000000": "42.0", - "5000000000": "47.0", - "6000000000": "52.0", - "7000000000": "57.0", - "8000000000": "63.0", - "9000000000": "68.0", - "10000000000": "73.0", - "12500000000": "78.0", - "15000000000": "83.0", - "17500000000": "88.0", - "20000000000": "95.0", - "25000000000": "101.0", - "30000000000": "108.0", - "35000000000": "115.0", - "40000000000": "121.0" - }, - "nightmare": { - "100000000": "1.0", - "200000000": "2.0", - "300000000": "3.0", - "500000000": "5.0", - "1000000000": "10.0", - "1500000000": "15.0", - "2000000000": "22.0", - "2500000000": "28.0", - "3000000000": "37.0", - "4000000000": "42.0", - "5000000000": "47.0", - "6000000000": "52.0", - "7000000000": "57.0", - "8000000000": "63.0", - "9000000000": "68.0", - "10000000000": "73.0", - "12500000000": "78.0", - "15000000000": "83.0", - "17500000000": "88.0", - "20000000000": "95.0", - "25000000000": "101.0", - "30000000000": "108.0", - "35000000000": "115.0", - "40000000000": "121.0" - } -} \ No newline at end of file diff --git a/tiers/Erakka-Sak [Erakka-Sak].json b/tiers/Erakka-Sak [Erakka-Sak].json deleted file mode 100644 index 61a6364..0000000 --- a/tiers/Erakka-Sak [Erakka-Sak].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "155000": 1, - "868000": 1, - "1178000": 1, - "2542000": 2, - "3875000": 2.5, - "8370000": 3, - "10540000": 3.5 - }, - "hard": { - "194000": 1, - "1085000": 1, - "1473000": 1, - "3178000": 2, - "4844000": 2.5, - "10463000": 3, - "13175000": 3.5 - }, - "legendary": { - "248000": 1, - "1389000": 1, - "1885000": 1, - "4067000": 2, - "6200000": 2.5, - "13392000": 3, - "16864000": 3.5 - }, - "nightmare": { - "310000": 1, - "1736000": 1, - "2356000": 1, - "5084000": 2, - "7750000": 2.5, - "16740000": 3, - "21080000": 3.5 - } -} diff --git a/tiers/Erebus [Erebus].json b/tiers/Erebus [Erebus].json deleted file mode 100644 index 7c9ae80..0000000 --- a/tiers/Erebus [Erebus].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "23000": 1, - "135000": 1, - "195000": 1, - "375000": 2, - "1065000": 2.5, - "2715000": 3, - "6150000": 3.5 - }, - "hard": { - "28000": 1, - "169000": 1, - "244000": 1, - "469000": 2, - "1331000": 2.5, - "3394000": 3, - "7688000": 3.5 - }, - "legendary": { - "36000": 1, - "216000": 1, - "312000": 1, - "600000": 2, - "1704000": 2.5, - "4344000": 3, - "9840000": 3.5 - }, - "nightmare": { - "45000": 1, - "270000": 1, - "390000": 1, - "750000": 2, - "2130000": 2.5, - "5430000": 3, - "12300000": 3.5 - } -} diff --git a/tiers/Euphronios [Euphronios].json b/tiers/Euphronios [Euphronios].json deleted file mode 100644 index f436241..0000000 --- a/tiers/Euphronios [Euphronios].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "68000": 1, - "405000": 1, - "585000": 1, - "1125000": 2, - "3195000": 2.5, - "8145000": 3, - "18450000": 3.5 - }, - "hard": { - "84000": 1, - "506000": 1, - "731000": 1, - "1406000": 2, - "3994000": 2.5, - "10181000": 3, - "23063000": 3.5 - }, - "legendary": { - "108000": 1, - "648000": 1, - "936000": 1, - "1800000": 2, - "5112000": 2.5, - "13032000": 3, - "29520000": 3.5 - }, - "nightmare": { - "135000": 1, - "810000": 1, - "1170000": 1, - "2250000": 2, - "6390000": 2.5, - "16290000": 3, - "36900000": 3.5 - } -} diff --git a/tiers/Euryino, The Fifth Terror [Euryino].json b/tiers/Euryino, The Fifth Terror [Euryino].json deleted file mode 100644 index e2002c4..0000000 --- a/tiers/Euryino, The Fifth Terror [Euryino].json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "normal": { - "300000000": "1.0", - "500000000": "6.0", - "1000000000": "13.0", - "1500000000": "22.0", - "2000000000": "32.0", - "2500000000": "40.0", - "3000000000": "48.0", - "4000000000": "55.0", - "5000000000": "65.0", - "6000000000": "70.0", - "7000000000": "74.0", - "8000000000": "78.0", - "9000000000": "86.0", - "10000000000": "94.0", - "12500000000": "98.0", - "15000000000": "105.0", - "17500000000": "110.0", - "20000000000": "119.0", - "25000000000": "126.0", - "30000000000": "134.0", - "40000000000": "149.0", - "50000000000": "201.0", - "60000000000": "240.0", - "70000000000": "278.0", - "80000000000": "318.0", - "90000000000": "359.0", - "100000000000": "408.0", - "150000000000": "521.0" - }, - "hard": { - "300000000": "1.0", - "500000000": "6.0", - "1000000000": "13.0", - "1500000000": "22.0", - "2000000000": "32.0", - "2500000000": "40.0", - "3000000000": "48.0", - "4000000000": "55.0", - "5000000000": "65.0", - "6000000000": "70.0", - "7000000000": "74.0", - "8000000000": "78.0", - "9000000000": "86.0", - "10000000000": "94.0", - "12500000000": "98.0", - "15000000000": "105.0", - "17500000000": "110.0", - "20000000000": "119.0", - "25000000000": "126.0", - "30000000000": "134.0", - "40000000000": "149.0", - "50000000000": "201.0", - "60000000000": "240.0", - "70000000000": "278.0", - "80000000000": "318.0", - "90000000000": "359.0", - "100000000000": "408.0", - "150000000000": "521.0" - }, - "legendary": { - "300000000": "1.0", - "500000000": "6.0", - "1000000000": "13.0", - "1500000000": "22.0", - "2000000000": "32.0", - "2500000000": "40.0", - "3000000000": "48.0", - "4000000000": "55.0", - "5000000000": "65.0", - "6000000000": "70.0", - "7000000000": "74.0", - "8000000000": "78.0", - "9000000000": "86.0", - "10000000000": "94.0", - "12500000000": "98.0", - "15000000000": "105.0", - "17500000000": "110.0", - "20000000000": "119.0", - "25000000000": "126.0", - "30000000000": "134.0", - "40000000000": "149.0", - "50000000000": "201.0", - "60000000000": "240.0", - "70000000000": "278.0", - "80000000000": "318.0", - "90000000000": "359.0", - "100000000000": "408.0", - "150000000000": "521.0" - }, - "nightmare": { - "300000000": "1.0", - "500000000": "6.0", - "1000000000": "13.0", - "1500000000": "22.0", - "2000000000": "32.0", - "2500000000": "40.0", - "3000000000": "48.0", - "4000000000": "55.0", - "5000000000": "65.0", - "6000000000": "70.0", - "7000000000": "74.0", - "8000000000": "78.0", - "9000000000": "86.0", - "10000000000": "94.0", - "12500000000": "98.0", - "15000000000": "105.0", - "17500000000": "110.0", - "20000000000": "119.0", - "25000000000": "126.0", - "30000000000": "134.0", - "40000000000": "149.0", - "50000000000": "201.0", - "60000000000": "240.0", - "70000000000": "278.0", - "80000000000": "318.0", - "90000000000": "359.0", - "100000000000": "408.0", - "150000000000": "521.0" - } -} \ No newline at end of file diff --git a/tiers/Faetouched Dragon [Fae Dragon].json b/tiers/Faetouched Dragon [Fae Dragon].json deleted file mode 100644 index 932c4fe..0000000 --- a/tiers/Faetouched Dragon [Fae Dragon].json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "normal": { - "200000000": 8, - "300000000": 12, - "500000000": 16, - "750000000": 21, - "1000000000": 25, - "1500000000": 34, - "2000000000": 42, - "2500000000": 49, - "3000000000": 56, - "4000000000": 65, - "5000000000": 74, - "7500000000": 86, - "10000000000": 97, - "15000000000": 116, - "20000000000": 134 - }, - "hard": { - "200000000": 8, - "300000000": 12, - "500000000": 16, - "750000000": 21, - "1000000000": 25, - "1500000000": 34, - "2000000000": 42, - "2500000000": 49, - "3000000000": 56, - "4000000000": 65, - "5000000000": 74, - "7500000000": 86, - "10000000000": 97, - "15000000000": 116, - "20000000000": 134 - }, - "legendary": { - "200000000": 8, - "300000000": 12, - "500000000": 16, - "750000000": 21, - "1000000000": 25, - "1500000000": 34, - "2000000000": 42, - "2500000000": 49, - "3000000000": 56, - "4000000000": 65, - "5000000000": 74, - "7500000000": 86, - "10000000000": 97, - "15000000000": 116, - "20000000000": 134 - }, - "nightmare": { - "200000000": 8, - "300000000": 12, - "500000000": 16, - "750000000": 21, - "1000000000": 25, - "1500000000": 34, - "2000000000": 42, - "2500000000": 49, - "3000000000": 56, - "4000000000": 65, - "5000000000": 74, - "7500000000": 86, - "10000000000": 97, - "15000000000": 116, - "20000000000": 134 - } -} diff --git a/tiers/Felendis and Shaoquin [Banhammer Bros].json b/tiers/Felendis and Shaoquin [Banhammer Bros].json deleted file mode 100644 index 30807c3..0000000 --- a/tiers/Felendis and Shaoquin [Banhammer Bros].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "884000": 1, - "3976000": 1, - "6627000": 1, - "9720000": 2, - "14138000": 2.5, - "28179000": 3, - "39764000": 3.5 - }, - "hard": { - "1098000": 1, - "4943000": 1, - "8239000": 1, - "12083000": 2, - "17576000": 2.5, - "35700000": 3, - "49431000": 3.5 - }, - "legendary": { - "1416000": 1, - "6371000": 1, - "10618000": 1, - "15573000": 2, - "22651000": 2.5, - "46010000": 3, - "63706000": 3.5 - }, - "nightmare": { - "1776000": 1, - "7992000": 1, - "13320000": 1, - "19536000": 2, - "28416000": 2.5, - "57720000": 3, - "79921000": 3.5 - } -} diff --git a/tiers/Fog Of Wars [Cannibals].json b/tiers/Fog Of Wars [Cannibals].json deleted file mode 100644 index 64abb85..0000000 --- a/tiers/Fog Of Wars [Cannibals].json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "nightmare": { - "250000": 62, - "300000": 86, - "375000": 96, - "480000": 110, - "580000": 132, - "660000": 154, - "900000": 168, - "1500000": 204, - "2000000": 244, - "2800000": 316, - "3500000": 436 - } -} diff --git a/tiers/Fog Of Wars [Gulkinari].json b/tiers/Fog Of Wars [Gulkinari].json deleted file mode 100644 index cf10903..0000000 --- a/tiers/Fog Of Wars [Gulkinari].json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "nightmare": { - "90000000": 24, - "135000000": 50, - "150000000": 66, - "1800000000": 78, - "2250000000": 82, - "3000000000": 106, - "5500000000": 116, - "9000000000": 140, - "15000000000": 204 - } -} diff --git a/tiers/Fog Of Wars [Verkiteia].json b/tiers/Fog Of Wars [Verkiteia].json deleted file mode 100644 index fd5691e..0000000 --- a/tiers/Fog Of Wars [Verkiteia].json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "nightmare": { - "100000": 22, - "175000": 68, - "250000": 84, - "300000": 98, - "375000": 110, - "450000": 122, - "525000": 136, - "600000": 154, - "900000": 168, - "1500000": 216 - } -} diff --git a/tiers/Fog Of Wars [Zugen].json b/tiers/Fog Of Wars [Zugen].json deleted file mode 100644 index fc74ead..0000000 --- a/tiers/Fog Of Wars [Zugen].json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "nightmare": { - "120000000": 48, - "180000000": 52, - "225000000": 56, - "240000000": 60, - "300000000": 72, - "400000000": 80, - "750000000": 98, - "1000000000": 116, - "1500000000": 186 - } -} diff --git a/tiers/Frogmen-Assassins [Frog-Men].json b/tiers/Frogmen-Assassins [Frog-Men].json deleted file mode 100644 index bc527b4..0000000 --- a/tiers/Frogmen-Assassins [Frog-Men].json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "normal": { - "400000000": 60, - "500000000": 66, - "600000000": 72, - "700000000": 78, - "800000000": 84, - "900000000": 90, - "1000000000": 96, - "1250000000": 120, - "1500000000": 144, - "1750000000": 168, - "2000000000": 192, - "2250000000": 216, - "2500000000": 240, - "2750000000": 264, - "3000000000": 288 - }, - "hard": { - "400000000": 60, - "500000000": 66, - "600000000": 72, - "700000000": 78, - "800000000": 84, - "900000000": 90, - "1000000000": 96, - "1250000000": 120, - "1500000000": 144, - "1750000000": 168, - "2000000000": 192, - "2250000000": 216, - "2500000000": 240, - "2750000000": 264, - "3000000000": 288 - }, - "legendary": { - "400000000": 60, - "500000000": 66, - "600000000": 72, - "700000000": 78, - "800000000": 84, - "900000000": 90, - "1000000000": 96, - "1250000000": 120, - "1500000000": 144, - "1750000000": 168, - "2000000000": 192, - "2250000000": 216, - "2500000000": 240, - "2750000000": 264, - "3000000000": 288 - }, - "nightmare": { - "400000000": 60, - "500000000": 66, - "600000000": 72, - "700000000": 78, - "800000000": 84, - "900000000": 90, - "1000000000": 96, - "1250000000": 120, - "1500000000": 144, - "1750000000": 168, - "2000000000": 192, - "2250000000": 216, - "2500000000": 240, - "2750000000": 264, - "3000000000": 288 - } -} diff --git a/tiers/Frost the Snow Dragon [Snow Drag].json b/tiers/Frost the Snow Dragon [Snow Drag].json deleted file mode 100644 index 6e16d68..0000000 --- a/tiers/Frost the Snow Dragon [Snow Drag].json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "normal": { - "250000000": "15.0", - "500000000": "40.0", - "1000000000": "61.0", - "1500000000": "71.0", - "2000000000": "103.0", - "2500000000": "153.0", - "5000000000": "217.0", - "7500000000": "248.0" - }, - "hard": { - "250000000": "15.0", - "500000000": "40.0", - "1000000000": "61.0", - "1500000000": "71.0", - "2000000000": "103.0", - "2500000000": "153.0", - "5000000000": "217.0", - "7500000000": "248.0" - }, - "legendary": { - "250000000": "15.0", - "500000000": "40.0", - "1000000000": "61.0", - "1500000000": "71.0", - "2000000000": "103.0", - "2500000000": "153.0", - "5000000000": "217.0", - "7500000000": "248.0" - }, - "nightmare": { - "250000000": "15.0", - "500000000": "40.0", - "1000000000": "61.0", - "1500000000": "71.0", - "2000000000": "103.0", - "2500000000": "153.0", - "5000000000": "217.0", - "7500000000": "248.0" - } -} \ No newline at end of file diff --git a/tiers/Gataalli Huxac [Gataalli].json b/tiers/Gataalli Huxac [Gataalli].json deleted file mode 100644 index 3b39e24..0000000 --- a/tiers/Gataalli Huxac [Gataalli].json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "normal": { - "1000000000": "27.0", - "1500000000": "48.0", - "2000000000": "66.0", - "2500000000": "81.0", - "3000000000": "94.0", - "4000000000": "103.0", - "5000000000": "122.0", - "6000000000": "132.0", - "7000000000": "144.0", - "8000000000": "158.0", - "9000000000": "176.0", - "10000000000": "194.0", - "12500000000": "204.0", - "15000000000": "209.0", - "17500000000": "219.0", - "20000000000": "225.0", - "25000000000": "242.0", - "30000000000": "284.0", - "40000000000": "301.0" - }, - "hard": { - "1000000000": "27.0", - "1500000000": "48.0", - "2000000000": "66.0", - "2500000000": "81.0", - "3000000000": "94.0", - "4000000000": "103.0", - "5000000000": "122.0", - "6000000000": "132.0", - "7000000000": "144.0", - "8000000000": "158.0", - "9000000000": "176.0", - "10000000000": "194.0", - "12500000000": "204.0", - "15000000000": "209.0", - "17500000000": "219.0", - "20000000000": "225.0", - "25000000000": "242.0", - "30000000000": "284.0", - "40000000000": "301.0" - }, - "legendary": { - "1000000000": "27.0", - "1500000000": "48.0", - "2000000000": "66.0", - "2500000000": "81.0", - "3000000000": "94.0", - "4000000000": "103.0", - "5000000000": "122.0", - "6000000000": "132.0", - "7000000000": "144.0", - "8000000000": "158.0", - "9000000000": "176.0", - "10000000000": "194.0", - "12500000000": "204.0", - "15000000000": "209.0", - "17500000000": "219.0", - "20000000000": "225.0", - "25000000000": "242.0", - "30000000000": "284.0", - "40000000000": "301.0" - }, - "nightmare": { - "1000000000": "27.0", - "1500000000": "48.0", - "2000000000": "66.0", - "2500000000": "81.0", - "3000000000": "94.0", - "4000000000": "103.0", - "5000000000": "122.0", - "6000000000": "132.0", - "7000000000": "144.0", - "8000000000": "158.0", - "9000000000": "176.0", - "10000000000": "194.0", - "12500000000": "204.0", - "15000000000": "209.0", - "17500000000": "219.0", - "20000000000": "225.0", - "25000000000": "242.0", - "30000000000": "284.0", - "40000000000": "301.0" - } -} \ No newline at end of file diff --git a/tiers/General Grune [Grune].json b/tiers/General Grune [Grune].json deleted file mode 100644 index 9a065ec..0000000 --- a/tiers/General Grune [Grune].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "40000": 1, - "180000": 1, - "300000": 1, - "440000": 2, - "640000": 2.5, - "1300000": 3, - "1800000": 3.5 - }, - "hard": { - "50000": 1, - "225000": 1, - "375000": 1, - "550000": 2, - "800000": 2.5, - "1625000": 3, - "2250000": 3.5 - }, - "legendary": { - "64000": 1, - "288000": 1, - "480000": 1, - "704000": 2, - "1024000": 2.5, - "2080000": 3, - "2880000": 3.5 - }, - "nightmare": { - "80000": 1, - "360000": 1, - "600000": 1, - "880000": 2, - "1280000": 2.5, - "2600000": 3, - "3600000": 3.5 - } -} diff --git a/tiers/General Korxun [Korxun].json b/tiers/General Korxun [Korxun].json deleted file mode 100644 index 1c11550..0000000 --- a/tiers/General Korxun [Korxun].json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "normal": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "36.0", - "5000000000": "48.0" - }, - "hard": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "36.0", - "5000000000": "48.0" - }, - "legendary": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "36.0", - "5000000000": "48.0" - }, - "nightmare": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "36.0", - "5000000000": "48.0" - } -} \ No newline at end of file diff --git a/tiers/Ghostly Alchemist [Alchemist].json b/tiers/Ghostly Alchemist [Alchemist].json deleted file mode 100644 index 123fa55..0000000 --- a/tiers/Ghostly Alchemist [Alchemist].json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "normal": { - "100000000": "4.0", - "150000000": "6.0", - "200000000": "8.0", - "250000000": "9.0", - "300000000": "11.0", - "400000000": "13.0", - "500000000": "15.0", - "650000000": "17.0", - "800000000": "19.0", - "1000000000": "20.0", - "1250000000": "25.0", - "1500000000": "32.0" - }, - "hard": { - "100000000": "4.0", - "150000000": "6.0", - "200000000": "8.0", - "250000000": "9.0", - "300000000": "11.0", - "400000000": "13.0", - "500000000": "15.0", - "650000000": "17.0", - "800000000": "19.0", - "1000000000": "20.0", - "1250000000": "25.0", - "1500000000": "32.0" - }, - "legendary": { - "100000000": "4.0", - "150000000": "6.0", - "200000000": "8.0", - "250000000": "9.0", - "300000000": "11.0", - "400000000": "13.0", - "500000000": "15.0", - "650000000": "17.0", - "800000000": "19.0", - "1000000000": "20.0", - "1250000000": "25.0", - "1500000000": "32.0" - }, - "nightmare": { - "100000000": "4.0", - "150000000": "6.0", - "200000000": "8.0", - "250000000": "9.0", - "300000000": "11.0", - "400000000": "13.0", - "500000000": "15.0", - "650000000": "17.0", - "800000000": "19.0", - "1000000000": "20.0", - "1250000000": "25.0", - "1500000000": "32.0" - } -} \ No newline at end of file diff --git a/tiers/Giant Dreadbloom [Dreadbloom].json b/tiers/Giant Dreadbloom [Dreadbloom].json deleted file mode 100644 index 9cdf727..0000000 --- a/tiers/Giant Dreadbloom [Dreadbloom].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "135000": 1, - "810000": 1, - "1170000": 1, - "2250000": 2, - "6390000": 2.5, - "16290000": 3, - "36900000": 3.5 - }, - "hard": { - "169000": 1, - "1013000": 1, - "1463000": 1, - "2813000": 2, - "7988000": 2.5, - "20363000": 3, - "46125000": 3.5 - }, - "legendary": { - "216000": 1, - "1296000": 1, - "1872000": 1, - "3600000": 2, - "10224000": 2.5, - "26064000": 3, - "59040000": 3.5 - }, - "nightmare": { - "270000": 1, - "1620000": 1, - "2340000": 1, - "4500000": 2, - "12780000": 2.5, - "32580000": 3, - "73800000": 3.5 - } -} diff --git a/tiers/Gigantomachy [Gigantomachy].json b/tiers/Gigantomachy [Gigantomachy].json deleted file mode 100644 index 4b66929..0000000 --- a/tiers/Gigantomachy [Gigantomachy].json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "normal": { - "200000000": "36.0", - "300000000": "48.0", - "400000000": "63.0", - "500000000": "76.0", - "750000000": "94.0", - "1000000000": "111.0", - "1500000000": "146.0", - "2000000000": "199.0", - "2500000000": "256.0", - "5000000000": "400.0", - "8000000000": "490.0" - }, - "hard": { - "200000000": "36.0", - "300000000": "48.0", - "400000000": "63.0", - "500000000": "76.0", - "750000000": "94.0", - "1000000000": "111.0", - "1500000000": "146.0", - "2000000000": "199.0", - "2500000000": "256.0", - "5000000000": "400.0", - "8000000000": "490.0" - }, - "legendary": { - "200000000": "36.0", - "300000000": "48.0", - "400000000": "63.0", - "500000000": "76.0", - "750000000": "94.0", - "1000000000": "111.0", - "1500000000": "146.0", - "2000000000": "199.0", - "2500000000": "256.0", - "5000000000": "400.0", - "8000000000": "490.0" - }, - "nightmare": { - "200000000": "36.0", - "300000000": "48.0", - "400000000": "63.0", - "500000000": "76.0", - "750000000": "94.0", - "1000000000": "111.0", - "1500000000": "146.0", - "2000000000": "199.0", - "2500000000": "256.0", - "5000000000": "400.0", - "8000000000": "490.0" - } -} \ No newline at end of file diff --git a/tiers/Gladiators [Gladiators].json b/tiers/Gladiators [Gladiators].json deleted file mode 100644 index 344e0f9..0000000 --- a/tiers/Gladiators [Gladiators].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "630000": 1, - "720000": 1, - "1080000": 1, - "1440000": 2, - "1920000": 2.5, - "3000000": 3, - "4200000": 3.5 - }, - "hard": { - "788000": 1, - "900000": 1, - "1350000": 1, - "1800000": 2, - "2400000": 2.5, - "3750000": 3, - "5250000": 3.5 - }, - "legendary": { - "1008000": 1, - "1152000": 1, - "1728000": 1, - "2304000": 2, - "3072000": 2.5, - "4800000": 3, - "6720000": 3.5 - }, - "nightmare": { - "1260000": 1, - "1440000": 1, - "2160000": 1, - "2880000": 2, - "3840000": 2.5, - "6000000": 3, - "8400000": 3.5 - } -} diff --git a/tiers/Gravlok [Gravlok].json b/tiers/Gravlok [Gravlok].json deleted file mode 100644 index 0c04066..0000000 --- a/tiers/Gravlok [Gravlok].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "100000": 1, - "450000": 1, - "750000": 1, - "1100000": 2, - "1600000": 2.5, - "3250000": 3, - "4500000": 3.5 - }, - "hard": { - "125000": 1, - "563000": 1, - "938000": 1, - "1375000": 2, - "2000000": 2.5, - "4063000": 3, - "5625000": 3.5 - }, - "legendary": { - "160000": 1, - "720000": 1, - "1200000": 1, - "1760000": 2, - "2560000": 2.5, - "5200000": 3, - "7200000": 3.5 - }, - "nightmare": { - "200000": 1, - "900000": 1, - "1500000": 1, - "2200000": 2, - "3200000": 2.5, - "6500000": 3, - "9000000": 3.5 - } -} diff --git a/tiers/Green Killers [Green Killers].json b/tiers/Green Killers [Green Killers].json deleted file mode 100644 index bc963f9..0000000 --- a/tiers/Green Killers [Green Killers].json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "normal": { - "150000000": "5.0", - "250000000": "6.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "12.0", - "750000000": "14.0", - "1000000000": "17.0", - "1500000000": "23.0", - "2000000000": "30.0", - "2500000000": "35.0", - "3500000000": "49.0", - "5000000000": "67.0" - }, - "hard": { - "150000000": "5.0", - "250000000": "6.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "12.0", - "750000000": "14.0", - "1000000000": "17.0", - "1500000000": "23.0", - "2000000000": "30.0", - "2500000000": "35.0", - "3500000000": "49.0", - "5000000000": "67.0" - }, - "legendary": { - "150000000": "5.0", - "250000000": "6.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "12.0", - "750000000": "14.0", - "1000000000": "17.0", - "1500000000": "23.0", - "2000000000": "30.0", - "2500000000": "35.0", - "3500000000": "49.0", - "5000000000": "67.0" - }, - "nightmare": { - "150000000": "5.0", - "250000000": "6.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "12.0", - "750000000": "14.0", - "1000000000": "17.0", - "1500000000": "23.0", - "2000000000": "30.0", - "2500000000": "35.0", - "3500000000": "49.0", - "5000000000": "67.0" - } -} \ No newline at end of file diff --git a/tiers/Groblar [Groblar].json b/tiers/Groblar [Groblar].json deleted file mode 100644 index fbb7c20..0000000 --- a/tiers/Groblar [Groblar].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "315000": 1, - "360000": 1, - "540000": 1, - "720000": 2, - "960000": 2.5, - "1500000": 3, - "2100000": 3.5 - }, - "hard": { - "394000": 1, - "450000": 1, - "675000": 1, - "900000": 2, - "1200000": 2.5, - "1875000": 3, - "2625000": 3.5 - }, - "legendary": { - "504000": 1, - "576000": 1, - "864000": 1, - "1152000": 2, - "1536000": 2.5, - "2400000": 3, - "3360000": 3.5 - }, - "nightmare": { - "630000": 1, - "720000": 1, - "1080000": 1, - "1440000": 2, - "1920000": 2.5, - "3000000": 3, - "4200000": 3.5 - } -} diff --git a/tiers/Grotesque Hybrid [Hybrid].json b/tiers/Grotesque Hybrid [Hybrid].json deleted file mode 100644 index 5f4f436..0000000 --- a/tiers/Grotesque Hybrid [Hybrid].json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "normal": { - "200000000": "2.0", - "300000000": "4.0", - "500000000": "24.0", - "1000000000": "54.0", - "1500000000": "90.0", - "2000000000": "129.0", - "2500000000": "161.0", - "3000000000": "195.0", - "4000000000": "223.0", - "5000000000": "261.0", - "6000000000": "278.0", - "7000000000": "295.0", - "8000000000": "311.0", - "9000000000": "342.0", - "10000000000": "373.0", - "12500000000": "389.0", - "15000000000": "414.0", - "17500000000": "435.0", - "20000000000": "470.0", - "25000000000": "499.0", - "30000000000": "531.0", - "40000000000": "592.0", - "50000000000": "818.0", - "60000000000": "985.0", - "70000000000": "1226.0", - "80000000000": "1417.0", - "90000000000": "1634.0", - "100000000000": "1800.0" - }, - "hard": { - "200000000": "2.0", - "300000000": "4.0", - "500000000": "24.0", - "1000000000": "54.0", - "1500000000": "90.0", - "2000000000": "129.0", - "2500000000": "161.0", - "3000000000": "195.0", - "4000000000": "223.0", - "5000000000": "261.0", - "6000000000": "278.0", - "7000000000": "295.0", - "8000000000": "311.0", - "9000000000": "342.0", - "10000000000": "373.0", - "12500000000": "389.0", - "15000000000": "414.0", - "17500000000": "435.0", - "20000000000": "470.0", - "25000000000": "499.0", - "30000000000": "531.0", - "40000000000": "592.0", - "50000000000": "818.0", - "60000000000": "985.0", - "70000000000": "1226.0", - "80000000000": "1417.0", - "90000000000": "1634.0", - "100000000000": "1800.0" - }, - "legendary": { - "200000000": "2.0", - "300000000": "4.0", - "500000000": "24.0", - "1000000000": "54.0", - "1500000000": "90.0", - "2000000000": "129.0", - "2500000000": "161.0", - "3000000000": "195.0", - "4000000000": "223.0", - "5000000000": "261.0", - "6000000000": "278.0", - "7000000000": "295.0", - "8000000000": "311.0", - "9000000000": "342.0", - "10000000000": "373.0", - "12500000000": "389.0", - "15000000000": "414.0", - "17500000000": "435.0", - "20000000000": "470.0", - "25000000000": "499.0", - "30000000000": "531.0", - "40000000000": "592.0", - "50000000000": "818.0", - "60000000000": "985.0", - "70000000000": "1226.0", - "80000000000": "1417.0", - "90000000000": "1634.0", - "100000000000": "1800.0" - }, - "nightmare": { - "200000000": "2.0", - "300000000": "4.0", - "500000000": "24.0", - "1000000000": "54.0", - "1500000000": "90.0", - "2000000000": "129.0", - "2500000000": "161.0", - "3000000000": "195.0", - "4000000000": "223.0", - "5000000000": "261.0", - "6000000000": "278.0", - "7000000000": "295.0", - "8000000000": "311.0", - "9000000000": "342.0", - "10000000000": "373.0", - "12500000000": "389.0", - "15000000000": "414.0", - "17500000000": "435.0", - "20000000000": "470.0", - "25000000000": "499.0", - "30000000000": "531.0", - "40000000000": "592.0", - "50000000000": "818.0", - "60000000000": "985.0", - "70000000000": "1226.0", - "80000000000": "1417.0", - "90000000000": "1634.0", - "100000000000": "1800.0" - } -} \ No newline at end of file diff --git a/tiers/Grundus [Grundus].json b/tiers/Grundus [Grundus].json deleted file mode 100644 index 1ee03ec..0000000 --- a/tiers/Grundus [Grundus].json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "normal": { - "8000000": 34 - }, - "hard": { - "16000000": 34 - }, - "legendary": { - "40000000": 34 - }, - "nightmare": { - "60000000": 34 - } -} diff --git a/tiers/Guilbert the Mad [Guilbert].json b/tiers/Guilbert the Mad [Guilbert].json deleted file mode 100644 index 3bba6ae..0000000 --- a/tiers/Guilbert the Mad [Guilbert].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "83000": 1, - "495000": 1, - "715000": 1, - "1375000": 2, - "3905000": 2.5, - "9955000": 3, - "22550000": 3.5 - }, - "hard": { - "103000": 1, - "619000": 1, - "894000": 1, - "1719000": 2, - "4881000": 2.5, - "12444000": 3, - "28188800": 3.5 - }, - "legendary": { - "132000": 1, - "792000": 1, - "1144000": 1, - "2200000": 2, - "6248000": 2.5, - "15928000": 3, - "36080000": 3.5 - }, - "nightmare": { - "165000": 1, - "990000": 1, - "14300000": 1, - "2750000": 2, - "7810000": 2.5, - "19910000": 3, - "45100000": 3.5 - } -} diff --git a/tiers/Gunnar the Berserk [Gunnar].json b/tiers/Gunnar the Berserk [Gunnar].json deleted file mode 100644 index 344e0f9..0000000 --- a/tiers/Gunnar the Berserk [Gunnar].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "630000": 1, - "720000": 1, - "1080000": 1, - "1440000": 2, - "1920000": 2.5, - "3000000": 3, - "4200000": 3.5 - }, - "hard": { - "788000": 1, - "900000": 1, - "1350000": 1, - "1800000": 2, - "2400000": 2.5, - "3750000": 3, - "5250000": 3.5 - }, - "legendary": { - "1008000": 1, - "1152000": 1, - "1728000": 1, - "2304000": 2, - "3072000": 2.5, - "4800000": 3, - "6720000": 3.5 - }, - "nightmare": { - "1260000": 1, - "1440000": 1, - "2160000": 1, - "2880000": 2, - "3840000": 2.5, - "6000000": 3, - "8400000": 3.5 - } -} diff --git a/tiers/Hammer [Hammer].json b/tiers/Hammer [Hammer].json deleted file mode 100644 index a74c236..0000000 --- a/tiers/Hammer [Hammer].json +++ /dev/null @@ -1,206 +0,0 @@ -{ - "normal": { - "550000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3080000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4180000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "9020000": { - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "13750000": { - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "29700000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "37400000": { - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - }, - "hard": { - "688000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3850000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5225000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "11275000": { - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "17188000": { - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "37125000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "46750000": { - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - }, - "legendary": { - "880000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4928000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "6688000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "14432000": { - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "22000000": { - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "47520000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "59480000": { - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - }, - "nightmare": { - "1100000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "6160000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "8360000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "18040000": { - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "27500000": { - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "59400000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "74800000": { - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Hargamesh [Hargamesh].json b/tiers/Hargamesh [Hargamesh].json deleted file mode 100644 index af9265b..0000000 --- a/tiers/Hargamesh [Hargamesh].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "945000": 1, - "1080000": 1, - "1620000": 1, - "2160000": 2, - "2880000": 2.5, - "4500000": 3, - "6300000": 3.5 - }, - "hard": { - "1181000": 1, - "1350000": 1, - "2025000": 1, - "2700000": 2, - "3600000": 2.5, - "5625000": 3, - "7875000": 3.5 - }, - "legendary": { - "1512000": 1, - "1728000": 1, - "2592000": 1, - "3456000": 2, - "4608000": 2.5, - "7200000": 3, - "1008000": 3.5 - }, - "nightmare": { - "1890000": 1, - "2160000": 1, - "3240000": 1, - "4320000": 2, - "5760000": 2.5, - "9000000": 3, - "12600000": 3.5 - } -} diff --git a/tiers/Headmaster Grimsly [Grimsly].json b/tiers/Headmaster Grimsly [Grimsly].json deleted file mode 100644 index 6695b5e..0000000 --- a/tiers/Headmaster Grimsly [Grimsly].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "180000": 1, - "1008000": 1, - "1368000": 1, - "2952000": 2, - "4500000": 2.5, - "9720000": 3, - "12240000": 3.5 - }, - "hard": { - "225000": 1, - "1260000": 1, - "1710000": 1, - "3690000": 2, - "5625000": 2.5, - "12150000": 3, - "15300000": 3.5 - }, - "legendary": { - "288000": 1, - "1613000": 1, - "2189000": 1, - "4723000": 2, - "7200000": 2.5, - "15552000": 3, - "19584000": 3.5 - }, - "nightmare": { - "360000": 1, - "2016000": 1, - "2736000": 1, - "5904000": 2, - "9000000": 2.5, - "19440000": 3, - "24480000": 3.5 - } -} diff --git a/tiers/Hellemental [Hellemental].json b/tiers/Hellemental [Hellemental].json deleted file mode 100644 index 635d516..0000000 --- a/tiers/Hellemental [Hellemental].json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "normal": { - "200000000": "8.0", - "250000000": "12.0", - "300000000": "16.0", - "500000000": "25.0", - "750000000": "28.0", - "1000000000": "34.0", - "1500000000": "41.0", - "2000000000": "50.0", - "2500000000": "58.0", - "3000000000": "64.0", - "4000000000": "71.0", - "5000000000": "77.0", - "6000000000": "85.0", - "8000000000": "102.0", - "10000000000": "120.0" - }, - "hard": { - "200000000": "8.0", - "250000000": "12.0", - "300000000": "16.0", - "500000000": "25.0", - "750000000": "28.0", - "1000000000": "34.0", - "1500000000": "41.0", - "2000000000": "50.0", - "2500000000": "58.0", - "3000000000": "64.0", - "4000000000": "71.0", - "5000000000": "77.0", - "6000000000": "85.0", - "8000000000": "102.0", - "10000000000": "120.0" - }, - "legendary": { - "200000000": "8.0", - "250000000": "12.0", - "300000000": "16.0", - "500000000": "25.0", - "750000000": "28.0", - "1000000000": "34.0", - "1500000000": "41.0", - "2000000000": "50.0", - "2500000000": "58.0", - "3000000000": "64.0", - "4000000000": "71.0", - "5000000000": "77.0", - "6000000000": "85.0", - "8000000000": "102.0", - "10000000000": "120.0" - }, - "nightmare": { - "200000000": "8.0", - "250000000": "12.0", - "300000000": "16.0", - "500000000": "25.0", - "750000000": "28.0", - "1000000000": "34.0", - "1500000000": "41.0", - "2000000000": "50.0", - "2500000000": "58.0", - "3000000000": "64.0", - "4000000000": "71.0", - "5000000000": "77.0", - "6000000000": "85.0", - "8000000000": "102.0", - "10000000000": "120.0" - } -} \ No newline at end of file diff --git a/tiers/Horthania the Grey [Horthania].json b/tiers/Horthania the Grey [Horthania].json deleted file mode 100644 index 4cda2f6..0000000 --- a/tiers/Horthania the Grey [Horthania].json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "normal": { - "200000000": "0.0", - "300000000": "1.0", - "500000000": "6.0", - "1000000000": "13.0", - "1500000000": "22.0", - "2000000000": "32.0", - "2500000000": "40.0", - "3000000000": "48.0", - "4000000000": "55.0", - "5000000000": "65.0", - "6000000000": "70.0", - "7000000000": "74.0", - "8000000000": "78.0", - "9000000000": "86.0", - "10000000000": "94.0", - "12500000000": "98.0", - "15000000000": "105.0", - "17500000000": "110.0", - "20000000000": "119.0", - "25000000000": "126.0", - "30000000000": "134.0", - "40000000000": "149.0", - "50000000000": "200.0", - "60000000000": "237.0", - "75000000000": "275.0" - }, - "hard": { - "200000000": "0.0", - "300000000": "1.0", - "500000000": "6.0", - "1000000000": "13.0", - "1500000000": "22.0", - "2000000000": "32.0", - "2500000000": "40.0", - "3000000000": "48.0", - "4000000000": "55.0", - "5000000000": "65.0", - "6000000000": "70.0", - "7000000000": "74.0", - "8000000000": "78.0", - "9000000000": "86.0", - "10000000000": "94.0", - "12500000000": "98.0", - "15000000000": "105.0", - "17500000000": "110.0", - "20000000000": "119.0", - "25000000000": "126.0", - "30000000000": "134.0", - "40000000000": "149.0", - "50000000000": "200.0", - "60000000000": "237.0", - "75000000000": "275.0" - }, - "legendary": { - "200000000": "0.0", - "300000000": "1.0", - "500000000": "6.0", - "1000000000": "13.0", - "1500000000": "22.0", - "2000000000": "32.0", - "2500000000": "40.0", - "3000000000": "48.0", - "4000000000": "55.0", - "5000000000": "65.0", - "6000000000": "70.0", - "7000000000": "74.0", - "8000000000": "78.0", - "9000000000": "86.0", - "10000000000": "94.0", - "12500000000": "98.0", - "15000000000": "105.0", - "17500000000": "110.0", - "20000000000": "119.0", - "25000000000": "126.0", - "30000000000": "134.0", - "40000000000": "149.0", - "50000000000": "200.0", - "60000000000": "237.0", - "75000000000": "275.0" - }, - "nightmare": { - "200000000": "0.0", - "300000000": "1.0", - "500000000": "6.0", - "1000000000": "13.0", - "1500000000": "22.0", - "2000000000": "32.0", - "2500000000": "40.0", - "3000000000": "48.0", - "4000000000": "55.0", - "5000000000": "65.0", - "6000000000": "70.0", - "7000000000": "74.0", - "8000000000": "78.0", - "9000000000": "86.0", - "10000000000": "94.0", - "12500000000": "98.0", - "15000000000": "105.0", - "17500000000": "110.0", - "20000000000": "119.0", - "25000000000": "126.0", - "30000000000": "134.0", - "40000000000": "149.0", - "50000000000": "200.0", - "60000000000": "237.0", - "75000000000": "275.0" - } -} \ No newline at end of file diff --git a/tiers/Hullbore Wyrms [Hullbore Wyrms].json b/tiers/Hullbore Wyrms [Hullbore Wyrms].json deleted file mode 100644 index 5b5d8ad..0000000 --- a/tiers/Hullbore Wyrms [Hullbore Wyrms].json +++ /dev/null @@ -1,130 +0,0 @@ -{ - "nightmare": { - "50000000": { - "epic": 10, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "100000000": { - "epic": 25, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "200000000": { - "epic": 34, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "300000000": { - "epic": 45, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "500000000": { - "epic": 60, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "750000000": { - "epic": 85, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1000000000": { - "epic": 111, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1500000000": { - "epic": 162, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2000000000": { - "epic": 215, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2500000000": { - "epic": 266, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3000000000": { - "epic": 332, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4000000000": { - "epic": 383, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000": { - "epic": 435, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "7500000000": { - "epic": 485, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000": { - "epic": 545, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000": { - "epic": 630, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000": { - "epic": 715, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "25000000000": { - "epic": 825, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Hurkus [Hurkus].json b/tiers/Hurkus [Hurkus].json deleted file mode 100644 index 31e6f4d..0000000 --- a/tiers/Hurkus [Hurkus].json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "normal": { - "90000000": 26, - "135000000": 54, - "150000000": 72, - "180000000": 84, - "225000000": 100, - "300000000": 118, - "550000000": 142, - "900000000": 160 - }, - "hard": { - "90000000": 26, - "135000000": 54, - "150000000": 72, - "180000000": 84, - "225000000": 100, - "300000000": 118, - "550000000": 142, - "900000000": 160 - }, - "legendary": { - "90000000": 26, - "135000000": 54, - "150000000": 72, - "180000000": 84, - "225000000": 100, - "300000000": 118, - "550000000": 142, - "900000000": 160 - }, - "nightmare": { - "90000000": 26, - "135000000": 54, - "150000000": 72, - "180000000": 84, - "225000000": 100, - "300000000": 118, - "550000000": 142, - "900000000": 160 - } -} diff --git a/tiers/Hydra [Hydra].json b/tiers/Hydra [Hydra].json deleted file mode 100644 index f492a88..0000000 --- a/tiers/Hydra [Hydra].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "130000": 1, - "585000": 1, - "975000": 1, - "1430000": 2, - "2080000": 2.5, - "4225000": 3, - "5850000": 3.5 - }, - "hard": { - "163000": 1, - "731000": 1, - "1219000": 1, - "1788000": 2, - "2600000": 2.5, - "5281000": 3, - "7313000": 3.5 - }, - "legendary": { - "208000": 1, - "936000": 1, - "1560000": 1, - "2288000": 2, - "3328000": 2.5, - "6760000": 3, - "9360000": 3.5 - }, - "nightmare": { - "260000": 1, - "1170000": 1, - "1950000": 1, - "2860000": 2, - "4160000": 2.5, - "8450000": 3, - "11700000": 3.5 - } -} diff --git a/tiers/Imryx the Incinerator [Imryx].json b/tiers/Imryx the Incinerator [Imryx].json deleted file mode 100644 index 09e4aa0..0000000 --- a/tiers/Imryx the Incinerator [Imryx].json +++ /dev/null @@ -1,126 +0,0 @@ -{ - "normal": { - "100000000": "16.0", - "150000000": "21.0", - "200000000": "26.0", - "250000000": "32.0", - "300000000": "38.0", - "400000000": "44.0", - "500000000": "51.0", - "750000000": "69.0", - "1000000000": "86.0", - "1250000000": "118.0", - "1500000000": "142.0", - "1750000000": "166.0", - "2000000000": "191.0", - "2500000000": "239.0", - "3000000000": "286.0", - "3500000000": "330.0", - "4000000000": "355.0", - "4500000000": "381.0", - "5000000000": "408.0", - "6000000000": "435.0", - "7000000000": "462.0", - "8000000000": "489.0", - "9000000000": "516.0", - "10000000000": "544.0", - "12500000000": "592.0", - "15000000000": "640.0", - "17500000000": "688.0", - "20000000000": "736.0", - "25000000000": "815.0" - }, - "hard": { - "100000000": "16.0", - "150000000": "21.0", - "200000000": "26.0", - "250000000": "32.0", - "300000000": "38.0", - "400000000": "44.0", - "500000000": "51.0", - "750000000": "69.0", - "1000000000": "86.0", - "1250000000": "118.0", - "1500000000": "142.0", - "1750000000": "166.0", - "2000000000": "191.0", - "2500000000": "239.0", - "3000000000": "286.0", - "3500000000": "330.0", - "4000000000": "355.0", - "4500000000": "381.0", - "5000000000": "408.0", - "6000000000": "435.0", - "7000000000": "462.0", - "8000000000": "489.0", - "9000000000": "516.0", - "10000000000": "544.0", - "12500000000": "592.0", - "15000000000": "640.0", - "17500000000": "688.0", - "20000000000": "736.0", - "25000000000": "815.0" - }, - "legendary": { - "100000000": "16.0", - "150000000": "21.0", - "200000000": "26.0", - "250000000": "32.0", - "300000000": "38.0", - "400000000": "44.0", - "500000000": "51.0", - "750000000": "69.0", - "1000000000": "86.0", - "1250000000": "118.0", - "1500000000": "142.0", - "1750000000": "166.0", - "2000000000": "191.0", - "2500000000": "239.0", - "3000000000": "286.0", - "3500000000": "330.0", - "4000000000": "355.0", - "4500000000": "381.0", - "5000000000": "408.0", - "6000000000": "435.0", - "7000000000": "462.0", - "8000000000": "489.0", - "9000000000": "516.0", - "10000000000": "544.0", - "12500000000": "592.0", - "15000000000": "640.0", - "17500000000": "688.0", - "20000000000": "736.0", - "25000000000": "815.0" - }, - "nightmare": { - "100000000": "16.0", - "150000000": "21.0", - "200000000": "26.0", - "250000000": "32.0", - "300000000": "38.0", - "400000000": "44.0", - "500000000": "51.0", - "750000000": "69.0", - "1000000000": "86.0", - "1250000000": "118.0", - "1500000000": "142.0", - "1750000000": "166.0", - "2000000000": "191.0", - "2500000000": "239.0", - "3000000000": "286.0", - "3500000000": "330.0", - "4000000000": "355.0", - "4500000000": "381.0", - "5000000000": "408.0", - "6000000000": "435.0", - "7000000000": "462.0", - "8000000000": "489.0", - "9000000000": "516.0", - "10000000000": "544.0", - "12500000000": "592.0", - "15000000000": "640.0", - "17500000000": "688.0", - "20000000000": "736.0", - "25000000000": "815.0" - } -} \ No newline at end of file diff --git a/tiers/Initiates of the Abyss [Initiates].json b/tiers/Initiates of the Abyss [Initiates].json deleted file mode 100644 index 7007af1..0000000 --- a/tiers/Initiates of the Abyss [Initiates].json +++ /dev/null @@ -1,123 +0,0 @@ -{ - "nightmare": { - "100000000": { - "epic": 6, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "500000000": { - "epic": 49, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1000000000": { - "epic": 231, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1500000000": { - "epic": 411, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2000000000": { - "epic": 472, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2500000000": { - "epic": 532, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3000000000": { - "epic": 618, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4000000000": { - "epic": 779, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000": { - "epic": 905, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "6000000000": { - "epic": 1026, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "8000000000": { - "epic": 1148, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000": { - "epic": 1215, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "12500000000": { - "epic": 1308, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000": { - "epic": 1465, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000": { - "epic": 1625, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "25000000000": { - "epic": 1780, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "30000000000": { - "epic": 1880, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Ironclad [Ironclad].json b/tiers/Ironclad [Ironclad].json deleted file mode 100644 index 6d01c7d..0000000 --- a/tiers/Ironclad [Ironclad].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "525000": 1, - "600000": 1, - "900000": 1, - "1200000": 2, - "1600000": 2.5, - "2500000": 3, - "3500000": 3.5 - }, - "hard": { - "656000": 1, - "750000": 1, - "1125000": 1, - "1500000": 2, - "2000000": 2.5, - "3125000": 3, - "4375000": 3.5 - }, - "legendary": { - "840000": 1, - "960000": 1, - "1440000": 1, - "1920000": 2, - "2560000": 2.5, - "4000000": 3, - "5600000": 3.5 - }, - "nightmare": { - "1050000": 1, - "1200000": 1, - "1800000": 1, - "2400000": 2, - "3200000": 2.5, - "5000000": 3, - "7000000": 3.5 - } -} diff --git a/tiers/Jack [Jack].json b/tiers/Jack [Jack].json deleted file mode 100644 index b29f44a..0000000 --- a/tiers/Jack [Jack].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "4000000": "2.0", - "20000000": "3.0", - "24000000": "4.0", - "48000000": "6.0", - "72000000": "7.0", - "96000000": "8.0", - "120000000": "9.0", - "144000000": "10.0", - "168000000": "11.0", - "192000000": "12.0" - }, - "hard": { - "6000000": "2.0", - "30000000": "3.0", - "36000000": "4.0", - "72000000": "6.0", - "108000000": "7.0", - "144000000": "8.0", - "180000000": "9.0", - "216000000": "10.0", - "252000000": "11.0", - "288000000": "12.0" - }, - "legendary": { - "8000000": "2.0", - "40000000": "3.0", - "48000000": "4.0", - "96000000": "6.0", - "144000000": "7.0", - "192000000": "8.0", - "240000000": "9.0", - "288000000": "10.0", - "336000000": "11.0", - "384000000": "12.0" - }, - "nightmare": { - "12000000": "2.0", - "60000000": "3.0", - "72000000": "4.0", - "144000000": "6.0", - "216000000": "7.0", - "288000000": "8.0", - "360000000": "9.0", - "432000000": "10.0", - "504000000": "11.0", - "576000000": "12.0" - } -} \ No newline at end of file diff --git a/tiers/Jack's Revenge [Jack's Revenge].json b/tiers/Jack's Revenge [Jack's Revenge].json deleted file mode 100644 index 55fdfbb..0000000 --- a/tiers/Jack's Revenge [Jack's Revenge].json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "normal": { - "20000000": "8.0", - "100000000": "12.0", - "120000000": "16.0", - "240000000": "27.0", - "500000000": "36.0", - "1000000000": "72.0" - }, - "hard": { - "30000000": "8.0", - "150000000": "12.0", - "180000000": "16.0", - "360000000": "27.0", - "750000000": "36.0", - "1500000000": "72.0" - }, - "legendary": { - "40000000": "8.0", - "200000000": "12.0", - "240000000": "16.0", - "480000000": "27.0", - "1000000000": "36.0", - "2000000000": "72.0" - }, - "nightmare": { - "60000000": "8.0", - "300000000": "12.0", - "360000000": "16.0", - "720000000": "27.0", - "1500000000": "36.0", - "3000000000": "72.0" - } -} \ No newline at end of file diff --git a/tiers/Jershan'thurn's Portal [Jershan'thurn].json b/tiers/Jershan'thurn's Portal [Jershan'thurn].json deleted file mode 100644 index bb2fd48..0000000 --- a/tiers/Jershan'thurn's Portal [Jershan'thurn].json +++ /dev/null @@ -1,179 +0,0 @@ -{ - "nightmare": { - "100000000": { - "epic": 6, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "200000000": { - "epic": 16, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "400000000": { - "epic": 32, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "500000000": { - "epic": 50, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "800000000": { - "epic": 84, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "900000000": { - "epic": 95, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1000000000": { - "epic": 117, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1250000000": { - "epic": 177, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1500000000": { - "epic": 208, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1750000000": { - "epic": 228, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2000000000": { - "epic": 239, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2500000000": { - "epic": 270, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3000000000": { - "epic": 306, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4000000000": { - "epic": 368, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000": { - "epic": 430, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "6000000000": { - "epic": 492, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "8000000000": { - "epic": 556, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000": { - "epic": 605, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "12500000000": { - "epic": 640, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000": { - "epic": 705, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000": { - "epic": 790, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "25000000000": { - "epic": 860, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "30000000000": { - "epic": 915, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "40000000000": { - "epic": 1040, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "50000000": { - "epic": 1150, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Jormungan the Sea-Storm [Jormungan].json b/tiers/Jormungan the Sea-Storm [Jormungan].json deleted file mode 100644 index 58ce61e..0000000 --- a/tiers/Jormungan the Sea-Storm [Jormungan].json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "normal": { - "200000000": "0.0", - "300000000": "1.0", - "500000000": "6.0", - "1000000000": "13.0", - "1500000000": "22.0", - "2000000000": "32.0", - "2500000000": "40.0", - "3000000000": "48.0", - "4000000000": "55.0", - "5000000000": "65.0", - "6000000000": "70.0", - "7000000000": "74.0", - "8000000000": "78.0", - "9000000000": "86.0", - "10000000000": "94.0", - "12500000000": "98.0", - "15000000000": "105.0", - "17500000000": "110.0", - "20000000000": "119.0", - "25000000000": "126.0", - "30000000000": "134.0", - "40000000000": "149.0", - "50000000000": "200.0", - "60000000000": "238.0", - "70000000000": "276.0", - "80000000000": "315.0", - "90000000000": "353.0", - "100000000000": "400.0" - }, - "hard": { - "200000000": "0.0", - "300000000": "1.0", - "500000000": "6.0", - "1000000000": "13.0", - "1500000000": "22.0", - "2000000000": "32.0", - "2500000000": "40.0", - "3000000000": "48.0", - "4000000000": "55.0", - "5000000000": "65.0", - "6000000000": "70.0", - "7000000000": "74.0", - "8000000000": "78.0", - "9000000000": "86.0", - "10000000000": "94.0", - "12500000000": "98.0", - "15000000000": "105.0", - "17500000000": "110.0", - "20000000000": "119.0", - "25000000000": "126.0", - "30000000000": "134.0", - "40000000000": "149.0", - "50000000000": "200.0", - "60000000000": "238.0", - "70000000000": "276.0", - "80000000000": "315.0", - "90000000000": "353.0", - "100000000000": "400.0" - }, - "legendary": { - "200000000": "0.0", - "300000000": "1.0", - "500000000": "6.0", - "1000000000": "13.0", - "1500000000": "22.0", - "2000000000": "32.0", - "2500000000": "40.0", - "3000000000": "48.0", - "4000000000": "55.0", - "5000000000": "65.0", - "6000000000": "70.0", - "7000000000": "74.0", - "8000000000": "78.0", - "9000000000": "86.0", - "10000000000": "94.0", - "12500000000": "98.0", - "15000000000": "105.0", - "17500000000": "110.0", - "20000000000": "119.0", - "25000000000": "126.0", - "30000000000": "134.0", - "40000000000": "149.0", - "50000000000": "200.0", - "60000000000": "238.0", - "70000000000": "276.0", - "80000000000": "315.0", - "90000000000": "353.0", - "100000000000": "400.0" - }, - "nightmare": { - "200000000": "0.0", - "300000000": "1.0", - "500000000": "6.0", - "1000000000": "13.0", - "1500000000": "22.0", - "2000000000": "32.0", - "2500000000": "40.0", - "3000000000": "48.0", - "4000000000": "55.0", - "5000000000": "65.0", - "6000000000": "70.0", - "7000000000": "74.0", - "8000000000": "78.0", - "9000000000": "86.0", - "10000000000": "94.0", - "12500000000": "98.0", - "15000000000": "105.0", - "17500000000": "110.0", - "20000000000": "119.0", - "25000000000": "126.0", - "30000000000": "134.0", - "40000000000": "149.0", - "50000000000": "200.0", - "60000000000": "238.0", - "70000000000": "276.0", - "80000000000": "315.0", - "90000000000": "353.0", - "100000000000": "400.0" - } -} \ No newline at end of file diff --git a/tiers/Kalaxia the Far-Seer [Kalaxia].json b/tiers/Kalaxia the Far-Seer [Kalaxia].json deleted file mode 100644 index 2fc39ab..0000000 --- a/tiers/Kalaxia the Far-Seer [Kalaxia].json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "normal": { - "320000": 1, - "720000": 1, - "1040000": 2, - "2000000": 2.5, - "4000000": 3, - "14400000": 3.5 - }, - "hard": { - "400000": 1, - "900000": 1, - "1300000": 2, - "2500000": 2.5, - "5000000": 3, - "18000000": 3.5 - }, - "legendary": { - "515000": 1, - "1152000": 1, - "1664000": 2, - "3200000": 2.5, - "6400000": 3, - "23040000": 3.5 - }, - "nightmare": { - "640000": 1, - "1440000": 1, - "2080000": 2, - "4000000": 2.5, - "8000000": 3, - "28800000": 3.5 - } -} diff --git a/tiers/Kanehuar Yachu [Kanehuar Yachu].json b/tiers/Kanehuar Yachu [Kanehuar Yachu].json deleted file mode 100644 index a12b6a0..0000000 --- a/tiers/Kanehuar Yachu [Kanehuar Yachu].json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "normal": { - "200000000": "6.0", - "250000000": "10.0", - "300000000": "14.0", - "500000000": "21.0", - "750000000": "27.0", - "1000000000": "30.0", - "1500000000": "37.0", - "2000000000": "45.0", - "2500000000": "54.0", - "3000000000": "62.0", - "4000000000": "68.0", - "5000000000": "75.0", - "6000000000": "81.0", - "8000000000": "93.0", - "10000000000": "110.0", - "12500000000": "127.0", - "15000000000": "141.0" - }, - "hard": { - "200000000": "6.0", - "250000000": "10.0", - "300000000": "14.0", - "500000000": "21.0", - "750000000": "27.0", - "1000000000": "30.0", - "1500000000": "37.0", - "2000000000": "45.0", - "2500000000": "54.0", - "3000000000": "62.0", - "4000000000": "68.0", - "5000000000": "75.0", - "6000000000": "81.0", - "8000000000": "93.0", - "10000000000": "110.0", - "12500000000": "127.0", - "15000000000": "141.0" - }, - "legendary": { - "200000000": "6.0", - "250000000": "10.0", - "300000000": "14.0", - "500000000": "21.0", - "750000000": "27.0", - "1000000000": "30.0", - "1500000000": "37.0", - "2000000000": "45.0", - "2500000000": "54.0", - "3000000000": "62.0", - "4000000000": "68.0", - "5000000000": "75.0", - "6000000000": "81.0", - "8000000000": "93.0", - "10000000000": "110.0", - "12500000000": "127.0", - "15000000000": "141.0" - }, - "nightmare": { - "200000000": "6.0", - "250000000": "10.0", - "300000000": "14.0", - "500000000": "21.0", - "750000000": "27.0", - "1000000000": "30.0", - "1500000000": "37.0", - "2000000000": "45.0", - "2500000000": "54.0", - "3000000000": "62.0", - "4000000000": "68.0", - "5000000000": "75.0", - "6000000000": "81.0", - "8000000000": "93.0", - "10000000000": "110.0", - "12500000000": "127.0", - "15000000000": "141.0" - } -} diff --git a/tiers/Kang-Gsod [Kang].json b/tiers/Kang-Gsod [Kang].json deleted file mode 100644 index 967b34e..0000000 --- a/tiers/Kang-Gsod [Kang].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "190000": 1, - "855000": 1, - "1425000": 1, - "2090000": 2, - "3040000": 2.5, - "6175000": 3, - "8550000": 3.5 - }, - "hard": { - "238000": 1, - "1069000": 1, - "1781000": 1, - "2613000": 2, - "3800000": 2.5, - "7719000": 3, - "10688000": 3.5 - }, - "legendary": { - "304000": 1, - "1368000": 1, - "2280000": 1, - "3344000": 2, - "4864000": 2.5, - "9880000": 3, - "13680000": 3.5 - }, - "nightmare": { - "380000": 1, - "1710000": 1, - "2850000": 1, - "4180000": 2, - "6080000": 2.5, - "12350000": 3, - "17100000": 3.5 - } -} diff --git a/tiers/Karkata [Karkata].json b/tiers/Karkata [Karkata].json deleted file mode 100644 index 07dda02..0000000 --- a/tiers/Karkata [Karkata].json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "normal": { - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "17.0", - "1250000000": "20.0", - "1500000000": "24.0", - "1750000000": "29.0", - "2000000000": "32.0", - "2250000000": "36.0", - "2500000000": "40.0", - "2750000000": "44.0", - "3000000000": "48.0", - "4000000000": "52.0", - "5000000000": "59.0", - "6000000000": "66.0", - "8000000000": "73.0", - "10000000000": "80.0", - "12500000000": "90.0", - "15000000000": "100.0" - }, - "hard": { - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "17.0", - "1250000000": "20.0", - "1500000000": "24.0", - "1750000000": "29.0", - "2000000000": "32.0", - "2250000000": "36.0", - "2500000000": "40.0", - "2750000000": "44.0", - "3000000000": "48.0", - "4000000000": "52.0", - "5000000000": "59.0", - "6000000000": "66.0", - "8000000000": "73.0", - "10000000000": "80.0", - "12500000000": "90.0", - "15000000000": "100.0" - }, - "legendary": { - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "17.0", - "1250000000": "20.0", - "1500000000": "24.0", - "1750000000": "29.0", - "2000000000": "32.0", - "2250000000": "36.0", - "2500000000": "40.0", - "2750000000": "44.0", - "3000000000": "48.0", - "4000000000": "52.0", - "5000000000": "59.0", - "6000000000": "66.0", - "8000000000": "73.0", - "10000000000": "80.0", - "12500000000": "90.0", - "15000000000": "100.0" - }, - "nightmare": { - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "17.0", - "1250000000": "20.0", - "1500000000": "24.0", - "1750000000": "29.0", - "2000000000": "32.0", - "2250000000": "36.0", - "2500000000": "40.0", - "2750000000": "44.0", - "3000000000": "48.0", - "4000000000": "52.0", - "5000000000": "59.0", - "6000000000": "66.0", - "8000000000": "73.0", - "10000000000": "80.0", - "12500000000": "90.0", - "15000000000": "100.0" - } -} \ No newline at end of file diff --git a/tiers/Kerberos [Kerberos].json b/tiers/Kerberos [Kerberos].json deleted file mode 100644 index 3558fcd..0000000 --- a/tiers/Kerberos [Kerberos].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "88000": 1, - "490000": 1, - "665000": 1, - "1435000": 2, - "2188000": 2.5, - "4750000": 3, - "5950000": 3.5 - }, - "hard": { - "109000": 1, - "613000": 1, - "831000": 1, - "1794000": 2, - "2734000": 2.5, - "5906000": 3, - "7438000": 3.5 - }, - "legendary": { - "140000": 1, - "784000": 1, - "1064000": 1, - "2296000": 2, - "3500000": 2.5, - "7560000": 3, - "9520000": 3.5 - }, - "nightmare": { - "175000": 1, - "980000": 1, - "1330000": 1, - "2870000": 2, - "4375000": 2.5, - "9450000": 3, - "11900000": 3.5 - } -} diff --git a/tiers/Keron the Sky-Shaker [Keron].json b/tiers/Keron the Sky-Shaker [Keron].json deleted file mode 100644 index dce23f9..0000000 --- a/tiers/Keron the Sky-Shaker [Keron].json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "normal": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26, - "1000000000": 30 - }, - "hard": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26, - "1000000000": 30 - }, - "legendary": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26, - "1000000000": 30 - }, - "nightmare": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26, - "1000000000": 30 - } -} diff --git a/tiers/Konungar [Konungar].json b/tiers/Konungar [Konungar].json deleted file mode 100644 index 97e2e8c..0000000 --- a/tiers/Konungar [Konungar].json +++ /dev/null @@ -1,141 +0,0 @@ -{ - "nightmare": - { - "500000000": - { - "epic": 24, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1000000000": - { - "epic": 50, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2000000000": - { - "epic": 140, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3000000000": - { - "epic": 240, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000": - { - "epic": 420, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "8000000000": - { - "epic": 750, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000": - { - "epic": 900, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000": - { - "epic": 1100, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000": - { - "epic": 1300, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "30000000000": - { - "epic": 1539, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "40000000000": - { - "epic": 1740, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "50000000000": - { - "epic": 1920, - "legendary": null, - "uncommon": null, - "common": null, - "stats": 100 - }, - "75000000000": - { - "epic": 2080, - "legendary": null, - "uncommon": null, - "common": null, - "stats": 300 - }, - "100000000000": - { - "epic": 2700, - "legendary": null, - "uncommon": null, - "common": null, - "stats": 700 - }, - "150000000000": - { - "epic": 3100, - "legendary": null, - "uncommon": null, - "common": null, - "stats": 825 - }, - "200000000000": - { - "epic": 3300, - "legendary": null, - "uncommon": null, - "common": null, - "stats": 925 - }, - "300000000000": - { - "epic": 3709, - "legendary": null, - "uncommon": null, - "common": null, - "stats": 1003 - } - } -} diff --git a/tiers/Kr'xunara of the Bloody Waves [Kr'xunara].json b/tiers/Kr'xunara of the Bloody Waves [Kr'xunara].json deleted file mode 100644 index a2f9b72..0000000 --- a/tiers/Kr'xunara of the Bloody Waves [Kr'xunara].json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "normal": { - "300000000": "56.0", - "400000000": "66.0", - "750000000": "94.0", - "1000000000": "118.0", - "1500000000": "192.0", - "2000000000": "226.0", - "2500000000": "254.0", - "3000000000": "270.0", - "4000000000": "290.0", - "5000000000": "360.0", - "6000000000": "368.0", - "8000000000": "400.0" - }, - "hard": { - "300000000": "56.0", - "400000000": "66.0", - "750000000": "94.0", - "1000000000": "118.0", - "1500000000": "192.0", - "2000000000": "226.0", - "2500000000": "254.0", - "3000000000": "270.0", - "4000000000": "290.0", - "5000000000": "360.0", - "6000000000": "368.0", - "8000000000": "400.0" - }, - "legendary": { - "300000000": "56.0", - "400000000": "66.0", - "750000000": "94.0", - "1000000000": "118.0", - "1500000000": "192.0", - "2000000000": "226.0", - "2500000000": "254.0", - "3000000000": "270.0", - "4000000000": "290.0", - "5000000000": "360.0", - "6000000000": "368.0", - "8000000000": "400.0" - }, - "nightmare": { - "300000000": "56.0", - "400000000": "66.0", - "750000000": "94.0", - "1000000000": "118.0", - "1500000000": "192.0", - "2000000000": "226.0", - "2500000000": "254.0", - "3000000000": "270.0", - "4000000000": "290.0", - "5000000000": "360.0", - "6000000000": "368.0", - "8000000000": "400.0" - } -} \ No newline at end of file diff --git a/tiers/Krasgore [Krasgore].json b/tiers/Krasgore [Krasgore].json deleted file mode 100644 index 847c538..0000000 --- a/tiers/Krasgore [Krasgore].json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "normal": { - "5000000": 1, - "7000000": 2, - "9000000": 3, - "10000000": 4, - "15000000": 5, - "20000000": 6, - "25000000": 7, - "30000000": 8, - "35000000": 9, - "40000000": 10, - "45000000": 11 - }, - "hard": { - "6000000": 1, - "9000000": 2, - "11000000": 3, - "13000000": 4, - "19000000": 5, - "25000000": 6, - "31000000": 7, - "38000000": 8, - "44000000": 9, - "50000000": 10, - "56000000": 11 - }, - "legendary": { - "8000000": 1, - "11000000": 2, - "14000000": 3, - "16000000": 4, - "24000000": 5, - "32000000": 6, - "40000000": 7, - "48000000": 8, - "56000000": 9, - "64000000": 10, - "72000000": 11 - }, - "nightmare": { - "10000000": 1, - "14000000": 2, - "18000000": 3, - "20000000": 4, - "30000000": 5, - "40000000": 6, - "50000000": 7, - "60000000": 8, - "70000000": 9, - "80000000": 10, - "90000000": 11 - } -} \ No newline at end of file diff --git a/tiers/Krugnug [Krugnug].json b/tiers/Krugnug [Krugnug].json deleted file mode 100644 index 5553522..0000000 --- a/tiers/Krugnug [Krugnug].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "hard": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "legendary": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "nightmare": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - } -} \ No newline at end of file diff --git a/tiers/Leonine [Leonine].json b/tiers/Leonine [Leonine].json deleted file mode 100644 index 5553522..0000000 --- a/tiers/Leonine [Leonine].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "hard": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "legendary": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "nightmare": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - } -} \ No newline at end of file diff --git a/tiers/Lord Hoton the Usurper [Lord Hoton].json b/tiers/Lord Hoton the Usurper [Lord Hoton].json deleted file mode 100644 index 2ca018f..0000000 --- a/tiers/Lord Hoton the Usurper [Lord Hoton].json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "nightmare": { - "1000000000": { - "epic": 71, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2000000000": { - "epic": 148, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3000000000": { - "epic": 219, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4000000000": { - "epic": 256, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000": { - "epic": 299, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "6000000000": { - "epic": 318, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "7000000000": { - "epic": 337, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "8000000000": { - "epic": 356, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "9000000000": { - "epic": 390, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000": { - "epic": 427, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "12500000000": { - "epic": 446, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000": { - "epic": 474, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "17500000000": { - "epic": 496, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000": { - "epic": 539, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "25000000000": { - "epic": 586, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Lost [Lost].json b/tiers/Lost [Lost].json deleted file mode 100644 index fb64163..0000000 --- a/tiers/Lost [Lost].json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "nightmare": { - "500000000": { - "epic": 25, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1000000000": { - "epic": 71, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2000000000": { - "epic": 142, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3000000000": { - "epic": 223, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4000000000": { - "epic": 309, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000": { - "epic": 391, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "7500000000": { - "epic": 598, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000": { - "epic": 785, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000": { - "epic": 930, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000": { - "epic": 1015, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Lunatics [Lunatics].json b/tiers/Lunatics [Lunatics].json deleted file mode 100644 index 06e7af1..0000000 --- a/tiers/Lunatics [Lunatics].json +++ /dev/null @@ -1,206 +0,0 @@ -{ - "normal": { - "450000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2520000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3420000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "7380000": { - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "11250000": { - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "24300000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "30600000": { - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - }, - "hard": { - "563000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3150000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4275000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "9225000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "14063000": { - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "30375000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "38250000": { - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - }, - "legendary": { - "720000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4032000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5472000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "11808000": { - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "18000000": { - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "38880000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "48960000": { - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - }, - "nightmare": { - "900000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5040000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "6840000": { - "epic": 1, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "14760000": { - "epic": 2, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "22500000": { - "epic": 2.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "48600000": { - "epic": 3, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "61200000": { - "epic": 3.5, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Lurking Horror [Lurking Horror].json b/tiers/Lurking Horror [Lurking Horror].json deleted file mode 100644 index 502989e..0000000 --- a/tiers/Lurking Horror [Lurking Horror].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "70000": 1, - "315000": 1, - "525000": 1, - "770000": 2, - "1120000": 2.5, - "2275000": 3, - "3150000": 3.5 - }, - "hard": { - "88000": 1, - "394000": 1, - "656000": 1, - "963000": 2, - "1400000": 2.5, - "2844100": 3, - "3938000": 3.5 - }, - "legendary": { - "112000": 1, - "504000": 1, - "840000": 1, - "1232000": 2, - "1792000": 2.5, - "3640000": 3, - "5040000": 3.5 - }, - "nightmare": { - "140000": 1, - "630000": 1, - "1050000": 1, - "1540000": 2, - "2240000": 2.5, - "4550000": 3, - "6300000": 3.5 - } -} diff --git a/tiers/Malchar the Tri-Eyed [Malchar the Tri-Eyed].json b/tiers/Malchar the Tri-Eyed [Malchar the Tri-Eyed].json deleted file mode 100644 index e0baf91..0000000 --- a/tiers/Malchar the Tri-Eyed [Malchar the Tri-Eyed].json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "normal": { - "5000000": 1, - "7000000": 2, - "9000000": 3, - "10000000": 4, - "15000000": 5, - "20000000": 6, - "25000000": 7, - "30000000": 8, - "35000000": 9, - "40000000": 10, - "45000000": 11 - }, - "hard": { - "6000000": 1, - "9000000": 2, - "11000000": 3, - "13000000": 4, - "19000000": 5, - "25000000": 6, - "31000000": 7, - "38000000": 8, - "44000000": 9, - "50000000": 10, - "56000000": 11 - }, - "legendary": { - "8000000": 1, - "11000000": 2, - "14000000": 3, - "16000000": 4, - "24000000": 5, - "32000000": 6, - "40000000": 7, - "48000000": 8, - "56000000": 9, - "64000000": 10, - "72000000": 11 - }, - "nightmare": { - "10000000": 1, - "14000000": 2, - "18000000": 3, - "20000000": 4, - "30000000": 5, - "40000000": 6, - "50000000": 7, - "60000000": 8, - "70000000": 9, - "80000000": 10, - "90000000": 11 - } -} diff --git a/tiers/Malleus [Malleus].json b/tiers/Malleus [Malleus].json deleted file mode 100644 index 73d45bd..0000000 --- a/tiers/Malleus [Malleus].json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "normal": { - "100000000": 22, - "150000000": 56, - "225000000": 78, - "300000000": 84, - "375000000": 96, - "450000000": 104, - "525000000": 116, - "600000000": 128, - "900000000": 156 - }, - "hard": { - "100000000": 22, - "150000000": 56, - "225000000": 78, - "300000000": 84, - "375000000": 96, - "450000000": 104, - "525000000": 116, - "600000000": 128, - "900000000": 156 - }, - "legendary": { - "100000000": 22, - "150000000": 56, - "225000000": 78, - "300000000": 84, - "375000000": 96, - "450000000": 104, - "525000000": 116, - "600000000": 128, - "900000000": 156 - }, - "nightmare": { - "100000000": 22, - "150000000": 56, - "225000000": 78, - "300000000": 84, - "375000000": 96, - "450000000": 104, - "525000000": 116, - "600000000": 128, - "900000000": 156 - } -} diff --git a/tiers/Maraak the Impaler [Maraak].json b/tiers/Maraak the Impaler [Maraak].json deleted file mode 100644 index a620074..0000000 --- a/tiers/Maraak the Impaler [Maraak].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "788000": 1, - "900000": 1, - "1350000": 1, - "1800000": 2, - "2400000": 2.5, - "3750000": 3, - "5250000": 3.5 - }, - "hard": { - "684000": 1, - "1125000": 1, - "1688000": 1, - "2250000": 2, - "3000000": 2.5, - "4688000": 3, - "6563000": 3.5 - }, - "legendary": { - "1260000": 1, - "1440000": 1, - "2160000": 1, - "2880000": 2, - "3840000": 2.5, - "6000000": 3, - "8400000": 3.5 - }, - "nightmare": { - "1575000": 1, - "1800000": 1, - "2700000": 1, - "3600000": 2, - "4800000": 2.5, - "7500000": 3, - "10500000": 3.5 - } -} diff --git a/tiers/Marble Colossus [Colossus].json b/tiers/Marble Colossus [Colossus].json deleted file mode 100644 index fde9ead..0000000 --- a/tiers/Marble Colossus [Colossus].json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "normal": { - "100000000": "2.0", - "200000000": "4.0", - "300000000": "6.0", - "400000000": "8.0", - "500000000": "10.0", - "600000000": "12.0", - "700000000": "14.0", - "800000000": "16.0", - "900000000": "18.0", - "1000000000": "21.0", - "1400000000": "32.0", - "2000000000": "43.0" - }, - "hard": { - "100000000": "2.0", - "200000000": "4.0", - "300000000": "6.0", - "400000000": "8.0", - "500000000": "10.0", - "600000000": "12.0", - "700000000": "14.0", - "800000000": "16.0", - "900000000": "18.0", - "1000000000": "21.0", - "1400000000": "32.0", - "2000000000": "43.0" - }, - "legendary": { - "100000000": "2.0", - "200000000": "4.0", - "300000000": "6.0", - "400000000": "8.0", - "500000000": "10.0", - "600000000": "12.0", - "700000000": "14.0", - "800000000": "16.0", - "900000000": "18.0", - "1000000000": "21.0", - "1400000000": "32.0", - "2000000000": "43.0" - }, - "nightmare": { - "100000000": "2.0", - "200000000": "4.0", - "300000000": "6.0", - "400000000": "8.0", - "500000000": "10.0", - "600000000": "12.0", - "700000000": "14.0", - "800000000": "16.0", - "900000000": "18.0", - "1000000000": "21.0", - "1400000000": "32.0", - "2000000000": "43.0" - } -} \ No newline at end of file diff --git a/tiers/Mardachus the Destroyer [Mardachus].json b/tiers/Mardachus the Destroyer [Mardachus].json deleted file mode 100644 index 748924e..0000000 --- a/tiers/Mardachus the Destroyer [Mardachus].json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "normal": { - "440000": 1, - "990000": 1, - "1430000": 2, - "2750000": 2.5, - "5500000": 3, - "19800000": 3.5 - }, - "hard": { - "550000": 1, - "1238000": 1, - "1788000": 2, - "3438000": 2.5, - "3875000": 3, - "24750000": 3.5 - }, - "legendary": { - "680000": 1, - "1530000": 1, - "2210000": 2, - "4250000": 2.5, - "8500000": 3, - "30600000": 3.5 - }, - "nightmare": { - "880000": 1, - "1980000": 1, - "2860000": 2, - "5500000": 2.5, - "11000000": 3, - "39600000": 3.5 - } -} diff --git a/tiers/Master Ninja Bakku [Bakku].json b/tiers/Master Ninja Bakku [Bakku].json deleted file mode 100644 index 86d42c2..0000000 --- a/tiers/Master Ninja Bakku [Bakku].json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "normal": { - "100000000": "3.0", - "200000000": "8.0", - "250000000": "10.0", - "300000000": "11.0", - "400000000": "12.0", - "500000000": "15.0", - "650000000": "18.0", - "800000000": "20.0", - "1000000000": "26.0", - "1250000000": "30.0", - "1500000000": "38.0", - "2000000000": "47.0" - }, - "hard": { - "100000000": "3.0", - "200000000": "8.0", - "250000000": "10.0", - "300000000": "11.0", - "400000000": "12.0", - "500000000": "15.0", - "650000000": "18.0", - "800000000": "20.0", - "1000000000": "26.0", - "1250000000": "30.0", - "1500000000": "38.0", - "2000000000": "47.0" - }, - "legendary": { - "100000000": "3.0", - "200000000": "8.0", - "250000000": "10.0", - "300000000": "11.0", - "400000000": "12.0", - "500000000": "15.0", - "650000000": "18.0", - "800000000": "20.0", - "1000000000": "26.0", - "1250000000": "30.0", - "1500000000": "38.0", - "2000000000": "47.0" - }, - "nightmare": { - "100000000": "3.0", - "200000000": "8.0", - "250000000": "10.0", - "300000000": "11.0", - "400000000": "12.0", - "500000000": "15.0", - "650000000": "18.0", - "800000000": "20.0", - "1000000000": "26.0", - "1250000000": "30.0", - "1500000000": "38.0", - "2000000000": "47.0" - } -} \ No newline at end of file diff --git a/tiers/Mazalu [Mazalu].json b/tiers/Mazalu [Mazalu].json deleted file mode 100644 index 4c0429f..0000000 --- a/tiers/Mazalu [Mazalu].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "13000": 1, - "70000": 1, - "95000": 1, - "205000": 2, - "313000": 2.5, - "675000": 3, - "850000": 3.5 - }, - "hard": { - "16000": 1, - "88000": 1, - "119000": 1, - "256000": 2, - "391000": 2.5, - "844000": 3, - "1063000": 3.5 - }, - "legendary": { - "20000": 1, - "112000": 1, - "152000": 1, - "328000": 2, - "500000": 2.5, - "1080000": 3, - "1360000": 3.5 - }, - "nightmare": { - "25000": 1, - "1408000": 1, - "190000": 1, - "410000": 2, - "625000": 2.5, - "1350000": 3, - "1700000": 3.5 - } -} diff --git a/tiers/Mestr Rekkr Rematch [Rekkr II].json b/tiers/Mestr Rekkr Rematch [Rekkr II].json deleted file mode 100644 index c541090..0000000 --- a/tiers/Mestr Rekkr Rematch [Rekkr II].json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "normal": { - "250000000": "10.0", - "300000000": "11.0", - "400000000": "15.0", - "500000000": "18.0", - "720000000": "23.0", - "1000000000": "26.0", - "1500000000": "34.0", - "2500000000": "37.0", - "3500000000": "51.0" - }, - "hard": { - "250000000": "10.0", - "300000000": "11.0", - "400000000": "15.0", - "500000000": "18.0", - "720000000": "23.0", - "1000000000": "26.0", - "1500000000": "34.0", - "2500000000": "37.0", - "3500000000": "51.0" - }, - "legendary": { - "250000000": "10.0", - "300000000": "11.0", - "400000000": "15.0", - "500000000": "18.0", - "720000000": "23.0", - "1000000000": "26.0", - "1500000000": "34.0", - "2500000000": "37.0", - "3500000000": "51.0" - }, - "nightmare": { - "250000000": "10.0", - "300000000": "11.0", - "400000000": "15.0", - "500000000": "18.0", - "720000000": "23.0", - "1000000000": "26.0", - "1500000000": "34.0", - "2500000000": "37.0", - "3500000000": "51.0" - } -} \ No newline at end of file diff --git a/tiers/Mesyra the Watcher [Mesyra].json b/tiers/Mesyra the Watcher [Mesyra].json deleted file mode 100644 index a9673e3..0000000 --- a/tiers/Mesyra the Watcher [Mesyra].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "150000": 1, - "900000": 1, - "1300000": 1, - "2500000": 2, - "7100000": 2.5, - "18100000": 3, - "41000000": 3.5 - }, - "hard": { - "188000": 1, - "1125000": 1, - "1625000": 1, - "3125000": 2, - "8875000": 2.5, - "22625000": 3, - "51250000": 3.5 - }, - "legendary": { - "240000": 1, - "1440000": 1, - "2080000": 1, - "4000000": 2, - "11360000": 2.5, - "28960000": 3, - "65600000": 3.5 - }, - "nightmare": { - "300000": 1, - "1800000": 1, - "2600000": 1, - "5000000": 2, - "14200000": 2.5, - "36200000": 3, - "82000000": 3.5 - } -} diff --git a/tiers/Murgrux the Mangler [Murgrux].json b/tiers/Murgrux the Mangler [Murgrux].json deleted file mode 100644 index b182773..0000000 --- a/tiers/Murgrux the Mangler [Murgrux].json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "normal": { - "150000000": "0.0", - "250000000": "1.0", - "500000000": "2.0", - "750000000": "5.0", - "1000000000": "10.0", - "1500000000": "15.0", - "2000000000": "31.0", - "2500000000": "41.0", - "3000000000": "57.0", - "3500000000": "67.0", - "4000000000": "72.0", - "4500000000": "78.0", - "5000000000": "87.0" - }, - "hard": { - "150000000": "0.0", - "250000000": "1.0", - "500000000": "2.0", - "750000000": "5.0", - "1000000000": "10.0", - "1500000000": "15.0", - "2000000000": "31.0", - "2500000000": "41.0", - "3000000000": "57.0", - "3500000000": "67.0", - "4000000000": "72.0", - "4500000000": "78.0", - "5000000000": "87.0" - }, - "legendary": { - "150000000": "0.0", - "250000000": "1.0", - "500000000": "2.0", - "750000000": "5.0", - "1000000000": "10.0", - "1500000000": "15.0", - "2000000000": "31.0", - "2500000000": "41.0", - "3000000000": "57.0", - "3500000000": "67.0", - "4000000000": "72.0", - "4500000000": "78.0", - "5000000000": "87.0" - }, - "nightmare": { - "150000000": "0.0", - "250000000": "1.0", - "500000000": "2.0", - "750000000": "5.0", - "1000000000": "10.0", - "1500000000": "15.0", - "2000000000": "31.0", - "2500000000": "41.0", - "3000000000": "57.0", - "3500000000": "67.0", - "4000000000": "72.0", - "4500000000": "78.0", - "5000000000": "87.0" - } -} \ No newline at end of file diff --git a/tiers/N'rlux the Devourer [N'rlux the Devourer].json b/tiers/N'rlux the Devourer [N'rlux the Devourer].json deleted file mode 100644 index 109821e..0000000 --- a/tiers/N'rlux the Devourer [N'rlux the Devourer].json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "normal": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26 - }, - "hard": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26 - }, - "legendary": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26 - }, - "nightmare": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26 - } -} diff --git a/tiers/Nalagarst [Nalagarst].json b/tiers/Nalagarst [Nalagarst].json deleted file mode 100644 index 15c1e66..0000000 --- a/tiers/Nalagarst [Nalagarst].json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "normal": { - "280000": 1, - "630000": 1, - "910000": 2, - "1750000": 2.5, - "3500000": 3, - "12600000": 3.5 - }, - "hard": { - "350000": 1, - "788000": 1, - "1138000": 2, - "2188000": 2.5, - "4375000": 3, - "15750000": 3.5 - }, - "legendary": { - "448000": 1, - "1080000": 1, - "1456000": 2, - "2800000": 2.5, - "5600000": 3, - "20160000": 3.5 - }, - "nightmare": { - "560000": 1, - "1260000": 1, - "1820000": 2, - "3500000": 2.5, - "7000000": 3, - "25200000": 3.5 - } -} diff --git a/tiers/Nereidon the Sea Slayer [Nereidon].json b/tiers/Nereidon the Sea Slayer [Nereidon].json deleted file mode 100644 index 1c11550..0000000 --- a/tiers/Nereidon the Sea Slayer [Nereidon].json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "normal": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "36.0", - "5000000000": "48.0" - }, - "hard": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "36.0", - "5000000000": "48.0" - }, - "legendary": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "36.0", - "5000000000": "48.0" - }, - "nightmare": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "36.0", - "5000000000": "48.0" - } -} \ No newline at end of file diff --git a/tiers/Nidhogg [Nidhogg].json b/tiers/Nidhogg [Nidhogg].json deleted file mode 100644 index 5ccb230..0000000 --- a/tiers/Nidhogg [Nidhogg].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "130000": 1, - "728000": 1, - "988000": 1, - "2132000": 2, - "3250000": 2.5, - "7020000": 3, - "8840000": 3.5 - }, - "hard": { - "163000": 1, - "910000": 1, - "1235000": 1, - "2665000": 2, - "4063000": 2.5, - "8775000": 3, - "1105000": 3.5 - }, - "legendary": { - "208000": 1, - "1165000": 1, - "1581000": 1, - "3411000": 2, - "5200000": 2.5, - "11232000": 3, - "14144000": 3.5 - }, - "nightmare": { - "260000": 1, - "1456000": 1, - "1976000": 1, - "4264000": 2, - "6500000": 2.5, - "14040000": 3, - "17680000": 3.5 - } -} diff --git a/tiers/Nimrod the Hunter [Nimrod].json b/tiers/Nimrod the Hunter [Nimrod].json deleted file mode 100644 index cc53a41..0000000 --- a/tiers/Nimrod the Hunter [Nimrod].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "180000": 1, - "1080000": 1, - "1560000": 1, - "3000000": 2, - "8520000": 2.5, - "21720000": 3, - "49200000": 3.5 - }, - "hard": { - "225000": 1, - "1350000": 1, - "1950000": 1, - "3750000": 2, - "10650000": 2.5, - "27150000": 3, - "61500000": 3.5 - }, - "legendary": { - "288000": 1, - "1728000": 1, - "2496000": 1, - "4800000": 2, - "13632000": 2.5, - "34752000": 3, - "78720000": 3.5 - }, - "nightmare": { - "360000": 1, - "2160000": 1, - "3120000": 1, - "6000000": 2, - "17040000": 2.5, - "43440000": 3, - "98400000": 3.5 - } -} diff --git a/tiers/Nylatrix [Nylatrix].json b/tiers/Nylatrix [Nylatrix].json deleted file mode 100644 index 2936d82..0000000 --- a/tiers/Nylatrix [Nylatrix].json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "normal": { - "20000000": 1, - "28000000": 2, - "36000000": 3, - "40000000": 4, - "60000000": 5, - "80000000": 6, - "100000000": 7, - "120000000": 8, - "140000000": 9, - "160000000": 10, - "180000000": 11 - }, - "hard": { - "25000000": 1, - "35000000": 2, - "45000000": 3, - "50000000": 4, - "75000000": 5, - "100000000": 6, - "125000000": 7, - "150000000": 8, - "175000000": 9, - "200000000": 10, - "225000000": 11 - }, - "legendary": { - "32000000": 1, - "45000000": 2, - "58000000": 3, - "64000000": 4, - "96000000": 5, - "128000000": 6, - "160000000": 7, - "192000000": 8, - "224000000": 9, - "256000000": 10, - "288000000": 11 - }, - "nightmare": { - "40000000": 1, - "56000000": 2, - "72000000": 3, - "80000000": 4, - "120000000": 5, - "160000000": 6, - "200000000": 7, - "240000000": 8, - "280000000": 9, - "320000000": 10, - "360000000": 11 - } -} \ No newline at end of file diff --git a/tiers/Paracoprion [Paracoprion].json b/tiers/Paracoprion [Paracoprion].json deleted file mode 100644 index dce23f9..0000000 --- a/tiers/Paracoprion [Paracoprion].json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "normal": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26, - "1000000000": 30 - }, - "hard": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26, - "1000000000": 30 - }, - "legendary": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26, - "1000000000": 30 - }, - "nightmare": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26, - "1000000000": 30 - } -} diff --git a/tiers/Phaedra the Deceiver [Phaedra].json b/tiers/Phaedra the Deceiver [Phaedra].json deleted file mode 100644 index 623aa8a..0000000 --- a/tiers/Phaedra the Deceiver [Phaedra].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "210000": 1, - "1260000": 1, - "1820000": 1, - "3500000": 2, - "9940000": 2.5, - "25340000": 3, - "57400000": 3.5 - }, - "hard": { - "263000": 1, - "1575000": 1, - "2275000": 1, - "4375000": 2, - "12425000": 2.5, - "31675000": 3, - "71750000": 3.5 - }, - "legendary": { - "336000": 1, - "2016000": 1, - "2912000": 1, - "5600000": 2, - "15904000": 2.5, - "40544000": 3, - "91840000": 3.5 - }, - "nightmare": { - "420000": 1, - "2520000": 1, - "3640000": 1, - "7000000": 2, - "19880000": 2.5, - "50680000": 3, - "114800000": 3.5 - } -} diff --git a/tiers/Prince Obyron [Obyron].json b/tiers/Prince Obyron [Obyron].json deleted file mode 100644 index b89eb2c..0000000 --- a/tiers/Prince Obyron [Obyron].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "1575000": 1, - "1800000": 1, - "2700000": 1, - "3600000": 2, - "4800000": 2.5, - "7500000": 3, - "10500000": 3.5 - }, - "hard": { - "1969000": 1, - "2250000": 1, - "3375000": 1, - "4500000": 2, - "6000000": 2.5, - "9375000": 3, - "13125000": 3.5 - }, - "legendary": { - "2520000": 1, - "2880000": 1, - "4320000": 1, - "5760000": 2, - "7680000": 2.5, - "12000000": 3, - "16800000": 3.5 - }, - "nightmare": { - "3150000": 1, - "3600000": 1, - "5400000": 1, - "7200000": 2, - "9600000": 2.5, - "15000000": 3, - "21000000": 3.5 - } -} diff --git a/tiers/Prison of Fear [Fear].json b/tiers/Prison of Fear [Fear].json deleted file mode 100644 index 2eeffb8..0000000 --- a/tiers/Prison of Fear [Fear].json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "normal": { - "3000000000": "195.0", - "4000000000": "223.0", - "5000000000": "263.0", - "6000000000": "280.0", - "7000000000": "297.0", - "8000000000": "315.0", - "9000000000": "346.0", - "10000000000": "377.0", - "12500000000": "395.0", - "15000000000": "420.0", - "17500000000": "441.0", - "20000000000": "477.0", - "25000000000": "606.0", - "30000000000": "737.0", - "40000000000": "899.0", - "50000000000": "1460.0", - "60000000000": "1953.0", - "70000000000": "2447.0", - "80000000000": "2940.0", - "90000000000": "3433.0", - "100000000000": "3933.0", - "150000000000": "4907.0", - "200000000000": "5913.0" - }, - "hard": { - "3000000000": "195.0", - "4000000000": "223.0", - "5000000000": "263.0", - "6000000000": "280.0", - "7000000000": "297.0", - "8000000000": "315.0", - "9000000000": "346.0", - "10000000000": "377.0", - "12500000000": "395.0", - "15000000000": "420.0", - "17500000000": "441.0", - "20000000000": "477.0", - "25000000000": "606.0", - "30000000000": "737.0", - "40000000000": "899.0", - "50000000000": "1460.0", - "60000000000": "1953.0", - "70000000000": "2447.0", - "80000000000": "2940.0", - "90000000000": "3433.0", - "100000000000": "3933.0", - "150000000000": "4907.0", - "200000000000": "5913.0" - }, - "legendary": { - "3000000000": "195.0", - "4000000000": "223.0", - "5000000000": "263.0", - "6000000000": "280.0", - "7000000000": "297.0", - "8000000000": "315.0", - "9000000000": "346.0", - "10000000000": "377.0", - "12500000000": "395.0", - "15000000000": "420.0", - "17500000000": "441.0", - "20000000000": "477.0", - "25000000000": "606.0", - "30000000000": "737.0", - "40000000000": "899.0", - "50000000000": "1460.0", - "60000000000": "1953.0", - "70000000000": "2447.0", - "80000000000": "2940.0", - "90000000000": "3433.0", - "100000000000": "3933.0", - "150000000000": "4907.0", - "200000000000": "5913.0" - }, - "nightmare": { - "3000000000": "195.0", - "4000000000": "223.0", - "5000000000": "263.0", - "6000000000": "280.0", - "7000000000": "297.0", - "8000000000": "315.0", - "9000000000": "346.0", - "10000000000": "377.0", - "12500000000": "395.0", - "15000000000": "420.0", - "17500000000": "441.0", - "20000000000": "477.0", - "25000000000": "606.0", - "30000000000": "737.0", - "40000000000": "899.0", - "50000000000": "1460.0", - "60000000000": "1953.0", - "70000000000": "2447.0", - "80000000000": "2940.0", - "90000000000": "3433.0", - "100000000000": "3933.0", - "150000000000": "4907.0", - "200000000000": "5913.0" - } -} \ No newline at end of file diff --git a/tiers/Qwiladrian Sporeforms [Sporeforms].json b/tiers/Qwiladrian Sporeforms [Sporeforms].json deleted file mode 100644 index fcfcc25..0000000 --- a/tiers/Qwiladrian Sporeforms [Sporeforms].json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "normal": { - "1000000000": "95.0", - "1250000000": "104.0", - "1500000000": "114.0", - "1750000000": "128.0", - "2000000000": "140.0", - "2250000000": "152.0", - "2500000000": "170.0", - "2750000000": "192.0", - "3000000000": "231.0", - "4000000000": "261.0", - "5000000000": "306.0", - "6000000000": "353.0", - "8000000000": "383.0", - "10000000000": "414.0", - "12500000000": "444.0", - "15000000000": "477.0", - "20000000000": "539.0" - }, - "hard": { - "1000000000": "95.0", - "1250000000": "104.0", - "1500000000": "114.0", - "1750000000": "128.0", - "2000000000": "140.0", - "2250000000": "152.0", - "2500000000": "170.0", - "2750000000": "192.0", - "3000000000": "231.0", - "4000000000": "261.0", - "5000000000": "306.0", - "6000000000": "353.0", - "8000000000": "383.0", - "10000000000": "414.0", - "12500000000": "444.0", - "15000000000": "477.0", - "20000000000": "539.0" - }, - "legendary": { - "1000000000": "95.0", - "1250000000": "104.0", - "1500000000": "114.0", - "1750000000": "128.0", - "2000000000": "140.0", - "2250000000": "152.0", - "2500000000": "170.0", - "2750000000": "192.0", - "3000000000": "231.0", - "4000000000": "261.0", - "5000000000": "306.0", - "6000000000": "353.0", - "8000000000": "383.0", - "10000000000": "414.0", - "12500000000": "444.0", - "15000000000": "477.0", - "20000000000": "539.0" - }, - "nightmare": { - "1000000000": "95.0", - "1250000000": "104.0", - "1500000000": "114.0", - "1750000000": "128.0", - "2000000000": "140.0", - "2250000000": "152.0", - "2500000000": "170.0", - "2750000000": "192.0", - "3000000000": "231.0", - "4000000000": "261.0", - "5000000000": "306.0", - "6000000000": "353.0", - "8000000000": "383.0", - "10000000000": "414.0", - "12500000000": "444.0", - "15000000000": "477.0", - "20000000000": "539.0" - } -} \ No newline at end of file diff --git a/tiers/Qwiladrian Stormship [Stormship].json b/tiers/Qwiladrian Stormship [Stormship].json deleted file mode 100644 index e3dcf17..0000000 --- a/tiers/Qwiladrian Stormship [Stormship].json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "normal": { - "200000000": "3.0", - "300000000": "9.0", - "500000000": "27.0", - "1000000000": "72.0", - "1500000000": "114.0", - "2000000000": "148.0", - "2500000000": "185.0", - "3000000000": "219.0", - "4000000000": "256.0", - "5000000000": "299.0", - "6000000000": "318.0", - "7000000000": "337.0", - "8000000000": "356.0", - "9000000000": "390.0", - "10000000000": "427.0", - "12500000000": "446.0", - "15000000000": "474.0", - "17500000000": "496.0", - "20000000000": "539.0", - "25000000000": "570.0" - }, - "hard": { - "200000000": "3.0", - "300000000": "9.0", - "500000000": "27.0", - "1000000000": "72.0", - "1500000000": "114.0", - "2000000000": "148.0", - "2500000000": "185.0", - "3000000000": "219.0", - "4000000000": "256.0", - "5000000000": "299.0", - "6000000000": "318.0", - "7000000000": "337.0", - "8000000000": "356.0", - "9000000000": "390.0", - "10000000000": "427.0", - "12500000000": "446.0", - "15000000000": "474.0", - "17500000000": "496.0", - "20000000000": "539.0", - "25000000000": "570.0" - }, - "legendary": { - "200000000": "3.0", - "300000000": "9.0", - "500000000": "27.0", - "1000000000": "72.0", - "1500000000": "114.0", - "2000000000": "148.0", - "2500000000": "185.0", - "3000000000": "219.0", - "4000000000": "256.0", - "5000000000": "299.0", - "6000000000": "318.0", - "7000000000": "337.0", - "8000000000": "356.0", - "9000000000": "390.0", - "10000000000": "427.0", - "12500000000": "446.0", - "15000000000": "474.0", - "17500000000": "496.0", - "20000000000": "539.0", - "25000000000": "570.0" - }, - "nightmare": { - "200000000": "3.0", - "300000000": "9.0", - "500000000": "27.0", - "1000000000": "72.0", - "1500000000": "114.0", - "2000000000": "148.0", - "2500000000": "185.0", - "3000000000": "219.0", - "4000000000": "256.0", - "5000000000": "299.0", - "6000000000": "318.0", - "7000000000": "337.0", - "8000000000": "356.0", - "9000000000": "390.0", - "10000000000": "427.0", - "12500000000": "446.0", - "15000000000": "474.0", - "17500000000": "496.0", - "20000000000": "539.0", - "25000000000": "570.0" - } -} \ No newline at end of file diff --git a/tiers/Ragetalon [Ragetalon].json b/tiers/Ragetalon [Ragetalon].json deleted file mode 100644 index 8ff53fc..0000000 --- a/tiers/Ragetalon [Ragetalon].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "220000": 1, - "990000": 1, - "1650000": 1, - "2420000": 2, - "3520000": 2.5, - "7150000": 3, - "9900000": 3.5 - }, - "hard": { - "275000": 1, - "1238000": 1, - "2063000": 1, - "3025000": 2, - "4400000": 2.5, - "8938000": 3, - "12375000": 3.5 - }, - "legendary": { - "352000": 1, - "1584000": 1, - "2640000": 1, - "3872000": 2, - "5632000": 2.5, - "11440000": 3, - "15840000": 3.5 - }, - "nightmare": { - "440000": 1, - "1980000": 1, - "3300000": 1, - "4840000": 2, - "7040000": 2.5, - "14300000": 3, - "19800000": 3.5 - } -} diff --git a/tiers/Rannveig [Rannveig].json b/tiers/Rannveig [Rannveig].json deleted file mode 100644 index 7da99ba..0000000 --- a/tiers/Rannveig [Rannveig].json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "normal": { - "100000000": "12.0", - "200000000": "24.0", - "300000000": "36.0", - "400000000": "48.0", - "500000000": "61.0", - "600000000": "73.0", - "700000000": "85.0", - "800000000": "97.0", - "900000000": "109.0", - "1000000000": "122.0", - "2000000000": "245.0", - "3000000000": "369.0" - }, - "hard": { - "100000000": "12.0", - "200000000": "24.0", - "300000000": "36.0", - "400000000": "48.0", - "500000000": "61.0", - "600000000": "73.0", - "700000000": "85.0", - "800000000": "97.0", - "900000000": "109.0", - "1000000000": "122.0", - "2000000000": "245.0", - "3000000000": "369.0" - }, - "legendary": { - "100000000": "12.0", - "200000000": "24.0", - "300000000": "36.0", - "400000000": "48.0", - "500000000": "61.0", - "600000000": "73.0", - "700000000": "85.0", - "800000000": "97.0", - "900000000": "109.0", - "1000000000": "122.0", - "2000000000": "245.0", - "3000000000": "369.0" - }, - "nightmare": { - "100000000": "12.0", - "200000000": "24.0", - "300000000": "36.0", - "400000000": "48.0", - "500000000": "61.0", - "600000000": "73.0", - "700000000": "85.0", - "800000000": "97.0", - "900000000": "109.0", - "1000000000": "122.0", - "2000000000": "245.0", - "3000000000": "369.0" - } -} \ No newline at end of file diff --git a/tiers/Reaper Mantis [Mantis].json b/tiers/Reaper Mantis [Mantis].json deleted file mode 100644 index 7007af1..0000000 --- a/tiers/Reaper Mantis [Mantis].json +++ /dev/null @@ -1,123 +0,0 @@ -{ - "nightmare": { - "100000000": { - "epic": 6, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "500000000": { - "epic": 49, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1000000000": { - "epic": 231, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1500000000": { - "epic": 411, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2000000000": { - "epic": 472, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2500000000": { - "epic": 532, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3000000000": { - "epic": 618, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4000000000": { - "epic": 779, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000": { - "epic": 905, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "6000000000": { - "epic": 1026, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "8000000000": { - "epic": 1148, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000": { - "epic": 1215, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "12500000000": { - "epic": 1308, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000": { - "epic": 1465, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000": { - "epic": 1625, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "25000000000": { - "epic": 1780, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "30000000000": { - "epic": 1880, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Red Snow [Red Snow].json b/tiers/Red Snow [Red Snow].json deleted file mode 100644 index 9147f3b..0000000 --- a/tiers/Red Snow [Red Snow].json +++ /dev/null @@ -1,126 +0,0 @@ -{ - "normal": { - "200000000": "2.0", - "300000000": "4.0", - "500000000": "24.0", - "1000000000": "54.0", - "1500000000": "90.0", - "2000000000": "131.0", - "2500000000": "164.0", - "3000000000": "199.0", - "4000000000": "227.0", - "5000000000": "267.0", - "6000000000": "284.0", - "7000000000": "301.0", - "8000000000": "317.0", - "9000000000": "349.0", - "10000000000": "380.0", - "12500000000": "397.0", - "15000000000": "422.0", - "17500000000": "443.0", - "20000000000": "479.0", - "25000000000": "509.0", - "30000000000": "541.0", - "40000000000": "604.0", - "50000000000": "832.0", - "60000000000": "999.0", - "70000000000": "1241.0", - "80000000000": "1433.0", - "90000000000": "1675.0", - "100000000000": "1918.0", - "150000000000": "2153.0" - }, - "hard": { - "200000000": "2.0", - "300000000": "4.0", - "500000000": "24.0", - "1000000000": "54.0", - "1500000000": "90.0", - "2000000000": "131.0", - "2500000000": "164.0", - "3000000000": "199.0", - "4000000000": "227.0", - "5000000000": "267.0", - "6000000000": "284.0", - "7000000000": "301.0", - "8000000000": "317.0", - "9000000000": "349.0", - "10000000000": "380.0", - "12500000000": "397.0", - "15000000000": "422.0", - "17500000000": "443.0", - "20000000000": "479.0", - "25000000000": "509.0", - "30000000000": "541.0", - "40000000000": "604.0", - "50000000000": "832.0", - "60000000000": "999.0", - "70000000000": "1241.0", - "80000000000": "1433.0", - "90000000000": "1675.0", - "100000000000": "1918.0", - "150000000000": "2153.0" - }, - "legendary": { - "200000000": "2.0", - "300000000": "4.0", - "500000000": "24.0", - "1000000000": "54.0", - "1500000000": "90.0", - "2000000000": "131.0", - "2500000000": "164.0", - "3000000000": "199.0", - "4000000000": "227.0", - "5000000000": "267.0", - "6000000000": "284.0", - "7000000000": "301.0", - "8000000000": "317.0", - "9000000000": "349.0", - "10000000000": "380.0", - "12500000000": "397.0", - "15000000000": "422.0", - "17500000000": "443.0", - "20000000000": "479.0", - "25000000000": "509.0", - "30000000000": "541.0", - "40000000000": "604.0", - "50000000000": "832.0", - "60000000000": "999.0", - "70000000000": "1241.0", - "80000000000": "1433.0", - "90000000000": "1675.0", - "100000000000": "1918.0", - "150000000000": "2153.0" - }, - "nightmare": { - "200000000": "2.0", - "300000000": "4.0", - "500000000": "24.0", - "1000000000": "54.0", - "1500000000": "90.0", - "2000000000": "131.0", - "2500000000": "164.0", - "3000000000": "199.0", - "4000000000": "227.0", - "5000000000": "267.0", - "6000000000": "284.0", - "7000000000": "301.0", - "8000000000": "317.0", - "9000000000": "349.0", - "10000000000": "380.0", - "12500000000": "397.0", - "15000000000": "422.0", - "17500000000": "443.0", - "20000000000": "479.0", - "25000000000": "509.0", - "30000000000": "541.0", - "40000000000": "604.0", - "50000000000": "832.0", - "60000000000": "999.0", - "70000000000": "1241.0", - "80000000000": "1433.0", - "90000000000": "1675.0", - "100000000000": "1918.0", - "150000000000": "2153.0" - } -} \ No newline at end of file diff --git a/tiers/Rhalmarius the Despoiler [Rhalmarius].json b/tiers/Rhalmarius the Despoiler [Rhalmarius].json deleted file mode 100644 index b0af842..0000000 --- a/tiers/Rhalmarius the Despoiler [Rhalmarius].json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "normal": { - "5000000": 30 - }, - "hard": { - "12500000": 30 - }, - "legendary": { - "31250000": 30 - }, - "nightmare": { - "39060000": 30 - } -} diff --git a/tiers/Rift the Mauler [Rift].json b/tiers/Rift the Mauler [Rift].json deleted file mode 100644 index fbf4080..0000000 --- a/tiers/Rift the Mauler [Rift].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "250000": 1, - "1125000": 1, - "1875000": 1, - "2750000": 2, - "4000000": 2.5, - "8125000": 3, - "11250000": 3.5 - }, - "hard": { - "313000": 1, - "1406000": 1, - "2344000": 1, - "3438000": 2, - "5000000": 2.5, - "10156000": 3, - "14063000": 3.5 - }, - "legendary": { - "400000": 1, - "1800000": 1, - "3000000": 1, - "4400000": 2, - "6400000": 2.5, - "13000000": 3, - "18000000": 3.5 - }, - "nightmare": { - "500000": 1, - "2250000": 1, - "3750000": 1, - "5500000": 2, - "8000000": 2.5, - "16250000": 3, - "22500000": 3.5 - } -} diff --git a/tiers/Rudaru the Axe Master [Rudaru].json b/tiers/Rudaru the Axe Master [Rudaru].json deleted file mode 100644 index a49cfd0..0000000 --- a/tiers/Rudaru the Axe Master [Rudaru].json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "normal": { - "300000000": "13.0", - "500000000": "15.0", - "750000000": "17.0", - "1000000000": "25.0", - "1500000000": "32.0" - }, - "hard": { - "300000000": "13.0", - "500000000": "15.0", - "750000000": "17.0", - "1000000000": "25.0", - "1500000000": "32.0" - }, - "legendary": { - "300000000": "13.0", - "500000000": "15.0", - "750000000": "17.0", - "1000000000": "25.0", - "1500000000": "32.0" - }, - "nightmare": { - "300000000": "13.0", - "500000000": "15.0", - "750000000": "17.0", - "1000000000": "25.0", - "1500000000": "32.0" - } -} \ No newline at end of file diff --git a/tiers/Ruzzik the Slayer [Ruzzik].json b/tiers/Ruzzik the Slayer [Ruzzik].json deleted file mode 100644 index 57c3e36..0000000 --- a/tiers/Ruzzik the Slayer [Ruzzik].json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "normal": { - "300000000": "2.0", - "400000000": "5.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0", - "1250000000": "20.0", - "1500000000": "24.0", - "1750000000": "28.0", - "2000000000": "32.0", - "2250000000": "36.0", - "2500000000": "40.0", - "2750000000": "44.0", - "3000000000": "48.0" - }, - "hard": { - "300000000": "2.0", - "400000000": "5.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0", - "1250000000": "20.0", - "1500000000": "24.0", - "1750000000": "28.0", - "2000000000": "32.0", - "2250000000": "36.0", - "2500000000": "40.0", - "2750000000": "44.0", - "3000000000": "48.0" - }, - "legendary": { - "300000000": "2.0", - "400000000": "5.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0", - "1250000000": "20.0", - "1500000000": "24.0", - "1750000000": "28.0", - "2000000000": "32.0", - "2250000000": "36.0", - "2500000000": "40.0", - "2750000000": "44.0", - "3000000000": "48.0" - }, - "nightmare": { - "300000000": "2.0", - "400000000": "5.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0", - "1250000000": "20.0", - "1500000000": "24.0", - "1750000000": "28.0", - "2000000000": "32.0", - "2250000000": "36.0", - "2500000000": "40.0", - "2750000000": "44.0", - "3000000000": "48.0" - } -} \ No newline at end of file diff --git a/tiers/Salome the Seductress [Salome].json b/tiers/Salome the Seductress [Salome].json deleted file mode 100644 index eb228e9..0000000 --- a/tiers/Salome the Seductress [Salome].json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "normal": { - "7000000": 1, - "9000000": 2, - "12000000": 3, - "13000000": 4, - "20000000": 5, - "27000000": 6, - "33000000": 7, - "40000000": 8, - "47000000": 9, - "53000000": 10, - "60000000": 11 - }, - "hard": { - "8000000": 1, - "12000000": 2, - "15000000": 3, - "17000000": 4, - "25000000": 5, - "33000000": 6, - "42000000": 7, - "50000000": 8, - "58000000": 9, - "67000000": 10, - "75000000": 11 - }, - "legendary": { - "11000000": 1, - "15000000": 2, - "19000000": 3, - "21000000": 4, - "32000000": 5, - "43000000": 6, - "53000000": 7, - "64000000": 8, - "75000000": 9, - "85000000": 10, - "96000000": 11 - }, - "nightmare": { - "13000000": 1, - "19000000": 2, - "24000000": 3, - "27000000": 4, - "40000000": 5, - "53000000": 6, - "67000000": 7, - "80000000": 8, - "93000000": 9, - "107000000": 10, - "120000000": 11 - } -} \ No newline at end of file diff --git a/tiers/Scuttlegore [Scuttlegore].json b/tiers/Scuttlegore [Scuttlegore].json deleted file mode 100644 index b65ae52..0000000 --- a/tiers/Scuttlegore [Scuttlegore].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "440000": 1, - "1980000": 1, - "3300000": 1, - "4840000": 2, - "7040000": 2.5, - "14300000": 3, - "19800000": 3.5 - }, - "hard": { - "550000": 1, - "2475000": 1, - "4125000": 1, - "6050000": 2, - "8800000": 2.5, - "17875000": 3, - "24750000": 3.5 - }, - "legendary": { - "704000": 1, - "3168000": 1, - "5280000": 1, - "7744000": 2, - "11264000": 2.5, - "22880000": 3, - "31680000": 3.5 - }, - "nightmare": { - "880000": 1, - "3960000": 1, - "6600000": 1, - "9680000": 2, - "14080000": 2.5, - "28600000": 3, - "39600000": 3.5 - } -} diff --git a/tiers/Scylla [Scylla].json b/tiers/Scylla [Scylla].json deleted file mode 100644 index 4bb1cae..0000000 --- a/tiers/Scylla [Scylla].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "63000": 1, - "350000": 1, - "475000": 1, - "1025000": 2, - "1563000": 2.5, - "3375000": 3, - "4250000": 3.5 - }, - "hard": { - "78000": 1, - "438000": 1, - "594000": 1, - "1281000": 2, - "1953000": 2.5, - "4219000": 3, - "5313000": 3.5 - }, - "legendary": { - "100000": 1, - "560000": 1, - "760000": 1, - "1640000": 2, - "2500000": 2.5, - "5400000": 3, - "6800000": 3.5 - }, - "nightmare": { - "125000": 1, - "700000": 1, - "950000": 1, - "2050000": 2, - "3125000": 2.5, - "6750000": 3, - "8500000": 3.5 - } -} diff --git a/tiers/Shaar the Reaver [Shaar].json b/tiers/Shaar the Reaver [Shaar].json deleted file mode 100644 index 9a6e9b1..0000000 --- a/tiers/Shaar the Reaver [Shaar].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "60.0", - "5000000000": "90.0", - "8000000000": "100.0" - }, - "hard": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "60.0", - "5000000000": "90.0", - "8000000000": "100.0" - }, - "legendary": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "60.0", - "5000000000": "90.0", - "8000000000": "100.0" - }, - "nightmare": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "60.0", - "5000000000": "90.0", - "8000000000": "100.0" - } -} \ No newline at end of file diff --git a/tiers/Shadow [Shadow].json b/tiers/Shadow [Shadow].json deleted file mode 100644 index da1a6cf..0000000 --- a/tiers/Shadow [Shadow].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "50000000": "1.0", - "75000000": "2.0", - "100000000": "5.0", - "150000000": "8.0", - "200000000": "10.0", - "250000000": "12.0", - "300000000": "14.0", - "500000000": "16.0", - "750000000": "19.0", - "1000000000": "25.0" - }, - "hard": { - "50000000": "1.0", - "75000000": "2.0", - "100000000": "5.0", - "150000000": "8.0", - "200000000": "10.0", - "250000000": "12.0", - "300000000": "14.0", - "500000000": "16.0", - "750000000": "19.0", - "1000000000": "25.0" - }, - "legendary": { - "50000000": "1.0", - "75000000": "2.0", - "100000000": "5.0", - "150000000": "8.0", - "200000000": "10.0", - "250000000": "12.0", - "300000000": "14.0", - "500000000": "16.0", - "750000000": "19.0", - "1000000000": "25.0" - }, - "nightmare": { - "50000000": "1.0", - "75000000": "2.0", - "100000000": "5.0", - "150000000": "8.0", - "200000000": "10.0", - "250000000": "12.0", - "300000000": "14.0", - "500000000": "16.0", - "750000000": "19.0", - "1000000000": "25.0" - } -} \ No newline at end of file diff --git a/tiers/Sir Cai [Sir Cai].json b/tiers/Sir Cai [Sir Cai].json deleted file mode 100644 index 4df5708..0000000 --- a/tiers/Sir Cai [Sir Cai].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "53000": 1, - "315000": 1, - "455000": 1, - "875000": 2, - "2485000": 2.5, - "6335000": 3, - "14350000": 3.5 - }, - "hard": { - "66000": 1, - "394000": 1, - "569000": 1, - "1094000": 2, - "3106000": 2.5, - "7919000": 3, - "17938000": 3.5 - }, - "legendary": { - "84000": 1, - "504000": 1, - "728000": 1, - "1400000": 2, - "3976000": 2.5, - "10136000": 3, - "22960000": 3.5 - }, - "nightmare": { - "105000": 1, - "630000": 1, - "910000": 1, - "1750000": 2, - "4970000": 2.5, - "12670000": 3, - "28700000": 3.5 - } -} diff --git a/tiers/Sisters of the Song [Sisters].json b/tiers/Sisters of the Song [Sisters].json deleted file mode 100644 index b30f578..0000000 --- a/tiers/Sisters of the Song [Sisters].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "90000": 1, - "540000": 1, - "780000": 1, - "1500000": 2, - "4260000": 2.5, - "10860000": 3, - "24600000": 3.5 - }, - "hard": { - "113000": 1, - "675000": 1, - "975000": 1, - "1875000": 2, - "5325000": 2.5, - "13575000": 3, - "30750000": 3.5 - }, - "legendary": { - "144000": 1, - "864000": 1, - "1248000": 1, - "2400000": 2, - "6816000": 2.5, - "17376000": 3, - "39360000": 3.5 - }, - "nightmare": { - "180000": 1, - "1080000": 1, - "1560000": 1, - "3000000": 2, - "8520000": 2.5, - "21720000": 3, - "49200000": 3.5 - } -} diff --git a/tiers/Slaughterers Six [Slaughterers].json b/tiers/Slaughterers Six [Slaughterers].json deleted file mode 100644 index 6123955..0000000 --- a/tiers/Slaughterers Six [Slaughterers].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "1260000": 1, - "1440000": 1, - "2160000": 1, - "2880000": 2, - "3840000": 2.5, - "6000000": 3, - "8400000": 3.5 - }, - "hard": { - "1575000": 1, - "1800000": 1, - "2700000": 1, - "3600000": 2, - "4800000": 2.5, - "7500000": 3, - "10500000": 3.5 - }, - "legendary": { - "2016000": 1, - "2304000": 1, - "3456000": 1, - "4608000": 2, - "6144000": 2.5, - "9600000": 3, - "13440000": 3.5 - }, - "nightmare": { - "2520000": 1, - "2880000": 1, - "4320000": 1, - "5760000": 2, - "7680000": 2.5, - "12000000": 3, - "16800000": 3.5 - } -} diff --git a/tiers/Soul Collector [Collector].json b/tiers/Soul Collector [Collector].json deleted file mode 100644 index 17b98f8..0000000 --- a/tiers/Soul Collector [Collector].json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "nightmare": { - "124000000": 22, - "200000000": 46, - "654000000": 113, - "1000000000": 185, - "2500000000": 230, - "3200000000": 295, - "4500000000": 340, - "5000000000": 425, - "7500000000": 488, - "10000000000": 600, - "15000000000": 725, - "20000000000": 860, - "25000000000": 910, - "30000000000": 1010, - "40000000000": 1100 - } -} diff --git a/tiers/Stein [Stein].json b/tiers/Stein [Stein].json deleted file mode 100644 index 2dffa19..0000000 --- a/tiers/Stein [Stein].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "160000": 1, - "720000": 1, - "1200000": 1, - "1760000": 2, - "2560000": 2.5, - "5200000": 3, - "7200000": 3.5 - }, - "hard": { - "200000": 1, - "900000": 1, - "1500000": 1, - "2200000": 2, - "3200000": 2.5, - "6500000": 3, - "9000000": 3.5 - }, - "legendary": { - "256000": 1, - "1152000": 1, - "1920000": 1, - "2816000": 2, - "4096000": 2.5, - "8320000": 3, - "11520000": 3.5 - }, - "nightmare": { - "320000": 1, - "1440000": 1, - "2400000": 1, - "3520000": 2, - "5120000": 2.5, - "10400000": 3, - "14400000": 3.5 - } -} diff --git a/tiers/Tainted Erebus [Tainted].json b/tiers/Tainted Erebus [Tainted].json deleted file mode 100644 index 111af60..0000000 --- a/tiers/Tainted Erebus [Tainted].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "38000": 1, - "225000": 1, - "325000": 1, - "625000": 2, - "1775000": 2.5, - "4525000": 3, - "10250000": 3.5 - }, - "hard": { - "47000": 1, - "281000": 1, - "406000": 1, - "781000": 2, - "2219000": 2.5, - "5656000": 3, - "12813000": 3.5 - }, - "legendary": { - "60000": 1, - "360000": 1, - "520000": 1, - "1000000": 2, - "2840000": 2.5, - "7240000": 3, - "16400000": 3.5 - }, - "nightmare": { - "75000": 1, - "450000": 1, - "650000": 1, - "1250000": 2, - "3550000": 2.5, - "9050000": 3, - "20500000": 3.5 - } -} diff --git a/tiers/Tenebra the Shadow-Mistress [Tenebra].json b/tiers/Tenebra the Shadow-Mistress [Tenebra].json deleted file mode 100644 index 224840b..0000000 --- a/tiers/Tenebra the Shadow-Mistress [Tenebra].json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "normal": { - "800000": 1, - "1800000": 1, - "2600000": 2, - "5000000": 2.5, - "10000000": 3, - "36000000": 3.5 - }, - "hard": { - "1000000": 1, - "2250000": 1, - "3250000": 2, - "6250000": 2.5, - "12500000": 3, - "45000000": 3.5 - }, - "legendary": { - "1280000": 1, - "2880000": 1, - "4160000": 2, - "8000000": 2.5, - "16000000": 3, - "57600000": 3.5 - }, - "nightmare": { - "1600000": 1, - "3600000": 1, - "5200000": 2, - "10000000": 2.5, - "20000000": 3, - "72000000": 3.5 - } -} diff --git a/tiers/Teremarthu [Teremarthu].json b/tiers/Teremarthu [Teremarthu].json deleted file mode 100644 index 5553522..0000000 --- a/tiers/Teremarthu [Teremarthu].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "hard": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "legendary": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "nightmare": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - } -} \ No newline at end of file diff --git a/tiers/Tetrarchos [Tetrarchos].json b/tiers/Tetrarchos [Tetrarchos].json deleted file mode 100644 index 4cfbbad..0000000 --- a/tiers/Tetrarchos [Tetrarchos].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "225000": 1, - "1260000": 1, - "1710000": 1, - "3690000": 2, - "5625000": 2.5, - "12150000": 3, - "15300000": 3.5 - }, - "hard": { - "281000": 1, - "1575000": 1, - "2138000": 1, - "4613000": 2, - "7031000": 2.5, - "15188000": 3, - "19125000": 3.5 - }, - "legendary": { - "285000": 1, - "1596000": 1, - "2166000": 1, - "4674000": 2, - "7125000": 2.5, - "15390000": 3, - "19380000": 3.5 - }, - "nightmare": { - "450000": 1, - "2520000": 1, - "3420000": 1, - "7380000": 2, - "11250000": 2.5, - "24300000": 3, - "30600000": 3.5 - } -} diff --git a/tiers/Thaltherda [Thaltherda].json b/tiers/Thaltherda [Thaltherda].json deleted file mode 100644 index c598f07..0000000 --- a/tiers/Thaltherda [Thaltherda].json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "normal": { - "120000000": 48, - "180000000": 52, - "225000000": 56, - "240000000": 60, - "300000000": 64, - "500000000": 70, - "750000000": 84, - "1000000000": 108 - }, - "hard": { - "120000000": 48, - "180000000": 52, - "225000000": 56, - "240000000": 60, - "300000000": 64, - "500000000": 70, - "750000000": 84, - "1000000000": 108 - }, - "legendary": { - "120000000": 48, - "180000000": 52, - "225000000": 56, - "240000000": 60, - "300000000": 64, - "500000000": 70, - "750000000": 84, - "1000000000": 108 - }, - "nightmare": { - "120000000": 48, - "180000000": 52, - "225000000": 56, - "240000000": 60, - "300000000": 64, - "500000000": 70, - "750000000": 84, - "1000000000": 108 - } -} diff --git a/tiers/The Baroness [Baroness].json b/tiers/The Baroness [Baroness].json deleted file mode 100644 index b5aeac8..0000000 --- a/tiers/The Baroness [Baroness].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "170000": 1, - "952000": 1, - "1292000": 1, - "2788000": 2, - "4250000": 2.5, - "9180000": 3, - "11560000": 3.5 - }, - "hard": { - "213000": 1, - "1190000": 1, - "1615000": 1, - "3485000": 2, - "5313000": 2.5, - "11475000": 3, - "14450000": 3.5 - }, - "legendary": { - "272000": 1, - "1523000": 1, - "2067000": 1, - "4461000": 2, - "6800000": 2.5, - "14688000": 3, - "18496000": 3.5 - }, - "nightmare": { - "340000": 1, - "1904000": 1, - "2584000": 1, - "5576000": 2, - "8500000": 2.5, - "18360000": 3, - "23120000": 3.5 - } -} diff --git a/tiers/The Bash Brothers [B. Brothers.json b/tiers/The Bash Brothers [B. Brothers.json deleted file mode 100644 index e50b531..0000000 --- a/tiers/The Bash Brothers [B. Brothers.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "normal": { - "1000000000": 8, - "1500000000": 12, - "2000000000": 16, - "2500000000": 20, - "3000000000": 24, - "4000000000": 32, - "5000000000": 40, - "7500000000": 60, - "10000000000": 80, - "15000000000": 120, - "20000000000": 160 - }, - "hard": { - "1000000000": 8, - "1500000000": 12, - "2000000000": 16, - "2500000000": 20, - "3000000000": 24, - "4000000000": 32, - "5000000000": 40, - "7500000000": 60, - "10000000000": 80, - "15000000000": 120, - "20000000000": 160 - }, - "legendary": { - "1000000000": 8, - "1500000000": 12, - "2000000000": 16, - "2500000000": 20, - "3000000000": 24, - "4000000000": 32, - "5000000000": 40, - "7500000000": 60, - "10000000000": 80, - "15000000000": 120, - "20000000000": 160 - }, - "nightmare": { - "1000000000": 8, - "1500000000": 12, - "2000000000": 16, - "2500000000": 20, - "3000000000": 24, - "4000000000": 32, - "5000000000": 40, - "7500000000": 60, - "10000000000": 80, - "15000000000": 120, - "20000000000": 160 - } -} diff --git a/tiers/The Black Moon Pack [Black Moon].json b/tiers/The Black Moon Pack [Black Moon].json deleted file mode 100644 index bf675af..0000000 --- a/tiers/The Black Moon Pack [Black Moon].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "338000": 1, - "1890000": 1, - "2565000": 1, - "5535000": 2, - "8438000": 2.5, - "18225000": 3, - "22950000": 3.5 - }, - "hard": { - "422000": 1, - "2363000": 1, - "3206000": 1, - "6919000": 2, - "10547000": 2.5, - "22781000": 3, - "28688000": 3.5 - }, - "legendary": { - "540000": 1, - "3024000": 1, - "4104000": 1, - "8856000": 2, - "13500000": 2.5, - "29160000": 3, - "36720000": 3.5 - }, - "nightmare": { - "675000": 1, - "3780000": 1, - "5130000": 1, - "11070000": 2, - "16875000": 2.5, - "36450000": 3, - "45900000": 3.5 - } -} diff --git a/tiers/The Bog Bodies [Bog Bodies].json b/tiers/The Bog Bodies [Bog Bodies].json deleted file mode 100644 index 84ce3bc..0000000 --- a/tiers/The Bog Bodies [Bog Bodies].json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "normal": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26, - "1000000000": 30 - }, - "hard": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26, - "1000000000": 30 - }, - "legendary": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26, - "1000000000": 30 - }, - "nightmare": { - "8000000": 2, - "17000000": 3, - "26000000": 4, - "35000000": 5, - "45000000": 6, - "56000000": 7, - "67000000": 8, - "78000000": 9, - "90000000": 10, - "103000000": 11, - "116000000": 12, - "129000000": 13, - "143000000": 14, - "157000000": 15, - "173000000": 16, - "188000000": 17, - "202000000": 18, - "220000000": 19, - "238000000": 20, - "255000000": 21, - "270000000": 22, - "293000000": 23, - "311000000": 24, - "330000000": 25, - "350000000": 26, - "1000000000": 30 - } -} diff --git a/tiers/The Frozen Spire [Frozen Spire].json b/tiers/The Frozen Spire [Frozen Spire].json deleted file mode 100644 index 8eb359a..0000000 --- a/tiers/The Frozen Spire [Frozen Spire].json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "normal": { - "1000000000": "61.0", - "5000000000": "296.0", - "10000000000": "422.0", - "15000000000": "470.0", - "20000000000": "535.0", - "30000000000": "604.0", - "40000000000": "675.0", - "50000000000": "795.0", - "60000000000": "848.0" - }, - "hard": { - "1000000000": "61.0", - "5000000000": "296.0", - "10000000000": "422.0", - "15000000000": "470.0", - "20000000000": "535.0", - "30000000000": "604.0", - "40000000000": "675.0", - "50000000000": "795.0", - "60000000000": "848.0" - }, - "legendary": { - "1000000000": "61.0", - "5000000000": "296.0", - "10000000000": "422.0", - "15000000000": "470.0", - "20000000000": "535.0", - "30000000000": "604.0", - "40000000000": "675.0", - "50000000000": "795.0", - "60000000000": "848.0" - }, - "nightmare": { - "1000000000": "61.0", - "5000000000": "296.0", - "10000000000": "422.0", - "15000000000": "470.0", - "20000000000": "535.0", - "30000000000": "604.0", - "40000000000": "675.0", - "50000000000": "795.0", - "60000000000": "848.0" - } -} \ No newline at end of file diff --git a/tiers/The Haunted Forest [Forest].json b/tiers/The Haunted Forest [Forest].json deleted file mode 100644 index 54a787c..0000000 --- a/tiers/The Haunted Forest [Forest].json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "normal": { - "1000000000": "95.0", - "1250000000": "104.0", - "1500000000": "114.0", - "1750000000": "128.0", - "2000000000": "140.0", - "2250000000": "152.0", - "2500000000": "170.0", - "2750000000": "192.0", - "3000000000": "231.0", - "4000000000": "261.0", - "5000000000": "306.0", - "6000000000": "352.0", - "8000000000": "382.0", - "10000000000": "415.0", - "12500000000": "445.0", - "15000000000": "477.0", - "20000000000": "539.0", - "25000000000": "577.0", - "30000000000": "616.0", - "35000000000": "655.0", - "40000000000": "695.0" - }, - "hard": { - "1000000000": "95.0", - "1250000000": "104.0", - "1500000000": "114.0", - "1750000000": "128.0", - "2000000000": "140.0", - "2250000000": "152.0", - "2500000000": "170.0", - "2750000000": "192.0", - "3000000000": "231.0", - "4000000000": "261.0", - "5000000000": "306.0", - "6000000000": "352.0", - "8000000000": "382.0", - "10000000000": "415.0", - "12500000000": "445.0", - "15000000000": "477.0", - "20000000000": "539.0", - "25000000000": "577.0", - "30000000000": "616.0", - "35000000000": "655.0", - "40000000000": "695.0" - }, - "legendary": { - "1000000000": "95.0", - "1250000000": "104.0", - "1500000000": "114.0", - "1750000000": "128.0", - "2000000000": "140.0", - "2250000000": "152.0", - "2500000000": "170.0", - "2750000000": "192.0", - "3000000000": "231.0", - "4000000000": "261.0", - "5000000000": "306.0", - "6000000000": "352.0", - "8000000000": "382.0", - "10000000000": "415.0", - "12500000000": "445.0", - "15000000000": "477.0", - "20000000000": "539.0", - "25000000000": "577.0", - "30000000000": "616.0", - "35000000000": "655.0", - "40000000000": "695.0" - }, - "nightmare": { - "1000000000": "95.0", - "1250000000": "104.0", - "1500000000": "114.0", - "1750000000": "128.0", - "2000000000": "140.0", - "2250000000": "152.0", - "2500000000": "170.0", - "2750000000": "192.0", - "3000000000": "231.0", - "4000000000": "261.0", - "5000000000": "306.0", - "6000000000": "352.0", - "8000000000": "382.0", - "10000000000": "415.0", - "12500000000": "445.0", - "15000000000": "477.0", - "20000000000": "539.0", - "25000000000": "577.0", - "30000000000": "616.0", - "35000000000": "655.0", - "40000000000": "695.0" - } -} \ No newline at end of file diff --git a/tiers/The Sight of Solus [Sight of Solus].json b/tiers/The Sight of Solus [Sight of Solus].json deleted file mode 100644 index c5aca63..0000000 --- a/tiers/The Sight of Solus [Sight of Solus].json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "nightmare": { - "100000000": { - "epic": 10, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "300000000": { - "epic": 25, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "500000000": { - "epic": 45, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "1000000000": { - "epic": 91, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3000000000": { - "epic": 273, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000": { - "epic": 325, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "7000000000": { - "epic": 377, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "8000000000": { - "epic": 428, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000": { - "epic": 480, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/The Thaw of Elvigar [Thaw of Elvigar].json b/tiers/The Thaw of Elvigar [Thaw of Elvigar].json deleted file mode 100644 index d8d3fd4..0000000 --- a/tiers/The Thaw of Elvigar [Thaw of Elvigar].json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "normal": { - "1000000000": "95.0", - "1250000000": "104.0", - "1500000000": "114.0", - "1750000000": "128.0", - "2000000000": "140.0", - "2250000000": "152.0", - "2500000000": "170.0", - "2750000000": "192.0", - "3000000000": "231.0", - "4000000000": "261.0", - "5000000000": "306.0", - "6000000000": "353.0", - "8000000000": "383.0", - "10000000000": "414.0", - "12500000000": "444.0", - "15000000000": "477.0", - "20000000000": "539.0", - "25000000000": "585.0" - }, - "hard": { - "1000000000": "95.0", - "1250000000": "104.0", - "1500000000": "114.0", - "1750000000": "128.0", - "2000000000": "140.0", - "2250000000": "152.0", - "2500000000": "170.0", - "2750000000": "192.0", - "3000000000": "231.0", - "4000000000": "261.0", - "5000000000": "306.0", - "6000000000": "353.0", - "8000000000": "383.0", - "10000000000": "414.0", - "12500000000": "444.0", - "15000000000": "477.0", - "20000000000": "539.0", - "25000000000": "585.0" - }, - "legendary": { - "1000000000": "95.0", - "1250000000": "104.0", - "1500000000": "114.0", - "1750000000": "128.0", - "2000000000": "140.0", - "2250000000": "152.0", - "2500000000": "170.0", - "2750000000": "192.0", - "3000000000": "231.0", - "4000000000": "261.0", - "5000000000": "306.0", - "6000000000": "353.0", - "8000000000": "383.0", - "10000000000": "414.0", - "12500000000": "444.0", - "15000000000": "477.0", - "20000000000": "539.0", - "25000000000": "585.0" - }, - "nightmare": { - "1000000000": "95.0", - "1250000000": "104.0", - "1500000000": "114.0", - "1750000000": "128.0", - "2000000000": "140.0", - "2250000000": "152.0", - "2500000000": "170.0", - "2750000000": "192.0", - "3000000000": "231.0", - "4000000000": "261.0", - "5000000000": "306.0", - "6000000000": "353.0", - "8000000000": "383.0", - "10000000000": "414.0", - "12500000000": "444.0", - "15000000000": "477.0", - "20000000000": "539.0", - "25000000000": "585.0" - } -} \ No newline at end of file diff --git a/tiers/Thratu's Abomination [Abomination].json b/tiers/Thratu's Abomination [Abomination].json deleted file mode 100644 index 327c8ae..0000000 --- a/tiers/Thratu's Abomination [Abomination].json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "normal": { - "200000000": "6.0", - "300000000": "7.0", - "400000000": "8.0", - "500000000": "10.0", - "600000000": "11.0", - "700000000": "12.0", - "800000000": "13.0", - "900000000": "14.0", - "1000000000": "17.0", - "1250000000": "21.0", - "1500000000": "25.0", - "1750000000": "29.0", - "2000000000": "33.0", - "2250000000": "37.0", - "2500000000": "41.0", - "2750000000": "45.0", - "3000000000": "49.0", - "4000000000": "53.0", - "5000000000": "60.0", - "6000000000": "68.0", - "8000000000": "76.0", - "10000000000": "83.0", - "12500000000": "94.0", - "15000000000": "105.0", - "20000000000": "126.0" - }, - "hard": { - "200000000": "6.0", - "300000000": "7.0", - "400000000": "8.0", - "500000000": "10.0", - "600000000": "11.0", - "700000000": "12.0", - "800000000": "13.0", - "900000000": "14.0", - "1000000000": "17.0", - "1250000000": "21.0", - "1500000000": "25.0", - "1750000000": "29.0", - "2000000000": "33.0", - "2250000000": "37.0", - "2500000000": "41.0", - "2750000000": "45.0", - "3000000000": "49.0", - "4000000000": "53.0", - "5000000000": "60.0", - "6000000000": "68.0", - "8000000000": "76.0", - "10000000000": "83.0", - "12500000000": "94.0", - "15000000000": "105.0", - "20000000000": "126.0" - }, - "legendary": { - "200000000": "6.0", - "300000000": "7.0", - "400000000": "8.0", - "500000000": "10.0", - "600000000": "11.0", - "700000000": "12.0", - "800000000": "13.0", - "900000000": "14.0", - "1000000000": "17.0", - "1250000000": "21.0", - "1500000000": "25.0", - "1750000000": "29.0", - "2000000000": "33.0", - "2250000000": "37.0", - "2500000000": "41.0", - "2750000000": "45.0", - "3000000000": "49.0", - "4000000000": "53.0", - "5000000000": "60.0", - "6000000000": "68.0", - "8000000000": "76.0", - "10000000000": "83.0", - "12500000000": "94.0", - "15000000000": "105.0", - "20000000000": "126.0" - }, - "nightmare": { - "200000000": "6.0", - "300000000": "7.0", - "400000000": "8.0", - "500000000": "10.0", - "600000000": "11.0", - "700000000": "12.0", - "800000000": "13.0", - "900000000": "14.0", - "1000000000": "17.0", - "1250000000": "21.0", - "1500000000": "25.0", - "1750000000": "29.0", - "2000000000": "33.0", - "2250000000": "37.0", - "2500000000": "41.0", - "2750000000": "45.0", - "3000000000": "49.0", - "4000000000": "53.0", - "5000000000": "60.0", - "6000000000": "68.0", - "8000000000": "76.0", - "10000000000": "83.0", - "12500000000": "94.0", - "15000000000": "105.0", - "20000000000": "126.0" - } -} \ No newline at end of file diff --git a/tiers/Tisiphone the Vengeful [Tisiphone].json b/tiers/Tisiphone the Vengeful [Tisiphone].json deleted file mode 100644 index 45b7db3..0000000 --- a/tiers/Tisiphone the Vengeful [Tisiphone].json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "normal": { - "5000000": "1.0", - "7000000": "2.0", - "9000000": "3.0", - "10000000": "4.0", - "15000000": "5.0", - "20000000": "6.0", - "25000000": "7.0", - "30000000": "8.0", - "35000000": "9.0", - "40000000": "10.0", - "45000000": "11.0" - }, - "hard": { - "25000000": "1.0", - "35000000": "2.0", - "45000000": "3.0", - "50000000": "4.0", - "75000000": "5.0", - "100000000": "6.0", - "125000000": "7.0", - "150000000": "8.0", - "175000000": "9.0", - "200000000": "10.0", - "225000000": "11.0" - }, - "legendary": { - "50000000": "1.0", - "70000000": "2.0", - "90000000": "3.0", - "100000000": "4.0", - "150000000": "5.0", - "200000000": "6.0", - "250000000": "7.0", - "300000000": "8.0", - "350000000": "9.0", - "400000000": "10.0", - "450000000": "11.0" - }, - "nightmare": { - "75000000": "1.0", - "105000000": "2.0", - "135000000": "3.0", - "150000000": "4.0", - "225000000": "5.0", - "300000000": "6.0", - "375000000": "7.0", - "450000000": "8.0", - "525000000": "9.0", - "600000000": "10.0", - "675000000": "11.0" - } -} \ No newline at end of file diff --git a/tiers/Tithrasia [Tithrasia].json b/tiers/Tithrasia [Tithrasia].json deleted file mode 100644 index e0a178b..0000000 --- a/tiers/Tithrasia [Tithrasia].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "945000": 1, - "1080000": 1, - "1620000": 1, - "2160000": 2, - "2880000": 2.5, - "4500000": 3, - "6300000": 3.5 - }, - "hard": { - "1181000": 1, - "1350000": 1, - "2025000": 1, - "2700000": 2, - "3600000": 2.5, - "5625000": 3, - "7875000": 3.5 - }, - "legendary": { - "1512000": 1, - "1728000": 1, - "2592000": 1, - "3456000": 2, - "4608000": 2.5, - "72000000": 3, - "10080000": 3.5 - }, - "nightmare": { - "1890000": 1, - "2160000": 1, - "3240000": 1, - "4320000": 2, - "5760000": 2.5, - "9000000": 3, - "12600000": 3.5 - } -} diff --git a/tiers/Tomb Gargole [Riddler].json b/tiers/Tomb Gargole [Riddler].json deleted file mode 100644 index f0cc783..0000000 --- a/tiers/Tomb Gargole [Riddler].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "100000000": 7, - "200000000": 8, - "300000000": 9, - "400000000": 10, - "500000000": 11, - "600000000": 12, - "700000000": 13, - "800000000": 14, - "900000000": 15, - "1000000000": 16 - }, - "hard": { - "100000000": 7, - "200000000": 8, - "300000000": 9, - "400000000": 10, - "500000000": 11, - "600000000": 12, - "700000000": 13, - "800000000": 14, - "900000000": 15, - "1000000000": 16 - }, - "legendary": { - "100000000": 7, - "200000000": 8, - "300000000": 9, - "400000000": 10, - "500000000": 11, - "600000000": 12, - "700000000": 13, - "800000000": 14, - "900000000": 15, - "1000000000": 16 - }, - "nightmare": { - "100000000": 7, - "200000000": 8, - "300000000": 9, - "400000000": 10, - "500000000": 11, - "600000000": 12, - "700000000": 13, - "800000000": 14, - "900000000": 15, - "1000000000": 16 - } -} diff --git a/tiers/Trekex's Amphibious Assault [Trekex].json b/tiers/Trekex's Amphibious Assault [Trekex].json deleted file mode 100644 index 33ddd35..0000000 --- a/tiers/Trekex's Amphibious Assault [Trekex].json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "normal": { - "100000000": "21.0", - "150000000": "28.0", - "200000000": "38.0", - "250000000": "44.0", - "300000000": "47.0", - "400000000": "59.0", - "500000000": "68.0", - "750000000": "94.0", - "1000000000": "119.0", - "1250000000": "147.0", - "1500000000": "179.0", - "1750000000": "215.0", - "2000000000": "250.0", - "2500000000": "308.0", - "3000000000": "381.0", - "3500000000": "431.0", - "4000000000": "498.0", - "4500000000": "546.0", - "5000000000": "557.0", - "6000000000": "593.0", - "7000000000": "627.0", - "8000000000": "661.0", - "9000000000": "691.0", - "10000000000": "725.0", - "12500000000": "790.0", - "15000000000": "861.0", - "17500000000": "926.0", - "20000000000": "980.0" - }, - "hard": { - "100000000": "21.0", - "150000000": "28.0", - "200000000": "38.0", - "250000000": "44.0", - "300000000": "47.0", - "400000000": "59.0", - "500000000": "68.0", - "750000000": "94.0", - "1000000000": "119.0", - "1250000000": "147.0", - "1500000000": "179.0", - "1750000000": "215.0", - "2000000000": "250.0", - "2500000000": "308.0", - "3000000000": "381.0", - "3500000000": "431.0", - "4000000000": "498.0", - "4500000000": "546.0", - "5000000000": "557.0", - "6000000000": "593.0", - "7000000000": "627.0", - "8000000000": "661.0", - "9000000000": "691.0", - "10000000000": "725.0", - "12500000000": "790.0", - "15000000000": "861.0", - "17500000000": "926.0", - "20000000000": "980.0" - }, - "legendary": { - "100000000": "21.0", - "150000000": "28.0", - "200000000": "38.0", - "250000000": "44.0", - "300000000": "47.0", - "400000000": "59.0", - "500000000": "68.0", - "750000000": "94.0", - "1000000000": "119.0", - "1250000000": "147.0", - "1500000000": "179.0", - "1750000000": "215.0", - "2000000000": "250.0", - "2500000000": "308.0", - "3000000000": "381.0", - "3500000000": "431.0", - "4000000000": "498.0", - "4500000000": "546.0", - "5000000000": "557.0", - "6000000000": "593.0", - "7000000000": "627.0", - "8000000000": "661.0", - "9000000000": "691.0", - "10000000000": "725.0", - "12500000000": "790.0", - "15000000000": "861.0", - "17500000000": "926.0", - "20000000000": "980.0" - }, - "nightmare": { - "100000000": "21.0", - "150000000": "28.0", - "200000000": "38.0", - "250000000": "44.0", - "300000000": "47.0", - "400000000": "59.0", - "500000000": "68.0", - "750000000": "94.0", - "1000000000": "119.0", - "1250000000": "147.0", - "1500000000": "179.0", - "1750000000": "215.0", - "2000000000": "250.0", - "2500000000": "308.0", - "3000000000": "381.0", - "3500000000": "431.0", - "4000000000": "498.0", - "4500000000": "546.0", - "5000000000": "557.0", - "6000000000": "593.0", - "7000000000": "627.0", - "8000000000": "661.0", - "9000000000": "691.0", - "10000000000": "725.0", - "12500000000": "790.0", - "15000000000": "861.0", - "17500000000": "926.0", - "20000000000": "980.0" - } -} \ No newline at end of file diff --git a/tiers/Tuxargus [Tuxargus].json b/tiers/Tuxargus [Tuxargus].json deleted file mode 100644 index 2936d82..0000000 --- a/tiers/Tuxargus [Tuxargus].json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "normal": { - "20000000": 1, - "28000000": 2, - "36000000": 3, - "40000000": 4, - "60000000": 5, - "80000000": 6, - "100000000": 7, - "120000000": 8, - "140000000": 9, - "160000000": 10, - "180000000": 11 - }, - "hard": { - "25000000": 1, - "35000000": 2, - "45000000": 3, - "50000000": 4, - "75000000": 5, - "100000000": 6, - "125000000": 7, - "150000000": 8, - "175000000": 9, - "200000000": 10, - "225000000": 11 - }, - "legendary": { - "32000000": 1, - "45000000": 2, - "58000000": 3, - "64000000": 4, - "96000000": 5, - "128000000": 6, - "160000000": 7, - "192000000": 8, - "224000000": 9, - "256000000": 10, - "288000000": 11 - }, - "nightmare": { - "40000000": 1, - "56000000": 2, - "72000000": 3, - "80000000": 4, - "120000000": 5, - "160000000": 6, - "200000000": 7, - "240000000": 8, - "280000000": 9, - "320000000": 10, - "360000000": 11 - } -} \ No newline at end of file diff --git a/tiers/Tyranthius [Tyranthius].json b/tiers/Tyranthius [Tyranthius].json deleted file mode 100644 index 89d3a62..0000000 --- a/tiers/Tyranthius [Tyranthius].json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "normal": { - "240000": 1, - "540000": 1, - "780000": 2, - "1500000": 2.5, - "3000000": 3, - "10800000": 3.5 - }, - "hard": { - "300000": 1, - "675000": 1, - "975000": 2, - "1875000": 2.5, - "3750000": 3, - "13500000": 3.5 - }, - "legendary": { - "384000": 1, - "864000": 1, - "1248000": 2, - "2400000": 2.5, - "4800000": 3, - "1728000": 3.5 - }, - "nightmare": { - "480000": 1, - "1080000": 1, - "1560000": 2, - "3000000": 2.5, - "6000000": 3, - "21600000": 3.5 - } -} diff --git a/tiers/Ulfrik [Ulfrik].json b/tiers/Ulfrik [Ulfrik].json deleted file mode 100644 index 478a3fd..0000000 --- a/tiers/Ulfrik [Ulfrik].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "75000": 1, - "450000": 1, - "650000": 1, - "1250000": 2, - "3550000": 2.5, - "9050000": 3, - "20500000": 3.5 - }, - "hard": { - "94000": 1, - "563000": 1, - "813000": 1, - "1563000": 2, - "4438000": 2.5, - "11313000": 3, - "25625000": 3.5 - }, - "legendary": { - "120000": 1, - "720000": 1, - "1040000": 1, - "2000000": 2, - "5680000": 2.5, - "14480000": 3, - "32800000": 3.5 - }, - "nightmare": { - "150000": 1, - "900000": 1, - "1300000": 1, - "2500000": 2, - "7100000": 2.5, - "18100000": 3, - "41000000": 3.5 - } -} diff --git a/tiers/Unholy Rite [Unholy Rite].json b/tiers/Unholy Rite [Unholy Rite].json deleted file mode 100644 index ba2ce60..0000000 --- a/tiers/Unholy Rite [Unholy Rite].json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "nightmare": { - "2000000000": { - "epic": 212, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "2500000000": { - "epic": 264, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "3000000000": { - "epic": 331, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "4000000000": { - "epic": 381, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "5000000000": { - "epic": 433, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "7500000000": { - "epic": 485, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "10000000000": { - "epic": 541, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "15000000000": { - "epic": 624, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "20000000000": { - "epic": 707, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - }, - "25000000000": { - "epic": 815, - "legendary": null, - "uncommon": null, - "common": null, - "stats": null - } - } -} diff --git a/tiers/Valanazes the Gold [Valanazes].json b/tiers/Valanazes the Gold [Valanazes].json deleted file mode 100644 index ff2ede4..0000000 --- a/tiers/Valanazes the Gold [Valanazes].json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "normal": { - "960000": 1, - "2160000": 1, - "3120000": 2, - "6000000": 2.5, - "12000000": 3, - "43200000": 3.5 - }, - "hard": { - "1200000": 1, - "2700000": 1, - "3900000": 2, - "7500000": 2.5, - "15000000": 3, - "54000000": 3.5 - }, - "legendary": { - "1536000": 1, - "3456000": 1, - "4992000": 2, - "9600000": 2.5, - "19200000": 3, - "69120000": 3.5 - }, - "nightmare": { - "1920000": 1, - "4320000": 1, - "6240000": 2, - "12000000": 2.5, - "24000000": 3, - "86400000": 3.5 - } -} diff --git a/tiers/Valley of Death [Valley of Death].json b/tiers/Valley of Death [Valley of Death].json deleted file mode 100644 index 8438e23..0000000 --- a/tiers/Valley of Death [Valley of Death].json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "normal": { - "150000000": "0.0", - "250000000": "1.0", - "500000000": "2.0", - "750000000": "5.0", - "1000000000": "10.0", - "1500000000": "15.0", - "2000000000": "21.0", - "2500000000": "35.0", - "3000000000": "60.0", - "3500000000": "63.0", - "4000000000": "67.0", - "4500000000": "72.0", - "5000000000": "76.0", - "6500000000": "84.0", - "8000000000": "92.0" - }, - "hard": { - "150000000": "0.0", - "250000000": "1.0", - "500000000": "2.0", - "750000000": "5.0", - "1000000000": "10.0", - "1500000000": "15.0", - "2000000000": "21.0", - "2500000000": "35.0", - "3000000000": "60.0", - "3500000000": "63.0", - "4000000000": "67.0", - "4500000000": "72.0", - "5000000000": "76.0", - "6500000000": "84.0", - "8000000000": "92.0" - }, - "legendary": { - "150000000": "0.0", - "250000000": "1.0", - "500000000": "2.0", - "750000000": "5.0", - "1000000000": "10.0", - "1500000000": "15.0", - "2000000000": "21.0", - "2500000000": "35.0", - "3000000000": "60.0", - "3500000000": "63.0", - "4000000000": "67.0", - "4500000000": "72.0", - "5000000000": "76.0", - "6500000000": "84.0", - "8000000000": "92.0" - }, - "nightmare": { - "150000000": "0.0", - "250000000": "1.0", - "500000000": "2.0", - "750000000": "5.0", - "1000000000": "10.0", - "1500000000": "15.0", - "2000000000": "21.0", - "2500000000": "35.0", - "3000000000": "60.0", - "3500000000": "63.0", - "4000000000": "67.0", - "4500000000": "72.0", - "5000000000": "76.0", - "6500000000": "84.0", - "8000000000": "92.0" - } -} \ No newline at end of file diff --git a/tiers/Valtrias [Valtrias].json b/tiers/Valtrias [Valtrias].json deleted file mode 100644 index ea9a935..0000000 --- a/tiers/Valtrias [Valtrias].json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "normal": { - "50000000": "1.0", - "100000000": "2.0", - "250000000": "4.0", - "500000000": "17.0", - "750000000": "21.0", - "1000000000": "27.0", - "1250000000": "35.0", - "1500000000": "44.0", - "2000000000": "53.0", - "2500000000": "61.0", - "5000000000": "99.0" - }, - "hard": { - "50000000": "1.0", - "100000000": "2.0", - "250000000": "4.0", - "500000000": "17.0", - "750000000": "21.0", - "1000000000": "27.0", - "1250000000": "35.0", - "1500000000": "44.0", - "2000000000": "53.0", - "2500000000": "61.0", - "5000000000": "99.0" - }, - "legendary": { - "50000000": "1.0", - "100000000": "2.0", - "250000000": "4.0", - "500000000": "17.0", - "750000000": "21.0", - "1000000000": "27.0", - "1250000000": "35.0", - "1500000000": "44.0", - "2000000000": "53.0", - "2500000000": "61.0", - "5000000000": "99.0" - }, - "nightmare": { - "50000000": "1.0", - "100000000": "2.0", - "250000000": "4.0", - "500000000": "17.0", - "750000000": "21.0", - "1000000000": "27.0", - "1250000000": "35.0", - "1500000000": "44.0", - "2000000000": "53.0", - "2500000000": "61.0", - "5000000000": "99.0" - } -} \ No newline at end of file diff --git a/tiers/Varlachleth [Varlachleth].json b/tiers/Varlachleth [Varlachleth].json deleted file mode 100644 index b8ab25b..0000000 --- a/tiers/Varlachleth [Varlachleth].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "660000": 1, - "2970000": 1, - "4950000": 1, - "7260000": 2, - "10560000": 2.5, - "21450000": 3, - "29700000": 3.5 - }, - "hard": { - "825000": 1, - "3713000": 1, - "6188000": 1, - "9075000": 2, - "13200000": 2.5, - "26813000": 3, - "37125000": 3.5 - }, - "legendary": { - "1056000": 1, - "4752000": 1, - "7920000": 1, - "11616000": 2, - "16896000": 2.5, - "34320000": 3, - "47520000": 3.5 - }, - "nightmare": { - "1320000": 1, - "5940000": 1, - "9900000": 1, - "14520000": 2, - "21120000": 2.5, - "42900000": 3, - "59400000": 3.5 - } -} diff --git a/tiers/Vineborn Behemoth [Behemoth].json b/tiers/Vineborn Behemoth [Behemoth].json deleted file mode 100644 index 56454d6..0000000 --- a/tiers/Vineborn Behemoth [Behemoth].json +++ /dev/null @@ -1,126 +0,0 @@ -{ - "normal": { - "200000000": "4.0", - "300000000": "6.0", - "400000000": "10.0", - "500000000": "14.0", - "600000000": "18.0", - "700000000": "19.0", - "800000000": "23.0", - "900000000": "26.0", - "1000000000": "29.0", - "1250000000": "32.0", - "1500000000": "36.0", - "1750000000": "40.0", - "2000000000": "44.0", - "2250000000": "48.0", - "2500000000": "53.0", - "2750000000": "60.0", - "3000000000": "72.0", - "4000000000": "83.0", - "5000000000": "98.0", - "6000000000": "114.0", - "8000000000": "125.0", - "10000000000": "136.0", - "12500000000": "146.0", - "15000000000": "157.0", - "20000000000": "177.0", - "25000000000": "190.0", - "30000000000": "203.0", - "35000000000": "216.0", - "40000000000": "230.0" - }, - "hard": { - "200000000": "4.0", - "300000000": "6.0", - "400000000": "10.0", - "500000000": "14.0", - "600000000": "18.0", - "700000000": "19.0", - "800000000": "23.0", - "900000000": "26.0", - "1000000000": "29.0", - "1250000000": "32.0", - "1500000000": "36.0", - "1750000000": "40.0", - "2000000000": "44.0", - "2250000000": "48.0", - "2500000000": "53.0", - "2750000000": "60.0", - "3000000000": "72.0", - "4000000000": "83.0", - "5000000000": "98.0", - "6000000000": "114.0", - "8000000000": "125.0", - "10000000000": "136.0", - "12500000000": "146.0", - "15000000000": "157.0", - "20000000000": "177.0", - "25000000000": "190.0", - "30000000000": "203.0", - "35000000000": "216.0", - "40000000000": "230.0" - }, - "legendary": { - "200000000": "4.0", - "300000000": "6.0", - "400000000": "10.0", - "500000000": "14.0", - "600000000": "18.0", - "700000000": "19.0", - "800000000": "23.0", - "900000000": "26.0", - "1000000000": "29.0", - "1250000000": "32.0", - "1500000000": "36.0", - "1750000000": "40.0", - "2000000000": "44.0", - "2250000000": "48.0", - "2500000000": "53.0", - "2750000000": "60.0", - "3000000000": "72.0", - "4000000000": "83.0", - "5000000000": "98.0", - "6000000000": "114.0", - "8000000000": "125.0", - "10000000000": "136.0", - "12500000000": "146.0", - "15000000000": "157.0", - "20000000000": "177.0", - "25000000000": "190.0", - "30000000000": "203.0", - "35000000000": "216.0", - "40000000000": "230.0" - }, - "nightmare": { - "200000000": "4.0", - "300000000": "6.0", - "400000000": "10.0", - "500000000": "14.0", - "600000000": "18.0", - "700000000": "19.0", - "800000000": "23.0", - "900000000": "26.0", - "1000000000": "29.0", - "1250000000": "32.0", - "1500000000": "36.0", - "1750000000": "40.0", - "2000000000": "44.0", - "2250000000": "48.0", - "2500000000": "53.0", - "2750000000": "60.0", - "3000000000": "72.0", - "4000000000": "83.0", - "5000000000": "98.0", - "6000000000": "114.0", - "8000000000": "125.0", - "10000000000": "136.0", - "12500000000": "146.0", - "15000000000": "157.0", - "20000000000": "177.0", - "25000000000": "190.0", - "30000000000": "203.0", - "35000000000": "216.0", - "40000000000": "230.0" - } -} \ No newline at end of file diff --git a/tiers/Vortex Abomination [Vortex].json b/tiers/Vortex Abomination [Vortex].json deleted file mode 100644 index 157fae0..0000000 --- a/tiers/Vortex Abomination [Vortex].json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "normal": { - "200000000": "3.0", - "300000000": "10.0", - "400000000": "14.0", - "500000000": "15.0", - "600000000": "17.0", - "700000000": "18.0", - "800000000": "21.0", - "900000000": "23.0", - "1000000000": "32.0", - "1500000000": "37.0", - "2000000000": "44.0", - "2500000000": "52.0", - "3000000000": "58.0", - "3500000000": "90.0" - }, - "hard": { - "200000000": "3.0", - "300000000": "10.0", - "400000000": "14.0", - "500000000": "15.0", - "600000000": "17.0", - "700000000": "18.0", - "800000000": "21.0", - "900000000": "23.0", - "1000000000": "32.0", - "1500000000": "37.0", - "2000000000": "44.0", - "2500000000": "52.0", - "3000000000": "58.0", - "3500000000": "90.0" - }, - "legendary": { - "200000000": "3.0", - "300000000": "10.0", - "400000000": "14.0", - "500000000": "15.0", - "600000000": "17.0", - "700000000": "18.0", - "800000000": "21.0", - "900000000": "23.0", - "1000000000": "32.0", - "1500000000": "37.0", - "2000000000": "44.0", - "2500000000": "52.0", - "3000000000": "58.0", - "3500000000": "90.0" - }, - "nightmare": { - "200000000": "3.0", - "300000000": "10.0", - "400000000": "14.0", - "500000000": "15.0", - "600000000": "17.0", - "700000000": "18.0", - "800000000": "21.0", - "900000000": "23.0", - "1000000000": "32.0", - "1500000000": "37.0", - "2000000000": "44.0", - "2500000000": "52.0", - "3000000000": "58.0", - "3500000000": "90.0" - } -} \ No newline at end of file diff --git a/tiers/Way Warden [Way Warden].json b/tiers/Way Warden [Way Warden].json deleted file mode 100644 index 07969fd..0000000 --- a/tiers/Way Warden [Way Warden].json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "normal": { - "100000000": "3.0", - "200000000": "6.0", - "300000000": "7.0", - "400000000": "8.0", - "500000000": "10.0", - "600000000": "11.0", - "700000000": "13.0", - "800000000": "14.0", - "880000000": "15.0", - "1000000000": "17.0", - "1250000000": "21.0", - "1500000000": "25.0", - "1750000000": "29.0", - "2000000000": "31.0", - "2250000000": "37.0", - "2500000000": "42.0", - "2750000000": "45.0", - "3000000000": "50.0", - "4000000000": "54.0", - "5000000000": "62.0", - "6000000000": "70.0", - "8000000000": "78.0", - "10000000000": "85.0", - "12500000000": "95.0", - "15000000000": "106.0", - "20000000000": "126.0", - "25000000000": "136.0" - }, - "hard": { - "100000000": "3.0", - "200000000": "6.0", - "300000000": "7.0", - "400000000": "8.0", - "500000000": "10.0", - "600000000": "11.0", - "700000000": "13.0", - "800000000": "14.0", - "880000000": "15.0", - "1000000000": "17.0", - "1250000000": "21.0", - "1500000000": "25.0", - "1750000000": "29.0", - "2000000000": "31.0", - "2250000000": "37.0", - "2500000000": "42.0", - "2750000000": "45.0", - "3000000000": "50.0", - "4000000000": "54.0", - "5000000000": "62.0", - "6000000000": "70.0", - "8000000000": "78.0", - "10000000000": "85.0", - "12500000000": "95.0", - "15000000000": "106.0", - "20000000000": "126.0", - "25000000000": "136.0" - }, - "legendary": { - "100000000": "3.0", - "200000000": "6.0", - "300000000": "7.0", - "400000000": "8.0", - "500000000": "10.0", - "600000000": "11.0", - "700000000": "13.0", - "800000000": "14.0", - "880000000": "15.0", - "1000000000": "17.0", - "1250000000": "21.0", - "1500000000": "25.0", - "1750000000": "29.0", - "2000000000": "31.0", - "2250000000": "37.0", - "2500000000": "42.0", - "2750000000": "45.0", - "3000000000": "50.0", - "4000000000": "54.0", - "5000000000": "62.0", - "6000000000": "70.0", - "8000000000": "78.0", - "10000000000": "85.0", - "12500000000": "95.0", - "15000000000": "106.0", - "20000000000": "126.0", - "25000000000": "136.0" - }, - "nightmare": { - "100000000": "3.0", - "200000000": "6.0", - "300000000": "7.0", - "400000000": "8.0", - "500000000": "10.0", - "600000000": "11.0", - "700000000": "13.0", - "800000000": "14.0", - "880000000": "15.0", - "1000000000": "17.0", - "1250000000": "21.0", - "1500000000": "25.0", - "1750000000": "29.0", - "2000000000": "31.0", - "2250000000": "37.0", - "2500000000": "42.0", - "2750000000": "45.0", - "3000000000": "50.0", - "4000000000": "54.0", - "5000000000": "62.0", - "6000000000": "70.0", - "8000000000": "78.0", - "10000000000": "85.0", - "12500000000": "95.0", - "15000000000": "106.0", - "20000000000": "126.0", - "25000000000": "136.0" - } -} \ No newline at end of file diff --git a/tiers/Wexxa the Worm-Tamer [Wexxa].json b/tiers/Wexxa the Worm-Tamer [Wexxa].json deleted file mode 100644 index 8ff53fc..0000000 --- a/tiers/Wexxa the Worm-Tamer [Wexxa].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "220000": 1, - "990000": 1, - "1650000": 1, - "2420000": 2, - "3520000": 2.5, - "7150000": 3, - "9900000": 3.5 - }, - "hard": { - "275000": 1, - "1238000": 1, - "2063000": 1, - "3025000": 2, - "4400000": 2.5, - "8938000": 3, - "12375000": 3.5 - }, - "legendary": { - "352000": 1, - "1584000": 1, - "2640000": 1, - "3872000": 2, - "5632000": 2.5, - "11440000": 3, - "15840000": 3.5 - }, - "nightmare": { - "440000": 1, - "1980000": 1, - "3300000": 1, - "4840000": 2, - "7040000": 2.5, - "14300000": 3, - "19800000": 3.5 - } -} diff --git a/tiers/Xerkara [Xerkara].json b/tiers/Xerkara [Xerkara].json deleted file mode 100644 index 9a6e9b1..0000000 --- a/tiers/Xerkara [Xerkara].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "60.0", - "5000000000": "90.0", - "8000000000": "100.0" - }, - "hard": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "60.0", - "5000000000": "90.0", - "8000000000": "100.0" - }, - "legendary": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "60.0", - "5000000000": "90.0", - "8000000000": "100.0" - }, - "nightmare": { - "225000000": "8.0", - "240000000": "9.0", - "300000000": "14.0", - "400000000": "16.0", - "750000000": "19.0", - "1000000000": "23.0", - "1500000000": "33.0", - "2500000000": "60.0", - "5000000000": "90.0", - "8000000000": "100.0" - } -} \ No newline at end of file diff --git a/tiers/Xessus of the Grim Wood [Xessus of the Grim Wood].json b/tiers/Xessus of the Grim Wood [Xessus of the Grim Wood].json deleted file mode 100644 index 847c538..0000000 --- a/tiers/Xessus of the Grim Wood [Xessus of the Grim Wood].json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "normal": { - "5000000": 1, - "7000000": 2, - "9000000": 3, - "10000000": 4, - "15000000": 5, - "20000000": 6, - "25000000": 7, - "30000000": 8, - "35000000": 9, - "40000000": 10, - "45000000": 11 - }, - "hard": { - "6000000": 1, - "9000000": 2, - "11000000": 3, - "13000000": 4, - "19000000": 5, - "25000000": 6, - "31000000": 7, - "38000000": 8, - "44000000": 9, - "50000000": 10, - "56000000": 11 - }, - "legendary": { - "8000000": 1, - "11000000": 2, - "14000000": 3, - "16000000": 4, - "24000000": 5, - "32000000": 6, - "40000000": 7, - "48000000": 8, - "56000000": 9, - "64000000": 10, - "72000000": 11 - }, - "nightmare": { - "10000000": 1, - "14000000": 2, - "18000000": 3, - "20000000": 4, - "30000000": 5, - "40000000": 6, - "50000000": 7, - "60000000": 8, - "70000000": 9, - "80000000": 10, - "90000000": 11 - } -} \ No newline at end of file diff --git a/tiers/Yule Present Bearer [Present Bearer].json b/tiers/Yule Present Bearer [Present Bearer].json deleted file mode 100644 index be956df..0000000 --- a/tiers/Yule Present Bearer [Present Bearer].json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "normal": { - "100000000": "0.0", - "200000000": "4.0", - "300000000": "8.0", - "400000000": "10.0", - "500000000": "15.0", - "750000000": "20.0", - "1000000000": "30.0", - "1500000000": "35.0", - "2000000000": "40.0", - "2500000000": "50.0", - "3000000000": "70.0", - "3500000000": "75.0", - "4000000000": "80.0", - "4500000000": "90.0", - "5000000000": "95.0", - "10000000000": "125.0" - }, - "hard": { - "100000000": "0.0", - "200000000": "4.0", - "300000000": "8.0", - "400000000": "10.0", - "500000000": "15.0", - "750000000": "20.0", - "1000000000": "30.0", - "1500000000": "35.0", - "2000000000": "40.0", - "2500000000": "50.0", - "3000000000": "70.0", - "3500000000": "75.0", - "4000000000": "80.0", - "4500000000": "90.0", - "5000000000": "95.0", - "10000000000": "125.0" - }, - "legendary": { - "100000000": "0.0", - "200000000": "4.0", - "300000000": "8.0", - "400000000": "10.0", - "500000000": "15.0", - "750000000": "20.0", - "1000000000": "30.0", - "1500000000": "35.0", - "2000000000": "40.0", - "2500000000": "50.0", - "3000000000": "70.0", - "3500000000": "75.0", - "4000000000": "80.0", - "4500000000": "90.0", - "5000000000": "95.0", - "10000000000": "125.0" - }, - "nightmare": { - "100000000": "0.0", - "200000000": "4.0", - "300000000": "8.0", - "400000000": "10.0", - "500000000": "15.0", - "750000000": "20.0", - "1000000000": "30.0", - "1500000000": "35.0", - "2000000000": "40.0", - "2500000000": "50.0", - "3000000000": "70.0", - "3500000000": "75.0", - "4000000000": "80.0", - "4500000000": "90.0", - "5000000000": "95.0", - "10000000000": "125.0" - } -} \ No newline at end of file diff --git a/tiers/Yule Punishment Bearer [Punishment].json b/tiers/Yule Punishment Bearer [Punishment].json deleted file mode 100644 index f770e6b..0000000 --- a/tiers/Yule Punishment Bearer [Punishment].json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "normal": { - "200000000": "11.0", - "300000000": "22.0", - "400000000": "28.0", - "500000000": "42.0", - "750000000": "57.0", - "1000000000": "71.0", - "1500000000": "85.0", - "2000000000": "114.0", - "2500000000": "142.0", - "3000000000": "171.0", - "3500000000": "185.0", - "4000000000": "200.0", - "5000000000": "257.0", - "10000000000": "371.0" - }, - "hard": { - "200000000": "11.0", - "300000000": "22.0", - "400000000": "28.0", - "500000000": "42.0", - "750000000": "57.0", - "1000000000": "71.0", - "1500000000": "85.0", - "2000000000": "114.0", - "2500000000": "142.0", - "3000000000": "171.0", - "3500000000": "185.0", - "4000000000": "200.0", - "5000000000": "257.0", - "10000000000": "371.0" - }, - "legendary": { - "200000000": "11.0", - "300000000": "22.0", - "400000000": "28.0", - "500000000": "42.0", - "750000000": "57.0", - "1000000000": "71.0", - "1500000000": "85.0", - "2000000000": "114.0", - "2500000000": "142.0", - "3000000000": "171.0", - "3500000000": "185.0", - "4000000000": "200.0", - "5000000000": "257.0", - "10000000000": "371.0" - }, - "nightmare": { - "200000000": "11.0", - "300000000": "22.0", - "400000000": "28.0", - "500000000": "42.0", - "750000000": "57.0", - "1000000000": "71.0", - "1500000000": "85.0", - "2000000000": "114.0", - "2500000000": "142.0", - "3000000000": "171.0", - "3500000000": "185.0", - "4000000000": "200.0", - "5000000000": "257.0", - "10000000000": "371.0" - } -} \ No newline at end of file diff --git a/tiers/Yydian's Sanctuary [Yydian].json b/tiers/Yydian's Sanctuary [Yydian].json deleted file mode 100644 index 3446e54..0000000 --- a/tiers/Yydian's Sanctuary [Yydian].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "125000000": "3.0", - "175000000": "8.0", - "250000000": "12.0", - "300000000": "13.0", - "375000000": "15.0", - "450000000": "16.0", - "525000000": "18.0", - "625000000": "21.0", - "900000000": "23.0", - "1500000000": "36.0" - }, - "hard": { - "125000000": "3.0", - "175000000": "8.0", - "250000000": "12.0", - "300000000": "13.0", - "375000000": "15.0", - "450000000": "16.0", - "525000000": "18.0", - "625000000": "21.0", - "900000000": "23.0", - "1500000000": "36.0" - }, - "legendary": { - "125000000": "3.0", - "175000000": "8.0", - "250000000": "12.0", - "300000000": "13.0", - "375000000": "15.0", - "450000000": "16.0", - "525000000": "18.0", - "625000000": "21.0", - "900000000": "23.0", - "1500000000": "36.0" - }, - "nightmare": { - "125000000": "3.0", - "175000000": "8.0", - "250000000": "12.0", - "300000000": "13.0", - "375000000": "15.0", - "450000000": "16.0", - "525000000": "18.0", - "625000000": "21.0", - "900000000": "23.0", - "1500000000": "36.0" - } -} \ No newline at end of file diff --git a/tiers/Z'ralk'thalat [Z'ralk'thalat].json b/tiers/Z'ralk'thalat [Z'ralk'thalat].json deleted file mode 100644 index 5553522..0000000 --- a/tiers/Z'ralk'thalat [Z'ralk'thalat].json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "normal": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "hard": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "legendary": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - }, - "nightmare": { - "100000000": "7.0", - "200000000": "8.0", - "300000000": "9.0", - "400000000": "10.0", - "500000000": "11.0", - "600000000": "12.0", - "700000000": "13.0", - "800000000": "14.0", - "900000000": "15.0", - "1000000000": "16.0" - } -} \ No newline at end of file diff --git a/tiers/Zombie Horde [Zombies].json b/tiers/Zombie Horde [Zombies].json deleted file mode 100644 index a068d6a..0000000 --- a/tiers/Zombie Horde [Zombies].json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "normal": { - "113000": 1, - "630000": 1, - "855000": 1, - "1845000": 2, - "2813000": 2.5, - "6075000": 3, - "7650000": 3.5 - }, - "hard": { - "141000": 1, - "788000": 1, - "1069000": 1, - "2306000": 2, - "3516000": 2.5, - "7594000": 3, - "9563000": 3.5 - }, - "legendary": { - "180000": 1, - "1008000": 1, - "1368000": 1, - "2952000": 2, - "4500000": 2.5, - "9720000": 3, - "12240000": 3.5 - }, - "nightmare": { - "225000": 1, - "1260000": 1, - "1710000": 1, - "3690000": 2, - "5625000": 2.5, - "12150000": 3, - "15300000": 3.5 - } -} From ac111bd2586adab0effa609dbac888ad85a8721f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 29 Nov 2016 13:09:44 +0100 Subject: [PATCH 268/341] assing missing link to readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8ed2040..7e006e2 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,4 @@ We prefer the usage of the [tracker](https://github.com/IDotD/Userscript/issues) ## How To Help -We can use helpers for the following: update and improve the wiki, help coding the userscript and testing any of the branches. For any of the later two have a look at the related documentation in the wiki. +We can use helpers for the following: update and improve the wiki, help coding the userscript and testing any of the branches. For any of the later two have a look at the related documentation in the [wiki](https://idotd.github.io/). From 57978fb902735614ac9ba3a011b854d9075ab79e Mon Sep 17 00:00:00 2001 From: Ardenian Date: Wed, 30 Nov 2016 13:35:12 +0100 Subject: [PATCH 269/341] Update ui.js fixes https://github.com/IDotD/Translations/issues/7 --- src/mods/ui.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/ui.js b/src/mods/ui.js index 6fa20b5..bf5c224 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -641,7 +641,7 @@ idrinth.ui = { type: 'tr', children: [ { type: 'th', - content: idrinth.text.get ( "land.avaible" ) + content: idrinth.text.get ( "land.available" ) }, { type: 'td', children: [ { From 34a8f580eeaf5bf9e0e0622fcadc2f0c8bd34e8b Mon Sep 17 00:00:00 2001 From: Ardenian Date: Tue, 6 Dec 2016 16:18:35 +0100 Subject: [PATCH 270/341] Update text.js fixes #235 --- src/mods/text.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index ab20894..5c60a2b 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -15,7 +15,7 @@ idrinth.text = { idrinth.text.initialized = true; return; } - idrinth.core.ajax.runHome ( 'lang-service/###RELOAD-VERSION###/', function ( file ) { + idrinth.core.ajax.runHome ( 'userscript-translation/'+language+'/###RELOAD-VERSION###/', function ( file ) { /** * * @param {object} to @@ -68,4 +68,4 @@ idrinth.text = { }; return getSub ( idrinth.text.data, key.split ( '.' ), getSub ); } -}; \ No newline at end of file +}; From 7fd27c8c53993e98ef6511c5ae078e94e5ed64e0 Mon Sep 17 00:00:00 2001 From: Ardenian Date: Tue, 6 Dec 2016 16:20:33 +0100 Subject: [PATCH 271/341] Update stable.js fixes #235 --- src/stable.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/stable.js b/src/stable.js index bd1c1ec..bd03488 100644 --- a/src/stable.js +++ b/src/stable.js @@ -119,6 +119,7 @@ var idrinth = { idrinth.user.start ( ); idrinth.names.start ( ); idrinth.raids.start ( ); + idrinth.text.start() idrinth.tier.start (); idrinth.chat.start (); idrinth.war.start (); From 3b26782d7d1d5322ccb3394ddf34f800c3f1795b Mon Sep 17 00:00:00 2001 From: Ardenian Date: Tue, 6 Dec 2016 16:37:53 +0100 Subject: [PATCH 272/341] Update stable.js adding missing semicolon --- src/stable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stable.js b/src/stable.js index bd03488..1f1da6a 100644 --- a/src/stable.js +++ b/src/stable.js @@ -119,7 +119,7 @@ var idrinth = { idrinth.user.start ( ); idrinth.names.start ( ); idrinth.raids.start ( ); - idrinth.text.start() + idrinth.text.start ( ); idrinth.tier.start (); idrinth.chat.start (); idrinth.war.start (); From 3f53a4419d8bb2c22e38d5fc1a80333f31477ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 6 Dec 2016 17:39:21 +0100 Subject: [PATCH 273/341] Update stable.js putting calls into a better order --- src/stable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stable.js b/src/stable.js index 1f1da6a..eda7f33 100644 --- a/src/stable.js +++ b/src/stable.js @@ -115,11 +115,11 @@ var idrinth = { startInternal: function ( ) { var startModules = function () { idrinth.settings.start ( ); + idrinth.text.start ( ); idrinth.ui.start ( ); idrinth.user.start ( ); idrinth.names.start ( ); idrinth.raids.start ( ); - idrinth.text.start ( ); idrinth.tier.start (); idrinth.chat.start (); idrinth.war.start (); From accfa67fbaf8a8f07991bc4315b31b9e98611345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 6 Dec 2016 17:50:33 +0100 Subject: [PATCH 274/341] Update stable.js --- src/stable.js | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/stable.js b/src/stable.js index eda7f33..144978f 100644 --- a/src/stable.js +++ b/src/stable.js @@ -116,13 +116,20 @@ var idrinth = { var startModules = function () { idrinth.settings.start ( ); idrinth.text.start ( ); - idrinth.ui.start ( ); - idrinth.user.start ( ); - idrinth.names.start ( ); - idrinth.raids.start ( ); - idrinth.tier.start (); - idrinth.chat.start (); - idrinth.war.start (); + idrinth._tmp=window.setInterval(function() { + if(!idrinth.text.initialized) { + return; + } + window.clearInterval(idrinth._tmp); + delete idrinth['_tmp']; + idrinth.ui.start ( ); + idrinth.user.start ( ); + idrinth.names.start ( ); + idrinth.raids.start ( ); + idrinth.tier.start (); + idrinth.chat.start (); + idrinth.war.start (); + },123); }; if ( idrinth.platform === 'newgrounds' ) { try { From ab3c78951e73ed0bfec03488fb22d30c012a2d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 6 Dec 2016 17:55:09 +0100 Subject: [PATCH 275/341] Update stable.js --- src/stable.js | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src/stable.js b/src/stable.js index 144978f..10fc71f 100644 --- a/src/stable.js +++ b/src/stable.js @@ -113,24 +113,6 @@ var idrinth = { }, platform: '', startInternal: function ( ) { - var startModules = function () { - idrinth.settings.start ( ); - idrinth.text.start ( ); - idrinth._tmp=window.setInterval(function() { - if(!idrinth.text.initialized) { - return; - } - window.clearInterval(idrinth._tmp); - delete idrinth['_tmp']; - idrinth.ui.start ( ); - idrinth.user.start ( ); - idrinth.names.start ( ); - idrinth.raids.start ( ); - idrinth.tier.start (); - idrinth.chat.start (); - idrinth.war.start (); - },123); - }; if ( idrinth.platform === 'newgrounds' ) { try { var frame = document.getElementById ( 'iframe_embed' ).getElementsByTagName ( 'iframe' )[0]; @@ -144,6 +126,24 @@ var idrinth = { } window.setTimeout ( idrinth.newgrounds.alarmCheck, 3333 ); } + idrinth.settings.start ( ); + idrinth.text.start ( ); + idrinth._tmp=window.setInterval(function() { + if(!idrinth.text.initialized) { + return; + } + var startModules = function () { + idrinth._tmp=window.setInterval(function() { + idrinth.ui.start ( ); + idrinth.user.start ( ); + idrinth.names.start ( ); + idrinth.raids.start ( ); + idrinth.tier.start (); + idrinth.chat.start (); + idrinth.war.start (); + }; + window.clearInterval(idrinth._tmp); + delete idrinth['_tmp']; startModules (); window.setTimeout ( function () { idrinth.core.multibind.add ( 'click', '.clipboard-copy', function ( element, event ) { @@ -154,6 +154,7 @@ var idrinth = { }, 1000 ); delete idrinth['start']; delete idrinth['startInternal']; + },123); }, start: function ( ) { 'use strict'; From 1f34a61dc2f5c5494d7354c13e49d9b436e253ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 6 Dec 2016 17:59:23 +0100 Subject: [PATCH 276/341] Update stable.js --- src/stable.js | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/src/stable.js b/src/stable.js index 10fc71f..ee29345 100644 --- a/src/stable.js +++ b/src/stable.js @@ -129,31 +129,27 @@ var idrinth = { idrinth.settings.start ( ); idrinth.text.start ( ); idrinth._tmp=window.setInterval(function() { - if(!idrinth.text.initialized) { - return; - } - var startModules = function () { - idrinth._tmp=window.setInterval(function() { - idrinth.ui.start ( ); - idrinth.user.start ( ); - idrinth.names.start ( ); - idrinth.raids.start ( ); - idrinth.tier.start (); - idrinth.chat.start (); - idrinth.war.start (); - }; - window.clearInterval(idrinth._tmp); - delete idrinth['_tmp']; - startModules (); - window.setTimeout ( function () { - idrinth.core.multibind.add ( 'click', '.clipboard-copy', function ( element, event ) { - idrinth.core.copyToClipboard.element ( element ); - element.parentNode.parentNode.removeChild ( element.parentNode ); - idrinth.core.log ( event + ' fired on ' + element ); - } ); - }, 1000 ); - delete idrinth['start']; - delete idrinth['startInternal']; + if(!idrinth.text.initialized) { + return; + } + idrinth.ui.start ( ); + idrinth.user.start ( ); + idrinth.names.start ( ); + idrinth.raids.start ( ); + idrinth.tier.start ( ); + idrinth.chat.start ( ); + idrinth.war.start ( ); + window.clearInterval(idrinth._tmp); + delete idrinth['_tmp']; + window.setTimeout ( function () { + idrinth.core.multibind.add ( 'click', '.clipboard-copy', function ( element, event ) { + idrinth.core.copyToClipboard.element ( element ); + element.parentNode.parentNode.removeChild ( element.parentNode ); + idrinth.core.log ( event + ' fired on ' + element ); + } ); + }, 1000 ); + delete idrinth['start']; + delete idrinth['startInternal']; },123); }, start: function ( ) { From 037d8591639cc5d867288d4e0e821760994827dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 6 Dec 2016 18:09:57 +0100 Subject: [PATCH 277/341] Update text.js --- src/mods/text.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mods/text.js b/src/mods/text.js index 5c60a2b..d66fc5e 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -35,6 +35,7 @@ idrinth.text = { } }; applyRecursive ( idrinth.text.data, JSON.parse ( file ), applyRecursive ); + idrinth.text.initialized = true; }, idrinth.text.start, idrinth.text.start, null, true ); }, /** From 27f8be37c735b9f5a9e0e00edfa5de4a4e061922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 6 Dec 2016 18:19:46 +0100 Subject: [PATCH 278/341] Update text.js --- src/mods/text.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/text.js b/src/mods/text.js index d66fc5e..ba6ce00 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -27,7 +27,7 @@ idrinth.text = { for (var prop in from) { if ( from.hasOwnProperty ( prop ) ) { if ( typeof to[prop] === 'string' && typeof from[prop] === 'string' ) { - to[prop] = file[prop]; + to[prop] = from[prop]; } else if ( typeof to[prop] === 'object' && typeof from[prop] === 'object' ) { func ( to[prop], from[prop], func ); } From 7ee33f649343f93c003e4c36088c9f09f4c02e0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 6 Dec 2016 18:54:29 +0100 Subject: [PATCH 279/341] Update ui.js adding language setting - should be moved to being a select --- src/mods/ui.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mods/ui.js b/src/mods/ui.js index bf5c224..dc5f8f2 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -472,6 +472,11 @@ idrinth.ui = { type: 'checkbox', platforms: [ 'kongregate' ], label: "setting.enableExtCharInfo" + },{ + name: 'language', + rType: '#input', + type: 'text', + label: "setting.language" }, { name: 'minimalist', rType: '#input', From eb0282dae2da312566c8551abc54832c0029bae1 Mon Sep 17 00:00:00 2001 From: ardenian Date: Sun, 25 Dec 2016 17:53:01 +0100 Subject: [PATCH 280/341] Set setting language to preserve language Parse correct language file --- src/mods/text.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mods/text.js b/src/mods/text.js index 5c60a2b..5c73df8 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -15,6 +15,7 @@ idrinth.text = { idrinth.text.initialized = true; return; } + idrinth.settings.change( "language", language ); idrinth.core.ajax.runHome ( 'userscript-translation/'+language+'/###RELOAD-VERSION###/', function ( file ) { /** * @@ -41,7 +42,7 @@ idrinth.text = { * See languages/en.json for an example * @type {object} */ - data: JSON.parse ( '###LANG###' ), + data: JSON.parse ( language+'.json' ), /** * returns the translation of a provided key or an error-message if no * matching translation is found From 44db1cfb7ddbcf6d8d5003646578452fa6846556 Mon Sep 17 00:00:00 2001 From: Ardenian Date: Fri, 30 Dec 2016 16:34:05 +0100 Subject: [PATCH 281/341] reverse commit --- src/mods/text.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index fc07cd8..ba6ce00 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -15,7 +15,6 @@ idrinth.text = { idrinth.text.initialized = true; return; } - idrinth.settings.change( "language", language ); idrinth.core.ajax.runHome ( 'userscript-translation/'+language+'/###RELOAD-VERSION###/', function ( file ) { /** * @@ -43,7 +42,7 @@ idrinth.text = { * See languages/en.json for an example * @type {object} */ - data: JSON.parse ( language+'.json' ), + data: JSON.parse ( '###LANG###' ), /** * returns the translation of a provided key or an error-message if no * matching translation is found From 7d013947acf48e4b66c24e29a883d20b05eb8366 Mon Sep 17 00:00:00 2001 From: ardenian Date: Sun, 1 Jan 2017 16:31:28 +0100 Subject: [PATCH 282/341] addition lang and replacement of calls language --- src/mods/settings.js | 1 + src/mods/text.js | 3 ++- src/mods/ui.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mods/settings.js b/src/mods/settings.js index 33c2b84..3eb5ac3 100644 --- a/src/mods/settings.js +++ b/src/mods/settings.js @@ -21,6 +21,7 @@ idrinth.settings = { alarmActive: false, bannedRaids: { }, language: 'en', + lang : null, notification: { mention: true, message: true, diff --git a/src/mods/text.js b/src/mods/text.js index ba6ce00..f16981a 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -10,7 +10,8 @@ idrinth.text = { * @returns {undefined} */ start: function ( ) { - var language = idrinth.settings.get ( "language" ) || window.navigator.userLanguage || window.navigator.language; + var language = idrinth.settings.get( "lang" ) || window.navigator.userLanguage || window.navigator.language || idrinth.settings.get( "language" ); + idrinth.settings.change( "lang", language ); if ( language === 'en' ) { idrinth.text.initialized = true; return; diff --git a/src/mods/ui.js b/src/mods/ui.js index dc5f8f2..695593b 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -473,7 +473,7 @@ idrinth.ui = { platforms: [ 'kongregate' ], label: "setting.enableExtCharInfo" },{ - name: 'language', + name: 'lang', rType: '#input', type: 'text', label: "setting.language" From 8274fa6b1df818280cfa892314d862ef068b1629 Mon Sep 17 00:00:00 2001 From: Ardenian Date: Mon, 2 Jan 2017 16:38:12 +0100 Subject: [PATCH 283/341] Update settings.js remove language property --- src/mods/settings.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mods/settings.js b/src/mods/settings.js index 3eb5ac3..889460b 100644 --- a/src/mods/settings.js +++ b/src/mods/settings.js @@ -20,7 +20,6 @@ idrinth.settings = { alarmTime: '8:0', alarmActive: false, bannedRaids: { }, - language: 'en', lang : null, notification: { mention: true, @@ -168,4 +167,4 @@ idrinth.settings = { } } } -}; \ No newline at end of file +}; From 0aece27e43cbf73ffdd86f46f8308d8e51eee3e8 Mon Sep 17 00:00:00 2001 From: Ardenian Date: Mon, 2 Jan 2017 16:39:09 +0100 Subject: [PATCH 284/341] Update text.js remove call for "language" field in settings --- src/mods/text.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/text.js b/src/mods/text.js index f16981a..4d11bba 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -10,7 +10,7 @@ idrinth.text = { * @returns {undefined} */ start: function ( ) { - var language = idrinth.settings.get( "lang" ) || window.navigator.userLanguage || window.navigator.language || idrinth.settings.get( "language" ); + var language = idrinth.settings.get( "lang" ) || window.navigator.userLanguage || window.navigator.language; idrinth.settings.change( "lang", language ); if ( language === 'en' ) { idrinth.text.initialized = true; From 4f0cab7760fb4d8a7ca013f3eb9f654eeaedf28c Mon Sep 17 00:00:00 2001 From: Ardenian Date: Fri, 6 Jan 2017 01:23:53 +0100 Subject: [PATCH 285/341] Update ui.js fixing label of language setting input field --- src/mods/ui.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/ui.js b/src/mods/ui.js index 695593b..fd9ec69 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -476,7 +476,7 @@ idrinth.ui = { name: 'lang', rType: '#input', type: 'text', - label: "setting.language" + label: "setting.lang" }, { name: 'minimalist', rType: '#input', From 11501c261693f777d4d6277c6eb4b928a1fcb783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 6 Jan 2017 10:03:49 +0100 Subject: [PATCH 286/341] Update root.scss fixing the quest-info on armorgames by putting our script even higher up --- src/root.scss | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/root.scss b/src/root.scss index c07136b..b0aa02c 100644 --- a/src/root.scss +++ b/src/root.scss @@ -2,6 +2,10 @@ width:$size; height:$size; } +@mixin z-offset($offset) { + //make sure we are always above the default pages + z-index:10000000+$offset; +} @import "styles/mutik.scss"; /** * These styles modify pages changed by the script of IDotD @@ -11,7 +15,7 @@ background: rgba(204, 204, 204, 0.9); border-radius: 2px; width: 200px; - z-index: 100000; + @include z-offset(0); display: block; box-shadow: 2px 2px 2px 1px rgba(0, 0, 0, 0.65); } @@ -438,7 +442,7 @@ } #idrinth-chat { - z-index: 99999; + @include z-offset(1); } .idrinth-userinfo-box { @@ -451,7 +455,7 @@ box-shadow: 3px 3px 5px rgba(255, 255, 255, 0.9); margin: 0; max-width: 150px; - z-index: 120000; + @include z-offset(2); } .idrinth-userinfo-box > li { @@ -663,4 +667,4 @@ td.is-os { height:35px; border-top: 1px solid #fff; border-bottom: 1px solid #fff; -} \ No newline at end of file +} From a75b75f036ad7e683a0c94ab90c02b57e772cd1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 6 Jan 2017 11:28:02 +0100 Subject: [PATCH 287/341] Update raids.js --- src/mods/raids.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mods/raids.js b/src/mods/raids.js index 7cfa4c0..ff38b83 100644 --- a/src/mods/raids.js +++ b/src/mods/raids.js @@ -42,7 +42,8 @@ idrinth.raids = { for (var key in list) { if ( list[key].delete ) { delHandler ( key ); - } else {//worst case: overwriting itself + } else { + //worst case: overwriting itself idrinth.raids.list[key] = list[key]; } } From 5013599624eb2a518bc2d0494a99e9b9b6385f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 6 Jan 2017 12:07:20 +0100 Subject: [PATCH 288/341] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7e006e2..2c396dc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # IDotD -A script for dawn of the dragons, that works based on data provided to https://dotd.idrinth.de via UgUp +A script for dawn of the dragons, that works based on data provided to https://dotd.idrinth.de via UgUp. [![Codacy Badge](https://api.codacy.com/project/badge/Grade/e80204911a734a56a471ab9b9ac649db)](https://www.codacy.com/app/eldrim/IDotD?utm_source=github.com&utm_medium=referral&utm_content=Idrinth/IDotD&utm_campaign=Badge_Grade) [![Code Climate](https://codeclimate.com/github/Idrinth/IDotD/badges/gpa.svg)](https://codeclimate.com/github/Idrinth/IDotD) From 82e0d0405ef844c479ecc04a93bae16837142d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 6 Jan 2017 12:34:49 +0100 Subject: [PATCH 289/341] Update text.js setting default if nothing else works --- src/mods/text.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mods/text.js b/src/mods/text.js index 4d11bba..1542446 100644 --- a/src/mods/text.js +++ b/src/mods/text.js @@ -10,9 +10,9 @@ idrinth.text = { * @returns {undefined} */ start: function ( ) { - var language = idrinth.settings.get( "lang" ) || window.navigator.userLanguage || window.navigator.language; + var language = idrinth.settings.get( "lang" ) || window.navigator.userLanguage || window.navigator.language || "en"; idrinth.settings.change( "lang", language ); - if ( language === 'en' ) { + if ( language === "en" ) { idrinth.text.initialized = true; return; } From 03736f47c27d0fe19fa2db428ee8588d6e7fc473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 6 Jan 2017 12:56:52 +0100 Subject: [PATCH 290/341] Update and rename .lgtm to .pullapprove.yml --- .lgtm | 3 --- .pullapprove.yml | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) delete mode 100644 .lgtm create mode 100644 .pullapprove.yml diff --git a/.lgtm b/.lgtm deleted file mode 100644 index c034be8..0000000 --- a/.lgtm +++ /dev/null @@ -1,3 +0,0 @@ -pattern = "(?i)^(:shipit:|:\\+1:|LGTM|Approved|Looks\\s+Good\\s+To\\s+Me|Seems\\s+good|Looks\\s+good)" -approvals = 1 -self_approval_off = true \ No newline at end of file diff --git a/.pullapprove.yml b/.pullapprove.yml new file mode 100644 index 0000000..61e8f78 --- /dev/null +++ b/.pullapprove.yml @@ -0,0 +1,18 @@ +version: 2 +requirements: + signed_off_by: + required: false +group_defaults: + approve_by_comment: + approve_regex: '(?i)^(:shipit:|:\\+1:|LGTM|Approved|Looks\\s+Good\\s+To\\s+Me|Seems\\s+good|Looks\\s+good)' + reset_on_push: + enabled: true +groups: + -reviewers: + required: 1 + users: + - Idrinth + - w20k + conditions: + branches: + - master From f7e0e34773bdaee873fcc6577cb48076a9025588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 6 Jan 2017 12:57:43 +0100 Subject: [PATCH 291/341] Delete MAINTAINERS --- MAINTAINERS | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS deleted file mode 100644 index f05f8cb..0000000 --- a/MAINTAINERS +++ /dev/null @@ -1,2 +0,0 @@ -Idrinth -w20k \ No newline at end of file From 52d10fb87b78eeb89e66f20953a39108f2af16fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 6 Jan 2017 15:52:50 +0100 Subject: [PATCH 292/341] Create .doclets.yml --- .doclets.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .doclets.yml diff --git a/.doclets.yml b/.doclets.yml new file mode 100644 index 0000000..b2b0b85 --- /dev/null +++ b/.doclets.yml @@ -0,0 +1,5 @@ +dir: lib +branches: + - master +articles: + - Overview: README.md From 09246ebe70429e3f9e2f5c552fe18e727b78b8ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 6 Jan 2017 15:53:38 +0100 Subject: [PATCH 293/341] Update .doclets.yml --- .doclets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.doclets.yml b/.doclets.yml index b2b0b85..13305f3 100644 --- a/.doclets.yml +++ b/.doclets.yml @@ -1,4 +1,4 @@ -dir: lib +dir: src branches: - master articles: From bb976a53b3d0873a5d2ba964d1faa2b44a403c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 6 Jan 2017 16:32:07 +0100 Subject: [PATCH 294/341] Create .esdoc.json --- .esdoc.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 .esdoc.json diff --git a/.esdoc.json b/.esdoc.json new file mode 100644 index 0000000..c32ef20 --- /dev/null +++ b/.esdoc.json @@ -0,0 +1 @@ +{"source": "./src", "destination": "./doc"} From 1ac8c49afbe8dbe76e3942add008011dd0d5c373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 6 Jan 2017 16:40:39 +0100 Subject: [PATCH 295/341] Delete .esdoc.json --- .esdoc.json | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .esdoc.json diff --git a/.esdoc.json b/.esdoc.json deleted file mode 100644 index c32ef20..0000000 --- a/.esdoc.json +++ /dev/null @@ -1 +0,0 @@ -{"source": "./src", "destination": "./doc"} From 53a88655d432db83d34d6f7bec0719f69fd99ba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 6 Jan 2017 16:41:01 +0100 Subject: [PATCH 296/341] Delete .codeclimate.yml --- .codeclimate.yml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 .codeclimate.yml diff --git a/.codeclimate.yml b/.codeclimate.yml deleted file mode 100644 index ca9e9e2..0000000 --- a/.codeclimate.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -engines: - csslint: - enabled: true - duplication: - enabled: true - config: - languages: - - ruby - - javascript - - python - - php - eslint: - enabled: true - fixme: - enabled: true -ratings: - paths: - - "**.css" - - "**.js" -exclude_paths: -- "libs/*" \ No newline at end of file From 873bff86166d02cf2290b5309cdc2a042bdda1a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 10 Jan 2017 15:49:44 +0100 Subject: [PATCH 297/341] fixes #150 adjusting filter options so tiers can be filtered by type --- src/mods/tier.js | 19 +++++++++++++++---- src/mods/ui.js | 32 +++++++++++++++++++++----------- 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index 4cd17bf..6e0697f 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -118,7 +118,9 @@ idrinth.tier = { window.setTimeout ( idrinth.tier.start, 1000 ); } }, - getTierForName: function ( name ) { + getMatchingTiers: function ( ) { + var name = document.getElementById ( 'idrinth-tierlist-namesearch' ).value; + var type = document.getElementById ( 'idrinth-tierlist-typesearch' ).value; var clearInnerHtml = function ( elem ) { elem.innerHTML = ''; }; @@ -280,14 +282,23 @@ idrinth.tier = { wrapper.appendChild ( sub ); } }; - if ( !name || name.length === 0 ) { + var matchesAny = function ( list, regExp ) { + for (var count = 0; count < list.length; count++) { + if ( list[count] && list[count].match ( regExp ) ) { + return true; + } + } + return false; + }; + if ( ( !name || name.length === 0 ) && ( !type || type.length === 0 ) ) { clearInnerHtml ( document.getElementById ( 'idrinth-tierlist' ) ); return; } var result = [ ]; - var regExp = new RegExp ( name, 'i' ); + var nameRegExp = new RegExp ( name, 'i' ); + var typeRegExp = new RegExp ( type, 'i' ); for (var key in idrinth.tier.list) { - if ( key.match ( regExp ) ) { + if ( key.match ( nameRegExp ) && matchesAny ( idrinth.tier.list[key].types, typeRegExp ) ) { result.push ( key ); } } diff --git a/src/mods/ui.js b/src/mods/ui.js index 6fa20b5..6f4b357 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -437,6 +437,23 @@ idrinth.ui = { ]; }; var buildTiers = function () { + var makeSearch = function ( label ) { + return { + type: 'input', + css: 'idrinth-float-half', + id: 'idrinth-tierlist-' + label + 'search', + attributes: [ + { + names: [ 'onblur', 'onchange', 'onkeyup' ], + value: 'idrinth.tier.getMatchingTiers();' + }, + { + namea: [ 'placeholder', 'title' ], + value: idrinth.text.get ( "tier." + label ) + } + ] + }; + }; return [ { css: 'idrinth-line', children: [ { @@ -449,17 +466,10 @@ idrinth.ui = { value: 'idrinth-tierlist-bosssearch' } ] - }, { - type: 'input', - css: 'idrinth-float-half', - id: 'idrinth-tierlist-bosssearch', - attributes: [ - { - names: [ 'onblur', 'onchange', 'onkeyup' ], - value: 'idrinth.tier.getTierForName(this.value);' - } - ] - } ] + }, + makeSearch ( 'name' ), + makeSearch ( 'type' ) + ] }, { id: 'idrinth-tierlist' } ]; From 141078564b6f00d9b4259a14b19b6ac1f8f3984e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 10 Jan 2017 15:56:30 +0100 Subject: [PATCH 298/341] fixing typo --- src/mods/ui.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mods/ui.js b/src/mods/ui.js index 68b6849..8e6dd7c 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -448,7 +448,7 @@ idrinth.ui = { value: 'idrinth.tier.getMatchingTiers();' }, { - namea: [ 'placeholder', 'title' ], + names: [ 'placeholder', 'title' ], value: idrinth.text.get ( "tier." + label ) } ] @@ -482,7 +482,7 @@ idrinth.ui = { type: 'checkbox', platforms: [ 'kongregate' ], label: "setting.enableExtCharInfo" - },{ + }, { name: 'lang', rType: '#input', type: 'text', From 3c959b471a1524121bb04274f19cfa88d4982841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 10 Jan 2017 16:19:50 +0100 Subject: [PATCH 299/341] ading javascriptdoc refs #135 --- src/mods/tier.js | 77 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 4 deletions(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index 6e0697f..0539770 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -1,9 +1,33 @@ idrinth.tier = { + /** + * + * @type {object} + */ list: { }, + /** + * + * @type {object} + */ + taggedSlots: { }, + /** + * + * @param {string} name + * @returns {undefined} + */ addTagged: function ( name ) { + /** + * + * @param {string} key + * @returns {Boolean} + */ var isValidParameter = function ( name ) { return name && idrinth.tier.list.hasOwnProperty ( name ) && typeof idrinth.tier.list[name] !== 'function' && !document.getElementById ( 'idrinth-tier-box-' + name ); }; + /** + * + * @param {string} key + * @returns {Boolean} + */ var isFreeSlot = function ( key ) { return idrinth.tier.taggedSlots.hasOwnProperty ( key ) && typeof key !== 'function' && idrinth.tier.taggedSlots[key] === null; }; @@ -11,6 +35,12 @@ idrinth.tier = { return; } var boss = this.list[name]; + /** + * + * @param {int} x + * @param {string} name + * @returns {undefined} + */ var make = function ( x, name ) { var makeElement = function ( label, number, description ) { return { @@ -67,7 +97,10 @@ idrinth.tier = { } idrinth.core.alert ( idrinth.text.get ( "tier.maxBoxes" ) ); }, - taggedSlots: { }, + /** + * initializes this module + * @returns {undefined} + */ start: function ( ) { 'use strict'; var pos = 1; @@ -77,9 +110,7 @@ idrinth.tier = { } idrinth.core.ajax.runHome ( 'tier-service/', - function ( text ) { - idrinth.tier.import ( text ); - }, + idrinth.tier.import, function ( ) { window.setTimeout ( idrinth.tier.start, 10000 ); }, @@ -88,6 +119,11 @@ idrinth.tier = { } ); }, + /** + * parsed a json-response and fills tier list and exclusion list + * @param {string} data + * @returns {undefined} + */ import: function ( data ) { 'use strict'; data = JSON.parse ( data ); @@ -118,13 +154,34 @@ idrinth.tier = { window.setTimeout ( idrinth.tier.start, 1000 ); } }, + /** + * displays bosses that match both name and type + * @returns {undefined} + */ getMatchingTiers: function ( ) { var name = document.getElementById ( 'idrinth-tierlist-namesearch' ).value; var type = document.getElementById ( 'idrinth-tierlist-typesearch' ).value; + /** + * + * @param {HTMLElement} elem + * @returns {undefined} + */ var clearInnerHtml = function ( elem ) { elem.innerHTML = ''; }; + /** + * + * @param {string} list + * @returns {undefined} + */ var makeList = function ( list ) { + /** + * + * @param {string} listKey + * @param {string} difficulty + * @param {string} ic + * @returns {object} for the buildElement wrapper + */ var makeField = function ( listKey, difficulty, ic ) { var ln = { type: 'td' @@ -147,6 +204,12 @@ idrinth.tier = { } return ln; }; + /** + * + * @param {string} title + * @param {object} dataset + * @returns {HTMLElement} + */ var makeRow = function ( title, dataset ) { return { type: 'tr', @@ -282,6 +345,12 @@ idrinth.tier = { wrapper.appendChild ( sub ); } }; + /** + * + * @param {Array} list + * @param {RegExp} regExp + * @returns {Boolean} + */ var matchesAny = function ( list, regExp ) { for (var count = 0; count < list.length; count++) { if ( list[count] && list[count].match ( regExp ) ) { From be3e513d0fd2eb2a84ef1f3739ee10bfedac0bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 10 Jan 2017 16:24:37 +0100 Subject: [PATCH 300/341] making one-use function private --- src/mods/tier.js | 87 ++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 44 deletions(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index 0539770..e822c70 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -110,50 +110,49 @@ idrinth.tier = { } idrinth.core.ajax.runHome ( 'tier-service/', - idrinth.tier.import, - function ( ) { - window.setTimeout ( idrinth.tier.start, 10000 ); - }, - function ( ) { - window.setTimeout ( idrinth.tier.start, 10000 ); - } - ); - }, - /** - * parsed a json-response and fills tier list and exclusion list - * @param {string} data - * @returns {undefined} - */ - import: function ( data ) { - 'use strict'; - data = JSON.parse ( data ); - if ( data ) { - idrinth.tier.list = data; - var create = function ( name, url ) { - 'use strict'; - if ( !idrinth.settings.data.bannedRaids[name] ) { - idrinth.settings.data.bannedRaids[name] = false; - window.localStorage.setItem ( 'idotd', JSON.stringify ( idrinth.settings.data ) ); - } - document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { - name: 'bannedRaids#' + name, - rType: '#input', - type: 'checkbox', - id: 'idrinth-raid-may-join-list-' + name, - label: idrinth.text.get ( "raids.disableJoining" ) + name - } ) ); - document.getElementById ( 'idrinth-raid-may-join-list' ).lastChild.setAttribute ( 'style', - 'background-image:url(https://dotd.idrinth.de/static/raid-image-service/' + url + '/);' ); - }; - for (var key in data) { - if ( data[key].name ) { - create ( data[key].name, data[key].url ); - } - } - } else { - window.setTimeout ( idrinth.tier.start, 1000 ); - } - }, + /** + * parsed a json-response and fills tier list and exclusion list + * @param {string} data + * @returns {undefined} + */ + function ( data ) { + 'use strict'; + data = JSON.parse ( data ); + if ( data ) { + idrinth.tier.list = data; + var create = function ( name, url ) { + 'use strict'; + if ( !idrinth.settings.data.bannedRaids[name] ) { + idrinth.settings.data.bannedRaids[name] = false; + window.localStorage.setItem ( 'idotd', JSON.stringify ( idrinth.settings.data ) ); + } + document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { + name: 'bannedRaids#' + name, + rType: '#input', + type: 'checkbox', + id: 'idrinth-raid-may-join-list-' + name, + label: idrinth.text.get ( "raids.disableJoining" ) + name + } ) ); + document.getElementById ( 'idrinth-raid-may-join-list' ).lastChild.setAttribute ( 'style', + 'background-image:url(https://dotd.idrinth.de/static/raid-image-service/' + url + '/);' ); + }; + for (var key in data) { + if ( data[key].name ) { + create ( data[key].name, data[key].url ); + } + } + } else { + window.setTimeout ( idrinth.tier.start, 1000 ); + } + }, + function ( ) { + window.setTimeout ( idrinth.tier.start, 10000 ); + }, + function ( ) { + window.setTimeout ( idrinth.tier.start, 10000 ); + } + ); + }, /** * displays bosses that match both name and type * @returns {undefined} From 8a19cf5969be2927dd197ac2dc9d35de887c38a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 10 Jan 2017 16:26:59 +0100 Subject: [PATCH 301/341] reformatting&organizing --- src/mods/tier.js | 87 ++++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index e822c70..6e63833 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -104,55 +104,56 @@ idrinth.tier = { start: function ( ) { 'use strict'; var pos = 1; + /** + * parsed a json-response and fills tier list and exclusion list + * @param {string} data + * @returns {undefined} + */ + var importData = function ( data ) { + 'use strict'; + data = JSON.parse ( data ); + if ( data ) { + idrinth.tier.list = data; + var create = function ( name, url ) { + 'use strict'; + if ( !idrinth.settings.data.bannedRaids[name] ) { + idrinth.settings.data.bannedRaids[name] = false; + window.localStorage.setItem ( 'idotd', JSON.stringify ( idrinth.settings.data ) ); + } + document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { + name: 'bannedRaids#' + name, + rType: '#input', + type: 'checkbox', + id: 'idrinth-raid-may-join-list-' + name, + label: idrinth.text.get ( "raids.disableJoining" ) + name + } ) ); + document.getElementById ( 'idrinth-raid-may-join-list' ).lastChild.setAttribute ( 'style', + 'background-image:url(https://dotd.idrinth.de/static/raid-image-service/' + url + '/);' ); + }; + for (var key in data) { + if ( data[key].name ) { + create ( data[key].name, data[key].url ); + } + } + } else { + window.setTimeout ( idrinth.tier.start, 1000 ); + } + }; while ( 0 < window.innerWidth - 140 * ( pos + 1 ) ) { this.taggedSlots[( pos * 140 ).toString ( )] = null; pos++; } idrinth.core.ajax.runHome ( 'tier-service/', - /** - * parsed a json-response and fills tier list and exclusion list - * @param {string} data - * @returns {undefined} - */ - function ( data ) { - 'use strict'; - data = JSON.parse ( data ); - if ( data ) { - idrinth.tier.list = data; - var create = function ( name, url ) { - 'use strict'; - if ( !idrinth.settings.data.bannedRaids[name] ) { - idrinth.settings.data.bannedRaids[name] = false; - window.localStorage.setItem ( 'idotd', JSON.stringify ( idrinth.settings.data ) ); - } - document.getElementById ( 'idrinth-raid-may-join-list' ).appendChild ( idrinth.ui.buildElement ( { - name: 'bannedRaids#' + name, - rType: '#input', - type: 'checkbox', - id: 'idrinth-raid-may-join-list-' + name, - label: idrinth.text.get ( "raids.disableJoining" ) + name - } ) ); - document.getElementById ( 'idrinth-raid-may-join-list' ).lastChild.setAttribute ( 'style', - 'background-image:url(https://dotd.idrinth.de/static/raid-image-service/' + url + '/);' ); - }; - for (var key in data) { - if ( data[key].name ) { - create ( data[key].name, data[key].url ); - } - } - } else { - window.setTimeout ( idrinth.tier.start, 1000 ); - } - }, - function ( ) { - window.setTimeout ( idrinth.tier.start, 10000 ); - }, - function ( ) { - window.setTimeout ( idrinth.tier.start, 10000 ); - } - ); - }, + importData, + function ( ) { + window.setTimeout ( idrinth.tier.start, 10000 ); + }, + function ( ) { + window.setTimeout ( idrinth.tier.start, 10000 ); + } + ); + }, /** * displays bosses that match both name and type * @returns {undefined} From 8eaf169fbb98dd36350cae9b0763d7a26ab4226f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 10 Jan 2017 16:28:29 +0100 Subject: [PATCH 302/341] removing unused "use strict" statements --- src/mods/tier.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/mods/tier.js b/src/mods/tier.js index 6e63833..059ec83 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -110,12 +110,10 @@ idrinth.tier = { * @returns {undefined} */ var importData = function ( data ) { - 'use strict'; data = JSON.parse ( data ); if ( data ) { idrinth.tier.list = data; var create = function ( name, url ) { - 'use strict'; if ( !idrinth.settings.data.bannedRaids[name] ) { idrinth.settings.data.bannedRaids[name] = false; window.localStorage.setItem ( 'idotd', JSON.stringify ( idrinth.settings.data ) ); From 5f960a95793fa6bc6e556b50e940198967161fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 10 Jan 2017 16:29:56 +0100 Subject: [PATCH 303/341] adding overlookd function's doc --- src/mods/tier.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mods/tier.js b/src/mods/tier.js index 059ec83..e7f37ae 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -113,6 +113,12 @@ idrinth.tier = { data = JSON.parse ( data ); if ( data ) { idrinth.tier.list = data; + /** + * + * @param {string} name + * @param {string} url + * @returns {undefined} + */ var create = function ( name, url ) { if ( !idrinth.settings.data.bannedRaids[name] ) { idrinth.settings.data.bannedRaids[name] = false; From d265ee34e2fd98b28600146a6ee30a4fcd510c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Tue, 10 Jan 2017 16:57:44 +0100 Subject: [PATCH 304/341] removing badges of no longer used tools --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 2c396dc..f04d2bb 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,6 @@ # IDotD A script for dawn of the dragons, that works based on data provided to https://dotd.idrinth.de via UgUp. -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/e80204911a734a56a471ab9b9ac649db)](https://www.codacy.com/app/eldrim/IDotD?utm_source=github.com&utm_medium=referral&utm_content=Idrinth/IDotD&utm_campaign=Badge_Grade) -[![Code Climate](https://codeclimate.com/github/Idrinth/IDotD/badges/gpa.svg)](https://codeclimate.com/github/Idrinth/IDotD) -[![Issue Count](https://codeclimate.com/github/Idrinth/IDotD/badges/issue_count.svg)](https://codeclimate.com/github/Idrinth/IDotD) - We support Opera, Firefox and Chrome. Please make sure to update your installation of those on a regular basis, since we can't guarantee, that the script will work on outdated versions. ## What is it? From a3e70afea138a6f480115aac0b024b3a8ea801e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 11:18:21 +0100 Subject: [PATCH 305/341] Update core.js making sure null being an object doesn't prevent lang from being written --- src/mods/core.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mods/core.js b/src/mods/core.js index 1ad4515..3569d01 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -10,7 +10,7 @@ idrinth.core = { * @returns {Boolean} */ fieldIsSetting: function ( parent, field, allowObjects ) { - return parent && typeof parent === 'object' && field && parent.hasOwnProperty ( field ) && ( typeof parent[field] !== 'object' || allowObjects ) && typeof parent[field] !== 'function'; + return parent && typeof parent === 'object' && field && parent.hasOwnProperty ( field ) && ( parent[field] === null || typeof parent[field] !== 'object' || allowObjects ) && typeof parent[field] !== 'function'; }, ajax: { runHome: function ( url, success, failure, timeout, additionalHeader, isStatic ) { @@ -160,4 +160,4 @@ idrinth.core = { } } } -}; \ No newline at end of file +}; From 4f4953b48aeed7b0ba5a310563470d2dad00123c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 11:39:56 +0100 Subject: [PATCH 306/341] Update root.scss --- src/root.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/root.scss b/src/root.scss index b0aa02c..4321637 100644 --- a/src/root.scss +++ b/src/root.scss @@ -135,6 +135,7 @@ #idrinth-controls { top: 5px; + @include z-offset(5); right: 5px; position: fixed; } From b259bdb8081fbdd53dac7b3ea2d410931a202dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 13:49:26 +0100 Subject: [PATCH 307/341] moving all functions that can be private to make them private --- src/mods/names.js | 119 ++++++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 61 deletions(-) diff --git a/src/mods/names.js b/src/mods/names.js index ab1b8d4..d4998c6 100644 --- a/src/mods/names.js +++ b/src/mods/names.js @@ -1,36 +1,67 @@ idrinth.names = { - load: function ( added ) { - 'use strict'; - idrinth.core.ajax.runHome ( - 'users-service/' + added, - function ( text ) { - idrinth.names.import ( text ); - } - ); - }, - import: function ( data ) { - 'use strict'; - data = JSON.parse ( data ); - if ( !data ) { - return; - } - if ( data.users ) { - idrinth.names.users = data.users; - } - if ( data.guilds ) { - idrinth.names.guilds = data.guilds; - } - if ( data.classes ) { - idrinth.names.classes = data.classes; - } - }, run: function ( ) { 'use strict'; + var load = function ( added ) { + var importNames = function ( data ) { + data = JSON.parse ( data ); + if ( !data ) { + return; + } + if ( data.users ) { + idrinth.names.users = data.users; + } + if ( data.guilds ) { + idrinth.names.guilds = data.guilds; + } + if ( data.classes ) { + idrinth.names.classes = data.classes; + } + }; + idrinth.core.ajax.runHome ( + 'users-service/' + added, + importNames + ); + }; + var add = function ( ) { + var processName = function ( element ) { + var name = ''; + var parse = function ( element ) { + 'use strict'; + if ( element.getAttribute ( 'dotdxname' ) ) { + return ( element.getAttribute ( 'dotdxname' ) ); + } + if ( element.getAttribute ( 'username' ) ) { + return ( element.getAttribute ( 'username' ) ); + } + return ( element.innerHTML ).replace ( /(<([^>]+)>)/ig, "" ); + }; + try { + name = parse ( element ); + } catch ( e ) { + return; + } + if ( !name ) { + return; + } + if ( !element.getAttribute ( 'data-idrinth-parsed' ) && idrinth.ui.childOf ( element, 'chat_message_window' ) ) { + element.setAttribute ( 'onmouseover', 'idrinth.ui.showTooltip(this);' ); + element.setAttribute ( 'data-idrinth-parsed', '1' ); + } + if ( !idrinth.names.users[name.toLowerCase ( )] && name.length > 0 ) { + idrinth.names.users[name.toLowerCase ()] = { }; + idrinth.core.ajax.runHome ( 'users-service/add/' + encodeURIComponent ( name ) + '/' ); + } + }; + var el = document.getElementsByClassName ( 'username' ); + for (var count = el.length - 1; count >= 0; count--) { + processName ( el[count] ); + } + }; try { if ( idrinth.names.counter % 300 === 0 || Object.keys ( idrinth.names.users ).length === 0 ) { - idrinth.names.load ( Object.keys ( idrinth.names.classes ).length === 0 ? 'init/' : 'get/' ); + load ( Object.keys ( idrinth.names.classes ).length === 0 ? 'init/' : 'get/' ); } else if ( Object.keys ( idrinth.names.users ).length > 0 ) { - idrinth.names.add ( ); + add ( ); } } catch ( e ) { idrinth.core.log ( e ); @@ -42,40 +73,6 @@ idrinth.names = { classes: { }, guilds: { }, ownTimeout: null, - add: function ( ) { - var processName = function ( element ) { - var name = ''; - try { - name = idrinth.names.parse ( element ); - } catch ( e ) { - return; - } - if ( !name ) { - return; - } - if ( element.getAttribute ( 'onmouseover' ) !== 'idrinth.ui.showTooltip()(this);' && idrinth.ui.childOf ( element, 'chat_message_window' ) ) { - element.setAttribute ( 'onmouseover', 'idrinth.ui.showTooltip(this);' ); - } - if ( !idrinth.names.users[name.toLowerCase ( )] && name.length > 0 ) { - idrinth.names.users[name.toLowerCase ()] = { }; - idrinth.core.ajax.runHome ( 'users-service/add/' + encodeURIComponent ( name ) + '/' ); - } - }; - var el = document.getElementsByClassName ( 'username' ); - for (var count = el.length - 1; count >= 0; count--) { - processName ( el[count] ); - } - }, - parse: function ( element ) { - 'use strict'; - if ( element.getAttribute ( 'dotdxname' ) ) { - return ( element.getAttribute ( 'dotdxname' ) ); - } - if ( element.getAttribute ( 'username' ) ) { - return ( element.getAttribute ( 'username' ) ); - } - return ( element.innerHTML ).replace ( /(<([^>]+)>)/ig, "" ); - }, start: function ( ) { 'use strict'; var build = function ( ) { From 4a1ad03228186682469ee30d2c88d89464a56beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 13:58:39 +0100 Subject: [PATCH 308/341] refs #108 refs #245 refs #135 reorganizing adding jsdoc headers preparing parsing to work without onhover-attribute --- src/mods/names.js | 70 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 63 insertions(+), 7 deletions(-) diff --git a/src/mods/names.js b/src/mods/names.js index d4998c6..42edc87 100644 --- a/src/mods/names.js +++ b/src/mods/names.js @@ -1,7 +1,42 @@ idrinth.names = { + /** + * @type {object} + */ + users: { }, + /** + * @type {object} + */ + classes: { }, + /** + * @type {object} + */ + guilds: { }, + /** + * a timeout + * @type {object} + */ + ownTimeout: null, + /** + * @type {Number} + */ + counter: 0, + /** + * the method being run to handle data im- and export + * @returns {undefined} + */ run: function ( ) { 'use strict'; + /** + * + * @param {string} added the path-segment defining the data returned + * @returns {undefined} + */ var load = function ( added ) { + /** + * + * @param {string} data + * @returns {undefined} + */ var importNames = function ( data ) { data = JSON.parse ( data ); if ( !data ) { @@ -22,9 +57,23 @@ idrinth.names = { importNames ); }; + /** + * adds names from elements on the page + * @returns {undefined} + */ var add = function ( ) { + /** + * + * @param {HTMLElement} element + * @returns {undefined} + */ var processName = function ( element ) { var name = ''; + /** + * + * @param {HTMLElement} element + * @returns {string} + */ var parse = function ( element ) { 'use strict'; if ( element.getAttribute ( 'dotdxname' ) ) { @@ -69,14 +118,22 @@ idrinth.names = { idrinth.names.counter = idrinth.names.counter + 1; idrinth.names.ownTimeout = window.setTimeout ( idrinth.names.run, 6666 ); }, - users: { }, - classes: { }, - guilds: { }, - ownTimeout: null, + /** + * initialises the module + * @returns {undefined} + */ start: function ( ) { 'use strict'; + /** + * creates the tooltip-element + * @returns {undefined} + */ var build = function ( ) { - 'use strict'; + /** + * + * @param {string} name + * @returns {Array} + */ function getServerPart ( name ) { return [ { css: 'idrinth-line idrinth-tooltip-header', @@ -173,6 +230,5 @@ idrinth.names = { idrinth.names.ownTimeout = window.setTimeout ( idrinth.names.run, 10000 ); build (); } - }, - counter: 0 + } }; \ No newline at end of file From 03d9a567e055ca5ae1dec039cf9f2ee02ed70f36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 14:19:59 +0100 Subject: [PATCH 309/341] fixes #108 bound hover by multibind --- src/mods/names.js | 42 +++++++++++++++++++++++++++++++++++++++++- src/mods/ui.js | 29 ----------------------------- 2 files changed, 41 insertions(+), 30 deletions(-) diff --git a/src/mods/names.js b/src/mods/names.js index 42edc87..71a2abc 100644 --- a/src/mods/names.js +++ b/src/mods/names.js @@ -93,7 +93,6 @@ idrinth.names = { return; } if ( !element.getAttribute ( 'data-idrinth-parsed' ) && idrinth.ui.childOf ( element, 'chat_message_window' ) ) { - element.setAttribute ( 'onmouseover', 'idrinth.ui.showTooltip(this);' ); element.setAttribute ( 'data-idrinth-parsed', '1' ); } if ( !idrinth.names.users[name.toLowerCase ( )] && name.length > 0 ) { @@ -226,7 +225,48 @@ idrinth.names = { } ); idrinth.ui.body.appendChild ( idrinth.ui.tooltip ); }; + /** + * shows the tooltip if the element has a known name + * @param {HTMLElement} element + * @returns {undefined} + */ + var showTooltip = function ( element ) { + /** + * + * @param {object} set + * @param {HTMLElement} element + * @param {Boolean} world + * @returns {undefined} + */ + function tooltip ( set, element, world ) { + if ( !set ) { + idrinth.ui.updateClassesList ( element, [ 'idrinth-hide' ], [ ] ); + return; + } + var baseUrl = 'https://dotd.idrinth.de/' + ( world ? 'world-kongregate' : 'kongregate' ); + idrinth.ui.updateClassesList ( idrinth.ui.tooltip, [ ], [ 'idrinth-hide' ] ); + idrinth.ui.updateClassesList ( element, [ ], [ 'idrinth-hide' ] ); + element.childNodes[0].setAttribute ( 'href', baseUrl + '/summoner/' + set.id + '/' ); + element.childNodes[0].innerHTML = set.name; + element.childNodes[1].childNodes[1].innerHTML = set.level + ' (' + set['7day'] + '/week, ' + set['30day'] + '/month)'; + element.childNodes[1].childNodes[3].innerHTML = idrinth.names.classes[set.class]; + element.childNodes[2].childNodes[1].setAttribute ( 'href', baseUrl + '/guild/' + set.guildId + '/' ); + element.childNodes[2].childNodes[1].innerHTML = idrinth.names.guilds[world ? 'world' : 'kongregate'][set.guildId]; + element.childNodes[3].childNodes[1].innerHTML = set.updated; + element.childNodes[3].setAttribute ( 'style', ( new Date () ) - ( new Date ( set.updated ) ) > 86400000 ? 'color:#aa0000;' : '' ); + } + idrinth.names.isHovering = false; + var name = idrinth.names.parse ( element ).toLowerCase ( ); + if ( idrinth.settings.get ( "names" ) && idrinth.ui.tooltip && idrinth.names.users[name] ) { + window.clearTimeout ( idrinth.ui.tooltipTO ); + idrinth.ui.tooltip.setAttribute ( 'style', idrinth.ui.getElementPositioning ( element, -200, -100 ) ); + tooltip ( idrinth.names.users[name].kongregate, idrinth.ui.tooltip.firstChild, false ); + tooltip ( idrinth.names.users[name].world, idrinth.ui.tooltip.lastChild, true ); + idrinth.ui.setTooltipTimeout (); + } + }; if ( idrinth.platform === 'kongregate' ) { + idrinth.core.multibind.add ( 'mouseover', '.chat_message_window .username', showTooltip ); idrinth.names.ownTimeout = window.setTimeout ( idrinth.names.run, 10000 ); build (); } diff --git a/src/mods/ui.js b/src/mods/ui.js index 8e6dd7c..eb53028 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -256,35 +256,6 @@ idrinth.ui = { } idrinth.ui.body.appendChild ( idrinth.ui.buildElement ( mod ) ); }, - showTooltip: function ( element ) { - 'use strict'; - function tooltip ( set, element, world ) { - if ( !set ) { - idrinth.ui.updateClassesList ( element, [ 'idrinth-hide' ], [ ] ); - return; - } - var baseUrl = 'https://dotd.idrinth.de/' + ( world ? 'world-kongregate' : 'kongregate' ); - idrinth.ui.updateClassesList ( idrinth.ui.tooltip, [ ], [ 'idrinth-hide' ] ); - idrinth.ui.updateClassesList ( element, [ ], [ 'idrinth-hide' ] ); - element.childNodes[0].setAttribute ( 'href', baseUrl + '/summoner/' + set.id + '/' ); - element.childNodes[0].innerHTML = set.name; - element.childNodes[1].childNodes[1].innerHTML = set.level + ' (' + set['7day'] + '/week, ' + set['30day'] + '/month)'; - element.childNodes[1].childNodes[3].innerHTML = idrinth.names.classes[set.class]; - element.childNodes[2].childNodes[1].setAttribute ( 'href', baseUrl + '/guild/' + set.guildId + '/' ); - element.childNodes[2].childNodes[1].innerHTML = idrinth.names.guilds[world ? 'world' : 'kongregate'][set.guildId]; - element.childNodes[3].childNodes[1].innerHTML = set.updated; - element.childNodes[3].setAttribute ( 'style', ( new Date () ) - ( new Date ( set.updated ) ) > 86400000 ? 'color:#aa0000;' : '' ); - } - idrinth.names.isHovering = false; - var name = idrinth.names.parse ( element ).toLowerCase ( ); - if ( idrinth.settings.get ( "names" ) && idrinth.ui.tooltip && idrinth.names.users[name] ) { - window.clearTimeout ( idrinth.ui.tooltipTO ); - idrinth.ui.tooltip.setAttribute ( 'style', idrinth.ui.getElementPositioning ( element, -200, -100 ) ); - tooltip ( idrinth.names.users[name].kongregate, idrinth.ui.tooltip.firstChild, false ); - tooltip ( idrinth.names.users[name].world, idrinth.ui.tooltip.lastChild, true ); - idrinth.ui.setTooltipTimeout (); - } - }, matchesCss: function ( element, selector ) { while ( element && element !== document ) { if ( typeof element.matches === 'function' && element.matches ( selector ) ) { From 5589798a6d8defdf0bfa205224bd2ecd12e01bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 14:27:25 +0100 Subject: [PATCH 310/341] removing uselss call to none existant function --- src/mods/chat.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index ffeb7c3..08bd3a1 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -808,7 +808,6 @@ idrinth.chat = { return; } idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 1500 ); - idrinth.chat.refreshMembers (); }, startLoginCallback: function ( data ) { if ( !data ) { From afb55d8a9bed5e167cf0efbf3b712410e1892073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 14:31:36 +0100 Subject: [PATCH 311/341] reparing parsing --- src/mods/names.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/mods/names.js b/src/mods/names.js index 71a2abc..13cb34d 100644 --- a/src/mods/names.js +++ b/src/mods/names.js @@ -20,6 +20,21 @@ idrinth.names = { * @type {Number} */ counter: 0, + /** + * + * @param {HTMLElement} element + * @returns {string} + */ + parse: function ( element ) { + 'use strict'; + if ( element.getAttribute ( 'dotdxname' ) ) { + return ( element.getAttribute ( 'dotdxname' ) ); + } + if ( element.getAttribute ( 'username' ) ) { + return ( element.getAttribute ( 'username' ) ); + } + return ( element.innerHTML ).replace ( /(<([^>]+)>)/ig, "" ); + }, /** * the method being run to handle data im- and export * @returns {undefined} @@ -69,23 +84,8 @@ idrinth.names = { */ var processName = function ( element ) { var name = ''; - /** - * - * @param {HTMLElement} element - * @returns {string} - */ - var parse = function ( element ) { - 'use strict'; - if ( element.getAttribute ( 'dotdxname' ) ) { - return ( element.getAttribute ( 'dotdxname' ) ); - } - if ( element.getAttribute ( 'username' ) ) { - return ( element.getAttribute ( 'username' ) ); - } - return ( element.innerHTML ).replace ( /(<([^>]+)>)/ig, "" ); - }; try { - name = parse ( element ); + name = idrinth.names.parse ( element ); } catch ( e ) { return; } From 5386709b1a079de2abff223bc660a3a4286de562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 18:11:34 +0100 Subject: [PATCH 312/341] adding object to handle timeouts fixes #203 adding jsdoc refs #135 --- src/mods/core.js | 185 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 184 insertions(+), 1 deletion(-) diff --git a/src/mods/core.js b/src/mods/core.js index 3569d01..5bb3f3a 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -1,4 +1,9 @@ idrinth.core = { + /** + * + * @param {string} str + * @returns {string} + */ escapeRegExp: function ( str ) { return str.replace ( /[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&" ); }, @@ -12,13 +17,41 @@ idrinth.core = { fieldIsSetting: function ( parent, field, allowObjects ) { return parent && typeof parent === 'object' && field && parent.hasOwnProperty ( field ) && ( parent[field] === null || typeof parent[field] !== 'object' || allowObjects ) && typeof parent[field] !== 'function'; }, + /** + * + * @type {object} + */ ajax: { + /** + * + * @type {object} + */ + active: { }, + /** + * + * @param {string} url + * @param {function} success + * @param {function} failure + * @param {function} timeout + * @param {string} additionalHeader + * @param {Boolean} [false] isStatic + * @returns {undefined} + */ runHome: function ( url, success, failure, timeout, additionalHeader, isStatic ) { var server = isStatic ? 'static' : ( idrinth.settings.get ( "isWorldServer" ) ? 'world-' : '' ) + idrinth.platform; var homeUrl = 'https://dotd.idrinth.de/' + server + ( '/' + url ).replace ( /\/\//, '/' ); idrinth.core.ajax.run ( homeUrl, success, failure, timeout, additionalHeader ); }, - active: { }, + /** + * + * @param {string} url + * @param {function} success + * @param {function} failure + * @param {function} timeout + * @param {string} additionalHeader + * @param {Boolean} [false] isStatic + * @returns {undefined} + */ run: function ( url, success, failure, timeout, additionalHeader ) { 'use strict'; var requestHandler = new XMLHttpRequest ( ); @@ -68,7 +101,16 @@ idrinth.core = { idrinth.core.ajax.active[url].send ( ); } }, + /** + * + * @type {object} + */ copyToClipboard: { + /** + * + * @param {string} text + * @returns {Boolean} + */ text: function ( text ) { var success; try { @@ -87,6 +129,11 @@ idrinth.core = { idrinth.ui.removeElement ( "idrinth-copy-helper" ); return success; }, + /** + * + * @param {HTMLElement} element + * @returns {string} + */ element: function ( element ) { if ( element.hasAttribute ( 'data-clipboard-text' ) ) { return idrinth.core.copyToClipboard.text ( element.getAttribute ( 'data-clipboard-text' ) ); @@ -97,6 +144,12 @@ idrinth.core = { return idrinth.core.copyToClipboard.text ( element.innerHTML ); } }, + /** + * + * @param {string} title + * @param {string|HTMLElement} content + * @returns {Boolean|window.Notification} + */ sendNotification: function ( title, content ) { if ( !( "Notification" in window ) ) { return false; @@ -112,18 +165,135 @@ idrinth.core = { body: content } ); }, + /** + * + * @type {object} + */ + timeouts: { + /** + * + * @type {object} + */ + next: null, + /** + * + * @type {object} + */ + list: { }, + /** + * + * @param {string} identifier + * @returns {undefined} + */ + remove: function ( identifier ) { + 'use strict'; + if ( idrinth.core.timeouts.list[identifier] !== undefined ) { + delete idrinth.core.timeouts.list[identifier]; + } + }, + /** + * + * @param {string} identifier + * @param {function} func + * @param {int} time in milliseconds + * @param {Boolean} [false] isInterval + * @returns {undefined} + */ + add: function ( identifier, func, time, isInterval ) { + 'use strict'; + var date = new Date (); + idrinth.core.timeouts.list[identifier] = { + func: func, + next: date.getTime () + date.getMilliseconds () + time / 1000, + duration: time, + interval: !!isInterval + }; + }, + /** + * activates all relevant timeouts and intervals + * @returns {undefined} + */ + process: function () { + 'use strict'; + var date = ( new Date () ).getTime () + ( new Date () ).getMilliseconds (); + var min = 10000; + /** + * + * @param {Number} durationLeft + * @param {Number} minDuration + * @returns {Number} + */ + var getVal = function ( durationLeft, minDuration ) { + if ( durationLeft < 0.1 ) { + return 0.1; + } + return durationLeft < minDuration ? durationLeft : minDuration; + }; + for (var property in idrinth.core.timeouts.list) { + if ( idrinth.core.timeouts.list.hasOwnProperty ( property ) ) { + if ( date >= idrinth.core.timeouts.list[property].next ) { + try { + idrinth.core.timeouts.list[property].func (); + if ( idrinth.core.timeouts.list[property].interval ) { + min = getVal ( idrinth.core.timeouts.list[property].duration, min ); + idrinth.core.timeouts.list[property].next = date + idrinth.core.timeouts.list[property].duration; + } else { + delete idrinth.core.timeouts.list[property]; + } + } catch ( e ) { + idrinth.core.log ( e.message ? e.message : e.getMessage () ); + } + } else { + min = getVal ( idrinth.core.timeouts.list[property].next - date, min ); + } + } + } + idrinth.core.timeouts.next = window.setTimeout ( idrinth.core.timeouts.process, min * 1000 ); + } + }, + /** + * + * @param {string} string + * @returns {undefined} + */ log: function ( string ) { 'use strict'; console.log ( '[IDotDS] ' + string ); }, + /** + * + * @param {string} text + * @returns {undefined} + */ alert: function ( text ) { idrinth.ui.buildModal ( 'Info', text ); }, + /** + * + * @param {string} text + * @param {function} callback + * @returns {undefined} + */ confirm: function ( text, callback ) { idrinth.ui.buildModal ( 'Do you?', text, callback ); }, + /** + * + * @type {object} + */ multibind: { + /** + * + * @type {object} + */ events: { }, + /** + * + * @param {string} event + * @param {string} selector + * @param {function} method + * @returns {undefined} + */ add: function ( event, selector, method ) { var bind = function ( event, selector, method ) { idrinth.core.multibind.events[event] = idrinth.core.multibind.events[event] ? idrinth.core.multibind.events[event] : { }; @@ -138,7 +308,20 @@ idrinth.core = { } bind ( event, selector, method ); }, + /** + * + * @param {HTMLElement} element + * @param {string} event + * @returns {undefined} + */ triggered: function ( element, event ) { + /** + * + * @param {HTMLElement} el + * @param {string} event + * @param {string} selector + * @returns {undefined} + */ var handleElement = function ( el, event, selector ) { if ( !el ) { return; From 6b1be3ac63c3fd05a0c26ba78b30ea94ee1b8b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 22:30:38 +0100 Subject: [PATCH 313/341] fixes #203 moving intervals and timeouts to new wrapper --- src/mods/chat.js | 16 +++++++-------- src/mods/names.js | 15 +++++--------- src/mods/raids.js | 25 +++++++---------------- src/mods/tier.js | 6 +++--- src/mods/ui.js | 5 ++--- src/mods/user.js | 46 ++++++++++++++++++++--------------------- src/mods/war.js | 13 +++--------- src/stable.js | 52 ++++++++++++++++------------------------------- 8 files changed, 68 insertions(+), 110 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index 08bd3a1..da9fc3a 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -167,7 +167,7 @@ idrinth.chat = { processMessages ( data.messages ); } idrinth.chat.oldMessages = [ ]; - idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 999 ); + idrinth.core.timeouts.add ( 'chat', idrinth.chat.refreshChats, 999 ); }; var refreshMembers = function () { var applyMembers = function ( data ) { @@ -249,7 +249,7 @@ idrinth.chat = { idrinth.chat.messages.unshift ( idrinth.chat.oldMessages[count] ); } idrinth.chat.oldMessages = [ ]; - window.setTimeout ( idrinth.chat.refreshChats, 999 ); + idrinth.core.timeouts.add ( 'chat', idrinth.chat.refreshChats, 999 ); }, userclick: function ( element, user, chat ) { 'use strict'; @@ -707,14 +707,14 @@ idrinth.chat = { idrinth.chat.elements.chats = document.getElementById ( 'idrinth-chat' ).getElementsByTagName ( 'ul' )[1]; idrinth.chat.elements.menu = document.getElementById ( 'idrinth-chat' ).getElementsByTagName ( 'ul' )[0]; } - window.setTimeout ( function () { + idrinth.core.timeouts.add ( 'chat.login', function () { idrinth.core.ajax.runHome ( 'chat-service/login/', idrinth.chat.startLoginCallback, function ( reply ) { }, function ( reply ) { - window.setTimeout ( idrinth.chat.login, 1 ); + idrinth.core.timeouts.add ( 'chat.login', idrinth.chat.login, 1 ); }, JSON.stringify ( { user: idrinth.settings.get ( "chatuser" ), @@ -722,7 +722,7 @@ idrinth.chat = { } ) ); }, 2500 ); - window.setTimeout ( function () { + idrinth.core.timeouts.add ( 'chat.emoticons', function () { idrinth.core.ajax.runHome ( 'emoticons/data/', function ( reply ) { @@ -807,7 +807,7 @@ idrinth.chat = { if ( idrinth.chat.updateTimeout ) { return; } - idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 1500 ); + idrinth.core.timeouts.add ( 'chat', idrinth.chat.refreshChats, 1500 ); }, startLoginCallback: function ( data ) { if ( !data ) { @@ -939,7 +939,7 @@ idrinth.chat = { idrinth.core.alert ( idrinth.text.get ( "chat.error.login" ) ); }, timeout = function () { - window.setTimeout ( idrinth.chat.login, 1 ); + idrinth.core.timeouts.add ( 'chat.login', idrinth.chat.login, 1 ); }, headers = { user: '', @@ -952,7 +952,7 @@ idrinth.chat = { if ( key === 'relogin' ) { success = function () { - idrinth.chat.updateTimeout = window.setTimeout ( idrinth.chat.refreshChats, 1500 ); + idrinth.core.timeouts.add ( 'chat', idrinth.chat.refreshChats, 1500 ); }; headers.user = idrinth.settings.get ( "chatuser" ); headers.pass = idrinth.settings.get ( "chatpass" ); diff --git a/src/mods/names.js b/src/mods/names.js index 13cb34d..3b9e733 100644 --- a/src/mods/names.js +++ b/src/mods/names.js @@ -11,11 +11,6 @@ idrinth.names = { * @type {object} */ guilds: { }, - /** - * a timeout - * @type {object} - */ - ownTimeout: null, /** * @type {Number} */ @@ -106,7 +101,7 @@ idrinth.names = { } }; try { - if ( idrinth.names.counter % 300 === 0 || Object.keys ( idrinth.names.users ).length === 0 ) { + if ( idrinth.names.counter === 0 || Object.keys ( idrinth.names.users ).length === 0 ) { load ( Object.keys ( idrinth.names.classes ).length === 0 ? 'init/' : 'get/' ); } else if ( Object.keys ( idrinth.names.users ).length > 0 ) { add ( ); @@ -114,8 +109,8 @@ idrinth.names = { } catch ( e ) { idrinth.core.log ( e ); } - idrinth.names.counter = idrinth.names.counter + 1; - idrinth.names.ownTimeout = window.setTimeout ( idrinth.names.run, 6666 ); + idrinth.names.counter = ( idrinth.names.counter + 1 ) % 300; + idrinth.core.timeouts.add ( 'names', idrinth.names.run, 6666 ); }, /** * initialises the module @@ -258,7 +253,7 @@ idrinth.names = { idrinth.names.isHovering = false; var name = idrinth.names.parse ( element ).toLowerCase ( ); if ( idrinth.settings.get ( "names" ) && idrinth.ui.tooltip && idrinth.names.users[name] ) { - window.clearTimeout ( idrinth.ui.tooltipTO ); + idrinth.core.timeouts.remove ( 'names.tooltip' ); idrinth.ui.tooltip.setAttribute ( 'style', idrinth.ui.getElementPositioning ( element, -200, -100 ) ); tooltip ( idrinth.names.users[name].kongregate, idrinth.ui.tooltip.firstChild, false ); tooltip ( idrinth.names.users[name].world, idrinth.ui.tooltip.lastChild, true ); @@ -267,7 +262,7 @@ idrinth.names = { }; if ( idrinth.platform === 'kongregate' ) { idrinth.core.multibind.add ( 'mouseover', '.chat_message_window .username', showTooltip ); - idrinth.names.ownTimeout = window.setTimeout ( idrinth.names.run, 10000 ); + idrinth.core.timeouts.add ( 'names', idrinth.names.run, 10000 ); build (); } } diff --git a/src/mods/raids.js b/src/mods/raids.js index ff38b83..682b3e3 100644 --- a/src/mods/raids.js +++ b/src/mods/raids.js @@ -2,19 +2,7 @@ idrinth.raids = { script: null, list: { }, joined: { }, - interval: null, requested: 0, - clearInterval: function () { - try { - window.clearInterval ( idrinth.raids.interval ); - } catch ( e ) { - idrinth.raids.interval = null; - } - }, - restartInterval: function () { - this.clearInterval (); - idrinth.raids.interval = window.setInterval ( idrinth.raids.join.process, 1500 ); - }, import: function ( id ) { 'use strict'; if ( !idrinth.platform ) { @@ -59,13 +47,13 @@ idrinth.raids = { return ( ( Object.keys ( idrinth.raids.joined ) ).concat ( Object.keys ( idrinth.raids.list ) ) ).join (); }, clearAll: function () { - this.clearInterval ( ); + idrinth.core.timeouts.remove ( 'raids' ); while ( document.getElementById ( "idrinth-raid-link-list" ).firstChild ) { idrinth.ui.removeElement ( document.getElementById ( "idrinth-raid-link-list" ).firstChild.id ); } idrinth.raids.list = { }; idrinth.raids.joined = { }; - idrinth.raids.restartInterval (); + idrinth.raids.start (); }, join: { data: { @@ -172,7 +160,7 @@ idrinth.raids = { trying: function ( key ) { 'use strict'; ( ( function ( key ) { - window.setTimeout ( function () { + idrinth.core.timeouts.add ( 'raid.join.' + key, function () { var id = 'idrinth-raid-link-' + key; if ( document.getElementById ( id ) ) { idrinth.ui.removeElement ( id ); @@ -232,7 +220,7 @@ idrinth.raids = { }, { name: 'onload', - value: 'try{event.stopPropagation();}catch(e){}window.setTimeout(){function(){idrinth.ui.removeElement(\'' + key + '\');},1234);' + value: 'try{event.stopPropagation();}catch(e){}idrinth.core.timeouts.add(\'raids.join.cleanup.' + key + '\',{function(){idrinth.ui.removeElement(\'' + key + '\');},1234);' }, { name: 'onunload', @@ -241,7 +229,7 @@ idrinth.raids = { ] } ); ( ( function ( key ) { - return window.setTimeout ( function () { + return idrinth.core.timeouts.add ( 'raids.join.remove.' + key, function () { idrinth.ui.removeElement ( 'join-' + key ); }, 30000 ); } ) ( key ) ); @@ -317,6 +305,7 @@ idrinth.raids = { }, start: function ( ) { 'use strict'; - idrinth.raids.restartInterval (); + idrinth.core.timeouts.remove ( 'raids' ); + idrinth.core.timeouts.add ( 'raids', idrinth.raids.join.process, 1500, true ); } }; diff --git a/src/mods/tier.js b/src/mods/tier.js index e7f37ae..5662e1e 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -140,7 +140,7 @@ idrinth.tier = { } } } else { - window.setTimeout ( idrinth.tier.start, 1000 ); + idrinth.core.timeouts.add ( 'tier', idrinth.tier.start, 1000 ); } }; while ( 0 < window.innerWidth - 140 * ( pos + 1 ) ) { @@ -151,10 +151,10 @@ idrinth.tier = { 'tier-service/', importData, function ( ) { - window.setTimeout ( idrinth.tier.start, 10000 ); + idrinth.core.timeouts.add ( 'tier', idrinth.tier.start, 10000 ); }, function ( ) { - window.setTimeout ( idrinth.tier.start, 10000 ); + idrinth.core.timeouts.add ( 'tier', idrinth.tier.start, 10000 ); } ); }, diff --git a/src/mods/ui.js b/src/mods/ui.js index eb53028..4645170 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -14,7 +14,7 @@ idrinth.ui = { }, buildChat: function ( id, name, rank, pass ) { if ( !idrinth.chat.elements.chats ) { - window.setTimeout ( function () { + idrinth.core.timeouts.add ( 'chat-' + id, function () { idrinth.ui.buildChat ( id, name, rank, pass ); }, 500 ); } @@ -200,7 +200,6 @@ idrinth.ui = { return el; }, controls: null, - tooltipTO: null, buildModal: function ( title, content, altFunc ) { var mod = { children: [ ], @@ -265,7 +264,7 @@ idrinth.ui = { } }, setTooltipTimeout: function () { - idrinth.ui.tooltipTO = window.setTimeout ( idrinth.ui.hideTooltip, idrinth.settings.get ( "timeout" ) ? idrinth.settings.get ( "timeout" ) : 5000 ); + idrinth.core.timeouts.add ( 'names.tooltip', idrinth.ui.hideTooltip, idrinth.settings.get ( "timeout" ) ? idrinth.settings.get ( "timeout" ) : 5000 ); }, hideTooltip: function () { if ( idrinth.names.isHovering ) { diff --git a/src/mods/user.js b/src/mods/user.js index 8adc30d..1877617 100644 --- a/src/mods/user.js +++ b/src/mods/user.js @@ -27,32 +27,32 @@ idrinth.user = { idrinth.user.id = ag[1]; idrinth.user.token = ag[2]; } - window.setTimeout ( idrinth.user.sendAlive, 20000 ); - }, - sendAlive: function () { - var getIdentifier = function () { - var guid = function () { - //from http://stackoverflow.com/a/105074 - var s4 = function () { - return Math.floor ( ( 1 + Math.random () ) * 0x10000 ).toString ( 36 ); + var sendAlive = function () { + var getIdentifier = function () { + var guid = function () { + //from http://stackoverflow.com/a/105074 + var s4 = function () { + return Math.floor ( ( 1 + Math.random () ) * 0x10000 ).toString ( 36 ); + }; + return s4 () + '-' + + s4 () + s4 () + '-' + + s4 () + s4 () + s4 () + '-' + + s4 () + s4 () + s4 () + s4 () + '-' + + s4 () + s4 () + s4 () + s4 () + s4 () + '-' + + s4 () + s4 () + s4 () + s4 () + s4 () + s4 (); }; - return s4 () + '-' + - s4 () + s4 () + '-' + - s4 () + s4 () + s4 () + '-' + - s4 () + s4 () + s4 () + s4 () + '-' + - s4 () + s4 () + s4 () + s4 () + s4 () + '-' + - s4 () + s4 () + s4 () + s4 () + s4 () + s4 (); + idrinth.user.identifier = window.localStorage.getItem ( 'idrinth-dotd-uuid' ); + if ( !idrinth.user.identifier || idrinth.user.identifier === '' || idrinth.user.identifier === null || !idrinth.user.identifier.match ( /^[a-z0-9]{4}-[a-z0-9]{8}-[a-z0-9]{12}-[a-z0-9]{16}-[a-z0-9]{20}-[a-z0-9]{24}$/ ) ) { + idrinth.user.identifier = guid (); + } + window.localStorage.setItem ( 'idrinth-dotd-uuid', idrinth.user.identifier ); + return idrinth.user.identifier; }; - idrinth.user.identifier = window.localStorage.getItem ( 'idrinth-dotd-uuid' ); - if ( !idrinth.user.identifier || idrinth.user.identifier === '' || idrinth.user.identifier === null || !idrinth.user.identifier.match ( /^[a-z0-9]{4}-[a-z0-9]{8}-[a-z0-9]{12}-[a-z0-9]{16}-[a-z0-9]{20}-[a-z0-9]{24}$/ ) ) { - idrinth.user.identifier = guid (); + if ( !window.localStorage ) { + return; } - window.localStorage.setItem ( 'idrinth-dotd-uuid', idrinth.user.identifier ); - return idrinth.user.identifier; + idrinth.core.ajax.runHome ( 'i-am-alive/' + getIdentifier () + '/' ); }; - if ( !window.localStorage ) { - return; - } - idrinth.core.ajax.runHome ( 'i-am-alive/' + getIdentifier () + '/' ); + idrinth.core.timeouts.add ( 'user', sendAlive, 20000 ); } }; diff --git a/src/mods/war.js b/src/mods/war.js index 3e9c0cc..b171bb2 100644 --- a/src/mods/war.js +++ b/src/mods/war.js @@ -2,16 +2,9 @@ idrinth.war = { from: null, to: null, element: null, - warTO: null, setTO: function ( ) { - if ( !idrinth.war.warTO ) { - idrinth.war.warTO = window.setTimeout ( - idrinth.war.getData, - ( idrinth.war.element.getAttribute ( 'class' ) ).match ( /(^|\s)idrinth-hide($|\s)/ ) !== null ? - 30000 : - 120000 - ); - } + var active = ( idrinth.war.element.getAttribute ( 'class' ) ).match ( /(^|\s)idrinth-hide($|\s)/ ) !== null; + idrinth.core.timeouts.add ( 'war', idrinth.war.getData, active ? 30000 : 120000 ); }, getData: function () { var raids2Join = function () { @@ -246,7 +239,7 @@ idrinth.war = { ); idrinth.ui.body.appendChild ( idrinth.war.element ); }; - idrinth.war.warTO = window.setTimeout ( idrinth.war.getData, 5000 ); + idrinth.core.timeouts.add ( 'war', idrinth.war.getData, 5000 ); build (); } }; \ No newline at end of file diff --git a/src/stable.js b/src/stable.js index ee29345..b640233 100644 --- a/src/stable.js +++ b/src/stable.js @@ -3,10 +3,9 @@ var idrinth = { windowactive: true, facebook: { popup: null, - timeout: null, restart: function () { try { - window.clearTimeout ( idrinth.facebook.timeout ); + idrinth.core.timeouts.remove ( 'facebook' ); idrinth.facebook.popup.close (); idrinth.ui.reloadGame (); idrinth.raids.clearAll (); @@ -15,17 +14,12 @@ var idrinth = { } }, rejoin: function () { - try { - window.clearInterval ( idrinth.raids.interval ); - } catch ( e ) { - idrinth.core.log ( e ); - } + idrinth.core.timeouts.remove ( 'raids' ); idrinth.facebook.popup = window.open ( "https://apps.facebook.com/dawnofthedragons/" ); idrinth.facebook.popup.onload = function () { - window.clearTimeout ( idrinth.facebook.timeout ); - idrinth.facebook.timeout = window.setTimeout ( idrinth.facebook.restart, 3333 ); + idrinth.core.timeouts.add ( 'facebook', idrinth.facebook.restart, 3333 ); }; - idrinth.facebook.timeout = window.setTimeout ( idrinth.facebook.restart, 11111 ); + idrinth.core.timeouts.add ( 'facebook', idrinth.facebook.restart, 11111 ); } }, newgrounds: { @@ -42,9 +36,9 @@ var idrinth = { alarmCheck: function () { var now = new Date (); if ( idrinth.settings.get ( "alarmActive" ) && now.getHours () + ':' + now.getMinutes () === idrinth.settings.get ( "alarmTime" ) ) { - window.setTimeout ( idrinth.newgrounds.joinRaids, 1 ); + idrinth.core.timeouts.add ( 'newgrounds', idrinth.newgrounds.joinRaids, 1 ); } - window.setTimeout ( idrinth.newgrounds.alarmCheck, 60000 ); + idrinth.core.timeouts.add ( 'newgrounds', idrinth.newgrounds.alarmCheck, 60000 ); }, join: function () { if ( idrinth.newgrounds.raids.length === 0 ) { @@ -58,7 +52,7 @@ var idrinth = { frame.setAttribute ( 'src', link ); }, remove: function ( key ) { - window.setTimeout ( + idrinth.core.timeouts.add ( 'newgrounds.remove', function () { try { idrinth.raids.list[key].joined = true; @@ -88,19 +82,8 @@ var idrinth = { idrinth.settings.get ( "newgroundLoad" ) * 1000 ); } }, - clearTimeout: function ( timeout ) { - if ( timeout ) { - try { - window.clearTimeout ( timeout ); - } catch ( e ) { - idrinth.core.log ( typeof e.getMessage === 'function' ? e.getMessage : e ) - } - } - }, reload: function ( ) { - idrinth.clearTimeout ( idrinth.chat.updateTimeout ); - idrinth.clearTimeout ( idrinth.war.warTO ); - idrinth.raids.clearInterval (); + window.clearTimeout ( idrinth.core.timeouts.next ); idrinth.ui.removeElement ( 'idrinth-controls' ); idrinth.ui.removeElement ( 'idrinth-chat' ); idrinth.ui.removeElement ( 'idrinth-war' ); @@ -121,17 +104,18 @@ var idrinth = { frame.setAttribute ( 'src', ( frame.getAttribute ( 'src' ) ).replace ( /&ir=.*/, '' ) + '&' + ( window.location.search ).replace ( /^\?/, '' ) ); } } catch ( e ) { - window.setTimeout ( idrinth.startInternal, 500 ); + return idrinth.core.timeouts.add ( 'start', idrinth.startInternal, 500 ); return; } - window.setTimeout ( idrinth.newgrounds.alarmCheck, 3333 ); + return idrinth.core.timeouts.add ( 'newgrounds', idrinth.newgrounds.alarmCheck, 3333 ); } idrinth.settings.start ( ); idrinth.text.start ( ); - idrinth._tmp=window.setInterval(function() { - if(!idrinth.text.initialized) { + idrinth.core.timeouts.add ( 'start', function () { + if ( !idrinth.text.initialized ) { return; } + idrinth.core.timeouts.remove ( 'start' ); idrinth.ui.start ( ); idrinth.user.start ( ); idrinth.names.start ( ); @@ -139,9 +123,7 @@ var idrinth = { idrinth.tier.start ( ); idrinth.chat.start ( ); idrinth.war.start ( ); - window.clearInterval(idrinth._tmp); - delete idrinth['_tmp']; - window.setTimeout ( function () { + idrinth.core.timeouts.add ( 'core.multibind', function () { idrinth.core.multibind.add ( 'click', '.clipboard-copy', function ( element, event ) { idrinth.core.copyToClipboard.element ( element ); element.parentNode.parentNode.removeChild ( element.parentNode ); @@ -150,7 +132,8 @@ var idrinth = { }, 1000 ); delete idrinth['start']; delete idrinth['startInternal']; - },123); + }, 123, true ); + idrinth.core.timeouts.process (); }, start: function ( ) { 'use strict'; @@ -166,8 +149,7 @@ var idrinth = { idrinth.platform = 'facebook'; } if ( idrinth.platform === 'armorgames' ) { - window.setTimeout ( idrinth.startInternal, 2222 ); - return; + return idrinth.core.timeouts.add ( 'start', idrinth.startInternal, 2222 ); } idrinth.startInternal (); } From e5ce434063fab110eb545e4be784dcf457a17156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 22:32:21 +0100 Subject: [PATCH 314/341] fixes #203 removing overlooked timeout --- src/mods/chat.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/mods/chat.js b/src/mods/chat.js index da9fc3a..0905c5e 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -774,7 +774,6 @@ idrinth.chat = { document.getElementById ( 'idrinth-make-chat' ).getElementsByTagName ( 'input' )[0].value = ''; }, users: { }, - updateTimeout: null, add: function () { idrinth.core.ajax.runHome ( 'chat-service/join/', @@ -804,9 +803,6 @@ idrinth.chat = { idrinth.ui.buildChat ( chatId, list[chatId].name, list[chatId].access, list[chatId].pass ); } } - if ( idrinth.chat.updateTimeout ) { - return; - } idrinth.core.timeouts.add ( 'chat', idrinth.chat.refreshChats, 1500 ); }, startLoginCallback: function ( data ) { From 3fc93198fd15c86d915477bc2ad80bfadcb60018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 22:41:30 +0100 Subject: [PATCH 315/341] refs #135 adding jsdoc headers --- src/mods/war.js | 381 +++++++++++++++++++++++++++++------------------- 1 file changed, 227 insertions(+), 154 deletions(-) diff --git a/src/mods/war.js b/src/mods/war.js index b171bb2..b62aa34 100644 --- a/src/mods/war.js +++ b/src/mods/war.js @@ -1,12 +1,230 @@ idrinth.war = { + /** + * + * @type {string} + */ from: null, + /** + * + * @type {string} + */ to: null, + /** + * + * @type {HTMLElement} + */ element: null, + /** + * sets the timeout + * @returns {undefined} + */ setTO: function ( ) { var active = ( idrinth.war.element.getAttribute ( 'class' ) ).match ( /(^|\s)idrinth-hide($|\s)/ ) !== null; idrinth.core.timeouts.add ( 'war', idrinth.war.getData, active ? 30000 : 120000 ); }, + /** + * requests data from the server + * @returns {undefined} + */ getData: function () { + /** + * + * @param {object} data + * @returns {undefined} + */ + var updateData = function ( data ) { + /** + * + * @param {object} data + * @returns {undefined} + */ + var process = function ( data ) { + /** + * + * @param {Boolean} onOff + * @returns {undefined} + */ + var toggleGUI = function ( onOff ) { + var toggle = onOff || false; + var addClasses = [ ]; + var removeClasses = [ ]; + if ( toggle === true ) { + removeClasses.push ( 'idrinth-hide' ); + addClasses.push ( "bottom" ); + if ( !idrinth.settings.get ( "warBottom" ) ) { + removeClasses.push ( "bottom" ); + } + } else { + addClasses.push ( "idrinth-hide" ); + while ( idrinth.war.element.childNodes[1].childNodes[1].firstChild ) { + idrinth.war.element.childNodes[1].childNodes[1].removeChild ( idrinth.war.element.childNodes[1].firstChild.firstChild ); + } + } + idrinth.ui.updateClassesList ( idrinth.war.element, addClasses, removeClasses ); + }; + /** + * + * @param {object} data + * @returns {undefined} + */ + var processJson = function ( data ) { + var magicIgmSrv = 'https://dotd.idrinth.de/static/magic-image-service/'; + /** + * + * @param {object} data + * @returns {Array} + */ + var getMagic = function ( data ) { + var magics = [ ]; + if ( !data || ( data.magics === null || data.magics === '' ) ) { + return [ ]; + } + var tmp = data.magics.split ( ',' ); + for (var key = 0; key < tmp.length; key++) { + var magic = tmp[key]; + var magicObj = { + type: 'img', + attributes: [ + { + name: 'src', + value: magicIgmSrv + magic + '/' + }, + { + name: 'width', + value: '20' + } ] + }; + magics.push ( magicObj ); + } + return magics; + }; + /** + * + * @param {object} raids + * @returns {undefined} + */ + function addRaids ( raids ) { + for (var key in raids) { + if ( idrinth.raids.joined[key] === undefined && idrinth.raids.list[key] === undefined ) { + idrinth.raids.list[key] = raids[key]; + } + } + } + /** + * + * @param {object} data + * @param {HTMLElement} element + * @returns {undefined} + */ + function updateBoss ( data, element ) { + //TODO: Dummy function, should be removed + function cleanUp () { + while ( element.getElementsByTagName ( 'td' )[3].firstChild ) { + element.getElementsByTagName ( 'td' )[3].removeChild ( element.getElementsByTagName ( 'td' )[3].firstChild ); + } + } + + cleanUp (); + var tmpMagics = getMagic ( data ); + for (var m = 0; m < tmpMagics.length; m++) { + element.getElementsByTagName ( 'td' )[3].appendChild ( idrinth.ui.buildElement ( tmpMagics[m] ) ); + } + element.getElementsByTagName ( 'td' )[0].setAttribute ( "class", 'traffic ' + ( data.amount < 90 ? 'yes' : ( data.amount > 110 ? 'no' : 'maybe' ) ) ); + element.getElementsByTagName ( 'td' )[0].setAttribute ( "title", data.amount + '/100' ); + element.getElementsByTagName ( 'td' )[0].firstChild.innerHTML = ( data.amount < 90 ? 'yes' : ( data.amount > 110 ? 'no' : 'maybe' ) ); + } + /** + * creates a new bpss + * @param {object} data + * @param {string} boss + * @returns {undefined} + */ + function newBoss ( data, boss ) { + idrinth.war.element.childNodes[1].appendChild ( idrinth.ui.buildElement ( + { + type: 'tr', + id: 'idrinth-war-' + boss, + children: [ + { + type: 'td', + css: 'traffic ' + ( data.amount < 90 ? 'yes' : ( data.amount > 110 ? 'no' : 'maybe' ) ), + children: [ { + type: 'span', + content: ( data.amount < 90 ? 'yes' : ( data.amount > 110 ? 'no' : 'maybe' ) ) + } ], + attributes: [ + { + name: 'title', + value: data.amount + '/100' + } + ] + }, + { + type: 'td', + content: data.name + }, + { + type: 'td', + children: [ + { + type: 'input', + attributes: [ + { + name: 'type', + value: 'checkbox' + }, + { + name: 'data-id', + value: boss + }, + { + name: 'title', + value: 'join ' + data.name + } + ] + } + ] + }, + { + type: 'td', + children: getMagic ( data ) + } + ] + } + ) ); + } + if ( data.raids !== undefined ) { + addRaids ( data.raids ); + } + for (var boss in data.stats) { + if ( document.getElementById ( 'idrinth-war-' + boss ) ) { + updateBoss ( data.stats[boss], document.getElementById ( 'idrinth-war-' + boss ) ); + } else { + newBoss ( data.stats[boss], boss ); + } + } + }; + if ( data === "" || data === "null" ) { + return; + } + if ( data === "{}" ) { + toggleGUI ( false ); + return; + } + toggleGUI ( true ); + try { + processJson ( JSON.parse ( data ) ); + } catch ( e ) { + idrinth.core.log ( e ); + } + }; + process ( data ); + idrinth.war.setTO (); + }; + /** + * + * @returns {String} + */ var raids2Join = function () { var list = [ ]; for (var input in idrinth.war.element.getElementsByTagName ( 'input' )) { @@ -21,166 +239,21 @@ idrinth.war = { }; idrinth.core.ajax.runHome ( "war-service/" + raids2Join () + "/" + Date.now () + "/", - idrinth.war.updateData, + updateData, idrinth.war.setTO, idrinth.war.setTO, idrinth.raids.knowRaids () ); }, - updateData: function ( data ) { - var process = function ( data ) { - var toggleGUI = function ( onOff ) { - var toggle = onOff || false; - var addClasses = [ ]; - var removeClasses = [ ]; - if ( toggle === true ) { - removeClasses.push ( 'idrinth-hide' ); - addClasses.push ( "bottom" ); - if ( !idrinth.settings.get ( "warBottom" ) ) { - removeClasses.push ( "bottom" ); - } - } else { - addClasses.push ( "idrinth-hide" ); - while ( idrinth.war.element.childNodes[1].childNodes[1].firstChild ) { - idrinth.war.element.childNodes[1].childNodes[1].removeChild ( idrinth.war.element.childNodes[1].firstChild.firstChild ); - } - } - idrinth.ui.updateClassesList ( idrinth.war.element, addClasses, removeClasses ); - }; - var processJson = function ( data ) { - var magicIgmSrv = 'https://dotd.idrinth.de/static/magic-image-service/'; - var getMagic = function ( data ) { - var magics = [ ], - tmp; - if ( !data || ( data.magics === null || data.magics === '' ) ) { - return [ ]; - } - tmp = data.magics.split ( ',' ); - for (var key = 0; key < tmp.length; key++) { - var magic = tmp[key]; - var magicObj = { - type: 'img', - attributes: [ - { - name: 'src', - value: magicIgmSrv + magic + '/' - }, - { - name: 'width', - value: '20' - } ] - }; - magics.push ( magicObj ); - } - return magics; - }; - function addRaids ( raids ) { - for (var key in raids) { - if ( idrinth.raids.joined[key] === undefined && idrinth.raids.list[key] === undefined ) { - idrinth.raids.list[key] = raids[key]; - } - } - } - function updateBoss ( data, element ) { - //TODO: Dummy function, should be removed - function cleanUp () { - while ( element.getElementsByTagName ( 'td' )[3].firstChild ) { - element.getElementsByTagName ( 'td' )[3].removeChild ( element.getElementsByTagName ( 'td' )[3].firstChild ); - } - } - - cleanUp (); - var tmpMagics = getMagic ( data ); - for (var m = 0; m < tmpMagics.length; m++) { - element.getElementsByTagName ( 'td' )[3].appendChild ( idrinth.ui.buildElement ( tmpMagics[m] ) ); - } - element.getElementsByTagName ( 'td' )[0].setAttribute ( "class", 'traffic ' + ( data.amount < 90 ? 'yes' : ( data.amount > 110 ? 'no' : 'maybe' ) ) ); - element.getElementsByTagName ( 'td' )[0].setAttribute ( "title", data.amount + '/100' ); - element.getElementsByTagName ( 'td' )[0].firstChild.innerHTML = ( data.amount < 90 ? 'yes' : ( data.amount > 110 ? 'no' : 'maybe' ) ); - } - function newBoss ( data, boss ) { - idrinth.war.element.childNodes[1].appendChild ( idrinth.ui.buildElement ( - { - type: 'tr', - id: 'idrinth-war-' + boss, - children: [ - { - type: 'td', - css: 'traffic ' + ( data.amount < 90 ? 'yes' : ( data.amount > 110 ? 'no' : 'maybe' ) ), - children: [ { - type: 'span', - content: ( data.amount < 90 ? 'yes' : ( data.amount > 110 ? 'no' : 'maybe' ) ) - } ], - attributes: [ - { - name: 'title', - value: data.amount + '/100' - } - ] - }, - { - type: 'td', - content: data.name - }, - { - type: 'td', - children: [ - { - type: 'input', - attributes: [ - { - name: 'type', - value: 'checkbox' - }, - { - name: 'data-id', - value: boss - }, - { - name: 'title', - value: 'join ' + data.name - } - ] - } - ] - }, - { - type: 'td', - children: getMagic ( data ) - } - ] - } - ) ); - } - if ( data.raids !== undefined ) { - addRaids ( data.raids ); - } - for (var boss in data.stats) { - if ( document.getElementById ( 'idrinth-war-' + boss ) ) { - updateBoss ( data.stats[boss], document.getElementById ( 'idrinth-war-' + boss ) ); - } else { - newBoss ( data.stats[boss], boss ); - } - } - }; - if ( data === "" || data === "null" ) { - return; - } - if ( data === "{}" ) { - toggleGUI ( false ); - return; - } - toggleGUI ( true ); - try { - processJson ( JSON.parse ( data ) ); - } catch ( e ) { - idrinth.core.log ( e ); - } - }; - process ( data ); - idrinth.war.setTO (); - }, + /** + * initializes the module + * @returns {undefined} + */ start: function () { + /** + * build the gui part + * @returns {undefined} + */ var build = function ( ) { idrinth.war.element = idrinth.ui.buildElement ( { From 6724d04471fb4ff0316181707d46bd458ac699fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 22:45:29 +0100 Subject: [PATCH 316/341] refs #135 adding jsdoc headers --- src/mods/user.js | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/src/mods/user.js b/src/mods/user.js index 1877617..d097595 100644 --- a/src/mods/user.js +++ b/src/mods/user.js @@ -1,10 +1,35 @@ idrinth.user = { + /** + * + * @type String + */ token: '', + /** + * + * @type Number + */ id: 0, + /** + * + * @type String + */ name: '', + /** + * + * @type String + */ identifier: '', + /** + * initializes the module + * @returns {undefined} + */ start: function ( ) { 'use strict'; + /** + * + * @param {Sstring} name + * @returns {String} + */ var getCookie = function ( name ) { var ca = document.cookie.split ( ';' ); for (var i = 0; i < ca.length; i++) { @@ -27,10 +52,25 @@ idrinth.user = { idrinth.user.id = ag[1]; idrinth.user.token = ag[2]; } + /** + * sends an id to the server for statistic purposes + * @returns {undefined} + */ var sendAlive = function () { + /** + * + * @returns {String|idrinth.user.identifier} + */ var getIdentifier = function () { + /** + * from http://stackoverflow.com/a/105074 + * @returns {String} + */ var guid = function () { - //from http://stackoverflow.com/a/105074 + /** + * + * @returns {String} + */ var s4 = function () { return Math.floor ( ( 1 + Math.random () ) * 0x10000 ).toString ( 36 ); }; From 94eefccbd62c96767da6101b7e9c48baaa2b5bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 22:54:26 +0100 Subject: [PATCH 317/341] refs #135 adding jsdoc headers --- src/mods/settings.js | 201 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 200 insertions(+), 1 deletion(-) diff --git a/src/mods/settings.js b/src/mods/settings.js index 889460b..7df74dd 100644 --- a/src/mods/settings.js +++ b/src/mods/settings.js @@ -1,41 +1,189 @@ idrinth.settings = { + /** + * + * @type {object} + */ data: { + /** + * + * @type Boolean + */ raids: false, + /** + * + * @type String + */ favs: '', + /** + * + * @type Boolean + */ factor: true, + /** + * + * @type Boolean + */ moveLeft: false, + /** + * + * @type Boolean + */ minimalist: false, + /** + * + * @type Boolean + */ chatHiddenOnStart: true, + /** + * + * @type Boolean + */ names: true, + /** + * + * @type Number + */ timeout: 5000, + /** + * + * @type Number + */ loadtime: 5000, + /** + * + * @type Number + */ windows: 3, + /** + * + * @type Boolean + */ warBottom: false, + /** + * + * @type Boolean + */ landMax: true, + /** + * + * @type Boolean + */ chatting: true, + /** + * + * @type String + */ chatuser: '', + /** + * + * @type Number + */ newgroundLoad: 30, + /** + * + * @type String + */ chatpass: '', + /** + * + * @type Boolean + */ isWorldServer: false, + /** + * + * @type String + */ alarmTime: '8:0', + /** + * + * @type Boolean + */ alarmActive: false, + /** + * + * @type Object + */ bannedRaids: { }, - lang : null, + /** + * + * @type String + */ + lang: null, + /** + * + * @type {Object} + */ notification: { + /** + * + * @type Boolean + */ mention: true, + /** + * + * @type Boolean + */ message: true, + /** + * + * @type Boolean + */ raid: true }, + /** + * + * @type Object + */ land: { + /** + * + * @type Number + */ cornfield: 0, + /** + * + * @type Number + */ stable: 0, + /** + * + * @type Number + */ barn: 0, + /** + * + * @type Number + */ store: 0, + /** + * + * @type Number + */ pub: 0, + /** + * + * @type Number + */ inn: 0, + /** + * + * @type Number + */ tower: 0, + /** + * + * @type Number + */ fort: 0, + /** + * + * @type Number + */ castle: 0, + /** + * + * @type Number + */ gold: 0 } }, @@ -84,8 +232,21 @@ idrinth.settings = { remove ( 'idrinth-dotd-' + field[0] + '-' + field[1] ); return getValue ( idrinth.settings.data[field[0]], field[1], allowObject ); }, + /** + * + * @param {String} field + * @param {String|Booleab|Number} value + * @returns {undefined} + */ change: function ( field, value ) { 'use strict'; + /** + * + * @param {obect} parent + * @param {string} field + * @param {String|Booleab|Number} value + * @returns {Boolean} + */ var setValue = function ( parent, field, value ) { if ( idrinth.core.fieldIsSetting ( parent, field ) ) { parent[field] = value; @@ -93,6 +254,10 @@ idrinth.settings = { } return false; }; + /** + * saves the data to local storage + * @returns {undefined} + */ var store = function ( ) { window.localStorage.setItem ( 'idotd', JSON.stringify ( idrinth.settings.data ) ); }; @@ -112,10 +277,25 @@ idrinth.settings = { return; } }, + /** + * initializes the module + * @returns {undefined} + */ start: function ( ) { 'use strict'; + /** + * fills the data from json in idotd + * @returns {undefined} + */ var getCurrent = function () { var data = JSON.parse ( window.localStorage.getItem ( 'idotd' ) ); + /** + * + * @param {object} to + * @param {object} from + * @param {function} apply + * @returns {undefined} + */ var apply = function ( to, from, apply ) { for (var key in from) { if ( from.hasOwnProperty ( key ) ) { @@ -130,8 +310,27 @@ idrinth.settings = { }; apply ( idrinth.settings.data, data, apply ); }; + /** + * fills the data from seperate storages + * @returns {undefined} + */ var getOld = function () { + /** + * + * @param {object} object + * @param {String} prefix + * @param {function} objectIterator + * @returns {Boolean} + */ var objectIterator = function ( object, prefix, objectIterator ) { + /** + * + * @param {String} prefix + * @param {String} key + * @param {Number|String|Boolean} item + * @returns {Boolean} + * @todo remove this once old data is unlikely to exist + */ var itemHandler = function ( prefix, key, item ) { if ( typeof item !== 'function' ) { var tmp = window.localStorage.getItem ( 'idrinth-dotd-' + prefix + key ); From 92f8d6e5bc4932755c9c86e7d01b9218a9a8a18a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 23:03:36 +0100 Subject: [PATCH 318/341] moving initialization to correct place --- src/stable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stable.js b/src/stable.js index b640233..0842cb4 100644 --- a/src/stable.js +++ b/src/stable.js @@ -132,8 +132,8 @@ var idrinth = { }, 1000 ); delete idrinth['start']; delete idrinth['startInternal']; + idrinth.core.timeouts.process (); }, 123, true ); - idrinth.core.timeouts.process (); }, start: function ( ) { 'use strict'; From dc5978b66765a23748bda0462058c1a8829e2fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 23:08:22 +0100 Subject: [PATCH 319/341] fixing setTimeout --- src/mods/core.js | 2 +- src/stable.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mods/core.js b/src/mods/core.js index 5bb3f3a..94ad5e2 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -248,7 +248,7 @@ idrinth.core = { } } } - idrinth.core.timeouts.next = window.setTimeout ( idrinth.core.timeouts.process, min * 1000 ); + idrinth.core.timeouts.next = window.setTimeout ( idrinth.core.timeouts.process, Math.ceil ( min * 1000 ) ); } }, /** diff --git a/src/stable.js b/src/stable.js index 0842cb4..b640233 100644 --- a/src/stable.js +++ b/src/stable.js @@ -132,8 +132,8 @@ var idrinth = { }, 1000 ); delete idrinth['start']; delete idrinth['startInternal']; - idrinth.core.timeouts.process (); }, 123, true ); + idrinth.core.timeouts.process (); }, start: function ( ) { 'use strict'; From 9a6577dc00752b89448a2554a6d32b4c8a509df6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 23:10:20 +0100 Subject: [PATCH 320/341] adding factor for milliseconds --- src/mods/core.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mods/core.js b/src/mods/core.js index 94ad5e2..d830af2 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -204,7 +204,7 @@ idrinth.core = { var date = new Date (); idrinth.core.timeouts.list[identifier] = { func: func, - next: date.getTime () + date.getMilliseconds () + time / 1000, + next: date.getTime () + date.getMilliseconds () / 1000 + time / 1000, duration: time, interval: !!isInterval }; @@ -215,7 +215,7 @@ idrinth.core = { */ process: function () { 'use strict'; - var date = ( new Date () ).getTime () + ( new Date () ).getMilliseconds (); + var date = ( new Date () ).getTime () + ( new Date () ).getMilliseconds () / 1000; var min = 10000; /** * From d746a516768f17aaf4679d86df44869e937da523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 23:29:40 +0100 Subject: [PATCH 321/341] fixing remove timeout --- src/mods/core.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mods/core.js b/src/mods/core.js index d830af2..e994ed0 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -181,14 +181,16 @@ idrinth.core = { */ list: { }, /** - * + * makes sure the timeout is removed when called next * @param {string} identifier * @returns {undefined} */ remove: function ( identifier ) { 'use strict'; if ( idrinth.core.timeouts.list[identifier] !== undefined ) { - delete idrinth.core.timeouts.list[identifier]; + idrinth.core.timeouts.list[identifier].interval = false; + idrinth.core.timeouts.list[identifier].func = function () { + }; } }, /** @@ -216,7 +218,7 @@ idrinth.core = { process: function () { 'use strict'; var date = ( new Date () ).getTime () + ( new Date () ).getMilliseconds () / 1000; - var min = 10000; + var min = 10; /** * * @param {Number} durationLeft From 7c74d656f43b36e4d7cf2c617fa933b53cf18c59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Wed, 11 Jan 2017 23:33:45 +0100 Subject: [PATCH 322/341] adding forgotten factor for milliseconds --- src/mods/core.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/core.js b/src/mods/core.js index e994ed0..9c31aad 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -238,7 +238,7 @@ idrinth.core = { idrinth.core.timeouts.list[property].func (); if ( idrinth.core.timeouts.list[property].interval ) { min = getVal ( idrinth.core.timeouts.list[property].duration, min ); - idrinth.core.timeouts.list[property].next = date + idrinth.core.timeouts.list[property].duration; + idrinth.core.timeouts.list[property].next = date + idrinth.core.timeouts.list[property].duration / 1000; } else { delete idrinth.core.timeouts.list[property]; } From f61ebfcc076d2a1974436e1d8e936d686e506f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Thu, 12 Jan 2017 00:01:46 +0100 Subject: [PATCH 323/341] binding everything to idrinth.ui.base to help refs #195 removing forgotten modules from stable --- src/mods/chat.js | 6 +- src/mods/core.js | 4 +- src/mods/facebook.js | 21 +++++ src/mods/names.js | 2 +- src/mods/newgrounds.js | 62 +++++++++++++ src/mods/raids.js | 2 +- src/mods/tier.js | 2 +- src/mods/ui.js | 8 +- src/mods/war.js | 2 +- src/stable.js | 200 +++++++++++++++-------------------------- 10 files changed, 167 insertions(+), 142 deletions(-) create mode 100644 src/mods/facebook.js create mode 100644 src/mods/newgrounds.js diff --git a/src/mods/chat.js b/src/mods/chat.js index 0905c5e..2ac5eb3 100644 --- a/src/mods/chat.js +++ b/src/mods/chat.js @@ -340,7 +340,7 @@ idrinth.chat = { value: 'this.parentNode.parentNode.removeChild(this.parentNode);' } ] } ); - idrinth.ui.body.appendChild ( idrinth.ui.buildElement ( { + idrinth.ui.base.appendChild ( idrinth.ui.buildElement ( { type: 'ul', children: popupContent, css: 'idrinth-userinfo-box', @@ -703,7 +703,7 @@ idrinth.chat = { return; } if ( !document.getElementById ( 'idrinth-chat' ) ) { - idrinth.ui.body.appendChild ( build () ); + idrinth.ui.base.appendChild ( build () ); idrinth.chat.elements.chats = document.getElementById ( 'idrinth-chat' ).getElementsByTagName ( 'ul' )[1]; idrinth.chat.elements.menu = document.getElementById ( 'idrinth-chat' ).getElementsByTagName ( 'ul' )[0]; } @@ -855,7 +855,7 @@ idrinth.chat = { }, showOptions: function ( event, element ) { event.preventDefault (); - idrinth.ui.body.appendChild ( idrinth.ui.buildElement ( { + idrinth.ui.base.appendChild ( idrinth.ui.buildElement ( { type: 'ul', css: 'idrinth-hovering-box', children: [ { diff --git a/src/mods/core.js b/src/mods/core.js index 9c31aad..3ba5a3b 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -119,7 +119,7 @@ idrinth.core = { id: "idrinth-copy-helper" } ); textAreaElement.value = text; - idrinth.ui.body.appendChild ( textAreaElement ); + idrinth.ui.base.appendChild ( textAreaElement ); textAreaElement.select ( ); success = document.execCommand ( 'copy' ); } catch ( exception ) { @@ -303,7 +303,7 @@ idrinth.core = { idrinth.core.multibind.events[event][selector].push ( method ); }; if ( !idrinth.core.multibind.events[event] ) { - idrinth.ui.body.addEventListener ( event, function ( e ) { + idrinth.ui.base.addEventListener ( event, function ( e ) { e = e || window.event; idrinth.core.multibind.triggered ( e.target, e.type ); } ); diff --git a/src/mods/facebook.js b/src/mods/facebook.js new file mode 100644 index 0000000..66606c6 --- /dev/null +++ b/src/mods/facebook.js @@ -0,0 +1,21 @@ +idrinth.facbook = { + popup: null, + restart: function () { + try { + idrinth.core.timeouts.remove ( 'facebook' ); + idrinth.facebook.popup.close (); + idrinth.ui.reloadGame (); + idrinth.raids.clearAll (); + } catch ( e ) { + idrinth.core.log ( e ); + } + }, + rejoin: function () { + idrinth.core.timeouts.remove ( 'raids' ); + idrinth.facebook.popup = window.open ( "https://apps.facebook.com/dawnofthedragons/" ); + idrinth.facebook.popup.onload = function () { + idrinth.core.timeouts.add ( 'facebook', idrinth.facebook.restart, 3333 ); + }; + idrinth.core.timeouts.add ( 'facebook', idrinth.facebook.restart, 11111 ); + } +}; \ No newline at end of file diff --git a/src/mods/names.js b/src/mods/names.js index 3b9e733..116b88d 100644 --- a/src/mods/names.js +++ b/src/mods/names.js @@ -218,7 +218,7 @@ idrinth.names = { } ] } ); - idrinth.ui.body.appendChild ( idrinth.ui.tooltip ); + idrinth.ui.base.appendChild ( idrinth.ui.tooltip ); }; /** * shows the tooltip if the element has a known name diff --git a/src/mods/newgrounds.js b/src/mods/newgrounds.js new file mode 100644 index 0000000..e0cdcf0 --- /dev/null +++ b/src/mods/newgrounds.js @@ -0,0 +1,62 @@ +idrinth.newgrounds = { + originalUrl: '', + raids: [ ], + joinRaids: function () { + for (var key in idrinth.raids.list) { + if ( idrinth.raids.list[key].hash && idrinth.raids.list[key].raidId ) { + idrinth.newgrounds.raids.push ( key ); + } + } + idrinth.newgrounds.join (); + }, + alarmCheck: function () { + var now = new Date (); + if ( idrinth.settings.get ( "alarmActive" ) && now.getHours () + ':' + now.getMinutes () === idrinth.settings.get ( "alarmTime" ) ) { + idrinth.core.timeouts.add ( 'newgrounds', idrinth.newgrounds.joinRaids, 1 ); + } + idrinth.core.timeouts.add ( 'newgrounds', idrinth.newgrounds.alarmCheck, 60000 ); + }, + join: function () { + if ( idrinth.newgrounds.raids.length === 0 ) { + idrinth.core.alert ( 'We\'re done! Have fun playing.' ); + return; + } + var frame = document.getElementById ( 'iframe_embed' ).getElementsByTagName ( 'iframe' )[0]; + var key = idrinth.newgrounds.raids.pop (); + var link = idrinth.newgrounds.originalUrl + '&' + ( idrinth.raids.join.getServerLink ( key ) ).replace ( /^.*?\?/, '' ); + frame.setAttribute ( 'onload', 'idrinth.newgrounds.remove(\'' + key + '\')' ); + frame.setAttribute ( 'src', link ); + }, + remove: function ( key ) { + idrinth.core.timeouts.add ( + 'newgrounds.remove', + function () { + try { + idrinth.raids.list[key].joined = true; + } catch ( e ) { + try { + idrinth.raids.joined[key].joined = true; + } catch ( f ) { + idrinth.core.log ( "We seem to have joined a dead raid" ); + } + } + if ( document.getElementById ( 'idrinth-raid-link-' + key ) ) { + idrinth.ui.removeElement ( 'idrinth-raid-link-' + key ); + } + try { + idrinth.raids.joined[key] = idrinth.raids.list[key]; + } catch ( e2 ) { + //lost? + } + try { + delete idrinth.raids.list[key]; + } catch ( e3 ) { + //already gone, nothing to do + } + idrinth.raids.join.messages.trying ( key ); + idrinth.newgrounds.join (); + }, + idrinth.settings.get ( "newgroundLoad" ) * 1000 + ); + } +}; \ No newline at end of file diff --git a/src/mods/raids.js b/src/mods/raids.js index 682b3e3..a283ec4 100644 --- a/src/mods/raids.js +++ b/src/mods/raids.js @@ -233,7 +233,7 @@ idrinth.raids = { idrinth.ui.removeElement ( 'join-' + key ); }, 30000 ); } ) ( key ) ); - idrinth.ui.body.appendChild ( frame ); + idrinth.ui.base.appendChild ( frame ); idrinth.raids.join.messages.trying ( key ); }; var postLink = function ( key ) { diff --git a/src/mods/tier.js b/src/mods/tier.js index 5662e1e..0527202 100644 --- a/src/mods/tier.js +++ b/src/mods/tier.js @@ -88,7 +88,7 @@ idrinth.tier = { ] } ); - idrinth.ui.body.appendChild ( idrinth.tier.taggedSlots[x] ); + idrinth.ui.base.appendChild ( idrinth.tier.taggedSlots[x] ); }; for (var key in this.taggedSlots) { if ( isFreeSlot ( key ) ) { diff --git a/src/mods/ui.js b/src/mods/ui.js index 4645170..c644e7c 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -253,7 +253,7 @@ idrinth.ui = { } else { mod.children[mod.children.length - 1].children = [ makeButton ( 'ok', '' ) ]; } - idrinth.ui.body.appendChild ( idrinth.ui.buildElement ( mod ) ); + idrinth.ui.base.appendChild ( idrinth.ui.buildElement ( mod ) ); }, matchesCss: function ( element, selector ) { while ( element && element !== document ) { @@ -289,7 +289,7 @@ idrinth.ui = { if ( element.className.match ( new RegExp ( '(^|\s)' + cssClass + '(\s|$)' ) ) ) { return true; } - if ( !element.parentNode || element === document.getElementsByTagName ( 'body' )[0] ) { + if ( !element.parentNode || element === idrinth.ui.base ) { return false; } element = element.parentNode; @@ -770,10 +770,10 @@ idrinth.ui = { id: 'idrinth-controls', children: children } ); - idrinth.ui.body.appendChild ( idrinth.ui.controls ); + idrinth.ui.base.appendChild ( idrinth.ui.controls ); document.getElementById ( 'idrinth-favs' ).setAttribute ( 'onkeyup', 'this.value=this.value.replace(/[^a-f0-9,]/g,\'\')' ); }; - idrinth.ui.body = document.getElementsByTagName ( 'body' )[0]; + idrinth.ui.base = document.getElementsByTagName ( 'body' )[0]; document.getElementsByTagName ( 'head' )[0].appendChild ( idrinth.ui.buildElement ( { type: 'link', attributes: [ { diff --git a/src/mods/war.js b/src/mods/war.js index b62aa34..6589589 100644 --- a/src/mods/war.js +++ b/src/mods/war.js @@ -310,7 +310,7 @@ idrinth.war = { ] } ); - idrinth.ui.body.appendChild ( idrinth.war.element ); + idrinth.ui.base.appendChild ( idrinth.war.element ); }; idrinth.core.timeouts.add ( 'war', idrinth.war.getData, 5000 ); build (); diff --git a/src/stable.js b/src/stable.js index b640233..c64c4ac 100644 --- a/src/stable.js +++ b/src/stable.js @@ -1,87 +1,21 @@ var idrinth = { + /** + * @type String + */ version: '###VERSION###', + /** + * @type Boolean + */ windowactive: true, - facebook: { - popup: null, - restart: function () { - try { - idrinth.core.timeouts.remove ( 'facebook' ); - idrinth.facebook.popup.close (); - idrinth.ui.reloadGame (); - idrinth.raids.clearAll (); - } catch ( e ) { - idrinth.core.log ( e ); - } - }, - rejoin: function () { - idrinth.core.timeouts.remove ( 'raids' ); - idrinth.facebook.popup = window.open ( "https://apps.facebook.com/dawnofthedragons/" ); - idrinth.facebook.popup.onload = function () { - idrinth.core.timeouts.add ( 'facebook', idrinth.facebook.restart, 3333 ); - }; - idrinth.core.timeouts.add ( 'facebook', idrinth.facebook.restart, 11111 ); - } - }, - newgrounds: { - originalUrl: '', - raids: [ ], - joinRaids: function () { - for (var key in idrinth.raids.list) { - if ( idrinth.raids.list[key].hash && idrinth.raids.list[key].raidId ) { - idrinth.newgrounds.raids.push ( key ); - } - } - idrinth.newgrounds.join (); - }, - alarmCheck: function () { - var now = new Date (); - if ( idrinth.settings.get ( "alarmActive" ) && now.getHours () + ':' + now.getMinutes () === idrinth.settings.get ( "alarmTime" ) ) { - idrinth.core.timeouts.add ( 'newgrounds', idrinth.newgrounds.joinRaids, 1 ); - } - idrinth.core.timeouts.add ( 'newgrounds', idrinth.newgrounds.alarmCheck, 60000 ); - }, - join: function () { - if ( idrinth.newgrounds.raids.length === 0 ) { - idrinth.core.alert ( 'We\'re done! Have fun playing.' ); - return; - } - var frame = document.getElementById ( 'iframe_embed' ).getElementsByTagName ( 'iframe' )[0]; - var key = idrinth.newgrounds.raids.pop (); - var link = idrinth.newgrounds.originalUrl + '&' + ( idrinth.raids.join.getServerLink ( key ) ).replace ( /^.*?\?/, '' ); - frame.setAttribute ( 'onload', 'idrinth.newgrounds.remove(\'' + key + '\')' ); - frame.setAttribute ( 'src', link ); - }, - remove: function ( key ) { - idrinth.core.timeouts.add ( 'newgrounds.remove', - function () { - try { - idrinth.raids.list[key].joined = true; - } catch ( e ) { - try { - idrinth.raids.joined[key].joined = true; - } catch ( f ) { - idrinth.core.log ( "We seem to have joined a dead raid" ); - } - } - if ( document.getElementById ( 'idrinth-raid-link-' + key ) ) { - idrinth.ui.removeElement ( 'idrinth-raid-link-' + key ); - } - try { - idrinth.raids.joined[key] = idrinth.raids.list[key]; - } catch ( e2 ) { - //lost? - } - try { - delete idrinth.raids.list[key]; - } catch ( e3 ) { - //already gone, nothing to do - } - idrinth.raids.join.messages.trying ( key ); - idrinth.newgrounds.join (); - }, - idrinth.settings.get ( "newgroundLoad" ) * 1000 ); - } - }, + /** + * + * @type String + */ + platform: '', + /** + * + * @returns {undefined} + */ reload: function ( ) { window.clearTimeout ( idrinth.core.timeouts.next ); idrinth.ui.removeElement ( 'idrinth-controls' ); @@ -89,69 +23,77 @@ var idrinth = { idrinth.ui.removeElement ( 'idrinth-war' ); var sc = document.createElement ( 'script' ); sc.setAttribute ( 'src', 'https://dotd.idrinth.de/static/userscript/###RELOAD-VERSION###/' + Math.random () + '/' ); - document.getElementsByTagName ( 'body' )[0].appendChild ( sc ); + document.getElementsByTagName ( 'head' )[0].appendChild ( sc ); window.setTimeout ( function () { idrinth = { }; }, 1 ); }, - platform: '', - startInternal: function ( ) { - if ( idrinth.platform === 'newgrounds' ) { - try { - var frame = document.getElementById ( 'iframe_embed' ).getElementsByTagName ( 'iframe' )[0]; - idrinth.newgrounds.originalUrl = frame.getAttribute ( 'src' ); - if ( window.location.search ) { - frame.setAttribute ( 'src', ( frame.getAttribute ( 'src' ) ).replace ( /&ir=.*/, '' ) + '&' + ( window.location.search ).replace ( /^\?/, '' ) ); - } - } catch ( e ) { - return idrinth.core.timeouts.add ( 'start', idrinth.startInternal, 500 ); - return; - } - return idrinth.core.timeouts.add ( 'newgrounds', idrinth.newgrounds.alarmCheck, 3333 ); - } - idrinth.settings.start ( ); - idrinth.text.start ( ); - idrinth.core.timeouts.add ( 'start', function () { - if ( !idrinth.text.initialized ) { - return; - } - idrinth.core.timeouts.remove ( 'start' ); - idrinth.ui.start ( ); - idrinth.user.start ( ); - idrinth.names.start ( ); - idrinth.raids.start ( ); - idrinth.tier.start ( ); - idrinth.chat.start ( ); - idrinth.war.start ( ); - idrinth.core.timeouts.add ( 'core.multibind', function () { - idrinth.core.multibind.add ( 'click', '.clipboard-copy', function ( element, event ) { - idrinth.core.copyToClipboard.element ( element ); - element.parentNode.parentNode.removeChild ( element.parentNode ); - idrinth.core.log ( event + ' fired on ' + element ); - } ); - }, 1000 ); - delete idrinth['start']; - delete idrinth['startInternal']; - }, 123, true ); - idrinth.core.timeouts.process (); - }, + /** + * initializes the whole script + * @returns {undefined} + */ start: function ( ) { 'use strict'; - window.onblur = function () { - idrinth.windowactive = false; + /** + * + * @returns {undefined} + */ + var startInternal = function ( ) { + /** + * initializes all modules + * @returns {undefined} + */ + var init = function () { + if ( !idrinth.text.initialized ) { + return; + } + idrinth.core.timeouts.remove ( 'start' ); + idrinth.ui.start ( ); + idrinth.user.start ( ); + idrinth.names.start ( ); + idrinth.raids.start ( ); + idrinth.tier.start ( ); + idrinth.chat.start ( ); + idrinth.war.start ( ); + idrinth.core.timeouts.add ( 'core.multibind', function () { + idrinth.core.multibind.add ( 'click', '.clipboard-copy', function ( element, event ) { + idrinth.core.copyToClipboard.element ( element ); + element.parentNode.parentNode.removeChild ( element.parentNode ); + idrinth.core.log ( event + ' fired on ' + element ); + } ); + }, 1000 ); + delete idrinth['start']; + delete idrinth['startInternal']; + }; + if ( idrinth.platform === 'newgrounds' ) { + try { + var frame = document.getElementById ( 'iframe_embed' ).getElementsByTagName ( 'iframe' )[0]; + idrinth.newgrounds.originalUrl = frame.getAttribute ( 'src' ); + if ( window.location.search ) { + frame.setAttribute ( 'src', ( frame.getAttribute ( 'src' ) ).replace ( /&ir=.*/, '' ) + '&' + ( window.location.search ).replace ( /^\?/, '' ) ); + } + } catch ( e ) { + return idrinth.core.timeouts.add ( 'start', idrinth.startInternal, 500 ); + } + return idrinth.core.timeouts.add ( 'newgrounds', idrinth.newgrounds.alarmCheck, 3333 ); + } + idrinth.settings.start ( ); + idrinth.text.start ( ); + idrinth.core.timeouts.add ( 'start', init, 123, true ); + idrinth.core.timeouts.process (); }; + idrinth.core.log ( 'Starting Idrinth\'s DotD Script' ); window.onblur = function () { - idrinth.windowactive = true; + idrinth.windowactive = !idrinth.windowactive; }; - idrinth.core.log ( 'Starting Idrinth\'s DotD Script' ); idrinth.platform = location.hostname.split ( '.' )[location.hostname.split ( '.' ).length - 2]; if ( idrinth.platform === 'dawnofthedragons' ) { idrinth.platform = 'facebook'; } if ( idrinth.platform === 'armorgames' ) { - return idrinth.core.timeouts.add ( 'start', idrinth.startInternal, 2222 ); + return idrinth.core.timeouts.add ( 'start', startInternal, 2222 ); } - idrinth.startInternal (); + startInternal (); } }; window.setTimeout ( idrinth.start, 6666 ); From f47e81ebefb19dd25f29b95b7a24087a74cc2100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Thu, 12 Jan 2017 00:20:00 +0100 Subject: [PATCH 324/341] adding jsdoc --- src/mods/ui.js | 231 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 229 insertions(+), 2 deletions(-) diff --git a/src/mods/ui.js b/src/mods/ui.js index c644e7c..4290fa7 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -1,5 +1,24 @@ idrinth.ui = { + /** + * + * @type HTMLElement + */ tooltip: null, + /** + * + * @type HTMLElement + */ + base: null, + /** + * + * @type HTMLElement + */ + controls: null, + /** + * + * @param {Number} number + * @returns {String} + */ formatNumber: function ( number ) { if ( isNaN ( number ) ) { return ''; @@ -12,6 +31,14 @@ idrinth.ui = { } return number.toString () + post[count]; }, + /** + * + * @param {Number} id + * @param {string} name + * @param {string} rank + * @param {string} pass + * @returns {undefined} + */ buildChat: function ( id, name, rank, pass ) { if ( !idrinth.chat.elements.chats ) { idrinth.core.timeouts.add ( 'chat-' + id, function () { @@ -82,6 +109,13 @@ idrinth.ui = { ) ); }, + /** + * + * @param {HTMLElement} element + * @param {Number} offsetX + * @param {Number} offsetY + * @returns {String} + */ getElementPositioning: function ( element, offsetX, offsetY ) { var pos = { x: element.getBoundingClientRect ().left + ( offsetX ? offsetX : 0 ), @@ -89,8 +123,19 @@ idrinth.ui = { }; return 'position:fixed;left:' + pos.x + 'px;top:' + pos.y + 'px'; }, + /** + * + * @param {object} config + * @returns {HTMLElement} + */ buildElement: function ( config ) { 'use strict'; + /** + * + * @param {HTMLElement} el + * @param {object} config + * @returns {undefined} + */ var setBase = function ( el, config ) { if ( config.id ) { el.id = config.id; @@ -102,6 +147,12 @@ idrinth.ui = { el.appendChild ( document.createTextNode ( config.content ) ); } }; + /** + * + * @param {HTMLElement} el + * @param {object} config + * @returns {undefined} + */ var addChildren = function ( el, config ) { if ( !config.children || !config.children.length ) { return; @@ -110,7 +161,19 @@ idrinth.ui = { el.appendChild ( idrinth.ui.buildElement ( config.children[count] ) ); } }; + /** + * + * @param {HTMLElement} el + * @param {object} config + * @returns {undefined} + */ var addAttributes = function ( el, config ) { + /** + * + * @param {HTMLElement} el + * @param {object} set + * @returns {undefined} + */ var applyValue = function ( el, set ) { if ( !set || set.value === undefined ) { return; @@ -131,8 +194,19 @@ idrinth.ui = { applyValue ( el, config.attributes[count] ); } }; + /** + * + * @param {object} config + * @returns {HTMLElement} + */ var makeInputLabel = function ( config ) { 'use strict'; + /** + * + * @param {String|Number} value + * @param {Array} list + * @returns {Boolean} + */ var inArray = function ( value, list ) { 'use strict'; if ( !Array.isArray ( list ) ) { @@ -199,7 +273,13 @@ idrinth.ui = { addAttributes ( el, config ); return el; }, - controls: null, + /** + * + * @param {string} title + * @param {string|HTMLElement} content + * @param {string} altFunc + * @returns {undefined} + */ buildModal: function ( title, content, altFunc ) { var mod = { children: [ ], @@ -235,6 +315,12 @@ idrinth.ui = { mod.children.push ( { css: 'buttons' } ); + /** + * + * @param {String} text + * @param {String} func + * @returns {object} + */ var makeButton = function ( text, func ) { return { type: 'button', @@ -255,6 +341,12 @@ idrinth.ui = { } idrinth.ui.base.appendChild ( idrinth.ui.buildElement ( mod ) ); }, + /** + * + * @param {HTMLElement} element + * @param {string} selector + * @returns {HTMLElement} + */ matchesCss: function ( element, selector ) { while ( element && element !== document ) { if ( typeof element.matches === 'function' && element.matches ( selector ) ) { @@ -263,15 +355,27 @@ idrinth.ui = { element = element.parentNode } }, + /** + * + * @returns {undefined} + */ setTooltipTimeout: function () { idrinth.core.timeouts.add ( 'names.tooltip', idrinth.ui.hideTooltip, idrinth.settings.get ( "timeout" ) ? idrinth.settings.get ( "timeout" ) : 5000 ); }, + /** + * + * @returns {undefined} + */ hideTooltip: function () { if ( idrinth.names.isHovering ) { return idrinth.ui.setTooltipTimeout (); } idrinth.ui.updateClassesList ( idrinth.ui.tooltip, [ 'idrinth-hide' ], [ ] ); }, + /** + * + * @returns {undefined} + */ openCloseSettings: function ( ) { 'use strict'; var toRemove = [ ( idrinth.ui.controls.getAttribute ( 'class' ) ).match ( /(^|\s)inactive($|\s)/ ) ? 'inactive' : 'active' ]; @@ -283,6 +387,12 @@ idrinth.ui = { } idrinth.ui.updateClassesList ( idrinth.ui.controls, [ 'active', 'inactive', 'left-sided', 'small' ], toRemove ); }, + /** + * + * @param {HTMLElement} element + * @param {String} cssClass + * @returns {Boolean} + */ childOf: function ( element, cssClass ) { 'use strict'; do { @@ -296,6 +406,11 @@ idrinth.ui = { } while ( element ); return false; }, + /** + * + * @param {string} id + * @returns {undefined} + */ removeElement: function ( id ) { 'use strict'; var el = document.getElementById ( id ); @@ -303,8 +418,15 @@ idrinth.ui = { el.parentNode.removeChild ( el ); } }, + /** + * + * @returns {undefined} + */ reloadGame: function ( ) { 'use strict'; + /** + * @param {HTMLElement} parent + */ var handleFrame = function ( parent ) { var frame = parent.getElementsByTagName ( 'iframe' )[0]; var src = ( frame.getAttribute ( 'src' ) ).replace ( /&ir=.*/, '' ); @@ -324,14 +446,40 @@ idrinth.ui = { idrinth.core.alert ( idrinth.text.get ( "ui.reloadGameFail" ) ); } }, + /** + * + * @param {HTMLElement} element + * @param {Array|String} add + * @param {Array|String} remove + * @returns {undefined} + */ updateClassesList: function ( element, add, remove ) { + /** + * + * @param {String} classString + * @param {Array|String} add + * @param {Array|String} remove + * @returns {unresolved} + */ var getClassesList = function ( classString, add, remove ) { + /** + * + * @param {String|Array} value + * @returns {Array} + */ var forceToArray = function ( value ) { return value && typeof value === 'object' && Array.isArray ( value ) && value !== null ? value : [ ]; }; var original = classString === null ? [ ] : classString.split ( ' ' ).concat ( forceToArray ( add ) ); var list = [ ]; remove = forceToArray ( remove ); + /** + * + * @param {Array} list + * @param {string} element + * @param {Array} forbidden + * @returns {unresolved} + */ var addUnique = function ( list, element, forbidden ) { if ( list.indexOf ( element ) === -1 && forbidden.indexOf ( element ) === -1 ) { list.push ( element ); @@ -345,9 +493,21 @@ idrinth.ui = { }; element.setAttribute ( 'class', getClassesList ( element.getAttribute ( 'class' ), add, remove ) ); }, + /** + * + * @param {String} name + * @returns {undefined} + */ activateTab: function ( name ) { var head = document.getElementById ( 'tab-activator-' + name ).parentNode.childNodes; var body = document.getElementById ( 'tab-element-' + name ).parentNode.childNodes; + /** + * + * @param {HTMLElement} head + * @param {HTMLElement} body + * @param {string} name + * @returns {undefined} + */ var setClasses = function ( head, body, name ) { if ( head === document.getElementById ( 'tab-activator-' + name ) ) { idrinth.ui.updateClassesList ( head, [ 'active' ], [ ] ); @@ -361,12 +521,34 @@ idrinth.ui = { setClasses ( head[count], body[count], name ); } }, + /** + * initializes the gui + * @returns {undefined} + */ start: function ( ) { 'use strict'; + /** + * builds most of the gui + * @returns {undefined} + */ var build = function () { - 'use strict'; + /** + * + * @returns {Array} + */ var wrapper = function ( ) { + /** + * creates the action tab + * @returns {Array} + */ var buildActions = function () { + /** + * + * @param {string} label + * @param {string} onclick + * @param {string} platform + * @returns {object} + */ var buttonMaker = function ( label, onclick, platform ) { return { css: 'idrinth-float-half' + ( platform && platform !== idrinth.platform ? " idrinth-hide" : "" ), @@ -406,7 +588,16 @@ idrinth.ui = { } ]; }; + /** + * + * @returns {Array} + */ var buildTiers = function () { + /** + * + * @param {string} label + * @returns {object} + */ var makeSearch = function ( label ) { return { type: 'input', @@ -444,6 +635,10 @@ idrinth.ui = { id: 'idrinth-tierlist' } ]; }; + /** + * + * @returns {Array} + */ var buildControls = function () { 'use strict'; return [ { @@ -564,7 +759,16 @@ idrinth.ui = { } ] } ]; }; + /** + * + * @returns {Array} + */ var buildLand = function () { + /** + * + * @param {string} label + * @returns {object} + */ var buildItem = function ( label ) { return { type: 'tr', @@ -664,10 +868,22 @@ idrinth.ui = { ] } ]; }; + /** + * + * @param {object} config + * @returns {Array} + */ var makeTabs = function ( config ) { var head = [ ]; var first = true; var body = [ ]; + /** + * + * @param {string} name + * @param {Number} width + * @param {Boolean} first + * @returns {object} + */ var buildHead = function ( name, width, first ) { return { type: 'li', @@ -686,6 +902,13 @@ idrinth.ui = { ] }; }; + /** + * + * @param {string} name + * @param {Array} children + * @param {Boolean} first + * @returns {object} + */ var buildBody = function ( name, children, first ) { return { type: 'li', @@ -719,6 +942,10 @@ idrinth.ui = { } ]; }; + /** + * + * @returns {Array} + */ var buildRaidJoinList = function () { return [ { content: idrinth.text.get ( "raids.clickCopy" ), From 7a8c382d5b6f2fd1cd1cccc88e27ec292a1a54f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Thu, 12 Jan 2017 10:46:34 +0100 Subject: [PATCH 325/341] adding option for limited repeats --- src/mods/core.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mods/core.js b/src/mods/core.js index 3ba5a3b..7dc23f0 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -199,16 +199,18 @@ idrinth.core = { * @param {function} func * @param {int} time in milliseconds * @param {Boolean} [false] isInterval + * @param {Number} [-1] isInterval -1 will repeat until the end of time * @returns {undefined} */ - add: function ( identifier, func, time, isInterval ) { + add: function ( identifier, func, time, isInterval, maxIntervals ) { 'use strict'; var date = new Date (); idrinth.core.timeouts.list[identifier] = { func: func, next: date.getTime () + date.getMilliseconds () / 1000 + time / 1000, duration: time, - interval: !!isInterval + interval: !!isInterval, + max: maxIntervals ? maxIntervals : -1 }; }, /** @@ -236,8 +238,9 @@ idrinth.core = { if ( date >= idrinth.core.timeouts.list[property].next ) { try { idrinth.core.timeouts.list[property].func (); - if ( idrinth.core.timeouts.list[property].interval ) { + if ( idrinth.core.timeouts.list[property].interval && idrinth.core.timeouts.list[property].max ) { min = getVal ( idrinth.core.timeouts.list[property].duration, min ); + idrinth.core.timeouts.list[property].max = Math.max ( -1, idrinth.core.timeouts.list[property].max - 1 ); idrinth.core.timeouts.list[property].next = date + idrinth.core.timeouts.list[property].duration / 1000; } else { delete idrinth.core.timeouts.list[property]; From 050620c1afb28d096dfd51b8155a9f9c72ee04dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Thu, 12 Jan 2017 10:59:13 +0100 Subject: [PATCH 326/341] removing useless property and adjusting uses --- src/mods/core.js | 12 +++++------- src/mods/raids.js | 2 +- src/stable.js | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/mods/core.js b/src/mods/core.js index 7dc23f0..118d365 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -198,19 +198,17 @@ idrinth.core = { * @param {string} identifier * @param {function} func * @param {int} time in milliseconds - * @param {Boolean} [false] isInterval - * @param {Number} [-1] isInterval -1 will repeat until the end of time + * @param {Number} [1] maxRepeats -1 will repeat until the end of time * @returns {undefined} */ - add: function ( identifier, func, time, isInterval, maxIntervals ) { + add: function ( identifier, func, time, maxRepeats ) { 'use strict'; var date = new Date (); idrinth.core.timeouts.list[identifier] = { func: func, next: date.getTime () + date.getMilliseconds () / 1000 + time / 1000, duration: time, - interval: !!isInterval, - max: maxIntervals ? maxIntervals : -1 + repeats: maxRepeats ? maxRepeats : 1 }; }, /** @@ -238,9 +236,9 @@ idrinth.core = { if ( date >= idrinth.core.timeouts.list[property].next ) { try { idrinth.core.timeouts.list[property].func (); - if ( idrinth.core.timeouts.list[property].interval && idrinth.core.timeouts.list[property].max ) { + idrinth.core.timeouts.list[property].repeats = Math.max ( -1, idrinth.core.timeouts.list[property].repeats - 1 ); + if ( idrinth.core.timeouts.list[property].repeats ) { min = getVal ( idrinth.core.timeouts.list[property].duration, min ); - idrinth.core.timeouts.list[property].max = Math.max ( -1, idrinth.core.timeouts.list[property].max - 1 ); idrinth.core.timeouts.list[property].next = date + idrinth.core.timeouts.list[property].duration / 1000; } else { delete idrinth.core.timeouts.list[property]; diff --git a/src/mods/raids.js b/src/mods/raids.js index a283ec4..c301f8d 100644 --- a/src/mods/raids.js +++ b/src/mods/raids.js @@ -306,6 +306,6 @@ idrinth.raids = { start: function ( ) { 'use strict'; idrinth.core.timeouts.remove ( 'raids' ); - idrinth.core.timeouts.add ( 'raids', idrinth.raids.join.process, 1500, true ); + idrinth.core.timeouts.add ( 'raids', idrinth.raids.join.process, 1500, -1 ); } }; diff --git a/src/stable.js b/src/stable.js index c64c4ac..39e21a3 100644 --- a/src/stable.js +++ b/src/stable.js @@ -79,7 +79,7 @@ var idrinth = { } idrinth.settings.start ( ); idrinth.text.start ( ); - idrinth.core.timeouts.add ( 'start', init, 123, true ); + idrinth.core.timeouts.add ( 'start', init, 123, -1 ); idrinth.core.timeouts.process (); }; idrinth.core.log ( 'Starting Idrinth\'s DotD Script' ); From 380d3d4af3b03784980e8819de0c7c85c7cc4834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Thu, 12 Jan 2017 11:01:02 +0100 Subject: [PATCH 327/341] adjusting removal --- src/mods/core.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/core.js b/src/mods/core.js index 118d365..1cad614 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -188,7 +188,7 @@ idrinth.core = { remove: function ( identifier ) { 'use strict'; if ( idrinth.core.timeouts.list[identifier] !== undefined ) { - idrinth.core.timeouts.list[identifier].interval = false; + idrinth.core.timeouts.list[identifier].repeats = 1; idrinth.core.timeouts.list[identifier].func = function () { }; } From 5507f0a2c918a7950021463f46c274efeabce8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Thu, 12 Jan 2017 11:09:56 +0100 Subject: [PATCH 328/341] Update .pullapprove.yml --- .pullapprove.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pullapprove.yml b/.pullapprove.yml index 61e8f78..482f246 100644 --- a/.pullapprove.yml +++ b/.pullapprove.yml @@ -8,7 +8,7 @@ group_defaults: reset_on_push: enabled: true groups: - -reviewers: + Javascript Reviewers: required: 1 users: - Idrinth From 364f66de653bfecb7af00cb6561d6260d9e0fba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Thu, 12 Jan 2017 15:51:33 +0100 Subject: [PATCH 329/341] preventing cases of timeouts not starting fixes #249 --- src/mods/core.js | 3 +++ src/stable.js | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mods/core.js b/src/mods/core.js index 1cad614..ddfac88 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -210,6 +210,9 @@ idrinth.core = { duration: time, repeats: maxRepeats ? maxRepeats : 1 }; + if ( !idrinth.core.timeouts.next ) { + idrinth.core.timeouts.next = window.setTimeout ( idrinth.core.timeouts.process, 1000 ); + } }, /** * activates all relevant timeouts and intervals diff --git a/src/stable.js b/src/stable.js index 39e21a3..8924493 100644 --- a/src/stable.js +++ b/src/stable.js @@ -80,7 +80,6 @@ var idrinth = { idrinth.settings.start ( ); idrinth.text.start ( ); idrinth.core.timeouts.add ( 'start', init, 123, -1 ); - idrinth.core.timeouts.process (); }; idrinth.core.log ( 'Starting Idrinth\'s DotD Script' ); window.onblur = function () { From 2d24488994f0255751e9fe3c6876958a58c6a99a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Thu, 12 Jan 2017 15:55:45 +0100 Subject: [PATCH 330/341] if no tasks, don't run timeout handler --- src/mods/core.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mods/core.js b/src/mods/core.js index ddfac88..0d8b58b 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -254,7 +254,9 @@ idrinth.core = { } } } - idrinth.core.timeouts.next = window.setTimeout ( idrinth.core.timeouts.process, Math.ceil ( min * 1000 ) ); + if ( Object.keys ( idrinth.core.timeouts.list ).length ) { + idrinth.core.timeouts.next = window.setTimeout ( idrinth.core.timeouts.process, Math.ceil ( min * 1000 ) ); + } } }, /** From 6f62d7ef011e30a77c0aac3b2a8c9aa7c188e653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 13 Jan 2017 11:08:32 +0100 Subject: [PATCH 331/341] adding basic structure for wrappers opening on click fixes #138 --- src/mods/ui.js | 139 ++++++++++++++++++++++++++++--------------------- 1 file changed, 81 insertions(+), 58 deletions(-) diff --git a/src/mods/ui.js b/src/mods/ui.js index 4290fa7..bf6dbb5 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -640,107 +640,130 @@ idrinth.ui = { * @returns {Array} */ var buildControls = function () { - 'use strict'; - return [ { - name: 'names', + var wrap = function ( list, header ) { + return { + children: [ + { + type: 'strong', + content: header + }, + { + children: list + } + ], + css: 'idrinth-openclick' + }; + }; + var raidJoin = [ { + name: 'raids', rType: '#input', type: 'checkbox', - platforms: [ 'kongregate' ], - label: "setting.enableExtCharInfo" + label: "setting.enableFavRequest" }, { - name: 'lang', + name: 'favs', rType: '#input', type: 'text', - label: "setting.lang" + label: "setting.favIdToJoin" }, { - name: 'minimalist', + name: 'isWorldServer', rType: '#input', type: 'checkbox', - label: "setting.minimLayout" + label: "setting.worldserver" }, { - name: 'moveLeft', + name: 'newgroundLoad', rType: '#input', - type: 'checkbox', - label: "setting.moveSettingLeft" + type: 'number', + platforms: [ 'newgrounds' ], + label: "setting.joiningDuration" }, { - name: 'warBottom', + name: 'alarmTime', rType: '#input', - type: 'checkbox', - label: "setting.warBottomPage" + type: 'text', + platforms: [ 'newgrounds' ], + label: "ui.timeAutoJoin" }, { - name: 'landMax', + name: 'windows', + rType: '#input', + type: 'number', + platforms: [ 'dawnofthedragons', 'facebook' ], + label: "ui.maxPopupsFrame" + } ]; + var chat = [ { + name: 'chatting', rType: '#input', type: 'checkbox', - label: "setting.useGoldEfficiently" + label: "setting.enableChat" }, { - name: 'factor', + name: 'notification#mention', rType: '#input', type: 'checkbox', - label: "setting.tenBuildOnce" + label: 'chat.notification.mention' }, { - name: 'timeout', + name: 'notification#raid', rType: '#input', - type: 'number', - platforms: [ 'kongregate' ], - label: "setting.extCharInfoDuration" + type: 'checkbox', + label: 'chat.notification.raid' }, { - name: 'newgroundLoad', + name: 'notification#message', rType: '#input', - type: 'number', - platforms: [ 'newgrounds' ], - label: "setting.joiningDuration" - }, { - name: 'chatting', + type: 'checkbox', + label: 'chat.notification.message' + } ]; + var landBuy = [ { + name: 'landMax', rType: '#input', type: 'checkbox', - label: "setting.enableChat" - }, { - css: 'idrinth-line', - type: 'span', - content: "ui.settingInfo" + label: "setting.useGoldEfficiently" }, { - name: 'raids', + name: 'factor', rType: '#input', type: 'checkbox', - label: "setting.enableFavRequest" - }, { - name: 'favs', + label: "setting.tenBuildOnce" + } ]; + var general = [ { + name: 'lang', rType: '#input', type: 'text', - label: "setting.favIdToJoin" + label: "setting.lang" }, { - name: 'isWorldServer', + name: 'minimalist', rType: '#input', type: 'checkbox', - label: "setting.worldserver" + label: "setting.minimLayout" }, { - name: 'notification#mention', + name: 'moveLeft', rType: '#input', type: 'checkbox', - label: 'chat.notification.mention' + label: "setting.moveSettingLeft" }, { - name: 'notification#raid', + name: 'warBottom', rType: '#input', type: 'checkbox', - label: 'chat.notification.raid' - }, { - name: 'notification#message', + label: "setting.warBottomPage" + } ]; + var names = [ { + name: 'names', rType: '#input', type: 'checkbox', - label: 'chat.notification.message' + platforms: [ 'kongregate' ], + label: "setting.enableExtCharInfo" }, { - name: 'windows', + name: 'timeout', rType: '#input', type: 'number', - platforms: [ 'dawnofthedragons', 'facebook' ], - label: "ui.maxPopupsFrame" - }, { - name: 'alarmTime', - rType: '#input', - type: 'text', - platforms: [ 'newgrounds' ], - label: "ui.timeAutoJoin" - }, { + platforms: [ 'kongregate' ], + label: "setting.extCharInfoDuration" + } ]; + idrinth.core.multibind.add ( 'click', '.idrinth-openclick > strong', function () { + window.alert ( 'caugth your click on ' + this.innerHTML ); + } ); + return [ + wrap ( general, 'General' ), + wrap ( names, 'Names' ), + wrap ( landBuy, 'Land Buy' ), + wrap ( raidJoin, 'Raid Joining' ), + wrap ( chat, 'Chat' ), + { css: 'idrinth-line', type: 'p', children: [ { From 01715e61a1cb79411fd1405744333747ab7020d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 13 Jan 2017 11:26:30 +0100 Subject: [PATCH 332/341] finalizing tabs refs #138 --- src/mods/ui.js | 8 +++++--- src/root.scss | 9 +++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/mods/ui.js b/src/mods/ui.js index bf6dbb5..d782e7b 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -754,9 +754,11 @@ idrinth.ui = { platforms: [ 'kongregate' ], label: "setting.extCharInfoDuration" } ]; - idrinth.core.multibind.add ( 'click', '.idrinth-openclick > strong', function () { - window.alert ( 'caugth your click on ' + this.innerHTML ); - } ); + var openCloseSwitch = function ( element ) { + var isActive = ( element.parent.getAttribute ( 'class' ) ).match ( /(^|\s)active($|\s)/ ); + idrinth.ui.updateClassesList ( element.parent, isActive ? [ ] : [ 'active' ], isActive ? [ 'active' ] : [ ] ); + }; + idrinth.core.multibind.add ( 'click', '.idrinth-openclick > strong', openCloseSwitch ); return [ wrap ( general, 'General' ), wrap ( names, 'Names' ), diff --git a/src/root.scss b/src/root.scss index 4321637..7f74cdc 100644 --- a/src/root.scss +++ b/src/root.scss @@ -669,3 +669,12 @@ td.is-os { border-top: 1px solid #fff; border-bottom: 1px solid #fff; } +.idrinth-openclick > strong { + cursor:pointer; +} +.idrinth-openclick > div { + display:none; +} +.idrinth-openclick.active > div { + display:block; +} \ No newline at end of file From 47cb54b5e483d5499b597422c52bc1c4f7626587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 13 Jan 2017 11:38:18 +0100 Subject: [PATCH 333/341] removing unneccessary local variables addins jsdoc --- src/mods/ui.js | 220 +++++++++++++++++++++++++------------------------ 1 file changed, 113 insertions(+), 107 deletions(-) diff --git a/src/mods/ui.js b/src/mods/ui.js index d782e7b..60c7843 100644 --- a/src/mods/ui.js +++ b/src/mods/ui.js @@ -640,6 +640,12 @@ idrinth.ui = { * @returns {Array} */ var buildControls = function () { + /** + * + * @param {Array} list + * @param {String} header + * @returns {object} + */ var wrap = function ( list, header ) { return { children: [ @@ -654,117 +660,117 @@ idrinth.ui = { css: 'idrinth-openclick' }; }; - var raidJoin = [ { - name: 'raids', - rType: '#input', - type: 'checkbox', - label: "setting.enableFavRequest" - }, { - name: 'favs', - rType: '#input', - type: 'text', - label: "setting.favIdToJoin" - }, { - name: 'isWorldServer', - rType: '#input', - type: 'checkbox', - label: "setting.worldserver" - }, { - name: 'newgroundLoad', - rType: '#input', - type: 'number', - platforms: [ 'newgrounds' ], - label: "setting.joiningDuration" - }, { - name: 'alarmTime', - rType: '#input', - type: 'text', - platforms: [ 'newgrounds' ], - label: "ui.timeAutoJoin" - }, { - name: 'windows', - rType: '#input', - type: 'number', - platforms: [ 'dawnofthedragons', 'facebook' ], - label: "ui.maxPopupsFrame" - } ]; - var chat = [ { - name: 'chatting', - rType: '#input', - type: 'checkbox', - label: "setting.enableChat" - }, { - name: 'notification#mention', - rType: '#input', - type: 'checkbox', - label: 'chat.notification.mention' - }, { - name: 'notification#raid', - rType: '#input', - type: 'checkbox', - label: 'chat.notification.raid' - }, { - name: 'notification#message', - rType: '#input', - type: 'checkbox', - label: 'chat.notification.message' - } ]; - var landBuy = [ { - name: 'landMax', - rType: '#input', - type: 'checkbox', - label: "setting.useGoldEfficiently" - }, { - name: 'factor', - rType: '#input', - type: 'checkbox', - label: "setting.tenBuildOnce" - } ]; - var general = [ { - name: 'lang', - rType: '#input', - type: 'text', - label: "setting.lang" - }, { - name: 'minimalist', - rType: '#input', - type: 'checkbox', - label: "setting.minimLayout" - }, { - name: 'moveLeft', - rType: '#input', - type: 'checkbox', - label: "setting.moveSettingLeft" - }, { - name: 'warBottom', - rType: '#input', - type: 'checkbox', - label: "setting.warBottomPage" - } ]; - var names = [ { - name: 'names', - rType: '#input', - type: 'checkbox', - platforms: [ 'kongregate' ], - label: "setting.enableExtCharInfo" - }, { - name: 'timeout', - rType: '#input', - type: 'number', - platforms: [ 'kongregate' ], - label: "setting.extCharInfoDuration" - } ]; + /** + * + * @param {HTMLElement} element + * @returns {undefined} + */ var openCloseSwitch = function ( element ) { - var isActive = ( element.parent.getAttribute ( 'class' ) ).match ( /(^|\s)active($|\s)/ ); - idrinth.ui.updateClassesList ( element.parent, isActive ? [ ] : [ 'active' ], isActive ? [ 'active' ] : [ ] ); + var isActive = ( element.parentElement.getAttribute ( 'class' ) ).match ( /(^|\s)active($|\s)/ ); + idrinth.ui.updateClassesList ( element.parentElement, isActive ? [ ] : [ 'active' ], isActive ? [ 'active' ] : [ ] ); }; idrinth.core.multibind.add ( 'click', '.idrinth-openclick > strong', openCloseSwitch ); return [ - wrap ( general, 'General' ), - wrap ( names, 'Names' ), - wrap ( landBuy, 'Land Buy' ), - wrap ( raidJoin, 'Raid Joining' ), - wrap ( chat, 'Chat' ), + wrap ( [ { + name: 'lang', + rType: '#input', + type: 'text', + label: "setting.lang" + }, { + name: 'minimalist', + rType: '#input', + type: 'checkbox', + label: "setting.minimLayout" + }, { + name: 'moveLeft', + rType: '#input', + type: 'checkbox', + label: "setting.moveSettingLeft" + }, { + name: 'warBottom', + rType: '#input', + type: 'checkbox', + label: "setting.warBottomPage" + } ], 'General' ), + wrap ( [ { + name: 'names', + rType: '#input', + type: 'checkbox', + platforms: [ 'kongregate' ], + label: "setting.enableExtCharInfo" + }, { + name: 'timeout', + rType: '#input', + type: 'number', + platforms: [ 'kongregate' ], + label: "setting.extCharInfoDuration" + } ], 'Names' ), + wrap ( [ { + name: 'landMax', + rType: '#input', + type: 'checkbox', + label: "setting.useGoldEfficiently" + }, { + name: 'factor', + rType: '#input', + type: 'checkbox', + label: "setting.tenBuildOnce" + } ], 'Land Buy' ), + wrap ( [ { + name: 'raids', + rType: '#input', + type: 'checkbox', + label: "setting.enableFavRequest" + }, { + name: 'favs', + rType: '#input', + type: 'text', + label: "setting.favIdToJoin" + }, { + name: 'isWorldServer', + rType: '#input', + type: 'checkbox', + label: "setting.worldserver" + }, { + name: 'newgroundLoad', + rType: '#input', + type: 'number', + platforms: [ 'newgrounds' ], + label: "setting.joiningDuration" + }, { + name: 'alarmTime', + rType: '#input', + type: 'text', + platforms: [ 'newgrounds' ], + label: "ui.timeAutoJoin" + }, { + name: 'windows', + rType: '#input', + type: 'number', + platforms: [ 'dawnofthedragons', 'facebook' ], + label: "ui.maxPopupsFrame" + } ], 'Raid Joining' ), + wrap ( [ { + name: 'chatting', + rType: '#input', + type: 'checkbox', + label: "setting.enableChat" + }, { + name: 'notification#mention', + rType: '#input', + type: 'checkbox', + label: 'chat.notification.mention' + }, { + name: 'notification#raid', + rType: '#input', + type: 'checkbox', + label: 'chat.notification.raid' + }, { + name: 'notification#message', + rType: '#input', + type: 'checkbox', + label: 'chat.notification.message' + } ], 'Chat' ), { css: 'idrinth-line', type: 'p', From dd2272150e2d546ec992e9a32d00008ee56d14a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 13 Jan 2017 11:44:32 +0100 Subject: [PATCH 334/341] adding basic styles --- src/root.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/root.scss b/src/root.scss index 7f74cdc..06e973a 100644 --- a/src/root.scss +++ b/src/root.scss @@ -669,7 +669,16 @@ td.is-os { border-top: 1px solid #fff; border-bottom: 1px solid #fff; } +.idrinth-openclick { + border: 1px solid #ccc; + margin: 1px; +} .idrinth-openclick > strong { + display:block; + border-radius: 3px; + text-align: center; + background-color:rgba(204,204,204,0.2); + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1)); cursor:pointer; } .idrinth-openclick > div { From e43fc918cec641c05aacefcb63cfe55b88b10521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 13 Jan 2017 13:27:02 +0100 Subject: [PATCH 335/341] fixes #253 adds some more jsdocs refs #135 --- src/mods/facebook.js | 12 ++++ src/mods/land.js | 147 +++++++++++++++++++++++++++++++++++++++++++ src/stable.js | 26 ++++---- 3 files changed, 172 insertions(+), 13 deletions(-) diff --git a/src/mods/facebook.js b/src/mods/facebook.js index 66606c6..11fddc1 100644 --- a/src/mods/facebook.js +++ b/src/mods/facebook.js @@ -1,5 +1,13 @@ idrinth.facbook = { + /** + * + * @type window + */ popup: null, + /** + * restarts the script's fnctions + * @returns {undefined} + */ restart: function () { try { idrinth.core.timeouts.remove ( 'facebook' ); @@ -10,6 +18,10 @@ idrinth.facbook = { idrinth.core.log ( e ); } }, + /** + * logs in again and then restarts the script's fnctions + * @returns {undefined} + */ rejoin: function () { idrinth.core.timeouts.remove ( 'raids' ); idrinth.facebook.popup = window.open ( "https://apps.facebook.com/dawnofthedragons/" ); diff --git a/src/mods/land.js b/src/mods/land.js index c0a6686..52a79af 100644 --- a/src/mods/land.js +++ b/src/mods/land.js @@ -1,18 +1,56 @@ idrinth.land = { + /** + * + * @returns {undefined} + */ calculate: function () { + /** + * + * @param {function[]} checkElementFunc + * @returns {object} + */ var baseCalculator = function ( checkElementFunc ) { var factor = idrinth.settings.get ( "factor" ) ? 10 : 1; + /** + * + * @param {string} building + * @returns {Number} + */ var nextPrice = function ( building ) { return ( 10 + idrinth.settings.get ( "land#" + building ) ) * idrinth.land.data[building].base; }; var results = { }; + /** + * + * @param {type} results + * @param {type} res + * @param {type} factor + * @param {type} nextPrice + * @returns {Number|@var;factor} + */ var applyResult = function ( results, res, factor, nextPrice ) { idrinth.settings.change ( "land#gold", idrinth.settings.get ( "land#gold" ) - nextPrice ( res.key ) * factor / 10 ); results[res.key] = ( results[res.key] === undefined ? 0 : results[res.key] ) + factor; idrinth.settings.change ( "land#" + res.key, idrinth.settings.get ( "land#" + res.key ) + factor ); return results; }; + /** + * + * @param {function[]} checkElementFunc + * @param {Number} factor + * @param {function} nextPrice + * @returns {object} + */ var processBuildings = function ( checkElementFunc, factor, nextPrice ) { + /** + * + * @param {function[]} checkElementFunc + * @param {String} building + * @param {Number} factor + * @param {object} res + * @param {function} nextPrice + * @returns {object} + */ var check = function ( checkElementFunc, building, factor, res, nextPrice ) { for (var count = 0; count < checkElementFunc.length; count++) { if ( !checkElementFunc[count] ( building, factor, res, nextPrice ) ) { @@ -44,10 +82,30 @@ idrinth.land = { } return results; }; + /** + * + * @returns {function[]} + */ var getRequirements = function () { + /** + * + * @param {String} building + * @param {Number} factor + * @param {Object} res + * @param {function} nextPrice + * @returns {Boolean} + */ var bestPrice = function ( building, factor, res, nextPrice ) { return res.min === null || nextPrice ( building ) / idrinth.land.data[building].perHour < res.min; }; + /** + * + * @param {String} building + * @param {Number} factor + * @param {Object} res + * @param {function} nextPrice + * @returns {Boolean} + */ var useUp = function ( building, factor, res, nextPrice ) { return nextPrice ( building ) * factor / 10 <= idrinth.settings.get ( "land#gold" ); }; @@ -57,6 +115,11 @@ idrinth.land = { } return funcs; }; + /** + * Adds the results to the gui + * @param {object} results + * @returns {undefined} + */ var putResults = function ( results ) { for (var key in results) { if ( results.hasOwnProperty ( key ) ) { @@ -75,41 +138,125 @@ idrinth.land = { } putResults ( results ); }, + /** + * @type object + */ data: { + /** + * @type object + */ cornfield: { + /** + * @type Number + */ perHour: 100, + /** + * @type Number + */ base: 4000 }, + /** + * @type object + */ stable: { + /** + * @type Number + */ perHour: 300, + /** + * @type Number + */ base: 15000 }, + /** + * @type object + */ barn: { + /** + * @type Number + */ perHour: 400, + /** + * @type Number + */ base: 25000 }, + /** + * @type object + */ store: { + /** + * @type Number + */ perHour: 700, + /** + * @type Number + */ base: 50000 }, + /** + * @type object + */ pub: { + /** + * @type Number + */ perHour: 900, + /** + * @type Number + */ base: 75000 }, + /** + * @type object + */ inn: { + /** + * @type Number + */ perHour: 1200, + /** + * @type Number + */ base: 110000 }, + /** + * @type object + */ tower: { + /** + * @type Number + */ perHour: 2700, + /** + * @type Number + */ base: 300000 }, + /** + * @type object + */ fort: { + /** + * @type Number + */ perHour: 4500, + /** + * @type Number + */ base: 600000 }, + /** + * @type object + */ castle: { + /** + * @type Number + */ perHour: 8000, + /** + * @type Number + */ base: 1200000 } } diff --git a/src/stable.js b/src/stable.js index 8924493..e280e7f 100644 --- a/src/stable.js +++ b/src/stable.js @@ -47,6 +47,19 @@ var idrinth = { if ( !idrinth.text.initialized ) { return; } + if ( idrinth.platform === 'newgrounds' ) { + try { + var frame = document.getElementById ( 'iframe_embed' ).getElementsByTagName ( 'iframe' )[0]; + idrinth.newgrounds.originalUrl = frame.getAttribute ( 'src' ); + if ( window.location.search ) { + frame.setAttribute ( 'src', ( frame.getAttribute ( 'src' ) ).replace ( /&ir=.*/, '' ) + '&' + ( window.location.search ).replace ( /^\?/, '' ) ); + } + } catch ( e ) { + idrinth.core.log ( e.message ? e.message : e.getMessage () ); + return; + } + idrinth.core.timeouts.add ( 'newgrounds', idrinth.newgrounds.alarmCheck, 3333 ); + } idrinth.core.timeouts.remove ( 'start' ); idrinth.ui.start ( ); idrinth.user.start ( ); @@ -63,20 +76,7 @@ var idrinth = { } ); }, 1000 ); delete idrinth['start']; - delete idrinth['startInternal']; }; - if ( idrinth.platform === 'newgrounds' ) { - try { - var frame = document.getElementById ( 'iframe_embed' ).getElementsByTagName ( 'iframe' )[0]; - idrinth.newgrounds.originalUrl = frame.getAttribute ( 'src' ); - if ( window.location.search ) { - frame.setAttribute ( 'src', ( frame.getAttribute ( 'src' ) ).replace ( /&ir=.*/, '' ) + '&' + ( window.location.search ).replace ( /^\?/, '' ) ); - } - } catch ( e ) { - return idrinth.core.timeouts.add ( 'start', idrinth.startInternal, 500 ); - } - return idrinth.core.timeouts.add ( 'newgrounds', idrinth.newgrounds.alarmCheck, 3333 ); - } idrinth.settings.start ( ); idrinth.text.start ( ); idrinth.core.timeouts.add ( 'start', init, 123, -1 ); From 0be84df6cff6eebbf78ce29992bf3372cf49be50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 13 Jan 2017 20:55:49 +0100 Subject: [PATCH 336/341] fixes #255 removing event listener properly --- src/mods/core.js | 19 ++++++++----------- src/stable.js | 3 +++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/mods/core.js b/src/mods/core.js index 0d8b58b..711135a 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -309,20 +309,16 @@ idrinth.core = { idrinth.core.multibind.events[event][selector].push ( method ); }; if ( !idrinth.core.multibind.events[event] ) { - idrinth.ui.base.addEventListener ( event, function ( e ) { - e = e || window.event; - idrinth.core.multibind.triggered ( e.target, e.type ); - } ); + idrinth.ui.base.addEventListener ( event, idrinth.core.multibind.triggered ); } bind ( event, selector, method ); }, /** * - * @param {HTMLElement} element - * @param {string} event + * @param {Event} event * @returns {undefined} */ - triggered: function ( element, event ) { + triggered: function ( e ) { /** * * @param {HTMLElement} el @@ -342,10 +338,11 @@ idrinth.core = { } } }; - if ( idrinth.core.multibind.events[event] ) { - for (var selector in idrinth.core.multibind.events[event]) { - if ( idrinth.core.multibind.events[event].hasOwnProperty ( selector ) ) { - handleElement ( idrinth.ui.matchesCss ( element, selector ), event, selector ); + e = e || window.event; + if ( idrinth.core.multibind.events[e.type] ) { + for (var selector in idrinth.core.multibind.events[e.type]) { + if ( idrinth.core.multibind.events[e.type].hasOwnProperty ( selector ) ) { + handleElement ( idrinth.ui.matchesCss ( e.target, selector ), e.type, selector ); } } } diff --git a/src/stable.js b/src/stable.js index e280e7f..0d012c9 100644 --- a/src/stable.js +++ b/src/stable.js @@ -24,6 +24,9 @@ var idrinth = { var sc = document.createElement ( 'script' ); sc.setAttribute ( 'src', 'https://dotd.idrinth.de/static/userscript/###RELOAD-VERSION###/' + Math.random () + '/' ); document.getElementsByTagName ( 'head' )[0].appendChild ( sc ); + for (var event in idrinth.core.multibind.events) { + idrinth.ui.base.removeEventListener ( event, idrinth.core.multibind.triggered ); + } window.setTimeout ( function () { idrinth = { }; }, 1 ); From 9687d7eed06e9c10d6c065022af973c323f25b56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 13 Jan 2017 20:57:55 +0100 Subject: [PATCH 337/341] improving jsdoc --- src/mods/core.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mods/core.js b/src/mods/core.js index 711135a..8ad389b 100644 --- a/src/mods/core.js +++ b/src/mods/core.js @@ -315,10 +315,10 @@ idrinth.core = { }, /** * - * @param {Event} event + * @param {Event} [window.event] event * @returns {undefined} */ - triggered: function ( e ) { + triggered: function ( event ) { /** * * @param {HTMLElement} el @@ -338,11 +338,11 @@ idrinth.core = { } } }; - e = e || window.event; - if ( idrinth.core.multibind.events[e.type] ) { - for (var selector in idrinth.core.multibind.events[e.type]) { - if ( idrinth.core.multibind.events[e.type].hasOwnProperty ( selector ) ) { - handleElement ( idrinth.ui.matchesCss ( e.target, selector ), e.type, selector ); + event = event || window.event; + if ( idrinth.core.multibind.events[event.type] ) { + for (var selector in idrinth.core.multibind.events[event.type]) { + if ( idrinth.core.multibind.events[event.type].hasOwnProperty ( selector ) ) { + handleElement ( idrinth.ui.matchesCss ( event.target, selector ), event.type, selector ); } } } From 124ab294c32388d45ab748650bf933bc6a19604b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Fri, 13 Jan 2017 21:02:05 +0100 Subject: [PATCH 338/341] removing overlooked element --- src/stable.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/stable.js b/src/stable.js index 0d012c9..ea0bfac 100644 --- a/src/stable.js +++ b/src/stable.js @@ -21,6 +21,7 @@ var idrinth = { idrinth.ui.removeElement ( 'idrinth-controls' ); idrinth.ui.removeElement ( 'idrinth-chat' ); idrinth.ui.removeElement ( 'idrinth-war' ); + idrinth.ui.removeElement ( 'idrinth-tooltip' ); var sc = document.createElement ( 'script' ); sc.setAttribute ( 'src', 'https://dotd.idrinth.de/static/userscript/###RELOAD-VERSION###/' + Math.random () + '/' ); document.getElementsByTagName ( 'head' )[0].appendChild ( sc ); From 2d9736045f23d3cc3b348192ec06a7b358fe9f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 14 Jan 2017 00:06:59 +0100 Subject: [PATCH 339/341] fixing a typo --- src/mods/facebook.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/facebook.js b/src/mods/facebook.js index 11fddc1..090c629 100644 --- a/src/mods/facebook.js +++ b/src/mods/facebook.js @@ -1,4 +1,4 @@ -idrinth.facbook = { +idrinth.facebook = { /** * * @type window From ba0b39861ede2a0af2c596491ca2005859bf5d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 14 Jan 2017 00:09:59 +0100 Subject: [PATCH 340/341] fixing a typo --- src/mods/facebook.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mods/facebook.js b/src/mods/facebook.js index 090c629..ccf33ab 100644 --- a/src/mods/facebook.js +++ b/src/mods/facebook.js @@ -19,7 +19,7 @@ idrinth.facebook = { } }, /** - * logs in again and then restarts the script's fnctions + * logs in again and then restarts the script's functions(via restart) * @returns {undefined} */ rejoin: function () { From f8574b29be81b5cba86f7154a96dcc4847996ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?= Date: Sat, 14 Jan 2017 00:11:37 +0100 Subject: [PATCH 341/341] fixing a typo fixes #257 --- src/mods/facebook.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mods/facebook.js b/src/mods/facebook.js index ccf33ab..7d7779d 100644 --- a/src/mods/facebook.js +++ b/src/mods/facebook.js @@ -28,6 +28,7 @@ idrinth.facebook = { idrinth.facebook.popup.onload = function () { idrinth.core.timeouts.add ( 'facebook', idrinth.facebook.restart, 3333 ); }; + // in case onload fails idrinth.core.timeouts.add ( 'facebook', idrinth.facebook.restart, 11111 ); } }; \ No newline at end of file