IMP - Rename AREA and ZONE to FIELD

Signed-off-by: RaenonX <[email protected]>

.data/custom/WebsiteText@cht.json

@@ -728,31 +728,31 @@
     "text": "自身 50 個 Buff"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_SELF_0",
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_SELF_0",
     "text": "自建 0 Buff 區內"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_SELF_1",
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_SELF_1",
     "text": "自建 1 Buff 區內"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_SELF_2",
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_SELF_2",
     "text": "自建 2 Buff 區內"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_ALLY_0",
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_ALLY_0",
     "text": "友建 0 Buff 區內"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_ALLY_1",
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_ALLY_1",
     "text": "友建 1 Buff 區內"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_ALLY_2",
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_ALLY_2",
     "text": "友建 2 Buff 區內"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_ALLY_3",
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_ALLY_3",
     "text": "友建 3 Buff 區內"
   },
   {
@@ -1032,7 +1032,7 @@
     "text": "活力上升時"
   },
   {
-    "id": "ENUM_COND_ON_ENTERED_BUFF_ZONE",
+    "id": "ENUM_COND_ON_ENTERED_BUFF_FIELD",
     "text": "進入 Buff 區時"
   },
   {
@@ -1648,7 +1648,7 @@
     "text": "敵人"
   },
   {
-    "id": "ENUM_TARGET_AREA",
+    "id": "ENUM_TARGET_FIELD",
     "text": "區域"
   },
   {

.data/custom/WebsiteText@en.json

@@ -728,32 +728,32 @@
     "text": "Self 50 Buff"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_SELF_0",
-    "text": "In 0 Self Buff Zone"
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_SELF_0",
+    "text": "In 0 Self Buff Field"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_SELF_1",
-    "text": "In 1 Self Buff Zone"
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_SELF_1",
+    "text": "In 1 Self Buff Field"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_SELF_2",
-    "text": "In 2 Self Buff Zone"
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_SELF_2",
+    "text": "In 2 Self Buff Field"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_ALLY_0",
-    "text": "In 0 Ally Buff Zone"
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_ALLY_0",
+    "text": "In 0 Ally Buff Field"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_ALLY_1",
-    "text": "In 1 Ally Buff Zone"
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_ALLY_1",
+    "text": "In 1 Ally Buff Field"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_ALLY_2",
-    "text": "In 2 Ally Buff Zone"
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_ALLY_2",
+    "text": "In 2 Ally Buff Field"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_ALLY_3",
-    "text": "In 3 Ally Buff Zone"
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_ALLY_3",
+    "text": "In 3 Ally Buff Field"
   },
   {
     "id": "ENUM_COND_WEAPON_SWORD",
@@ -1032,8 +1032,8 @@
     "text": "Upon Energy lv up"
   },
   {
-    "id": "ENUM_COND_ON_ENTERED_BUFF_ZONE",
-    "text": "Upon entering buff zone"
+    "id": "ENUM_COND_ON_ENTERED_BUFF_FIELD",
+    "text": "Upon entering buff field"
   },
   {
     "id": "ENUM_COND_ON_HEALED",
@@ -1648,7 +1648,7 @@
     "text": "Enemy"
   },
   {
-    "id": "ENUM_TARGET_AREA",
+    "id": "ENUM_TARGET_FIELD",
     "text": "Field"
   },
   {

.data/custom/WebsiteText@jp.json

@@ -728,31 +728,31 @@
     "text": "自身 50 個 Buff"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_SELF_0",
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_SELF_0",
     "text": "自建 0 Buff 區內"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_SELF_1",
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_SELF_1",
     "text": "自建 1 Buff 區內"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_SELF_2",
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_SELF_2",
     "text": "自建 2 Buff 區內"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_ALLY_0",
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_ALLY_0",
     "text": "友建 0 Buff 區內"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_ALLY_1",
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_ALLY_1",
     "text": "友建 1 Buff 區內"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_ALLY_2",
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_ALLY_2",
     "text": "友建 2 Buff 區內"
   },
   {
-    "id": "ENUM_COND_IN_BUFF_ZONE_BY_ALLY_3",
+    "id": "ENUM_COND_IN_BUFF_FIELD_BY_ALLY_3",
     "text": "友建 3 Buff 區內"
   },
   {
@@ -1032,7 +1032,7 @@
     "text": "活力上升時"
   },
   {
-    "id": "ENUM_COND_ON_ENTERED_BUFF_ZONE",
+    "id": "ENUM_COND_ON_ENTERED_BUFF_FIELD",
     "text": "進入 Buff 區時"
   },
   {
@@ -1648,7 +1648,7 @@
     "text": "敵人"
   },
   {
-    "id": "ENUM_TARGET_AREA",
+    "id": "ENUM_TARGET_FIELD",
     "text": "區域"
   },
   {

dlparse/enums/ability_condition.py

@@ -53,7 +53,7 @@ class AbilityCondition(Enum):
     TRG_SELF_HP_LTE = 59
     EFF_SELF_HP_GTE_2 = 60
     EFF_SELF_HP_LT_2 = 61
-    EFF_IN_BUFF_ZONE = 88
+    EFF_IN_BUFF_FIELD = 88
     TRG_HEALED = 92
     TRG_COMBO_COUNT_DIV_LIMITED = 95
     TRG_DODGE_SUCCESS = 96

dlparse/enums/ability_variant.py

@@ -59,7 +59,7 @@ class AbilityVariantType(Enum):
 
     If the variant is inside an EX ability entry, the effect is team-wide.
     This only applies to the buffs that are directly applied to the user.
-    Zoned buff like Gala Euden S1 (`10150403`) will not be affected by this.
+    Buff fields like Gala Euden S1 (`10150403`) will not be affected by this.
     """
 
     AFFLICTION_PUNISHER = 20

dlparse/enums/buff_parameter.py

@@ -67,7 +67,7 @@ class BuffParameter(TranslatableEnumMixin, Enum):
 
     Note that the "targeted" here means that the extension is only effective to the buff that targets the players,
     such as ATK up buffs.
-    The duration of the zoned buffs like the one built by Gala Euden S1 (101504031) will **not** be affected by this.
+    The duration of the buff field like the one built by Gala Euden S1 (101504031) will **not** be affected by this.
     """
     COMBO_TIME = 112
     """

dlparse/enums/condition/category.py

@@ -27,8 +27,8 @@ class ConditionCheckResult(ConditionCheckResultMixin, Enum):
     MULTIPLE_HP_STATUS = auto()
     MULTIPLE_COMBO_COUNT = auto()
     MULTIPLE_BUFF_COUNT = auto()
-    MULTIPLE_BUFF_ZONE_SELF = auto()
-    MULTIPLE_BUFF_ZONE_ALLY = auto()
+    MULTIPLE_BUFF_FIELD_SELF = auto()
+    MULTIPLE_BUFF_FIELD_ALLY = auto()
     MULTIPLE_WEAPON_TYPE = auto()
     MULTIPLE_BULLET_HIT = auto()
     MULTIPLE_TEAMMATE_COVERAGE = auto()
@@ -53,8 +53,8 @@ class ConditionCheckResult(ConditionCheckResultMixin, Enum):
     INTERNAL_NOT_HP_CONDITION = auto()
     INTERNAL_NOT_COMBO_COUNT = auto()
     INTERNAL_NOT_BUFF_COUNT = auto()
-    INTERNAL_NOT_BUFF_ZONE_SELF = auto()
-    INTERNAL_NOT_BUFF_ZONE_ALLY = auto()
+    INTERNAL_NOT_BUFF_FIELD_SELF = auto()
+    INTERNAL_NOT_BUFF_FIELD_ALLY = auto()
     INTERNAL_NOT_WEAPON_TYPE = auto()
     INTERNAL_NOT_BULLET_HIT_COUNT = auto()
     INTERNAL_NOT_TEAMMATE_COVERAGE = auto()
@@ -377,26 +377,26 @@ class ConditionCategories:
         "Self - buff count",
         ConditionCheckResult.MULTIPLE_BUFF_COUNT
     )
-    self_in_buff_zone_self = ConditionCategoryTargetNumber(
+    self_in_buff_field_self = ConditionCategoryTargetNumber(
         {
-            Condition.IN_BUFF_ZONE_BY_SELF_0: 0,
-            Condition.IN_BUFF_ZONE_BY_SELF_1: 1,
-            Condition.IN_BUFF_ZONE_BY_SELF_2: 2,
+            Condition.IN_BUFF_FIELD_BY_SELF_0: 0,
+            Condition.IN_BUFF_FIELD_BY_SELF_1: 1,
+            Condition.IN_BUFF_FIELD_BY_SELF_2: 2,
         },
         ConditionMaxCount.SINGLE,
-        "Self - count of self-built buff zones inside",
-        ConditionCheckResult.MULTIPLE_BUFF_ZONE_SELF
+        "Self - count of self-built buff fields inside",
+        ConditionCheckResult.MULTIPLE_BUFF_FIELD_SELF
     )
-    self_in_buff_zone_ally = ConditionCategoryTargetNumber(
+    self_in_buff_field_ally = ConditionCategoryTargetNumber(
         {
-            Condition.IN_BUFF_ZONE_BY_ALLY_0: 0,
-            Condition.IN_BUFF_ZONE_BY_ALLY_1: 1,
-            Condition.IN_BUFF_ZONE_BY_ALLY_2: 2,
-            Condition.IN_BUFF_ZONE_BY_ALLY_3: 3,
+            Condition.IN_BUFF_FIELD_BY_ALLY_0: 0,
+            Condition.IN_BUFF_FIELD_BY_ALLY_1: 1,
+            Condition.IN_BUFF_FIELD_BY_ALLY_2: 2,
+            Condition.IN_BUFF_FIELD_BY_ALLY_3: 3,
         },
         ConditionMaxCount.SINGLE,
-        "Self - count of ally-built buff zones inside",
-        ConditionCheckResult.MULTIPLE_BUFF_ZONE_ALLY
+        "Self - count of ally-built buff fields inside",
+        ConditionCheckResult.MULTIPLE_BUFF_FIELD_ALLY
     )
     self_weapon_type = ConditionCategory[Weapon](
         {
@@ -562,7 +562,7 @@ class ConditionCategories:
             Condition.ON_BUFFED_DEF,
             Condition.ON_REVIVED,
             Condition.ON_ENERGY_LV_UP,
-            Condition.ON_ENTERED_BUFF_ZONE,
+            Condition.ON_ENTERED_BUFF_FIELD,
             Condition.ON_HEALED,
             Condition.ON_DODGE_SUCCESS,
             Condition.ON_HP_LT_30,

dlparse/enums/condition/composite.py

@@ -63,10 +63,10 @@ class ConditionComposite(ConditionCompositeBase[Condition]):
     combo_count_converted: int = field(init=False)
     buff_count: Optional[Condition] = field(init=False)
     buff_count_converted: int = field(init=False)
-    buff_zone_self: Optional[Condition] = field(init=False)
-    buff_zone_self_converted: int = field(init=False)
-    buff_zone_ally: Optional[Condition] = field(init=False)
-    buff_zone_ally_converted: int = field(init=False)
+    buff_field_self: Optional[Condition] = field(init=False)
+    buff_field_self_converted: int = field(init=False)
+    buff_field_ally: Optional[Condition] = field(init=False)
+    buff_field_ally_converted: int = field(init=False)
     weapon_type: Optional[Condition] = field(init=False)
     weapon_type_converted: Weapon = field(init=False)
     action_cond: Optional[Condition] = field(init=False)
@@ -144,13 +144,13 @@ def _init_validate_self_general(self):
         if self.bullet_hit_count and self.bullet_hit_count not in CondCat.skill_bullet_hit:
             raise ConditionValidationFailedError(ConditionCheckResult.INTERNAL_NOT_BULLET_HIT_COUNT)
 
-        # Check `self.buff_zone_self`
-        if self.buff_zone_self and self.buff_zone_self not in CondCat.self_in_buff_zone_self:
-            raise ConditionValidationFailedError(ConditionCheckResult.INTERNAL_NOT_BUFF_ZONE_SELF)
+        # Check `self.buff_field_self`
+        if self.buff_field_self and self.buff_field_self not in CondCat.self_in_buff_field_self:
+            raise ConditionValidationFailedError(ConditionCheckResult.INTERNAL_NOT_BUFF_FIELD_SELF)
 
-        # Check `self.buff_zone_ally`
-        if self.buff_zone_ally and self.buff_zone_ally not in CondCat.self_in_buff_zone_ally:
-            raise ConditionValidationFailedError(ConditionCheckResult.INTERNAL_NOT_BUFF_ZONE_ALLY)
+        # Check `self.buff_field_ally`
+        if self.buff_field_ally and self.buff_field_ally not in CondCat.self_in_buff_field_ally:
+            raise ConditionValidationFailedError(ConditionCheckResult.INTERNAL_NOT_BUFF_FIELD_ALLY)
 
     def _init_validate_self_special(self):
         # Check `self.action_cond`
@@ -223,8 +223,8 @@ def __post_init__(self, conditions: Optional[Union[Iterable[Condition], Conditio
         self.hp_condition = CondCat.self_hp_cond.extract(conditions)
         self.combo_count = CondCat.self_combo_count.extract(conditions)
         self.buff_count = CondCat.self_buff_count.extract(conditions)
-        self.buff_zone_self = CondCat.self_in_buff_zone_self.extract(conditions)
-        self.buff_zone_ally = CondCat.self_in_buff_zone_ally.extract(conditions)
+        self.buff_field_self = CondCat.self_in_buff_field_self.extract(conditions)
+        self.buff_field_ally = CondCat.self_in_buff_field_ally.extract(conditions)
         self.weapon_type = CondCat.self_weapon_type.extract(conditions)
         self.action_cond = CondCat.action_condition.extract(conditions)
         self.gauge_filled = CondCat.self_gauge_filled.extract(conditions)
@@ -265,8 +265,8 @@ def __post_init__(self, conditions: Optional[Union[Iterable[Condition], Conditio
         self.hp_status_converted = CondCat.self_hp_status.convert(self.hp_status, on_missing=1)
         self.combo_count_converted = CondCat.self_combo_count.convert(self.combo_count, on_missing=0)
         self.buff_count_converted = CondCat.self_buff_count.convert(self.buff_count, on_missing=0)
-        self.buff_zone_self_converted = CondCat.self_in_buff_zone_self.convert(self.buff_zone_self, on_missing=0)
-        self.buff_zone_ally_converted = CondCat.self_in_buff_zone_ally.convert(self.buff_zone_ally, on_missing=0)
+        self.buff_field_self_converted = CondCat.self_in_buff_field_self.convert(self.buff_field_self, on_missing=0)
+        self.buff_field_ally_converted = CondCat.self_in_buff_field_ally.convert(self.buff_field_ally, on_missing=0)
         self.weapon_type_converted = CondCat.self_weapon_type.convert(self.weapon_type, on_missing=None)
         self.action_cond_id = CondCat.action_condition.convert(self.action_cond, on_missing=None)
         self.gauge_filled_converted = CondCat.self_gauge_filled.convert(self.gauge_filled, on_missing=0)
@@ -327,11 +327,11 @@ def _cond_sorted_self_general(self) -> tuple[Condition]:
         if self.buff_count:
             ret += (self.buff_count,)
 
-        if self.buff_zone_self:
-            ret += (self.buff_zone_self,)
+        if self.buff_field_self:
+            ret += (self.buff_field_self,)
 
-        if self.buff_zone_ally:
-            ret += (self.buff_zone_ally,)
+        if self.buff_field_ally:
+            ret += (self.buff_field_ally,)
 
         return ret
 
@@ -403,7 +403,7 @@ def conditions_sorted(self) -> tuple[Condition, ...]:
         - [Self] HP status / condition
         - [Self] Combo count
         - [Self] Buff count
-        - [Self] Buff zone built by self / ally
+        - [Self] Buff field built by self / ally
         - [Self] Self action condition
         - [Self] Gauge status
         - [Self] Shapeshift

dlparse/enums/condition/items.py

@@ -143,14 +143,14 @@ class Condition(TranslatableEnumMixin, Enum):
     SELF_BUFF_50 = 268
     # endregion
 
-    # region In buff zone
-    IN_BUFF_ZONE_BY_SELF_0 = 270
-    IN_BUFF_ZONE_BY_SELF_1 = 271
-    IN_BUFF_ZONE_BY_SELF_2 = 272
-    IN_BUFF_ZONE_BY_ALLY_0 = 273
-    IN_BUFF_ZONE_BY_ALLY_1 = 274
-    IN_BUFF_ZONE_BY_ALLY_2 = 275
-    IN_BUFF_ZONE_BY_ALLY_3 = 276
+    # region In buff field
+    IN_BUFF_FIELD_BY_SELF_0 = 270
+    IN_BUFF_FIELD_BY_SELF_1 = 271
+    IN_BUFF_FIELD_BY_SELF_2 = 272
+    IN_BUFF_FIELD_BY_ALLY_0 = 273
+    IN_BUFF_FIELD_BY_ALLY_1 = 274
+    IN_BUFF_FIELD_BY_ALLY_2 = 275
+    IN_BUFF_FIELD_BY_ALLY_3 = 276
     # endregion
 
     # region Weapon type
@@ -268,7 +268,7 @@ class Condition(TranslatableEnumMixin, Enum):
     ON_BUFFED_DEF = 801
     ON_REVIVED = 802
     ON_ENERGY_LV_UP = 803
-    ON_ENTERED_BUFF_ZONE = 804
+    ON_ENTERED_BUFF_FIELD = 804
     ON_HEALED = 805
     ON_DODGE_SUCCESS = 806
     # endregion