Skip to content
This repository was archived by the owner on Jun 9, 2022. It is now read-only.

Commit b31740a

Browse files
committed
ADD - Parse CEX (CRT by combo, on healed, on dodged)
Signed-off-by: RaenonX <[email protected]>
1 parent c68b291 commit b31740a

File tree

23 files changed

+220
-59
lines changed

23 files changed

+220
-59
lines changed

.data/custom/[email protected]

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -419,10 +419,6 @@
419419
"id": "ENUM_COND_IN_BUFF_ZONE_BY_ALLY_3",
420420
"text": "友建 3 Buff 區內"
421421
},
422-
{
423-
"id": "ENUM_COND_IN_BUFF_ZONE",
424-
"text": "Buff 區內"
425-
},
426422
{
427423
"id": "ENUM_COND_WEAPON_SWORD",
428424
"text": "武器: 劍"
@@ -703,6 +699,14 @@
703699
"id": "ENUM_COND_ON_ENTERED_BUFF_ZONE",
704700
"text": "進入 Buff 區時"
705701
},
702+
{
703+
"id": "ENUM_COND_ON_HEALED",
704+
"text": "回血時"
705+
},
706+
{
707+
"id": "ENUM_COND_ON_DODGE_SUCCESS",
708+
"text": "成功迴避攻擊"
709+
},
706710
{
707711
"id": "ENUM_COND_ON_HP_LT_30",
708712
"text": "HP < 30% 時"
@@ -783,6 +787,10 @@
783787
"id": "ENUM_COND_ON_COMBO_GTE_10",
784788
"text": "Combo >= 10 時"
785789
},
790+
{
791+
"id": "ENUM_COND_ON_COMBO_DIV_BY_10",
792+
"text": "每 10 Combo"
793+
},
786794
{
787795
"id": "ENUM_COND_ON_COMBO_DIV_BY_20",
788796
"text": "每 20 Combo"
@@ -796,7 +804,7 @@
796804
"text": "Combo 重設時"
797805
},
798806
{
799-
"id": "ENUM_COND_ON_HIT_BY_POISON",
807+
"id": "ENUM_COND_ON_HIT",
800808
"text": "被攻擊"
801809
},
802810
{

.data/custom/[email protected]

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -419,10 +419,6 @@
419419
"id": "ENUM_COND_IN_BUFF_ZONE_BY_ALLY_3",
420420
"text": "In 3 Ally Buff Zone"
421421
},
422-
{
423-
"id": "ENUM_COND_IN_BUFF_ZONE",
424-
"text": "In Buff Zone"
425-
},
426422
{
427423
"id": "ENUM_COND_WEAPON_SWORD",
428424
"text": "Weapon: Sword"
@@ -703,6 +699,14 @@
703699
"id": "ENUM_COND_ON_ENTERED_BUFF_ZONE",
704700
"text": "Upon entering buff zone"
705701
},
702+
{
703+
"id": "ENUM_COND_ON_HEALED",
704+
"text": "Upon healed"
705+
},
706+
{
707+
"id": "ENUM_COND_ON_DODGE_SUCCESS",
708+
"text": "Upon successfully dodged"
709+
},
706710
{
707711
"id": "ENUM_COND_ON_HP_LT_30",
708712
"text": "Upon HP < 30%"
@@ -783,6 +787,10 @@
783787
"id": "ENUM_COND_ON_COMBO_GTE_10",
784788
"text": "Upon Combo >= 10"
785789
},
790+
{
791+
"id": "ENUM_COND_ON_COMBO_DIV_BY_10",
792+
"text": "Every 10 Combo"
793+
},
786794
{
787795
"id": "ENUM_COND_ON_COMBO_DIV_BY_20",
788796
"text": "Every 20 Combo"

.data/custom/[email protected]

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -419,10 +419,6 @@
419419
"id": "ENUM_COND_IN_BUFF_ZONE_BY_ALLY_3",
420420
"text": "友建 3 Buff 區內"
421421
},
422-
{
423-
"id": "ENUM_COND_IN_BUFF_ZONE",
424-
"text": "Buff 區內"
425-
},
426422
{
427423
"id": "ENUM_COND_WEAPON_SWORD",
428424
"text": "武器: 劍"
@@ -703,6 +699,14 @@
703699
"id": "ENUM_COND_ON_ENTERED_BUFF_ZONE",
704700
"text": "進入 Buff 區時"
705701
},
702+
{
703+
"id": "ENUM_COND_ON_HEALED",
704+
"text": "Upon healed"
705+
},
706+
{
707+
"id": "ENUM_COND_ON_DODGE_SUCCESS",
708+
"text": "成功迴避攻擊"
709+
},
706710
{
707711
"id": "ENUM_COND_ON_HP_LT_30",
708712
"text": "Upon HP < 30%"
@@ -783,6 +787,10 @@
783787
"id": "ENUM_COND_ON_COMBO_GTE_10",
784788
"text": "Upon Combo >= 10"
785789
},
790+
{
791+
"id": "ENUM_COND_ON_COMBO_DIV_BY_10",
792+
"text": "每 10 Combo"
793+
},
786794
{
787795
"id": "ENUM_COND_ON_COMBO_DIV_BY_20",
788796
"text": "每 20 Combo"

dlparse/enums/ability_condition.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ class AbilityCondition(Enum):
5454
EFF_SELF_HP_GTE_2 = 60
5555
EFF_SELF_HP_LT_2 = 61
5656
EFF_IN_BUFF_ZONE = 88
57+
TRG_HEALED = 92
58+
TRG_COMBO_COUNT_DIV_LIMITED = 95
59+
TRG_DODGE_SUCCESS = 96
5760

5861
@property
5962
def is_shapeshifted_to_dragon(self) -> bool:

dlparse/enums/ability_param.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ class AbilityUpParameter(Enum):
1111
Ability status up parameters.
1212
1313
This can be found in the ID-A field of the abiltity variants.
14+
15+
The enum definition can be found in ``Gluon.TargetParam`` of the metadata.
1416
"""
1517

1618
NONE = 0 # None

dlparse/enums/action.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AbilityTargetAction(Enum):
1313
1414
This can be found in the field ``_TargetAction`` of ``ActionGrant``.
1515
16-
The official definition can be found in ``Gluon.AbilityTargetAction`` of the metadata.
16+
The enum definition can be found in ``Gluon.AbilityTargetAction`` of the metadata.
1717
"""
1818

1919
UNKNOWN = -1

dlparse/enums/action_debuff_type.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class ActionDebuffType(Enum):
1111
This is used by the ability condition fields, where if the condition type is ``DEBUFF`` (``50``),
1212
the condition value will be this.
1313
14-
The enum definition can be found in ``Gluon.CharacterBuff.ActionDefDebuff`` in the metadata.
14+
The enum definition can be found in ``Gluon.CharacterBuff.ActionDefDebuff`` of the metadata.
1515
"""
1616

1717
UNKNOWN = -1

dlparse/enums/buff_parameter.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class BuffParameter(Enum):
1919
"""ATK up (calculated as buff). A value of 0.12 means ATK +12%."""
2020
DEF_BUFF = 102
2121
"""DEF up (calculated as buff). A value of 0.12 means DEF +12%."""
22-
CRT_RATE = 103
22+
CRT_RATE_BUFF = 103
2323
"""Critical rate up (calculated as buff). A value of 0.12 means CRT +12%."""
2424
CRT_DAMAGE = 104
2525
"""Critical damage up (calculated as buff). A value of 0.12 means CRT DMG +12%."""
@@ -69,6 +69,8 @@ class BuffParameter(Enum):
6969
"""ATK up (calculated as passive). A value of 0.12 means ATK +12%."""
7070
DEF_PASSIVE = 152
7171
"""DEF up (calculated as passive). A value of 0.12 means DEF +12%."""
72+
CRT_RATE_PASSIVE = 153
73+
"""Critical rate up (calculated as passive). A value of 0.12 means CRT +12%."""
7274
ASPD_PASSIVE = 156
7375
"""Attack speed up (calculated as passive). A value of 0.12 means ASPD +12%."""
7476
# endregion
@@ -315,7 +317,7 @@ class BuffParameter(Enum):
315317
"""Increased the damage dealt in the dragon form. A value of 0.12 means damage in dragon +12%."""
316318
DRAGON_GAUGE_FILL = 606
317319
"""
318-
Fill the dragon gauge by a certain percentage. A value of 0.12 means to fill 12% of the dragon gauge.
320+
Fill the dragon gauge by a certain percentage. A value of 0.12 means to fill 12% of the dragon gauge.
319321
(Shapeshifting once takes 50% of the dragon gauge)
320322
"""
321323
# endregion

dlparse/enums/condition/category.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -563,13 +563,16 @@ class ConditionCategories:
563563
Condition.ON_REVIVED,
564564
Condition.ON_ENERGY_LV_UP,
565565
Condition.ON_ENTERED_BUFF_ZONE,
566-
Condition.ON_SELF_HP_LT_30,
567-
Condition.ON_SELF_HP_LT_40,
568-
Condition.ON_SELF_HP_LT_60,
569-
Condition.ON_SELF_HP_GTE_40,
570-
Condition.ON_SELF_HP_GTE_60,
566+
Condition.ON_HEALED,
567+
Condition.ON_DODGE_SUCCESS,
568+
Condition.ON_HP_LT_30,
569+
Condition.ON_HP_LT_40,
570+
Condition.ON_HP_LT_60,
571+
Condition.ON_HP_GTE_40,
572+
Condition.ON_HP_GTE_60,
571573
Condition.ON_COMBO_RESET,
572574
Condition.ON_COMBO_GTE_10,
575+
Condition.ON_COMBO_DIV_BY_10,
573576
Condition.ON_COMBO_DIV_BY_20,
574577
Condition.ON_COMBO_DIV_BY_50,
575578
Condition.ON_HIT,

dlparse/enums/condition/items.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -267,14 +267,16 @@ class Condition(Enum):
267267
ON_REVIVED = 802
268268
ON_ENERGY_LV_UP = 803
269269
ON_ENTERED_BUFF_ZONE = 804
270+
ON_HEALED = 805
271+
ON_DODGE_SUCCESS = 806
270272
# endregion
271273

272274
# region HP change
273-
ON_SELF_HP_LT_30 = 810
274-
ON_SELF_HP_LT_40 = 811
275-
ON_SELF_HP_LT_60 = 812
276-
ON_SELF_HP_GTE_40 = 820
277-
ON_SELF_HP_GTE_60 = 821
275+
ON_HP_LT_30 = 810
276+
ON_HP_LT_40 = 811
277+
ON_HP_LT_60 = 812
278+
ON_HP_GTE_40 = 820
279+
ON_HP_GTE_60 = 821
278280
# endregion
279281

280282
# region Infliction
@@ -297,8 +299,9 @@ class Condition(Enum):
297299
# region Combo count
298300
ON_COMBO_RESET = 850
299301
ON_COMBO_GTE_10 = 851
300-
ON_COMBO_DIV_BY_20 = 855
301-
ON_COMBO_DIV_BY_50 = 856
302+
ON_COMBO_DIV_BY_10 = 855
303+
ON_COMBO_DIV_BY_20 = 856
304+
ON_COMBO_DIV_BY_50 = 857
302305
# endregion
303306
# endregion
304307

0 commit comments

Comments
 (0)