Merge pull request #73 from lanedirt/71-building-units-in-shipyarddef…

…ense-does-not-show-timer-countdown-for-unit Add active build pusher to unit shipyard/defense screens
lanedirt · Apr 15, 2024 · 0af8667 · 0af8667
2 parents acc6ddd + c77dc98
commit 0af8667
Show file tree

Hide file tree

Showing 34 changed files with 53 additions and 40,131 deletions.
diff --git a/app/Http/Controllers/Abstracts/AbstractUnitsController.php b/app/Http/Controllers/Abstracts/AbstractUnitsController.php
@@ -105,6 +105,7 @@ public function index(Request $request, PlayerService $player, ObjectService $ob
                 $view_model->requirements_met = $requirements_met;
                 $view_model->enough_resources = $enough_resources;
                 $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;
 
                 $units[$key_row][$object->id] = $view_model;
             }

diff --git a/app/ViewModels/UnitViewModel.php b/app/ViewModels/UnitViewModel.php
@@ -12,4 +12,5 @@ class UnitViewModel
     public bool $requirements_met;
     public bool $enough_resources;
     public bool $currently_building;
+    public int $currently_building_amount;
 }