From dc235ac95506753764756551e1b3cd6a23d12c23 Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Sun, 26 Jul 2020 08:37:01 -0600
Subject: [PATCH 01/19] Figured out how to generate required items based on
 arrays from logic.

---
 app/components/map/DarkList.vue             |  2 +
 app/components/map/LightList.vue            |  2 +
 app/retro/RetroStaticMapLW.ts               |  4 +-
 app/standard/StandardRegionHelper.ts        | 16 ++++-
 app/standard/StandardStaticMapLW.ts         |  7 +-
 app/tests/utils/RequiredItemsHelper.spec.js |  8 +++
 app/utils/RequiredItemsHelper.ts            | 80 +++++++++++++++++++++
 7 files changed, 111 insertions(+), 8 deletions(-)
 create mode 100644 app/tests/utils/RequiredItemsHelper.spec.js
 create mode 100644 app/utils/RequiredItemsHelper.ts

diff --git a/app/components/map/DarkList.vue b/app/components/map/DarkList.vue
index 73d91a5..11a15a6 100644
--- a/app/components/map/DarkList.vue
+++ b/app/components/map/DarkList.vue
@@ -27,8 +27,10 @@
                 <Label class="list-title" :text="mapHandler.staticLocations[key].title"/>
               </StackLayout>
               <StackLayout orientation="horizontal" style="padding-right:4;padding-top:6;">
+                <!--
                 <Image v-for="img in mapHandler.staticLocations[key].req" v-bind:key="img"
                        height="16" :src="'~/img/'+img+'.png'"/>
+                       -->
               </StackLayout>
             </StackLayout>
             <StackLayout row="0" col="1" orientation="vertical">
diff --git a/app/components/map/LightList.vue b/app/components/map/LightList.vue
index bdf71d1..adf5779 100644
--- a/app/components/map/LightList.vue
+++ b/app/components/map/LightList.vue
@@ -55,8 +55,10 @@
                 <Label class="title" :text="shopHandler.staticLocations[key].title"/>
               </StackLayout>
               <StackLayout orientation="horizontal" style="padding-right:4;padding-top:6;">
+                <!--
                 <Image v-for="img in shopHandler.staticLocations[key].req" v-bind:key="img"
                        height="15" :src="'~/img/'+img+'.png'"/>
+                       -->
               </StackLayout>
             </StackLayout>
             <StackLayout row="0" col="1" orientation="vertical">
