Add Shop data and names Merchants Beedle and Shops

Author: savage13

src/components/AppMapDetailsObj.ts

@@ -84,7 +84,7 @@ function numOrArrayToArray(x: number | [number, number, number] | undefined): [n
 
 function isAreaObject(obj: ObjectMinData) {
   const areaObjectNames = ["Area", "BoxWater", "SpotBgmTag", "PointWindSetTag", "AreaCulling_InnerHide",
-    "AreaCulling_InnerOn", "AreaCulling_OuterNPCMementary", "FarModelCullingArea"];
+    "AreaCulling_InnerOn", "AreaCulling_OuterNPCMementary", "FarModelCullingArea", "CastleBarrier"];
   return areaObjectNames.includes(obj.name) || obj.name.startsWith('AirWall');
 }
 
@@ -113,6 +113,7 @@ export default class AppMapDetailsObj extends AppMapDetailsBase<MapMarkerObj | M
 
   private dropTables: { [key: string]: any } = {};
   private shopData: { [key: string]: any } = {};
+  private shopName: string | null = null;
   private links: PlacementLink[] = [];
   private linksToSelf: PlacementLink[] = [];
   private linkTagInputs: PlacementLink[] = [];
@@ -141,6 +142,7 @@ export default class AppMapDetailsObj extends AppMapDetailsBase<MapMarkerObj | M
     this.railMarkers.forEach(m => m.remove());
     this.railMarkers = [];
     this.shopData = {};
+    this.shopName = null;
     if (this.minObj.objid) {
       this.obj = (await MapMgr.getInstance().getObjByObjId(this.minObj.objid))!;
     } else {
@@ -171,6 +173,39 @@ export default class AppMapDetailsObj extends AppMapDetailsBase<MapMarkerObj | M
       }
     }
 
+    // @ts-ignore
+    if (this.obj.data.ShopData) {
+      // @ts-ignore
+      this.shopData = this.obj.data.ShopData//await MapMgr.getInstance().getObjShopData()
+    }
+    // Count Items in GenGroup with ForSale
+    let ggHasForSale = genGroupForSaleCount(this.genGroup)
+
+    if (ggHasForSale) {
+      this.shopData = {}
+
+      let gg = genGroupFilterItems(this.obj.name, this.genGroup)
+
+      let owner = gg.find((g: any) => g.data.ShopName)
+      if (owner) {
+        this.shopName = owner.data.ShopName
+      } else {
+        owner = gg.find((g: any) => g.data['!Parameters'].ProfileUser == "NPC")
+        if (owner && this.getName(owner.name) != owner.name) {
+          this.shopName = "Shop / " + this.getName(owner.name)
+        }
+      }
+      // Identify items ForSale and count them
+      let items: any = gg
+        .filter(g => g.data.LinksToObj)
+        .filter(g => g.data.LinksToObj.some((gobj: any) => gobj.DefinitionName == "ForSale"))
+        .map(g => g.name)
+        // @ts-ignore
+        .reduce((acc, name) => { acc[name] = (acc[name] || 0) + 1; return acc }, {})
+      let Normal = shopDataFromItems(items)
+      this.shopData = { Header: { TableNum: 1, Table01: "Normal" }, Normal }
+    }
+
     if (this.obj.data.LinksToRail || DRAGON_HASH_IDS.includes(this.obj.hash_id)) {
       this.rails = await MapMgr.getInstance().getObjRails(this.obj.hash_id);
     }
@@ -226,6 +261,10 @@ export default class AppMapDetailsObj extends AppMapDetailsBase<MapMarkerObj | M
       if (this.railLimits.max === undefined) { this.railLimits.max = yvals[0]; }
       this.railLimits.min = Math.min(this.railLimits.min, ...yvals);
       this.railLimits.max = Math.max(this.railLimits.max, ...yvals);
+      if (Math.abs(this.railLimits.min - this.railLimits.max) < 5) {
+        this.railLimits.min -= 3
+        this.railLimits.max += 3
+      }
       // Draw polyline [x,z,y] but z is North-South and y is Up-Down
       pts = pts.map((pt: any) => [pt[2], pt[0], pt[1]]);
       // @ts-ignore
@@ -632,6 +671,20 @@ export default class AppMapDetailsObj extends AppMapDetailsBase<MapMarkerObj | M
     return Object.keys(this.shopData).length > 0;
   }
 
+  getShopData() {
+    let location = this.getLocationSub()
+    if (location) {
+      return this.shopData[location]
+    }
+    return this.shopData
+  }
+
+  getShopName() {
+    // @ts-ignore
+    return (this.shopName) ? this.shopName : null
+  }
+
+
   formatDropTable(): string {
     let lines = [];
     let names = Object.keys(this.dropTables);
@@ -807,3 +860,50 @@ export default class AppMapDetailsObj extends AppMapDetailsBase<MapMarkerObj | M
     this.forgetColorScale();
   }
 }
