Merge pull request #5 from Arcopix/bug-fixes-0.3.0009

Bugfixes

Author: Arcopix

tools.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name       DG utilities
 // @namespace  devhex
-// @version    0.3.0009
+// @version    0.3.0010
 // @description  various minor improvements of DG interface
 // @match      https://beta.darkgalaxy.com/
 // @match      https://beta.darkgalaxy.com/*
@@ -10,7 +10,7 @@
 
 /* Config start */
 var nap_ally = [ "[ALLY1]", "[ALLY2]" ]; // Which alliances you want to be color coded as NAP. Note the brackets.
-var custom_style = "COLOR: #FFD54F;"; // Color specified for NAP
+var custom_style = "COLOR: #FFE66F;"; // Color specified for NAP
 /* Config end */
 
 /* Common counters & pointers */
@@ -170,12 +170,10 @@ if (location.href.includes('/fleet/')&&document.querySelector('.nextPrevFleet, .
   Original concept by Mordread
   Refactored by Arcopix
 */
-var numberWithCommas;
 var line;
 var availablePopulation, occupiedPopulation;
 var planets;
 if (location.href.includes('/planet/')) {
-    numberWithCommas = (x) => x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
     line = document.getElementsByClassName('resource')[3];
     availablePopulation = line.getElementsByTagName('span')[0].innerText.split(' / ')[0];
     occupiedPopulation = line.getElementsByTagName('span')[2].innerText.replace('(', '').replace(' occupied)', '')
@@ -207,15 +205,17 @@ for (i=0; i<coords.length; i++)
 {
     let c = coords[i];
     /* In planet details there is no span on the planer coordinates */
-    if (!location.href.includes('/planet/')) {
-        c = c.getElementsByTagName('span')[0];
+    let __c = c.getElementsByTagName('span')[0];
+    if (__c) {
+        c = __c;
     }
 
     /* Don't bother with home planets */
     if (typeof c !== 'undefined' && typeof c.innerText !== 'undefined' && c.innerText=='0.0.0') {
         continue;
     }
-    if (c && c.innerText.match(/[0-9]+\.[0-9]+\.[0-9]+/g)) {
+
+    if (c && c.innerText.match(/^[0-9]+\.[0-9]+\.[0-9]+$/g)) {
         let p = c.innerText.split('.');
         c.innerHTML = '<a href="/navigation/' + p[0] + '/' + p[1] + '/">' + c.innerHTML + '</a>';
     }
@@ -242,10 +242,17 @@ if (location.href.includes('/radar/')) {
             fleetRow[j].parentNode.removeChild(fleetRow[j]);
         }
 
+        n = 0;
         /* For every possible TICK, reducing output the rows */
         for (m=24; m>=0; m--) {
             for (j=crow.length-1; j>=0; j--) {
-                if (crow[j]&&parseInt(crow[j].getElementsByClassName('turns')[0].innerText)==m) {
+                if (crow[j]&&crow[j].getElementsByClassName('turns')[0]&&parseInt(crow[j].getElementsByClassName('turns')[0].innerText)==m) {
+                    if (n = ((n+1)%2)) {
+                        crow[j].className = "opacBackground lightBorderBottom entry";
+                    } else {
+                        crow[j].className = "opacLightBackground lightBorderBottom entry";
+                    }
+                    //alert(crow[j].className);
                     radars[i].appendChild(crow[j]);
                     /* Nullify the row so we would not have to search it by class, text and so on */
                     crow[j] = 0;
@@ -310,10 +317,10 @@ if (location.href.includes('/comms/')) {
 }
 
 /* Request confirmation when kicking people from alliance */
-if (location.href.includes('/alliances/')) {
+if (window.location.pathname=='/alliances/') {    
     k = document.querySelectorAll('input[type=submit]');
     for (i=0; i<=k.length; i++) {
-        if (k[i].value=='Kick Member') {
+        if (k[i]&&k[i].value=='Kick Member') {
             l=k[i];
             /* Get the player name. This is a bit ugly, but oh well... */
             let playerName = l.parentNode.parentNode.parentNode.querySelector('div.name').innerText;