Skip to content

Commit da77d59

Browse files
committed
Updated enums from JP 2.122.0
1 parent 6e106df commit da77d59

File tree

2 files changed

+36
-16
lines changed

2 files changed

+36
-16
lines changed

app/schemas/gameenums.py

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ class FuncType(IntEnum):
289289
SET_BATTLE_MISSION_VALUE = 156
290290
CHANGE_ENEMY_STATUS_UI_TYPE = 157
291291
SWAP_FIELD_POSITION = 158
292+
SET_DISPLAY_DIRECT_BATTLE_MESSAGE_IN_FSM = 159
292293

293294

294295
class NiceFuncType(StrEnum):
@@ -416,6 +417,7 @@ class NiceFuncType(StrEnum):
416417
setBattleMissionValue = "setBattleMissionValue"
417418
changeEnemyStatusUiType = "changeEnemyStatusUiType"
418419
swapFieldPosition = "swapFieldPosition"
420+
setDisplayDirectBattleMessageInFsm = "setDisplayDirectBattleMessageInFsm"
419421

420422

421423
FUNC_TYPE_NAME: dict[int, NiceFuncType] = {
@@ -541,6 +543,7 @@ class NiceFuncType(StrEnum):
541543
156: NiceFuncType.setBattleMissionValue,
542544
157: NiceFuncType.changeEnemyStatusUiType,
543545
158: NiceFuncType.swapFieldPosition,
546+
159: NiceFuncType.setDisplayDirectBattleMessageInFsm,
544547
}
545548

546549

@@ -2201,7 +2204,7 @@ class ItemType(IntEnum):
22012204
EXCHANGE_SVT_COIN = 38
22022205
REDUCE_TRADE_TIME = 39
22032206
EVENT_PASSIVE_SKILL_GIVEN = 40
2204-
SHOP18_ITEM = 41
2207+
CLASS_BOARD_RESET_ITEM = 41
22052208

22062209

22072210
class NiceItemType(StrEnum):
@@ -2247,7 +2250,7 @@ class NiceItemType(StrEnum):
22472250
exchangeSvtCoin = "exchangeSvtCoin"
22482251
reduceTradeTime = "reduceTradeTime"
22492252
eventPassiveSkillGiven = "eventPassiveSkillGiven"
2250-
shop18Item = "shop18Item"
2253+
classBoardResetItem = "classBoardResetItem"
22512254
netmarbleChargeStone = "netmarbleChargeStone"
22522255

22532256

@@ -2292,7 +2295,7 @@ class NiceItemType(StrEnum):
22922295
38: NiceItemType.exchangeSvtCoin,
22932296
39: NiceItemType.reduceTradeTime,
22942297
40: NiceItemType.eventPassiveSkillGiven,
2295-
41: NiceItemType.shop18Item,
2298+
41: NiceItemType.classBoardResetItem,
22962299
9999: NiceItemType.netmarbleChargeStone,
22972300
}
22982301

@@ -2382,7 +2385,7 @@ class ShopType(IntEnum):
23822385
REVIVAL_ITEM = 15
23832386
EVENT_SVT_EQUIP = 16
23842387
EXCHANGE_SVT_COIN = 17
2385-
SHOP18 = 18
2388+
CLASS_BOARD_RESET = 18
23862389

23872390

23882391
class NiceShopType(StrEnum):
@@ -2406,7 +2409,7 @@ class NiceShopType(StrEnum):
24062409
revivalItem = "revivalItem"
24072410
eventSvtEquip = "eventSvtEquip"
24082411
exchangeSvtCoin = "exchangeSvtCoin"
2409-
shop18 = "shop18"
2412+
classBoardReset = "classBoardReset"
24102413

24112414

24122415
SHOP_TYPE_NAME: dict[int, NiceShopType] = {
@@ -2428,7 +2431,7 @@ class NiceShopType(StrEnum):
24282431
15: NiceShopType.revivalItem,
24292432
16: NiceShopType.eventSvtEquip,
24302433
17: NiceShopType.exchangeSvtCoin,
2431-
18: NiceShopType.shop18,
2434+
18: NiceShopType.classBoardReset,
24322435
}
24332436

