Randomizer version 1.11.0

.eslintrc

@@ -20,7 +20,6 @@
       "newlines-between": "always"
     }],
     "no-continue": "off",
-    "no-underscore-dangle": "off",
     "valid-jsdoc": ["error", {
       "requireReturn": false
     }],
@@ -82,20 +81,20 @@
               "type": "method"
             }],
             "public-properties": [{
-              "name": "/[^_].+/",
+              "name": "/[^#].+/",
               "type": "property"
             }],
             "public-static-methods": [{
-              "name": "/[^_].+/",
+              "name": "/[^#].+/",
               "static": true,
               "type": "method"
             }],
             "public-methods": [{
-              "name": "/[^_].+/",
+              "name": "/[^#].+/",
               "type": "method"
             }],
             "private": [{
-              "name": "/_.+/"
+              "name": "/#.+/"
             }]
           }
         }]

scripts/update-test-data.js

@@ -1,5 +1,7 @@
 import fs from 'fs';
 
+import _ from 'lodash';
+
 import Locations from '../src/services/locations';
 import LogicHelper from '../src/services/logic-helper';
 import LogicLoader from '../src/services/logic-loader';
@@ -31,8 +33,8 @@ const script = async () => {
     macrosFile,
   } = await LogicLoader.loadLogicFiles();
 
-  Locations.initialize(itemLocationsFile);
-  Macros.initialize(macrosFile);
+  Locations.initialize(_.cloneDeep(itemLocationsFile));
+  Macros.initialize(_.cloneDeep(macrosFile));
 
   LogicTweaks.applyTweaks();
 

scripts/verify-logic.js

@@ -7,14 +7,15 @@ import LogicCalculation from '../src/services/logic-calculation';
 import LogicHelper from '../src/services/logic-helper';
 import LogicLoader from '../src/services/logic-loader';
 import LogicTweaks from '../src/services/logic-tweaks';
+import Permalink from '../src/services/permalink';
 import TrackerController from '../src/services/tracker-controller';
 
 LogicLoader.loadLogicFiles = async () => ({
   itemLocationsFile: TEST_ITEM_LOCATIONS,
   macrosFile: TEST_MACROS,
 });
 
