From 3569ba2df01afd74d51b548ba51e8befd92d7a3f Mon Sep 17 00:00:00 2001 From: ardenian Date: Sun, 9 Oct 2016 13:43:29 +0200 Subject: [PATCH 01/35] 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 02/35] 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 03/35] 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 eb085647cfc8f199bcd190db2adc5b3891b730c8 Mon Sep 17 00:00:00 2001 From: Theodotosp Date: Mon, 10 Oct 2016 22:28:22 +0300 Subject: [PATCH 04/35] 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 05/35] 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 06/35] 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 07/35] 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 08/35] 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 bd3ccfd1b752e04470344633d414dd680db63769 Mon Sep 17 00:00:00 2001 From: ardenian Date: Tue, 11 Oct 2016 17:17:20 +0200 Subject: [PATCH 09/35] 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 10/35] 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 11/35] 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 12/35] 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 13/35] 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 14/35] 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 15/35] 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 16/35] 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 17/35] 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 18/35] 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 19/35] 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 20/35] 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 21/35] 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 22/35] 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 23/35] 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 24/35] 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 25/35] 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 26/35] 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 27/35] 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 28/35] 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 29/35] 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 30/35] 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 31/35] 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 32/35] #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 33/35] 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 34/35] 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 35/35] 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',