From ca873958ec8968d5cf5a4afb3eb612d5e2ac08b6 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@legendserver.info>
Date: Thu, 29 Oct 2020 21:02:48 -0400
Subject: [PATCH] Fix duplicate and outright wrong data in playerSettings page.

---
 WebHostLib/static/static/playerSettings.json | 30 ++++++++++----------
 WebHostLib/static/static/playerSettings.yaml | 10 -------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/WebHostLib/static/static/playerSettings.json b/WebHostLib/static/static/playerSettings.json
index a84f381d..08b162e1 100644
--- a/WebHostLib/static/static/playerSettings.json
+++ b/WebHostLib/static/static/playerSettings.json
@@ -1572,26 +1572,26 @@
     },
 	"hud_palettes": {
       "keyString": "rom.hud_palettes",
-      "friendlyName": "Underworld Palettes",
-      "description": "Randomize the colors of the underworld (caves, dungeons, etc.), within reason.",
+      "friendlyName": "HUD Palettes",
+      "description": "Randomize the colors of the HUD (user interface), within reason.",
       "inputType": "range",
       "subOptions": {
         "default": {
           "keyString": "rom.hud_palettes.default",
           "friendlyName": "Vanilla",
-          "description": "Overworld colors will remain unchanged.",
+          "description": "HUD colors will remain unchanged.",
           "defaultValue": 50
         },
         "random": {
           "keyString": "rom.hud_palettes.random",
           "friendlyName": "Random",
-          "description": "Shuffles the colors of the overworld palette.",
+          "description": "Shuffles the colors of the HUD palette.",
           "defaultValue": 0
         },
         "blackout": {
           "keyString": "rom.hud_palettes.blackout",
           "friendlyName": "Blackout",
-          "description": "Never use this. Makes all overworld palette colors black.",
+          "description": "Never use this. Makes all HUD palette colors black.",
           "defaultValue": 0
         },
 		"grayscale": {
@@ -1634,26 +1634,26 @@
     },
 	"shield_palettes": {
       "keyString": "rom.shield_palettes",
-      "friendlyName": "Underworld Palettes",
-      "description": "Randomize the colors of the underworld (caves, dungeons, etc.), within reason.",
+      "friendlyName": "Shield Palettes",
+      "description": "Randomize the colors of the shield, within reason.",
       "inputType": "range",
       "subOptions": {
         "default": {
           "keyString": "rom.shield_palettes.default",
           "friendlyName": "Vanilla",
-          "description": "Overworld colors will remain unchanged.",
+          "description": "Shield colors will remain unchanged.",
           "defaultValue": 50
         },
         "random": {
           "keyString": "rom.shield_palettes.random",
           "friendlyName": "Random",
-          "description": "Shuffles the colors of the overworld palette.",
+          "description": "Shuffles the colors of the shield palette.",
           "defaultValue": 0
         },
         "blackout": {
           "keyString": "rom.shield_palettes.blackout",
           "friendlyName": "Blackout",
-          "description": "Never use this. Makes all overworld palette colors black.",
+          "description": "Never use this. Makes all shield palette colors black.",
           "defaultValue": 0
         },
 		"grayscale": {
@@ -1696,26 +1696,26 @@
     },
 	"sword_palettes": {
       "keyString": "rom.sword_palettes",
-      "friendlyName": "Underworld Palettes",
-      "description": "Randomize the colors of the underworld (caves, dungeons, etc.), within reason.",
+      "friendlyName": "Sword Palettes",
+      "description": "Randomize the colors of the sword, within reason.",
       "inputType": "range",
       "subOptions": {
         "default": {
           "keyString": "rom.sword_palettes.default",
           "friendlyName": "Vanilla",
-          "description": "Overworld colors will remain unchanged.",
+          "description": "Sword colors will remain unchanged.",
           "defaultValue": 50
         },
         "random": {
           "keyString": "rom.sword_palettes.random",
           "friendlyName": "Random",
-          "description": "Shuffles the colors of the overworld palette.",
+          "description": "Shuffles the colors of the sword palette.",
           "defaultValue": 0
         },
         "blackout": {
           "keyString": "rom.sword_palettes.blackout",
           "friendlyName": "Blackout",
-          "description": "Never use this. Makes all overworld palette colors black.",
+          "description": "Never use this. Makes all sword palette colors black.",
           "defaultValue": 0
         },
 		"grayscale": {
diff --git a/WebHostLib/static/static/playerSettings.yaml b/WebHostLib/static/static/playerSettings.yaml
index ddd21714..8b828a15 100644
--- a/WebHostLib/static/static/playerSettings.yaml
+++ b/WebHostLib/static/static/playerSettings.yaml
@@ -391,13 +391,3 @@ rom:
     dizzy: 0
     sick: 0
     puke: 0
-  uw_palettes: # Change the colors of shields
-    default: 50 # No changes
-    random: 0 # Shuffle the colors
-    blackout: 0 # Never use this
-    grayscale: 0
-    negative: 0
-    classic: 0
-    dizzy: 0
-    sick: 0
-    puke: 0
\ No newline at end of file