From ea70da8fbf054912a96428b5a3128959f9eb53d9 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Thu, 26 Dec 2024 20:26:22 -0500
Subject: [PATCH] [O] Split

---
 .../samnyan/aqua/sega/chusan/ChusanData.kt    | 39 +++++++++++++++++++
 .../sega/chusan/ChusanServletController.kt    | 37 +-----------------
 2 files changed, 40 insertions(+), 36 deletions(-)
 create mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/ChusanData.kt

diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanData.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanData.kt
new file mode 100644
index 00000000..6a84d554
--- /dev/null
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanData.kt
@@ -0,0 +1,39 @@
+package icu.samnyan.aqua.sega.chusan
+
+
+object ChusanData {
+    val mapAreaCondition = mapOf(
+        "gameMapAreaConditionList" to listOf(
+            mapOf("mapAreaId" to 2206201, "mapAreaConditionList" to listOf(
+                mapOf("type" to 3, "conditionId" to 6832, "logicalOpe" to 1)
+            )),
+            mapOf("mapAreaId" to 2206203, "mapAreaConditionList" to listOf(
+                mapOf("type" to 3, "conditionId" to 6833, "logicalOpe" to 1)
+            )),
+            mapOf("mapAreaId" to 2206204, "mapAreaConditionList" to listOf(
+                mapOf("type" to 3, "conditionId" to 6834, "logicalOpe" to 1),
+                mapOf("type" to 3, "conditionId" to 6835, "logicalOpe" to 1)
+            )),
+            mapOf("mapAreaId" to 2206205, "mapAreaConditionList" to listOf(
+                mapOf("type" to 3, "conditionId" to 6837, "logicalOpe" to 1)
+            )),
+            mapOf("mapAreaId" to 2206206, "mapAreaConditionList" to listOf(
+                mapOf("type" to 3, "conditionId" to 6838, "logicalOpe" to 1)
+            )),
+            mapOf("mapAreaId" to 2206207, "mapAreaConditionList" to listOf(
+                mapOf("type" to 2, "conditionId" to 2206201, "logicalOpe" to 1),
+                mapOf("type" to 2, "conditionId" to 2206202, "logicalOpe" to 1),
+                mapOf("type" to 2, "conditionId" to 2206203, "logicalOpe" to 1),
+                mapOf("type" to 2, "conditionId" to 2206204, "logicalOpe" to 1),
+                mapOf("type" to 2, "conditionId" to 2206205, "logicalOpe" to 1),
+                mapOf("type" to 2, "conditionId" to 2206206, "logicalOpe" to 1)
+            )),
+            mapOf("mapAreaId" to 3229301, "mapAreaConditionList" to listOf(
+                mapOf("type" to 1, "conditionId" to 3020701, "logicalOpe" to 2)
+            )),
+            mapOf("mapAreaId" to 3229302, "mapAreaConditionList" to listOf(
+                mapOf("type" to 1, "conditionId" to 3020701, "logicalOpe" to 1)
+            ))
+        )
+    )
+}
\ No newline at end of file
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanServletController.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanServletController.kt
index 0a7c1006..0ed91115 100644
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanServletController.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanServletController.kt
@@ -350,42 +350,7 @@ fun ChusanServletController.init() {
     "GetGameEvent" static { db.gameEvent.findByEnable(true).let { mapOf("type" to 1, "length" to it.size, "gameEventList" to it) } }
     "GetGameCharge" static { db.gameCharge.findAll().let { mapOf("length" to it.size, "gameChargeList" to it) } }
     "GetGameGacha" static { db.gameGacha.findAll().let { mapOf("length" to it.size, "gameGachaList" to it, "registIdList" to empty) } }
-    "GetGameMapAreaCondition" static {
-        mapOf(
-            "gameMapAreaConditionList" to listOf(
-                mapOf("mapAreaId" to 2206201, "mapAreaConditionList" to listOf(
-                    mapOf("type" to 3, "conditionId" to 6832, "logicalOpe" to 1)
-                )),
-                mapOf("mapAreaId" to 2206203, "mapAreaConditionList" to listOf(
-                    mapOf("type" to 3, "conditionId" to 6833, "logicalOpe" to 1)
-                )),
-                mapOf("mapAreaId" to 2206204, "mapAreaConditionList" to listOf(
-                    mapOf("type" to 3, "conditionId" to 6834, "logicalOpe" to 1),
-                    mapOf("type" to 3, "conditionId" to 6835, "logicalOpe" to 1)
-                )),
-                mapOf("mapAreaId" to 2206205, "mapAreaConditionList" to listOf(
-                    mapOf("type" to 3, "conditionId" to 6837, "logicalOpe" to 1)
-                )),
-                mapOf("mapAreaId" to 2206206, "mapAreaConditionList" to listOf(
-                    mapOf("type" to 3, "conditionId" to 6838, "logicalOpe" to 1)
-                )),
-                mapOf("mapAreaId" to 2206207, "mapAreaConditionList" to listOf(
-                    mapOf("type" to 2, "conditionId" to 2206201, "logicalOpe" to 1),
-                    mapOf("type" to 2, "conditionId" to 2206202, "logicalOpe" to 1),
-                    mapOf("type" to 2, "conditionId" to 2206203, "logicalOpe" to 1),
-                    mapOf("type" to 2, "conditionId" to 2206204, "logicalOpe" to 1),
-                    mapOf("type" to 2, "conditionId" to 2206205, "logicalOpe" to 1),
-                    mapOf("type" to 2, "conditionId" to 2206206, "logicalOpe" to 1)
-                )),
-                mapOf("mapAreaId" to 3229301, "mapAreaConditionList" to listOf(
-                    mapOf("type" to 1, "conditionId" to 3020701, "logicalOpe" to 2)
-                )),
-                mapOf("mapAreaId" to 3229302, "mapAreaConditionList" to listOf(
-                    mapOf("type" to 1, "conditionId" to 3020701, "logicalOpe" to 1)
-                ))
-            )
-        )
-    }
+    "GetGameMapAreaCondition" static { ChusanData.mapAreaCondition }
 
     // CardMaker (TODO: Somebody test this, I don't have a card maker)
     "CMGetUserData" {