diff --git a/app/retro/RetroStaticMapLW.ts b/app/retro/RetroStaticMapLW.ts
index 38c5549..74bcf1c 100644
--- a/app/retro/RetroStaticMapLW.ts
+++ b/app/retro/RetroStaticMapLW.ts
@@ -70,9 +70,7 @@ export class RetroStaticMapLW extends StandardStaticMapLW{
       return rb === 2 && g;
     }};
   kingTomb = {x: 902, y: 444, title:'King\'s Tomb', itemCount: 1,
-    req:['items/boots1', 'items/glove2', 'or', 'items/boots1', 'items/mirror1', 'items/moonpearl1',
-      'lp', 'dungeons/aga_boss0', 'items/hookshot1', 'items/flippers1', 'rp', 'or',
-      'lp', 'items/glove1', 'items/hammer1', 'rp'],
+    req:[],
     validate(items, dungeons){
       return items.boots
                 && (items.glove === 2
diff --git a/app/standard/StandardRegionHelper.ts b/app/standard/StandardRegionHelper.ts
index 64d80a7..628161a 100644
--- a/app/standard/StandardRegionHelper.ts
+++ b/app/standard/StandardRegionHelper.ts
@@ -26,15 +26,27 @@ export class StandardRegionHelper {
             (items.glove === 2 && items.moonpearl &&
             (items.hammer || items.flippers));
   }
+  static reqNorthEastDW = [
+    ['dungeons/aga_boss1'],
+    ['items/hammer1', 'items/glove1', 'items/moonpearl1'],
+    ['items/glove2', 'items/moonpearl1', 'items/hammer1'],
+    ['items/glove2', 'items/moonpearl1', 'items/flippers1']
+  ];
   static northWestDW(items, dungeons) {
     return items.moonpearl
             && (this.northEastDW(items, dungeons)
-                && ((items.hookshot
-                    && (items.glove > 0 || items.hammer)
+                  && ((items.hookshot && (items.glove > 0 || items.hammer)
                     || items.flippers))
                 || (items.hammer && items.glove > 0)
                 || items.glove === 2);
   }
+  static reqNorthWestDW = [
+    ['items/moonpearl1', StandardRegionHelper.reqNorthEastDW, 'items/hookshot1', 'items/hammer1'],
+    ['items/moonpearl1', StandardRegionHelper.reqNorthEastDW, 'items/hookshot1', 'items/glove1'],
+    ['items/moonpearl1', StandardRegionHelper.reqNorthEastDW, 'items/flippers1'],
+    ['items/moonpearl1', 'items/hammer1', 'items/glove1'],
+    ['items/moonpearl1', 'items/glove2']
+  ];
   static southDW(items, dungeons) {
     return (items.moonpearl && (this.northEastDW(items, dungeons)
             && (items.hammer || items.flippers)))
diff --git a/app/standard/StandardStaticMapLW.ts b/app/standard/StandardStaticMapLW.ts
index ecdd7fe..6828619 100644
--- a/app/standard/StandardStaticMapLW.ts
+++ b/app/standard/StandardStaticMapLW.ts
@@ -69,9 +69,10 @@ export class StandardStaticMapLW {
       return rb === 2 && g;
     }};
   kingTomb = {x: 902, y: 444, title:'King\'s Tomb', itemCount: 1,
-    req:['items/boots1', 'items/glove2', 'or', 'items/boots1', 'items/mirror1', 'items/moonpearl1',
-      'lp', 'dungeons/aga_boss0', 'items/hookshot1', 'items/flippers1', 'rp', 'or',
-      'lp', 'items/glove1', 'items/hammer1', 'rp'],
+    req:[
+      ['items/boots1', 'items/glove2'],
+      ['items/boots1', 'items/moonpearl1', StandardRegionHelper.reqNorthWestDW]
+    ],
     validate(items, dungeons){
       return items.boots
                 && (items.glove === 2
diff --git a/app/tests/utils/RequiredItemsHelper.spec.js b/app/tests/utils/RequiredItemsHelper.spec.js
new file mode 100644
index 0000000..f61b021
--- /dev/null
+++ b/app/tests/utils/RequiredItemsHelper.spec.js
@@ -0,0 +1,8 @@
+import {RequiredItemsHelper} from '~/utils/RequiredItemsHelper';
+
+describe('RequiredItemsHelper', () => {
+  fit('should get an array', () => {
+    const rih = new RequiredItemsHelper();
+    rih.getTestArray();
+  });
+});
diff --git a/app/utils/RequiredItemsHelper.ts b/app/utils/RequiredItemsHelper.ts
new file mode 100644
index 0000000..660a79c
--- /dev/null
+++ b/app/utils/RequiredItemsHelper.ts
@@ -0,0 +1,80 @@
+import {StandardStaticMapLW} from '@/standard/StandardStaticMapLW';
+
+export class RequiredItemsHelper {
+
+  getTestArray() {
+    const kt = new StandardStaticMapLW();
+    let parsed = this.parseRequired(kt.kingTomb.req);
+    parsed = this.cleanRequired(parsed);
+
+    for(const p of parsed) {
+      console.log('fin:', p);
+    }
+  }
+  onlyUnique(value, index, self) {
+    return self.indexOf(value) === index;
+  }
+
+  parseRequired(arr) {
+    let retval = [];
+    for(const item of arr) {
+      if(item.every(i => (typeof i === 'string'))) {
+        retval.push(item);
+      } else {
+        retval = retval.concat(this.parseItem(item, []));
+      }
+    }
+    return retval;
+  }
+  parseItem(arr, parentArr) :any {
+    let retval = [];
+    const stringArr = [];
+    const arrArr = [];
+    for(const a of arr) {
+      if(typeof a === 'string') {
+        stringArr.push(a);
+      } else {
+        arrArr.push(a);
+      }
+    }
+    if(arrArr.length) {
+      for(const a of arrArr){
+        let newArr = Array.from(parentArr);
+        newArr = newArr.concat(stringArr);
+        retval = retval.concat(this.parseItem(a, newArr));
+
+      }
+    } else {
+      const lastArr = parentArr.concat(stringArr).filter(this.onlyUnique);
+      retval.push(lastArr);
+    }
+    return retval;
+  }
+  cleanRequired(arr) {
+    arr.sort((a, b)=> {
+      let r = 0;
+      a.length > b.length ? r = -1 : a.length < b.length ? r = 1 :  r = 0;
+      return r;
+    });
+    const checkRule = (a, t) => a.every(v => t.includes(v));
+    let i = arr.length;
+    while(i--){
+      if(arr[i]){
+        const rule = arr[i];
+        const copy = Array.from(arr);
+        for(let n=copy.length-1; n>-1; n--) {
+          if(copy[n] && checkRule(rule, copy[n])) {
+            copy.splice(n, 1);
+          }
+        }
+        copy.push(rule);
+        arr = copy;
+      }
+    }
+    return arr.sort((a, b)=> {
+      let r = 0;
+      a.length < b.length ? r = -1 : a.length > b.length ? r = 1 :  r = 0;
+      return r;
+    });
+  }
+}

From 5f2ee4752f7316624d671a4fd4d2c13946c8a6cb Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Sun, 26 Jul 2020 11:20:40 -0600
Subject: [PATCH 02/19] Req item changes

---
 app/retro/RetroStaticMapDW.ts               |  2 +-
 app/retro/RetroStaticMapLW.ts               |  2 +-
 app/standard/StandardRegionHelper.ts        | 46 ++++++++--
 app/standard/StandardStaticMapDW.ts         | 68 ++++++--------
 app/standard/StandardStaticMapLW.ts         | 98 +++++++++------------
 app/tests/utils/RequiredItemsHelper.spec.js | 45 +++++++++-
 app/utils/RequiredItemsHelper.ts            | 15 ++--
 7 files changed, 158 insertions(+), 118 deletions(-)

diff --git a/app/retro/RetroStaticMapDW.ts b/app/retro/RetroStaticMapDW.ts
index 031b24f..f0932b6 100644
--- a/app/retro/RetroStaticMapDW.ts
+++ b/app/retro/RetroStaticMapDW.ts
@@ -1,7 +1,7 @@
 import {RetroRegionHelper} from '@/retro/RetroRegionHelper';
 import {StandardStaticMapDW} from '@/standard/StandardStaticMapDW';
 
-export class RetroStaticMapDW extends StandardStaticMapDW{
+export class RetroStaticMapDW {
   superbunnyCave = {x: 1265, y: 223, title: 'Superbunny Cave', itemCount: 2,
     req:['items/moonpearl1', 'items/glove2',
       'lp', 'items/hookshot1', 'or', 'items/hammer1', 'items/mirror1', 'rp',
diff --git a/app/retro/RetroStaticMapLW.ts b/app/retro/RetroStaticMapLW.ts
index 74bcf1c..7f248a4 100644
--- a/app/retro/RetroStaticMapLW.ts
+++ b/app/retro/RetroStaticMapLW.ts
@@ -1,7 +1,7 @@
 import {RetroRegionHelper} from '@/retro/RetroRegionHelper';
 import {StandardStaticMapLW} from '@/standard/StandardStaticMapLW';
 
-export class RetroStaticMapLW extends StandardStaticMapLW{
+export class RetroStaticMapLW {
   uncle  = {x:894, y:624, title:'Uncle', itemCount: 1, req:[], validate(items, dungeons) {
     return true;
   }};
diff --git a/app/standard/StandardRegionHelper.ts b/app/standard/StandardRegionHelper.ts
index 628161a..5a68877 100644
--- a/app/standard/StandardRegionHelper.ts
+++ b/app/standard/StandardRegionHelper.ts
@@ -9,17 +9,36 @@ export class StandardRegionHelper {
   static southLW(items, dungeons) {
     return true;
   }
+  static deathMtnWestLW(items, dungeons) {
+    return items.flute || (items.glove > 0 && items.lantern);
+  }
+  static reqDeathMtnWestLW = [
+    ['items/flute1'],
+    ['items/glove1', 'items/lantern1']
+  ];
+  static toh(items, dungeons) {
+    return (items.mirror || (items.hookshot && items.hammer))
+      && this.deathMtnWestLW(items, dungeons);
+  }
+  static reqToh = [
+    ['items/mirror1', StandardRegionHelper.reqDeathMtnWestLW],
+    ['items/hammer1', StandardRegionHelper.reqDeathMtnWestLW],
+  ];
   static deathMtnEastLW(items, dungeons) {
     return (items.hookshot && this.deathMtnWestLW(items, dungeons))
             || (items.hammer && this.toh(items, dungeons));
   }
-  static deathMtnWestLW(items, dungeons) {
-    return items.flute || (items.glove > 0 && items.lantern);
-  }
+  static reqDeathMtnEastLW = [
+    ['items/hookshot1', StandardRegionHelper.reqDeathMtnWestLW],
+    ['items/hammer1', StandardRegionHelper.reqToh]
+  ];
   // dark world
   static mireDW(items, dungeons) {
     return items.glove === 2 && items.flute;
   }
+  static reqMireDW = [
+    ['items/glove2', 'items/flute1']
+  ];
   static northEastDW(items, dungeons) {
     return dungeons.aga.boss ||
             (items.hammer && items.glove > 0 && items.moonpearl) ||
@@ -48,10 +67,16 @@ export class StandardRegionHelper {
     ['items/moonpearl1', 'items/glove2']
   ];
   static southDW(items, dungeons) {
-    return (items.moonpearl && (this.northEastDW(items, dungeons)
-            && (items.hammer || items.flippers)))
+    return (items.moonpearl
+              && (this.northEastDW(items, dungeons)
+                && (items.hammer || items.flippers)))
             || this.northWestDW(items, dungeons);
   }
+  static reqSouthDW = [
+    ['items/moonpearl1', StandardRegionHelper.reqNorthEastDW, 'items/hammer1'],
+    ['items/moonpearl1', StandardRegionHelper.reqNorthEastDW, 'items/flippers1'],
+    [StandardRegionHelper.reqNorthWestDW]
+  ];
   static deathMtnEastDW(items, dungeons) {
     return items.glove === 2 && this.deathMtnEastLW(items, dungeons);
   }
@@ -62,10 +87,10 @@ export class StandardRegionHelper {
   static dp(items, dungeons) {
     return items.book || (items.mirror && this.mireDW(items, dungeons));
   }
-  static toh(items, dungeons) {
-    return (items.mirror || (items.hookshot && items.hammer))
-            && this.deathMtnWestLW(items, dungeons);
-  }
+  static reqDp = [
+    ['items/book1'],
+    ['items/mirror1', StandardRegionHelper.reqMireDW]
+  ];
   static mm(items, dungeons) {
     const m = (dungeons.mm.medallion === 1 && items.bombos) ||
             (dungeons.mm.medallion === 2 && items.ether) ||
@@ -78,6 +103,9 @@ export class StandardRegionHelper {
             (dungeons.tr.medallion === 3 && items.quake);
     return m && items.moonpearl && items.redcane && items.hammer && items.glove === 2 && this.deathMtnEastLW(items, dungeons);
   }
+  static reqTr = [
+    ['dungeons/medallion0', 'items/moonpearl1', 'items/redcane1', 'items/hammer1', 'items/glove2', StandardRegionHelper.reqDeathMtnEastLW]
+  ];
   static gt(items, dungeons, settings) {
     let c = 0;
     const keys = Object.keys(dungeons);
diff --git a/app/standard/StandardStaticMapDW.ts b/app/standard/StandardStaticMapDW.ts
index 5cb0022..73009fc 100644
--- a/app/standard/StandardStaticMapDW.ts
+++ b/app/standard/StandardStaticMapDW.ts
@@ -2,44 +2,45 @@ import {StandardRegionHelper} from '@/standard/StandardRegionHelper';
 
 export class StandardStaticMapDW {
   superbunnyCave = {x: 1265, y: 223, title: 'Superbunny Cave', itemCount: 2,
-    req:['items/moonpearl1', 'items/glove2',
-      'lp', 'items/hookshot1', 'or', 'items/hammer1', 'items/mirror1', 'rp',
-      'and', 'lp', 'items/flute1', 'or', 'items/lantern1', 'rp'],
+    req:[['items/moonpearl1', StandardRegionHelper.reqDeathMtnEastLW]],
     validate(items, dungeons){
       return items.moonpearl && StandardRegionHelper.deathMtnEastDW(items, dungeons);
     }};
   hookshotCave = {x: 1247, y: 99, title: 'Hookshot Cave', itemCount: 4,
-    req:['items/hookshot1', 'items/moonpearl1', 'items/glove2',
-      'and', 'lp', 'items/flute1', 'or', 'items/lantern1', 'rp'],
+    req:[
+      ['items/hookshot1', 'items/moonpearl1', StandardRegionHelper.reqDeathMtnEastLW],
+      ['items/boots1', 'items/moonpearl1', StandardRegionHelper.reqDeathMtnEastLW],
+    ],
     validate(items, dungeons){
       return (items.hookshot || items.boots) && items.moonpearl && StandardRegionHelper.deathMtnEastDW(items, dungeons);
     }};
   spikeCave = {x: 862, y: 221, title: 'Spike Cave', itemCount: 1,
-    req:['items/hammer1', 'items/moonpearl1', 'items/glove2',
-      'lp', 'items/hookshot1', 'or', 'items/mirror1', 'rp',
-      'and', 'lp', 'items/flute1', 'or', 'items/lantern1', 'rp'],
+    req:[
+      ['items/jar1', 'items/hammer1', 'items/glove1', 'items/moonpearl1', 'items/cape1', StandardRegionHelper.reqDeathMtnWestLW],
+      ['items/jar1', 'items/hammer1', 'items/glove1', 'items/moonpearl1', 'items/bluecane1', StandardRegionHelper.reqDeathMtnWestLW],
+      ['items/halfmagic1', 'items/hammer1', 'items/glove1', 'items/moonpearl1', 'items/cape1', StandardRegionHelper.reqDeathMtnWestLW],
+      ['items/halfmagic1', 'items/hammer1', 'items/glove1', 'items/moonpearl1', 'items/bluecane1', StandardRegionHelper.reqDeathMtnWestLW],
+    ],
     validate(items, dungeons){
       return (items.jar > 0 || items.halfmagic) && items.hammer
         && items.glove>0 && items.moonpearl && (items.cape || items.bluecane)
         && StandardRegionHelper.deathMtnWestDW(items, dungeons);
     }};
   catfish = {x: 1341, y: 257, title: 'Catfish', itemCount: 1,
-    req:['items/moonpearl1', 'items/glove1', 'and',
-      'dungeons/aga_boss0', 'or', 'items/hammer1'],
+    req:[['items/moonpearl1', 'items/glove1', StandardRegionHelper.reqNorthEastDW]],
     validate(items, dungeons){
       return items.moonpearl && items.glove > 0 && StandardRegionHelper.northEastDW(items, dungeons);
     }};
   pyramid = {x: 870, y: 670, title: 'Pyramid', itemCount: 1,
-    req:['dungeons/aga_boss0',
-      'or', 'items/hammer1', 'items/glove1'],
+    req:[[StandardRegionHelper.reqNorthEastDW]],
     validate(items, dungeons){
       return StandardRegionHelper.northEastDW(items, dungeons);
     }};
   pyramidFairy = {x: 703, y: 733, title: 'Pyramid Fairy', itemCount: 2,
-    req:['dungeons/crystal4', 'dungeons/crystal4',
-      'items/moonpearl1', 'and', 'items/glove2', 'or',
-      'lp', 'items/hammer1', 'or', 'items/flippers1',
-      'and', 'dungeons/aga_boss0', 'or', 'items/glove1', 'rp'],
+    req:[
+      ['dungeons/crystal3', 'dungeons/crystal4', StandardRegionHelper.reqSouthDW, 'items/mirror1', 'dungeons/aga_boss1'],
+      ['dungeons/crystal3', 'dungeons/crystal4', StandardRegionHelper.reqSouthDW, 'items/hammer1', 'items/moonpearl1']
+    ],
     validate(items, dungeons){
       let c = 0;
       const keys = Object.keys(dungeons);
@@ -53,73 +54,60 @@ export class StandardStaticMapDW {
                 || (items.mirror && dungeons.aga.boss));
     }};
   brewery = {x: 163, y: 878, title: 'Brewery', itemCount: 1,
-    req:['items/bombs1', 'items/moonpearl1', 'and',
-      'items/glove2', 'or', 'items/hammer1', 'items/glove1', 'or',
-      'lp', 'dungeons/aga_boss0', 'and', 'items/hammer1', 'or', 'items/flippers1', 'rp'],
+    req:[['items/bombs1', 'items/moonpearl1', StandardRegionHelper.reqNorthWestDW]],
     validate(items, dungeons){
       return items.bombs && items.moonpearl && StandardRegionHelper.northWestDW(items, dungeons);
     }};
   cShapeHouse = {x: 310, y: 726, title: 'C-Shaped House', itemCount: 1,
-    req:['items/moonpearl1', 'and',
-      'items/glove2', 'or', 'items/hammer1', 'items/glove1', 'or',
-      'lp', 'dungeons/aga_boss0', 'and', 'items/hammer1', 'or', 'items/flippers1', 'rp'],
+    req:[['items/moonpearl1', StandardRegionHelper.reqNorthWestDW]],
     validate(items, dungeons){
       return items.moonpearl && StandardRegionHelper.northWestDW(items, dungeons);
     }};
   chestGame = {x: 76, y: 702, title: 'Chest Game', itemCount: 1,
-    req:['items/moonpearl1', 'and',
-      'items/glove2', 'or', 'items/hammer1', 'items/glove1', 'or',
-      'lp', 'dungeons/aga_boss0', 'and', 'items/hammer1', 'or', 'items/flippers1', 'rp'],
+    req:[['items/moonpearl1', StandardRegionHelper.reqNorthWestDW]],
     validate(items, dungeons){
       return items.moonpearl && StandardRegionHelper.northWestDW(items, dungeons);
     }};
   hammerPegs = {x: 474, y: 908, title: 'Hammer Pegs', itemCount: 1,
-    req:['items/moonpearl1', 'items/hammer1', 'items/glove2'],
+    req:[['items/moonpearl1', 'items/hammer1', 'items/glove2', StandardRegionHelper.reqNorthWestDW]],
     validate(items, dungeons){
       return items.moonpearl && items.hammer && items.glove === 2 && StandardRegionHelper.northWestDW(items, dungeons);
     }};
   bumperCave = {x: 532, y: 268, title: '​Bumper Cave', itemCount: 1,
-    req:['items/moonpearl1', 'and', 'lp', 'items/hammer1', 'or', 'items/flippers1', 'rp', 'and',
-      'lp', 'items/glove1', 'or', 'dungeons/aga_boss0', 'rp'],
+    req:[['items/moonpearl1', 'items/glove1', 'items/cape1', StandardRegionHelper.reqNorthWestDW]],
     validate(items, dungeons){
       return items.moonpearl && items.glove > 0 && items.cape
             &&StandardRegionHelper.northWestDW(items, dungeons);
     }};
   blacksmith = {x: 223, y: 994, title: 'Blacksmith', itemCount: 1,
-    req:['items/mirror1', 'items/moonpearl1', 'items/glove2'],
+    req:[['items/moonpearl1', 'items/glove2', StandardRegionHelper.reqNorthWestDW]],
     validate(items, dungeons){
       return items.moonpearl && items.glove === 2
             && StandardRegionHelper.northWestDW(items, dungeons);
     }};
   purpleChest = {x: 457, y: 802, title: 'Purple Chest', itemCount: 1,
-    req:['items/mirror1', 'items/moonpearl1', 'items/glove2'],
+    req:[['items/moonpearl1', 'items/glove2', StandardRegionHelper.reqNorthWestDW]],
     validate(items, dungeons){
       return items.moonpearl && items.glove === 2
             && StandardRegionHelper.northWestDW(items, dungeons);
     }};
   hypeCave = {x: 896, y: 1168, title: 'Hype Cave', itemCount: 5,
-    req:['items/moonpearl1', 'and', 'items/glove2', 'or',
-      'lp', 'items/hammer1', 'or', 'items/flippers1',
-      'and', 'dungeons/aga_boss0', 'or', 'items/glove1', 'rp'],
+    req:[['items/moonpearl1', 'items/bombs1', StandardRegionHelper.reqSouthDW]],
     validate(items, dungeons){
       return items.moonpearl && items.bombs && StandardRegionHelper.southDW(items, dungeons);
     }};
   stumpy = {x: 463, y: 1024, title: 'Stumpy', itemCount: 1,
-    req:['items/moonpearl1', 'and', 'items/glove2', 'or',
-      'lp', 'items/hammer1', 'or', 'items/flippers1',
-      'and', 'dungeons/aga_boss0', 'or', 'items/glove1', 'rp'],
+    req:[['items/moonpearl1', StandardRegionHelper.reqSouthDW]],
     validate(items, dungeons){
       return items.moonpearl && StandardRegionHelper.southDW(items, dungeons);
     }};
   diggingGame = {x: 85, y: 1043, title: 'Digging Game', itemCount: 1,
-    req:['items/moonpearl1', 'and', 'items/glove2', 'or',
-      'lp', 'items/hammer1', 'or', 'items/flippers1',
-      'and', 'dungeons/aga_boss0', 'or', 'items/glove1', 'rp'],
+    req:[['items/moonpearl1', StandardRegionHelper.reqSouthDW]],
     validate(items, dungeons){
       return items.moonpearl && StandardRegionHelper.southDW(items, dungeons);
     }};
   mireShed = {x: 59, y: 1205, title: 'Mire Shed', itemCount: 2,
-    req:['items/mirror1', 'items/glove2', 'items/flute1'],
+    req:[['items/moonpearl1', StandardRegionHelper.reqMireDW]],
     validate(items, dungeons){
       return items.moonpearl && StandardRegionHelper.mireDW(items, dungeons);
     }};
diff --git a/app/standard/StandardStaticMapLW.ts b/app/standard/StandardStaticMapLW.ts
index 6828619..e43933d 100644
--- a/app/standard/StandardStaticMapLW.ts
+++ b/app/standard/StandardStaticMapLW.ts
@@ -8,18 +8,18 @@ export class StandardStaticMapLW {
     return true;
   }};
   backOfEscape = {x:778, y:439, title:'Escape',
-    itemCount: 6, req:['items/glove1'],
+    itemCount: 6, req:[['items/glove1']],
     validate(items, dungeons) {
       return items.glove > 0;
     }};
   sahashralaHut = {x:1216, y:660, title:'Sahashrala\'s Hut', itemCount: 3,
-    req: ['items/bombs1'],
+    req: [['items/bombs1']],
     validate(items, dungeons) {
       return items.bombs;
     }
   };
   sahashrala = {x:1216, y:680, title:'Sahashrala', itemCount: 1,
-    req: ['crystal-green'],
+    req: [['crystal-green']],
     validate(items, dungeons) {
       let retval = false;
       const keys = Object.keys(dungeons);
@@ -33,28 +33,28 @@ export class StandardStaticMapLW {
     }
   };
   potionShop = {x:1201, y:502, title:'Potion Shop', itemCount: 1,
-    req:['items/mushroom1'],
+    req:[['items/mushroom1']],
     validate(items){
       return items.mushroom;
     }};
   zora = {x:1457, y:187, title:'King Zora (500 Rupees)', itemCount: 1,
-    req:['items/glove1', 'or', 'items/flippers1'],
+    req:[['items/glove1'], ['items/flippers1']],
     validate(items){
       return items.glove > 0 || items.flippers;
     }
   };
   zoraLedge = {x:1427, y:187, title:'Zora Ledge', itemCount: 1,
-    req:['items/flippers1'],
+    req:[['items/flippers1']],
     validate(items){
       return items.flippers;
     }};
   waterfallFairy = {x:1350, y:208, title:'Waterfall Fairy', itemCount: 2,
-    req:['items/flippers1'],
+    req:[['items/flippers1']],
     validate(items){
       return items.flippers;
     }};
   pedestal = {x:62, y:74, title:'Master Sword Pedestal', itemCount: 1,
-    req:['crystal-green', 'crystal-blue', 'crystal-red'],
+    req:[['crystal-green', 'crystal-blue', 'crystal-red']],
     validate(items, dungeons){
       let rb = 0;
       let g = false;
@@ -82,47 +82,48 @@ export class StandardStaticMapLW {
     return true;
   }};
   chickenHut = {x: 146, y:814, title:'Chicken Hut', itemCount: 1,
-    req:['items/bombs1'], validate(items){
+    req:[['items/bombs1']], validate(items){
       return items.bombs;
     }};
   well = {x: 38, y:639, title:'Kakariko Well', itemCount: 5,
-    req:['items/bombs1'], validate(items){
+    req:[['items/bombs1']], validate(items){
       return items.bombs;
     }};
   blindhouse = {x: 193, y:632, title:'Blind\'s House', itemCount: 5,
-    req:['items/bombs1'], validate(items){
+    req:[['items/bombs1']], validate(items){
       return items.bombs;
     }};
   pegasusRock = {x:595, y:440, title:'Pegasus Rocks', itemCount: 1,
-    req:['items/boots1'], validate(items){
+    req:[['items/boots1']], validate(items){
       return items.boots;
     }};
   bottleMerchant = {x:144, y:698, title:'Bottle Merchant (100 Rupees)', itemCount: 1, req:[], validate(){
     return true;
   }};
   magicBat = {x:486, y:844, title:'Magic Bat', itemCount: 1,
-    req:['items/powder1', 'items/hammer1', 'or',
-      'items/powder1', 'items/moonpearl1', 'dungeons/aga_boss0', 'items/hookshot1', 'items/flippers1', 'items/glove2'],
+    req:[
+      ['items/powder1', 'items/hammer1'],
+      ['items/powder1', 'items/mirror1', 'items/moonpearl1', 'items/glove2', StandardRegionHelper.reqNorthWestDW]
+    ],
     validate(items, dungeons){
-      return items.powder
-                && (items.hammer
-                    || (items.mirror && items.moonpearl
-                        && (items.glove === 2 && StandardRegionHelper.northWestDW(items, dungeons))));
+      return items.powder &&
+        (items.hammer
+          || (items.mirror && items.moonpearl
+                && (items.glove === 2 && StandardRegionHelper.northWestDW(items, dungeons))));
     }};
   sickKid = {x:234, y:807, title:'Sick Kid', itemCount: 1,
-    req:['items/jar1'], validate(items){
+    req:[['items/jar1']], validate(items){
       return items.jar > 0;
     }};
   lwHideout = {x:283, y:194, title:'Lost Woods Hideout', itemCount: 1, req:[], validate(){
     return true;
   }};
   lumberjackTree = {x:450, y:110, title:'Lumberjack Tree', itemCount: 1,
-    req:['dungeons/aga_boss0', 'items/boots1'], validate(items, dungeons){
+    req:[['dungeons/aga_boss0', 'items/boots1']], validate(items, dungeons){
       return dungeons.aga.boss && items.boots;
     }};
   graveyardLedge = {x:855, y:416, title:'Graveyard Ledge', itemCount: 1,
-    req:['items/mirror1', 'items/moonpearl1', 'lp', 'dungeons/aga_boss0', 'items/hookshot1', 'items/flippers1', 'rp', 'or',
-      'lp', 'items/hammer1', 'items/glove1', 'rp', 'or', 'items/glove2'],
+    req:[['items/mirror1', 'items/moonpearl1', StandardRegionHelper.reqNorthWestDW]],
     validate(items, dungeons){
       return items.mirror && items.moonpearl && StandardRegionHelper.northWestDW(items, dungeons);
     }};
@@ -142,108 +143,95 @@ export class StandardStaticMapLW {
     return true;
   }};
   aginahCave = {x:298, y:1242, title:'Aginah Cave', itemCount: 1,
-    req:['items/bombs1'], validate(items){
+    req:[['items/bombs1']], validate(items){
       return items.bombs;
     }};
   moldormCave =  {x:978, y:1412, title:'Mini-Moldorm Cave', itemCount: 5,
-    req:['items/bombs1'], validate(items){
+    req:[['items/bombs1']], validate(items){
       return items.bombs;
     }};
   iceRodCave = {x:1342, y:1160, title:'Ice Rod Cave', itemCount: 1,
-    req:['items/bombs1'], validate(items){
+    req:[['items/bombs1']], validate(items){
       return items.bombs;
     }};
   hobo = {x:1059, y:1045, title:'Hobo Under the Bridge', itemCount: 1,
-    req:['items/flippers1'], validate(items){
+    req:[['items/flippers1']], validate(items){
       return items.flippers;
     }};
   bombosTablet = {x:328, y:1380, title:'Bombos Tablet', itemCount: 1,
-    req:['items/book1', 'items/sword2', 'items/mirror1', 'items/moonpearl1',
-      'lp', 'dungeons/aga_boss0', 'items/hookshot1', 'items/flippers1',
-      'rp', 'or',
-      'lp', 'items/hammer1', 'items/glove1', 'rp'],
+    req:[['items/book1', 'items/sword2', 'items/mirror1', StandardRegionHelper.reqSouthDW]],
     validate(items, dungeons){
       return items.book && items.sword > 1 && items.mirror && StandardRegionHelper.southDW(items, dungeons);
     }};
   cave45 = {x:399, y:1242, title:'Cave 45', itemCount: 1,
-    req:['items/mirror1', 'items/moonpearl1',
-      'lp', 'dungeons/aga_boss0', 'items/hookshot1', 'items/flippers1',
-      'rp', 'or',
-      'lp', 'items/hammer1', 'items/glove1', 'rp'],
+    req:[['items/mirror1', StandardRegionHelper.reqSouthDW]],
     validate(items, dungeons){
       return items.mirror && StandardRegionHelper.southDW(items, dungeons);
     }};
   checkerCave = {x:263, y:1165, title:'Checkerboard Cave', itemCount: 1,
-    req:['items/mirror1', 'items/glove2', 'items/flute1'],
+    req:[['items/mirror1', StandardRegionHelper.reqMireDW]],
     validate(items, dungeons){
       return items.mirror && StandardRegionHelper.mireDW(items, dungeons);
     }};
   library = {x:243, y:990, title:'Library', itemCount: 1,
-    req:['items/boots1'], validate(items){
+    req:[['items/boots1']], validate(items){
       return items.boots;
     }};
   mazeRace = {x:148, y:1080, title:'Maze Race', itemCount: 1,
-    req:['items/bombs1'], validate(items){
+    req:[['items/bombs1']], validate(items){
       return items.bombs;
     }};
   desertLedge = {x:38, y:1375, title:'Desert Ledge', itemCount: 1,
-    req:['items/book1', 'or', 'items/mirror1', 'items/glove2', 'items/flute1'],
+    req:[['items/book1', 'or', 'items/mirror1', 'items/glove2', 'items/flute1']],
     validate(items, dungeons){
       return StandardRegionHelper.dp(items, dungeons);
     }};
   lakeIsland = {x:1091, y:1244, title:'Lake Hylia Island', itemCount: 1,
-    req:['items/mirror1', 'items/flippers1', 'items/moonpearl1', 'lp', 'dungeons/aga_boss0', 'rp',
-      'or', 'lp', 'items/hammer1', 'items/glove1', 'rp'],
+    req:[['items/mirror1', 'items/flippers1', 'items/moonpearl1', StandardRegionHelper.reqNorthEastDW]],
     validate(items, dungeons){
       return items.mirror && items.flippers && items.moonpearl && StandardRegionHelper.northEastDW(items, dungeons);
     }};
   fluteSpot = {x:435, y:992, title:'Flute Spot', itemCount: 1,
-    req:['items/shovel1'], validate(items){
+    req:[['items/shovel1']], validate(items){
       return items.shovel;
     }};
   oldMan = {x:609, y:286, title:'Rescue Old Man', itemCount: 1,
-    req:['items/lantern1', 'lp', 'items/flute1', 'or', 'items/glove1', 'rp'],
+    req:[['items/lantern1', StandardRegionHelper.reqDeathMtnWestLW]],
     validate(items, dungeons){
       return items.lantern && StandardRegionHelper.deathMtnWestLW(items, dungeons);
     }};
   spectacleRockCave = {x:732, y:220, title:'Spectacle Rock Cave', itemCount: 1,
-    req:['items/flute1', 'or', 'items/glove1', 'items/lantern1'],
+    req:[[StandardRegionHelper.reqDeathMtnWestLW]],
     validate(items, dungeons){
       return StandardRegionHelper.deathMtnWestLW(items, dungeons);
     }};
   etherTablet = {x:630, y:28, title:'Ether Tablet', itemCount: 1,
-    req:['lp', 'items/mirror1', 'or', 'items/hookshot1', 'items/hammer1', 'rp', 'and', 'lp', 'items/flute1', 'or', 'items/glove1', 'items/lantern1', 'rp'],
+    req:[['items/book1', 'items/sword2', StandardRegionHelper.reqToh]],
     validate(items, dungeons){
       return items.book && items.sword > 1 && StandardRegionHelper.toh(items, dungeons);
     }};
   spectacleRock = {x:761, y:121, title:'Spectacle Rock', itemCount: 1,
-    req:['items/mirror1', 'and', 'items/flute1', 'or', 'items/glove1', 'items/lantern1'],
+    req:[['items/mirror1', StandardRegionHelper.reqDeathMtnWestLW]],
     validate(items, dungeons){
       return items.mirror && StandardRegionHelper.deathMtnWestLW(items, dungeons);
     }};
   spiralCave = {x:1195, y:140, title:'Spiral Cave', itemCount: 1,
-    req:['lp', 'items/hookshot1', 'or', 'items/hammer1', 'items/mirror1', 'rp',
-      'and', 'lp', 'items/flute1', 'or', 'items/glove1', 'items/lantern1', 'rp'],
+    req:[[StandardRegionHelper.reqDeathMtnEastLW]],
     validate(items, dungeons){
       return StandardRegionHelper.deathMtnEastLW(items, dungeons);
     }};
   mimicCave = {x:1266, y:140, title:'Mimic Cave', itemCount: 1,
-    req:['dungeons/medallion0', 'items/moonpearl1', 'items/redcane1', 'items/hammer1', 'items/glove2',
-      'lp', 'items/hookshot1', 'or', 'items/mirror1', 'rp',
-      'lp', 'items/flute1', 'or', 'items/lantern1', 'rp'],
+    req:[['items/hammer1', 'items/mirror1', StandardRegionHelper.reqTr]],
     validate(items, dungeons){
       return items.hammer && items.mirror && StandardRegionHelper.tr(items, dungeons);
     }};
   paradoxCave = {x:1283, y:222, title:'Paradox Cave', itemCount: 7,
-    req:['lp', 'items/hookshot1', 'or', 'items/hammer1', 'items/mirror1', 'rp',
-      'and', 'lp', 'items/flute1', 'or', 'items/glove1', 'items/lantern1', 'rp'],
+    req:[[StandardRegionHelper.reqDeathMtnEastLW]],
     validate(items, dungeons){
       return StandardRegionHelper.deathMtnEastLW(items, dungeons);
     }};
   floatingIsland = {x:1220, y:26, title:'Floating Island', itemCount: 1,
-    req:['items/mirror1', 'items/bombs1', 'items/glove1',
-      'and', 'lp', 'items/hookshot1', 'or', 'items/hammer1', 'rp',
-      'and', 'lp', 'items/flute1', 'or', 'items/lantern1', 'rp'],
+    req:[['items/mirror1', 'items/bombs1', 'items/glove1', StandardRegionHelper.reqDeathMtnEastLW]],
     validate(items, dungeons){
       return items.mirror && items.bombs && items.glove > 0
             && StandardRegionHelper.deathMtnEastDW(items, dungeons);
diff --git a/app/tests/utils/RequiredItemsHelper.spec.js b/app/tests/utils/RequiredItemsHelper.spec.js
index f61b021..71710f2 100644
--- a/app/tests/utils/RequiredItemsHelper.spec.js
+++ b/app/tests/utils/RequiredItemsHelper.spec.js
@@ -1,8 +1,45 @@
 import {RequiredItemsHelper} from '~/utils/RequiredItemsHelper';
+import {StandardStaticMapLW} from '~/standard/StandardStaticMapLW';
+import {StandardStaticMapDW} from '~/standard/StandardStaticMapDW';
 
-describe('RequiredItemsHelper', () => {
-  fit('should get an array', () => {
-    const rih = new RequiredItemsHelper();
-    rih.getTestArray();
+fdescribe('RequiredItemsHelper', () => {
+  const standardMapLW = new StandardStaticMapLW();
+  const standardMapDW = new StandardStaticMapDW();
+  const rih = new RequiredItemsHelper();
+  it('should get kings tomb', () => {
+    listItems(standardMapLW.kingTomb.title, rih.getRequiredItems(standardMapLW.kingTomb.req));
+  });
+  it('should get magic bat', () => {
+    listItems(standardMapLW.magicBat.title, rih.getRequiredItems(standardMapLW.magicBat.req));
+  });
+  it('should get bombos tablet', () => {
+    listItems(standardMapLW.bombosTablet.title, rih.getRequiredItems(standardMapLW.bombosTablet.req));
+  });
+  it('should get checker cave', () => {
+    listItems(standardMapLW.checkerCave.title, rih.getRequiredItems(standardMapLW.checkerCave.req));
+  });
+  it('do all light world maps', () => {
+    const keys = Object.keys(standardMapLW);
+    for(const key of keys) {
+      listItems(standardMapLW[key].title, rih.getRequiredItems(standardMapLW[key].req));
+    }
+  });
+  it('should get spike cave', () => {
+    listItems(standardMapDW.spikeCave.title, rih.getRequiredItems(standardMapDW.spikeCave.req));
+  });
+  it('should get pyramid fairy', () => {
+    listItems(standardMapDW.pyramidFairy.title, rih.getRequiredItems(standardMapDW.pyramidFairy.req));
+  });
+  fit('do all dark world maps', () => {
+    const keys = Object.keys(standardMapDW);
+    for(const key of keys) {
+      listItems(standardMapDW[key].title, rih.getRequiredItems(standardMapDW[key].req));
+    }
   });
 });
+function listItems(title, arr){
+  console.log(title);
+  for(const a of arr){
+    console.log(a);
+  }
+}
diff --git a/app/utils/RequiredItemsHelper.ts b/app/utils/RequiredItemsHelper.ts
index 660a79c..22eed00 100644
--- a/app/utils/RequiredItemsHelper.ts
+++ b/app/utils/RequiredItemsHelper.ts
@@ -1,15 +1,11 @@
-import {StandardStaticMapLW} from '@/standard/StandardStaticMapLW';
+//import {StandardStaticMapLW} from '@/standard/StandardStaticMapLW';
 
 export class RequiredItemsHelper {
 
-  getTestArray() {
-    const kt = new StandardStaticMapLW();
-    let parsed = this.parseRequired(kt.kingTomb.req);
+  getRequiredItems(arrs) {
+    let parsed = this.parseRequired(arrs);
     parsed = this.cleanRequired(parsed);
-
-    for(const p of parsed) {
-      console.log('fin:', p);
-    }
+    return parsed;
   }
   onlyUnique(value, index, self) {
     return self.indexOf(value) === index;
@@ -51,6 +47,9 @@ export class RequiredItemsHelper {
     return retval;
   }
   cleanRequired(arr) {
+    if(arr.length < 1) {
+      return arr;
+    }
     arr.sort((a, b)=> {
       let r = 0;
       a.length > b.length ? r = -1 : a.length < b.length ? r = 1 :  r = 0;

From 0e9f7eeba711ffa7318dd69865186314b86c5dec Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Sun, 26 Jul 2020 14:17:18 -0600
Subject: [PATCH 03/19] Show required items on modal

---
 app/components/map/DarkList.vue             |   2 +
 app/components/map/LightList.vue            |   2 +
 app/components/map/LocaleModal.vue          |  30 ++-
 app/retro/RetroStaticMapDW.ts               | 124 +---------
 app/retro/RetroStaticMapDungeonsDW.ts       |  42 ----
 app/retro/RetroStaticMapDungeonsLW.ts       |  26 ---
 app/retro/RetroStaticMapLW.ts               | 246 +-------------------
 app/standard/StandardRegionHelper.ts        |   2 +-
 app/standard/StandardStaticMapDW.ts         |   4 +-
 app/tests/utils/RequiredItemsHelper.spec.js |   4 +-
 10 files changed, 39 insertions(+), 443 deletions(-)

diff --git a/app/components/map/DarkList.vue b/app/components/map/DarkList.vue
index 11a15a6..970eac1 100644
--- a/app/components/map/DarkList.vue
+++ b/app/components/map/DarkList.vue
@@ -57,8 +57,10 @@
                 <Label class="title" :text="shopHandler.staticLocations[key].title"/>
               </StackLayout>
               <StackLayout orientation="horizontal" style="padding-right:4;padding-top:6;">
+                <!--
                 <Image v-for="img in shopHandler.staticLocations[key].req" v-bind:key="img"
                        height="15" :src="'~/img/'+img+'.png'"/>
+                       -->
               </StackLayout>
             </StackLayout>
             <StackLayout row="0" col="1" orientation="vertical">
diff --git a/app/components/map/LightList.vue b/app/components/map/LightList.vue
index adf5779..d4f4617 100644
--- a/app/components/map/LightList.vue
+++ b/app/components/map/LightList.vue
@@ -27,8 +27,10 @@
                 <Label class="list-title" :text="mapHandler.staticLocations[key].title"/>
               </StackLayout>
               <StackLayout orientation="horizontal" style="padding-right:4;padding-top:6;">
+                <!--
                 <Image v-for="img in mapHandler.staticLocations[key].req" v-bind:key="img"
                        height="16" :src="'~/img/'+img+'.png'" />
+                       -->
               </StackLayout>
             </StackLayout>
             <StackLayout row="0" col="1" orientation="vertical">
diff --git a/app/components/map/LocaleModal.vue b/app/components/map/LocaleModal.vue
index ac81a46..771e366 100644
--- a/app/components/map/LocaleModal.vue
+++ b/app/components/map/LocaleModal.vue
@@ -1,8 +1,17 @@
 <template>
   <ScrollView>
     <StackLayout orientation="vertical" class="modal-dialog">
-      <Label class="list-title" :text="title" textAlignment="center" marginBottom="5"/>
-      <Button class="btn standard padded" @tap="closeModal">Close</Button>
+      <Label class="list-title" :text="title" textAlignment="center" marginBottom="5" fontSize="24"/>
+      <StackLayout v-if="type === 'location'" orientation="horizontal" horizontalAlignment="center">
+        <Image src="~/img/chest.png" width="20"/>
+        <Label :text="' x'+itemCount"/>
+      </StackLayout>
+      <Label v-if="requiredArr.length" text="Required Items:" marginTop="4" marginLeft="10"/>
+      <StackLayout v-for="(req, idx) of requiredArr" v-bind:key="idx" orientation="horizontal" marginLeft="10">
+        <Image v-if="idx > 0" src="~/img/or.png" width="18"/>
+        <Image v-for="img of req" v-bind:key="img" :src="'~/img/'+(img.replace('~',''))+'.png'" width="18" height="18" margin="2"/>
+      </StackLayout>
+      <Button class="btn standard padded" @tap="closeModal" marginTop="14">Close</Button>
     </StackLayout>
   </ScrollView>
 
@@ -10,6 +19,13 @@
 
 <script type="ts">
   import {Component, Prop, Vue} from 'vue-property-decorator';
+  import {StandardStaticMapLW} from '@/standard/StandardStaticMapLW';
+  import {StandardStaticMapDW} from '@/standard/StandardStaticMapDW';
+  import {InvertedStaticMapLW} from '@/inverted/InvertedStaticMapLW';
+  import {InvertedStaticMapDW} from '@/inverted/InvertedStaticMapDW';
+  import {RetroStaticMapLW} from '@/retro/RetroStaticMapLW';
+  import {RetroStaticMapDW} from '@/retro/RetroStaticMapDW';
+  import {RequiredItemsHelper} from '@/utils/RequiredItemsHelper';
 
   @Component
   export default class LocaleModal extends Vue {
@@ -21,6 +37,8 @@
     req = [];
     itemCount = 0;
     takeAny = false;
+    requiredArr = [];
+    requiredHelper = new RequiredItemsHelper();
 
     mounted() {
       let loc = undefined;
@@ -32,6 +50,13 @@
           this.req = loc.req;
           this.itemCount = loc.itemCount;
         }
+        const staticObj = this.$modelManager.getGameMode() === this.$sol.STANDARD && this.world === 'lightworld' ? new StandardStaticMapLW()
+          : this.$modelManager.getGameMode() === this.$sol.STANDARD && this.world === 'darkworld' ? new StandardStaticMapDW()
+            : this.$modelManager.getGameMode() === this.$sol.INVERTED && this.world === 'lightworld' ? new InvertedStaticMapLW()
+              : this.$modelManager.getGameMode() === this.$sol.INVERTED && this.world === 'darkworld' ? new InvertedStaticMapDW()
+                : this.$modelManager.getGameMode() === this.$sol.RETRO && this.world === 'lightworld' ? new RetroStaticMapLW()
+                  : new RetroStaticMapDW();
+        this.requiredArr = this.requiredHelper.getRequiredItems(staticObj[this.localeKey].req);
       }
       if(this.type === 'shop') {
         loc = (this.world === 'darkworld') ? this.$sol.getStaticMapShopsDW(this.$modelManager.getGameMode())[this.localeKey]
@@ -39,6 +64,7 @@
         if(loc) {
           this.title = loc.title;
           this.req = loc.req;
+          this.itemCount = loc.itemCount;
           this.takeAny = loc.takeAny;
         }
       }
diff --git a/app/retro/RetroStaticMapDW.ts b/app/retro/RetroStaticMapDW.ts
index f0932b6..b52c7f8 100644
--- a/app/retro/RetroStaticMapDW.ts
+++ b/app/retro/RetroStaticMapDW.ts
@@ -1,127 +1,5 @@
 import {RetroRegionHelper} from '@/retro/RetroRegionHelper';
 import {StandardStaticMapDW} from '@/standard/StandardStaticMapDW';
 
-export class RetroStaticMapDW {
-  superbunnyCave = {x: 1265, y: 223, title: 'Superbunny Cave', itemCount: 2,
-    req:['items/moonpearl1', 'items/glove2',
-      'lp', 'items/hookshot1', 'or', 'items/hammer1', 'items/mirror1', 'rp',
-      'and', 'lp', 'items/flute1', 'or', 'items/lantern1', 'rp'],
-    validate(items, dungeons){
-      return items.moonpearl && RetroRegionHelper.deathMtnEastDW(items, dungeons);
-    }};
-  hookshotCave = {x: 1247, y: 99, title: 'Hookshot Cave', itemCount: 4,
-    req:['items/hookshot1', 'items/moonpearl1', 'items/glove2',
-      'and', 'lp', 'items/flute1', 'or', 'items/lantern1', 'rp'],
-    validate(items, dungeons){
-      return (items.hookshot || items.boots) && items.moonpearl && RetroRegionHelper.deathMtnEastDW(items, dungeons);
-    }};
-  spikeCave = {x: 862, y: 221, title: 'Spike Cave', itemCount: 1,
-    req:['items/hammer1', 'items/moonpearl1', 'items/glove2',
-      'lp', 'items/hookshot1', 'or', 'items/mirror1', 'rp',
-      'and', 'lp', 'items/flute1', 'or', 'items/lantern1', 'rp'],
-    validate(items, dungeons){
-      return (items.jar > 0 || items.halfmagic) && items.hammer
-        && items.glove>0 && items.moonpearl && (items.cape || items.bluecane)
-        && RetroRegionHelper.deathMtnWestDW(items, dungeons);
-    }};
-  catfish = {x: 1341, y: 257, title: 'Catfish', itemCount: 1,
-    req:['items/moonpearl1', 'items/glove1', 'and',
-      'dungeons/aga_boss0', 'or', 'items/hammer1'],
-    validate(items, dungeons){
-      return items.moonpearl && items.glove > 0 && RetroRegionHelper.northEastDW(items, dungeons);
-    }};
-  pyramid = {x: 870, y: 670, title: 'Pyramid', itemCount: 1,
-    req:['dungeons/aga_boss0',
-      'or', 'items/hammer1', 'items/glove1'],
-    validate(items, dungeons){
-      return RetroRegionHelper.northEastDW(items, dungeons);
-    }};
-  pyramidFairy = {x: 703, y: 733, title: 'Pyramid Fairy', itemCount: 2,
-    req:['dungeons/crystal4', 'dungeons/crystal4',
-      'items/moonpearl1', 'and', 'items/glove2', 'or',
-      'lp', 'items/hammer1', 'or', 'items/flippers1',
-      'and', 'dungeons/aga_boss0', 'or', 'items/glove1', 'rp'],
-    validate(items, dungeons){
-      let c = 0;
-      const keys = Object.keys(dungeons);
-      for(const key of keys){
-        if(dungeons[key].crystal === 4 && dungeons[key].boss) {
-          c = c + 1;
-        }
-      }
-      return c === 2 && RetroRegionHelper.southDW(items, dungeons)
-            && ((items.hammer && items.moonpearl)
-                || (items.mirror && dungeons.aga.boss));
-    }};
-  brewery = {x: 163, y: 878, title: 'Brewery', itemCount: 1,
-    req:['items/bombs1', 'items/moonpearl1', 'and',
-      'items/glove2', 'or', 'items/hammer1', 'items/glove1', 'or',
-      'lp', 'dungeons/aga_boss0', 'and', 'items/hammer1', 'or', 'items/flippers1', 'rp'],
-    validate(items, dungeons){
-      return items.bombs && items.moonpearl && RetroRegionHelper.northWestDW(items, dungeons);
-    }};
-  cShapeHouse = {x: 310, y: 726, title: 'C-Shaped House', itemCount: 1,
-    req:['items/moonpearl1', 'and',
-      'items/glove2', 'or', 'items/hammer1', 'items/glove1', 'or',
-      'lp', 'dungeons/aga_boss0', 'and', 'items/hammer1', 'or', 'items/flippers1', 'rp'],
-    validate(items, dungeons){
-      return items.moonpearl && RetroRegionHelper.northWestDW(items, dungeons);
-    }};
-  chestGame = {x: 76, y: 702, title: 'Chest Game', itemCount: 1,
-    req:['items/moonpearl1', 'and',
-      'items/glove2', 'or', 'items/hammer1', 'items/glove1', 'or',
-      'lp', 'dungeons/aga_boss0', 'and', 'items/hammer1', 'or', 'items/flippers1', 'rp'],
-    validate(items, dungeons){
-      return items.moonpearl && RetroRegionHelper.northWestDW(items, dungeons);
-    }};
-  hammerPegs = {x: 474, y: 908, title: 'Hammer Pegs', itemCount: 1,
-    req:['items/moonpearl1', 'items/hammer1', 'items/glove2'],
-    validate(items, dungeons){
-      return items.moonpearl && items.hammer && items.glove === 2 && RetroRegionHelper.northWestDW(items, dungeons);
-    }};
-  bumperCave = {x: 532, y: 268, title: '​Bumper Cave', itemCount: 1,
-    req:['items/moonpearl1', 'and', 'lp', 'items/hammer1', 'or', 'items/flippers1', 'rp', 'and',
-      'lp', 'items/glove1', 'or', 'dungeons/aga_boss0', 'rp'],
-    validate(items, dungeons){
-      return items.moonpearl && items.glove > 0 && items.cape
-            &&RetroRegionHelper.northWestDW(items, dungeons);
-    }};
-  blacksmith = {x: 223, y: 994, title: 'Blacksmith', itemCount: 1,
-    req:['items/mirror1', 'items/moonpearl1', 'items/glove2'],
-    validate(items, dungeons){
-      return items.moonpearl && items.glove === 2
-            && RetroRegionHelper.northWestDW(items, dungeons);
-    }};
-  purpleChest = {x: 457, y: 802, title: 'Purple Chest', itemCount: 1,
-    req:['items/mirror1', 'items/moonpearl1', 'items/glove2'],
-    validate(items, dungeons){
-      return items.moonpearl && items.glove === 2
-            && RetroRegionHelper.northWestDW(items, dungeons);
-    }};
-  hypeCave = {x: 896, y: 1168, title: 'Hype Cave', itemCount: 5,
-    req:['items/moonpearl1', 'and', 'items/glove2', 'or',
-      'lp', 'items/hammer1', 'or', 'items/flippers1',
-      'and', 'dungeons/aga_boss0', 'or', 'items/glove1', 'rp'],
-    validate(items, dungeons){
-      return items.moonpearl && items.bombs && RetroRegionHelper.southDW(items, dungeons);
-    }};
-  stumpy = {x: 463, y: 1024, title: 'Stumpy', itemCount: 1,
-    req:['items/moonpearl1', 'and', 'items/glove2', 'or',
-      'lp', 'items/hammer1', 'or', 'items/flippers1',
-      'and', 'dungeons/aga_boss0', 'or', 'items/glove1', 'rp'],
-    validate(items, dungeons){
-      return items.moonpearl && RetroRegionHelper.southDW(items, dungeons);
-    }};
-  diggingGame = {x: 85, y: 1043, title: 'Digging Game', itemCount: 1,
-    req:['items/moonpearl1', 'and', 'items/glove2', 'or',
-      'lp', 'items/hammer1', 'or', 'items/flippers1',
-      'and', 'dungeons/aga_boss0', 'or', 'items/glove1', 'rp'],
-    validate(items, dungeons){
-      return items.moonpearl && RetroRegionHelper.southDW(items, dungeons);
-    }};
-  mireShed = {x: 59, y: 1205, title: 'Mire Shed', itemCount: 2,
-    req:['items/mirror1', 'items/glove2', 'items/flute1'],
-    validate(items, dungeons){
-      return items.moonpearl && RetroRegionHelper.mireDW(items, dungeons);
-    }};
+export class RetroStaticMapDW extends StandardStaticMapDW{
 }
diff --git a/app/retro/RetroStaticMapDungeonsDW.ts b/app/retro/RetroStaticMapDungeonsDW.ts
index 94dc4f4..dea65d0 100644
--- a/app/retro/RetroStaticMapDungeonsDW.ts
+++ b/app/retro/RetroStaticMapDungeonsDW.ts
@@ -10,48 +10,6 @@ export class RetroStaticMapDungeonsDW extends StandardStaticMapDungeonsDW{
       return items.hammer && items.moonpearl && (items.bow > 0 && items.quiver)
         && (items.lantern || items.firerod) && RetroRegionHelper.northEastDW(items, dungeons);
     }}; // palace of darkness
-  sp = {x:703, y:1402,
-    validate(items, dungeons){
-      return items.flippers && items.moonpearl && items.mirror && RetroRegionHelper.southDW(items, dungeons);
-    },
-    validateBoss(items, dungeons){
-      return items.flippers && items.moonpearl && items.mirror && items.hookshot && items.hammer && RetroRegionHelper.southDW(items, dungeons);
-    }}; // swamp palace
-  sw = {x:149, y:164,
-    validate(items, dungeons){
-      return items.moonpearl && RetroRegionHelper.northWestDW(items, dungeons);
-    },
-    validateBoss(items, dungeons){
-      return items.moonpearl && items.firerod && RetroRegionHelper.northWestDW(items, dungeons);
-    }}; // skull woods
-  tt = {x:190, y:717,
-    validate(items, dungeons){
-      return items.moonpearl && RetroRegionHelper.northWestDW(items, dungeons);
-    },
-    validateBoss(items, dungeons){
-      return items.moonpearl && RetroRegionHelper.northWestDW(items, dungeons);
-    }}; // thieves town
-  ip = {x:1195, y:1294,
-    validate(items, dungeons){
-      return (items.firerod || items.bombos) && items.moonpearl && items.flippers && items.glove === 2 && RetroRegionHelper.southDW(items, dungeons);
-    },
-    validateBoss(items, dungeons){
-      return items.hammer && items.glove === 2 && (items.firerod || items.bombos) && items.moonpearl && items.flippers && RetroRegionHelper.southDW(items, dungeons);
-    }}; // ice palace
-  mm = {x:110, y:1247,
-    validate(items, dungeons){
-      return RetroRegionHelper.mm(items, dungeons);
-    },
-    validateBoss(items, dungeons){
-      return items.redcane && items.lantern && RetroRegionHelper.mm(items, dungeons);
-    }}; // misery mire
-  tr = {x:1411, y:90,
-    validate(items, dungeons){
-      return RetroRegionHelper.tr(items, dungeons);
-    },
-    validateBoss(items, dungeons){
-      return items.firerod && items.icerod && RetroRegionHelper.tr(items, dungeons);
-    }}; // turtle rock
   gt = {x:844, y:35,
     validate(items, dungeons, settings){
       return RetroRegionHelper.gt(items, dungeons, settings);
diff --git a/app/retro/RetroStaticMapDungeonsLW.ts b/app/retro/RetroStaticMapDungeonsLW.ts
index 2eed323..c997a58 100644
--- a/app/retro/RetroStaticMapDungeonsLW.ts
+++ b/app/retro/RetroStaticMapDungeonsLW.ts
@@ -10,30 +10,4 @@ export class RetroStaticMapDungeonsLW extends StandardStaticMapDungeonsLW{
       return  (items.bow > 0 && items.quiver) && (items.lantern || items.firerod);
     }
   };
-  dp = {x:111, y:1270,
-    validate(items, dungeons){
-      return RetroRegionHelper.dp(items, dungeons);
-    },
-    validateBoss(items, dungeons){
-      return RetroRegionHelper.dp(items, dungeons)
-                && (items.glove > 0 || (items.mirror && RetroRegionHelper.mireDW(items, dungeons)))
-                && (items.lantern || items.firerod);
-    }
-  };
-  toh = {x:840, y:40,
-    validate(items, dungeons){
-      return RetroRegionHelper.toh(items, dungeons);
-    },
-    validateBoss(items, dungeons){
-      return RetroRegionHelper.toh(items, dungeons);
-    }
-  };
-  aga = {x:750, y:577,
-    validate(items){
-      return (items.cape || items.sword > 1);
-    },
-    validateBoss(items){
-      return items.lantern && (items.cape || items.sword > 1) && (items.sword > 0 || items.net);
-    }
-  };
 }
diff --git a/app/retro/RetroStaticMapLW.ts b/app/retro/RetroStaticMapLW.ts
index 7f248a4..55afb1b 100644
--- a/app/retro/RetroStaticMapLW.ts
+++ b/app/retro/RetroStaticMapLW.ts
@@ -1,249 +1,5 @@
 import {RetroRegionHelper} from '@/retro/RetroRegionHelper';
 import {StandardStaticMapLW} from '@/standard/StandardStaticMapLW';
 
-export class RetroStaticMapLW {
-  uncle  = {x:894, y:624, title:'Uncle', itemCount: 1, req:[], validate(items, dungeons) {
-    return true;
-  }};
-  secretPassage = {x:826, y:644, title:'Secret Passage', itemCount: 1, req:[],  validate(items, dungeons) {
-    return true;
-  }};
-  backOfEscape = {x:778, y:439, title:'Escape',
-    itemCount: 6, req:['items/glove1'],
-    validate(items, dungeons) {
-      return items.glove > 0;
-    }};
-  sahashralaHut = {x:1216, y:660, title:'Sahashrala\'s Hut', itemCount: 3,
-    req: ['items/bombs1'],
-    validate(items, dungeons) {
-      return items.bombs;
-    }
-  };
-  sahashrala = {x:1216, y:680, title:'Sahashrala', itemCount: 1,
-    req: ['crystal-green'],
-    validate(items, dungeons) {
-      let retval = false;
-      const keys = Object.keys(dungeons);
-      for(const key of keys) {
-        if(dungeons[key].crystal === 1 && dungeons[key].boss === true){
-          retval = true;
-          break;
-        }
-      }
-      return retval;
-    }
-  };
-  potionShop = {x:1201, y:502, title:'Potion Shop', itemCount: 1,
-    req:['items/mushroom1'],
-    validate(items){
-      return items.mushroom;
-    }};
-  zora = {x:1457, y:187, title:'King Zora (500 Rupees)', itemCount: 1,
-    req:['items/glove1', 'or', 'items/flippers1'],
-    validate(items){
-      return items.glove > 0 || items.flippers;
-    }
-  };
-  zoraLedge = {x:1427, y:187, title:'Zora Ledge', itemCount: 1,
-    req:['items/flippers1'],
-    validate(items){
-      return items.flippers;
-    }};
-  waterfallFairy = {x:1350, y:208, title:'Waterfall Fairy', itemCount: 2,
-    req:['items/flippers1'],
-    validate(items){
-      return items.flippers;
-    }};
-  pedestal = {x:62, y:74, title:'Master Sword Pedestal', itemCount: 1,
-    req:['crystal-green', 'crystal-blue', 'crystal-red'],
-    validate(items, dungeons){
-      let rb = 0;
-      let g = false;
-      const keys = Object.keys(dungeons);
-      for(const key of keys) {
-        if(dungeons[key].crystal === 1 && dungeons[key].boss === true){
-          g = true;
-        } else if(dungeons[key].crystal === 2 && dungeons[key].boss === true) {
-          rb = rb + 1;
-        }
-      }
-      return rb === 2 && g;
-    }};
-  kingTomb = {x: 902, y: 444, title:'King\'s Tomb', itemCount: 1,
-    req:[],
-    validate(items, dungeons){
-      return items.boots
-                && (items.glove === 2
-                || (items.mirror && RetroRegionHelper.northWestDW(items, dungeons)) && items.moonpearl);
-    }};
-  tavern = {x: 240, y:850, title:'Kakariko Tavern', itemCount: 1, req:[], validate(){
-    return true;
-  }};
-  chickenHut = {x: 146, y:814, title:'Chicken Hut', itemCount: 1,
-    req:['items/bombs1'], validate(items){
-      return items.bombs;
-    }};
-  well = {x: 38, y:639, title:'Kakariko Well', itemCount: 5,
-    req:['items/bombs1'], validate(items){
-      return items.bombs;
-    }};
-  blindhouse = {x: 193, y:632, title:'Blind\'s House', itemCount: 5,
-    req:['items/bombs1'], validate(items){
-      return items.bombs;
-    }};
-  pegasusRock = {x:595, y:440, title:'Pegasus Rocks', itemCount: 1,
-    req:['items/boots1'], validate(items){
-      return items.boots;
-    }};
-  bottleMerchant = {x:144, y:698, title:'Bottle Merchant (100 Rupees)', itemCount: 1, req:[], validate(){
-    return true;
-  }};
-  magicBat = {x:486, y:844, title:'Magic Bat', itemCount: 1,
-    req:['items/powder1', 'items/hammer1', 'or',
-      'items/powder1', 'items/moonpearl1', 'dungeons/aga_boss0', 'items/hookshot1', 'items/flippers1', 'items/glove2'],
-    validate(items, dungeons){
-      return items.powder
-                && (items.hammer
-                    || (items.mirror && items.moonpearl
-                        && (items.glove === 2 && RetroRegionHelper.northWestDW(items, dungeons))));
-    }};
-  sickKid = {x:234, y:807, title:'Sick Kid', itemCount: 1,
-    req:['items/jar1'], validate(items){
-      return items.jar > 0;
-    }};
-  lwHideout = {x:283, y:194, title:'Lost Woods Hideout', itemCount: 1, req:[], validate(){
-    return true;
-  }};
-  lumberjackTree = {x:450, y:110, title:'Lumberjack Tree', itemCount: 1,
-    req:['dungeons/aga_boss0', 'items/boots1'], validate(items, dungeons){
-      return dungeons.aga.boss && items.boots;
-    }};
-  graveyardLedge = {x:855, y:416, title:'Graveyard Ledge', itemCount: 1,
-    req:['items/mirror1', 'items/moonpearl1', 'lp', 'dungeons/aga_boss0', 'items/hookshot1', 'items/flippers1', 'rp', 'or',
-      'lp', 'items/hammer1', 'items/glove1', 'rp', 'or', 'items/glove2'],
-    validate(items, dungeons){
-      return items.mirror && items.moonpearl && RetroRegionHelper.northWestDW(items, dungeons);
-    }};
-  lwMushroom = {x:185, y:135, title:'Lost Woods Mushroom Location', itemCount: 1, req:[], validate(){
-    return true;
-  }};
-  floodChest = {x:703, y:1405, title:'Floodgate Chest', itemCount: 1, req:[], validate(){
-    return true;
-  }};
-  floodTreasure = {x:677, y:1394, title:'Floodgate Sunken Treasure', itemCount: 1, req:[], validate(){
-    return true;
-  }};
-  linkHouse =  {x:820, y:1037, title:'Link\'s House', itemCount: 1, req:[], validate(){
-    return true;
-  }};
-  sanctuary = {x:691, y:410, title:'Sanctuary', itemCount: 1, req:[], validate(){
-    return true;
-  }};
-  aginahCave = {x:298, y:1242, title:'Aginah Cave', itemCount: 1,
-    req:['items/bombs1'], validate(items){
-      return items.bombs;
-    }};
-  moldormCave =  {x:978, y:1412, title:'Mini-Moldorm Cave', itemCount: 5,
-    req:['items/bombs1'], validate(items){
-      return items.bombs;
-    }};
-  iceRodCave = {x:1342, y:1160, title:'Ice Rod Cave', itemCount: 1,
-    req:['items/bombs1'], validate(items){
-      return items.bombs;
-    }};
-  hobo = {x:1059, y:1045, title:'Hobo Under the Bridge', itemCount: 1,
-    req:['items/flippers1'], validate(items){
-      return items.flippers;
-    }};
-  bombosTablet = {x:328, y:1380, title:'Bombos Tablet', itemCount: 1,
-    req:['items/book1', 'items/sword2', 'items/mirror1', 'items/moonpearl1',
-      'lp', 'dungeons/aga_boss0', 'items/hookshot1', 'items/flippers1',
-      'rp', 'or',
-      'lp', 'items/hammer1', 'items/glove1', 'rp'],
-    validate(items, dungeons){
-      return items.book && items.sword > 1 && items.mirror && RetroRegionHelper.southDW(items, dungeons);
-    }};
-  cave45 = {x:399, y:1242, title:'Cave 45', itemCount: 1,
-    req:['items/mirror1', 'items/moonpearl1',
-      'lp', 'dungeons/aga_boss0', 'items/hookshot1', 'items/flippers1',
-      'rp', 'or',
-      'lp', 'items/hammer1', 'items/glove1', 'rp'],
-    validate(items, dungeons){
-      return items.mirror && RetroRegionHelper.southDW(items, dungeons);
-    }};
-  checkerCave = {x:263, y:1165, title:'Checkerboard Cave', itemCount: 1,
-    req:['items/mirror1', 'items/glove2', 'items/flute1'],
-    validate(items, dungeons){
-      return items.mirror && RetroRegionHelper.mireDW(items, dungeons);
-    }};
-  library = {x:243, y:990, title:'Library', itemCount: 1,
-    req:['items/boots1'], validate(items){
-      return items.boots;
-    }};
-  mazeRace = {x:148, y:1080, title:'Maze Race', itemCount: 1,
-    req:['items/bombs1'], validate(items){
-      return items.bombs;
-    }};
-  desertLedge = {x:38, y:1375, title:'Desert Ledge', itemCount: 1,
-    req:['items/book1', 'or', 'items/mirror1', 'items/glove2', 'items/flute1'],
-    validate(items, dungeons){
-      return RetroRegionHelper.dp(items, dungeons);
-    }};
-  lakeIsland = {x:1091, y:1244, title:'Lake Hylia Island', itemCount: 1,
-    req:['items/mirror1', 'items/flippers1', 'items/moonpearl1', 'lp', 'dungeons/aga_boss0', 'rp',
-      'or', 'lp', 'items/hammer1', 'items/glove1', 'rp'],
-    validate(items, dungeons){
-      return items.mirror && items.flippers && items.moonpearl && RetroRegionHelper.northEastDW(items, dungeons);
-    }};
-  fluteSpot = {x:435, y:992, title:'Flute Spot', itemCount: 1,
-    req:['items/shovel1'], validate(items){
-      return items.shovel;
-    }};
-  oldMan = {x:609, y:286, title:'Rescue Old Man', itemCount: 1,
-    req:['items/lantern1', 'lp', 'items/flute1', 'or', 'items/glove1', 'rp'],
-    validate(items, dungeons){
-      return items.lantern && RetroRegionHelper.deathMtnWestLW(items, dungeons);
-    }};
-  spectacleRockCave = {x:732, y:220, title:'Spectacle Rock Cave', itemCount: 1,
-    req:['items/flute1', 'or', 'items/glove1', 'items/lantern1'],
-    validate(items, dungeons){
-      return RetroRegionHelper.deathMtnWestLW(items, dungeons);
-    }};
-  etherTablet = {x:630, y:28, title:'Ether Tablet', itemCount: 1,
-    req:['lp', 'items/mirror1', 'or', 'items/hookshot1', 'items/hammer1', 'rp', 'and', 'lp', 'items/flute1', 'or', 'items/glove1', 'items/lantern1', 'rp'],
-    validate(items, dungeons){
-      return items.book && items.sword > 1 && RetroRegionHelper.toh(items, dungeons);
-    }};
-  spectacleRock = {x:761, y:121, title:'Spectacle Rock', itemCount: 1,
-    req:['items/mirror1', 'and', 'items/flute1', 'or', 'items/glove1', 'items/lantern1'],
-    validate(items, dungeons){
-      return items.mirror && RetroRegionHelper.deathMtnWestLW(items, dungeons);
-    }};
-  spiralCave = {x:1195, y:140, title:'Spiral Cave', itemCount: 1,
-    req:['lp', 'items/hookshot1', 'or', 'items/hammer1', 'items/mirror1', 'rp',
-      'and', 'lp', 'items/flute1', 'or', 'items/glove1', 'items/lantern1', 'rp'],
-    validate(items, dungeons){
-      return RetroRegionHelper.deathMtnEastLW(items, dungeons);
-    }};
-  mimicCave = {x:1266, y:140, title:'Mimic Cave', itemCount: 1,
-    req:['dungeons/medallion0', 'items/moonpearl1', 'items/redcane1', 'items/hammer1', 'items/glove2',
-      'lp', 'items/hookshot1', 'or', 'items/mirror1', 'rp',
-      'lp', 'items/flute1', 'or', 'items/lantern1', 'rp'],
-    validate(items, dungeons){
-      return items.hammer && items.mirror && RetroRegionHelper.tr(items, dungeons);
-    }};
-  paradoxCave = {x:1283, y:222, title:'Paradox Cave', itemCount: 7,
-    req:['lp', 'items/hookshot1', 'or', 'items/hammer1', 'items/mirror1', 'rp',
-      'and', 'lp', 'items/flute1', 'or', 'items/glove1', 'items/lantern1', 'rp'],
-    validate(items, dungeons){
-      return RetroRegionHelper.deathMtnEastLW(items, dungeons);
-    }};
-  floatingIsland = {x:1220, y:26, title:'Floating Island', itemCount: 1,
-    req:['items/mirror1', 'items/bombs1', 'items/glove1',
-      'and', 'lp', 'items/hookshot1', 'or', 'items/hammer1', 'rp',
-      'and', 'lp', 'items/flute1', 'or', 'items/lantern1', 'rp'],
-    validate(items, dungeons){
-      return items.mirror && items.bombs && items.glove > 0
-            && RetroRegionHelper.deathMtnEastDW(items, dungeons);
-    }}
+export class RetroStaticMapLW extends StandardStaticMapLW {
 }
diff --git a/app/standard/StandardRegionHelper.ts b/app/standard/StandardRegionHelper.ts
index 5a68877..3962624 100644
--- a/app/standard/StandardRegionHelper.ts
+++ b/app/standard/StandardRegionHelper.ts
@@ -46,7 +46,7 @@ export class StandardRegionHelper {
             (items.hammer || items.flippers));
   }
   static reqNorthEastDW = [
-    ['dungeons/aga_boss1'],
+    ['dungeons/aga_boss0'],
     ['items/hammer1', 'items/glove1', 'items/moonpearl1'],
     ['items/glove2', 'items/moonpearl1', 'items/hammer1'],
     ['items/glove2', 'items/moonpearl1', 'items/flippers1']
diff --git a/app/standard/StandardStaticMapDW.ts b/app/standard/StandardStaticMapDW.ts
index 73009fc..9ab99a4 100644
--- a/app/standard/StandardStaticMapDW.ts
+++ b/app/standard/StandardStaticMapDW.ts
@@ -38,8 +38,8 @@ export class StandardStaticMapDW {
     }};
   pyramidFairy = {x: 703, y: 733, title: 'Pyramid Fairy', itemCount: 2,
     req:[
-      ['dungeons/crystal3', 'dungeons/crystal4', StandardRegionHelper.reqSouthDW, 'items/mirror1', 'dungeons/aga_boss1'],
-      ['dungeons/crystal3', 'dungeons/crystal4', StandardRegionHelper.reqSouthDW, 'items/hammer1', 'items/moonpearl1']
+      ['dungeons/crystal4~', 'dungeons/crystal4', StandardRegionHelper.reqSouthDW, 'items/mirror1', 'dungeons/aga_boss0'],
+      ['dungeons/crystal4~', 'dungeons/crystal4', StandardRegionHelper.reqSouthDW, 'items/hammer1', 'items/moonpearl1']
     ],
     validate(items, dungeons){
       let c = 0;
diff --git a/app/tests/utils/RequiredItemsHelper.spec.js b/app/tests/utils/RequiredItemsHelper.spec.js
index 71710f2..a8d4753 100644
--- a/app/tests/utils/RequiredItemsHelper.spec.js
+++ b/app/tests/utils/RequiredItemsHelper.spec.js
@@ -2,7 +2,7 @@ import {RequiredItemsHelper} from '~/utils/RequiredItemsHelper';
 import {StandardStaticMapLW} from '~/standard/StandardStaticMapLW';
 import {StandardStaticMapDW} from '~/standard/StandardStaticMapDW';
 
-fdescribe('RequiredItemsHelper', () => {
+describe('RequiredItemsHelper', () => {
   const standardMapLW = new StandardStaticMapLW();
   const standardMapDW = new StandardStaticMapDW();
   const rih = new RequiredItemsHelper();
@@ -30,7 +30,7 @@ fdescribe('RequiredItemsHelper', () => {
   it('should get pyramid fairy', () => {
     listItems(standardMapDW.pyramidFairy.title, rih.getRequiredItems(standardMapDW.pyramidFairy.req));
   });
-  fit('do all dark world maps', () => {
+  it('do all dark world maps', () => {
     const keys = Object.keys(standardMapDW);
     for(const key of keys) {
       listItems(standardMapDW[key].title, rih.getRequiredItems(standardMapDW[key].req));

From b7a4b01c06ffade320172ba5cecf689ca7cc1741 Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Sun, 26 Jul 2020 14:46:20 -0600
Subject: [PATCH 04/19] Add shop required items

---
 app/components/map/LocaleModal.vue |  6 +++-
 app/retro/RetroStaticMapShopsDW.ts | 45 +++++++++++++++++-------------
 app/retro/RetroStaticMapShopsLW.ts | 16 +++++------
 3 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/app/components/map/LocaleModal.vue b/app/components/map/LocaleModal.vue
index 771e366..99a69d6 100644
--- a/app/components/map/LocaleModal.vue
+++ b/app/components/map/LocaleModal.vue
@@ -6,7 +6,7 @@
         <Image src="~/img/chest.png" width="20"/>
         <Label :text="' x'+itemCount"/>
       </StackLayout>
-      <Label v-if="requiredArr.length" text="Required Items:" marginTop="4" marginLeft="10"/>
+      <Label v-if="requiredArr.length && requiredArr[0].length" text="Required Items:" marginTop="4" marginLeft="10"/>
       <StackLayout v-for="(req, idx) of requiredArr" v-bind:key="idx" orientation="horizontal" marginLeft="10">
         <Image v-if="idx > 0" src="~/img/or.png" width="18"/>
         <Image v-for="img of req" v-bind:key="img" :src="'~/img/'+(img.replace('~',''))+'.png'" width="18" height="18" margin="2"/>
@@ -26,6 +26,8 @@
   import {RetroStaticMapLW} from '@/retro/RetroStaticMapLW';
   import {RetroStaticMapDW} from '@/retro/RetroStaticMapDW';
   import {RequiredItemsHelper} from '@/utils/RequiredItemsHelper';
+  import {RetroStaticMapShopsLW} from '@/retro/RetroStaticMapShopsLW';
+  import {RetroStaticMapShopsDW} from '@/retro/RetroStaticMapShopsDW';
 
   @Component
   export default class LocaleModal extends Vue {
@@ -67,6 +69,8 @@
           this.itemCount = loc.itemCount;
           this.takeAny = loc.takeAny;
         }
+        const staticObj = this.world === 'lightworld' ? new RetroStaticMapShopsLW() : new RetroStaticMapShopsDW();
+        this.requiredArr = this.requiredHelper.getRequiredItems(staticObj[this.localeKey].req);
       }
     }
 
diff --git a/app/retro/RetroStaticMapShopsDW.ts b/app/retro/RetroStaticMapShopsDW.ts
index d8dacf0..2996464 100644
--- a/app/retro/RetroStaticMapShopsDW.ts
+++ b/app/retro/RetroStaticMapShopsDW.ts
@@ -3,80 +3,87 @@ import {RetroRegionHelper} from '@/retro/RetroRegionHelper';
 
 export class RetroStaticMapShopsDW implements IStaticMapShopsDW{
   dwFortuneTeller = {x:281, y:487, title:'Fortune Teller',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[[RetroRegionHelper.reqNorthWestDW]], validate(items, dungeons): boolean{
       return RetroRegionHelper.northWestDW(items, dungeons);
     }};
   archeryGame = {x:322, y:1055, title:'Archery Game',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[[RetroRegionHelper.reqNorthWestDW]], validate(items, dungeons): boolean{
       return RetroRegionHelper.northWestDW(items, dungeons);
     }};
   dwSanctuaryHint = {x:692, y:416, title:'Dark Sanctuary Hint',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[[RetroRegionHelper.reqNorthWestDW]], validate(items, dungeons): boolean{
       return RetroRegionHelper.northWestDW(items, dungeons);
     }};
   dwBonkFairy = {x:709, y:977, title:'Dark Bonk Fairy',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[['items/boots1', 'items/moonpearl1', RetroRegionHelper.reqSouthDW]], validate(items, dungeons): boolean{
       return items.boots && items.moonpearl && RetroRegionHelper.southDW(items, dungeons);
     }};
   dwDesertFairy = {x:164, y:1202, title:'Mire Fairy',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[['items/moonpearl1', RetroRegionHelper.reqMireDW]], validate(items, dungeons): boolean{
       return items.moonpearl && RetroRegionHelper.mireDW(items, dungeons);
     }};
   dwDesertHint = {x:298, y:1241, title:'Mire Hint',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[['items/moonpearl1', RetroRegionHelper.reqMireDW]], validate(items, dungeons): boolean{
       return items.moonpearl && RetroRegionHelper.mireDW(items, dungeons);
     }};
   dwLakeHyliaFairy = {x:1236, y:972, title:'Dark Lake Hylia Fairy',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[[RetroRegionHelper.reqNorthEastDW]], validate(items, dungeons): boolean{
       return RetroRegionHelper.northEastDW(items, dungeons);
     }};
   podHint = {x:1274, y:758, title:'Palace of Darkness Hint',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[['items/moonpearl1', RetroRegionHelper.reqNorthEastDW]], validate(items, dungeons): boolean{
       return items.moonpearl && RetroRegionHelper.northEastDW(items, dungeons);
     }};
   dwEastHint = {x:1470, y:1054, title:'East Dark World Hint',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[['items/moonpearl1', RetroRegionHelper.reqNorthEastDW]], validate(items, dungeons): boolean{
       return items.moonpearl && RetroRegionHelper.northEastDW(items, dungeons);
     }};
   dwLakeLedgeFairy = {x:1342, y:1158, title:'Lake Hylia Ledge Fairy',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[
+      ['items/moonpearl1', 'items/flippers1', 'items/bombs1', RetroRegionHelper.reqSouthDW],
+      ['items/moonpearl1', 'items/flippers1', 'items/boots1', RetroRegionHelper.reqSouthDW]
+    ], validate(items, dungeons): boolean{
       return items.moonpearl && items.flippers && (items.bombs || items.boots) && RetroRegionHelper.southDW(items, dungeons);
     }};
   dwLakeLedgeSpikeCave = {x:1371, y:1158, title:'Lake Hylia Ledge Spike Cave',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[['items/moonpearl1', 'items/flippers1', RetroRegionHelper.reqSouthDW]], validate(items, dungeons): boolean{
       return items.moonpearl && items.flippers && RetroRegionHelper.southDW(items, dungeons);
     }};
   dwLakeLedgeHint = {x:1353, y:1178, title:'Laky Hylia Ledge Hint',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[['items/moonpearl1', 'items/flippers1', RetroRegionHelper.reqSouthDW]], validate(items, dungeons): boolean{
       return items.moonpearl && items.flippers && RetroRegionHelper.southDW(items, dungeons);
     }};
   dwDeathMtnFairy = {x:609, y:287, title:'Dark Death Mountain Fairy',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[['items/moonpearl1', RetroRegionHelper.reqDeathMtnWestLW]], validate(items, dungeons): boolean{
       return items.moonpearl && RetroRegionHelper.deathMtnWestDW(items, dungeons);
     }};
   //shops
   dwPotionShop = {x:1207, y:509, title:'Dark Potion Shop',
-    takeAny: false, req:[], validate(items, dungeons): boolean{
+    takeAny: false, req:[
+      ['items/hammer1', RetroRegionHelper.reqNorthEastDW],
+      ['items/flippers1', RetroRegionHelper.reqNorthEastDW],
+      ['items/glove1', RetroRegionHelper.reqNorthEastDW],
+    ], validate(items, dungeons): boolean{
       return (items.hammer || items.flippers || items.glove > 0) && RetroRegionHelper.northEastDW(items, dungeons);
     }};
   dwForestShop = {x:498, y:691, title:'Dark Forest Shop',
-    takeAny: false, req:[], validate(items, dungeons): boolean{
+    takeAny: false, req:[[RetroRegionHelper.reqNorthWestDW]], validate(items, dungeons): boolean{
       return RetroRegionHelper.northWestDW(items, dungeons);
     }};
   dwLumberjackHutShop = {x:504, y:88, title:'Lumberjack Hut',
-    takeAny: false, req:[], validate(items, dungeons): boolean{
+    takeAny: false, req:[[RetroRegionHelper.reqNorthWestDW]], validate(items, dungeons): boolean{
       return RetroRegionHelper.northWestDW(items, dungeons);
     }};
   dwLakeHyliaShop = {x:972, y:1207, title:'Dark Lake Hylia Shop',
-    takeAny: false, req:[], validate(items, dungeons): boolean{
+    takeAny: false, req:[[RetroRegionHelper.reqSouthDW]], validate(items, dungeons): boolean{
       return RetroRegionHelper.southDW(items, dungeons);
     }};
   dwOutcastShop = {x:304, y:802, title:'Outcast Shop',
-    takeAny: false, req:[], validate(items, dungeons): boolean{
+    takeAny: false, req:[['items/hammer1', 'items/moonpearl1', RetroRegionHelper.reqNorthWestDW]], validate(items, dungeons): boolean{
       return items.hammer && items.moonpearl && RetroRegionHelper.northWestDW(items, dungeons);
     }};
   dwDeathMtnShop = {x:1266, y:222, title:'Dark Death Mountain Shop',
-    takeAny: false, req:[], validate(items, dungeons): boolean{
+    takeAny: false, req:[['items/moonpearl1', RetroRegionHelper.reqDeathMtnEastLW]], validate(items, dungeons): boolean{
       return items.moonpearl && RetroRegionHelper.deathMtnEastLW(items, dungeons);
     }};
 
diff --git a/app/retro/RetroStaticMapShopsLW.ts b/app/retro/RetroStaticMapShopsLW.ts
index 710950d..e1458e3 100644
--- a/app/retro/RetroStaticMapShopsLW.ts
+++ b/app/retro/RetroStaticMapShopsLW.ts
@@ -27,7 +27,7 @@ export class RetroStaticMapShopsLW implements IStaticMapShopsLW{
       return RetroRegionHelper.northWestLW(items, dungeons);
     }};
   bombHut ={x:41, y:897, title:'Bomb Hut',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[['items/bombs1']], validate(items, dungeons): boolean{
       return items.bombs && RetroRegionHelper.northWestLW(items, dungeons);
     }};
   kakarikoGambleGame = {x:322, y:1054, title:'Kakariko Gamble Game',
@@ -35,7 +35,7 @@ export class RetroStaticMapShopsLW implements IStaticMapShopsLW{
       return RetroRegionHelper.northWestLW(items, dungeons);
     }};
   lwBonkFairy = {x:710, y:979, title:'Bonk Fairy',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[['items/bombs1']], validate(items, dungeons): boolean{
       return items.boots && RetroRegionHelper.southLW(items, dungeons);
     }};
   desertFairy = {x:416, y:1340, title:'Desert Fairy',
@@ -43,11 +43,11 @@ export class RetroStaticMapShopsLW implements IStaticMapShopsLW{
       return RetroRegionHelper.southLW(items, dungeons);
     }};
   fiftyRupeeCave = {x:468, y:1434, title:'50 Rupee Cave',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[['items/glove1']], validate(items, dungeons): boolean{
       return items.glove > 0 && RetroRegionHelper.southLW(items, dungeons);
     }};
   lwHypeFairy = {x:896, y:1172, title:'Hype Fairy',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[['items/bombs1']], validate(items, dungeons): boolean{
       return items.bombs && RetroRegionHelper.southLW(items, dungeons);
     }};
   lwLakeHyliaFortuneTeller = {x:973, y:1206, title:'Lake Hylia Fortune Teller',
@@ -67,15 +67,15 @@ export class RetroStaticMapShopsLW implements IStaticMapShopsLW{
       return RetroRegionHelper.southLW(items, dungeons);
     }};
   twentyRupeeCave = {x:1353, y:1177, title:'20 Rupee Cave',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[['items/glove1']], validate(items, dungeons): boolean{
       return items.glove > 0 && RetroRegionHelper.southLW(items, dungeons);
     }};
   capacityUpgrade = {x:1189, y:1282, title:'Capacity Upgrade',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[['items/flippers1']], validate(items, dungeons): boolean{
       return items.flippers && RetroRegionHelper.southLW(items, dungeons);
     }}
   hookshotFairy = {x:1266, y:221, title:'Hookshot Fairy',
-    takeAny: true, req:[], validate(items, dungeons): boolean{
+    takeAny: true, req:[[RetroRegionHelper.reqDeathMtnEastLW]], validate(items, dungeons): boolean{
       return RetroRegionHelper.deathMtnEastLW(items, dungeons);
     }};
 
@@ -89,7 +89,7 @@ export class RetroStaticMapShopsLW implements IStaticMapShopsLW{
       return RetroRegionHelper.southLW(items, dungeons);
     }};
   lwDeathMtnShop = {x:1283, y:221, title:'Death Mountain Shop',
-    takeAny: false, req:[], validate(items, dungeons): boolean{
+    takeAny: false, req:[['items/bombs1']], validate(items, dungeons): boolean{
       return items.bombs && RetroRegionHelper.deathMtnEastLW(items, dungeons);
     }};
 

From 5bb2c3ae340e8b3426ff48a8fbd04c1b6e4fcb1f Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Sun, 26 Jul 2020 15:22:12 -0600
Subject: [PATCH 05/19] Update list layouts

---
 app/components/map/DarkList.vue  | 65 +++++++++++---------------------
 app/components/map/LightList.vue | 65 +++++++++++---------------------
 2 files changed, 42 insertions(+), 88 deletions(-)

diff --git a/app/components/map/DarkList.vue b/app/components/map/DarkList.vue
index 970eac1..a6a7f5a 100644
--- a/app/components/map/DarkList.vue
+++ b/app/components/map/DarkList.vue
@@ -17,57 +17,34 @@
         <StackLayout orientation="vertical" backgroundColor="black">
           <GridLayout class="locale-wrapper" v-for="key in mapHandler.keys" v-bind:key="key"
                       :visibility="getVisible(key)"
-                      columns="*,48" rows="60"
+                      columns="36,*,36,36" rows="40"
                       :class="getBackgroundColor(mapHandler.locations[key])">
-            <StackLayout row="0" col="0" orientation="vertical" style="padding-left:5">
-              <StackLayout orientation="horizontal">
-                <Image
-                    :src="mapHandler.locations[key].checked ? '~/img/checked.png' : '~/img/unchecked.png'"
-                    width="32" height="32" @tap="clickCheck(key)" marginRight="5"/>
-                <Label class="list-title" :text="mapHandler.staticLocations[key].title"/>
-              </StackLayout>
-              <StackLayout orientation="horizontal" style="padding-right:4;padding-top:6;">
-                <!--
-                <Image v-for="img in mapHandler.staticLocations[key].req" v-bind:key="img"
-                       height="16" :src="'~/img/'+img+'.png'"/>
-                       -->
-              </StackLayout>
-            </StackLayout>
-            <StackLayout row="0" col="1" orientation="vertical">
-              <Image row="0" col="1" src="~/img/dungeons/compass1.png" width="32" height="32"
-                     @tap="clickCompass(key)" horizontalAlignment="center"/>
-              <StackLayout orientation="horizontal" style="margin-top:4;" horizontalAlignment="right">
-                <Image src="~/img/chest.png" height="16" width="16"/>
-                <Label class="list-title" fontSize="16"
-                       :text="'x'+mapHandler.staticLocations[key].itemCount"/>
-              </StackLayout>
-
+            <Image col="0"
+                   :src="mapHandler.locations[key].checked ? '~/img/checked.png' : '~/img/unchecked.png'"
+                   width="36" height="36" @tap="clickCheck(key)" marginRight="5"/>
+            <Label col="1" :fontSize="mapHandler.staticLocations[key].title.length < 23 ? 20 : 18"
+                   class="list-title" :text="mapHandler.staticLocations[key].title" verticalAlignment="center"/>
+            <StackLayout col="2" orientation="vertical">
+              <Image src="~/img/chest.png" height="16" width="16"/>
+              <Label class="list-title" fontSize="16" textAlignment="center"
+                     :text="'x'+mapHandler.staticLocations[key].itemCount"/>
             </StackLayout>
+            <Image col="3" src="~/img/dungeons/compass1.png" width="32" height="32"
+                   @tap="clickCompass(key)" horizontalAlignment="center"/>
           </GridLayout>
 
           <GridLayout class="locale-wrapper" v-for="key in shopHandler.keys" v-bind:key="key"
                       :visibility="getVisible(key, true)"
-                      columns="*,48" rows="60"
+                      columns="36,36,*,36" rows="40"
                       :class="getBackgroundColor(shopHandler.shops[key])">
-            <StackLayout row="0" col="0" orientation="vertical" style="padding-left:5">
-              <StackLayout orientation="horizontal">
-                <Image
-                    :src="shopHandler.shops[key].checked ? '~/img/checked.png' : '~/img/unchecked.png'"
-                    width="32" height="32" @tap="clickCheck(key, true)" marginRight="5"/>
-                <Label class="title" :text="shopHandler.staticLocations[key].title"/>
-              </StackLayout>
-              <StackLayout orientation="horizontal" style="padding-right:4;padding-top:6;">
-                <!--
-                <Image v-for="img in shopHandler.staticLocations[key].req" v-bind:key="img"
-                       height="15" :src="'~/img/'+img+'.png'"/>
-                       -->
-              </StackLayout>
-            </StackLayout>
-            <StackLayout row="0" col="1" orientation="vertical">
-              <Image src="~/img/dungeons/compass1.png" width="32" height="32"
-                     @tap="clickCompass(key, true)" horizontalAlignment="center"/>
-              <Image height="16" :src="shopHandler.staticLocations[key].takeAny ? '~/img/takeAny.png' : '~/img/shopDW.png'" marginTop="4"/>
-            </StackLayout>
+            <Image col="0"
+                   :src="shopHandler.shops[key].checked ? '~/img/checked.png' : '~/img/unchecked.png'"
+                   width="32" height="32" @tap="clickCheck(key, true)" marginRight="5"/>
+            <Image col="1" height="28" :src="shopHandler.staticLocations[key].takeAny ? '~/img/takeAny.png' : '~/img/shopDW.png'" marginRight="5" />
+            <Label col="2" :fontSize="shopHandler.staticLocations[key].title.length < 23 ? 20 : 18"
+                   class="title" :text="shopHandler.staticLocations[key].title" verticalAlignment="center"/>
+            <Image col="3" src="~/img/dungeons/compass1.png" width="32" height="32"
+                   @tap="clickCompass(key, true)" horizontalAlignment="center"/>
           </GridLayout>
         </StackLayout>
       </ScrollView>
diff --git a/app/components/map/LightList.vue b/app/components/map/LightList.vue
index d4f4617..35d8744 100644
--- a/app/components/map/LightList.vue
+++ b/app/components/map/LightList.vue
@@ -17,57 +17,34 @@
         <StackLayout orientation="vertical" backgroundColor="black">
           <GridLayout class="locale-wrapper" v-for="key in mapHandler.keys" v-bind:key="key"
                       :visibility="getVisible(key)"
-                      columns="*,48" rows="60"
+                      columns="36,*,36,36" rows="40"
                       :class="getBackgroundColor(mapHandler.locations[key])">
-            <StackLayout row="0" col="0" orientation="vertical" style="padding-left:5">
-              <StackLayout orientation="horizontal">
-                <Image
-                    :src="mapHandler.locations[key].checked ? '~/img/checked.png' : '~/img/unchecked.png'"
-                    width="32" height="32" @tap="clickCheck(key)" marginRight="5"/>
-                <Label class="list-title" :text="mapHandler.staticLocations[key].title"/>
-              </StackLayout>
-              <StackLayout orientation="horizontal" style="padding-right:4;padding-top:6;">
-                <!--
-                <Image v-for="img in mapHandler.staticLocations[key].req" v-bind:key="img"
-                       height="16" :src="'~/img/'+img+'.png'" />
-                       -->
-              </StackLayout>
-            </StackLayout>
-            <StackLayout row="0" col="1" orientation="vertical">
-              <Image row="0" col="1" src="~/img/dungeons/compass1.png" width="32" height="32"
-                     @tap="clickCompass(key)" horizontalAlignment="center"/>
-              <StackLayout orientation="horizontal" style="margin-top:4;" horizontalAlignment="right">
-                <Image src="~/img/chest.png" height="16" width="16" />
-                <Label class="list-title" fontSize="16"
-                       :text="'x'+mapHandler.staticLocations[key].itemCount"/>
-              </StackLayout>
-
+            <Image col="0"
+                   :src="mapHandler.locations[key].checked ? '~/img/checked.png' : '~/img/unchecked.png'"
+                   width="36" height="36" @tap="clickCheck(key)" marginRight="5"/>
+            <Label col="1" :fontSize="mapHandler.staticLocations[key].title.length < 23 ? 20 : 18"
+                   class="list-title" :text="mapHandler.staticLocations[key].title" verticalAlignment="center"/>
+            <StackLayout col="2" orientation="vertical">
+              <Image src="~/img/chest.png" height="16" width="16"/>
+              <Label class="list-title" fontSize="16" textAlignment="center"
+                     :text="'x'+mapHandler.staticLocations[key].itemCount"/>
             </StackLayout>
+            <Image col="3" src="~/img/dungeons/compass1.png" width="32" height="32"
+                   @tap="clickCompass(key)" horizontalAlignment="center"/>
           </GridLayout>
 
           <GridLayout class="locale-wrapper" v-for="key in shopHandler.keys" v-bind:key="key"
                       :visibility="getVisible(key, true)"
-                      columns="*,48" rows="60"
+                      columns="36,36,*,36" rows="40"
                       :class="getBackgroundColor(shopHandler.shops[key])">
-            <StackLayout row="0" col="0" orientation="vertical" style="padding-left:5">
-              <StackLayout orientation="horizontal">
-                <Image
-                    :src="shopHandler.shops[key].checked ? '~/img/checked.png' : '~/img/unchecked.png'"
-                    width="32" height="32" @tap="clickCheck(key, true)" marginRight="5"/>
-                <Label class="title" :text="shopHandler.staticLocations[key].title"/>
-              </StackLayout>
-              <StackLayout orientation="horizontal" style="padding-right:4;padding-top:6;">
-                <!--
-                <Image v-for="img in shopHandler.staticLocations[key].req" v-bind:key="img"
-                       height="15" :src="'~/img/'+img+'.png'"/>
-                       -->
-              </StackLayout>
-            </StackLayout>
-            <StackLayout row="0" col="1" orientation="vertical">
-              <Image row="0" col="1" src="~/img/dungeons/compass1.png" width="32" height="32"
-                     @tap="clickCompass(key, true)" horizontalAlignment="center"/>
-              <Image height="16" :src="shopHandler.staticLocations[key].takeAny ? '~/img/takeAny.png' : '~/img/shopLW.png'" marginTop="4"/>
-            </StackLayout>
+            <Image col="0"
+                   :src="shopHandler.shops[key].checked ? '~/img/checked.png' : '~/img/unchecked.png'"
+                   width="32" height="32" @tap="clickCheck(key, true)" marginRight="5"/>
+            <Image col="1" height="28" :src="shopHandler.staticLocations[key].takeAny ? '~/img/takeAny.png' : '~/img/shopDW.png'" marginRight="5" />
+            <Label col="2" :fontSize="shopHandler.staticLocations[key].title.length < 23 ? 20 : 18"
+                   class="title" :text="shopHandler.staticLocations[key].title" verticalAlignment="center"/>
+            <Image col="3" src="~/img/dungeons/compass1.png" width="32" height="32"
+                   @tap="clickCompass(key, true)" horizontalAlignment="center"/>
           </GridLayout>
         </StackLayout>
       </ScrollView>

From a94cd55e340602d568cd68b77d615e80948cc8d5 Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Sun, 26 Jul 2020 16:13:13 -0600
Subject: [PATCH 06/19] Update required items for inverted

---
 app/components/map/DarkList.vue      |   6 ++
 app/components/map/LightList.vue     |   6 ++
 app/inverted/InvertedRegionHelper.ts |  73 ++++++++++++++----
 app/inverted/InvertedStaticMapLW.ts  | 111 ++++++++++++++++-----------
 4 files changed, 134 insertions(+), 62 deletions(-)

diff --git a/app/components/map/DarkList.vue b/app/components/map/DarkList.vue
index a6a7f5a..3d2db8c 100644
--- a/app/components/map/DarkList.vue
+++ b/app/components/map/DarkList.vue
@@ -23,6 +23,7 @@
                    :src="mapHandler.locations[key].checked ? '~/img/checked.png' : '~/img/unchecked.png'"
                    width="36" height="36" @tap="clickCheck(key)" marginRight="5"/>
             <Label col="1" :fontSize="mapHandler.staticLocations[key].title.length < 23 ? 20 : 18"
+                   @longpress="onLongPress(key, 'location')"
                    class="list-title" :text="mapHandler.staticLocations[key].title" verticalAlignment="center"/>
             <StackLayout col="2" orientation="vertical">
               <Image src="~/img/chest.png" height="16" width="16"/>
@@ -42,6 +43,7 @@
                    width="32" height="32" @tap="clickCheck(key, true)" marginRight="5"/>
             <Image col="1" height="28" :src="shopHandler.staticLocations[key].takeAny ? '~/img/takeAny.png' : '~/img/shopDW.png'" marginRight="5" />
             <Label col="2" :fontSize="shopHandler.staticLocations[key].title.length < 23 ? 20 : 18"
+                   @longpress="onLongPress(key, 'shop')"
                    class="title" :text="shopHandler.staticLocations[key].title" verticalAlignment="center"/>
             <Image col="3" src="~/img/dungeons/compass1.png" width="32" height="32"
                    @tap="clickCompass(key, true)" horizontalAlignment="center"/>
@@ -55,6 +57,7 @@
 <script type="ts">
   import {Component, Vue, Ref} from 'vue-property-decorator';
   import DarkMap from '@/components/map/DarkMap.vue';
+  import LocaleModal from '@/components/map/LocaleModal.vue';
 
   @Component
   export default class DarkList extends Vue {
@@ -161,6 +164,9 @@
       this.filterList = this.$modelManager.map.darkworld.filterList = val;
       this.$modelManager.saveMap();
     }
+    async onLongPress(key, type) {
+      await this.$showModal(LocaleModal, {props:{localeKey:key, world:'darkworld', type:type}});
+    }
   }
 </script>
 
diff --git a/app/components/map/LightList.vue b/app/components/map/LightList.vue
index 35d8744..7968b48 100644
--- a/app/components/map/LightList.vue
+++ b/app/components/map/LightList.vue
@@ -23,6 +23,7 @@
                    :src="mapHandler.locations[key].checked ? '~/img/checked.png' : '~/img/unchecked.png'"
                    width="36" height="36" @tap="clickCheck(key)" marginRight="5"/>
             <Label col="1" :fontSize="mapHandler.staticLocations[key].title.length < 23 ? 20 : 18"
+                   @longpress="onLongPress(key, 'location')"
                    class="list-title" :text="mapHandler.staticLocations[key].title" verticalAlignment="center"/>
             <StackLayout col="2" orientation="vertical">
               <Image src="~/img/chest.png" height="16" width="16"/>
@@ -42,6 +43,7 @@
                    width="32" height="32" @tap="clickCheck(key, true)" marginRight="5"/>
             <Image col="1" height="28" :src="shopHandler.staticLocations[key].takeAny ? '~/img/takeAny.png' : '~/img/shopDW.png'" marginRight="5" />
             <Label col="2" :fontSize="shopHandler.staticLocations[key].title.length < 23 ? 20 : 18"
+                   @longpress="onLongPress(key, 'shop')"
                    class="title" :text="shopHandler.staticLocations[key].title" verticalAlignment="center"/>
             <Image col="3" src="~/img/dungeons/compass1.png" width="32" height="32"
                    @tap="clickCompass(key, true)" horizontalAlignment="center"/>
@@ -55,6 +57,7 @@
 <script type="ts">
   import {Component, Vue, Ref} from 'vue-property-decorator';
   import LightMap from '@/components/map/LightMap.vue';
+  import LocaleModal from '@/components/map/LocaleModal.vue';
 
   @Component
   export default class LightList extends Vue {
@@ -161,6 +164,9 @@
       this.filterList = this.$modelManager.map.lightworld.filterList = val;
       this.$modelManager.saveMap();
     }
+    async onLongPress(key, type) {
+      await this.$showModal(LocaleModal, {props:{localeKey:key, world:'lightworld', type:type}});
+    }
   }
 </script>
 
diff --git a/app/inverted/InvertedRegionHelper.ts b/app/inverted/InvertedRegionHelper.ts
index b59c070..2a497f8 100644
--- a/app/inverted/InvertedRegionHelper.ts
+++ b/app/inverted/InvertedRegionHelper.ts
@@ -4,44 +4,89 @@ export class InvertedRegionHelper {
     return dungeons.aga.boss
             || items.moonpearl && (items.hammer && items.glove > 0 || items.glove === 2);
   }
+  static reqNorthEastLW = [
+    ['dungeons/aga_boss0'],
+    ['items/moonpearl1', 'items/hammer1', 'items/glove1'],
+    ['items/moonpearl1', 'items/glove2']
+  ];
   static northWestLW(items, dungeons) {
     return this.northEastLW(items, dungeons);
   }
+  static reqNorthWestLW = InvertedRegionHelper.reqNorthEastLW;
+  static activeFlute(items, dungeons) {
+    return items.flute && (dungeons.aga.boss
+      || items.moonpearl && (items.hammer && items.glove > 0 || items.glove === 2));
+  }
+  static reqActiveFlute = [
+    ['items/flute1', 'dungeons/aga_boss0'],
+    ['items/flute1', 'items/moonpearl1', 'items/hammer1', 'items/glove1'],
+    ['items/flute1', 'items/moonpearl1', 'items/glove2']
+  ];
   static southLW(items, dungeons) {
     return this.northEastLW(items, dungeons);
   }
+  static reqSouthLW = InvertedRegionHelper.reqNorthEastLW;
+  static deathMtnWestLW(items, dungeons) {
+    return (this.activeFlute(items, dungeons) || (items.glove > 0 && items.lantern));
+  }
+  static reqDeathMtnWestLW = [
+    [InvertedRegionHelper.reqActiveFlute],
+    ['items/glove1', 'items/lantern1']
+  ];
+  static deathMtnWestDW(items, dungeons) {
+    return (this.activeFlute(items, dungeons) || (items.glove > 0 && items.lantern));
+  }
+  static reqDeathMtnWestDW = [
+    [InvertedRegionHelper.reqActiveFlute],
+    ['items/glove1', 'items/lantern1']
+  ];
+  static deathMtnEastDW(items, dungeons) {
+    return (this.deathMtnWestDW(items, dungeons))
+      || (items.mirror && items.moonpearl && items.hookshot && this.deathMtnWestLW(items, dungeons));
+  }
+  static reqDeathMtnEastDW = [
+    [InvertedRegionHelper.reqDeathMtnWestDW],
+    ['items/mirror1', 'items/moonpearl1', 'items/hookshot1', InvertedRegionHelper.reqDeathMtnWestLW]
+  ];
   static deathMtnEastLW(items, dungeons) {
     return (items.glove === 2 && this.deathMtnEastDW(items, dungeons))
       || (this.deathMtnWestLW(items, dungeons)
-      && items.moonpearl && items.hookshot);
+        && items.moonpearl && items.hookshot);
   }
-  static deathMtnWestLW(items, dungeons) {
-    return (this.activeFlute(items, dungeons) || (items.glove > 0 && items.lantern));
-  }
-  // dark world
+  static reqDeathMtnEastLW = [
+    ['items/glove2', InvertedRegionHelper.reqDeathMtnEastDW],
+    ['items/moonpearl1', 'items/hookshot1', InvertedRegionHelper.reqDeathMtnWestLW]
+  ];
   static mireDW(items, dungeons) {
     return this.activeFlute(items, dungeons) || (items.mirror && this.southLW(items, dungeons));
   }
+  static reqMireDW = [
+    [InvertedRegionHelper.reqActiveFlute],
+    ['items/mirror1', InvertedRegionHelper.reqSouthLW]
+  ];
   static northEastDW(items, dungeons) {
     return this.activeFlute(items, dungeons) || items.hammer || items.flippers || (items.mirror && this.northEastLW(items, dungeons));
   }
+  static reqNorthEastDW = [
+    [InvertedRegionHelper.reqActiveFlute],
+    ['items/hammer1'],
+    ['items/flippers1'],
+    ['items/mirror1', InvertedRegionHelper.reqNorthEastLW]
+  ];
   static northWestDW(items, dungeons) {
     return true;
   }
   static southDW(items, dungeons) {
     return true;
   }
-  static deathMtnEastDW(items, dungeons) {
-    return (this.deathMtnWestDW(items, dungeons))
-      || (items.mirror && items.moonpearl && items.hookshot && this.deathMtnWestLW(items, dungeons));
-  }
-  static deathMtnWestDW(items, dungeons) {
-    return (this.activeFlute(items, dungeons) || (items.glove > 0 && items.lantern));
-  }
   static toh(items, dungeons) {
     return (items.hookshot || items.glove === 2) && items.hammer
             && this.deathMtnWestLW(items, dungeons);
   }
+  static reqToh = [
+    [InvertedRegionHelper.reqDeathMtnWestLW, 'items/hammer1', 'items/hookshot1'],
+    [InvertedRegionHelper.reqDeathMtnWestLW, 'items/hammer1', 'items/glove2']
+  ];
   static mm(items, dungeons) {
     const m = (dungeons.mm.medallion === 1 && items.bombos) ||
             (dungeons.mm.medallion === 2 && items.ether) ||
@@ -65,8 +110,4 @@ export class InvertedRegionHelper {
     }
     return c >= settings.openGT && items.moonpearl && this.northEastLW(items, dungeons);
   }
-  static activeFlute(items, dungeons) {
-    return items.flute && (dungeons.aga.boss
-    || items.moonpearl && (items.hammer && items.glove > 0 || items.glove === 2));
-  }
 }
diff --git a/app/inverted/InvertedStaticMapLW.ts b/app/inverted/InvertedStaticMapLW.ts
index c7210d2..f118b82 100644
--- a/app/inverted/InvertedStaticMapLW.ts
+++ b/app/inverted/InvertedStaticMapLW.ts
@@ -2,26 +2,26 @@ import {InvertedRegionHelper} from '@/inverted/InvertedRegionHelper';
 
 export class InvertedStaticMapLW {
   uncle = {x:894, y:624, title:'Inverted Uncle', itemCount: 1,
-    req:[], validate(items, dungeons) {
+    req:[['items/moonpearl1', InvertedRegionHelper.reqNorthEastLW]], validate(items, dungeons) {
       return items.moonpearl && InvertedRegionHelper.northEastLW(items, dungeons);
     }};
   secretPassage = {x:826, y:644, title:'Secret Passage', itemCount: 1,
-    req:[],  validate(items, dungeons) {
+    req:[['items/moonpearl1', InvertedRegionHelper.reqNorthEastLW]],  validate(items, dungeons) {
       return items.moonpearl && InvertedRegionHelper.northEastLW(items, dungeons);
     }};
   backOfEscape = {x:778, y:439, title:'Escape',
-    itemCount: 6, req:[],
+    itemCount: 6, req:[['items/moonpearl1', 'items/glove1', InvertedRegionHelper.reqNorthEastLW]],
     validate(items, dungeons) {
       return InvertedRegionHelper.northEastLW(items, dungeons) && items.moonpearl && items.glove > 0;
     }};
   sahashralaHut = {x:1216, y:660, title:'Sahashrala\'s Hut', itemCount: 3,
-    req: [],
+    req: [['items/moonpearl1', 'items/bombs1', InvertedRegionHelper.reqNorthEastLW]],
     validate(items, dungeons) {
       return InvertedRegionHelper.northEastLW(items, dungeons) && items.moonpearl && items.bombs;
     }
   };
   sahashrala = {x:1216, y:680, title:'Sahashrala', itemCount: 1,
-    req: [],
+    req: [['crystal-green', InvertedRegionHelper.reqNorthEastLW]],
     validate(items, dungeons) {
       let retval = false;
       const keys = Object.keys(dungeons);
@@ -35,29 +35,32 @@ export class InvertedStaticMapLW {
     }
   };
   potionShop = {x:1201, y:502, title:'Potion Shop', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqNorthEastLW, 'items/mushroom1', 'items/moonpearl1']],
     validate(items, dungeons){
       return items.mushroom && InvertedRegionHelper.northEastLW(items, dungeons) && items.moonpearl;
     }};
   zora = {x:1457, y:187, title:'King Zora (500 Rupees)', itemCount: 1,
-    req:[],
+    req:[
+      [InvertedRegionHelper.reqNorthEastLW, 'items/moonpearl1', 'items/glove1'],
+      [InvertedRegionHelper.reqNorthEastLW, 'items/moonpearl1', 'items/flippers1'],
+    ],
     validate(items, dungeons){
       return  InvertedRegionHelper.northEastLW(items, dungeons) && items.moonpearl
                 && (items.glove > 0 || items.flippers);
     }
   };
   zoraLedge = {x:1427, y:187, title:'Zora Ledge', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqNorthEastLW, 'items/moonpearl1', 'items/flippers1']],
     validate(items, dungeons){
       return InvertedRegionHelper.northEastLW(items, dungeons) && items.moonpearl && items.flippers;
     }};
   waterfallFairy = {x:1350, y:208, title:'Waterfall Fairy', itemCount: 2,
-    req:[],
+    req:[[InvertedRegionHelper.reqNorthEastLW, 'items/moonpearl1', 'items/flippers1']],
     validate(items, dungeons){
       return InvertedRegionHelper.northEastLW(items, dungeons) && items.moonpearl && items.flippers;
     }};
   pedestal = {x:62, y:74, title:'Master Sword Pedestal', itemCount: 1,
-    req:[],
+    req:[['crystal-green', 'crystal-red', 'crystal-blue', InvertedRegionHelper.reqNorthWestLW]],
     validate(items, dungeons){
       let rb = 0;
       let g = false;
@@ -72,171 +75,187 @@ export class InvertedStaticMapLW {
       return InvertedRegionHelper.northWestLW(items, dungeons) && rb === 2 && g;
     }};
   kingTomb = {x: 902, y: 444, title:'King\'s Tomb', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqNorthWestLW, 'items/boots1', 'items/moonpearl1', 'items/glove2']],
     validate(items, dungeons){
       return InvertedRegionHelper.northWestLW(items, dungeons)
                 && items.boots && items.moonpearl
                 && items.glove === 2;
     }};
   tavern = {x: 240, y:850, title:'Kakariko Tavern', itemCount: 1,
-    req:[], validate(items, dungeons){
+    req:[['items/moonpearl1', InvertedRegionHelper.reqNorthWestLW]],
+    validate(items, dungeons){
       return InvertedRegionHelper.northWestLW(items, dungeons) && items.moonpearl;
     }};
   chickenHut = {x: 146, y:814, title:'Chicken Hut', itemCount: 1,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqNorthWestLW, 'items/moonpearl1', 'items/bombs1']],
+    validate(items, dungeons){
       return InvertedRegionHelper.northWestLW(items, dungeons) && items.moonpearl && items.bombs;
     }};
   well = {x: 38, y:639, title:'Kakariko Well', itemCount: 5,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqNorthWestLW, 'items/moonpearl1', 'items/bombs1']],
+    validate(items, dungeons){
       return InvertedRegionHelper.northWestLW(items, dungeons) && items.moonpearl && items.bombs;
     }};
   blindhouse = {x: 193, y:632, title:'Blind\'s House', itemCount: 5,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqNorthWestLW, 'items/moonpearl1', 'items/bombs1']],
+    validate(items, dungeons){
       return InvertedRegionHelper.northWestLW(items, dungeons) && items.moonpearl && items.bombs;
     }};
   pegasusRock = {x:595, y:440, title:'Pegasus Rocks', itemCount: 1,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqNorthWestLW, 'items/moonpearl1', 'items/boots1']],
+    validate(items, dungeons){
       return InvertedRegionHelper.northWestLW(items, dungeons) && items.moonpearl && items.boots;
     }};
   bottleMerchant = {x:144, y:698, title:'Bottle Merchant (100 Rupees)', itemCount: 1,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqNorthWestLW]], validate(items, dungeons){
       return InvertedRegionHelper.northWestLW(items, dungeons);
     }};
   magicBat = {x:486, y:844, title:'Magic Bat', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqNorthWestLW, 'items/moonpearl1', 'items/hammer1', 'items/powder1']],
     validate(items, dungeons){
       return InvertedRegionHelper.northWestLW(items, dungeons)
                 && items.hammer && items.powder && items.moonpearl;
     }};
   sickKid = {x:234, y:807, title:'Sick Kid', itemCount: 1,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqNorthWestLW, 'items/jar1']],
+    validate(items, dungeons){
       return InvertedRegionHelper.northWestLW(items, dungeons) && items.jar > 0;
     }};
   lwHideout = {x:283, y:194, title:'Lost Woods Hideout', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqNorthWestLW, 'items/moonpearl1']],
     validate(items, dungeons){
       return items.moonpearl && InvertedRegionHelper.northWestLW(items, dungeons);
     }
   };
   lumberjackTree = {x:450, y:110, title:'Lumberjack Tree', itemCount: 1,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqNorthWestLW, 'items/moonpearl1', 'items/boots1', 'dungeons/aga_boss0']],
+    validate(items, dungeons){
       return InvertedRegionHelper.northWestLW(items, dungeons) && dungeons.aga.boss && items.boots && items.moonpearl;
     }
   };
   graveyardLedge = {x:855, y:416, title:'Graveyard Ledge', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqNorthWestLW, 'items/moonpearl1', 'items/bombs1']],
     validate(items, dungeons){
       return items.moonpearl && items.bombs && InvertedRegionHelper.northWestLW(items, dungeons);
     }};
   lwMushroom = {x:185, y:135, title:'Lost Woods Mushroom Location', itemCount: 1,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqNorthWestLW, 'items/moonpearl1']],
+    validate(items, dungeons){
       return InvertedRegionHelper.northWestLW(items, dungeons) && items.moonpearl;
     }
   };
   floodChest = {x:703, y:1405, title:'Floodgate Chest', itemCount: 1,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqSouthLW, 'items/moonpearl1']],
+    validate(items, dungeons){
       return InvertedRegionHelper.southLW(items, dungeons) && items.moonpearl;
     }};
   floodTreasure = {x:677, y:1394, title:'Floodgate Sunken Treasure', itemCount: 1,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqSouthLW, 'items/moonpearl1']], validate(items, dungeons){
       return InvertedRegionHelper.southLW(items, dungeons) && items.moonpearl;
     }};
   sanctuary = {x:691, y:410, title:'Sanctuary', itemCount: 1,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqNorthEastLW, 'items/moonpearl1']], validate(items, dungeons){
       return items.moonpearl && InvertedRegionHelper.northEastLW(items, dungeons);
     }};
   aginahCave = {x:298, y:1242, title:'Aginah Cave', itemCount: 1,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqSouthLW, 'items/moonpearl1', 'items/bombs1']],
+    validate(items, dungeons){
       return InvertedRegionHelper.southLW(items, dungeons) && items.moonpearl && items.bombs;
     }};
   moldormCave = {x:978, y:1412, title:'Mini-Moldorm Cave', itemCount: 5,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqSouthLW, 'items/moonpearl1']],
+    validate(items, dungeons){
       return InvertedRegionHelper.southLW(items, dungeons) && items.moonpearl;
     }};
   iceRodCave = {x:1342, y:1160, title:'Ice Rod Cave', itemCount: 1,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqSouthLW, 'items/moonpearl1', 'items/bombs1']],
+    validate(items, dungeons){
       return InvertedRegionHelper.southLW(items, dungeons) && items.moonpearl && items.bombs;
     }};
   hobo = {x:1059, y:1045, title:'Hobo Under the Bridge', itemCount: 1,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqSouthLW, 'items/moonpearl1', 'items/flippers1']],
+    validate(items, dungeons){
       return InvertedRegionHelper.southLW(items, dungeons) && items.moonpearl && items.flippers;
     }};
   bombosTablet = {x:328, y:1380, title:'Bombos Tablet', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqSouthLW, 'items/book1', 'items/sword2']],
     validate(items, dungeons){
       return items.book && items.sword > 1 && InvertedRegionHelper.southLW(items, dungeons);
     }};
   cave45 = {x:399, y:1242, title:'Cave 45', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqSouthLW, 'items/moonpearl1']],
     validate(items, dungeons){
       return InvertedRegionHelper.southLW(items, dungeons) && items.moonpearl;
     }};
   checkerCave = {x:263, y:1165, title:'Checkerboard Cave', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqSouthLW, 'items/moonpearl1', 'items/glove1']],
     validate(items, dungeons){
       return InvertedRegionHelper.southLW(items, dungeons) && items.moonpearl && items.glove>0;
     }};
   library = {x:243, y:990, title:'Library', itemCount: 1,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqSouthLW, 'items/moonpearl1', 'items/boots1']],
+    validate(items, dungeons){
       return InvertedRegionHelper.southLW(items, dungeons) && items.moonpearl && items.boots;
     }};
   mazeRace = {x:148, y:1080, title:'Maze Race', itemCount: 1,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqSouthLW, 'items/moonpearl1', 'items/bombs1']],
+    validate(items, dungeons){
       return InvertedRegionHelper.southLW(items, dungeons) && items.moonpearl && items.bombs;
     }};
   desertLedge = {x:38, y:1375, title:'Desert Ledge', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqSouthLW, 'items/moonpearl1', 'items/book1']],
     validate(items, dungeons){
       return InvertedRegionHelper.southLW(items, dungeons) && items.moonpearl && items.book;
     }};
   lakeIsland = {x:1091, y:1244, title:'Lake Hylia Island', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqSouthLW, 'items/moonpearl1', 'items/flippers1']],
     validate(items, dungeons){
       return InvertedRegionHelper.southLW(items, dungeons) && items.moonpearl && items.flippers;
     }};
   fluteSpot = {x:435, y:992, title:'Flute Spot', itemCount: 1,
-    req:[], validate(items, dungeons){
+    req:[[InvertedRegionHelper.reqSouthLW, 'items/moonpearl1', 'items/shovel1']],
+    validate(items, dungeons){
       return InvertedRegionHelper.southLW(items, dungeons) && items.moonpearl && items.shovel;
     }};
   bumperCave = {x:532, y:268, title:'Bumper Cave', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqNorthEastLW, 'items/moonpearl1', 'items/cape1', 'items/mirror1']],
     validate(items, dungeons){
       return items.cape && items.moonpearl && items.mirror && InvertedRegionHelper.northEastLW(items, dungeons);
     }};
   spectacleRockCave = {x:732, y:220, title:'Spectacle Rock Cave', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqDeathMtnWestLW]],
     validate(items, dungeons){
       return InvertedRegionHelper.deathMtnWestLW(items, dungeons);
     }};
   etherTablet = {x:630, y:28, title:'Ether Tablet', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqToh && 'items/book1','items/sword2', 'items/hammer1']],
     validate(items, dungeons){
       return items.moonpearl && InvertedRegionHelper.toh(items, dungeons)
             && items.book && items.sword > 1 && items.hammer;
     }};
   spectacleRock = {x:761, y:121, title:'Spectacle Rock', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqDeathMtnEastLW, 'items/hammer1', 'items/moonpearl1']],
     validate(items, dungeons){
       return items.hammer && items.moonpearl && InvertedRegionHelper.deathMtnEastLW(items, dungeons);
     }};
   spiralCave = {x:1195, y:140, title:'Spiral Cave', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqDeathMtnEastLW, 'items/moonpearl1']],
     validate(items, dungeons){
       return items.moonpearl && InvertedRegionHelper.deathMtnEastLW(items, dungeons);
     }};
   mimicCave = {x:1266, y:140, title:'Mimic Cave', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqDeathMtnEastLW, 'items/hammer1', 'items/moonpearl1']],
     validate(items, dungeons){
       return items.hammer && items.moonpearl && InvertedRegionHelper.deathMtnEastLW(items, dungeons);
     }};
   paradoxCave = {x:1283, y:222, title:'Paradox Cave', itemCount: 7,
-    req:[],
+    req:[[InvertedRegionHelper.reqDeathMtnEastLW, 'items/moonpearl1', 'items/bombs1']],
     validate(items, dungeons){
       return items.moonpearl && InvertedRegionHelper.deathMtnEastLW(items, dungeons)
             && items.bombs;
     }};
   floatingIsland = {x:1220, y:26, title:'Floating Island', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqDeathMtnEastLW]],
     validate(items, dungeons){
       return InvertedRegionHelper.deathMtnEastLW(items, dungeons);
     }};