24342437

@@ -2509,7 +2512,7 @@ class PurchaseType(IntEnum):
25092512
GIFT = 20
25102513
EVENT_SVT_JOIN = 21
25112514
ASSIST = 22
2512-
SHOP18_ITEM = 23
2515+
CLASS_BOARD_RESET_ITEM = 23
25132516
PARTS_SKILL = 24
25142517

25152518

@@ -2538,7 +2541,7 @@ class NicePurchaseType(StrEnum):
25382541
gift = "gift"
25392542
eventSvtJoin = "eventSvtJoin"
25402543
assist = "assist"
2541-
shop18Item = "shop18Item"
2544+
classBoardResetItem = "classBoardResetItem"
25422545
partsSkill = "partsSkill"
25432546
kiaraPunisherReset = "kiaraPunisherReset"
25442547

@@ -2566,7 +2569,7 @@ class NicePurchaseType(StrEnum):
25662569
20: NicePurchaseType.gift,
25672570
21: NicePurchaseType.eventSvtJoin,
25682571
22: NicePurchaseType.assist,
2569-
23: NicePurchaseType.shop18Item,
2572+
23: NicePurchaseType.classBoardResetItem,
25702573
24: NicePurchaseType.partsSkill,
25712574
13: NicePurchaseType.kiaraPunisherReset,
25722575
}
@@ -4964,6 +4967,7 @@ class AiActType(IntEnum):
49644967
SKILL_ID = 40
49654968
SKILL_ID_CHECKBUFF = 41
49664969
RESURRECTION = 42
4970+
BATTLE_SCRIPT = 50
49674971
PLAY_MOTION = 71
49684972
MESSAGE = 72
49694973
MESSAGE_GROUP = 73
@@ -4996,6 +5000,7 @@ class NiceAiActType(StrEnum):
49965000
skillId = "skillId"
49975001
skillIdCheckbuff = "skillIdCheckbuff"
49985002
resurrection = "resurrection"
5003+
battleScript = "battleScript"
49995004
playMotion = "playMotion"
50005005
message = "message"
50015006
messageGroup = "messageGroup"
@@ -5028,6 +5033,7 @@ class NiceAiActType(StrEnum):
50285033
40: NiceAiActType.skillId,
50295034
41: NiceAiActType.skillIdCheckbuff,
50305035
42: NiceAiActType.resurrection,
5036+
50: NiceAiActType.battleScript,
50315037
71: NiceAiActType.playMotion,
50325038
72: NiceAiActType.message,
50335039
73: NiceAiActType.messageGroup,
@@ -5092,6 +5098,7 @@ class NiceAiActTarget(StrEnum):
50925098
class AiActNum(IntEnum):
50935099
NOMAL = 0
50945100
ANYTIME = -1
5101+
REACTION_PLAYER_COMBO_END = -2
50955102
REACTION_PLYAER_SKILL = -3
50965103
REACTION_ENEMYTURN_START = -4
50975104
REACTION_ENEMYTURN_END = -5
@@ -5103,14 +5110,16 @@ class AiActNum(IntEnum):
51035110
USENP_TARGET = -11
51045111
REACTION_TURNSTART = -12
51055112
REACTION_PLAYERACTIONSTART = -13
5106-
REACTION_ENTRY_UNIT = -14
5113+
REACTION_ENTRY_ANY_UNIT = -14
51075114
REACTION_BEFORE_RESURRECTION = -15
51085115
REACTION_BEFORE_DEAD = -16
51095116
SHIFT_SERVANT_AFTER = -17
51105117
REACTION_BEFORE_MOVE_WAVE = -18
51115118
SHIFT_SERVANT_BEFORE = -19
5119+
REACTION_PLAYER_COMBO_END_PRIORITY = -201
51125120
REACTION_ENEMY_TURN_START_PRIORITY = -401
51135121
REACTION_ENEMY_TURN_END_PRIORITY = -501
5122+
REACTION_ENTRY_ANY_UNIT_PRIORITY = -1401
51145123
SHIFT_SERVANT_BEFORE_PRIORITY = -1901
51155124

