v2.1.0

loic-favier · loic-favier · commit 51aa891b9bf9 · 2023-02-15T10:52:10.000+01:00
diff --git a/src/dataManager.js b/src/dataManager.js
@@ -77,9 +77,9 @@ class DataManager {
 		return retrieveValue('data.'+planetId, {});
 	}
 	
-	updatePlanetData(planetId, planet) {
+	updatePlanetData(planetId, planet, force, timestamp) {
 		this.planets[planetId] = planet;
-		storeValue('data.'+planetId, planet);
+		storeValue('data.'+planetId, planet, force, timestamp);
 		this.setJsonValue('data.'+planetId, planet);
 	}
 
diff --git a/src/displays/planetsProductionDisplay.js b/src/displays/planetsProductionDisplay.js
@@ -24,6 +24,8 @@ class PlanetsProductionDisplay {
 
 		var prod_mod = PARAMS.prod_display;
 
+		// let maxShips = this.dataManager.getIntValue('data.maxships', 0);
+
 		for (var i = 0; i < nbPlanets; i++) {
 			var planetId = myPlanetsRes.snapshotItem(i).textContent;
 			const [planetdata, moondata, planetProd, moonProd] = await this.dataManager.loadFullPlanet(planetId);
@@ -221,13 +223,14 @@ class PlanetsProductionDisplay {
 			
 			// mount base html
 			jQuery('#' + planetId + '>.prod').html(
+				// Planet production
 				'<div class="planet_prod">'
 				+ '<span id="m_dispo" class="dispo" title="Capacity : ' + formatInt(planet.prod.M.capa) + '"></span>' +
 				(PARAMS.game_style === 'miner' ?
 					'<span class="prod_per_hour ' + (prod_mod === 'hour' ? '' : 'hidden') + ' ' + m_prod_class + '">+' + formatInt(planet.prod.M.prod) + '/h</span>' +
 					'<span class="prod_per_day ' + (prod_mod === 'day' ? '' : 'hidden') + ' ' + m_prod_class + '">+' + formatInt(planet.prod.M.prod * 24) + '/d</span>'
 				: '')
-				+ '<br/><span id="c_dispo" class="dispo" title="Capacity : ' + formatInt(planet.prod.D.capa) + '"></span>' +
+				+ '<br/><span id="c_dispo" class="dispo" title="Capacity : ' + formatInt(planet.prod.C.capa) + '"></span>' +
 				(PARAMS.game_style === 'miner' ?
 					'<span class="prod_per_hour ' + (prod_mod === 'hour' ? '' : 'hidden') + ' ' + c_prod_class + '">+' + formatInt(planet.prod.C.prod) + '/h</span>' +
 					'<span class="prod_per_day ' + (prod_mod === 'day' ? '' : 'hidden') + ' ' + c_prod_class + '">+' + formatInt(planet.prod.C.prod * 24) + '/d</span>'
@@ -246,13 +249,14 @@ class PlanetsProductionDisplay {
 				+ (PARAMS.energie_display == 1 ? '<br/><span id="e_dispo" class="dispo" title="Production : ' + formatInt(planet.prod.E.prod) + '"><span class="' + warnE + '" style="width:' + this.percent(planet.prod.E.prod - planet.prod.E.dispo, planet.prod.E.prod) + '%">E:&nbsp;' + formatInt(planet.prod.E.dispo) + '</span></span>' : '')
 				//+ '<span class="capa">&nbsp;/&nbsp;'+formatInt(planet.prod.E.prod)+'</span>'
 				+ cefPercent
+				// Moon production
 				+ '</div><div class="moon_prod">'
 				+ '<span id="m_dispo" class="dispo" title="Capacity : ' + formatInt(planet.moonprod.M.capa) + '"></span>' +
 				(PARAMS.game_style === 'miner' ?
 					'<span class="prod_per_hour ' + (prod_mod === 'hour' ? '' : 'hidden') + ' ' + m_prod_class_moon + '">+' + formatInt(planet.moonprod.M.prod) + '/h</span>' +
 					'<span class="prod_per_day ' + (prod_mod === 'day' ? '' : 'hidden') + ' ' + m_prod_class_moon + '">+' + formatInt(planet.moonprod.M.prod * 24) + '/d</span>'
 				: '')
-				+ '<br/><span id="c_dispo"  class="dispo" title="Capacity : ' + formatInt(planet.moonprod.D.capa) + '"></span>' +
+				+ '<br/><span id="c_dispo"  class="dispo" title="Capacity : ' + formatInt(planet.moonprod.C.capa) + '"></span>' +
 				(PARAMS.game_style === 'miner' ?
 					'<span class="prod_per_hour ' + (prod_mod === 'hour' ? '' : 'hidden') + ' ' + c_prod_class_moon + '">+' + formatInt(planet.moonprod.C.prod) + '/h</span>' +
 					'<span class="prod_per_day ' + (prod_mod === 'day' ? '' : 'hidden') + ' ' + c_prod_class_moon + '">+' + formatInt(planet.moonprod.C.prod * 24) + '/d</span>'
@@ -270,7 +274,9 @@ class PlanetsProductionDisplay {
 				//+ '<span class="capa">&nbsp;/&nbsp;'+formatInt(planet.moonprod.E.prod)+'</span>'
 				+ '</div>'
 			);
+			// Incomming fleet base html
 			jQuery('#'+planetId).append('<span class="incomming_fleet"></span>');
+			// Store reference to jQuery base HTML elements
 			// planet
 			planet.$m_dispo = jQuery('#'+planetId + ' .planet_prod #m_dispo');
 			planet.$c_dispo = jQuery('#'+planetId + ' .planet_prod #c_dispo');
@@ -292,6 +298,18 @@ class PlanetsProductionDisplay {
 
 			planet.$incomming_fleet = jQuery('#'+planetId + ' .incomming_fleet');
 			this.planetList.push(planet);
+
+			if (PARAMS.show_stationed_ships == 1) {
+				// Indicateurs de présence de flotte
+				jQuery('#' + planetId + ' a.planetlink').append('<span class="aquai" title="' + formatInt(planetdata.vaissels) + ' ships"><span class="percent" style=""></span></span>');
+				planet.$fleetAquai = jQuery('#' + planetId + ' a.planetlink span.aquai');
+				planet.$fleetPercent = jQuery('#' + planetId + ' a.planetlink span.aquai span.percent');
+				planet.$fleetPercent.data('vaissels', planetdata.vaissels);
+				jQuery('#' + planetId + ' a.moonlink').append('<span class="aquai" title="' + formatInt(moondata.vaissels) + ' ships"><span class="percent" style=""></span></span>');
+				planet.$fleetAquai_moon = jQuery('#' + planetId + ' a.moonlink span.aquai');
+				planet.$fleetPercent_moon = jQuery('#' + planetId + ' a.moonlink span.aquai span.percent');
+				planet.$fleetPercent_moon.data('vaissels', moondata.vaissels);
+			}
 		}
 
 		jQuery('#planetList').append('<div class="total_prod">'
@@ -384,7 +402,9 @@ class PlanetsProductionDisplay {
 				}
 			}
 		});
-		
+
+		let maxShips = 0;
+
 		// display per planet
 		for (var i =0; i<this.planetList.length; i++) {
 			var warnM = '';
@@ -396,6 +416,13 @@ class PlanetsProductionDisplay {
 
 			const [planetdata, moondata, planetProd, moonProd] = await this.dataManager.loadFullPlanet(planet.id);
 
+
+			// compute maxShips
+			if (PARAMS.show_stationed_ships == 1 && planetdata.vaissels >= 0) {
+				maxShips = Math.max(maxShips, planetdata.vaissels);
+				planet.$fleetPercent.data('vaissels', planetdata.vaissels);
+			}
+
 			planet.prod = planetProd;
 			planet.moonprod = moonProd;
 
@@ -487,6 +514,11 @@ class PlanetsProductionDisplay {
 
 			// moon production
 			if (planet.moonprod) {
+				// compute maxShips
+				if (PARAMS.show_stationed_ships == 1 && moondata.vaissels >= 0) {
+					maxShips = Math.max(maxShips, moondata.vaissels);
+					planet.$fleetPercent_moon.data('vaissels', moondata.vaissels);
+				}
 				warnM = '';
 				warnC = '';
 				warnD = '';
@@ -612,7 +644,19 @@ class PlanetsProductionDisplay {
 			}
 
 		}
-		
+
+		if (PARAMS.show_stationed_ships == 1) {
+			jQuery('span.aquai span.percent').each(function (index, elt) {
+				$elt = jQuery(elt);
+				let vaissels = parseInt($elt.data('vaissels'));
+				let fleetPercent = vaissels * 100 / maxShips;
+				let fleetColor = fleetPercent > 75 ? 'red' : (fleetPercent > 50 ? 'orange' : 'green');
+				let minWidth = fleetPercent > 0 ? 8 : 0;
+				$elt.attr('style', 'width: ' + fleetPercent + '%; background-color: ' + fleetColor + '; min-width: ' + minWidth + 'px;');
+				$elt.parent().attr('title', formatInt(vaissels) + ' ships');
+			});
+		}
+
 		// in flight
 		jQuery('#planetList .total_prod .in_flight_metal').html(formatInt(inFlight_M));
 		jQuery('#planetList .total_prod .in_flight_cristal').html(formatInt(inFlight_C));
diff --git a/src/ogameLive.css b/src/ogameLive.css
@@ -471,6 +471,31 @@ span.incomming_fleet {
 	opacity: 0.5;
 }
 
+span.aquai {
+	display: block;
+	background-color: rgb(85,85,85);
+	height: 2px;
+	position: absolute;
+	bottom: 0px;
+	cursor: help;
+}
+
+a.planetlink span.aquai {
+	width: 80px;
+}
+
+a.moonlink span.aquai {
+	width: 40px;
+}
+
+span.aquai .percent {
+	display: block;
+	height: 100%;
+	width: 0%;
+	background-color: green;
+}
+
+
 figure.planetIcon.debrisField {
 	background: url("https://gf1.geo.gfsrv.net/cdnc5/fa3e396b8af2ae31e28ef3b44eca91.gif") no-repeat;
 	background-size: 16px;
@@ -709,6 +734,17 @@ li>a.menubutton>a.empire_moon:before {
 	opacity: 0.7;
 }
 
-#OGameLiveEvents .eventFleet[data-mission-type="15"][data-return-flight="false"] {
+#OGameLiveEvents .eventFleet[data-mission-type="15"][data-return-flight="false"],
+#OGameLiveEvents .eventFleet[data-mission-type="18"][data-return-flight="false"] {
 	display: none;
 }
+
+#rechts .smallplanet a.alert {
+	right: auto !important;
+	left: 102px !important;
+	top: 5px !important;
+}
+
+.OGameClock>span {
+	color: red;
+}
diff --git a/src/ogameLive.html b/src/ogameLive.html
@@ -6,41 +6,7 @@
         <link rel="stylesheet" media="all" type="text/css" href="style.css"/>
     </head>
     <body>
-        <h1>OGameLive Parameters</h1>
-
-        <h2>General options</h2>
-        <div class="parameter">
-            <label>Game style</label>
-            <select id="game-style">
-                <option value="raider">Raider</option>
-                <option value="miner">Miner</option>
-            </select>
-        </div>
-        <div class="parameter">
-            <label>Production display</label>
-            <select id="production-display">
-                <option value="hour">per hour</option>
-                <option value="day">per day</option>
-<!--                <option value="week">per week</option>-->
-            </select>
-        </div>
-        <div class="parameter">
-            <label>Production round</label>
-            <select id="production-round">
-                <option value="0">No</option>
-                <option value="1">Yes</option>
-            </select>
-        </div>
-
-        <h2>Fleet options</h2>
-        <div class="parameter">
-            <label>Show fleet speed</label>
-            <select id="fleet-speed">
-                <option value="0">No</option>
-                <option value="1">Yes</option>
-            </select>
-        </div>
-
-    <script type="application/javascript" src="parameters.js"></script>
+        <h1>OGameLive</h1>
+    <p>Thank you for using OGameLive !</p>
     </body>
 </html>
diff --git a/src/ogameLive.user.js b/src/ogameLive.user.js
@@ -53,6 +53,8 @@ const DEFAULT_PARAMS = {
 	energie_display: 1,
 	sum_display: 1,
 	show_flights: 1,
+	show_cost_overlay: 1,
+	show_stationed_ships: 1,
 };
 
 // noinspection ES6ConvertVarToLetConst
@@ -71,9 +73,14 @@ if (PARAMS.lifeform == null || PARAMS.lastServerData == null || parseInt(PARAMS.
 	// get Universe params if not defined, or Once a day
 	jQuery.get(urlUnivers + "/api/serverData.xml", function (data) {
 		let $data = jQuery(data);
+		console.log('versionUnivers', $data.find('version')[0].textContent )
 		versionUnivers = $data.find('version')[0].textContent;
+
+		console.log('lifeformSettings', $data.find('lifeformSettings').length )
 		PARAMS.lifeform = $data.find('lifeformSettings').length > 0;
-		PARAMS.nb_systems = parseInt($data.find('systems').textContent);
+
+		console.log('versionUnivers', $data.find('systems')[0].textContent )
+		PARAMS.nb_systems = parseInt($data.find('systems')[0].textContent);
 		PARAMS.lastServerData = (new Date()).getTime();
 		GM_setJsonValue('params', PARAMS);
 		storeValue('params', PARAMS);
@@ -193,6 +200,9 @@ window.addEventListener('DOMContentLoaded', (event) => {
 	// with OGameLive Infinity-based planets and moon display, change default tooltip side
 	jQuery('.smallplanet > a').toggleClass('tooltipRight tooltipLeft');
 
+	// Add timer at the bottom of the galaxy view
+	jQuery('.ctGalaxyFooter #colonized').after('<div style="flex: 1; display: flex"><span class="OGameClock"></span><span class="ogk-ping"></span></div>');
+
 	// Finaly detect other plugins and add them into body class (this is not really helpfully if that plugins load after OGameLive)
 	hasOGInfinity = jQuery('.ogl-harvestOptions').length >= 1;
 	hasOGLight = jQuery('#menuTable .ogl_leftMenuIcon').length >= 1;
diff --git a/src/parameters.js b/src/parameters.js
@@ -70,6 +70,20 @@ class Parameters {
                 min: 0,
                 max: 99,
             },
+            show_cost_overlay: {
+                label: 'Show cost overlay',
+                options: [
+                    {value: 1, label: 'Yes'},
+                    {value: 0, label: 'No'}
+                ],
+            },
+            show_stationed_ships: {
+                label: 'Show stationed ships',
+                options: [
+                    {value: 1, label: 'Yes'},
+                    {value: 0, label: 'No'}
+                ],
+            },
         }
 
     }
@@ -83,13 +97,16 @@ class Parameters {
                     '<h2>General options</h2>' +
                     this._getParamSelect('game_style') +
                     this._getParamInteger('main_refresh') +
+                    '<h2>Technologies</h2>' +
+                    this._getParamSelect('show_cost_overlay') +
                     '<h2>Live production</h2>' +
                     this._getParamSelect('show_production') +
                     this._getParamSelect('prod_display') +
                     this._getParamSelect('energie_display') +
                     this._getParamSelect('sum_display') +
                     this._getParamSelect('prod_round') +
                     this._getParamSelect('show_needed_transporters') +
+                    this._getParamSelect('show_stationed_ships') +
                     '<h2>Fleet options</h2>' +
                     this._getParamSelect('show_fleet_speed') +
                     this._getParamInteger('random_system') +
diff --git a/src/parsers/empireParser.js b/src/parsers/empireParser.js
@@ -38,6 +38,8 @@ class EmpireParser {
                 empireObserver.disconnect();
                 let planetList = Xpath.getUnorderedSnapshotNodes(document,'//div[contains(@class,"planetWrapper")]/div/@id');
                 let nbPlanets = planetList.snapshotLength;
+                // reset max fleet in storage
+                // this.dataManager.setValue('data.maxships', 0);
                 for (var i = 0; i < nbPlanets; i++) {
                     let internalId;
                     let planetId = planetList.snapshotItem(i).textContent;
@@ -54,7 +56,7 @@ class EmpireParser {
                         this.dataManager.loadPlanetData(internalId),
                         this.dataManager.loadPlanetProd(internalId)
                     ]);
-                    console.log(planetId, planetData, planetProd);
+                    console.log(planetId, internalId, planetData, planetProd);
 
                     // Now we have our planet from dataManager, parse planet data from the empire view
                     if (!jQuery.isEmptyObject(planetData)) {
@@ -121,6 +123,26 @@ class EmpireParser {
                         }
 
                         this.dataManager.updatePlanetProd(internalId, planetProd, true, loadedTime);
+
+                        // Parse some other data
+
+                        // Fleet
+                        if (!planetData.fleet) {
+                            planetData.fleet = {};
+                        }
+                        planetData.vaissels = 0;
+                        Object.keys(OgameConstants.fleet).forEach(function(shipName) {
+                            const shipId = OgameConstants.fleet[shipName];
+                            let quantity = Xpath.getStringValue(document, '//div[contains(@id,"'+planetId+'")]/div[contains(@class,"ships")]/div[contains(@class,"' + shipId + '")]');
+                            quantity = parseInt(quantity.split('.').join(''));
+                            planetData.fleet[shipName] = quantity;
+                            console.log(internalId, shipName, planetData.fleet[shipName])
+                            if (shipName !== 'resbuggy' && shipName !== 'solarSatellite') {
+                                // Do not count resbuggy and solarSatellite
+                                planetData.vaissels += quantity;
+                            }
+                        });
+                        this.dataManager.updatePlanetData(internalId, planetData, true,loadedTime);
                     }
 
                 }
diff --git a/src/parsers/fleetParser.js b/src/parsers/fleetParser.js
@@ -19,9 +19,18 @@ class FleetParser {
 		if (!planetData.fleet) {
 			planetData.fleet = {};
 		}
+		planetData.vaissels = 0;
 		Object.keys(constants).forEach(function(k) {
 			planetData.fleet[k] = 
 				Xpath.getNumberValue(document, '//div[contains(@id,"technologies")]/div/ul/li[contains(@class,"'+k+'")]/span/span[contains(@class,"amount")]/@data-value');
+			if (isNaN(planetData.fleet[k])) {
+				planetData.fleet[k] = 0;
+			}
+			console.log(k, planetData.fleet[k]);
+			if (k !== 'resbuggy' && k !== 'solarSatellite') {
+				// Do not count resbuggy and solarSatellite
+				planetData.vaissels += planetData.fleet[k];
+			}
 			if (getFleetData) {
 				jQuery.get(urlUnivers + '/game/index.php?page=ajax&component=technologytree&ajax=1&technologyId='+constants[k]+'&tab=2', function(htmlStr) {
 					log("get response for " + k, LOG_LEVEL_TRACE);
@@ -42,4 +51,4 @@ class FleetParser {
 		});
 		dataManager.updateCurrentPlanetData(planetData);
 	}
-}
+}
diff --git a/src/router.js b/src/router.js
diff --git a/src/window.js b/src/window.js
diff --git a/src/worker.js b/src/worker.js

Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,9 @@ class DataManager {`
`77`	`77`	`return retrieveValue('data.'+planetId, {});`
`78`	`78`	`}`
`79`	`79`
`80`		`- updatePlanetData(planetId, planet) {`
	`80`	`+ updatePlanetData(planetId, planet, force, timestamp) {`
`81`	`81`	`this.planets[planetId] = planet;`
`82`		`- storeValue('data.'+planetId, planet);`
	`82`	`+ storeValue('data.'+planetId, planet, force, timestamp);`
`83`	`83`	`this.setJsonValue('data.'+planetId, planet);`
`84`	`84`	`}`
`85`	`85`