From 6ceea7c88a09110bc69bf2943728d8f1e38056b7 Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Sun, 26 Jul 2020 17:15:59 -0600
Subject: [PATCH 07/19] Update required items for inverted DW

---
 app/inverted/InvertedStaticMapDW.ts | 46 +++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/app/inverted/InvertedStaticMapDW.ts b/app/inverted/InvertedStaticMapDW.ts
index 85ddd09..a97efc1 100644
--- a/app/inverted/InvertedStaticMapDW.ts
+++ b/app/inverted/InvertedStaticMapDW.ts
@@ -2,24 +2,32 @@ import {InvertedRegionHelper} from '@/inverted/InvertedRegionHelper';
 
 export class InvertedStaticMapDW {
   superbunnyCave = {x: 1265, y: 223, title: 'Superbunny Cave', itemCount: 2,
-    req:[],
+    req:[[InvertedRegionHelper.reqDeathMtnEastDW]],
     validate(items, dungeons){
       return InvertedRegionHelper.deathMtnEastDW(items, dungeons);
     }};
   hookshotCave = {x: 1247, y: 99, title: 'Hookshot Cave', itemCount: 4,
-    req:[],
+    req:[
+      [InvertedRegionHelper.reqDeathMtnEastDW, 'items/hookshot1'],
+      [InvertedRegionHelper.reqDeathMtnEastDW, 'items/boots1']
+    ],
     validate(items, dungeons){
       return (items.hookshot || items.boots) && InvertedRegionHelper.deathMtnEastDW(items, dungeons);
     }};
   spikeCave = {x: 862, y: 221, title: 'Spike Cave', itemCount: 1,
-    req:[],
+    req:[
+      [InvertedRegionHelper.reqDeathMtnWestDW, 'items/hammer1', 'items/glove1', 'items/jar1', 'items/cape1'],
+      [InvertedRegionHelper.reqDeathMtnWestDW, 'items/hammer1', 'items/glove1', 'items/jar1', 'items/bluecane1'],
+      [InvertedRegionHelper.reqDeathMtnWestDW, 'items/hammer1', 'items/glove1', 'items/halfmagic1', 'items/cape1'],
+      [InvertedRegionHelper.reqDeathMtnWestDW, 'items/hammer1', 'items/glove1', 'items/halfmagic1', 'items/bluecane1'],
+    ],
     validate(items, dungeons){
       return (items.jar > 0 || items.halfmagic) && items.hammer
         && items.glove>0 && (items.cape || items.bluecane)
         && InvertedRegionHelper.deathMtnWestDW(items, dungeons);
     }};
   catfish = {x: 1341, y: 257, title: 'Catfish', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqNorthEastDW, 'items/glove1']],
     validate(items, dungeons){
       return items.glove > 0 && InvertedRegionHelper.northEastDW(items, dungeons);
     }};
