From 149a6b47f947cb6385020ef6e9d28fc81e442ad9 Mon Sep 17 00:00:00 2001
From: Adrian Gaudebert <adrian@gaudebert.fr>
Date: Thu, 7 Nov 2024 11:18:49 +0100
Subject: [PATCH] Add a worldmap showing some oasis regions.

---
 public/img/icons/world.svg   |  1 +
 src/board/OasisRegion.svelte | 25 +++++++++++++++++++++++++
 src/board/Worldmap.svelte    | 27 +++++++++++++++++++++++++++
 src/data/worldmap.ts         | 22 ++++++++++++++++++++++
 src/hud/Game.svelte          |  3 +++
 src/hud/Navigation.svelte    |  7 +++++++
 src/types.ts                 | 27 ++++++++++++++++++++++++++-
 src/village.ts               | 16 +++++++++++++++-
 8 files changed, 126 insertions(+), 2 deletions(-)
 create mode 100644 public/img/icons/world.svg
 create mode 100644 src/board/OasisRegion.svelte
 create mode 100644 src/board/Worldmap.svelte
 create mode 100644 src/data/worldmap.ts

diff --git a/public/img/icons/world.svg b/public/img/icons/world.svg
new file mode 100644
index 0000000..dc13813
--- /dev/null
+++ b/public/img/icons/world.svg
@@ -0,0 +1 @@
+<svg style="height: 512px; width: 512px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><g class="" style="" transform="translate(0,0)"><path d="M253.47 17.406C123.76 17.406 18.437 122.76 18.437 252.47c0 129.707 105.324 235.06 235.03 235.06 129.707 0 235.063-105.353 235.063-235.06 0-129.71-105.355-235.064-235.06-235.064zM367.874 68.75c61.246 38.19 101.97 106.14 101.97 183.72 0 17.143-1.993 33.823-5.75 49.81l-34.25-18.06 22 54.874c-9.454 21.647-22.362 41.432-38 58.687l-43.158-30.936-64.625 47.72-61.656 6.967-13.906-41.78-49.72 26.844-68.093-18.938 9.157 36.594c-28.41-21.793-51.23-50.466-66-83.563L81.25 304.47l32.25 17.124 59.22-9.875 2.843-40.908-37.344-1.718 4.905-17.844 30.78-25.313-25.093-15.625 67.22-38.593-45.345-29.657-66.625 40.187-49.437-15.28c13.812-32.14 35.21-60.22 61.906-82.064l-3.75 44.375 43.376-34.124 72 22.22-22.5-27.407L233 75.562l26.813 28.468 71 9.845-3.5-34.47 41.468 12.657-.905-23.312zm1.156 120.03L278 199.47l28.906 43.218 3.156 64.468L339.25 321l11.438-28.375 62.656 48.656L395.78 294l6.408-48.344-43.75-22.72 10.593-34.155zM221 192.438l-31.594 21.188 36.47 14.78 16.686-14.78L221 192.437zm22.188 144.688l18.687 52.594 19.78-42.564-38.467-10.03z" fill="#ffffff" fill-opacity="1"></path></g></svg>
\ No newline at end of file
diff --git a/src/board/OasisRegion.svelte b/src/board/OasisRegion.svelte
new file mode 100644
index 0000000..5c65b6f
--- /dev/null
+++ b/src/board/OasisRegion.svelte
@@ -0,0 +1,25 @@
+<script lang="ts">
+    import type { OasisType } from "../types";
+
+    export let region: OasisType;
+</script>
+
+<div>
+    <h2>
+        <img src="/img/icons/{ region.resource }.png" alt="{ region.resource }">
+        Oasis
+        (→ { region.distance })
+    </h2>
+    <div>
+        <button>Pillage</button>
+        <button>Conquer</button>
+    </div>
+</div>
+
+<style>
+    h2 {
+        align-items: center;
+        display: flex;
+        gap: 0.4em;
+    }
+</style>
diff --git a/src/board/Worldmap.svelte b/src/board/Worldmap.svelte
new file mode 100644
index 0000000..0c8d33d
--- /dev/null
+++ b/src/board/Worldmap.svelte
@@ -0,0 +1,27 @@
+<script lang="ts">
+    import village from "../village";
+    import OasisRegion from "./OasisRegion.svelte";
+
+</script>
+
+<section class="worldmap">
+    { #each $village.worldmap as region }
+    <div class="region">
+        { #if region.type === 'oasis' }
+        <OasisRegion { region } />
+        { /if }
+    </div>
+    { /each }
+</section>
+
+<style>
+    .worldmap {
+        display: flex;
+        justify-content: space-between;
+    }
+
+    .region {
+        border: 1px solid white;
+        padding: 1em;
+    }
+</style>
diff --git a/src/data/worldmap.ts b/src/data/worldmap.ts
new file mode 100644
index 0000000..e030041
--- /dev/null
+++ b/src/data/worldmap.ts
@@ -0,0 +1,22 @@
+export default [
+    {
+        type: 'oasis',
+        resource: 'food',
+        distance: 1,
+    },
+    {
+        type: 'oasis',
+        resource: 'wood',
+        distance: 1,
+    },
+    {
+        type: 'oasis',
+        resource: 'stone',
+        distance: 1,
+    },
+    {
+        type: 'oasis',
+        resource: 'iron',
+        distance: 1,
+    },
+];
diff --git a/src/hud/Game.svelte b/src/hud/Game.svelte
index bd9f493..f2ec241 100644
--- a/src/hud/Game.svelte
+++ b/src/hud/Game.svelte
@@ -3,6 +3,7 @@
 
     import Outside from "../board/Outside.svelte";
     import Village from "../board/Village.svelte";
+    import Worldmap from "../board/Worldmap.svelte";
     import gameTab from "../stores/gameTab";
     import type { GameTab } from "../types";
     import update from "../update";
@@ -44,6 +45,8 @@
         <Village />
         { :else if $gameTab === 'resources' }
         <Outside />
+        { :else if $gameTab === 'world' }
+        <Worldmap />
         { /if }
     </div>
 </section>
diff --git a/src/hud/Navigation.svelte b/src/hud/Navigation.svelte
index e33bf9d..3082720 100644
--- a/src/hud/Navigation.svelte
+++ b/src/hud/Navigation.svelte
@@ -19,6 +19,13 @@
         <img src="/img/icons/field.svg" alt="">
         <span>Resources</span>
     </button>
+    <button
+        class="invisible"
+        on:click={ () => setTab('world') }
+    >
+        <img src="/img/icons/world.svg" alt="">
+        <span>Worldmap</span>
+    </button>
 </nav>
 
 <style>
diff --git a/src/types.ts b/src/types.ts
index 30da5f4..00356e0 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,7 +1,7 @@
 import type { Hex } from "./hexgrid";
 
 
-export type GameTab = 'village' | 'resources';
+export type GameTab = 'village' | 'resources' | 'world';
 
 
 export interface CostType {
@@ -62,3 +62,28 @@ export interface UnitType {
         culturePerMinute?: number;
     }
 }
+
+
+interface BaseRegionType {
+    distance: number;
+    state: {
+        mission?: {
+            type: string;
+        };
+    };
+}
+
+
+export interface OasisType extends BaseRegionType {
+    type: 'oasis';
+    resource: keyof CostType;
+}
+
+
+export interface BourgadeType extends BaseRegionType {
+    type: 'bourgade';
+    distance: number;
+}
+
+
+export type RegionType = OasisType | BourgadeType;
diff --git a/src/village.ts b/src/village.ts
index 269eb2d..3664d9d 100644
--- a/src/village.ts
+++ b/src/village.ts
@@ -1,8 +1,9 @@
 import { writable } from "svelte/store";
 
 import { createBuilding } from "./create";
+import worldmap from "./data/worldmap";
 import { getTilesAtDistance, Hex } from "./hexgrid";
-import type { BuildingType, ResourcesType } from "./types";
+import type { BuildingType, RegionType, ResourcesType } from "./types";
 import { getKeysAsNumbers, shuffle } from "./utils";
 
 
@@ -21,6 +22,7 @@ export interface VillageState {
     resources: ResourcesType;
     villageTiles: Board;
     outsideTiles: Board;
+    worldmap: RegionType[];
     victory: boolean;
 }
 
@@ -63,6 +65,17 @@ function getInitialOutsideBoard() {
 }
 
 
+function getInitialWorldmap(): RegionType[] {
+    return worldmap.map(r => {
+        const region = r as RegionType;
+        return {
+            ...region,
+            state: {},
+        };
+    });
+}
+
+
 function getInitialState() {
     const state: VillageState = {
         buildings: [],
@@ -76,6 +89,7 @@ function getInitialState() {
         },
         villageTiles: getInitialVillageBoard(),
         outsideTiles: getInitialOutsideBoard(),
+        worldmap: getInitialWorldmap(),
         victory: false,
     };