Map 8-1N fixes

waicool20 · Dec 18, 2023 · d615753 · d615753
1 parent 6d63d5d
commit d615753
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/modules/assets/combat/maps/8-1N/map.json b/modules/assets/combat/maps/8-1N/map.json
@@ -1,28 +1,28 @@
 [
   {
     "type": "Heliport",
-    "x": 143,
-    "y": 96,
-    "width": 81,
-    "height": 81
+    "x": 200,
+    "y": 187,
+    "width": 60,
+    "height": 60
   },
   {
-    "x": 255,
-    "y": 275,
-    "width": 81,
-    "height": 81
+    "x": 280,
+    "y": 315,
+    "width": 60,
+    "height": 60
   },
   {
-    "x": 36,
-    "y": 572,
-    "width": 81,
-    "height": 81
+    "x": 122,
+    "y": 529,
+    "width": 60,
+    "height": 60
   },
   {
     "type": "Heliport",
-    "x": 62,
-    "y": 781,
-    "width": 68,
-    "height": 68
+    "x": 142,
+    "y": 680,
+    "width": 60,
+    "height": 60
   }
 ]
diff --git a/modules/assets/combat/maps/8-1N/map.png b/modules/assets/combat/maps/8-1N/map.png
diff --git a/modules/core/src/main/kotlin/com/waicool20/wai2k/script/modules/combat/maps/Map8_1N.kt b/modules/core/src/main/kotlin/com/waicool20/wai2k/script/modules/combat/maps/Map8_1N.kt
@@ -45,6 +45,12 @@ class Map8_1N(scriptComponent: ScriptComponent) : HomographyMapRunner(scriptComp
                 )
                 delay(500)
             }
+            val r1 = region.subRegion(292, 266, 126, 137)
+            val r2 = r1.copy().apply { translate(400, 200) }
+            repeat(2) {
+                r1.swipeTo(r2)
+            }
+            r2.swipeTo(r1)
             gameState.requiresMapInit = false
         }
         delay((500 * gameState.delayCoefficient).roundToLong())

diff --git a/modules/core/src/main/kotlin/com/waicool20/wai2k/views/DebugView.kt b/modules/core/src/main/kotlin/com/waicool20/wai2k/views/DebugView.kt
@@ -193,9 +193,9 @@ class DebugView : CoroutineScopeView() {
                 }
         }
         windowBoundsButton.setOnAction {
-            xSpinner.valueFactory.value = 348
+            xSpinner.valueFactory.value = 255
             ySpinner.valueFactory.value = 151
-            wSpinner.valueFactory.value = 1281
+            wSpinner.valueFactory.value = 1234
             hSpinner.valueFactory.value = 929
         }
         saveButton.setOnAction {