phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3 from jonatkins/master

Browse Source 
Pull from upstream.
This commit is contained in:
nexushoratio 2013-11-27 00:30:39 -08:00
commit 0ddc8b5d4e
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mobile/AndroidManifest.xml
View File

@ -11,8 +11,10 @@
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<!--
<uses-permission android:name="android.permission.USE_CREDENTIALS"/>
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
-->
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@ -26,8 +28,7 @@
android:name=".IITC_Mobile"
android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
android:label="@string/app_name"
android:launchMode="singleTop"
android:theme="@style/AppBaseTheme">
android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@ -78,19 +79,16 @@
<activity
android:name=".IITC_PreferenceActivity"
android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
android:label="@string/activity_settings"
android:theme="@style/AppBaseTheme"/>
android:label="@string/activity_settings"/>
<activity
android:name=".IITC_PluginPreferenceActivity"
android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
android:label="@string/activity_plugins"
android:theme="@style/AppBaseTheme"/>
android:label="@string/activity_plugins"/>
<activity
android:name=".share.ShareActivity"
android:label="@string/activity_share"
android:noHistory="true"
android:parentActivityName=".IITC_Mobile"
android:theme="@android:style/Theme.Holo.Light.DarkActionBar">
android:parentActivityName=".IITC_Mobile">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".IITC_Mobile"/>

14
plugins/portal-highlighter-can-make-level.user.js
View File

@ -34,19 +34,19 @@ window.plugin.portalHighligherPortalsCanMakeLevel.highlight = function(data,high
//determines the level of poral a user can make all on their own
window.plugin.portalHighligherPortalsCanMakeLevel.playerCanSoloLevel = function(lvl) {
var renators_total = 0;
var renators_placed = 0;
var resonators_total = 0;
var resonators_placed = 0;
var resonator_level = PLAYER.level
while(renators_placed < 8) {
while(resonators_placed < 8) {
for(var i = 0; i<MAX_RESO_PER_PLAYER[resonator_level]; i++) {
if(renators_placed < 8) {
renators_total += resonator_level;
renators_placed++;
if(resonators_placed < 8) {
resonators_total += resonator_level;
resonators_placed++;
}
}
resonator_level--;
}
return(Math.floor(renators_total/8));
return(Math.floor(resonators_total/8));
}
window.plugin.portalHighligherPortalsCanMakeLevel.getHighlighter = function(lvl) {
return(function(data){