vision: add 1-3

macabeus · Jun 9, 2019 · 62555d8 · 62555d8
1 parent 4152946
commit 62555d8
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 1 deletion.
diff --git a/brush/src/components/Map/Point/PointOam.js b/brush/src/components/Map/Point/PointOam.js
@@ -5,7 +5,10 @@ import { oamIdToName } from 'scissors'
 import Point from '.'
 
 const oamIdToColor = {
+  0x01: '188, 22, 22, 1',
+  0x02: '22, 22, 188, 1',
   0x03: '255, 232, 13, 1',
+  0x05: '115, 115, 115, 1',
   0x07: '255, 110, 210, 1',
   0x2C: '179, 255, 98, 1',
   0x2D: '140, 255, 250',

diff --git a/brush/src/components/SelectVision/index.js b/brush/src/components/SelectVision/index.js
@@ -28,7 +28,11 @@ const SelectVision = () => {
       placeholder="Select a vision"
       onChange={e => setNewVision(e.target.value)}
       value={dropdownValue}
-      options={[{ name: 'Vision 1-1', value: '1-1' }, { name: 'Vision 1-2', value: '1-2' }]}
+      options={[
+        { name: 'Vision 1-1', value: '1-1' },
+        { name: 'Vision 1-2', value: '1-2' },
+        { name: 'Vision 1-3', value: '1-3' },
+      ]}
     />
   )
 }

diff --git a/brush/src/constants/tileNameToColor.js b/brush/src/constants/tileNameToColor.js
@@ -1,11 +1,13 @@
 const tileNameToColor = {
+  blueDoor: '100, 100, 215, 0.5',
   board: '199, 199, 199, 1',
   bridge: '200, 131, 63, 1',
   bridgeRope: '200, 131, 63, 0.5',
   darkRock: '90, 60, 63, 1',
   empty: '255, 255, 255, 0',
   grass: '0, 125, 0, 1',
   lightRock: '200, 100, 63, 1',
+  redDoor: '215, 100, 100, 0.5',
   rock: '160, 60, 63, 1',
   spike: '200, 20, 70, 1',
   unknown: '0, 0, 0, 1',

diff --git a/scissors/src/oamMaps.js b/scissors/src/oamMaps.js
@@ -1,5 +1,8 @@
 const oamIdToName = {
+  0x01: 'redKey',
+  0x02: 'blueKey',
   0x03: 'star',
+  0x05: 'door',
   0x07: 'heart',
   0x2C: 'dreamStone',
   0x2D: 'dreamStoneLarge',

diff --git a/scissors/src/visions/1-3.js b/scissors/src/visions/1-3.js
@@ -0,0 +1,49 @@
+export default {
+  rom: {
+    tilemap: [0x1B50AC, 0x1B5ECC],
+    oam: [0xE4DF0, 0xE5109],
+  },
+  tilemap: {
+    totalStages: 5,
+    height: 59,
+    width: 300,
+    scheme: [
+      {
+        name: 'rock',
+        ids: [0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5D, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x6B, 0x6E, 0x6F, 0x7A, 0x7B, 0x7C, 0x7E, 0x7F, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x91, 0xAB, 0xB0, 0xB1, 0xB3, 0xBD],
+      },
+      {
+        name: 'lightRock',
+        ids: [0x68, 0x69, 0x6A, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x78, 0xAC, 0xAD, 0xAE, 0xAF, 0xB4],
+      },
+      {
+        name: 'darkRock',
+        ids: [0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x48, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x5B, 0x5E, 0x5F, 0x95, 0x97, 0x96, 0x9C, 0x9E, 0x9F, 0xA0, 0xA1, 0xA2, 0xA3, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xBB, 0xBC, 0xB7, 0xB8, 0xB9, 0xBA, 0xC0, 0xC2],
+      },
+      {
+        name: 'wood',
+        ids: [0x47, 0x49, 0x52, 0x94, 0x98, 0x99, 0x9A, 0x9B, 0x9D, 0xA4, 0xA5],
+      },
+      {
+        name: 'bridge',
+        ids: [0x66, 0x67, 0x6C, 0x70, 0x79, 0x92, 0x93, 0xB2, 0xB5, 0xB6, 0xBE, 0xBF, 0xC1],
+      },
+      {
+        name: 'bridgeRope',
+        ids: [0x04, 0x05, 0x0B, 0x0C, 0x11, 0x13, 0x14, 0x21],
+      },
+      {
+        name: 'board',
+        ids: [0x10, 0x12, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x38, 0x37, 0x38, 0x39, 0x3A],
+      },
+      {
+        name: 'redDoor',
+        ids: [0x08, 0x09, 0x1E, 0x20],
+      },
+      {
+        name: 'blueDoor',
+        ids: [0x02, 0x07, 0x1D, 0x1F],
+      }
+    ],
+  }
+}