From 3f61f82f241e1fdd6560ccb936dc855fd76c8a3b Mon Sep 17 00:00:00 2001
From: CaitSith2 <d_good@caitsith2.com>
Date: Fri, 18 Sep 2020 09:16:23 -0700
Subject: [PATCH] Update Player Settings Generator with additions.

---
 WebHostLib/static/static/playerSettings.json | 58 ++++++++++++++++++++
 WebHostLib/static/static/playerSettings.yaml |  9 +++
 2 files changed, 67 insertions(+)

diff --git a/WebHostLib/static/static/playerSettings.json b/WebHostLib/static/static/playerSettings.json
index 7b353034..2ef5f5f2 100644
--- a/WebHostLib/static/static/playerSettings.json
+++ b/WebHostLib/static/static/playerSettings.json
@@ -681,6 +681,12 @@
       "description": "Alters the usefulness of various items in the game.",
       "inputType": "range",
       "subOptions": {
+        "easy": {
+          "keyString": "item_functionality.easy",
+          "friendlyName": "Easy",
+          "description": "Increases helpfulness of items. Medallions are usable everywhere, even without a sword. Hammer can be used in place of master sword to beat ganon and collect the tablets.",
+          "defaultValue": 0
+        },
         "normal": {
           "keyString": "item_functionality.normal",
           "friendlyName": "Normal",
@@ -1088,6 +1094,58 @@
           "defaultValue": 0
         }
       }
+    },
+    "intensity": {
+      "keyString": "intensity",
+      "friendlyName": "Door Shuffle Intensity Level",
+      "description": "Specifies what types of doors will be shuffled.",
+      "inputType": "range",
+      "subOptions": {
+        "1": {
+          "keyString": "intensity.1",
+          "friendlyName": "Level 1",
+          "description": "Doors and Spiral cases will be shuffled amongst themselves.",
+          "defaultValue": 50
+        },
+        "2": {
+          "keyString": "intensity.2",
+          "friendlyName": "Level 2",
+          "description": "Doors, Open Edges, and Straight stair cases shuffled amongst each other. Spiral cases will be shuffled amongst themselves.",
+          "defaultValue": 0
+        },
+        "3": {
+          "keyString": "intensity.3",
+          "friendlyName": "Level 3",
+          "description": "(Coming soon) Everything in Level 2 plus lobby shuffling, using any non-dead-end super-tiles with a south facing door to become a dungeon entrance. (for example, EP Cannonball chest, TR Pipe Maze, Mire Hub, etc...)",
+          "defaultValue": 0
+        },
+        "random": {
+          "keyString": "intensity.random",
+          "friendlyName": "Random",
+          "description": "Randomly chooses an intensity level from 1-3.",
+          "defaultValue": 0
+        }
+      }
+    },
+    "experimental": {
+      "keyString": "experimental",
+      "friendlyName": "Door Shuffle Experimental Options",
+      "description": "Specifies whether to try out experimental things. What it does is subject to change.",
+      "inputType": "range",
+      "subOptions": {
+        "on": {
+          "keyString": "experimental.on",
+          "friendlyName": "On",
+          "description": "Enable experimental door features.",
+          "defaultValue": 0
+        },
+        "off": {
+          "keyString": "experimental.off",
+          "friendlyName": "Off",
+          "description": "Disable experimental door features.",
+          "defaultValue": 50
+        }
+      }
     }
   },
   "romOptions": {
diff --git a/WebHostLib/static/static/playerSettings.yaml b/WebHostLib/static/static/playerSettings.yaml
index ef3df05d..0f8176a8 100644
--- a/WebHostLib/static/static/playerSettings.yaml
+++ b/WebHostLib/static/static/playerSettings.yaml
@@ -141,6 +141,7 @@ item_pool:
   expert: 0 # Minimum upgrade availability (max: 8 hearts, green mail, master sword, fighter shield, no silvers unless swordless)
   crowd_control: 0 # Sets up the item pool for the crowd control extension. Do not use it without crowd control
 item_functionality:
+  easy: 0 # Allow Hammer to damage ganon, Allow Hammer tablet collection, Allow swordless medallion use everywhere.
   normal: 50 # Vanilla item functionality
   hard: 0 # Reduced helpfulness of items (potions less effective, can't catch faeries, cape uses double magic, byrna does not grant invulnerability, boomerangs do not stun, silvers disabled outside ganon)
   expert: 0 # Vastly reduces the helpfulness of items (potions barely effective, can't catch faeries, cape uses double magic, byrna does not grant invulnerability, boomerangs and hookshot do not stun, silvers disabled outside ganon)
@@ -217,6 +218,14 @@ door_shuffle: # Only available if the host uses the doors branch, it is ignored
   vanilla: 50 # Everything should be like in vanilla
   basic: 0 # Dungeons are shuffled within themselves
   crossed: 0 # Dungeons are shuffled across each other
+intensity: # Only available if the host uses the doors branch, it is ignored otherwise
+  1: 50 # Shuffles normal doors and spiral staircases
+  2: 0 # And shuffles open edges and straight staircases
+  3: 0 # (Coming soon) And shuffles dungeon lobbies
+  random: 0 # Picks one of those at random
+experimental: # Only available if the host uses the doors branch, it is ignored otherwise
+  on: 0 # Enables experimental features. Currently, this is just the dungeon keys in chest counter.
+  off: 50
 rom:
   sprite: # Enter the name of your preferred sprite and weight it appropriately
     random: 0