@@ -28,12 +36,12 @@ export class InvertedStaticMapDW {
       return true;
     }};
   pyramid = {x: 870, y: 670, title: 'Pyramid', itemCount: 1,
-    req:[],
+    req:[[InvertedRegionHelper.reqNorthEastDW]],
     validate(items, dungeons){
       return InvertedRegionHelper.northEastDW(items, dungeons);
     }};
   pyramidFairy = {x: 703, y: 733, title: 'Pyramid Fairy', itemCount: 2,
-    req:[],
+    req:[['dungeons/crystal4~', 'dungeons/crystal4', 'items/mirror1', InvertedRegionHelper.reqNorthEastDW]],
     validate(items, dungeons){
       let c = 0;
       const keys = Object.keys(dungeons);
@@ -45,7 +53,7 @@ export class InvertedStaticMapDW {
       return c === 2 && items.mirror && InvertedRegionHelper.northEastDW(items, dungeons);
     }};
   brewery = {x: 163, y: 878, title: 'Brewery', itemCount: 1,
-    req:[],
+    req:[['items/bombs1']],
     validate(items, dungeons){
       return items.bombs;
     }};
@@ -60,32 +68,44 @@ export class InvertedStaticMapDW {
       return true;
     }};
   hammerPegs = {x: 474, y: 908, title: 'Hammer Pegs', itemCount: 1,
-    req:[],
+    req:[
+      ['items/hammer1', 'items/glove2'],
+      ['items/hammer1', 'items/mirror1', InvertedRegionHelper.reqNorthWestLW]
+    ],
     validate(items, dungeons){
       return items.hammer && (items.glove === 2
             || (items.mirror && InvertedRegionHelper.northWestLW(items, dungeons)));
     }};
   oldMan = {x: 532, y: 268, title: 'Rescue Old Man', itemCount: 1,
-    req:[],
+    req:[
+      ['items/lantern1', 'items/glove1'],
+      ['items/lantern1', InvertedRegionHelper.reqDeathMtnWestDW]
+    ],
     validate(items, dungeons){
       return items.lantern
             && ((items.glove > 0 && InvertedRegionHelper.northWestDW(items, dungeons))
             || InvertedRegionHelper.deathMtnWestDW(items, dungeons));
     }};
   blacksmith = {x: 223, y: 994, title: 'Blacksmith', itemCount: 1,
-    req:[],
+    req:[
+      ['items/glove2', InvertedRegionHelper.reqNorthWestLW],
+      ['items/mirror1', InvertedRegionHelper.reqNorthWestLW],
+    ],
     validate(items, dungeons) {
       return (items.glove === 2 || items.mirror) && InvertedRegionHelper.northWestLW(items, dungeons);
     }
   };
   purpleChest = {x: 457, y: 802, title: 'Purple Chest', itemCount: 1,
-    req:[],
+    req:[
+      ['items/glove2', InvertedRegionHelper.reqNorthWestLW, InvertedRegionHelper.reqSouthLW],
+      ['items/mirror1', InvertedRegionHelper.reqNorthWestLW, InvertedRegionHelper.reqSouthLW],
+    ],
     validate(items, dungeons){
       return ((items.glove === 2 || items.mirror) && InvertedRegionHelper.northWestLW(items, dungeons))
             && InvertedRegionHelper.southLW(items, dungeons);
     }};
   hypeCave = {x: 896, y: 1168, title: 'Hype Cave', itemCount: 5,
-    req:[],
+    req:[['items/bombs1']],
     validate(items, dungeons){
       return items.bombs;
     }};
