From 23ed38f8c531883ad845a69dca1a03e48bcb475d Mon Sep 17 00:00:00 2001
From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com>
Date: Tue, 30 Jul 2024 13:49:11 -0400
Subject: [PATCH] More changes

Removed two settings that aren't necessary (settings are bugged, and I don't know how to fix it ;-;)

Re-added logging the wave seed
---
 src/logger.ts                   |  6 +++++-
 src/phases.ts                   |  1 +
 src/system/settings/settings.ts | 37 +--------------------------------
 src/ui/battle-info.ts           |  2 +-
 4 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/src/logger.ts b/src/logger.ts
index 88ef18d08f0..ed21a40e3b2 100644
--- a/src/logger.ts
+++ b/src/logger.ts
@@ -433,7 +433,9 @@ export interface DRPD {
    */
   waves: Wave[],
   /** The Pokemon that the player started with. Daily runs will have 3. @see PokeData */
-  starters?: PokeData[]
+  starters?: PokeData[],
+  /** The RNG seed of the run. */
+  seed?: string
 }
 /**
  * Imports a string as a DRPD.
@@ -479,6 +481,7 @@ export function printDRPD(inData: string, indent: string, drpd: DRPD): string {
   inData += indent + "{"
   inData += "\n" + indent + "  \"version\": \"" + drpd.version + "\""
   inData += ",\n" + indent + "  \"title\": \"" + drpd.title + "\""
+  inData += ",\n" + indent + "  \"seed\": \"" + drpd.seed + "\""
   inData += ",\n" + indent + "  \"authors\": [\"" + drpd.authors.join("\", \"") + "\"]"
   inData += ",\n" + indent + "  \"date\": \"" + drpd.date + "\""
   inData += ",\n" + indent + "  \"label\": \"" + drpd.label + "\""
@@ -1668,6 +1671,7 @@ export function logPokemon(scene: BattleScene, floor: integer = undefined, slot:
   //wv.actions = []
   wv.clearActionsFlag = false;
   wv.shop = ""
+  drpd.seed = scene.seed
   console.log("--> ", drpd)
   localStorage.setItem(getLogID(scene), JSON.stringify(drpd))
 }
diff --git a/src/phases.ts b/src/phases.ts
index ec4e8ebe796..a0f9e7d213b 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -593,6 +593,7 @@ export class TitlePhase extends Phase {
     var lastsave = this.getLastSave(); // Gets the last save you played
     var ls1 = this.getLastSave(false, true)
     var ls2 = this.getLastSavesOfEach()
+    this.scene.quickloadDisplayMode = "Both"
     switch (true) {
       case (this.scene.quickloadDisplayMode == "Daily" && this.getLastSave(false, true) != undefined):
         options.push({
diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts
index ac1029d037e..98e7c3bba38 100644
--- a/src/system/settings/settings.ts
+++ b/src/system/settings/settings.ts
@@ -177,19 +177,6 @@ export const Setting: Array<Setting> = [
     default: 0,
     type: SettingType.GENERAL,
   },
-  {
-    key: SettingKeys.LazyReloads,
-    label: "Lazy Reloads",
-    options: [{
-      label: "Off",
-      value: "Off"
-    }, {
-      label: "On",
-      value: "On"
-    }],
-    default: 0,
-    type: SettingType.GENERAL,
-  },
   {
     key: SettingKeys.FancyBiome,
     label: "Fancy Title Screen",
@@ -203,28 +190,6 @@ export const Setting: Array<Setting> = [
     default: 0,
     type: SettingType.GENERAL,
   },
-  {
-    key: SettingKeys.TitleScreenContinueMode,
-    label: "Quick Load",
-    options: [{
-      label: "Off",
-      value: "Off" // Shows "Continue" button on the home screen
-    }, {
-      label: "Daily",
-      value: "Daily" // Shows the last played Daily Run, or the last run if there are no Daily Runs
-    }, {
-      label: "Dailies",
-      value: "Dailies" // Shows all Daily Runs, or the last run if there are no Daily Runs
-    }, {
-      label: "Latest",
-      value: "Latest" // Shows the last run
-    }, {
-      label: "Both",
-      value: "Both" // Shows the last run and the last Daily Run, or only the last played game if it is a Daily Run
-    }],
-    default: 1,
-    type: SettingType.GENERAL,
-  },
   {
     key: SettingKeys.DailyShinyLuck,
     label: "Daily Shiny Luck",
@@ -388,7 +353,7 @@ export const Setting: Array<Setting> = [
   {
     key: SettingKeys.Window_Type,
     label: i18next.t("settings:windowType"),
-    options: new Array(5).fill(null).map((_, i) => {
+    options: new Array(6).fill(null).map((_, i) => {
       const windowType = (i + 1).toString();
       return {
         value: windowType,
diff --git a/src/ui/battle-info.ts b/src/ui/battle-info.ts
index 30bc1d2d7a2..989f702b2b7 100644
--- a/src/ui/battle-info.ts
+++ b/src/ui/battle-info.ts
@@ -1009,7 +1009,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
       ease: "Sine.easeInOut",
       alpha: visible && this.iconsActive ? 0 : (this.lastStatus == 0 ? 0 : 1)
     });
-    console.log(this.iconsActive, this.lastStatus, this.statusIndicator.visible, this.statusIndicator.alpha)
+    //console.log(this.iconsActive, this.lastStatus, this.statusIndicator.visible, this.statusIndicator.alpha)
   }
 
   /**