Merge pull request #502 from lanedirt/499-bug-when-shipyard-queue-is-…

…not-empty-the-building-queue-duration-is-overwritten Fix countdown time collision bug when more than one build queue is shown
lanedirt · Dec 17, 2024 · 1c52c1e · 1c52c1e
2 parents 9bc0299 + 73a3a23
commit 1c52c1e
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 26 deletions.
diff --git a/public/css/ingame.css b/public/css/ingame.css
@@ -1910,12 +1910,6 @@ button.ui-button::-moz-focus-inner {
     content: "";
 }
 
-.technology[data-status="active"] .icon::after {
-    top: auto;
-    bottom: 0;
-    background: rgba(0, 0, 0, .75);
-}
-
 .technology[data-status="disabled"] .icon::after {
     background: repeating-linear-gradient(-45deg, rgba(255, 150, 0, .33), rgba(255, 150, 0, .33) 2px, transparent 3px, transparent 7px);
 }

diff --git a/public/img/objects/buildings/nanite_factory_micro.jpg b/public/img/objects/buildings/nanite_factory_micro.jpg
diff --git a/public/img/objects/buildings/nanite_factory_small.jpg b/public/img/objects/buildings/nanite_factory_small.jpg
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/css/ingame.css": "/css/ingame.css?id=e7ef1b854da89d884b1472c61761ade4",
+    "/css/ingame.css": "/css/ingame.css?id=1ca088b7e1f8cf2b7d7213b8b07f12a0",
     "/css/outgame.css": "/css/outgame.css?id=0edfd34484fc3ec74eca0604a470461f",
     "/js/ingame.js": "/js/ingame.js?id=f7ca8c70d70904454426ad83cb49783f",
     "/js/ingame.min.js": "/js/ingame.min.js?id=f7ca8c70d70904454426ad83cb49783f",

diff --git a/resources/css/ingame/990d5d349ed6e981658ff4e2e3444c.css b/resources/css/ingame/990d5d349ed6e981658ff4e2e3444c.css
@@ -34277,12 +34277,6 @@ a#message_alert_box_default,
     content: "";
 }
 
-.technology[data-status="active"] .icon::after {
-    top: auto;
-    bottom: 0;
-    background: rgba(0, 0, 0, .75);
-}
-
 .technology[data-status="disabled"] .icon::after {
     background: repeating-linear-gradient(-45deg, rgba(255, 150, 0, .33), rgba(255, 150, 0, .33) 2px, transparent 3px, transparent 7px);
 }

diff --git a/resources/css/ingame/modules/fleets.css b/resources/css/ingame/modules/fleets.css
@@ -356,12 +356,6 @@
     content: "";
 }
 
-.technology[data-status="active"] .icon::after {
-    top: auto;
-    bottom: 0;
-    background: rgba(0, 0, 0, .75);
-}
-
 .technology[data-status="disabled"] .icon::after {
     background: repeating-linear-gradient(-45deg, rgba(255, 150, 0, .33), rgba(255, 150, 0, .33) 2px, transparent 3px, transparent 7px);
 }

diff --git a/resources/views/ingame/facilities/index.blade.php b/resources/views/ingame/facilities/index.blade.php
@@ -74,6 +74,7 @@ class="upgrade tooltip hideOthers js_hideTipOnMobile"
                                 </button>
                             @endif
                             @if ($building->currently_building)
+                                <span class="targetlevel" data-value="{{ $building->current_level + 1 }}" data-bonus="0">{{ $building->current_level + 1 }}</span>
                                 <div class="cooldownBackground"></div>
                                 <time-counter><time class="countdown buildingCountdown" id="countdownbuildingDetails" data-segments="2">...</time></time-counter>
                             @endif

diff --git a/resources/views/ingame/research/research-item.blade.php b/resources/views/ingame/research/research-item.blade.php
@@ -39,8 +39,9 @@
                                     -25% ⌛
                                 </span>-->
                             @if ($building->currently_building)
+                                <span class="targetlevel" data-value="{{ $building->current_level + 1 }}" data-bonus="0">{{ $building->current_level + 1 }}</span>
                                 <div class="cooldownBackground"></div>
-                                <time-counter><time class="countdown buildingCountdown" id="countdownbuildingDetails" data-segments="2">...</time></time-counter>
+                                <time-counter><time class="countdown researchCountdown" id="countdownbuildingDetails" data-segments="2">...</time></time-counter>
                             @endif
                             <span class="level" data-value="{{ $building->current_level }}" data-bonus="0">
                             <span class="stockAmount">{{ $building->current_level }}</span>

