From ba812bbc03c4b6e5940ae2941ac6fc33cb9c98c5 Mon Sep 17 00:00:00 2001
From: Adrian Gaudebert <adrian@gaudebert.fr>
Date: Tue, 5 Nov 2024 10:35:42 +0100
Subject: [PATCH] Display the time to recruit units in the University panel.

---
 package-lock.json              |  17 +++++++++++++++
 package.json                   |   2 ++
 public/img/icons/time.png      | Bin 0 -> 1512 bytes
 src/hud/Cost.svelte            |  12 +++++++++++
 src/hud/UniversityPanel.svelte |  38 ++++++++++++++++++---------------
 5 files changed, 52 insertions(+), 17 deletions(-)
 create mode 100644 public/img/icons/time.png

diff --git a/package-lock.json b/package-lock.json
index 4609fa7..cf907a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,9 @@
       "devDependencies": {
         "@sveltejs/vite-plugin-svelte": "^3.1.2",
         "@tsconfig/svelte": "^5.0.4",
+        "@types/luxon": "^3.4.2",
         "immer": "^10.1.1",
+        "luxon": "^3.5.0",
         "svelte": "^4.2.19",
         "svelte-check": "^4.0.4",
         "tslib": "^2.7.0",
@@ -706,6 +708,12 @@
       "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
       "dev": true
     },
+    "node_modules/@types/luxon": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz",
+      "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==",
+      "dev": true
+    },
     "node_modules/acorn": {
       "version": "8.13.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
@@ -912,6 +920,15 @@
       "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==",
       "dev": true
     },
