vision: extract the OAM of all stages and plot just what the vision n…

…eeds It is necessary because some visions has more than 3 stages and if we plot the OAM of all stages more than necessary we'll show trash on the map
macabeus · Jun 9, 2019 · 4152946 · 4152946
1 parent b926a5f
commit 4152946
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 37 deletions.
diff --git a/brush/src/components/Map/OAMLayer/index.js b/brush/src/components/Map/OAMLayer/index.js
@@ -1,48 +1,30 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import { Layer } from 'react-konva'
+import { range } from 'ramda'
 import PointOam from '../Point/PointOam'
 
-const OAMLayer = ({ setSelectedPointInfos, vision }) => {
+const OAMLayer = ({ setSelectedPointInfos, totalStages, vision }) => {
   const { oam } = vision
 
   const oamList = oam
     .map(oamEntry => oamEntry.data)
-    .map(({
-      kind,
-      xStage1,
-      xStage2,
-      xStage3,
-      yStage1,
-      yStage2,
-      yStage3,
-    }) =>
-      [
-        <PointOam
-          key={`${xStage1} ${yStage1} 1`}
-          oamId={kind}
-          stage={1}
-          showPointInfosHandle={setSelectedPointInfos}
-          x={xStage1}
-          y={yStage1}
-        />,
-        <PointOam
-          key={`${xStage2} ${yStage2} 2`}
-          oamId={kind}
-          stage={2}
-          showPointInfosHandle={setSelectedPointInfos}
-          x={xStage2}
-          y={yStage2}
-        />,
-        <PointOam
-          key={`${xStage3} ${yStage3} 3`}
-          oamId={kind}
-          stage={3}
-          showPointInfosHandle={setSelectedPointInfos}
-          x={xStage3}
-          y={yStage3}
-        />,
-      ])
+    .map(oamData =>
+      range(1, totalStages + 1).map((i) => {
+        const x = oamData[`xStage${i}`]
+        const y = oamData[`yStage${i}`]
+
+        return (
+          <PointOam
+            key={`${x} ${y} ${i}`}
+            oamId={oamData.kind}
+            stage={i}
+            showPointInfosHandle={setSelectedPointInfos}
+            x={x}
+            y={y}
+          />
+        )
+      }))
 
   return (
     <Layer>
@@ -53,6 +35,7 @@ const OAMLayer = ({ setSelectedPointInfos, vision }) => {
 
 OAMLayer.propTypes = {
   setSelectedPointInfos: PropTypes.func,
+  totalStages: PropTypes.number.isRequired,
   vision: PropTypes.shape({
     oam: PropTypes.arrayOf(PropTypes.shape({
       data: PropTypes.object.isRequired,

diff --git a/brush/src/components/Map/index.js b/brush/src/components/Map/index.js
@@ -21,6 +21,7 @@ const Map = ({
     infos: {
       tilemap: {
         height,
+        totalStages,
         width,
       },
     },
@@ -47,6 +48,7 @@ const Map = ({
         />
         {optShowOAM && <OAMLayer
           setSelectedPointInfos={setSelectedPointInfos}
+          totalStages={totalStages}
           vision={vision}
         />}
         <Layer>

diff --git a/scissors/src/visionManager.js b/scissors/src/visionManager.js
@@ -31,7 +31,13 @@ const extractOAM = (romBuffer, [addressStart, addressEnd]) =>
       .skip(4)
       .word16lu('xStage3')
       .word16lu('yStage3')
-      .skip(21)
+      .skip(4)
+      .word16lu('xStage4')
+      .word16lu('yStage4')
+      .skip(4)
+      .word16lu('xStage5')
+      .word16lu('yStage5')
+      .skip(5)
       .word8lu('kind')
       .vars,
     memory,

diff --git a/scissors/src/visions/1-1.js b/scissors/src/visions/1-1.js
@@ -4,6 +4,7 @@ export default {
     oam: [0xE2B90, 0xE2F59],
   },
   tilemap: {
+    totalStages: 3,
     height: 60,
     width: 420,
     scheme: [

diff --git a/scissors/src/visions/1-2.js b/scissors/src/visions/1-2.js
@@ -4,6 +4,7 @@ export default {
     oam: [0xE3CC0, 0xE3FAC],
   },
   tilemap: {
+    totalStages: 3,
     height: 60,
     width: 300,
     scheme: [