@@ -100,7 +120,7 @@ export class InvertedStaticMapDW {
       return true;
     }};
   mireShed = {x: 59, y: 1205, title: 'Mire Shed', itemCount: 2,
-    req:[],
+    req:[[InvertedRegionHelper.reqMireDW]],
     validate(items, dungeons){
       return InvertedRegionHelper.mireDW(items, dungeons);
     }};

From 8c821b290ace8a1e8fbc7328cc67ad2b66628b2a Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Sun, 26 Jul 2020 18:03:41 -0600
Subject: [PATCH 08/19] Fixed helper to handle mitts/gloves issues.

---
 app/inverted/InvertedStaticMapDW.ts |  2 +-
 app/utils/RequiredItemsHelper.ts    | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/inverted/InvertedStaticMapDW.ts b/app/inverted/InvertedStaticMapDW.ts
index a97efc1..75228e4 100644
--- a/app/inverted/InvertedStaticMapDW.ts
+++ b/app/inverted/InvertedStaticMapDW.ts
@@ -27,7 +27,7 @@ export class InvertedStaticMapDW {
         && InvertedRegionHelper.deathMtnWestDW(items, dungeons);
     }};
   catfish = {x: 1341, y: 257, title: 'Catfish', itemCount: 1,
-    req:[[InvertedRegionHelper.reqNorthEastDW, 'items/glove1']],
+    req:[['items/glove1', InvertedRegionHelper.reqNorthEastDW]],
     validate(items, dungeons){
       return items.glove > 0 && InvertedRegionHelper.northEastDW(items, dungeons);
     }};
diff --git a/app/utils/RequiredItemsHelper.ts b/app/utils/RequiredItemsHelper.ts
index 22eed00..ae097af 100644
--- a/app/utils/RequiredItemsHelper.ts
+++ b/app/utils/RequiredItemsHelper.ts
@@ -55,7 +55,17 @@ export class RequiredItemsHelper {
       a.length > b.length ? r = -1 : a.length < b.length ? r = 1 :  r = 0;
       return r;
     });