-LogicTweaks._applyHasAccessedLocationTweaksForLocations = () => { };
+LogicTweaks.applyHasAccessedLocationTweaksForLocations = () => { };
 
 const verifyLogicForItemCounts = (
   generalLocation,
@@ -31,14 +32,16 @@ const verifyLogicForItemCounts = (
   const simplifiedRequirements = LogicHelper.requirementsForLocation(
     generalLocation,
     detailedLocation,
+    false,
   );
-  const rawRequirements = LogicHelper._rawRequirementsForLocation(
+  const rawRequirements = LogicHelper.rawRequirementsForLocation(
     generalLocation,
     detailedLocation,
+    false,
   );
 
-  const simplifiedRequirementsMet = logic._areRequirementsMet(simplifiedRequirements);
-  const rawRequirementsMet = logic._areRequirementsMet(rawRequirements);
+  const simplifiedRequirementsMet = logic.areRequirementsMet(simplifiedRequirements);
+  const rawRequirementsMet = logic.areRequirementsMet(rawRequirements);
 
   if (simplifiedRequirementsMet !== rawRequirementsMet) {
     throw Error(
@@ -54,9 +57,10 @@ const verifyLogicForItemCounts = (
 
 const verifyLogicForLocation = (generalLocation, detailedLocation, trackerState) => {
   console.log(`\nChecking location "${generalLocation} - ${detailedLocation}":`); // eslint-disable-line no-console
-  const rawRequirements = LogicHelper._rawRequirementsForLocation(
+  const rawRequirements = LogicHelper.rawRequirementsForLocation(
     generalLocation,
     detailedLocation,
+    false,
   );
   const rawItemsRequired = new Set();
 
@@ -129,8 +133,8 @@ const verifyLogicForSettings = async (permalink) => {
 };
 
 const script = async () => {
-  await verifyLogicForSettings('MS4xMC4wAEEABwEDAAygvgMQ0AAAAAAAAAAAAAAA'); // no starting items
-  await verifyLogicForSettings('MS4xMC4wAEEABwEDAAygvgMA0AACAAAAAAGAIAAA'); // default settings
+  await verifyLogicForSettings('bWFzdGVyAEEASRBQGQAA+wLoAgAAAAAAAAAAAAI='); // no starting items
+  await verifyLogicForSettings(Permalink.DEFAULT_PERMALINK);
 };
 
 script();

src/css/main.scss

@@ -114,6 +114,10 @@ body {
         &.label-text {
           padding-left: 20px;
           padding-right: 10px;
+
+          &.label-disabled {
+            opacity: 0.7;
+          }
         }
 
         &.option-container {
@@ -136,6 +140,10 @@ body {
               height: 34px;
               font-size: 1em;
               cursor: pointer;
+
+              &.select-disabled {
+                cursor: auto;
+              }
             }
           }
 
@@ -514,6 +522,10 @@ button:hover:enabled {
         padding-top: 0;
         padding-bottom: 0;
       }
+
+      .extra-width-header {
+        width: 130px;
+      }
     }
 
     .zoom-map-background,
@@ -554,13 +566,22 @@ button:hover:enabled {
         text-decoration: line-through;
       }
 
-      &.font-small {
+      &.font-two-columns {
         font-size: 13px;
       }
 
-      &.font-smallest {
+      &.font-three-columns {
         font-size: 10px;
       }
+
+      &.less-padding {
+        padding-bottom: 2px;
+      }
+
+      &.detail-disabled span {
+        cursor: auto;
+        opacity: 0.7;
+      }
     }
   }
 }
@@ -609,13 +630,11 @@ button:hover:enabled {
 .extra-locations {
   float: left;
   background-color: rgba(160, 160, 160, 0.85);
-  width: 630px;
   height: 242px;
   margin-right: 8px;
   margin-bottom: 8px;
 
   .extra-location {
-    width: 120px;
     float: left;
     background-position-y: 15px;
     display: flex;
@@ -661,7 +680,6 @@ button:hover:enabled {
 
 .statistics {
   float: left;
-  width: 620px;
   background-color: rgba(80, 80, 80, 0.85);
   height: 85px;
   margin: 0 0 8px 0;
@@ -741,20 +759,27 @@ button:hover:enabled {
     margin-top: 5px;
     width: 250px;
   }
+}
 
-  .button-checkbox {
-    margin: 0 5px 0 0;
-    vertical-align: middle;
-    pointer-events: none;
-  }
+.detail-span .button-checkbox,
+.buttons .button-checkbox,
+.buttons .button-radio {
+  margin: 0 5px 0 0;
+  vertical-align: middle;
+  pointer-events: none;
+}
+
+.buttons .second-button-radio {
+  margin-left: 20px;
 }
 
-.color-picker-window {
+.settings-window {
   position: fixed;
   background-color: white;
   padding: 10px;
   width: 400px;
   user-select: none;
+  z-index: 10;
 
   .close-color-picker {
     position: fixed;
@@ -769,27 +794,27 @@ button:hover:enabled {
     z-index: 10;
   }
 
-  .color-picker-top-row {
+  .settings-window-top-row {
     display: flex;
   }
 
-  .color-picker-title {
+  .settings-window-title {
     font-size: 20px;
   }
 
-  .color-picker-row {
+  .settings-window-row {
     display: flex;
     height: 35px;
     align-items: center;
   }
 
-  .color-picker-label {
+  .settings-window-label {
     cursor: pointer;
     width: 360px;
     margin-left: 5px;
   }
 
-  .color-picker-checkbox {
+  .settings-window-checkbox {
     cursor: pointer;
   }
 

src/data/race-mode-banned-locations.json → src/data/additional-banned-locations.json

@@ -1,24 +1,24 @@
-{
-  "Forbidden Woods": [
-    {
-      "generalLocation": "Mailbox",
-      "detailedLocation": "Letter from Orca"
-    }
-  ],
-  "Forsaken Fortress": [
-    {
-      "generalLocation": "Mailbox",
-      "detailedLocation": "Letter from Aryll"
-    },
-    {
-      "generalLocation": "Mailbox",
-      "detailedLocation": "Letter from Tingle"
-    }
-  ],
-  "Earth Temple": [
-    {
-      "generalLocation": "Mailbox",
-      "detailedLocation": "Letter from Baito"
-    }
-  ]
-}
+{
+  "Forbidden Woods": [
+    {
+      "generalLocation": "Mailbox",
+      "detailedLocation": "Letter from Orca"
+    }
+  ],
+  "Forsaken Fortress": [
+    {
+      "generalLocation": "Mailbox",
+      "detailedLocation": "Letter from Aryll"
+    },
+    {
+      "generalLocation": "Mailbox",
+      "detailedLocation": "Letter from Tingle"
+    }
+  ],
+  "Earth Temple": [
+    {
+      "generalLocation": "Mailbox",
+      "detailedLocation": "Letter from Baito"
+    }
+  ]
+}