+    "node_modules/luxon": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz",
+      "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/magic-string": {
       "version": "0.30.12",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz",
diff --git a/package.json b/package.json
index 67a12e3..f1cd9ce 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,9 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^3.1.2",
     "@tsconfig/svelte": "^5.0.4",
+    "@types/luxon": "^3.4.2",
     "immer": "^10.1.1",
+    "luxon": "^3.5.0",
     "svelte": "^4.2.19",
     "svelte-check": "^4.0.4",
     "tslib": "^2.7.0",
diff --git a/public/img/icons/time.png b/public/img/icons/time.png
new file mode 100644
index 0000000000000000000000000000000000000000..669413f9c5ccaa536066ec8ecf9ae11f6f4bdde8
GIT binary patch
literal 1512
zcmV<E1sD2>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkTnn^@KR9J<@mJ3XiR~UvdX34U|WHT|@Vz!a#rg9Mx?}<^DZ7wFb
z&CQ6kL_xgkU|u#ZV!3Hi)FDi{lv-%ZMGzMinc_Vvh){2o+mKdDK^a&q6_s9icfPK_
zsYL}DY)ziz^qlW|&wKv=Kj(Z-0G$3$Uih<r$pm|5GJ+VXj9f;AjYbAuL8Dz<mMwP!
z!~IPR_%bewS4_d-pxHR~%a=GA{x!}<e`Dp6a1l!P`n(hx<Kha#=38@ff1C}Gzb9;q
znA4Ym;fX#jD30`g<s<`z7LnxRQq|`ZILLD~9N@V@x@I~GHqW!J;#~Z4To-S}t(+KC
zA5TL483~%M=0kh!sFlXcIjAj4!JYhFsK^LIY4Qe~2>r^Mdt}pGWUii$-+bMW%yZTE
zX&}|l4Kkn4AoX*B)PEwRfs-L$GY#SuUO2RJDkMzo(8_7O-oMCyGSb<j7A^BYs-HU~
z%iJO6yCQw*c%=U@7HJDV25I-lz`-;Yn9h)|@Ie0hX*jWUE_<&FQIf#J_2d93WkIOP
z*^Fv=5Gp0>a5E*q`k2oN7T|Q~=QtKL19_`GA@_I3A-)UJcrHj~W=OkVyMP6b6bA7_
z5<&vid2wrtvjzMT=@#!Q$%c6vLKNWDMXRxg`nYk5r5wsl2n|#TgZW{k`9|9?EJE;B
zSVW{*sYkH62dzE8GlI3-sqa<P84yBoMhjH*pEO9TU)#_gmh2P}6_cGLmK8rT;y7o(
z)Pv^N8F=s%2Pv+-8#2lz4bmEr0p|SO@a>Vt3T?-BS`i6bdeHeg15eB->$ae-tVtJ6
zxuh{*1KMjcCnh3{-MzQ+uHF=5wwU!~Leqt~mrZ`J3p>mfi%!*~5>pQ4lE%L>K<#aU
z=mRlvdz1}r`c$*=S+}9Hy|U&(yMUXxruAV&gSslMtD{+`tuMbuv6Mr(gJOW7)d*sR
zjdhxP8Qq39%l#Wi*dZi)PFr;`?%p|fiDD?0%NsNU1bd%u;esfGvgU@gz3xJfy@5Y(
zo<7f3t*03KoIy2UGvT~FI<{3+TawRBu2!BuMSV2p7(eI+2)4Ckl7hk<jiNwJP@DQ*
z7CTf1vNMjJ%xb*-M=3#V>ibU&u*d8X87oxN*WY-nsGOiS_0ian8ekK|(1%v4ZWYjp
zr&0WVmmmXI8Xj!3eS|SXVt{@9@liW>)!)+UgwHIv)9@IArm}1UK?Yi$BB`>aBR*QV
zyOv@HWWfG1ayW<*t*7C`CyDGbYBQK{rmk7LliLNgEiJL!F-$QOOF4sLfDRQp*;M-O
zcy<pwvL3}xu-kqcs%lCKo*%``V4bcznsVOwD0Vc!T}F!L4guYQ++|dy$0kk15e;X6
z+JkZ#IhN&7p_>$m345CAt8QvdCSwm_c=XV$IGOyyF-%b3@r-@CvI~WOQJhjyqNZG?
zQ8A#hJUwtK!XpH@SdfgaP94l9BP?bkOivBHCg-?!RSM+=xiwbbe&3o)8fgJu{V&T|
zRm=*@i4d=vj^v-dMbW;sxR|;birh$4ort%hz9{N7IrVYl6iYdjOB$p_noRrkWjXy)
z{M;T>Rh+ZT6^B<&Lf*Qm$lEv*xf^FezHSDx*3W`Cz!Q!&q1fL8(p6r_4D^JIk;MvH
z*>ZPe@+LsCcq~N!RK=Zr8Xz$_Gmys&6t4He*^oK7vcntYiG17^uSRuNFluwR^s0)>
z_w!H^_Z==p&c~UbXQOE26dVnlh-}|+$oT#fh`c}QyDX>QuS+Im4pmuB+I<>ezjtPh
zd2iBUulM=EUpU8yEf|w6@c#7F&PC%CdlrvZG1LcqT^~EX0_vkNilJD_p<L1+Ez%_I
z{umg>7|wW`F@iCYF^cg4V>IJKhBIS~1J1Uw(YDx8w%idmEz%t3Xy9){^p#xa=9DA=
O0000<MNUMnLSTZ7yv}0)

literal 0
HcmV?d00001

diff --git a/src/hud/Cost.svelte b/src/hud/Cost.svelte
index 9748cb5..1df4200 100644
--- a/src/hud/Cost.svelte
+++ b/src/hud/Cost.svelte
@@ -1,7 +1,13 @@
 <script lang="ts">
+    import { Duration } from 'luxon';
+
     import type { CostType } from "../types";
 
     export let cost: CostType;
+    export let duration: number | null = null;
+
+
+    $: prettyDuration = (duration !== null) ? Duration.fromMillis(duration * 1000).toFormat(`mm:ss:SS`) : '';
 </script>
 
 <div class="cost">
@@ -21,6 +27,12 @@
         <img src="/img/icons/food.png" alt="Food" />
         { cost.food }
     </div>
+    { #if duration !== null }
+    <div>
+        <img src="/img/icons/time.png" alt="Duration">
+        { prettyDuration }
+    </div>
+    { /if }
 </div>
 
 <style>
diff --git a/src/hud/UniversityPanel.svelte b/src/hud/UniversityPanel.svelte
index 1d00585..fdebe7d 100644
--- a/src/hud/UniversityPanel.svelte
+++ b/src/hud/UniversityPanel.svelte
@@ -22,7 +22,7 @@
         iron: unit.cost.iron * numberOfUnits,
         food: unit.cost.food * numberOfUnits,
     };
-
+    $: timeToRecruit = building.behavior.units?.recruitmentTime($village, building) * numberOfUnits;
 
     function recruit() {
         moves.recruitUnits(building.id, unitType, numberOfUnits);
@@ -46,23 +46,27 @@
 
 <div class="university">
     <p>Create Philosophers</p>
-    <div class="cost"><Cost { cost } /></div>
+    <div class="cost">
+        <Cost { cost } duration={ timeToRecruit } />
+    </div>
 
-    <input
-        type="range"
-        name="units"
-        min="1"
-        max={ maximumUnits }
-        bind:value={ numberOfUnits }
-    />
-    <input
-        type="number"
-        name="units"
-        min="1"
-        max={ maximumUnits }
-        bind:value={ numberOfUnits }
-    />
-    <button on:click={ recruit } disabled={ numberOfUnits > maximumUnits }>Recruit</button>
+    <div>
+        <input
+            type="range"
+            name="units"
+            min="1"
+            max={ maximumUnits }
+            bind:value={ numberOfUnits }
+        />
+        <input
+            type="number"
+            name="units"
+            min="1"
+            max={ maximumUnits }
+            bind:value={ numberOfUnits }
+        />
+        <button on:click={ recruit } disabled={ numberOfUnits > maximumUnits }>Recruit</button>
+    </div>
 </div>
 
 <style>