Merge pull request lanedirt#1108 from nguyenthanhan/fix/crawlers-energy-display-overlay-1011

fix: display energy needed for Crawlers in building overlay lanedirt#1011 lanedirt#1012

Author: lanedirt

app/GameMissions/BattleEngine/Models/DefenderFleet.php

@@ -2,11 +2,11 @@
 
 namespace OGame\GameMissions\BattleEngine\Models;
 
-use OGame\Services\ObjectService;
 use OGame\Factories\PlayerServiceFactory;
 use OGame\GameObjects\Models\Units\UnitCollection;
 use OGame\Models\FleetMission;
 use OGame\Services\FleetMissionService;
+use OGame\Services\ObjectService;
 use OGame\Services\PlanetService;
 use OGame\Services\PlayerService;
 

app/GameObjects/CivilShipObjects.php

@@ -190,7 +190,7 @@ public static function get(): array
         $crawler->title = 'Crawler';
         $crawler->machine_name = 'crawler';
         $crawler->class_name = 'resbuggy'; // CSS uses 'resbuggy' for Crawler sprite
-        $crawler->description = 'Crawlers are resource drones that support the mines and increase production.';
+        $crawler->description = 'Crawlers increase the production of metal, crystal and Deuterium on their tasked planet each by 0.02%, 0.02% and 0.02% respectively. As a collector, production also increases. The maximum total bonus depends on the overall level of your mines.';
         $crawler->description_long = 'Crawlers are state-of-the-art mining machines which can considerably increase the production of raw materials in the mines. However, they can only be built by members of the Collector class. Crawlers move across the planet`s surface and enter the shafts where they help to increase the mine`s production. The maximum number of Crawlers that can be used is limited by the level of the planet`s mines. The maximum overcharge is 100%. Collectors will be able to upgrade their Crawlers to an overcharge of 150%.';
         $crawler->requirements = [
             new GameObjectRequirement('shipyard', 4),

app/Http/Middleware/ServerTiming.php

@@ -3,6 +3,9 @@
 namespace OGame\Http\Middleware;
 
 use Closure;
+
+use function defined;
+
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -20,7 +23,7 @@ public function handle(Request $request, Closure $next): Response
         $response = $next($request);
 
         // Add server timing metrics for performance monitoring.
-        $processingTime = \defined('LARAVEL_START') ? round((microtime(true) - LARAVEL_START) * 1000, 2) : 0;
+        $processingTime = defined('LARAVEL_START') ? round((microtime(true) - LARAVEL_START) * 1000, 2) : 0;
         $response->headers->set('Server-Timing', 'app;dur=' . $processingTime . ', cdn;desc="miss", origin;desc="local"');
 
         return $response;

app/Http/Traits/ObjectAjaxTrait.php

@@ -111,6 +111,19 @@ public function ajaxHandler(Request $request, PlayerService $player): JsonRespon
             if (!empty($production_current->energy->get())) {
                 $energy_difference = ($production_next->energy->get() - $production_current->energy->get()) * -1;
             }
+        } elseif ($object->machine_name === 'crawler') {
+            // Special handling for Crawlers: they consume energy but don't have production property
+            // Each crawler consumes 50 energy at 100%, with additional cost for overcharge
+            $crawlerPercentage = $planet->getBuildingPercent('crawler') / 10; // Convert to decimal (0-1.5)
+            $baseEnergy = 50;
+            $energyConsumption = $baseEnergy * $crawlerPercentage;
+
+            // Add extra energy cost for overload (>100%)
+            if ($crawlerPercentage > 1.0) {
+                $energyConsumption += $baseEnergy * ($crawlerPercentage - 1.0);
+            }
+
+            $energy_difference = floor($energyConsumption);
         }
 
         $enough_resources = $planet->hasResources($price);

app/Models/FleetTemplate.php

@@ -2,10 +2,10 @@
 
 namespace OGame\Models;
 
-use Illuminate\Support\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Support\Carbon;
 
 /**
  *

tests/Feature/FleetDispatch/FleetDispatchEspionageTest.php

@@ -4,7 +4,6 @@
 
 use Exception;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\DB;
 use OGame\GameMissions\EspionageMission;
 use OGame\GameObjects\Models\Units\UnitCollection;
 use OGame\Models\EspionageReport;

tests/Feature/MissilesDoNotParticipateInCombatTest.php

@@ -2,11 +2,11 @@
 
 namespace Tests\Feature;
 
-use OGame\Models\Message;
 use OGame\Factories\PlanetServiceFactory;
 use OGame\GameMissions\AttackMission;
 use OGame\GameObjects\Models\Units\UnitCollection;
 use OGame\Models\BattleReport;
+use OGame\Models\Message;
 use OGame\Models\Resources;
 use OGame\Services\FleetMissionService;
 use OGame\Services\ObjectService;

tests/Unit/CrawlerEnergyDisplayTest.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Tests\Unit;
+
+use OGame\Services\ObjectService;
+use Tests\UnitTestCase;
+
+/**
+ * Test that the Crawler energy consumption is displayed correctly in building overlay.
+ */
+class CrawlerEnergyDisplayTest extends UnitTestCase
+{
+    /**
+     * Test that crawlers display energy consumption correctly in building overlay.
+     */
+    public function test_crawler_energy_display_in_overlay(): void
+    {
+        // Create a planet with some mines to allow crawlers to work
+        $this->createAndSetPlanetModel([
+            'metal_mine' => 10,
+            'crystal_mine' => 10,
+            'deuterium_synthesizer' => 10,
+            'crawler' => 0, // Starting with 0 crawlers
+        ]);
+
+        // Get crawler object
+        $object = ObjectService::getObjectById(217); // Crawler ID
+        
+        // Simulate the energy calculation from ObjectAjaxTrait for 100% production
+        $crawlerPercentage = 10 / 10; // Convert to decimal (0-1.5)
+        $baseEnergy = 50;
+        $energyConsumption = $baseEnergy * $crawlerPercentage;
+        
+        $energy_difference = floor($energyConsumption);
+        
+        // Assert that energy consumption is calculated correctly
+        $this->assertEquals(50, $energy_difference, 'Crawler should consume 50 energy at 100% production');
+    }
+}