From ced1b6a78085abbfac3add265df16801a921514a Mon Sep 17 00:00:00 2001
From: CAtlas0784 <phitchayutnilnet90@gmail.com>
Date: Tue, 13 Oct 2026 16:33:19 +0700
Subject: [PATCH] feat(scenes): update 20572 to Moment of Joy (Planarcadia
 beta) and auto-bust scene cache

---
 app/src/main/assets/scenes.json                    | 14 +++++++-------
 .../catlas/escapepenacony/data/SceneRepository.kt  |  6 ++++--
 gradle.properties                                  |  1 +
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/src/main/assets/scenes.json b/app/src/main/assets/scenes.json
index 32a226d..84254bf 100644
--- a/app/src/main/assets/scenes.json
+++ b/app/src/main/assets/scenes.json
@@ -1,6 +1,6 @@
 {
-  "version": "4.6.5X-MASTER-LOCALIZED",
-  "updated_at": "2026-10-04",
+  "version": "4.7.0-BETA-UPDATE",
+  "updated_at": "2026-10-13",
   "total_worlds": 8,
   "total_scenes": 85,
   "total_combat_scenes": 16,
@@ -2096,17 +2096,17 @@
           "beta_notice_zh": "需要 4.7 Beta 测试端，正式服/Product 客户端会卡在列车加载界面"
         },
         {
-          "name": "Fleeting Joy",
-          "name_th": "Fleeting Joy (บาร์ระคนสุขโศก)",
+          "name": "Moment of Joy",
+          "name_th": "Moment of Joy (Fleeting Joy / บาร์ระคนสุขโศก)",
           "name_zh": "瞬息欢愉",
           "plane_id": 20572,
           "x": -743,
           "y": 2435,
           "z": -64637,
           "map_layer": 1,
-          "desc": "A bar where sorrow and joy are mixed",
-          "desc_th": "บาร์สังสรรค์ที่ความโศกเศร้าและความสุขผสมผสานกัน",
-          "desc_zh": "悲欢交织的瞬息酒吧",
+          "desc": "A bar where sorrow and joy are mixed (Official EN: Moment of Joy, formerly Fleeting Joy)",
+          "desc_th": "บาร์สังสรรค์ที่ความโศกเศร้าและความสุขผสมผสานกัน (ชื่อทางการ EN: Moment of Joy / เดิมเรียก Fleeting Joy)",
+          "desc_zh": "悲欢交织的瞬息酒吧（官方英文：Moment of Joy，此前曾称 Fleeting Joy）",
           "calyx_x": -743,
           "calyx_y": -999999,
           "calyx_z": -64637,
diff --git a/app/src/main/java/com/catlas/escapepenacony/data/SceneRepository.kt b/app/src/main/java/com/catlas/escapepenacony/data/SceneRepository.kt
index b6b84b6..5fa364e 100644
--- a/app/src/main/java/com/catlas/escapepenacony/data/SceneRepository.kt
+++ b/app/src/main/java/com/catlas/escapepenacony/data/SceneRepository.kt
@@ -23,8 +23,10 @@ object SceneRepository {
                 val defaultObj = JSONObject(defaultJson)
                 val defaultBeta = defaultObj.optInt("total_beta_scenes", 0)
                 val cachedBeta = cachedObj.optInt("total_beta_scenes", 0)
-                // Discard stale cache if bundled asset has more beta scene definitions
-                if (defaultBeta > cachedBeta) {
+                val defaultVer = defaultObj.optString("version", "")
+                val cachedVer = cachedObj.optString("version", "")
+                // Discard stale cache if bundled asset has newer version or more beta scene definitions
+                if (defaultBeta > cachedBeta || (defaultVer.isNotBlank() && defaultVer != cachedVer)) {
                     cachedFile.delete()
                     defaultJson
                 } else {
diff --git a/gradle.properties b/gradle.properties
index f0a2e55..88e1430 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,3 +2,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 kotlin.code.style=official
 android.nonTransitiveRClass=true
+org.gradle.java.home=C:/Program Files/Java/jdk-22