Add third floor rooms and some position points, add stairs positions

AtDeadOfNight · Jan 10, 2024 · 4d22422 · 4d22422
1 parent 72cbed0
commit 4d22422
Show file tree

Hide file tree

Showing 4 changed files with 115 additions and 8 deletions.
diff --git a/remapper.html b/remapper.html
@@ -13,9 +13,9 @@
     </style>
   </head>
   <body style="margin: 0">
-    <!-- <img src="src/assets/map/floor-1.png" onClick="pointRoom(event)" /> -->
+    <img src="src/assets/map/floor-1.png" onClick="pointRoom(event)" />
     <!-- <img src="src/assets/map/floor-1.png" onClick="pointPos(event)" /> -->
-    <img src="src/assets/map/floor-2.png" onClick="pointRoom(event)" />
+    <!-- <img src="src/assets/map/floor-2.png" onClick="pointRoom(event)" /> -->
     <!-- <img src="src/assets/map/floor-2.png" onClick="pointPos(event)" /> -->
     <!-- <img src="src/assets/map/floor-3.png" onClick="pointRoom(event)" /> -->
     <!-- <img src="src/assets/map/floor-3.png" onClick="pointPos(event)" /> -->

diff --git a/src/data.ts b/src/data.ts
@@ -1,8 +1,9 @@
 type Room = { room: number, x: number, y: number }
 type Point = { xpos: number, ypos: number, x: number, y: number }
 
-export const floors: { rooms: Room[], points: Point[] }[] = [
+export const floors: { stairs: { x: number, y: number }, rooms: Room[], points: Point[] }[] = [
   {
+    stairs: { x: 792, y: 430 },
     rooms: [
       {
         'room': 105,
@@ -358,6 +359,7 @@ export const floors: { rooms: Room[], points: Point[] }[] = [
     ]
   },
   {
+    stairs: { x: 792, y: 430 },
     rooms: [
       {
         'room': 201,
@@ -707,7 +709,54 @@ export const floors: { rooms: Room[], points: Point[] }[] = [
     ]
   },
   {
-    rooms: [],
+    stairs: { x: 415, y: 199 },
+    rooms: [
+      {
+        'room': 308,
+        'x': 613,
+        'y': 102
+      },
+      {
+        'room': 309,
+        'x': 613,
+        'y': 270
+      },
+      {
+        'room': 301,
+        'x': 81,
+        'y': 339
+      },
+      {
+        'room': 307,
+        'x': 278,
+        'y': 657
+      },
+      {
+        'room': 303,
+        'x': 454,
+        'y': 627
+      },
+      {
+        'room': 306,
+        'x': 542,
+        'y': 600
+      },
+      {
+        'room': 305,
+        'x': 540,
+        'y': 492
+      },
+      {
+        'room': 304,
+        'x': 458,
+        'y': 465
+      },
+      {
+        'room': 302,
+        'x': 322,
+        'y': 529
+      }
+    ],
     points: [
       {
         'xpos': 60,
@@ -792,6 +841,48 @@ export const floors: { rooms: Room[], points: Point[] }[] = [
         'ypos': 21,
         'x': 616,
         'y': 172
+      },
+      {
+        'xpos': 61,
+        'ypos': 14,
+        'x': 357,
+        'y': 581
+      },
+      {
+        'xpos': 62,
+        'ypos': 14,
+        'x': 281,
+        'y': 594
+      },
+      {
+        'xpos': 63,
+        'ypos': 14,
+        'x': 209,
+        'y': 593
+      },
+      {
+        'xpos': 61,
+        'ypos': 15,
+        'x': 374,
+        'y': 554
+      },
+      {
+        'xpos': 60,
+        'ypos': 16,
+        'x': 458,
+        'y': 535
+      },
+      {
+        'xpos': 59,
+        'ypos': 16,
+        'x': 537,
+        'y': 535
+      },
+      {
+        'xpos': 61,
+        'ypos': 16,
+        'x': 374,
+        'y': 521
       }
     ]
   }

diff --git a/src/radar.ts b/src/radar.ts
@@ -132,10 +132,15 @@ export function initRadar() {
       }
 
       if (window.inroom === 0) {
-        const xpos = window.pos[0]
-        const ypos = window.pos[1]
-        const dir = window.pos[2]
-        moveCharacter(maya, xpos, ypos, dir, skipTransition ? '0s' : '1s')
+        if (window.stairs === 2) {
+          const { x, y } = floorMap.stairs
+          moveCharacter(maya, x, y, 'N', skipTransition ? '0s' : '1s')
+        } else {
+          const xpos = window.pos[0]
+          const ypos = window.pos[1]
+          const dir = window.pos[2]
+          moveCharacter(maya, xpos, ypos, dir, skipTransition ? '0s' : '1s')
+        }
       } else {
         const room = floorMap.rooms.find(({ room }) => room === window.inroom)
         if (!room) return
@@ -255,6 +260,14 @@ export function initRadar() {
         }
       }, 1)
     }
+
+    const checkIfJimmyInRoomWithMaya = () => {
+      if(window.jhinroom === window.inroom) {
+        maya.style.opacity = '0.1'
+      } else {
+        maya.style.opacity = '1'
+      }
+    }
 
     onPropertyChange('menon', () => {
       if(window.menon === 0) {
@@ -286,10 +299,12 @@ export function initRadar() {
 
     onPropertyChange('inroom', () => {
       moveMaya()
+      checkIfJimmyInRoomWithMaya()
     })
 
     onPropertyChange('jhinroom', () => {
       moveJimmy()
+      checkIfJimmyInRoomWithMaya()
     })
 
     onPropertyChange('pos', () => {

diff --git a/src/window.d.ts b/src/window.d.ts
@@ -6,4 +6,5 @@ interface Window {
   jhfloor: number
   jhinroom: number
   menon: 0 | 1
+  stairs: number
 }