51165125

@@ -5119,6 +5128,7 @@ class NiceAiActNum(StrEnum):
51195128

51205129
nomal = "nomal"
51215130
anytime = "anytime"
5131+
reactionPlayerComboEnd = "reactionPlayerComboEnd"
51225132
reactionPlyaerSkill = "reactionPlyaerSkill"
51235133
reactionEnemyturnStart = "reactionEnemyturnStart"
51245134
reactionEnemyturnEnd = "reactionEnemyturnEnd"
@@ -5130,21 +5140,24 @@ class NiceAiActNum(StrEnum):
51305140
usenpTarget = "usenpTarget"
51315141
reactionTurnstart = "reactionTurnstart"
51325142
reactionPlayeractionstart = "reactionPlayeractionstart"
5133-
reactionEntryUnit = "reactionEntryUnit"
5143+
reactionEntryAnyUnit = "reactionEntryAnyUnit"
51345144
reactionBeforeResurrection = "reactionBeforeResurrection"
51355145
reactionBeforeDead = "reactionBeforeDead"
51365146
shiftServantAfter = "shiftServantAfter"
51375147
reactionBeforeMoveWave = "reactionBeforeMoveWave"
51385148
shiftServantBefore = "shiftServantBefore"
5149+
reactionPlayerComboEndPriority = "reactionPlayerComboEndPriority"
51395150
reactionEnemyTurnStartPriority = "reactionEnemyTurnStartPriority"
51405151
reactionEnemyTurnEndPriority = "reactionEnemyTurnEndPriority"
5152+
reactionEntryAnyUnitPriority = "reactionEntryAnyUnitPriority"
51415153
shiftServantBeforePriority = "shiftServantBeforePriority"
51425154
unknown = "unknown"
51435155

51445156

51455157
AI_ACT_NUM_NAME: dict[int, NiceAiActNum] = {
51465158
0: NiceAiActNum.nomal,
51475159
-1: NiceAiActNum.anytime,
5160+
-2: NiceAiActNum.reactionPlayerComboEnd,
51485161
-3: NiceAiActNum.reactionPlyaerSkill,
51495162
-4: NiceAiActNum.reactionEnemyturnStart,
51505163
-5: NiceAiActNum.reactionEnemyturnEnd,
@@ -5156,14 +5169,16 @@ class NiceAiActNum(StrEnum):
51565169
-11: NiceAiActNum.usenpTarget,
51575170
-12: NiceAiActNum.reactionTurnstart,
51585171
-13: NiceAiActNum.reactionPlayeractionstart,
5159-
-14: NiceAiActNum.reactionEntryUnit,
5172+
-14: NiceAiActNum.reactionEntryAnyUnit,
51605173
-15: NiceAiActNum.reactionBeforeResurrection,
51615174
-16: NiceAiActNum.reactionBeforeDead,
51625175
-17: NiceAiActNum.shiftServantAfter,
51635176
-18: NiceAiActNum.reactionBeforeMoveWave,
51645177
-19: NiceAiActNum.shiftServantBefore,
5178+
-201: NiceAiActNum.reactionPlayerComboEndPriority,
51655179
-401: NiceAiActNum.reactionEnemyTurnStartPriority,
51665180
-501: NiceAiActNum.reactionEnemyTurnEndPriority,
5181+
-1401: NiceAiActNum.reactionEntryAnyUnitPriority,
51675182
-1901: NiceAiActNum.shiftServantBeforePriority,
51685183
-9999: NiceAiActNum.unknown,
51695184
}

scripts/enum.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ export enum NiceFuncType {
172172
SET_BATTLE_MISSION_VALUE = "setBattleMissionValue",
173173
CHANGE_ENEMY_STATUS_UI_TYPE = "changeEnemyStatusUiType",
174174
SWAP_FIELD_POSITION = "swapFieldPosition",
175+
SET_DISPLAY_DIRECT_BATTLE_MESSAGE_IN_FSM = "setDisplayDirectBattleMessageInFsm",
175176
}
176177

