From 6e93a51a8b80a4a9c0c1e9854e196155425493c0 Mon Sep 17 00:00:00 2001
From: Tobias Berger <tobi.berger13@gmail.com>
Date: Thu, 30 Sep 2021 22:22:57 +0200
Subject: [PATCH] Remove Log Reset message

---
 src/components/Log.svelte     | 12 +++++-------
 src/components/Wrapper.svelte |  6 +++---
 src/shark/Log.ts              |  3 +--
 src/shark/Message.ts          |  2 +-
 src/shark/SaveHandler.ts      |  2 +-
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/components/Log.svelte b/src/components/Log.svelte
index 448c86e..2ae3a06 100644
--- a/src/components/Log.svelte
+++ b/src/components/Log.svelte
@@ -6,7 +6,7 @@
   import type { Writable } from "svelte/store";
   import { slide } from "svelte/transition";
 
-  import type { AddMessageEvent, ResetMessagesEvent, Message } from "../shark/Message";
+  import type { AddMessageEvent, ResetLogEvent, Message } from "../shark/Message";
   import { MessageType } from "../shark/Message";
 
   export let messages: Writable<Message[]>;
@@ -14,15 +14,14 @@
 
   const dispatch = createEventDispatcher<{
     addMessage: AddMessageEvent;
-    resetLog: ResetMessagesEvent;
+    resetLog: ResetLogEvent;
   }>();
 
-  // Shorthand
   function addMessage(message: string, messageType?: MessageType) {
     dispatch("addMessage", { message, messageType });
   }
-  function resetMessages(notify = true) {
-    dispatch("resetLog", { notify });
+  function resetLog() {
+    dispatch("resetLog");
   }
 
   $: displayMessages = $messages.slice(-logLength).reverse();
@@ -44,8 +43,7 @@
       addMessage("error" + $messages.length, MessageType.error);
     }}>Add Error</button
   >
-  <button on:click={() => resetMessages()}>Clear log; notify</button>
-  <button on:click={() => resetMessages(false)}>Clear log; no-notify</button>
+  <button on:click={resetLog}>Clear log</button>
   <ol id="message-log">
     {#each displayMessages as message, i (message)}
       {#if i < logLength}
diff --git a/src/components/Wrapper.svelte b/src/components/Wrapper.svelte
index fff5f33..50b534e 100644
--- a/src/components/Wrapper.svelte
+++ b/src/components/Wrapper.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { AddMessageEvent, ResetMessagesEvent } from "../shark/Message";
+  import type { AddMessageEvent } from "../shark/Message";
   import type { SharkGame } from "../shark/SharkGame";
   import Log from "./Log.svelte";
   import ResourceTable from "./ResourceTable/ResourceTable.svelte";
@@ -15,8 +15,8 @@
   function handleAddMessage(event: CustomEvent<AddMessageEvent>) {
     game.Log.addMessage(event.detail.message, event.detail.messageType);
   }
-  function handleResetLog(event: CustomEvent<ResetMessagesEvent>) {
-    game.Log.reset(event.detail.notify);
+  function handleResetLog() {
+    game.Log.reset();
   }
 
   let logLength: number;
diff --git a/src/shark/Log.ts b/src/shark/Log.ts
index 8da5e9a..d91314f 100644
--- a/src/shark/Log.ts
+++ b/src/shark/Log.ts
@@ -20,9 +20,8 @@ export class Log extends StaticClass {
     );
   }
 
-  static reset(notify = true): void {
+  static reset(): void {
     Message.even = true;
     this.messages.set([]);
-    if (notify) this.addMessage("Log cleared");
   }
 }
diff --git a/src/shark/Message.ts b/src/shark/Message.ts
index 2679302..f634e20 100644
--- a/src/shark/Message.ts
+++ b/src/shark/Message.ts
@@ -1,5 +1,5 @@
 export type AddMessageEvent = { message: string; messageType?: MessageType };
-export type ResetMessagesEvent = { notify?: boolean };
+export type ResetLogEvent = { notify: false };
 
 export enum MessageType {
   message = "message",
diff --git a/src/shark/SaveHandler.ts b/src/shark/SaveHandler.ts
index 3148566..462eb4d 100644
--- a/src/shark/SaveHandler.ts
+++ b/src/shark/SaveHandler.ts
@@ -97,7 +97,7 @@ export class SaveHandler extends StaticClass {
       return settings;
     });
 
-    game.Log.reset(false);
+    game.Log.reset();
 
     fullSave.messages.forEach((message) => {
       game.Log.addMessage(message.message, message.type);