diff --git a/resources/views/ingame/resources/index.blade.php b/resources/views/ingame/resources/index.blade.php
@@ -73,6 +73,7 @@ class="upgrade tooltip hideOthers js_hideTipOnMobile"
                                 </button>
                             @endif
                             @if ($building->currently_building)
+                                <span class="targetlevel" data-value="{{ $building->current_level + 1 }}" data-bonus="0">{{ $building->current_level + 1 }}</span>
                                 <div class="cooldownBackground"></div>
                                 <time-counter><time class="countdown buildingCountdown" id="countdownbuildingDetails" data-segments="2">...</time></time-counter>
                             @endif

diff --git a/resources/views/ingame/shared/buildqueue/research-active.blade.php b/resources/views/ingame/shared/buildqueue/research-active.blade.php
@@ -51,7 +51,7 @@
         </tr>
         <tr class="data">
             <td class="desc timer">
-                <time class="countdown buildingCountdown" data-segments="2">{{ \OGame\Facades\AppUtil::formatTimeDuration($build_active->time_countdown) }}</time>
+                <time class="countdown researchCountdown" data-segments="2">{{ \OGame\Facades\AppUtil::formatTimeDuration($build_active->time_countdown) }}</time>
             </td>
         </tr>
         <tr class="data">
@@ -78,7 +78,7 @@
         var pricebuilding = 750;
         var referrerPage = $.deparam.querystring().page;
 
-        new CountdownTimer('buildingCountdown', {{ $build_active->time_countdown }},'{{ url()->current() }}',null,true,3)
+        new CountdownTimer('researchCountdown', {{ $build_active->time_countdown }},'{{ url()->current() }}',null,true,3)
 
         function cancelbuilding(id, listId, question) {
             errorBoxDecision('Caution', "" + question + "", 'yes', 'No', function() {

diff --git a/resources/views/ingame/shared/buildqueue/unit-active.blade.php b/resources/views/ingame/shared/buildqueue/unit-active.blade.php
@@ -31,7 +31,7 @@
         </tr>
         <tr class="data">
             <td class="desc timer">
-                <time class="countdown buildingCountdown"
+                <time class="countdown unitCountdown"
                       data-segments="2">{{ \OGame\Facades\AppUtil::formatTimeDuration($build_queue_countdown) }}</time>
             </td>
         </tr>
@@ -60,7 +60,7 @@
         var questionbuilding = 'Do\u0020you\u0020want\u0020to\u0020reduce\u0020the\u0020construction\u0020time\u0020of\u0020the\u0020current\u0020construction\u0020project\u0020by\u002050\u0025\u0020of\u0020the\u0020total\u0020construction\u0020time\u0020\u00287m\u002010s\u0029\u0020for\u0020\u003Cspan\u0020style\u003D\u0022font\u002Dweight\u003A\u0020bold\u003B\u0022\u003E750\u0020Dark\u0020Matter\u003C\/span\u003E\u003F';
         var pricebuilding = 750;
         var referrerPage = $.deparam.querystring().page;
-        new CountdownTimer('buildingCountdown', {{ $build_active->time_countdown }}, '{{ url()->current() }}', null, true, 3)
+        new CountdownTimer('unitCountdown', {{ $build_active->time_countdown }}, '{{ url()->current() }}', null, true, 3)
         new CountdownTimerUnit('shipyardCountdownUnit', {{ $build_active->time_countdown_object_next }}, {{ $build_active->object_amount_remaining }}, {{ $build_active->object->id }}, {{ $build_active->time_countdown_per_object }}, false, 3)
     </script>
 @else

diff --git a/resources/views/ingame/shipyard/unit-item.blade.php b/resources/views/ingame/shipyard/unit-item.blade.php
@@ -34,11 +34,11 @@
         sprite_small small
         @endif{{ $building->object->class_name }}">
         @if ($building->currently_building)
-            <span class="targetamount" data-value="54" data-bonus="0">
+            <span class="targetamount" data-value="{{ $building->amount + $building->currently_building_amount }}" data-bonus="0">
                 {{ $building->amount + $building->currently_building_amount }}
             </span>
             <div class="cooldownBackground"></div>
-            <time-counter><time class="countdown buildingCountdown" id="countdownbuildingDetails" data-segments="2">...</time></time-counter>
+            <time-counter><time class="countdown unitCountdown" id="countdownbuildingDetails" data-segments="2">...</time></time-counter>
         @endif
             <span class="amount" data-value="{{ $building->amount }}" data-bonus="0">
             <span class="stockAmount">{{ $building->amount }}</span>