177178
export enum NiceFuncTargetType {
@@ -914,7 +915,7 @@ export enum NiceItemType {
914915
EXCHANGE_SVT_COIN = "exchangeSvtCoin",
915916
REDUCE_TRADE_TIME = "reduceTradeTime",
916917
EVENT_PASSIVE_SKILL_GIVEN = "eventPassiveSkillGiven",
917-
SHOP18_ITEM = "shop18Item",
918+
CLASS_BOARD_RESET_ITEM = "classBoardResetItem",
918919
NETMARBLE_CHARGE_STONE = "netmarbleChargeStone",
919920
}
920921

@@ -958,7 +959,7 @@ export enum NiceShopType {
958959
REVIVAL_ITEM = "revivalItem",
959960
EVENT_SVT_EQUIP = "eventSvtEquip",
960961
EXCHANGE_SVT_COIN = "exchangeSvtCoin",
961-
SHOP18 = "shop18",
962+
CLASS_BOARD_RESET = "classBoardReset",
962963
}
963964

964965
export enum NicePayType {
@@ -1001,7 +1002,7 @@ export enum NicePurchaseType {
10011002
GIFT = "gift",
10021003
EVENT_SVT_JOIN = "eventSvtJoin",
10031004
ASSIST = "assist",
1004-
SHOP18_ITEM = "shop18Item",
1005+
CLASS_BOARD_RESET_ITEM = "classBoardResetItem",
10051006
PARTS_SKILL = "partsSkill",
10061007
KIARA_PUNISHER_RESET = "kiaraPunisherReset",
10071008
}
@@ -1798,6 +1799,7 @@ export enum NiceAiActType {
17981799
SKILL_ID = "skillId",
17991800
SKILL_ID_CHECKBUFF = "skillIdCheckbuff",
18001801
RESURRECTION = "resurrection",
1802+
BATTLE_SCRIPT = "battleScript",
18011803
PLAY_MOTION = "playMotion",
18021804
MESSAGE = "message",
18031805
MESSAGE_GROUP = "messageGroup",
@@ -1828,6 +1830,7 @@ export enum NiceAiActTarget {
18281830
export enum NiceAiActNum {
18291831
NOMAL = "nomal",
18301832
ANYTIME = "anytime",
1833+
REACTION_PLAYER_COMBO_END = "reactionPlayerComboEnd",
18311834
REACTION_PLYAER_SKILL = "reactionPlyaerSkill",
18321835
REACTION_ENEMYTURN_START = "reactionEnemyturnStart",
18331836
REACTION_ENEMYTURN_END = "reactionEnemyturnEnd",
@@ -1839,14 +1842,16 @@ export enum NiceAiActNum {
18391842
USENP_TARGET = "usenpTarget",
18401843
REACTION_TURNSTART = "reactionTurnstart",
18411844
REACTION_PLAYERACTIONSTART = "reactionPlayeractionstart",
1842-
REACTION_ENTRY_UNIT = "reactionEntryUnit",
1845+
REACTION_ENTRY_ANY_UNIT = "reactionEntryAnyUnit",
18431846
REACTION_BEFORE_RESURRECTION = "reactionBeforeResurrection",
18441847
REACTION_BEFORE_DEAD = "reactionBeforeDead",
18451848
SHIFT_SERVANT_AFTER = "shiftServantAfter",
18461849
REACTION_BEFORE_MOVE_WAVE = "reactionBeforeMoveWave",
18471850
SHIFT_SERVANT_BEFORE = "shiftServantBefore",
1851+
REACTION_PLAYER_COMBO_END_PRIORITY = "reactionPlayerComboEndPriority",
18481852
REACTION_ENEMY_TURN_START_PRIORITY = "reactionEnemyTurnStartPriority",
18491853
REACTION_ENEMY_TURN_END_PRIORITY = "reactionEnemyTurnEndPriority",
1854+
REACTION_ENTRY_ANY_UNIT_PRIORITY = "reactionEntryAnyUnitPriority",
18501855
SHIFT_SERVANT_BEFORE_PRIORITY = "shiftServantBeforePriority",
18511856
UNKNOWN = "unknown",
18521857
}

0 commit comments

Comments
 (0)