+
+function genGroupForSaleCount(genGroup: ObjectData[]) {
+  return genGroup
+    .map(g => g.data.LinksToObj)
+    .filter(g => g)
+    .map(g =>
+      g.map((gobj: any) => gobj.DefinitionName)
+        .filter((name: string) => name == "ForSale"))
+    .flat().length
+}
+
+function genGroupFilterItems(name: string, genGroup: ObjectData[]) {
+  // Tarrey Town groups all Shops together
+  //   Search for Owner and get Shop Name
+  //   Filter out names of items in shop
+  if (!(genGroup.some(g => g.name == "Npc_oasis050"))) { // Found Rhondson in genGroup (Tarrey Town)
+    return genGroup
+  }
+  if (name.startsWith("Mannequin_006_") || name == "Npc_oasis050") {
+    return genGroup.filter(g => g.name.startsWith("Mannequin_006_") || g.name == "Npc_oasis050")
+  }
+  if (name.startsWith("Item_Ore_") || name == "Npc_Goron025") {
+    return genGroup.filter(g => g.name.startsWith("Item_Ore_") || g.name == "Npc_Goron025")
+  }
+  if (name.startsWith("Obj_") || name == "Npc_HighMountain010") {
+    return genGroup.filter(g => g.name.startsWith("Obj_") || g.name == "Npc_HighMountain010")
+      .filter(g => !g.name.startsWith("Obj_Tree"))
+  }
+  return []
+}
+
+function shopDataFromItems(items: any) {
+  let Normal: any = { ColumnNum: Object.keys(items).length }
+  let BuyingPrice = MapMgr.getInstance().getBuyingPrice()
+  Object.keys(items).forEach((name, i) => {
+    let I = (i + 1).toString().padStart(3, '0')
+    Normal[`ItemsSort${I}`] = i + 1
+    Normal[`ItemName${I}`] = name
+    Normal[`ItemNum${I}`] = items[name]
+    Normal[`ItemPriceBase${I}`] = BuyingPrice[name]
+    Normal[`ItemAdjustPrice${I}`] = 0
+    Normal[`ItemPrice${I}`] = BuyingPrice[name]
+    if (!BuyingPrice[name])
+      console.log("No buying price: ", name)
+  })
+  return Normal
+}

src/components/AppMapDetailsObj.vue

@@ -67,7 +67,7 @@
       </section>
 
       <section v-if="shopDataExists()">
-        <ShopData :data="shopData[this.getLocationSub()]" />
+        <ShopData :data="getShopData()" :shop_ui_name="getShopName()" />
       </section>
 
       <section v-if="obj.data['!Parameters']">

src/components/ShopData.ts

@@ -9,19 +9,45 @@ export default class ShopData extends mixins(MixinUtil) {
   @Prop()
   private data!: any;
 
+  @Prop()
+  private shop_ui_name!: any;
+
+  table: string = "Normal"
+
+  private created() {
+    if (Object.keys(this.data || []).length) {
+      if (this.data.Normal)
+        this.table = "Normal"
+      else
+        this.table = Object.keys(this.data)[0]
+    }
+  }
+  shop_name() {
+    if (this.shop_ui_name)
+      return this.shop_ui_name
+    if (this.data.Cooking && this.data.Compound) {
+      return "Beedle Shop Data"
+    }
+    return "Shop"
+  }
   length() {
-    return this.data.Normal.ColumnNum;
+    if (this.data[this.table])
+      return this.data[this.table].ColumnNum;
+    return 0
   }
   name(i: number) {
     const n = i.toString().padStart(3, '0')
-    return ui.getName(this.data.Normal[`ItemName${n}`]);
+    return ui.getName(this.data[this.table][`ItemName${n}`]);
   }
   num(i: number) {
     const n = i.toString().padStart(3, '0')
-    return this.data.Normal[`ItemNum${n}`];
+    return this.data[this.table][`ItemNum${n}`];
   }
   price(i: number) {
     const n = i.toString().padStart(3, '0')
-    return this.data.Normal[`ItemPrice${n}`];
+    return this.data[this.table][`ItemPrice${n}`];
+  }
+  tables() {
+    return Object.keys(this.data).filter(v => v != "Header")
   }
 }

src/components/ShopData.vue

@@ -1,7 +1,10 @@
 <template>
   <section >
     <hr>
-    <h4 class="subsection-heading">Beedle Shop Data</h4>
+    <h4 class="subsection-heading">{{shop_name()}}</h4>
+    <div v-if="shop_name() != 'Beedle Shop Data' && tables().length > 1">
+      <b-form-select v-model="table" :options="tables()" class="mb-2 select_table" size="sm"> </b-form-select>
+    </div>
     <div class="table">
         <div v-for="idx in length()" :key="idx" class="table-row">
           <div class="cell">{{name(idx)}}</div>
@@ -24,5 +27,18 @@
   .table-row .cell {
       display: table-cell;
   }
+  .select_table {
+      color: white;
+      background: rgba(0,0,0,0.2);
+      border: rgba(255,255,255,0.2) 1px solid;
+
+      -webkit-appearance: none; /* For Chrome, Safari */
+      -moz-appearance: none;    /* For Firefox */
+      appearance: none;         /* Standard property */
+      background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><polygon points="0,2 4,6 8,2" fill="white"/></svg>') no-repeat right 10px center;
+      background-size: 10px;
+      padding-right: 30px;   /* Make space for the custom arrow */
+  }
+
 </style>
 <script src="./ShopData.ts"></script>

src/services/MapMgr.ts

@@ -1,6 +1,8 @@
 
 import { GAME_FILES } from '@/util/map';
 
+import { BuyingPrice } from './buying_price'
+
 const RADAR_URL = process.env.VUE_APP_RADAR_URL;
 
 export type Vec3 = [number, number, number];
@@ -113,6 +115,10 @@ export class MapMgr {
     return fetch(`${GAME_FILES}/ecosystem/beedle_shop_data.json`).then(parse);
   }
 
+  getBuyingPrice() {
+    return BuyingPrice
+  }
+
   getObjDropTables(unitConfigName: string, tableName: string) {
     return fetch(`${RADAR_URL}/drop/${unitConfigName}/${tableName}`).then(parse);
   }