From 2a96c226122cee67e589f93aa04b7ddd51830672 Mon Sep 17 00:00:00 2001
From: DimbreathBot <58192498+DimbreathBot@users.noreply.github.com>
Date: Wed, 31 Dec 2025 05:24:07 +0100
Subject: [PATCH] OSPRODWin2.5.0_R13085029_S13085029_D13083053

---
 .../LonginusAbility/Longinus_Enhance.json     | 12 ------
 Data/_unsorted/Abyss_BossFight27_Buff_03.json | 37 +++++++------------
 Data/_unsorted/Abyss_BossFight29_Buff_01.json | 37 +++++++------------
 .../Abyss_PeriodicLayerBuff_39_1.json         | 37 +++++++------------
 .../Abyss_PeriodicLayerBuff_40_1.json         | 37 +++++++------------
 Data/_unsorted/Coop_Longinus_Upgrade.json     | 25 +++++++++++++
 Data/_unsorted/Floor_100101.json              |  2 +-
 Data/_unsorted/Longinus_BlockManager.json     |  7 +++-
 FileCfg/ConstValueConfigTemplateTb.json       |  4 +-
 9 files changed, 87 insertions(+), 111 deletions(-)

diff --git a/Data/JsonBytes/NewAbility/AvatarAbility/LonginusAbility/Longinus_Enhance.json b/Data/JsonBytes/NewAbility/AvatarAbility/LonginusAbility/Longinus_Enhance.json
index 72e88ea7..a1dbb594 100644
--- a/Data/JsonBytes/NewAbility/AvatarAbility/LonginusAbility/Longinus_Enhance.json
+++ b/Data/JsonBytes/NewAbility/AvatarAbility/LonginusAbility/Longinus_Enhance.json
@@ -59,18 +59,6 @@
         "CustomPropertyType": "EnhanceNum",
         "Percentage": 0,
         "Predicates": [
-          {
-            "$type": "ByNot",
-            "Predicates": [
-              {
-                "$type": "ByIsInZoneTags",
-                "Tags": [
-                  "Coop_Equipment"
-                ],
-                "Target": "Self"
-              }
-            ]
-          },
           {
             "$type": "ByCustomEvent",
             "EventKey": "BlockSuccess"
diff --git a/Data/_unsorted/Abyss_BossFight27_Buff_03.json b/Data/_unsorted/Abyss_BossFight27_Buff_03.json
index 0b465c7e..558b816d 100644
--- a/Data/_unsorted/Abyss_BossFight27_Buff_03.json
+++ b/Data/_unsorted/Abyss_BossFight27_Buff_03.json
@@ -1,4 +1,17 @@
 {
+  "AbilityMixins": [
+    {
+      "$type": "AttachZoneTagWithModifierMixin",
+      "ConfigList": [
+        {
+          "ModifierNameList": [
+            "AvatarBuff_BossFight27_03_ExtraBuff"
+          ],
+          "ZoneTag": "ThemeSpace"
+        }
+      ]
+    }
+  ],
   "AbilityName": "Abyss_BossFight27_Buff_03",
   "AbilitySpecials": {
     "AS_AddedDamageRatio": {
@@ -29,30 +42,6 @@
         "IsAutoTrigger": false,
         "Target": "TeamEntity"
       }
-    ],
-    "OnCustomEventReceived": [
-      {
-        "$type": "ApplyModifier",
-        "ModifierName": "AvatarBuff_BossFight27_03_ExtraBuff",
-        "Predicates": [
-          {
-            "$type": "ByCustomEvent",
-            "EventKey": "OnThemeSpaceStart"
-          }
-        ],
-        "Target": "Self"
-      },
-      {
-        "$type": "RemoveModifier",
-        "ModifierName": "AvatarBuff_BossFight27_03_ExtraBuff",
-        "Predicates": [
-          {
-            "$type": "ByCustomEvent",
-            "EventKey": "OnThemeSpaceEnd"
-          }
-        ],
-        "Target": "Self"
-      }
     ]
   },
   "Modifiers": {
diff --git a/Data/_unsorted/Abyss_BossFight29_Buff_01.json b/Data/_unsorted/Abyss_BossFight29_Buff_01.json
index b0a0a523..9f179f91 100644
--- a/Data/_unsorted/Abyss_BossFight29_Buff_01.json
+++ b/Data/_unsorted/Abyss_BossFight29_Buff_01.json
@@ -1,4 +1,17 @@
 {
+  "AbilityMixins": [
+    {
+      "$type": "AttachZoneTagWithModifierMixin",
+      "ConfigList": [
+        {
+          "ModifierNameList": [
+            "AvatarBuff_BossFight29_01_ExtraBuff"
+          ],
+          "ZoneTag": "ThemeSpace"
+        }
+      ]
+    }
+  ],
   "AbilityName": "Abyss_BossFight29_Buff_01",
   "AbilitySpecials": {
     "AS_AddedAtkRatio": {
@@ -32,30 +45,6 @@
         "IsAutoTrigger": false,
         "Target": "TeamEntity"
       }
-    ],
-    "OnCustomEventReceived": [
-      {
-        "$type": "ApplyModifier",
-        "ModifierName": "AvatarBuff_BossFight29_01_ExtraBuff",
-        "Predicates": [
-          {
-            "$type": "ByCustomEvent",
-            "EventKey": "OnThemeSpaceStart"
-          }
-        ],
-        "Target": "Self"
-      },
-      {
-        "$type": "RemoveModifier",
-        "ModifierName": "AvatarBuff_BossFight29_01_ExtraBuff",
-        "Predicates": [
-          {
-            "$type": "ByCustomEvent",
-            "EventKey": "OnThemeSpaceEnd"
-          }
-        ],
-        "Target": "Self"
-      }
     ]
   },
   "Modifiers": {
diff --git a/Data/_unsorted/Abyss_PeriodicLayerBuff_39_1.json b/Data/_unsorted/Abyss_PeriodicLayerBuff_39_1.json
index 32abefd7..588be076 100644
--- a/Data/_unsorted/Abyss_PeriodicLayerBuff_39_1.json
+++ b/Data/_unsorted/Abyss_PeriodicLayerBuff_39_1.json
@@ -1,4 +1,17 @@
 {
+  "AbilityMixins": [
+    {
+      "$type": "AttachZoneTagWithModifierMixin",
+      "ConfigList": [
+        {
+          "ModifierNameList": [
+            "AbyssPeriodic39_1_Buff_Theme"
+          ],
+          "ZoneTag": "ThemeSpace"
+        }
+      ]
+    }
+  ],
   "AbilityName": "Abyss_PeriodicLayerBuff_39_1",
   "AbilitySpecials": {
     "AS_AddedDamageRatio": {
@@ -20,30 +33,6 @@
         "ModifierName": "AbyssPeriodic39_1_BaseBuff",
         "Target": "Self"
       }
-    ],
-    "OnCustomEventReceived": [
-      {
-        "$type": "ApplyModifier",
-        "ModifierName": "AbyssPeriodic39_1_Buff_Theme",
-        "Predicates": [
-          {
-            "$type": "ByCustomEvent",
-            "EventKey": "OnThemeSpaceStart"
-          }
-        ],
-        "Target": "Self"
-      },
-      {
-        "$type": "RemoveModifier",
-        "ModifierName": "AbyssPeriodic39_1_Buff_Theme",
-        "Predicates": [
-          {
-            "$type": "ByCustomEvent",
-            "EventKey": "OnThemeSpaceEnd"
-          }
-        ],
-        "Target": "Self"
-      }
     ]
   },
   "Modifiers": {
diff --git a/Data/_unsorted/Abyss_PeriodicLayerBuff_40_1.json b/Data/_unsorted/Abyss_PeriodicLayerBuff_40_1.json
index cb0a23b8..451e0931 100644
--- a/Data/_unsorted/Abyss_PeriodicLayerBuff_40_1.json
+++ b/Data/_unsorted/Abyss_PeriodicLayerBuff_40_1.json
@@ -1,4 +1,17 @@
 {
+  "AbilityMixins": [
+    {
+      "$type": "AttachZoneTagWithModifierMixin",
+      "ConfigList": [
+        {
+          "ModifierNameList": [
+            "AbyssPeriodic40_1_Buff_Theme"
+          ],
+          "ZoneTag": "ThemeSpace"
+        }
+      ]
+    }
+  ],
   "AbilityName": "Abyss_PeriodicLayerBuff_40_1",
   "AbilitySpecials": {
     "AS_BaseAtkRatio": {
@@ -20,30 +33,6 @@
         "ModifierName": "AbyssPeriodic40_1_BaseBuff",
         "Target": "Self"
       }
-    ],
-    "OnCustomEventReceived": [
-      {
-        "$type": "ApplyModifier",
-        "ModifierName": "AbyssPeriodic40_1_Buff_Theme",
-        "Predicates": [
-          {
-            "$type": "ByCustomEvent",
-            "EventKey": "OnThemeSpaceStart"
-          }
-        ],
-        "Target": "Self"
-      },
-      {
-        "$type": "RemoveModifier",
-        "ModifierName": "AbyssPeriodic40_1_Buff_Theme",
-        "Predicates": [
-          {
-            "$type": "ByCustomEvent",
-            "EventKey": "OnThemeSpaceEnd"
-          }
-        ],
-        "Target": "Self"
-      }
     ]
   },
   "Modifiers": {
diff --git a/Data/_unsorted/Coop_Longinus_Upgrade.json b/Data/_unsorted/Coop_Longinus_Upgrade.json
index cc87649f..34ad4b30 100644
--- a/Data/_unsorted/Coop_Longinus_Upgrade.json
+++ b/Data/_unsorted/Coop_Longinus_Upgrade.json
@@ -1,4 +1,29 @@
 {
+  "AbilityMixins": [
+    {
+      "$type": "ListenAbilityMixin",
+      "AbilityName": "Longinus_BlockManager",
+      "OnListenAbilityAdded": [
+        {
+          "$type": "SetTargetAbilitySpecialAction",
+          "Params": [
+            {
+              "AbilityName": "Longinus_BlockManager",
+              "AbilitySpecials": [
+                {
+                  "ModifyFunction": "Replace",
+                  "Param": 1.5,
+                  "ParamName": "AS_PerfectBlockCDModifier",
+                  "ParamType": "Float"
+                }
+              ]
+            }
+          ]
+        }
+      ],
+      "Targetting": "Self"
+    }
+  ],
   "AbilityName": "Coop_Longinus_Upgrade",
   "AbilitySpecials": {
     "AS_BaseAtkRatio": {
diff --git a/Data/_unsorted/Floor_100101.json b/Data/_unsorted/Floor_100101.json
index 12037065..e6b21d6b 100644
--- a/Data/_unsorted/Floor_100101.json
+++ b/Data/_unsorted/Floor_100101.json
@@ -9,7 +9,7 @@
     "FloorID": 100101,
     "FloorMD5": "269298c2ae4a5e313403648611e6450a",
     "FloorUsage": "Default",
-    "FloorVersion": 1767060703,
+    "FloorVersion": 1767102373,
     "GameplayExternalData": {
       "$type": "ConfigFloorExternalDataCollection",
       "BattleRegionMap": {
diff --git a/Data/_unsorted/Longinus_BlockManager.json b/Data/_unsorted/Longinus_BlockManager.json
index f76d2689..7c5b911e 100644
--- a/Data/_unsorted/Longinus_BlockManager.json
+++ b/Data/_unsorted/Longinus_BlockManager.json
@@ -112,6 +112,11 @@
     }
   ],
   "AbilityName": "Longinus_BlockManager",
+  "AbilitySpecials": {
+    "AS_PerfectBlockCDModifier": {
+      "Value": 0.5
+    }
+  },
   "AbilityStacking": "Unique",
   "DefaultModifier": {
     "OnHitOtherPre": [
@@ -664,7 +669,7 @@
       "ModifierStacking": "Unique"
     },
     "PerfectBlockCDModifier": {
-      "Duration": 0.5,
+      "Duration": "%AS_PerfectBlockCDModifier",
       "ModifierStacking": "Unique"
     },
     "PerfectBlockModifier": {
diff --git a/FileCfg/ConstValueConfigTemplateTb.json b/FileCfg/ConstValueConfigTemplateTb.json
index d1ec27ee..22482049 100644
--- a/FileCfg/ConstValueConfigTemplateTb.json
+++ b/FileCfg/ConstValueConfigTemplateTb.json
@@ -413,7 +413,9 @@
     111,
     112,
     501,
-    215
+    215,
+    301,
+    119
   ],
   "DKDDFHDNHED": [
     115,