Merge pull request #409 from rautamik/bugfix/212-max-shields

Restrict small and large shields max amount
lanedirt · Oct 22, 2024 · 5268834 · 5268834
2 parents 404b665 + ee00314
commit 5268834
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 2 deletions.
diff --git a/app/Http/Controllers/Abstracts/AbstractUnitsController.php b/app/Http/Controllers/Abstracts/AbstractUnitsController.php
@@ -99,12 +99,16 @@ public function index(Request $request, PlayerService $player, ObjectService $ob
                 // Check if the current planet has enough resources to build this building.
                 $enough_resources = $planet->hasResources($objects->getObjectPrice($object->machine_name, $planet));
 
+                // Get maximum build amount of this building
+                $max_build_amount = $objects->getObjectMaxBuildAmount($object->machine_name, $planet, $requirements_met);
+
                 $view_model = new UnitViewModel();
                 $view_model->object = $object;
                 $view_model->count = $count;
                 $view_model->amount = $amount;
                 $view_model->requirements_met = $requirements_met;
                 $view_model->enough_resources = $enough_resources;
+                $view_model->max_build_amount = $max_build_amount;
                 $view_model->currently_building = (!empty($build_active) && $build_active->object->machine_name == $object->machine_name);
                 $view_model->currently_building_amount = (!empty($build_active) && $build_active->object->machine_name == $object->machine_name) ? $build_active->object_amount_remaining : 0;
 

diff --git a/app/Services/ObjectService.php b/app/Services/ObjectService.php
@@ -373,6 +373,11 @@ public function getObjectMaxBuildAmount(string $machine_name, PlanetService $pla
             return 0;
         }
 
+        // Objects only be able to be built once
+        if ($machine_name === 'small_shield_dome' || $machine_name === 'large_shield_dome') {
+            return $planet->getObjectAmount($machine_name) ? 0 : 1;
+        }
+
         $price = $this->getObjectPrice($machine_name, $planet);
 
         // Calculate max build amount based on price

diff --git a/app/ViewModels/UnitViewModel.php b/app/ViewModels/UnitViewModel.php
@@ -11,6 +11,7 @@ class UnitViewModel
     public int $amount;
     public bool $requirements_met;
     public bool $enough_resources;
+    public int $max_build_amount;
     public bool $currently_building;
     public int $currently_building_amount;
 }
diff --git a/resources/views/ingame/ajax/object.blade.php b/resources/views/ingame/ajax/object.blade.php
@@ -163,7 +163,7 @@
 
             </div>
 
-            @if ($object_type == \OGame\GameObjects\Models\Enums\GameObjectType::Ship || $object_type == \OGame\GameObjects\Models\Enums\GameObjectType::Defense)
+            @if ($max_build_amount && ($object_type == \OGame\GameObjects\Models\Enums\GameObjectType::Ship || $object_type == \OGame\GameObjects\Models\Enums\GameObjectType::Defense))
                 <div class="build_amount">
                     <label for="build_amount">Number:</label>
                     <input type="text" name="build_amount" id="build_amount" min="0" max="{{ $max_build_amount }}" onfocus="clearInput(this);" onkeyup="checkIntInput(this, 1, {{ $max_build_amount }});event.stopPropagation();">
@@ -181,7 +181,7 @@
             <div class="build-it_wrap">
                 <div class="ipiHintable" data-ipi-hint="ipiTechnologyUpgradedeuteriumSynthesizer">
                     <button class="upgrade"
-                            @if (!$enough_resources || !$requirements_met || $build_queue_max)
+                            @if (!$enough_resources || !$requirements_met || $build_queue_max || !$max_build_amount)
                                 disabled
                             @else
                             @endif

diff --git a/resources/views/ingame/shipyard/unit-item.blade.php b/resources/views/ingame/shipyard/unit-item.blade.php
@@ -20,6 +20,9 @@
     @elseif (!$building->enough_resources)
         data-status="disabled"
     title="{{ $building->object->title }}<br/>@lang('Not enough resources!')"
+    @elseif (!$building->max_build_amount)
+        data-status="disabled"
+    title="{{ $building->object->title }}<br/>@lang('Maximum number reached!')"
     @else
         data-status="on"
     title="{{ $building->object->title }}"

diff --git a/tests/Unit/ObjectServiceTest.php b/tests/Unit/ObjectServiceTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Tests\Unit;
+
+use OGame\Services\ObjectService;
+use Tests\UnitTestCase;
+
+class ObjectServiceTest extends UnitTestCase
+{
+    public function testGetObjectMaxBuildAmount(): void
+    {
+        $objectService = new ObjectService();
+        $this->createAndSetPlanetModel([]);
+
+        // Test with requirement not met
+        $maxBuildAmount = $objectService->getObjectMaxBuildAmount('plasma_turret', $this->planetService, false);
+        $this->assertEquals(0, $maxBuildAmount);
+
+        // Test with object limited to one instance
+        $maxBuildAmount = $objectService->getObjectMaxBuildAmount('small_shield_dome', $this->planetService, true);
+        $this->assertEquals(1, $maxBuildAmount);
+
+        $this->createAndSetPlanetModel([
+            'small_shield_dome' => 1,
+        ]);
+
+        // Test with object limited to one instance which already exists
+        $maxBuildAmount = $objectService->getObjectMaxBuildAmount('small_shield_dome', $this->planetService, true);
+        $this->assertEquals(0, $maxBuildAmount);
+
+        $this->createAndSetPlanetModel([
+            'metal' => 24000,
+            'crystal' => 6000
+        ]);
+
+        // Test it calculates max amount correctly
+        $maxBuildAmount = $objectService->getObjectMaxBuildAmount('anti_ballistic_missile', $this->planetService, true);
+        $this->assertEquals(3, $maxBuildAmount);
+    }
+}