From 4a13df97c123443748b3d90bbdc8f3a33de0b73f Mon Sep 17 00:00:00 2001 From: Leendert de Borst Date: Wed, 18 Dec 2024 00:15:31 +0100 Subject: [PATCH 1/3] Add missing nanite factory images --- .../objects/buildings/nanite_factory_micro.jpg | Bin 0 -> 1110 bytes .../objects/buildings/nanite_factory_small.jpg | Bin 0 -> 1628 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/img/objects/buildings/nanite_factory_micro.jpg create mode 100644 public/img/objects/buildings/nanite_factory_small.jpg diff --git a/public/img/objects/buildings/nanite_factory_micro.jpg b/public/img/objects/buildings/nanite_factory_micro.jpg new file mode 100644 index 0000000000000000000000000000000000000000..93434bfb0daa2296c5ad2b1461a38292602c0560 GIT binary patch literal 1110 zcmex=q5@28ex|4~8g&iu*$i&RTDkvnvz$Ppzrl`a& zZs@3N6xgV4?Bo`l(li;UN1Bm=iJ5^JVHg853ll3F10y?7QeO~gATui)D=S={kx7tQ zNRdU@&@oWSD6w(j2N9=<2QMlo6)yVt{}uxeGtf9eW^q?0qY zXSOe63<)#lZA_hWaCVf+-9KKee99ZzW&P)RdAWEj5OF!G*^@BiRLQU8Y2HdnuIdlO zw;T@&)XYkDZ8&r*ZH0-J#>JhvaSOU2Gkf=!?fj zl~$K+Z5%s7tGbuXoWto+U?AaCs^-@q@3-UC<@A}_Mn|6h&C*Rc=6QFa%S+AqGd4d` zOTP8VCQ(q)$y~m7oA|p1u1V`0(^@Ok8yU$)^ZD=i(hdyDGltFL2zFaLVTPPF`nbl!fxU)}Kw zAI6?4o4L7`@rPKJpViMVxtC28EoFbFOxDhrFq6@wbAsyvR#8rxVY3PhSr=v*{ANX0dZ^MFUmflS4- zo;>q2+B0SpM0QMj^Cc_w9h--#!pRex*X1sAS|i8xOj)Q&Tfo=t{IwS6j*CCq7Q3FA zu&Q&CXAs}42B#@nLLJ{rI3IW{oG)zPD$DJpBv>Il_jdhWwWEt`OO2y$g}N3kTUq_9 zcB5v{X9Lw&v%(iBGk>=5_q^vk&w0MjyE(Wy2FSS++z0>&0RXD_ z0GlHK9)Ll=A)YVVfvWhY?GC#Hd{n%^+&?vwVFoc3=0D=agXmFDYr~n`U1wr6n5aMc3m{>BE10WFa zNAn*B5CVn45omcpK^v)Kp{VPuWJw~UtX(q2Zq@HO|4kBmAs_+}YvyPGghIrhhQj~Z z1Bx3!wPErW&Lr}UMFkyNWip31Y+HQKtsN zS$^4AR%}2(1KTHloBGpKz~*I^jbpo7+yEo_Z5}dr+?U&8Y@N4Cv{E^5`@2Q*a`E8X zg7T5VrF>Ip6L#00FB45#F-izG)UqNS$!@gQ3`>J!6i(B&wpA# zk?Wdk)is36`9x0Y2sxbcVG{_j?;Nu#vK$W0!RcF?JjxSx>M^8~;g`<2&-HA$%sCL> zuotvzUeNdY*)%p4BUS#AP{&{|d5F@gY=t3g3g|6MFz~m!X<0FE1A_%WQF^ zyM8-MXj&^xpVvingMDto z@Cj;*`3+6AjI)uWjl~Cr9gQy9~UqrhZnK z;`wUecPA3-YvW2^_uUy^l8(T{KDR)oT}BB3*W=Cuj4O?a_nH`rh$TWxDjf95cyvGf z^Xe!;sv~$1lgd54Q5Hs9NjA4wwE(Ry=Y=cu zuHSVs=yFGe+J;vNk5F#$s*f+->*zgw=yVz`W=nYcaTq4+04?4`&g-E`a{Sd^jz5F= zHJrx%I<`N`kBaD7|5#_PbBZ)|!MtF%?J8!fj&#u@G}0F@Ju^{T#JSB5UKlFYp;I%3 z#I!B&5Dj#8=|+o#%}hF07k@$Cu9V+orVdUwimoX!>$T|SOWkr8t+7YuYewYRBNdKs zzS3v1^bgkP?!mf!$}XQBsP&#vNf6E$+c@0pH_qIl{k)IJff}VDb#B5Z<~8ls+p_gu zZKIg7(vMcLXLh?r`b^$xy?p&GP4U*`lF^w-n%=bv-eHSYP05EY>}xH+bV^9^-K}Q* zv34FC6+M1+vmyTGM?E8#uZ*lqP-Ey4@n$gtMZ={*jB-JWS5rqxT$#TE<|E)0xYj0f z=9m59wahEn-Xk`WJ$&W)Ak7P%l;|jrqEtVj2p5#%fMXA^Mq{hBSs? Date: Wed, 18 Dec 2024 00:17:40 +0100 Subject: [PATCH 2/3] Fix countdown variable name collission and add target level build indicator --- resources/views/ingame/facilities/index.blade.php | 1 + resources/views/ingame/research/research-item.blade.php | 3 ++- resources/views/ingame/resources/index.blade.php | 1 + .../views/ingame/shared/buildqueue/research-active.blade.php | 4 ++-- .../views/ingame/shared/buildqueue/unit-active.blade.php | 4 ++-- resources/views/ingame/shipyard/unit-item.blade.php | 4 ++-- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/resources/views/ingame/facilities/index.blade.php b/resources/views/ingame/facilities/index.blade.php index e7561af8..bbdb8abd 100644 --- 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" @endif @if ($building->currently_building) + {{ $building->current_level + 1 }}
@endif diff --git a/resources/views/ingame/research/research-item.blade.php b/resources/views/ingame/research/research-item.blade.php index 94630bbb..99ad0135 100644 --- a/resources/views/ingame/research/research-item.blade.php +++ b/resources/views/ingame/research/research-item.blade.php @@ -39,8 +39,9 @@ -25% ⌛ --> @if ($building->currently_building) + {{ $building->current_level + 1 }}
- + @endif {{ $building->current_level }} diff --git a/resources/views/ingame/resources/index.blade.php b/resources/views/ingame/resources/index.blade.php index 6785a78f..e727a9f8 100644 --- 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" @endif @if ($building->currently_building) + {{ $building->current_level + 1 }}
@endif diff --git a/resources/views/ingame/shared/buildqueue/research-active.blade.php b/resources/views/ingame/shared/buildqueue/research-active.blade.php index 4f499ab0..663e34b2 100644 --- a/resources/views/ingame/shared/buildqueue/research-active.blade.php +++ b/resources/views/ingame/shared/buildqueue/research-active.blade.php @@ -51,7 +51,7 @@ - + @@ -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 index b3cab70a..301f252b 100644 --- a/resources/views/ingame/shared/buildqueue/unit-active.blade.php +++ b/resources/views/ingame/shared/buildqueue/unit-active.blade.php @@ -31,7 +31,7 @@ - @@ -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) @else diff --git a/resources/views/ingame/shipyard/unit-item.blade.php b/resources/views/ingame/shipyard/unit-item.blade.php index aff1543e..564f2bc3 100644 --- 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) - + {{ $building->amount + $building->currently_building_amount }}
- + @endif {{ $building->amount }} From 73a3a2316f600ca00febc93117c59335d8e22d56 Mon Sep 17 00:00:00 2001 From: Leendert de Borst Date: Wed, 18 Dec 2024 00:17:57 +0100 Subject: [PATCH 3/3] Update CSS for build countdown to reflect current game --- public/css/ingame.css | 6 ------ public/mix-manifest.json | 2 +- resources/css/ingame/990d5d349ed6e981658ff4e2e3444c.css | 6 ------ resources/css/ingame/modules/fleets.css | 6 ------ 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/public/css/ingame.css b/public/css/ingame.css index 7f0770e6..405b26e4 100644 --- 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/mix-manifest.json b/public/mix-manifest.json index f3512b68..d2045a29 100644 --- 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 index 83d6bea7..18cc3a13 100644 --- 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 index d6a59709..32cd257a 100644 --- 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); }