From 04a37732d962caa0d5bc4dfb1e006115557c76e2 Mon Sep 17 00:00:00 2001
From: Adrian Gaudebert <adrian@gaudebert.fr>
Date: Mon, 4 Nov 2024 18:10:26 +0100
Subject: [PATCH] Show culture in the HUD and make philosophers produce it.

---
 public/img/icons/culture.png | Bin 0 -> 873 bytes
 src/hud/Resources.svelte     |   4 ++++
 src/types.ts                 |   5 +++++
 src/update.ts                |   8 +++++++-
 src/village.ts               |  10 ++--------
 5 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 public/img/icons/culture.png

diff --git a/public/img/icons/culture.png b/public/img/icons/culture.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ce1c4e845c5605037881b47ba0ceb4e39f8c69c
GIT binary patch
literal 873
zcmV-v1D5=WP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iKcu1+6+4JHWT;LSL`5963Pq?8YK2xEOfLO`CJjl7
zi=*ILaPVWX>fqw6tAnc`2!4P#J2)x2NQwVT3N2zhIPS;0dyl(!fWKa5su>&yRLwF{
ziMWu-t_q=7bR&p<1kfijQ=b#XBs|C0J$!t<i}5V)bAOH=C1*0gClJpv-LQx^h^IF#
zo%23%gcT))_?&pmpbHW|a$R=$jdQ_aKhKO9>C`-NgjguFvE0V2XsE<f#8E}nDBquP
zS>e3JSuIyt^Pc>L;heUz%ypW>NMI355FtQD6(y8mAx5i4iis5M$36T*j$b5~Os*0b
zITlcX3d!+<|H1EW&HUtqn-q=%9WS>1F#?2kfkw@?zmILZaRLOMfh(=$uhfB=Ptt2G
zEqVm>ZUYzBElu77E_Z;zCtWfmM+(sN=kvh(8GTb07`O$x*4*Bj`#607($rP*1~@nb
zMhld^?(y!<_TK(I)9mjD^UZQ}5vC)x00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru=nDi91PRV1A?^SG0cJ@=K~z}7?NmEU!%!GKZKJrj
zI0z|}E}c?ZN(ne+>*Oe%?NU1EAMp=l5kc(i?&5Z*LJ_INDN89tBoMF}JH*8=+(d2e
z&4WV88E+ovJCE-IB}(i&#=}Xl?Rm9m@|iuyP6kL)Ug!Yh;Uv&iP3T>v2-PEFfCu&r
zUDc2jfs!Zr$QYp6ZD6@r34d4JC3!9mP~Mj9glA-byHy8Rfew)J|8RAGgSXe0%C>*h
z^057I6TtO+xSo$EYX)7_V6tf<c`66^{cd&};d#4N$Nb|R{Q8O91xl9O`NBnV2LJ}#
zJ>DidP)lR`!R816;CenzPmV+K^NTZleXfPFmyV#*>;G9eUiosdiflt}YuM@agKOh5
zlDlO)k<2aIfyt%-Agn&qJrFOPXzQg1;MJ48zY6zLx-^h>AWlx!r%^9GKs@s-))OkC
zB?JJ9f{0}cm%0N)WCG#MmX%mYHIbJnvDf$p8Dh4NN+*q-00000NkvXXu0mjfS_6ZP

literal 0
HcmV?d00001

diff --git a/src/hud/Resources.svelte b/src/hud/Resources.svelte
index f7ebc9e..e8bee8b 100644
--- a/src/hud/Resources.svelte
+++ b/src/hud/Resources.svelte
@@ -28,6 +28,10 @@
         { Math.floor($village.resources.food) } / { capacity.food }
         ({ production.food >= 0 ? '+' : '' }{ production.food })
     </div>
+    <div>
+        <img src="/img/icons/culture.png" alt="Culture" />
+        { Math.floor($village.resources.culture) }
+    </div>
 </div>
 
 <style>
diff --git a/src/types.ts b/src/types.ts
index 259a6be..8330cef 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -15,6 +15,11 @@ export interface CostType {
 export type ProductionType = CostType;
 
 
+export interface ResourcesType extends CostType {
+    culture: number;
+}
+
+
 export interface BuildingSource {
     name: string;
     type: string;
diff --git a/src/update.ts b/src/update.ts
index 6b3a3cc..cf557ed 100644
--- a/src/update.ts
+++ b/src/update.ts
@@ -1,6 +1,6 @@
 import { produce } from 'immer';
 
-import { getBuilding, getProduction, getStorage } from './utils';
+import { getBuilding, getProduction, getStorage, getUnitSource } from './utils';
 import village, { type VillageState } from "./village";
 import type { ProductionType } from './types';
 
@@ -67,6 +67,12 @@ export default function update(timestamp: number) {
                 }
             });
 
+            // Make philosophers produce culture.
+            const philosopher = getUnitSource('philosopher');
+            const outputPerMinute = philosopher.behavior.culturePerMinute;
+            const outputPerMilisecond = outputPerMinute /  60.0 / 1000.0;
+            V.resources.culture += outputPerMilisecond * delta * V.units.philosopher;
+
             return V;
         });
     });
diff --git a/src/village.ts b/src/village.ts
index 6cdb983..dc46c50 100644
--- a/src/village.ts
+++ b/src/village.ts
@@ -2,7 +2,7 @@ import { writable } from "svelte/store";
 
 import { createBuilding } from "./create";
 import { getTilesAtDistance, Hex } from "./hexgrid";
-import type { BuildingType } from "./types";
+import type { BuildingType, ResourcesType } from "./types";
 import { getKeysAsNumbers, shuffle } from "./utils";
 
 
@@ -24,13 +24,7 @@ export interface VillageState {
     units: {
         [key: string]: number;
     },
-    resources: {
-        wood: number;
-        stone: number;
-        iron: number;
-        food: number;
-        culture: number;
-    };
+    resources: ResourcesType;
     villageTiles: Board;
     outsideTiles: Board;
     queue: QueuedBuilding[];