Skip to content

Add "All Non-Maxed" token search capability #17

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
1DontEx1st wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add "All Non-Maxed" token search capability #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30684b0
Update Arena.js
1DontEx1st Nov 2, 2017
940a958
Update Menu and User Info.js
1DontEx1st Nov 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions scripts/Arena.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function playArena() {
if ( checkIfActive( myUrl ) == true ) {
return false
}
if ( getProperty( 'Token Search' ) == "Enabled" ) {
if ( (getProperty( 'Token Search' ) == "Enabled") || (getProperty( 'Token Search' ) == "All Non-Maxed")) {
var Search = searchArena();
Logger.log( 'Search:' + Search )
}
Expand All @@ -26,7 +26,11 @@ function playArena() {
* return false/[search count,found token]
*/
function searchArena() {
var myTarget = getProperty( 'Arena_Target' ).split( "," );
if (getProperty( 'Token Search' ) == "Enabled") {
var myTarget = getProperty( 'Arena_Target' ).split( "," );
} else {
var myTarget = getNonMaxedCharacterTokens().split(",");
}
if ( myTarget.length < 2 ) {
return false
}
Expand Down
25 changes: 19 additions & 6 deletions scripts/Menu and User Info.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ function loadUserSettings() { //Read settings
}

myProperties.setProperties( {
'Timezone': getSetting( myRange, 'Timezone' ),
//Options
'Energy Check': getSetting( myRange, 'Energy Check' ),
'Ad Crate': getSetting( myRange, 'Ad Crate' ),
Expand Down Expand Up @@ -56,9 +57,6 @@ function loadUserSettings() { //Read settings
'Token Search': getSetting( myRange, 'Token Search' ),
'Search Timeout': getSetting( myRange, 'Search Timeout' ),
'Arena_Target': mySearch,
//Other
'_currenttime': formattedTime(),
'_time_count': formattedTime(),
//Logging
'_logs_RefillChallenge': '',
'_logs_RefillChallenge_count': 0,
Expand Down Expand Up @@ -103,6 +101,7 @@ if (button == ui.Button.OK) {
}
var mySheet = SpreadsheetApp.getActiveSpreadsheet().getSheetByName( 'Settings' );
var myRange = mySheet.getRange( "C1:D97" ).getValues();
mySheet.getRange( "D"+getSettingPOS( myRange, 'Timezone')).setValue(mySettings['Timezone']);
//Options
mySheet.getRange( "D"+getSettingPOS( myRange, 'Ad Crate')).setValue(mySettings['Ad Crate']);
mySheet.getRange( "D"+getSettingPOS( myRange, 'Ad Boost')).setValue(mySettings['Ad Boost']);
Expand Down Expand Up @@ -175,6 +174,7 @@ function ExportSettings() {
var mySheet = SpreadsheetApp.getActiveSpreadsheet().getSheetByName( 'Settings' );
var myRange = mySheet.getRange( "C1:D97" ).getValues();
var Settings = {
'Timezone' : getSetting( myRange, 'Timezone' ),
//Options
'Ad Crate' : getSetting( myRange, 'Ad Crate' ),
'Ad Boost' : getSetting( myRange, 'Ad Boost' ),
Expand Down Expand Up @@ -271,7 +271,6 @@ function getSetting( aArray, aSetting ) {
* return island ID
*/
function convertIsland( aInfo ) {
Logger.log("Test: "+aInfo)
if ( aInfo.length < 4 ) {
aInfo = "0" + aInfo
}
Expand Down Expand Up @@ -367,7 +366,7 @@ function authenticateUser( aId, aToken ) { //Check if use is valid & create user
var myUserName = myUserAuthJson.user_data.name;
if(myCheck == true){
Logger.log('Login Failed')
updateStatus( 'Login failed.. Check Login info ' + formattedTime() );
updateStatus( 'Login failed.. Check Login info' );
Logger.log( 'User Auth fail' );
return false
}
Expand All @@ -381,7 +380,7 @@ function authenticateUser( aId, aToken ) { //Check if use is valid & create user
if(myCheck != false){
setProperty( '_IslandCost', myCheck+'');
}else{
updateStatus( 'Account ' + getProperty( '_name' ) + ' Island unavailable to farm ' + formattedTime() );
updateStatus( 'Account ' + getProperty( '_name' ) + ' Island unavailable to farm ' );
return false
}
}
Expand Down Expand Up @@ -468,3 +467,17 @@ function getCharacterTokens(aRange) {

return mySearch
}

function getNonMaxedCharacterTokens() {
var myUrl = getProperty( '_url' );
var myInit = UrlFetchApp.fetch( myUrl + '&message=init' );
var myInitJson = JSON.parse( myInit );
var myHeroes = myInitJson.user_heroes;
var mySearch = '';
for (var key in myHeroes) {
if (parseInt(myHeroes[key].level) < 10) {
mySearch += "," + myHeroes[key].unit_id;
}
}
return mySearch;
}