From 481431a1f0be574f436db4b2e1dbe9e374d0cc74 Mon Sep 17 00:00:00 2001
From: AngelinaBot_v2 <@>
Date: Sat, 15 Feb 2025 04:30:15 +0800
Subject: [PATCH] [CN UPDATE] Client:2.4.41 Data:25-02-14-16-11-02-89657b

---
 .../[uc]lua/hotfixes/EtlchiHotfixer.lua       |  12 +-
 zh_CN/gamedata/battle/buff_template_data.json |   9 +-
 .../act18mini/level_act18mini_03.json         | 506 +++++++++++++++++-
 .../act18mini/level_act18mini_sub-1-1.json    |   2 +-
 4 files changed, 517 insertions(+), 12 deletions(-)

diff --git a/zh_CN/gamedata/[uc]lua/hotfixes/EtlchiHotfixer.lua b/zh_CN/gamedata/[uc]lua/hotfixes/EtlchiHotfixer.lua
index 4637f4675..daeb83756 100644
--- a/zh_CN/gamedata/[uc]lua/hotfixes/EtlchiHotfixer.lua
+++ b/zh_CN/gamedata/[uc]lua/hotfixes/EtlchiHotfixer.lua
@@ -7,12 +7,12 @@ local function _GetNearestEndPointTile(self, sourcePos, motionMode, avoidCheckRe
   return self:GetNearestEndPointTile(sourcePos, motionMode, avoidCheckReachable)
 end
 
-local function _EnsureDmgOrHealExecute(self, blackboard, sourceType, snapshot)
+local function _FilterLevelId(self, blackboard, sourceType, snapshot)
   local snapshotModifier = snapshot.modifier
   local snapshotSource = snapshot.source
   local localSnapshot = snapshot
   local isEntlec = blackboard:GetFloatOrDefault("is_entlec", 0)
-  if not snapshotModifier.isCancelled and snapshotModifier.damageType == CS.Torappu.Battle.DamageType.PURE and isEntlec > 0.5 then
+  if not snapshotModifier.isCancelled and snapshotModifier.damageType == CS.Torappu.Battle.DamageType.PURE and isEntlec > 0.5 and snapshotModifier:CheckSharedFlag(CS.Torappu.Battle.Modifier.SharedFlagIndex.DAMAGE_WITHOUT_MODIFY) and snapshotModifier.source == nil then
     snapshotModifier.value = blackboard:GetFpOrDefault("value", snapshotModifier.value)
     localSnapshot.modifier = snapshotModifier
     snapshot = localSnapshot
@@ -27,11 +27,11 @@ function EtlchiHotfixer:OnInit()
     local ok, endPos, route = xpcall(_GetNearestEndPointTile, debug.traceback, self, sourcePos, motionMode, avoidCheckReachable)
     return endPos, route
   end)
-  xlua.private_accessible(CS.Torappu.Battle.Action.Nodes.EnsureDmgOrHeal)
-  self:Fix_ex(CS.Torappu.Battle.Action.Nodes.EnsureDmgOrHeal, "Execute", function(self, blackboard, sourceType, snapshot)
-    local ok, res, snapshot = xpcall(_EnsureDmgOrHealExecute, debug.traceback, self, blackboard, sourceType, snapshot)
+  xlua.private_accessible(CS.Torappu.Battle.Action.Nodes.FilterLevelId)
+  self:Fix_ex(CS.Torappu.Battle.Action.Nodes.FilterLevelId, "Execute", function(self, blackboard, sourceType, snapshot)
+    local ok, res, snapshot = xpcall(_FilterLevelId, debug.traceback, self, blackboard, sourceType, snapshot)
     if not ok then
-      LogError("[_EnsureDmgOrHealExecute] fix" .. res)
+      LogError("[_FilterLevelId] fix" .. res)
     end
     return res, snapshot
   end)
diff --git a/zh_CN/gamedata/battle/buff_template_data.json b/zh_CN/gamedata/battle/buff_template_data.json
index 60f70f49d..8da2eee28 100644
--- a/zh_CN/gamedata/battle/buff_template_data.json
+++ b/zh_CN/gamedata/battle/buff_template_data.json
@@ -139764,7 +139764,8 @@
             "_checkTileKey": true,
             "_tileKeys": [
               "tile_passable_wall",
-              "tile_stairs"
+              "tile_stairs",
+              "tile_passable_wall_forbidden"
             ]
           },
           "_succeedNodes": null,
@@ -256538,8 +256539,8 @@
           "_filterModifierCancelled": false
         },
         {
-          "$type": "Torappu.Battle.Action.Nodes+EnsureDmgOrHeal, Assembly-CSharp",
-          "_key": null
+          "$type": "Torappu.Battle.Action.Nodes+FilterLevelId, Assembly-CSharp",
+          "_levelIds": []
         }
       ]
     }
@@ -257105,7 +257106,7 @@
           "_damageType": "PURE",
           "_damageKey": "value",
           "_ignoreForSp": true,