-    const checkRule = (a, t) => a.every(v => t.includes(v));
+    const checkRule = (a, t) => {
+      if(!a.every(v => t.includes(v)) && a.indexOf('items/glove1')>-1 && t.indexOf('items/glove2')>-1) {
+        //handle mitt override
+        const tempA = a.map(i => i==='items/glove1' ? 'xxx' : i);
+        const tempT = t.map(i => i==='items/glove2' ? 'xxx' : i);
+        const retval = tempA.every(v => tempT.includes(v));
+        return retval;
+      } else {
+        return a.every(v => t.includes(v));
+      }
+    };
     let i = arr.length;
     while(i--){
       if(arr[i]){
@@ -70,6 +80,12 @@ export class RequiredItemsHelper {
         arr = copy;
       }
     }
+    //remove mitts if glove already in array
+    for(const a of arr){
+      if(a.indexOf('items/glove2')>-1 && a.indexOf('items/glove1')>-1) {
+        a.splice(a.indexOf('items/glove2'), 1);
+      }
+    }
     return arr.sort((a, b)=> {
       let r = 0;
       a.length < b.length ? r = -1 : a.length > b.length ? r = 1 :  r = 0;

From 6d841489eb5dd1192dd38017d739fa1e0581bb0e Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Mon, 27 Jul 2020 04:40:55 -0600
Subject: [PATCH 09/19] Add modal stuff for dungeons on map

---
 app/components/map/DarkMap.vue              |  3 ++
 app/components/map/LightMap.vue             |  3 ++
 app/components/map/LocaleModal.vue          | 42 ++++++++++++++--
 app/inverted/InvertedStaticMapDungeonsDW.ts | 56 +++++++++++++++------
 app/inverted/InvertedStaticMapDungeonsLW.ts | 25 ++++++---
 app/retro/RetroStaticMapDungeonsDW.ts       | 14 ++++--
 app/retro/RetroStaticMapDungeonsLW.ts       |  6 ++-
 app/standard/StandardStaticMapDungeonsDW.ts | 56 +++++++++++++++------
 app/standard/StandardStaticMapDungeonsLW.ts | 36 ++++++++++---
 9 files changed, 184 insertions(+), 57 deletions(-)

diff --git a/app/components/map/DarkMap.vue b/app/components/map/DarkMap.vue
index 8cc6ea7..f90f9cc 100644
--- a/app/components/map/DarkMap.vue
+++ b/app/components/map/DarkMap.vue
@@ -5,6 +5,7 @@
       <AbsoluteLayout ref="mapWrapper" top="0" left="0" :scaleX="pinchHandler.currentScale" :scaleY="pinchHandler.currentScale">
         <Image v-for="(tile, idx) in mapHandler.tiles" v-bind:key="idx" :top="tile.top" :left="tile.left" :width="tile.width" :height="tile.height" :src="tile.src" />
         <Label v-for="dkey in mapHandler.dungeonKeys" v-bind:key="dkey" :visibility="pinchHandler.pinching ? 'collapsed' : 'visible'"
+               @tap="onLongPress(dkey, 'dungeon')"
                :class="(mapHandler.staticDungeonValues[dkey].maxChests === 0 ? (mapHandler.dungeonValues[dkey].boss) : mapHandler.dungeonValues[dkey].chests === 0) ? 'locale-gray' : mapHandler.dungeons[dkey].klass"
                :width="Math.floor(46 * (1 / pinchHandler.localeScale))"
                :height="Math.floor(46 * (1 / pinchHandler.localeScale))"
@@ -12,6 +13,7 @@
                :top="Math.floor(mapHandler.staticDungeons[dkey].y - (23 * (1 / pinchHandler.localeScale)))" />
         <Label v-for="bkey in mapHandler.dungeonKeys" v-bind:key="bkey+'_boss'" :visibility="pinchHandler.pinching ? 'collapsed' : 'visible'"
                style="border-width: 0"
+               @tap="onLongPress(bkey, 'dungeon')"
                :class="mapHandler.dungeonValues[bkey].boss ? 'locale-gray' : mapHandler.bosses[bkey].klass"
                :width="Math.floor(30 * (1 / pinchHandler.localeScale))"
                :height="Math.floor(30 * (1 / pinchHandler.localeScale))"
@@ -19,6 +21,7 @@
                :top="Math.floor(mapHandler.staticDungeons[bkey].y - (15 * (1 / pinchHandler.localeScale)))" />
         <Image v-for="bkey in mapHandler.dungeonKeys" v-bind:key="bkey+'_img'" :visibility="pinchHandler.pinching ? 'collapsed' : 'visible'"
                :src="'~/img/dungeons/'+bkey+'_boss0.png'"
+               @tap="onLongPress(bkey, 'dungeon')"
                :width="Math.floor(20 * (1 / pinchHandler.localeScale))"
                :height="Math.floor(20 * (1 / pinchHandler.localeScale))"
                :left="Math.floor(mapHandler.staticDungeons[bkey].x - (10 * (1 / pinchHandler.localeScale)))"
diff --git a/app/components/map/LightMap.vue b/app/components/map/LightMap.vue
index 06ab61b..72ed4b4 100644
--- a/app/components/map/LightMap.vue
+++ b/app/components/map/LightMap.vue
@@ -5,6 +5,7 @@
       <AbsoluteLayout ref="mapWrapper" top="0" left="0" :scaleX="pinchHandler.currentScale" :scaleY="pinchHandler.currentScale">
         <Image v-for="(tile, idx) in mapHandler.tiles" v-bind:key="idx" :top="tile.top" :left="tile.left" :width="tile.width" :height="tile.height" :src="tile.src" />
         <Label v-for="dkey in mapHandler.dungeonKeys" v-bind:key="dkey" :visibility="pinchHandler.pinching ? 'collapsed' : 'visible'"
+               @tap="onLongPress(dkey, 'dungeon')"
                :class="(mapHandler.staticDungeonValues[dkey].maxChests === 0 ? (mapHandler.dungeonValues[dkey].boss) : mapHandler.dungeonValues[dkey].chests === 0) ? 'locale-gray' : mapHandler.dungeons[dkey].klass"
                :width="Math.floor(46 * (1 / pinchHandler.localeScale))"
                :height="Math.floor(46 * (1 / pinchHandler.localeScale))"
@@ -12,6 +13,7 @@
                :top="Math.floor(mapHandler.staticDungeons[dkey].y - (23 * (1 / pinchHandler.localeScale)))" />
         <Label v-for="bkey in mapHandler.dungeonKeys" v-bind:key="bkey+'_boss'" :visibility="pinchHandler.pinching ? 'collapsed' : 'visible'"
                style="border-width: 0"
+               @tap="onLongPress(bkey, 'dungeon')"
                :class="mapHandler.dungeonValues[bkey].boss ? 'locale-gray' : mapHandler.bosses[bkey].klass"
                :width="Math.floor(30 * (1 / pinchHandler.localeScale))"
                :height="Math.floor(30 * (1 / pinchHandler.localeScale))"
@@ -19,6 +21,7 @@
                :top="Math.floor(mapHandler.staticDungeons[bkey].y - (15 * (1 / pinchHandler.localeScale)))" />
         <Image v-for="bkey in mapHandler.dungeonKeys" v-bind:key="bkey+'_img'" :visibility="pinchHandler.pinching ? 'collapsed' : 'visible'"
                :src="'~/img/dungeons/'+bkey+'_boss0.png'"
+               @tap="onLongPress(bkey, 'dungeon')"
                :width="Math.floor(20 * (1 / pinchHandler.localeScale))"
                :height="Math.floor(20 * (1 / pinchHandler.localeScale))"
                :left="Math.floor(mapHandler.staticDungeons[bkey].x - (10 * (1 / pinchHandler.localeScale)))"
diff --git a/app/components/map/LocaleModal.vue b/app/components/map/LocaleModal.vue
index 99a69d6..04b7aeb 100644
--- a/app/components/map/LocaleModal.vue
+++ b/app/components/map/LocaleModal.vue
@@ -2,15 +2,23 @@
   <ScrollView>
     <StackLayout orientation="vertical" class="modal-dialog">
       <Label class="list-title" :text="title" textAlignment="center" marginBottom="5" fontSize="24"/>
-      <StackLayout v-if="type === 'location'" orientation="horizontal" horizontalAlignment="center">
+      <StackLayout :visibility="type === 'location' ? 'visible' : 'collapsed'" orientation="horizontal" horizontalAlignment="center">
         <Image src="~/img/chest.png" width="20"/>
         <Label :text="' x'+itemCount"/>
       </StackLayout>
-      <Label v-if="requiredArr.length && requiredArr[0].length" text="Required Items:" marginTop="4" marginLeft="10"/>
+      <Label :visibility="type==='shop' ? 'visible' : 'collapsed'" :text="takeAny ? 'Take Any Cave':'Shop'"/>
+      <Label :visibility="requiredArr.length  ? 'visible' : 'collapsed'" text="Required Items:" marginTop="4" marginLeft="10"/>
       <StackLayout v-for="(req, idx) of requiredArr" v-bind:key="idx" orientation="horizontal" marginLeft="10">
-        <Image v-if="idx > 0" src="~/img/or.png" width="18"/>
+        <Image :visibility="idx > 0  ? 'visible' : 'collapsed'" src="~/img/or.png" width="18"/>
         <Image v-for="img of req" v-bind:key="img" :src="'~/img/'+(img.replace('~',''))+'.png'" width="18" height="18" margin="2"/>
       </StackLayout>
+
+      <Label :visibility="type === 'dungeon'  ? 'visible' : 'collapsed'" class="list-title" :text="boss" textAlignment="center" marginBottom="5" fontSize="24"/>
+      <Label :visibility="type === 'dungeon' && requiredBossArr.length ? 'visible':'collapsed'" text="Boss Required Items:" marginTop="4" marginLeft="10"/>
+      <StackLayout v-for="(breq, idx) of requiredBossArr" v-bind:key="idx" orientation="horizontal" marginLeft="10">
+        <Image :visibility="idx > 0  ? 'visible' : 'collapsed'" src="~/img/or.png" width="18"/>
+        <Image v-for="bimg of breq" v-bind:key="bimg" :src="'~/img/'+(bimg.replace('~',''))+'.png'" width="18" height="18" margin="2"/>
+      </StackLayout>
       <Button class="btn standard padded" @tap="closeModal" marginTop="14">Close</Button>
     </StackLayout>
   </ScrollView>
@@ -28,6 +36,12 @@
   import {RequiredItemsHelper} from '@/utils/RequiredItemsHelper';
   import {RetroStaticMapShopsLW} from '@/retro/RetroStaticMapShopsLW';
   import {RetroStaticMapShopsDW} from '@/retro/RetroStaticMapShopsDW';
+  import {StandardStaticMapDungeonsLW} from '@/standard/StandardStaticMapDungeonsLW';
+  import {StandardStaticMapDungeonsDW} from '@/standard/StandardStaticMapDungeonsDW';
+  import {InvertedStaticMapDungeonsLW} from '@/inverted/InvertedStaticMapDungeonsLW';
+  import {InvertedStaticMapDungeonsDW} from '@/inverted/InvertedStaticMapDungeonsDW';
+  import {RetroStaticMapDungeonsLW} from '@/retro/RetroStaticMapDungeonsLW';
+  import {RetroStaticMapDungeonsDW} from '@/retro/RetroStaticMapDungeonsDW';
 
   @Component
   export default class LocaleModal extends Vue {
@@ -40,6 +54,9 @@
     itemCount = 0;
     takeAny = false;
     requiredArr = [];
+    boss = '';
+    bossReq = [];
+    requiredBossArr = [];
     requiredHelper = new RequiredItemsHelper();
 
     mounted() {
@@ -60,6 +77,25 @@
                   : new RetroStaticMapDW();
         this.requiredArr = this.requiredHelper.getRequiredItems(staticObj[this.localeKey].req);
       }
+      if(this.type === 'dungeon') {
+        loc = (this.world === 'darkworld') ? this.$sol.getStaticMapDungeonsDW(this.$modelManager.getGameMode())[this.localeKey]
+          : this.$sol.getStaticMapDungeonsLW(this.$modelManager.getGameMode())[this.localeKey];
+        if(loc) {
+          this.title = loc.title;
+          this.boss = loc.boss;
+          this.req = loc.req;
+          this.boss = loc.boss;
+          this.bossReq = loc.bossReq;
+          const staticObj = this.$modelManager.getGameMode() === this.$sol.STANDARD && this.world === 'lightworld' ? new StandardStaticMapDungeonsLW()
+            : this.$modelManager.getGameMode() === this.$sol.STANDARD && this.world === 'darkworld' ? new StandardStaticMapDungeonsDW()
+              : this.$modelManager.getGameMode() === this.$sol.INVERTED && this.world === 'lightworld' ? new InvertedStaticMapDungeonsLW()
+                : this.$modelManager.getGameMode() === this.$sol.INVERTED && this.world === 'darkworld' ? new InvertedStaticMapDungeonsDW()
+                  : this.$modelManager.getGameMode() === this.$sol.RETRO && this.world === 'lightworld' ? new RetroStaticMapDungeonsLW()
+                    : new RetroStaticMapDungeonsDW();
+          this.requiredArr = this.requiredHelper.getRequiredItems(staticObj[this.localeKey].req);
+          this.requiredBossArr = this.requiredHelper.getRequiredItems(staticObj[this.localeKey].reqBoss);
+        }
+      }
       if(this.type === 'shop') {
         loc = (this.world === 'darkworld') ? this.$sol.getStaticMapShopsDW(this.$modelManager.getGameMode())[this.localeKey]
           : this.$sol.getStaticMapShopsLW(this.$modelManager.getGameMode())[this.localeKey];
diff --git a/app/inverted/InvertedStaticMapDungeonsDW.ts b/app/inverted/InvertedStaticMapDungeonsDW.ts
index 542f8d4..059f6bc 100644
--- a/app/inverted/InvertedStaticMapDungeonsDW.ts
+++ b/app/inverted/InvertedStaticMapDungeonsDW.ts
@@ -1,60 +1,84 @@
 import {InvertedRegionHelper} from '@/inverted/InvertedRegionHelper';
 
 export class InvertedStaticMapDungeonsDW {
-  pod = {x:1438, y:603,
+  pod = {x:1438, y:603, title:'Palace of Darkness', boss:'Helmasaur King',
     validate(items, dungeons){
       return InvertedRegionHelper.northEastDW(items, dungeons);
     },
     validateBoss(items, dungeons){
       return items.hammer && items.bow > 0 && items.lantern && InvertedRegionHelper.northEastDW(items, dungeons);
-    }}; // palace of darkness
-  sp = {x:703, y:1402,
+    },
+    req:[],
+    reqBoss:[]
+  }; // palace of darkness
+  sp = {x:703, y:1402, title:'Swamp Palace', boss:'Arrghus',
     validate(items, dungeons){
       return items.flippers && items.moonpearl && items.mirror && InvertedRegionHelper.southDW(items, dungeons);
     },
     validateBoss(items, dungeons){
       return items.flippers && items.moonpearl && items.mirror && items.hookshot && items.hammer && InvertedRegionHelper.southDW(items, dungeons);
-    }}; // swamp palace
-  sw = {x:149, y:164,
+    },
+    req:[],
+    reqBoss:[]
+  }; // swamp palace
+  sw = {x:149, y:164, title:'Skull Woods', boss:'Mothula',
     validate(items, dungeons){
       return InvertedRegionHelper.northWestDW(items, dungeons);
     },
     validateBoss(items, dungeons){
       return items.firerod && InvertedRegionHelper.northWestDW(items, dungeons);
-    }}; // skull woods
-  tt = {x:190, y:717,
+    },
+    req:[],
+    reqBoss:[]
+  }; // skull woods
+  tt = {x:190, y:717, title:'Thieves\' Town', boss:'Blind',
     validate(items, dungeons){
       return InvertedRegionHelper.northWestDW(items, dungeons);
     },
     validateBoss(items, dungeons){
       return InvertedRegionHelper.northWestDW(items, dungeons);
-    }}; // thieves town
-  ip = {x:1195, y:1294,
+    },
+    req:[],
+    reqBoss:[]
+  }; // thieves town
+  ip = {x:1195, y:1294, title:'Ice Palace', boss:'Kholdstare',
     validate(items, dungeons){
       return (items.firerod || items.bombos) && items.flippers && InvertedRegionHelper.southDW(items, dungeons);
     },
     validateBoss(items, dungeons){
       return items.hammer && items.glove > 0 && (items.firerod || items.bombos) && items.flippers && InvertedRegionHelper.southDW(items, dungeons);
-    }}; // ice palace
-  mm = {x:110, y:1247,
+    },
+    req:[],
+    reqBoss:[]
+  }; // ice palace
+  mm = {x:110, y:1247, title:'Misery Mire', boss:'Vitreous',
     validate(items, dungeons){
       return InvertedRegionHelper.mm(items, dungeons);
     },
     validateBoss(items, dungeons){
       return items.redcane && items.lantern && InvertedRegionHelper.mm(items, dungeons);
-    }}; // misery mire
-  tr = {x:1411, y:90,
+    },
+    req:[],
+    reqBoss:[]
+  }; // misery mire
+  tr = {x:1411, y:90, title:'Turtle Rock', boss:'Trinexx',
     validate(items, dungeons){
       return InvertedRegionHelper.tr(items, dungeons);
     },
     validateBoss(items, dungeons){
       return items.firerod && items.icerod && InvertedRegionHelper.tr(items, dungeons);
-    }}; // turtle rock
-  aga = {x:844, y:35,
+    },
+    req:[],
+    reqBoss:[]
+  }; // turtle rock
+  aga = {x:844, y:35, title:'Agahnim\'s Tower', boss:'Agahnim',
     validate(items, dungeons){
       return InvertedRegionHelper.deathMtnEastDW(items, dungeons);
     },
     validateBoss(items, dungeons){
       return items.lantern && (items.sword > 0 || items.net) && InvertedRegionHelper.deathMtnEastDW(items, dungeons);
-    }};
+    },
+    req:[],
+    reqBoss:[]
+  };
 }
diff --git a/app/inverted/InvertedStaticMapDungeonsLW.ts b/app/inverted/InvertedStaticMapDungeonsLW.ts
index 08ecc56..d10e851 100644
--- a/app/inverted/InvertedStaticMapDungeonsLW.ts
+++ b/app/inverted/InvertedStaticMapDungeonsLW.ts
@@ -1,33 +1,40 @@
 import {InvertedRegionHelper} from '@/inverted/InvertedRegionHelper';
 
 export class InvertedStaticMapDungeonsLW {
-  ep = {x:1437, y:610,
+  ep = {x:1437, y:610, title:'Eastern Palace', boss:'Armos Knights',
     validate(items, dungeons){
       return items.moonpearl && InvertedRegionHelper.northEastLW(items, dungeons);
     },
     validateBoss(items, dungeons){
       return  items.moonpearl && InvertedRegionHelper.northEastLW(items, dungeons)
             && items.bow > 0 && (items.lantern || items.firerod);
-    }
+    },
+    req:[],
+    reqBoss:[]
+
   };
-  dp = {x:111, y:1270,
+  dp = {x:111, y:1270, title:'Desert Palace', boss:'Lanmolas',
     validate(items, dungeons){
       return InvertedRegionHelper.southLW(items, dungeons) && items.moonpearl && items.book;
     },
     validateBoss(items, dungeons){
       return InvertedRegionHelper.southLW(items, dungeons) && items.moonpearl && items.book
                 && items.glove > 0 && (items.lantern || items.firerod);
-    }
+    },
+    req:[],
+    reqBoss:[]
   };
-  toh = {x:840, y:40,
+  toh = {x:840, y:40, title:'Tower of Hera', boss:'Moldorm',
     validate(items, dungeons){
       return InvertedRegionHelper.toh(items, dungeons) && items.moonpearl;
     },
     validateBoss(items, dungeons){
       return InvertedRegionHelper.toh(items, dungeons) && items.moonpearl;
-    }
+    },
+    req:[],
+    reqBoss:[]
   };
-  gt = {x:750, y:577,
+  gt = {x:750, y:577, title:'Ganon\'s Tower', boss:'Agahnim II',
     validate(items, dungeons, settings){
       return InvertedRegionHelper.gt(items, dungeons, settings);
     },
@@ -35,6 +42,8 @@ export class InvertedStaticMapDungeonsLW {
       return (items.sword > 0 || items.net) && items.bow > 0
         && (items.lantern || items.firerod) && items.hookshot
         && InvertedRegionHelper.gt(items, dungeons, settings);
-    }
+    },
+    req:[],
+    reqBoss:[]
   };
 }
diff --git a/app/retro/RetroStaticMapDungeonsDW.ts b/app/retro/RetroStaticMapDungeonsDW.ts
index dea65d0..8805edf 100644
--- a/app/retro/RetroStaticMapDungeonsDW.ts
+++ b/app/retro/RetroStaticMapDungeonsDW.ts
@@ -2,15 +2,18 @@ import {RetroRegionHelper} from '@/retro/RetroRegionHelper';
 import {StandardStaticMapDungeonsDW} from '@/standard/StandardStaticMapDungeonsDW';
 
 export class RetroStaticMapDungeonsDW extends StandardStaticMapDungeonsDW{
-  pod = {x:1438, y:603,
+  pod = {x:1438, y:603, title:'Palace of Darkness', boss:'Helmasaur King',
     validate(items, dungeons){
       return items.moonpearl && RetroRegionHelper.northEastDW(items, dungeons);
     },
     validateBoss(items, dungeons){
       return items.hammer && items.moonpearl && (items.bow > 0 && items.quiver)
         && (items.lantern || items.firerod) && RetroRegionHelper.northEastDW(items, dungeons);
-    }}; // palace of darkness
-  gt = {x:844, y:35,
+    },
+    req:[],
+    reqBoss:[]
+  }; // palace of darkness
+  gt = {x:844, y:35, title:'Ganon\'s Tower', boss:'Agahnim II',
     validate(items, dungeons, settings){
       return RetroRegionHelper.gt(items, dungeons, settings);
     },
@@ -18,5 +21,8 @@ export class RetroStaticMapDungeonsDW extends StandardStaticMapDungeonsDW{
       return (items.sword > 0 || items.net) && (items.bow > 0 && items.quiver)
         && (items.lantern || items.firerod) && items.hookshot
         && RetroRegionHelper.gt(items, dungeons, settings);
-    }};
+    },
+    req:[],
+    reqBoss:[]
+  };
 }
diff --git a/app/retro/RetroStaticMapDungeonsLW.ts b/app/retro/RetroStaticMapDungeonsLW.ts
index c997a58..9a78cd3 100644
--- a/app/retro/RetroStaticMapDungeonsLW.ts
+++ b/app/retro/RetroStaticMapDungeonsLW.ts
@@ -2,12 +2,14 @@ import {RetroRegionHelper} from '@/retro/RetroRegionHelper';
 import {StandardStaticMapDungeonsLW} from '@/standard/StandardStaticMapDungeonsLW';
 
 export class RetroStaticMapDungeonsLW extends StandardStaticMapDungeonsLW{
-  ep = {x:1437, y:610,
+  ep = {x:1437, y:610, title:'Eastern Palace', boss:'Armos Knights',
     validate(){
       return true;
     },
     validateBoss(items){
       return  (items.bow > 0 && items.quiver) && (items.lantern || items.firerod);
-    }
+    },
+    req:[],
+    reqBoss:[]
   };
 }
diff --git a/app/standard/StandardStaticMapDungeonsDW.ts b/app/standard/StandardStaticMapDungeonsDW.ts
index 73b528e..00c5bad 100644
--- a/app/standard/StandardStaticMapDungeonsDW.ts
+++ b/app/standard/StandardStaticMapDungeonsDW.ts
@@ -1,57 +1,78 @@
 import {StandardRegionHelper} from '@/standard/StandardRegionHelper';
 
 export class StandardStaticMapDungeonsDW {
-  pod = {x:1438, y:603,
+  pod = {x:1438, y:603, title:'Palace of Darkness', boss:'Helmasaur King',
     validate(items, dungeons){
       return items.moonpearl && StandardRegionHelper.northEastDW(items, dungeons);
     },
     validateBoss(items, dungeons){
       return items.hammer && items.moonpearl && items.bow > 0
         && (items.lantern || items.firerod) && StandardRegionHelper.northEastDW(items, dungeons);
-    }}; // palace of darkness
-  sp = {x:703, y:1402,
+    },
+    req:[],
+    reqBoss:[]
+  }; // palace of darkness
+  sp = {x:703, y:1402, title:'Swamp Palace', boss:'Arrghus',
     validate(items, dungeons){
       return items.flippers && items.moonpearl && items.mirror && StandardRegionHelper.southDW(items, dungeons);
     },
     validateBoss(items, dungeons){
       return items.flippers && items.moonpearl && items.mirror && items.hookshot && items.hammer && StandardRegionHelper.southDW(items, dungeons);
-    }}; // swamp palace
-  sw = {x:149, y:164,
+    },
+    req:[],
+    reqBoss:[]
+  }; // swamp palace
+  sw = {x:149, y:164, title:'Skull Woods', boss:'Mothula',
     validate(items, dungeons){
       return items.moonpearl && StandardRegionHelper.northWestDW(items, dungeons);
     },
     validateBoss(items, dungeons){
       return items.moonpearl && items.firerod && StandardRegionHelper.northWestDW(items, dungeons);
-    }}; // skull woods
-  tt = {x:190, y:717,
+    },
+    req:[],
+    reqBoss:[]
+  }; // skull woods
+  tt = {x:190, y:717, title:'Thieves\' Town', boss:'Blind',
     validate(items, dungeons){
       return items.moonpearl && StandardRegionHelper.northWestDW(items, dungeons);
     },
     validateBoss(items, dungeons){
       return items.moonpearl && StandardRegionHelper.northWestDW(items, dungeons);
-    }}; // thieves town
-  ip = {x:1195, y:1294,
+    },
+    req:[],
+    reqBoss:[]
+  }; // thieves town
+  ip = {x:1195, y:1294, title:'Ice Palace', boss:'Kholdstare',
     validate(items, dungeons){
       return (items.firerod || items.bombos) && items.moonpearl && items.flippers && items.glove === 2 && StandardRegionHelper.southDW(items, dungeons);
     },
     validateBoss(items, dungeons){
       return items.hammer && items.glove === 2 && (items.firerod || items.bombos) && items.moonpearl && items.flippers && StandardRegionHelper.southDW(items, dungeons);
-    }}; // ice palace
-  mm = {x:110, y:1247,
+    },
+    req:[],
+    reqBoss:[]
+  }; // ice palace
+  mm = {x:110, y:1247, title:'Misery Mire', boss:'Vitreous',
     validate(items, dungeons){
       return StandardRegionHelper.mm(items, dungeons);
     },
     validateBoss(items, dungeons){
       return items.redcane && items.lantern && StandardRegionHelper.mm(items, dungeons);
-    }}; // misery mire
-  tr = {x:1411, y:90,
+    },
+    req:[],
+    reqBoss:[]
+  }; // misery mire
+  tr = {x:1411, y:90, title:'Turtle Rock', boss:'Trinexx',
     validate(items, dungeons){
       return StandardRegionHelper.tr(items, dungeons);
     },
     validateBoss(items, dungeons){
       return items.firerod && items.icerod && StandardRegionHelper.tr(items, dungeons);
-    }}; // turtle rock
-  gt = {x:844, y:35,
+    },
+    req:[],
+    reqBoss:[]
+  }; // turtle rock
+  gt = {x:844, y:35, title:'Ganon\'s Tower', boss:'Agahnim II',
     validate(items, dungeons, settings){
       return StandardRegionHelper.gt(items, dungeons, settings);
     },
@@ -59,5 +80,8 @@ export class StandardStaticMapDungeonsDW {
       return (items.sword > 0 || items.net) && items.bow > 0
         && (items.lantern || items.firerod) && items.hookshot
         && StandardRegionHelper.gt(items, dungeons, settings);
-    }};
+    },
+    req:[],
+    reqBoss:[]
+  };
 }
diff --git a/app/standard/StandardStaticMapDungeonsLW.ts b/app/standard/StandardStaticMapDungeonsLW.ts
index 0d37f52..352056a 100644
--- a/app/standard/StandardStaticMapDungeonsLW.ts
+++ b/app/standard/StandardStaticMapDungeonsLW.ts
@@ -1,15 +1,20 @@
 import {StandardRegionHelper} from '@/standard/StandardRegionHelper';
 
 export class StandardStaticMapDungeonsLW {
-  ep = {x:1437, y:610,
+  ep = {x:1437, y:610, title:'Eastern Palace', boss:'Armos Knights',
     validate(){
       return true;
     },
     validateBoss(items){
       return  items.bow > 0 && (items.lantern || items.firerod);
-    }
+    },
+    req:[],
+    reqBoss:[
+      ['items/bow1', 'items/lantern1'],
+      ['items/bow1', 'items/firerod1'],
+    ]
   };
-  dp = {x:111, y:1270,
+  dp = {x:111, y:1270, title:'Desert Palace', boss:'Lanmolas',
     validate(items, dungeons){
       return StandardRegionHelper.dp(items, dungeons);
     },
@@ -17,22 +22,37 @@ export class StandardStaticMapDungeonsLW {
       return StandardRegionHelper.dp(items, dungeons)
                 && (items.glove > 0 || (items.mirror && StandardRegionHelper.mireDW(items, dungeons)))
                 && (items.lantern || items.firerod);
-    }
+    },
+    req:[[StandardRegionHelper.reqDp]],
+    reqBoss:[
+      [StandardRegionHelper.reqDp, 'items/glove1', 'items/mirror1', 'items/lantern1'],
+      [StandardRegionHelper.reqDp, 'items/glove1', 'items/mirror1', 'items/firerod1'],
+      [StandardRegionHelper.reqDp, 'items/glove1', StandardRegionHelper.reqMireDW, 'items/lantern1'],
+      [StandardRegionHelper.reqDp, 'items/glove1', StandardRegionHelper.reqMireDW, 'items/firerod1'],
+    ]
   };
-  toh = {x:840, y:40,
+  toh = {x:840, y:40, title:'Tower of Hera', boss:'Moldorm',
     validate(items, dungeons){
       return StandardRegionHelper.toh(items, dungeons);
     },
     validateBoss(items, dungeons){
       return StandardRegionHelper.toh(items, dungeons);
-    }
+    },
+    req:[[StandardRegionHelper.reqToh]],
+    reqBoss:[[StandardRegionHelper.reqToh]]
   };
-  aga = {x:750, y:577,
+  aga = {x:750, y:577, title:'Agahnim\'s Tower', boss:'Agahnim',
     validate(items){
       return (items.cape || items.sword > 1);
     },
     validateBoss(items){
       return items.lantern && (items.cape || items.sword > 1) && (items.sword > 0 || items.net);
-    }
+    },
+    req:[['items/cape1', 'items/sword2']],
+    reqBoss:[
+      ['items/lantern1', 'items/sword2'],
+      ['items/lantern1', 'items/cape1', 'items/sword1'],
+      ['items/lantern1', 'items/cape1', 'items/net1'],
+    ]
   };
 }

From f11fe44e4c8835c0cb6c4127632f80d28428ca28 Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Mon, 27 Jul 2020 05:43:26 -0600
Subject: [PATCH 10/19] Add standard and retro dungeon items

---
 app/components/map/LocaleModal.vue          | 14 ++++++-
 app/retro/RetroStaticMapDungeonsDW.ts       | 17 ++++++--
 app/retro/RetroStaticMapDungeonsLW.ts       |  5 ++-
 app/standard/StandardRegionHelper.ts        |  5 +++
 app/standard/StandardStaticMapDungeonsDW.ts | 46 ++++++++++++++-------
 5 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/app/components/map/LocaleModal.vue b/app/components/map/LocaleModal.vue
index 04b7aeb..7c5296c 100644
--- a/app/components/map/LocaleModal.vue
+++ b/app/components/map/LocaleModal.vue
@@ -2,11 +2,14 @@
   <ScrollView>
     <StackLayout orientation="vertical" class="modal-dialog">
       <Label class="list-title" :text="title" textAlignment="center" marginBottom="5" fontSize="24"/>
+      <StackLayout :visibility="type==='dungeon' && localeKey === 'gt' ? 'visible':'collapsed'" orientation="horizontal"  horizontalAlignment="center">
+        <Image v-for="c in gtReq" :src="'~/img/'+c+'.png'" width="16"/>
+      </StackLayout>
       <StackLayout :visibility="type === 'location' ? 'visible' : 'collapsed'" orientation="horizontal" horizontalAlignment="center">
         <Image src="~/img/chest.png" width="20"/>
         <Label :text="' x'+itemCount"/>
       </StackLayout>
-      <Label :visibility="type==='shop' ? 'visible' : 'collapsed'" :text="takeAny ? 'Take Any Cave':'Shop'"/>
+      <Label :visibility="type==='shop' ? 'visible' : 'collapsed'" :text="takeAny ? 'Take Any Cave':'Shop'" horizontalAlignment="center"/>
       <Label :visibility="requiredArr.length  ? 'visible' : 'collapsed'" text="Required Items:" marginTop="4" marginLeft="10"/>
       <StackLayout v-for="(req, idx) of requiredArr" v-bind:key="idx" orientation="horizontal" marginLeft="10">
         <Image :visibility="idx > 0  ? 'visible' : 'collapsed'" src="~/img/or.png" width="18"/>
@@ -22,7 +25,6 @@
       <Button class="btn standard padded" @tap="closeModal" marginTop="14">Close</Button>
     </StackLayout>
   </ScrollView>
-
 </template>
 
 <script type="ts">
@@ -57,6 +59,7 @@
     boss = '';
     bossReq = [];
     requiredBossArr = [];
+    gtReq = [];
     requiredHelper = new RequiredItemsHelper();
 
     mounted() {
@@ -94,6 +97,13 @@
                     : new RetroStaticMapDungeonsDW();
           this.requiredArr = this.requiredHelper.getRequiredItems(staticObj[this.localeKey].req);
           this.requiredBossArr = this.requiredHelper.getRequiredItems(staticObj[this.localeKey].reqBoss);
+          if(this.localeKey === 'gt') {
+            const cArr = [];
+            for(let i = 0; i < this.$modelManager.settings.openGT; i++) {
+              cArr.push('dungeons/crystal3');
+            }
+            this.gtReq = cArr;
+          }
         }
       }
       if(this.type === 'shop') {
diff --git a/app/retro/RetroStaticMapDungeonsDW.ts b/app/retro/RetroStaticMapDungeonsDW.ts
index 8805edf..060c35f 100644
--- a/app/retro/RetroStaticMapDungeonsDW.ts
+++ b/app/retro/RetroStaticMapDungeonsDW.ts
@@ -1,5 +1,6 @@
 import {RetroRegionHelper} from '@/retro/RetroRegionHelper';
 import {StandardStaticMapDungeonsDW} from '@/standard/StandardStaticMapDungeonsDW';
+import {StandardRegionHelper} from '@/standard/StandardRegionHelper';
 
 export class RetroStaticMapDungeonsDW extends StandardStaticMapDungeonsDW{
   pod = {x:1438, y:603, title:'Palace of Darkness', boss:'Helmasaur King',
@@ -10,8 +11,11 @@ export class RetroStaticMapDungeonsDW extends StandardStaticMapDungeonsDW{
       return items.hammer && items.moonpearl && (items.bow > 0 && items.quiver)
         && (items.lantern || items.firerod) && RetroRegionHelper.northEastDW(items, dungeons);
     },
-    req:[],
-    reqBoss:[]
+    req:[['items/moonpearl1', StandardRegionHelper.reqNorthEastDW]],
+    reqBoss:[
+      ['items/hammer1', 'items/moonpearl1', 'items/bow1', 'items/quiver1', StandardRegionHelper.reqNorthEastDW, 'items/lantern1'],
+      ['items/hammer1', 'items/moonpearl1', 'items/bow1', 'items/quiver1', StandardRegionHelper.reqNorthEastDW, 'items/firerod1']
+    ]
   }; // palace of darkness
   gt = {x:844, y:35, title:'Ganon\'s Tower', boss:'Agahnim II',
     validate(items, dungeons, settings){
@@ -22,7 +26,12 @@ export class RetroStaticMapDungeonsDW extends StandardStaticMapDungeonsDW{
         && (items.lantern || items.firerod) && items.hookshot
         && RetroRegionHelper.gt(items, dungeons, settings);
     },
-    req:[],
-    reqBoss:[]
+    req:[[StandardRegionHelper.reqGt]],
+    reqBoss:[
+      ['items/bow1', 'items/quiver1', 'items/hookshot1', StandardRegionHelper.reqGt, 'items/sword1', 'items/lantern1'],
+      ['items/bow1', 'items/quiver1', 'items/hookshot1', StandardRegionHelper.reqGt, 'items/sword1', 'items/firerod1'],
+      ['items/bow1', 'items/quiver1', 'items/hookshot1', StandardRegionHelper.reqGt, 'items/net1', 'items/lantern1'],
+      ['items/bow1', 'items/quiver1', 'items/hookshot1', StandardRegionHelper.reqGt, 'items/net1', 'items/firerod1']
+    ]
   };
 }
diff --git a/app/retro/RetroStaticMapDungeonsLW.ts b/app/retro/RetroStaticMapDungeonsLW.ts
index 9a78cd3..c284ad8 100644
--- a/app/retro/RetroStaticMapDungeonsLW.ts
+++ b/app/retro/RetroStaticMapDungeonsLW.ts
@@ -10,6 +10,9 @@ export class RetroStaticMapDungeonsLW extends StandardStaticMapDungeonsLW{
       return  (items.bow > 0 && items.quiver) && (items.lantern || items.firerod);
     },
     req:[],
-    reqBoss:[]
+    reqBoss:[
+      ['items/bow1', 'items/quiver1', 'items/lantern1'],
+      ['items/bow1', 'items/quiver1', 'items/firerod1'],
+    ]
   };
 }
