From d4a646e105fe7ea39add9bd6a530bb2876cf38e3 Mon Sep 17 00:00:00 2001
From: Tobias Berger <tobi.berger13@gmail.com>
Date: Thu, 30 Sep 2021 22:05:32 +0200
Subject: [PATCH] Some love for homeactions (icons)

---
 public/img/homeActions/catchFish.png | Bin 0 -> 1864 bytes
 public/img/homeActions/getShark.png  | Bin 0 -> 786 bytes
 src/components/Tabs/Home.svelte      |  47 +++++++++++++++++++++++----
 src/components/Wrapper.svelte        |  25 ++++++++++----
 src/shark/Settings.ts                |   9 ++++-
 src/shark/SharkGame.ts               |   5 +++
 src/shark/data/HomeActions.ts        |   7 ++--
 7 files changed, 77 insertions(+), 16 deletions(-)
 create mode 100644 public/img/homeActions/catchFish.png
 create mode 100644 public/img/homeActions/getShark.png

diff --git a/public/img/homeActions/catchFish.png b/public/img/homeActions/catchFish.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd8f8b0b01f303cbf687f16bad01f87120a5a917
GIT binary patch
literal 1864
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
CTZNJU

literal 0
HcmV?d00001

diff --git a/public/img/homeActions/getShark.png b/public/img/homeActions/getShark.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd9068e490eee1e0a53418b55839b06d52f77c91
GIT binary patch
literal 786
zcmV+t1MU2YP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00009a7bBm000XT
z000XT0n*)m`~Uy~#7RU!RA_<inJ<hQK@`S6HWl@CS9OPLG02LhNy(<JB<Q=GsHrN~
zP+f7N>Y4!RY*Sql^cE6Qfy96$=WwT5QN>mbH!N>v-uwfS?q~KAX5PHtzV~L{>;a|r
zr~YJ-o5noaha)cPPZoK-R%MT`MD)c;zwZBTz5UsIi4U)y8~se;xn!>*#Le|B3j#PI
z5DLOZM*%{m695c*SM1b3c(Kb60$?=AtnC~{M1ThfS2=?e)4|7v3?ZUnlU9HuNNflf
zIY-1d6^b@|AOHstIU1bS!DIvQhX4*(>^?gbC9Cb%r#7f<Hl&=+5uGD)x|y23P|*N9
z4n*NZv)#=bt&}}4Ml=9R5S0_un{BkxXiigdDt1mvn8t)mD<ER8Ws`2yykXC7UhwU=
z(MnkmuAnMeM?_T*^;*@tCS<t&WRY_(Re&Xk3?UX3TWpBJ9u2Y`yIiqBitR{oA=`-P
zirp3hV19hy9CD!`fQM8CfR|4mhrhG$146brn=jdosS!jNq9DX#TyY_yU3Fb@wkVZz
zs+*uZo)Z;g{;4`%-$;D={2st|4K&+ba;-)yHGbdHMnv@{WQcJ#MZH$tJc}}=Nq@4)
z#X7^@RfUSsXpku(g`!@pbPzY!w_BI1X1kjUXH`HtX$MnjMWxg@n*snjAI~wHFM~9M
zGKd@v6`&G?`Wh}E*6THrB-uR2*%YtS7n`STVRK}H(VpzH`I2lwk|e>KXHRkd?h7tD
zmqsUi0Jt`cEee%N0zxSN{l^%M*wUt!>bLJ-zX1R)I+s@M2EcDQY(*M19YCTse*VZ%
zF}S7bX1V{s;fgdQ3QKkQ;iL~WSJm>%_FU^p3vvj#f><4htGgAs@afr^%i243e0DeX
z#cFl8!pZ5$*23cNZu{+y1FEQo*orB!QcH%2<%qA8PI20TQl(0jD)ry%ACj$|AAFj;
QmjD0&07*qoM6N<$g35GYJ^%m!

literal 0
HcmV?d00001

diff --git a/src/components/Tabs/Home.svelte b/src/components/Tabs/Home.svelte
index 2cafdee..c451fd0 100644
--- a/src/components/Tabs/Home.svelte
+++ b/src/components/Tabs/Home.svelte
@@ -1,11 +1,14 @@
 <script lang="ts">
   import { createEventDispatcher } from "svelte";
 
-  import type { HomeAction } from "../../shark/data/HomeActions";
-  import { HomeActions } from "../../shark/data/HomeActions";
-  import { Resources } from "../../shark/data/Resources";
+  import type { HomeAction, HomeActions } from "../../shark/data/HomeActions";
   import type { AddMessageEvent } from "../../shark/Message";
 
+  import { Resources } from "../../shark/data/Resources";
+
+  export let homeActions: ReturnType<typeof HomeActions["getActionTable"]>;
+  export let showIcons: boolean;
+
   const dispatch = createEventDispatcher<{ addMessage: AddMessageEvent }>();
 
   function homeActionClick(homeAction: HomeAction) {
@@ -28,10 +31,21 @@
 </script>
 
 <div>
-  {#each Object.entries(HomeActions.getActionTable()) as [homeActionId, homeAction]}
-    <button on:click={() => homeActionClick(homeAction)} id={homeActionId}>
-      {homeAction.name}
-    </button>
+  {#each Object.entries(homeActions) as [homeActionId, homeAction]}
+    {#each Array(50).fill(homeAction) as homeActionClone}
+      <button class:no-icons={!showIcons} on:click={() => homeActionClick(homeActionClone)} id={homeActionId}>
+        {#if showIcons}
+          <img
+            width="50"
+            height="50"
+            class="homeaction-icon"
+            alt="A decorative icon representing the home action"
+            src={"img/homeActions/" + homeAction.image}
+          />
+        {/if}
+        {homeAction.name}
+      </button>
+    {/each}
   {/each}
 </div>
 
@@ -39,5 +53,24 @@
   div {
     display: flex;
     flex-direction: row;
+    flex-wrap: wrap;
+
+    > button {
+      display: flex;
+      flex-direction: column;
+
+      align-items: center;
+      justify-content: center;
+
+      font-size: 1em;
+      width: 8em;
+
+      &:not(.no-icons) {
+        height: 6em;
+      }
+      &.no-icons {
+        height: calc(6em - 50px);
+      }
+    }
   }
 </style>
diff --git a/src/components/Wrapper.svelte b/src/components/Wrapper.svelte
index 6df2dd4..fff5f33 100644
--- a/src/components/Wrapper.svelte
+++ b/src/components/Wrapper.svelte
@@ -20,8 +20,10 @@
   }
 
   let logLength: number;
+  let showIcons: boolean;
   game.Settings.settings.subscribe((settings) => {
     logLength = settings.layout.logLength.current;
+    showIcons = settings.appearance.showIcons.current;
   });
 </script>
 
@@ -50,12 +52,23 @@
       <TabSelector tabs={game.TabHandler.AllTabs} bind:selectedTab={game.TabHandler.currentTab} />
     </div>
     <div id="tab-content">
-      <svelte:component
-        this={game.TabHandler.currentTab}
-        on:addMessage={handleAddMessage}
-        on:openModal
-        on:closeModal
-      />
+      {#if game.TabHandler.currentTab === game.TabHandler.AllTabs.Home}
+        <svelte:component
+          this={game.TabHandler.AllTabs.Home}
+          on:addMessage={handleAddMessage}
+          {showIcons}
+          homeActions={game.Data.HomeActions.getActionTable()}
+        />
+      {:else if game.TabHandler.currentTab === game.TabHandler.AllTabs.Lab}
+        <svelte:component this={game.TabHandler.AllTabs.Lab} />
+      {:else}
+        <svelte:component
+          this={game.TabHandler.currentTab}
+          on:addMessage={handleAddMessage}
+          on:openModal
+          on:closeModal
+        />
+      {/if}
     </div>
   </div>
 </main>
diff --git a/src/shark/Settings.ts b/src/shark/Settings.ts
index 22f8b9d..f9be57d 100644
--- a/src/shark/Settings.ts
+++ b/src/shark/Settings.ts
@@ -28,7 +28,14 @@ export class Settings extends StaticClass {
         default: "marine" as const,
         name: "Currently enabled theme" as const,
         description: "Only applied if planet-dependent styles are enabled" as const,
-        options: ["abandoned", "chaotic", "frigid", "haven", "marine", "shrouded", "tempestuous", "violent"],
+        options: ["abandoned", "chaotic", "frigid", "haven", "marine", "shrouded", "tempestuous", "violent"] as const,
+      },
+      showIcons: {
+        current: true,
+        default: true as const,
+        name: "Show icons" as const,
+        description: "Whether to show decorative icons in various places" as const,
+        options: [true, false] as const,
       },
     },
   };
diff --git a/src/shark/SharkGame.ts b/src/shark/SharkGame.ts
index 3d3b49f..6a383d4 100644
--- a/src/shark/SharkGame.ts
+++ b/src/shark/SharkGame.ts
@@ -5,6 +5,8 @@ import { Settings } from "./Settings";
 import { StaticClass } from "./StaticClass";
 import { TabHandler } from "./TabHandler";
 
+import { HomeActions } from "./data/HomeActions";
+
 export class SharkGame extends StaticClass {
   static readonly #GAME_NAMES = [
     "Five Seconds A Shark",
@@ -61,6 +63,9 @@ export class SharkGame extends StaticClass {
   static readonly Resources = Resources;
   static readonly TabHandler = TabHandler;
   static readonly SaveHandler = SaveHandler;
+  static readonly Data = Object.seal({
+    HomeActions,
+  });
 
   static init(): void {
     Log.init();
diff --git a/src/shark/data/HomeActions.ts b/src/shark/data/HomeActions.ts
index 3de13ba..7670b85 100644
--- a/src/shark/data/HomeActions.ts
+++ b/src/shark/data/HomeActions.ts
@@ -7,6 +7,7 @@ export type HomeAction = {
   };
   outcomes: string[];
   multiOutcomes?: string[];
+  image?: string;
 };
 
 export class HomeActions extends StaticClass {
@@ -16,7 +17,8 @@ export class HomeActions extends StaticClass {
 
   static readonly actionTable = Object.seal({
     catchFish: {
-      name: "Catch fish",
+      image: "catchFish.png",
+      name: "Steal fish",
       effect: {
         resource: {
           fish: 1,
@@ -66,7 +68,8 @@ export class HomeActions extends StaticClass {
       ],
     },
     catchShark: {
-      name: "Catch shark",
+      image: "getShark.png",
+      name: "Kidnap shark",
       effect: {
         resource: {
           shark: 1,