-          "_damageWithoutModify": false,
+          "_damageWithoutModify": true,
           "_attackType": "NORMAL",
           "_isEnvDamage": false,
           "_isUndeadable": false,
diff --git a/zh_CN/gamedata/levels/activities/act18mini/level_act18mini_03.json b/zh_CN/gamedata/levels/activities/act18mini/level_act18mini_03.json
index 784a6d716..0e380ea3a 100644
--- a/zh_CN/gamedata/levels/activities/act18mini/level_act18mini_03.json
+++ b/zh_CN/gamedata/levels/activities/act18mini/level_act18mini_03.json
@@ -1163,6 +1163,62 @@
           "randomizeReachOffset": false,
           "reachDistance": 0.0
         },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 1,
+            "col": 1
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 1,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 2,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 3,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
         {
           "type": "MOVE",
           "time": 0.0,
@@ -1258,6 +1314,62 @@
           "randomizeReachOffset": false,
           "reachDistance": 0.0
         },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 1,
+            "col": 1
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 1,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 2,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 3,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
         {
           "type": "MOVE",
           "time": 0.0,
@@ -1353,6 +1465,62 @@
           "randomizeReachOffset": false,
           "reachDistance": 0.0
         },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 1,
+            "col": 1
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 1,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 2,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 3,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
         {
           "type": "MOVE",
           "time": 0.0,
@@ -1557,6 +1725,34 @@
           "randomizeReachOffset": false,
           "reachDistance": 0.0
         },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 4,
+            "col": 7
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 6,
+            "col": 7
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
         {
           "type": "WAIT_FOR_SECONDS",
           "time": 15.0,
@@ -1733,6 +1929,34 @@
           "randomizeReachOffset": false,
           "reachDistance": 0.0
         },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 4,
+            "col": 7
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 6,
+            "col": 7
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
         {
           "type": "MOVE",
           "time": 0.0,
@@ -1828,6 +2052,62 @@
           "randomizeReachOffset": false,
           "reachDistance": 0.0
         },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 1,
+            "col": 1
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 1,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 2,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 3,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
         {
           "type": "MOVE",
           "time": 0.0,
@@ -1923,6 +2203,62 @@
           "randomizeReachOffset": false,
           "reachDistance": 0.0
         },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 1,
+            "col": 1
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 1,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 2,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 3,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
         {
           "type": "MOVE",
           "time": 0.0,
@@ -2018,6 +2354,34 @@
           "randomizeReachOffset": false,
           "reachDistance": 0.0
         },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 4,
+            "col": 7
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 6,
+            "col": 7
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
         {
           "type": "MOVE",
           "time": 0.0,
@@ -2127,6 +2491,34 @@
           "randomizeReachOffset": false,
           "reachDistance": 0.0
         },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 4,
+            "col": 7
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 6,
+            "col": 7
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
         {
           "type": "MOVE",
           "time": 0.0,
@@ -2222,6 +2614,34 @@
           "randomizeReachOffset": false,
           "reachDistance": 0.0
         },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 4,
+            "col": 7
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 6,
+            "col": 7
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
         {
           "type": "MOVE",
           "time": 0.0,
@@ -2282,7 +2702,7 @@
       "allowDiagonalMove": true,
       "visitEveryTileCenter": false,
       "visitEveryNodeCenter": false,
-      "visitEveryCheckPoint": false
+      "visitEveryCheckPoint": true
     },
     {
       "motionMode": "WALK",
@@ -2356,6 +2776,34 @@
           "randomizeReachOffset": false,
           "reachDistance": 0.0
         },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 4,
+            "col": 7
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 6,
+            "col": 7
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
         {
           "type": "MOVE",
           "time": 0.0,
@@ -2451,6 +2899,62 @@
           "randomizeReachOffset": false,
           "reachDistance": 0.0
         },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 1,
+            "col": 1
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 1,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 2,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
+        {
+          "type": "MOVE",
+          "time": 0.0,
+          "position": {
+            "row": 3,
+            "col": 3
+          },
+          "reachOffset": {
+            "x": 0.0,
+            "y": 0.0
+          },
+          "randomizeReachOffset": false,
+          "reachDistance": 0.0
+        },
         {
           "type": "MOVE",
           "time": 0.0,
diff --git a/zh_CN/gamedata/levels/activities/act18mini/level_act18mini_sub-1-1.json b/zh_CN/gamedata/levels/activities/act18mini/level_act18mini_sub-1-1.json
index 503452688..0e0678620 100644
--- a/zh_CN/gamedata/levels/activities/act18mini/level_act18mini_sub-1-1.json
+++ b/zh_CN/gamedata/levels/activities/act18mini/level_act18mini_sub-1-1.json
@@ -4550,7 +4550,7 @@
         "uniEquipIds": null,
         "inst": {
           "characterKey": "char_328_cammou",
-          "level": 70,
+          "level": 60,
           "phase": "PHASE_1",
           "favorPoint": 100,
           "potentialRank": 0