diff --git a/app/standard/StandardRegionHelper.ts b/app/standard/StandardRegionHelper.ts
index 3962624..82a363d 100644
--- a/app/standard/StandardRegionHelper.ts
+++ b/app/standard/StandardRegionHelper.ts
@@ -1,3 +1,4 @@
+
 export class StandardRegionHelper {
   // light world
   static northEastLW(items, dungeons) {
@@ -97,6 +98,9 @@ export class StandardRegionHelper {
             (dungeons.mm.medallion === 3 && items.quake);
     return m && items.moonpearl && this.mireDW(items, dungeons);
   }
+  static reqMm = [
+    ['dungeons/medallion0', 'items/moonpearl1', StandardRegionHelper.reqMireDW]
+  ];
   static tr(items, dungeons) {
     const m = (dungeons.tr.medallion === 1 && items.bombos) ||
             (dungeons.tr.medallion === 2 && items.ether) ||
@@ -116,4 +120,5 @@ export class StandardRegionHelper {
     }
     return (c >= settings.openGT && items.moonpearl && this.deathMtnEastDW(items, dungeons));
   }
+  static reqGt = [['items/moonpearl1', StandardRegionHelper.reqDeathMtnEastLW]];
 }
diff --git a/app/standard/StandardStaticMapDungeonsDW.ts b/app/standard/StandardStaticMapDungeonsDW.ts
index 00c5bad..8f98a8e 100644
--- a/app/standard/StandardStaticMapDungeonsDW.ts
+++ b/app/standard/StandardStaticMapDungeonsDW.ts
@@ -9,8 +9,11 @@ export class StandardStaticMapDungeonsDW {
       return items.hammer && items.moonpearl && items.bow > 0
         && (items.lantern || items.firerod) && StandardRegionHelper.northEastDW(items, dungeons);
     },
-    req:[],
-    reqBoss:[]
+    req:[['items/moonpearl1', StandardRegionHelper.reqNorthEastDW]],
+    reqBoss:[
+      ['items/hammer1', 'items/moonpearl1', 'items/bow1', StandardRegionHelper.reqNorthEastDW, 'items/lantern1'],
+      ['items/hammer1', 'items/moonpearl1', 'items/bow1', StandardRegionHelper.reqNorthEastDW, 'items/firerod1']
+    ]
   }; // palace of darkness
   sp = {x:703, y:1402, title:'Swamp Palace', boss:'Arrghus',
     validate(items, dungeons){
@@ -19,8 +22,8 @@ export class StandardStaticMapDungeonsDW {
     validateBoss(items, dungeons){
       return items.flippers && items.moonpearl && items.mirror && items.hookshot && items.hammer && StandardRegionHelper.southDW(items, dungeons);
     },
-    req:[],
-    reqBoss:[]
+    req:[['items/flippers1', 'items/moonpearl1', 'items/mirror1', StandardRegionHelper.reqSouthDW]],
+    reqBoss:[['items/flippers1', 'items/moonpearl1', 'items/mirror1', 'items/hookshot1', 'items/hammer1', StandardRegionHelper.reqSouthDW]]
   }; // swamp palace
   sw = {x:149, y:164, title:'Skull Woods', boss:'Mothula',
     validate(items, dungeons){
@@ -29,8 +32,8 @@ export class StandardStaticMapDungeonsDW {
     validateBoss(items, dungeons){
       return items.moonpearl && items.firerod && StandardRegionHelper.northWestDW(items, dungeons);
     },
-    req:[],
-    reqBoss:[]
+    req:[['items/moonpearl1', StandardRegionHelper.reqNorthWestDW]],
+    reqBoss:[['items/moonpearl1', 'items/firerod1', StandardRegionHelper.reqNorthWestDW]]
   }; // skull woods
   tt = {x:190, y:717, title:'Thieves\' Town', boss:'Blind',
     validate(items, dungeons){
@@ -39,8 +42,8 @@ export class StandardStaticMapDungeonsDW {
     validateBoss(items, dungeons){
       return items.moonpearl && StandardRegionHelper.northWestDW(items, dungeons);
     },
-    req:[],
-    reqBoss:[]
+    req:[['items/moonpearl1', StandardRegionHelper.reqNorthWestDW]],
+    reqBoss:[['items/moonpearl1', StandardRegionHelper.reqNorthWestDW]]
   }; // thieves town
   ip = {x:1195, y:1294, title:'Ice Palace', boss:'Kholdstare',
     validate(items, dungeons){
@@ -49,8 +52,14 @@ export class StandardStaticMapDungeonsDW {
     validateBoss(items, dungeons){
       return items.hammer && items.glove === 2 && (items.firerod || items.bombos) && items.moonpearl && items.flippers && StandardRegionHelper.southDW(items, dungeons);
     },
-    req:[],
-    reqBoss:[]
+    req:[
+      ['items/moonpearl1', 'items/glove2', 'items/flippers1', StandardRegionHelper.reqSouthDW, 'items/firerod1'],
+      ['items/moonpearl1', 'items/glove2', 'items/flippers1', StandardRegionHelper.reqSouthDW, 'items/bombos1']
+    ],
+    reqBoss:[
+      ['items/moonpearl1', 'items/glove2', 'items/flippers1', StandardRegionHelper.reqSouthDW, 'items/firerod1', 'items/hammer1'],
+      ['items/moonpearl1', 'items/glove2', 'items/flippers1', StandardRegionHelper.reqSouthDW, 'items/bombos1', 'items/hammer1'],
+    ]
   }; // ice palace
   mm = {x:110, y:1247, title:'Misery Mire', boss:'Vitreous',
     validate(items, dungeons){
@@ -59,8 +68,8 @@ export class StandardStaticMapDungeonsDW {
     validateBoss(items, dungeons){
       return items.redcane && items.lantern && StandardRegionHelper.mm(items, dungeons);
     },
-    req:[],
-    reqBoss:[]
+    req:[[StandardRegionHelper.reqMm]],
+    reqBoss:[['items/redcane1', 'items/lantern1', StandardRegionHelper.reqMm]]
   }; // misery mire
   tr = {x:1411, y:90, title:'Turtle Rock', boss:'Trinexx',
     validate(items, dungeons){
@@ -69,8 +78,8 @@ export class StandardStaticMapDungeonsDW {
     validateBoss(items, dungeons){
       return items.firerod && items.icerod && StandardRegionHelper.tr(items, dungeons);
     },
-    req:[],
-    reqBoss:[]
+    req:[[StandardRegionHelper.reqTr]],
+    reqBoss:[['items/firerod1', 'items/icerod1', StandardRegionHelper.reqTr]]
   }; // turtle rock
   gt = {x:844, y:35, title:'Ganon\'s Tower', boss:'Agahnim II',
     validate(items, dungeons, settings){
@@ -81,7 +90,12 @@ export class StandardStaticMapDungeonsDW {
         && (items.lantern || items.firerod) && items.hookshot
         && StandardRegionHelper.gt(items, dungeons, settings);
     },
-    req:[],
-    reqBoss:[]
+    req:[[StandardRegionHelper.reqGt]],
+    reqBoss:[
+      ['items/bow1', 'items/hookshot1', StandardRegionHelper.reqGt, 'items/sword1', 'items/lantern1'],
+      ['items/bow1', 'items/hookshot1', StandardRegionHelper.reqGt, 'items/sword1', 'items/firerod1'],
+      ['items/bow1', 'items/hookshot1', StandardRegionHelper.reqGt, 'items/net1', 'items/lantern1'],
+      ['items/bow1', 'items/hookshot1', StandardRegionHelper.reqGt, 'items/net1', 'items/firerod1']
+    ]
   };
 }

From 476baf4b10a352357893e51a0a7a3b8ed86e2361 Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Mon, 27 Jul 2020 07:34:50 -0600
Subject: [PATCH 11/19] Layout changes

---
 app/components/map/LocaleModal.vue | 64 +++++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 15 deletions(-)

diff --git a/app/components/map/LocaleModal.vue b/app/components/map/LocaleModal.vue
index 7c5296c..de1c828 100644
--- a/app/components/map/LocaleModal.vue
+++ b/app/components/map/LocaleModal.vue
@@ -1,6 +1,8 @@
 <template>
-  <ScrollView>
-    <StackLayout orientation="vertical" class="modal-dialog">
+  <GridLayout :rows="((type==='location' || type==='shop' || (type === 'dungeon' && localeKey === 'gt')) ? '80'
+    : '50')+',*,80'" columns="*" class="modal-dialog" style="padding:0">
+    <!-- HEADER -->
+    <StackLayout orientation="vertical" class="modal-header" :class="{'empty': !requiredArr.length && !requiredBossArr.length}">
       <Label class="list-title" :text="title" textAlignment="center" marginBottom="5" fontSize="24"/>
       <StackLayout :visibility="type==='dungeon' && localeKey === 'gt' ? 'visible':'collapsed'" orientation="horizontal"  horizontalAlignment="center">
         <Image v-for="c in gtReq" :src="'~/img/'+c+'.png'" width="16"/>
@@ -10,21 +12,28 @@
         <Label :text="' x'+itemCount"/>
       </StackLayout>
       <Label :visibility="type==='shop' ? 'visible' : 'collapsed'" :text="takeAny ? 'Take Any Cave':'Shop'" horizontalAlignment="center"/>
-      <Label :visibility="requiredArr.length  ? 'visible' : 'collapsed'" text="Required Items:" marginTop="4" marginLeft="10"/>
-      <StackLayout v-for="(req, idx) of requiredArr" v-bind:key="idx" orientation="horizontal" marginLeft="10">
-        <Image :visibility="idx > 0  ? 'visible' : 'collapsed'" src="~/img/or.png" width="18"/>
-        <Image v-for="img of req" v-bind:key="img" :src="'~/img/'+(img.replace('~',''))+'.png'" width="18" height="18" margin="2"/>
-      </StackLayout>
-
-      <Label :visibility="type === 'dungeon'  ? 'visible' : 'collapsed'" class="list-title" :text="boss" textAlignment="center" marginBottom="5" fontSize="24"/>
-      <Label :visibility="type === 'dungeon' && requiredBossArr.length ? 'visible':'collapsed'" text="Boss Required Items:" marginTop="4" marginLeft="10"/>
-      <StackLayout v-for="(breq, idx) of requiredBossArr" v-bind:key="idx" orientation="horizontal" marginLeft="10">
-        <Image :visibility="idx > 0  ? 'visible' : 'collapsed'" src="~/img/or.png" width="18"/>
-        <Image v-for="bimg of breq" v-bind:key="bimg" :src="'~/img/'+(bimg.replace('~',''))+'.png'" width="18" height="18" margin="2"/>
+    </StackLayout>
+    <!-- BODY -->
+    <ScrollView row="1" class="scrollbox" :class="{'empty': !requiredArr.length && !requiredBossArr.length}">
+      <StackLayout orientation="vertical" marginBottom="5">
+        <Label :visibility="requiredArr.length  ? 'visible' : 'collapsed'" text="Required Items:" marginTop="4" marginLeft="10"/>
+        <StackLayout v-for="(req, idx) of requiredArr" v-bind:key="idx" orientation="horizontal" marginLeft="10">
+          <Image :visibility="idx > 0  ? 'visible' : 'collapsed'" src="~/img/or.png" width="18"/>
+          <Image v-for="img of req" v-bind:key="img" :src="'~/img/'+(img.replace('~',''))+'.png'" width="18" height="18" margin="2"/>
+        </StackLayout>
+        <Label :visibility="type === 'dungeon'  ? 'visible' : 'collapsed'" class="list-title" :text="boss" textAlignment="center" marginBottom="5" fontSize="24"/>
+        <Label :visibility="type === 'dungeon' && requiredBossArr.length ? 'visible':'collapsed'" text="Boss Required Items:" marginTop="4" marginLeft="10"/>
+        <StackLayout v-for="(breq, idx) of requiredBossArr" v-bind:key="idx" orientation="horizontal" marginLeft="10">
+          <Image :visibility="idx > 0  ? 'visible' : 'collapsed'" src="~/img/or.png" width="18"/>
+          <Image v-for="bimg of breq" v-bind:key="bimg" :src="'~/img/'+(bimg.replace('~',''))+'.png'" width="18" height="18" margin="2"/>
+        </StackLayout>
       </StackLayout>
-      <Button class="btn standard padded" @tap="closeModal" marginTop="14">Close</Button>
+    </ScrollView>
+    <!-- FOOTER -->
+    <StackLayout orientation="vertical" row="2" class="modal-footer" :class="{'empty': !requiredArr.length && !requiredBossArr.length}">
+      <Button class="btn standard padded" @tap="closeModal">Close</Button>
     </StackLayout>
-  </ScrollView>
+  </GridLayout>
 </template>
 
 <script type="ts">
@@ -127,5 +136,30 @@
 </script>
 
 <style scoped lang="scss">
+  @import "../../global_vars";
+  .scrollbox {
+    background-color: #006c00;
+    border-width: 0;
+    &.empty {
+      background-color: $standard-bg;
+    }
+  }
+  .modal-header {
+    border-color: $standard-border;
+    border-width: 0 0 2 0;
+    padding-top:10;
+    &.empty {
+      border-width: 0;
+    }
+  }
+  .modal-footer {
+    border-color: $standard-border;
+    border-width: 2 0 0 0;
+    padding-bottom:10;
+    padding-top:10;
+    &.empty {
+      border-width: 0;
+    }
+  }
 
 </style>

From f6b3e27392439c4832af3542c2fa2b2de5fd768a Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Mon, 27 Jul 2020 09:10:59 -0600
Subject: [PATCH 12/19] finishing up on required items

---
 app/components/map/LocaleModal.vue          |  7 ++---
 app/inverted/InvertedRegionHelper.ts        |  9 ++++++
 app/inverted/InvertedStaticMapDungeonsDW.ts | 35 +++++++++++++--------
 app/inverted/InvertedStaticMapDungeonsLW.ts | 27 +++++++++++-----
 app/retro/RetroStaticMapShopsLW.ts          |  9 ++++--
 app/standard/StandardStaticMapDungeonsLW.ts | 10 +++---
 6 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/app/components/map/LocaleModal.vue b/app/components/map/LocaleModal.vue
index de1c828..c6774d4 100644
--- a/app/components/map/LocaleModal.vue
+++ b/app/components/map/LocaleModal.vue
@@ -1,9 +1,8 @@
 <template>
-  <GridLayout :rows="((type==='location' || type==='shop' || (type === 'dungeon' && localeKey === 'gt')) ? '80'
-    : '50')+',*,80'" columns="*" class="modal-dialog" style="padding:0">
+  <GridLayout rows="80,*,80" columns="*" class="modal-dialog" style="padding:0">
     <!-- HEADER -->
     <StackLayout orientation="vertical" class="modal-header" :class="{'empty': !requiredArr.length && !requiredBossArr.length}">
-      <Label class="list-title" :text="title" textAlignment="center" marginBottom="5" fontSize="24"/>
+      <Label class="list-title" :text="title" textAlignment="center" fontSize="24"/>
       <StackLayout :visibility="type==='dungeon' && localeKey === 'gt' ? 'visible':'collapsed'" orientation="horizontal"  horizontalAlignment="center">
         <Image v-for="c in gtReq" :src="'~/img/'+c+'.png'" width="16"/>
       </StackLayout>
@@ -12,6 +11,7 @@
         <Label :text="' x'+itemCount"/>
       </StackLayout>
       <Label :visibility="type==='shop' ? 'visible' : 'collapsed'" :text="takeAny ? 'Take Any Cave':'Shop'" horizontalAlignment="center"/>
+      <Label :visibility="type === 'dungeon' && localeKey!=='gt'  ? 'visible' : 'collapsed'" class="list-title" :text="boss" textAlignment="center" />
     </StackLayout>
     <!-- BODY -->
     <ScrollView row="1" class="scrollbox" :class="{'empty': !requiredArr.length && !requiredBossArr.length}">
@@ -21,7 +21,6 @@
           <Image :visibility="idx > 0  ? 'visible' : 'collapsed'" src="~/img/or.png" width="18"/>
           <Image v-for="img of req" v-bind:key="img" :src="'~/img/'+(img.replace('~',''))+'.png'" width="18" height="18" margin="2"/>
         </StackLayout>
-        <Label :visibility="type === 'dungeon'  ? 'visible' : 'collapsed'" class="list-title" :text="boss" textAlignment="center" marginBottom="5" fontSize="24"/>
         <Label :visibility="type === 'dungeon' && requiredBossArr.length ? 'visible':'collapsed'" text="Boss Required Items:" marginTop="4" marginLeft="10"/>
         <StackLayout v-for="(breq, idx) of requiredBossArr" v-bind:key="idx" orientation="horizontal" marginLeft="10">
           <Image :visibility="idx > 0  ? 'visible' : 'collapsed'" src="~/img/or.png" width="18"/>
diff --git a/app/inverted/InvertedRegionHelper.ts b/app/inverted/InvertedRegionHelper.ts
index 2a497f8..4cb15a8 100644
--- a/app/inverted/InvertedRegionHelper.ts
+++ b/app/inverted/InvertedRegionHelper.ts
@@ -93,6 +93,10 @@ export class InvertedRegionHelper {
             (dungeons.mm.medallion === 3 && items.quake);
     return m && this.mireDW(items, dungeons);
   }
+  static reqMm = [
+    ['dungeons/medallion0', InvertedRegionHelper.reqMireDW]
+  ];
+
   static tr(items, dungeons) {
     const m = (dungeons.tr.medallion === 1 && items.bombos) ||
       (dungeons.tr.medallion === 2 && items.ether) ||
@@ -100,6 +104,10 @@ export class InvertedRegionHelper {
     return (m && items.redcane && this.deathMtnEastDW(items, dungeons))
       || (items.redcane && items.moonpearl && items.mirror && InvertedRegionHelper.deathMtnEastLW(items, dungeons));
   }
+  static reqTr = [
+    ['dungeons/medallion0', 'items/redcane1', InvertedRegionHelper.reqDeathMtnEastDW],
+    ['items/redcane1', 'items/moonpearl1', 'items/mirror1', InvertedRegionHelper.reqDeathMtnEastLW]
+  ];
   static gt(items, dungeons, settings) {
     let c = 0;
     const keys = Object.keys(dungeons);
@@ -110,4 +118,5 @@ export class InvertedRegionHelper {
     }
     return c >= settings.openGT && items.moonpearl && this.northEastLW(items, dungeons);
   }
+  static reqGt = [['items/moonpearl1',InvertedRegionHelper.reqNorthEastLW]];
 }
diff --git a/app/inverted/InvertedStaticMapDungeonsDW.ts b/app/inverted/InvertedStaticMapDungeonsDW.ts
index 059f6bc..c466fda 100644
--- a/app/inverted/InvertedStaticMapDungeonsDW.ts
+++ b/app/inverted/InvertedStaticMapDungeonsDW.ts
@@ -8,8 +8,8 @@ export class InvertedStaticMapDungeonsDW {
     validateBoss(items, dungeons){
       return items.hammer && items.bow > 0 && items.lantern && InvertedRegionHelper.northEastDW(items, dungeons);
     },
-    req:[],
-    reqBoss:[]
+    req:[[InvertedRegionHelper.reqNorthEastDW]],
+    reqBoss:[['items/hammer1', 'items/bow1', 'items/lantern1', InvertedRegionHelper.reqNorthEastDW]]
   }; // palace of darkness
   sp = {x:703, y:1402, title:'Swamp Palace', boss:'Arrghus',
     validate(items, dungeons){
@@ -18,8 +18,8 @@ export class InvertedStaticMapDungeonsDW {
     validateBoss(items, dungeons){
       return items.flippers && items.moonpearl && items.mirror && items.hookshot && items.hammer && InvertedRegionHelper.southDW(items, dungeons);
     },
-    req:[],
-    reqBoss:[]
+    req:[['items/flippers1', 'items/moonpearl1', 'items/mirror1']],
+    reqBoss:[['items/flippers1', 'items/moonpearl1', 'items/mirror1', 'items/hookshot1', 'items/hammer1']]
   }; // swamp palace
   sw = {x:149, y:164, title:'Skull Woods', boss:'Mothula',
     validate(items, dungeons){
@@ -29,7 +29,7 @@ export class InvertedStaticMapDungeonsDW {
       return items.firerod && InvertedRegionHelper.northWestDW(items, dungeons);
     },
     req:[],
-    reqBoss:[]
+    reqBoss:[['items/firerod1']]
   }; // skull woods
   tt = {x:190, y:717, title:'Thieves\' Town', boss:'Blind',
     validate(items, dungeons){
@@ -48,8 +48,14 @@ export class InvertedStaticMapDungeonsDW {
     validateBoss(items, dungeons){
       return items.hammer && items.glove > 0 && (items.firerod || items.bombos) && items.flippers && InvertedRegionHelper.southDW(items, dungeons);
     },
-    req:[],
-    reqBoss:[]
+    req:[
+      ['items/flippers1', 'items/firerod1'],
+      ['items/flippers1', 'items/bombos1']
+    ],
+    reqBoss:[
+      ['items/flippers1', 'items/hammer1', 'items/glove1', 'items/firerod1'],
+      ['items/flippers1', 'items/hammer1', 'items/glove1', 'items/bombos1']
+    ]
   }; // ice palace
   mm = {x:110, y:1247, title:'Misery Mire', boss:'Vitreous',
     validate(items, dungeons){
@@ -58,8 +64,8 @@ export class InvertedStaticMapDungeonsDW {
     validateBoss(items, dungeons){
       return items.redcane && items.lantern && InvertedRegionHelper.mm(items, dungeons);
     },
-    req:[],
-    reqBoss:[]
+    req:[[InvertedRegionHelper.reqMm]],
+    reqBoss:[['items/redcane1', 'items/lantern1', InvertedRegionHelper.reqMm]]
   }; // misery mire
   tr = {x:1411, y:90, title:'Turtle Rock', boss:'Trinexx',
     validate(items, dungeons){
@@ -68,8 +74,8 @@ export class InvertedStaticMapDungeonsDW {
     validateBoss(items, dungeons){
       return items.firerod && items.icerod && InvertedRegionHelper.tr(items, dungeons);
     },
-    req:[],
-    reqBoss:[]
+    req:[[InvertedRegionHelper.reqTr]],
+    reqBoss:[['items/firerod1', 'items/icerod1', InvertedRegionHelper.reqTr]]
   }; // turtle rock
   aga = {x:844, y:35, title:'Agahnim\'s Tower', boss:'Agahnim',
     validate(items, dungeons){
@@ -78,7 +84,10 @@ export class InvertedStaticMapDungeonsDW {
     validateBoss(items, dungeons){
       return items.lantern && (items.sword > 0 || items.net) && InvertedRegionHelper.deathMtnEastDW(items, dungeons);
     },
-    req:[],
-    reqBoss:[]
+    req:[[InvertedRegionHelper.reqDeathMtnEastDW]],
+    reqBoss:[
+      ['items/lantern1', InvertedRegionHelper.reqDeathMtnEastDW, 'items/sword1'],
+      ['items/lantern1', InvertedRegionHelper.reqDeathMtnEastDW, 'items/net1'],
+    ]
   };
 }
diff --git a/app/inverted/InvertedStaticMapDungeonsLW.ts b/app/inverted/InvertedStaticMapDungeonsLW.ts
index d10e851..1e3a4cd 100644
--- a/app/inverted/InvertedStaticMapDungeonsLW.ts
+++ b/app/inverted/InvertedStaticMapDungeonsLW.ts
@@ -9,8 +9,11 @@ export class InvertedStaticMapDungeonsLW {
       return  items.moonpearl && InvertedRegionHelper.northEastLW(items, dungeons)
             && items.bow > 0 && (items.lantern || items.firerod);
     },
-    req:[],
-    reqBoss:[]
+    req:[['items/moonpearl1', InvertedRegionHelper.reqNorthEastLW]],
+    reqBoss:[
+      ['items/moonpearl1', InvertedRegionHelper.reqNorthEastLW, 'items/bow1', 'items/lantern1'],
+      ['items/moonpearl1', InvertedRegionHelper.reqNorthEastLW, 'items/bow1', 'items/firerod1']
+    ]
 
   };
   dp = {x:111, y:1270, title:'Desert Palace', boss:'Lanmolas',
@@ -21,8 +24,11 @@ export class InvertedStaticMapDungeonsLW {
       return InvertedRegionHelper.southLW(items, dungeons) && items.moonpearl && items.book
                 && items.glove > 0 && (items.lantern || items.firerod);
     },
-    req:[],
-    reqBoss:[]
+    req:[['items/book1', 'items/moonpearl1', InvertedRegionHelper.reqSouthLW]],
+    reqBoss:[
+      ['items/book1', 'items/moonpearl1', InvertedRegionHelper.reqSouthLW, 'items/glove1', 'items/lantern1'],
+      ['items/book1', 'items/moonpearl1', InvertedRegionHelper.reqSouthLW, 'items/glove1', 'items/firerod1'],
+    ]
   };
   toh = {x:840, y:40, title:'Tower of Hera', boss:'Moldorm',
     validate(items, dungeons){
@@ -31,8 +37,8 @@ export class InvertedStaticMapDungeonsLW {
     validateBoss(items, dungeons){
       return InvertedRegionHelper.toh(items, dungeons) && items.moonpearl;
     },
-    req:[],
-    reqBoss:[]
+    req:[['items/moonpearl1', InvertedRegionHelper.reqToh]],
+    reqBoss:[['items/moonpearl1', InvertedRegionHelper.reqToh]]
   };
   gt = {x:750, y:577, title:'Ganon\'s Tower', boss:'Agahnim II',
     validate(items, dungeons, settings){
@@ -43,7 +49,12 @@ export class InvertedStaticMapDungeonsLW {
         && (items.lantern || items.firerod) && items.hookshot
         && InvertedRegionHelper.gt(items, dungeons, settings);
     },
-    req:[],
-    reqBoss:[]
+    req:[[InvertedRegionHelper.reqGt]],
+    reqBoss:[
+      ['items/bow1', 'items/hookshot1', InvertedRegionHelper.reqGt, 'items/sword1', 'items/lantern1'],
+      ['items/bow1', 'items/hookshot1', InvertedRegionHelper.reqGt, 'items/sword1', 'items/firerod1'],
+      ['items/bow1', 'items/hookshot1', InvertedRegionHelper.reqGt, 'items/net1', 'items/lantern1'],
+      ['items/bow1', 'items/hookshot1', InvertedRegionHelper.reqGt, 'items/net1', 'items/firerod1']
+    ]
   };
 }
diff --git a/app/retro/RetroStaticMapShopsLW.ts b/app/retro/RetroStaticMapShopsLW.ts
index e1458e3..723d38f 100644
--- a/app/retro/RetroStaticMapShopsLW.ts
+++ b/app/retro/RetroStaticMapShopsLW.ts
@@ -81,15 +81,18 @@ export class RetroStaticMapShopsLW implements IStaticMapShopsLW{
 
   // shops
   kakarikoShop = {x:164, y:878, title:'Kakariko Shop',
-    takeAny: false, req:[], validate(items, dungeons): boolean{
+    takeAny: false, req:[],
+    validate(items, dungeons): boolean{
       return RetroRegionHelper.northWestLW(items, dungeons);
     }};
   lwLakeHyliaShop = {x:1090, y:1153, title:'Lake Hylia Shop',
-    takeAny: false, req:[], validate(items, dungeons): boolean{
+    takeAny: false, req:[],
+    validate(items, dungeons): boolean{
       return RetroRegionHelper.southLW(items, dungeons);
     }};
   lwDeathMtnShop = {x:1283, y:221, title:'Death Mountain Shop',
-    takeAny: false, req:[['items/bombs1']], validate(items, dungeons): boolean{
+    takeAny: false, req:[['items/bombs1', RetroRegionHelper.reqDeathMtnEastLW]],
+    validate(items, dungeons): boolean{
       return items.bombs && RetroRegionHelper.deathMtnEastLW(items, dungeons);
     }};
 
diff --git a/app/standard/StandardStaticMapDungeonsLW.ts b/app/standard/StandardStaticMapDungeonsLW.ts
index 352056a..02d762d 100644
--- a/app/standard/StandardStaticMapDungeonsLW.ts
+++ b/app/standard/StandardStaticMapDungeonsLW.ts
@@ -25,10 +25,10 @@ export class StandardStaticMapDungeonsLW {
     },
     req:[[StandardRegionHelper.reqDp]],
     reqBoss:[
-      [StandardRegionHelper.reqDp, 'items/glove1', 'items/mirror1', 'items/lantern1'],
-      [StandardRegionHelper.reqDp, 'items/glove1', 'items/mirror1', 'items/firerod1'],
-      [StandardRegionHelper.reqDp, 'items/glove1', StandardRegionHelper.reqMireDW, 'items/lantern1'],
-      [StandardRegionHelper.reqDp, 'items/glove1', StandardRegionHelper.reqMireDW, 'items/firerod1'],
+      ['items/book1', 'items/glove1', 'items/lantern1'],
+      ['items/book1', 'items/glove1', 'items/firerod1'],
+      ['items/mirror1', StandardRegionHelper.reqMireDW, 'items/lantern1'],
+      ['items/mirror1', StandardRegionHelper.reqMireDW, 'items/firerod1'],
     ]
   };
   toh = {x:840, y:40, title:'Tower of Hera', boss:'Moldorm',
@@ -48,7 +48,7 @@ export class StandardStaticMapDungeonsLW {
     validateBoss(items){
       return items.lantern && (items.cape || items.sword > 1) && (items.sword > 0 || items.net);
     },
-    req:[['items/cape1', 'items/sword2']],
+    req:[['items/cape1'], ['items/sword2']],
     reqBoss:[
       ['items/lantern1', 'items/sword2'],
       ['items/lantern1', 'items/cape1', 'items/sword1'],

From f5c6182078af1228eb4c57f960a9f5eba4b93479 Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Mon, 27 Jul 2020 11:18:15 -0600
Subject: [PATCH 13/19] fix issue with colors

---
 app/app.scss                       | 4 ++++
 app/components/GoalEditModal.vue   | 2 +-
 app/components/map/LocaleModal.vue | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/app.scss b/app/app.scss
index 9f25a2b..f00333a 100644
--- a/app/app.scss
+++ b/app/app.scss
@@ -60,6 +60,10 @@ Button:active{
   color: $standard-font-color;
   font-family: $font-ganon;
   font-size: 20;
+  &.standard {
+    background-color: $standard-bg;
+    border-color: $standard-border;
+  }
   &.danger {
     background-color: $danger-bg;
     border-color: $danger-border;
diff --git a/app/components/GoalEditModal.vue b/app/components/GoalEditModal.vue
index 02e4d8d..50baa5a 100644
--- a/app/components/GoalEditModal.vue
+++ b/app/components/GoalEditModal.vue
@@ -1,6 +1,6 @@
 <template>
   <ScrollView>
-    <StackLayout orientation="vertical" class="modal-dialog">
+    <StackLayout orientation="vertical" class="modal-dialog standard">
       <StackLayout :visibility="game.goal === goalOptions.triforce.id ? 'visible':'collapsed'" orientation="vertical">
         <Label :text="'Triforce Pieces Goal: '+game.triforceGoal" />
         <GridLayout row="20" columns="20,*,20" style="margin:0;padding:0">
diff --git a/app/components/map/LocaleModal.vue b/app/components/map/LocaleModal.vue
index c6774d4..f901fef 100644
--- a/app/components/map/LocaleModal.vue
+++ b/app/components/map/LocaleModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <GridLayout rows="80,*,80" columns="*" class="modal-dialog" style="padding:0">
+  <GridLayout rows="80,*,80" columns="*" class="modal-dialog standard" style="padding:0">
     <!-- HEADER -->
     <StackLayout orientation="vertical" class="modal-header" :class="{'empty': !requiredArr.length && !requiredBossArr.length}">
       <Label class="list-title" :text="title" textAlignment="center" fontSize="24"/>

From 33686627309166bece14b10fcaadbb73270f2c64 Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Mon, 27 Jul 2020 11:21:18 -0600
Subject: [PATCH 14/19] switch required modal display for dungeons from @tap to
 @longpress to be consistent.

---
 app/components/map/DarkMap.vue  | 6 +++---
 app/components/map/LightMap.vue | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/components/map/DarkMap.vue b/app/components/map/DarkMap.vue
index f90f9cc..fd9f2fc 100644
--- a/app/components/map/DarkMap.vue
+++ b/app/components/map/DarkMap.vue
@@ -5,7 +5,7 @@
       <AbsoluteLayout ref="mapWrapper" top="0" left="0" :scaleX="pinchHandler.currentScale" :scaleY="pinchHandler.currentScale">
         <Image v-for="(tile, idx) in mapHandler.tiles" v-bind:key="idx" :top="tile.top" :left="tile.left" :width="tile.width" :height="tile.height" :src="tile.src" />
         <Label v-for="dkey in mapHandler.dungeonKeys" v-bind:key="dkey" :visibility="pinchHandler.pinching ? 'collapsed' : 'visible'"
-               @tap="onLongPress(dkey, 'dungeon')"
+               @longpress="onLongPress(dkey, 'dungeon')"
                :class="(mapHandler.staticDungeonValues[dkey].maxChests === 0 ? (mapHandler.dungeonValues[dkey].boss) : mapHandler.dungeonValues[dkey].chests === 0) ? 'locale-gray' : mapHandler.dungeons[dkey].klass"
                :width="Math.floor(46 * (1 / pinchHandler.localeScale))"
                :height="Math.floor(46 * (1 / pinchHandler.localeScale))"
@@ -13,7 +13,7 @@
                :top="Math.floor(mapHandler.staticDungeons[dkey].y - (23 * (1 / pinchHandler.localeScale)))" />
         <Label v-for="bkey in mapHandler.dungeonKeys" v-bind:key="bkey+'_boss'" :visibility="pinchHandler.pinching ? 'collapsed' : 'visible'"
                style="border-width: 0"
-               @tap="onLongPress(bkey, 'dungeon')"
+               @longpress="onLongPress(bkey, 'dungeon')"
                :class="mapHandler.dungeonValues[bkey].boss ? 'locale-gray' : mapHandler.bosses[bkey].klass"
                :width="Math.floor(30 * (1 / pinchHandler.localeScale))"
                :height="Math.floor(30 * (1 / pinchHandler.localeScale))"
@@ -21,7 +21,7 @@
                :top="Math.floor(mapHandler.staticDungeons[bkey].y - (15 * (1 / pinchHandler.localeScale)))" />
         <Image v-for="bkey in mapHandler.dungeonKeys" v-bind:key="bkey+'_img'" :visibility="pinchHandler.pinching ? 'collapsed' : 'visible'"
                :src="'~/img/dungeons/'+bkey+'_boss0.png'"
-               @tap="onLongPress(bkey, 'dungeon')"
+               @longpress="onLongPress(bkey, 'dungeon')"
                :width="Math.floor(20 * (1 / pinchHandler.localeScale))"
                :height="Math.floor(20 * (1 / pinchHandler.localeScale))"
                :left="Math.floor(mapHandler.staticDungeons[bkey].x - (10 * (1 / pinchHandler.localeScale)))"
diff --git a/app/components/map/LightMap.vue b/app/components/map/LightMap.vue
index 72ed4b4..565ebdd 100644
--- a/app/components/map/LightMap.vue
+++ b/app/components/map/LightMap.vue
@@ -5,7 +5,7 @@
       <AbsoluteLayout ref="mapWrapper" top="0" left="0" :scaleX="pinchHandler.currentScale" :scaleY="pinchHandler.currentScale">
         <Image v-for="(tile, idx) in mapHandler.tiles" v-bind:key="idx" :top="tile.top" :left="tile.left" :width="tile.width" :height="tile.height" :src="tile.src" />
         <Label v-for="dkey in mapHandler.dungeonKeys" v-bind:key="dkey" :visibility="pinchHandler.pinching ? 'collapsed' : 'visible'"
-               @tap="onLongPress(dkey, 'dungeon')"
+               @longpress="onLongPress(dkey, 'dungeon')"
                :class="(mapHandler.staticDungeonValues[dkey].maxChests === 0 ? (mapHandler.dungeonValues[dkey].boss) : mapHandler.dungeonValues[dkey].chests === 0) ? 'locale-gray' : mapHandler.dungeons[dkey].klass"
                :width="Math.floor(46 * (1 / pinchHandler.localeScale))"
                :height="Math.floor(46 * (1 / pinchHandler.localeScale))"
@@ -13,7 +13,7 @@
                :top="Math.floor(mapHandler.staticDungeons[dkey].y - (23 * (1 / pinchHandler.localeScale)))" />
         <Label v-for="bkey in mapHandler.dungeonKeys" v-bind:key="bkey+'_boss'" :visibility="pinchHandler.pinching ? 'collapsed' : 'visible'"
                style="border-width: 0"
-               @tap="onLongPress(bkey, 'dungeon')"
+               @longpress="onLongPress(bkey, 'dungeon')"
                :class="mapHandler.dungeonValues[bkey].boss ? 'locale-gray' : mapHandler.bosses[bkey].klass"
                :width="Math.floor(30 * (1 / pinchHandler.localeScale))"
                :height="Math.floor(30 * (1 / pinchHandler.localeScale))"
@@ -21,7 +21,7 @@
                :top="Math.floor(mapHandler.staticDungeons[bkey].y - (15 * (1 / pinchHandler.localeScale)))" />
         <Image v-for="bkey in mapHandler.dungeonKeys" v-bind:key="bkey+'_img'" :visibility="pinchHandler.pinching ? 'collapsed' : 'visible'"
                :src="'~/img/dungeons/'+bkey+'_boss0.png'"
-               @tap="onLongPress(bkey, 'dungeon')"
+               @longpress="onLongPress(bkey, 'dungeon')"
                :width="Math.floor(20 * (1 / pinchHandler.localeScale))"
                :height="Math.floor(20 * (1 / pinchHandler.localeScale))"
                :left="Math.floor(mapHandler.staticDungeons[bkey].x - (10 * (1 / pinchHandler.localeScale)))"

From 646788bbb6256d67d0d12d508717a78b9422edd6 Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Mon, 27 Jul 2020 13:46:46 -0600
Subject: [PATCH 15/19] Set lightlist shop icon to correct NPC

---
 app/components/map/LightList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/map/LightList.vue b/app/components/map/LightList.vue
index 7968b48..860400a 100644
--- a/app/components/map/LightList.vue
+++ b/app/components/map/LightList.vue
@@ -41,7 +41,7 @@
             <Image col="0"
                    :src="shopHandler.shops[key].checked ? '~/img/checked.png' : '~/img/unchecked.png'"
                    width="32" height="32" @tap="clickCheck(key, true)" marginRight="5"/>
-            <Image col="1" height="28" :src="shopHandler.staticLocations[key].takeAny ? '~/img/takeAny.png' : '~/img/shopDW.png'" marginRight="5" />
+            <Image col="1" height="28" :src="shopHandler.staticLocations[key].takeAny ? '~/img/takeAny.png' : '~/img/shopLW.png'" marginRight="5" />
             <Label col="2" :fontSize="shopHandler.staticLocations[key].title.length < 23 ? 20 : 18"
                    @longpress="onLongPress(key, 'shop')"
                    class="title" :text="shopHandler.staticLocations[key].title" verticalAlignment="center"/>

From f7773ba639599423af1a4c2459d4de611c1a8cae Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Mon, 27 Jul 2020 16:29:24 -0600
Subject: [PATCH 16/19] Fix my horrid math when it comes to counting items.

---
 app/inverted/InvertedStaticMapLW.ts           |  2 +-
 app/standard/StandardStaticMapLW.ts           |  2 +-
 .../standard/StandardOverallTests.spec.js     | 23 +++++++++++++++++++
 app/utils/ModelManager.ts                     | 17 +++++++-------
 4 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 app/tests/standard/StandardOverallTests.spec.js

diff --git a/app/inverted/InvertedStaticMapLW.ts b/app/inverted/InvertedStaticMapLW.ts
index f118b82..ba54e00 100644
--- a/app/inverted/InvertedStaticMapLW.ts
+++ b/app/inverted/InvertedStaticMapLW.ts
@@ -10,7 +10,7 @@ export class InvertedStaticMapLW {
       return items.moonpearl && InvertedRegionHelper.northEastLW(items, dungeons);
     }};
   backOfEscape = {x:778, y:439, title:'Escape',
-    itemCount: 6, req:[['items/moonpearl1', 'items/glove1', InvertedRegionHelper.reqNorthEastLW]],
+    itemCount: 5, req:[['items/moonpearl1', 'items/glove1', InvertedRegionHelper.reqNorthEastLW]],
     validate(items, dungeons) {
       return InvertedRegionHelper.northEastLW(items, dungeons) && items.moonpearl && items.glove > 0;
     }};
diff --git a/app/standard/StandardStaticMapLW.ts b/app/standard/StandardStaticMapLW.ts
index e43933d..7c639a3 100644
--- a/app/standard/StandardStaticMapLW.ts
+++ b/app/standard/StandardStaticMapLW.ts
@@ -8,7 +8,7 @@ export class StandardStaticMapLW {
     return true;
   }};
   backOfEscape = {x:778, y:439, title:'Escape',
-    itemCount: 6, req:[['items/glove1']],
+    itemCount: 5, req:[['items/glove1']],
     validate(items, dungeons) {
       return items.glove > 0;
     }};
diff --git a/app/tests/standard/StandardOverallTests.spec.js b/app/tests/standard/StandardOverallTests.spec.js
new file mode 100644
index 0000000..bebc605
--- /dev/null
+++ b/app/tests/standard/StandardOverallTests.spec.js
@@ -0,0 +1,23 @@
+import {StandardStaticMapLW} from '~/standard/StandardStaticMapLW';
+import {StandardStaticMapDW} from '~/standard/StandardStaticMapDW';
+
+describe('Overall Tests for Standard', () => {
+  it('should count the items', () => {
+    const lws = new StandardStaticMapLW();
+    const dws = new StandardStaticMapDW();
+    const lwk = Object.keys(lws);
+    const dwk = Object.keys(dws);
+
+    let lwCount = 0;
+    let dwCount = 0;
+    for(const k of lwk){
+      lwCount = lwCount + lws[k].itemCount;
+    }
+    for(const k of dwk){
+      dwCount = dwCount + dws[k].itemCount;
+    }
+    console.log('lwCount', lwCount);
+    console.log('dwCount', dwCount);
+    console.log('total', lwCount + dwCount);
+  });
+});
diff --git a/app/utils/ModelManager.ts b/app/utils/ModelManager.ts
index 58d15cc..b7e13dc 100644
--- a/app/utils/ModelManager.ts
+++ b/app/utils/ModelManager.ts
@@ -213,15 +213,15 @@ export class ModelManager {
 
   getItemMax() {
     if (this.settings.gameMode === this.sol.STANDARD || this.settings.gameMode === this.sol.INVERTED) {
-      return this.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.standard.id ? 155
-        : this.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.mc.id ? (155 + 20)
-          : this.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.mcsk.id ? (155 + 20 + 28)
-            : (155 + 30 + 28);
+      return this.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.standard.id ? 153
+        : this.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.mc.id ? (153 + 22)
+          : this.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.mcsk.id ? (153 + 22 + 28)
+            : (153 + 33 + 28);
     } else if(this.settings.gameMode === this.sol.RETRO) {
-      return this.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.standard.id ? (155 + 28)
-        : this.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.mc.id ? (155 + 20 + 28)
-          : this.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.mcsk.id ? (155 + 20 + 28)
-            : (155 + 30 + 28);
+      return this.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.standard.id ? (153 + 28)
+        : this.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.mc.id ? (153 + 22 + 28)
+          : this.settings.itemShuffle === GameSaveHelper.itemShuffleOptions.mcsk.id ? (153 + 22 + 28)
+            : (153 + 33 + 28);
     }
   }
 
@@ -432,6 +432,7 @@ export class ModelManager {
   }
 
   saveCurrentGame() {
+    console.log('saving game');
     const game = this.settings.gameSlot;
     this.gameSaves[game].items = this.items.getCopy();
     this.gameSaves[game].dungeons = this.dungeons.getCopy();

From 74026670a8478d71dbfc3f669dddb00b82ed2760 Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Mon, 27 Jul 2020 16:41:42 -0600
Subject: [PATCH 17/19] Update FAQ related to item counts.

---
 FAQ.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/FAQ.md b/FAQ.md
index f0d0c9d..a04e44b 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -39,10 +39,9 @@ That said, there still may be placed that have been missed and I welcome your fe
 
 #### There should be 216 items. Where are the missing items?
 
-As described in the [Item Shuffle Settings](#item-shuffle-settings), the tracker only counts relevant items and never counts Hyrule Castle items. The three Hyrule Castle items not counted are:
+As described in the [Item Shuffle Settings](#item-shuffle-settings), the tracker only counts relevant items and never counts Hyrule Castle items. The two Hyrule Castle items not counted are:
 
 - Hyrule Castle Map
-- Hyrule Castle Big Key
 - Hyrule Castle Small Key
 
 If you feel there is an error in item counts, please file an [issue](https://github.com/thecodeflayer/alttp-tracker/issues).
@@ -85,7 +84,7 @@ To learn more about the randomizer options for item shuffle please read Item Set
 **Standard**
 
 In this mode, dungeon items (big keys, small keys, maps and compasses) are not counted in the overall item count.
-The chest count for dungeons only reflects non-dungeon items. The overall item count in this mode is 155 items.
+The chest count for dungeons only reflects non-dungeon items. The overall item count in this mode is 153 items.
 
 In this mode small keys will decrement from their maximum number found in the dungeon.
 This is to help newer players by making it more obvious how many total small keys are in each dungeon.
@@ -111,7 +110,7 @@ To increment item count when you find a small key in a chest you should click th
 
 In this mode, maps, compasses, small keys and big keys (excluding Hyrule Castle) are added to the item pool.
 The chest count for dungeons will be increased as in the Maps, Compasses and Small Keys option with the inclusion of big keys.
-The overall item count in this mode is 213.
+The overall item count in this mode is 214.
 
 In this mode small keys will increment from zero. Note that, like the Maps, Compasses and Small Keys option, the small key counter does not affect the item count.
 The small key counter reflects all the small keys in the dungeon whether they are in a chest, a drop or from pots.

From 214478ce8c5a53266f6948b763f1ff1d9db78424 Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Mon, 27 Jul 2020 17:02:43 -0600
Subject: [PATCH 18/19] Fixed issue with chest saves where zero count was not
 saved. Also added proper value check to other default classes.

---
 app/default-objects/DefaultDungeons.ts            | 6 ++++--
 app/default-objects/DefaultGameSaves.ts           | 2 +-
 app/default-objects/DefaultItems.ts               | 2 +-
 app/default-objects/DefaultMap.ts                 | 4 ++--
 app/default-objects/DefaultSettings.ts            | 2 +-
 app/tests/default-objects/DefaultDungeons.spec.js | 3 ++-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/default-objects/DefaultDungeons.ts b/app/default-objects/DefaultDungeons.ts
index b2a4135..3915d28 100644
--- a/app/default-objects/DefaultDungeons.ts
+++ b/app/default-objects/DefaultDungeons.ts
@@ -7,6 +7,7 @@ export class DefaultDungeons {
   }
   static fromJSON(str: string) :DefaultDungeons {
     const obj = JSON.parse(str);
+    //console.log(obj);
     const retval =  new DefaultDungeons();
     retval.version = obj.version;
     retval.data = DefaultDungeonsData.fromObject(obj.data);
@@ -30,8 +31,9 @@ export class DefaultDungeonsData {
   static fromObject(obj:any):DefaultDungeonsData {
     const data = new DefaultDungeonsData();
     const keys = Object.keys(data);
+    console.log(obj);
     for(const key of keys){
-      if(obj[key]) {
+      if(obj[key]!==undefined) {
         data[key].setFromObject(obj[key]);
       }
     }
@@ -72,7 +74,7 @@ export class Dungeon {
   setFromObject(obj:any): void{
     const keys = Object.keys(this);
     for(const key of keys) {
-      if(obj[key]) {
+      if(obj[key]!==undefined) {
         this[key] = obj[key];
       }
     }
diff --git a/app/default-objects/DefaultGameSaves.ts b/app/default-objects/DefaultGameSaves.ts
index 368d255..bbee947 100644
--- a/app/default-objects/DefaultGameSaves.ts
+++ b/app/default-objects/DefaultGameSaves.ts
@@ -32,7 +32,7 @@ export class DefaultGameSavesData {
     const data = new DefaultGameSavesData();
     const keys = Object.keys(data);
     for(const key of keys){
-      if(obj[key]) {
+      if(obj[key]!==undefined) {
         data[key] = Game.fromObject(obj[key]);
       }
     }
diff --git a/app/default-objects/DefaultItems.ts b/app/default-objects/DefaultItems.ts
index 358e442..340d04b 100644
--- a/app/default-objects/DefaultItems.ts
+++ b/app/default-objects/DefaultItems.ts
@@ -50,7 +50,7 @@ export class DefaultItemsData {
     const data = new DefaultItemsData();
     const keys = Object.keys(data);
     for(const key of keys){
-      if(obj[key]) {
+      if(obj[key]!==undefined) {
         data[key] = obj[key];
       }
     }
diff --git a/app/default-objects/DefaultMap.ts b/app/default-objects/DefaultMap.ts
index 70763bc..2f1dfd6 100644
--- a/app/default-objects/DefaultMap.ts
+++ b/app/default-objects/DefaultMap.ts
@@ -19,11 +19,11 @@ export abstract class DefaultMapData implements IDefaultMapData{
     if(data[world][mapkey] !== null && typeof data[world][mapkey] ==='object' ) {
       const keys = Object.keys(data[world][mapkey]);
       for (const key of keys) {
-        if (obj[world] && obj[world][mapkey] && obj[world][mapkey][key]) {
+        if (obj[world] && obj[world][mapkey] && obj[world][mapkey][key]!==undefined) {
           data[world][mapkey][key] = obj[world][mapkey][key];
         }
       }
-    } else if(obj[world] && obj[world][mapkey]) {
+    } else if(obj[world] && obj[world][mapkey]!==undefined) {
       data[world][mapkey] = obj[world][mapkey];
     }
     return data;
diff --git a/app/default-objects/DefaultSettings.ts b/app/default-objects/DefaultSettings.ts
index 6beb7c2..5a05513 100644
--- a/app/default-objects/DefaultSettings.ts
+++ b/app/default-objects/DefaultSettings.ts
@@ -28,7 +28,7 @@ export class DefaultSettingsData {
     const data = new DefaultSettingsData();
     const keys = Object.keys(data);
     for(const key of keys){
-      if(obj[key]) {
+      if(obj[key]!==undefined) {
         data[key] = obj[key];
       }
     }
diff --git a/app/tests/default-objects/DefaultDungeons.spec.js b/app/tests/default-objects/DefaultDungeons.spec.js
index de024d0..be16cb3 100644
--- a/app/tests/default-objects/DefaultDungeons.spec.js
+++ b/app/tests/default-objects/DefaultDungeons.spec.js
@@ -14,12 +14,13 @@ describe('DefaultDungeons', () => {
     expect(dungeons.data.ep.boss).toEqual(true);
   });
   it('should load items from JSON even if json is incomplete', () => {
-    const json = {'version':'0.0.1', 'data':{'dp':{'boss':true, 'crystal':0, 'chests':4, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'toh':{'boss':false, 'crystal':0, 'chests':4, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'aga':{'boss':false, 'crystal':0, 'chests':0, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'pod':{'boss':false, 'crystal':0, 'chests':7, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'sp':{'boss':false, 'crystal':0, 'chests':8, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'sw':{'boss':false, 'crystal':0, 'chests':4, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'tt':{'boss':false, 'crystal':0, 'chests':6, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'ip':{'boss':false, 'crystal':0, 'chests':5, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'mm':{'boss':false, 'crystal':0, 'chests':4, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'tr':{'boss':false, 'crystal':0, 'chests':7, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'gt':{'boss':false, 'crystal':0, 'chests':22, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}}};
+    const json = {'version':'0.0.1', 'data':{'dp':{'boss':true, 'crystal':0, 'chests':0, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'toh':{'boss':false, 'crystal':0, 'chests':4, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'aga':{'boss':false, 'crystal':0, 'chests':0, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'pod':{'boss':false, 'crystal':0, 'chests':7, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'sp':{'boss':false, 'crystal':0, 'chests':8, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'sw':{'boss':false, 'crystal':0, 'chests':4, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'tt':{'boss':false, 'crystal':0, 'chests':6, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'ip':{'boss':false, 'crystal':0, 'chests':5, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'mm':{'boss':false, 'crystal':0, 'chests':4, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'tr':{'boss':false, 'crystal':0, 'chests':7, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}, 'gt':{'boss':false, 'crystal':0, 'chests':22, 'map':false, 'compass':false, 'bosskey':false, 'smallkeys':0, 'medallion':0}}};
     const dungeons = DefaultDungeons.fromJSON(JSON.stringify(json));
 
     expect(dungeons.data.ep).toBeDefined();
     expect(dungeons.data.ep.boss).toEqual(false);
     expect(dungeons.data.dp.boss).toEqual(true);
+    expect(dungeons.data.dp.chests).toEqual(0);
   });
   it('should make a copy', () => {
     const dungeons1 = new DefaultDungeonsData();

From ed8809d64f258bdc2ecf617f05d74ff038d9d5c3 Mon Sep 17 00:00:00 2001
From: thecodeflayer <thecodeflayer@users.noreply.github.com>
Date: Mon, 27 Jul 2020 18:22:37 -0600
Subject: [PATCH 19/19] Prep for 1.1.1

---
 CHANGELOG.md                                  | 20 ++++++++++++++++---
 README.md                                     |  2 +-
 .../Android/src/main/AndroidManifest.xml      |  4 ++--
 app/utils/ModelManager.ts                     |  2 +-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4dec192..ce22544 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,20 @@
-# What's New in Version 1.1.0
+# What's New in Version 1.1.1
+
+### Location Item Requirements Modal
+Required items for locations can now be shown by "long pressing" on the location.
+
+- From the Maps, this works for locations, shops and dungeons.
+- From the Location Lists this works by long pressing the location title.
+
+### Enhancements and Bug Fixes
+
+- Fixed issue with chest saves in Dungeons screen where chest counts set to zero would be reset to max value when reloading the save.
+- Fixed issue with item counts in various item shuffle modes. Items should now add up correctly. 
+- Location list views now have a sleeker UI.
+
+---
+
+## What's New in Version 1.1.0
 
 ### Retro Game Mode
 Retro mode harkens back to the original Legend of Zelda. 
@@ -21,8 +37,6 @@ For the tracker the following features have been added:
 - App now stays in Portrait mode (Landscape mode never worked correctly)
 - Fixed a bug with maps where position, scale and view mode were not getting saved. 
 
----
-
 ## What's New in Version 1.0.0
 
 ### Logic Fixes and Testing
diff --git a/README.md b/README.md
index 3c4fc8f..4d33430 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ First take a look at existing issues and make sure that it hasn't been filed bef
 ## Installation
 In order to install on Android you will have to "side-load" the APK from Github. On most modern Android platforms you can follow these steps:
 1. Navigate to the latest release page on the Android device you want to install the app on. 
-Current release is [1.1.0](https://github.com/thecodeflayer/alttp-tracker/releases/tag/1.1.0)
+Current release is [1.1.1](https://github.com/thecodeflayer/alttp-tracker/releases/tag/1.1.1)
 2. Under the Assets section, click on the APK file listed on the release page.
 3. You will typically receive a warning about APK files harming your device. You will need to confirm download.
 4. Once downloaded, click on the downloaded APK file.
diff --git a/app/App_Resources/Android/src/main/AndroidManifest.xml b/app/App_Resources/Android/src/main/AndroidManifest.xml
index 743d416..f9c4b84 100644
--- a/app/App_Resources/Android/src/main/AndroidManifest.xml
+++ b/app/App_Resources/Android/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="__PACKAGE__"
-	android:versionCode="10021"
-	android:versionName="1.1.0">
+	android:versionCode="10022"
+	android:versionName="1.1.1">
 
 	<supports-screens
 		android:smallScreens="true"
diff --git a/app/utils/ModelManager.ts b/app/utils/ModelManager.ts
index b7e13dc..ca81499 100644
--- a/app/utils/ModelManager.ts
+++ b/app/utils/ModelManager.ts
@@ -24,7 +24,7 @@ export class ModelManager {
   gameSaves: DefaultGameSavesData;
   editGame: GameEditObj;
 
-  appVersion = '1.1.0';
+  appVersion = '1.1.1';
   itemsVersion = '0.0.1';
   dungeonsVersion = '0.0.2';
   mapVersion = '0.0.1';