Skip to content

Commit 6cacb49

Browse files
narumi147narumi147
committed
Updated new enums from JP 2.113.0
1 parent 090cb7c commit 6cacb49

File tree

4 files changed

+93
-0
lines changed

4 files changed

+93
-0
lines changed

‎app/core/nice/quest.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,11 @@ async def get_nice_quest_phase_no_rayshift(
442442
for aiNpc in raw_quest.mstQuestPhase.script["aiMultiNpc"]:
443443
aiNpc["npc"] = npcs.ai_npc[aiNpc["npcId"]]
444444

445+
if "LimitAct" in raw_quest.mstQuestPhase.script:
446+
raw_quest.mstQuestPhase.script["LimitAct"] = STAGE_LIMIT_ACT_TYPE_NAME[
447+
raw_quest.mstQuestPhase.script["LimitAct"]
448+
]
449+
445450
restrictions = {
446451
restriction.id: restriction for restriction in raw_quest.mstRestriction
447452
}

‎app/schemas/gameenums.py‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2411,6 +2411,7 @@ class PurchaseType(IntEnum):
24112411
EVENT_SVT_JOIN = 21
24122412
ASSIST = 22
24132413
SHOP18_ITEM = 23
2414+
PARTS_SKILL = 24
24142415

24152416

24162417
class NicePurchaseType(StrEnum):
@@ -2439,6 +2440,7 @@ class NicePurchaseType(StrEnum):
24392440
eventSvtJoin = "eventSvtJoin"
24402441
assist = "assist"
24412442
shop18Item = "shop18Item"
2443+
partsSkill = "partsSkill"
24422444
kiaraPunisherReset = "kiaraPunisherReset"
24432445

24442446

@@ -2466,6 +2468,7 @@ class NicePurchaseType(StrEnum):
24662468
21: NicePurchaseType.eventSvtJoin,
24672469
22: NicePurchaseType.assist,
24682470
23: NicePurchaseType.shop18Item,
2471+
24: NicePurchaseType.partsSkill,
24692472
13: NicePurchaseType.kiaraPunisherReset,
24702473
}
24712474

@@ -2772,6 +2775,7 @@ class CondType(IntEnum):
27722775
GRAND_SVT_SET = 258
27732776
PLAYED_MOVIE = 259
27742777
NOT_PLAYED_MOVIE = 260
2778+
NOT_SHOP_GROUP_LIMIT_NUM = 263
27752779

27762780

27772781
class NiceCondType(StrEnum):
@@ -3030,6 +3034,7 @@ class NiceCondType(StrEnum):
30303034
grandSvtSet = "grandSvtSet"
30313035
playedMovie = "playedMovie"
30323036
notPlayedMovie = "notPlayedMovie"
3037+
notShopGroupLimitNum = "notShopGroupLimitNum"
30333038

30343039

30353040
COND_TYPE_NAME: dict[int, NiceCondType] = {
@@ -3286,6 +3291,7 @@ class NiceCondType(StrEnum):
32863291
258: NiceCondType.grandSvtSet,
32873292
259: NiceCondType.playedMovie,
32883293
260: NiceCondType.notPlayedMovie,
3294+
263: NiceCondType.notShopGroupLimitNum,
32893295
}
32903296

32913297

@@ -3773,30 +3779,50 @@ class StatusRank(IntEnum):
37733779
A_MINUS = 14
37743780
A_PLUS3 = 15
37753781
A_QUESTION = 16
3782+
A_B = 17
3783+
A_C = 18
3784+
A_D = 19
3785+
A_E = 20
37763786
B = 21
37773787
B_PLUS = 22
37783788
B_PLUS2 = 23
37793789
B_MINUS = 24
37803790
B_PLUS3 = 25
37813791
B_QUESTION = 26
3792+
B_A = 27
3793+
B_C = 28
3794+
B_D = 29
3795+
B_E = 30
37823796
C = 31
37833797
C_PLUS = 32
37843798
C_PLUS2 = 33
37853799
C_MINUS = 34
37863800
C_PLUS3 = 35
37873801
C_QUESTION = 36
3802+
C_A = 37
3803+
C_B = 38
3804+
C_D = 39
3805+
C_E = 40
37883806
D = 41
37893807
D_PLUS = 42
37903808
D_PLUS2 = 43
37913809
D_MINUS = 44
37923810
D_PLUS3 = 45
37933811
D_QUESTION = 46
3812+
D_A = 47
3813+
D_B = 48
3814+
D_C = 49
3815+
D_E = 50
37943816
E = 51
37953817
E_PLUS = 52
37963818
E_PLUS2 = 53
37973819
E_MINUS = 54
37983820
E_PLUS3 = 55
37993821
E_QUESTION = 56
3822+
E_A = 57
3823+
E_B = 58
3824+
E_C = 59
3825+
E_D = 60
38003826
EX = 61
38013827
QUESTION = 98
38023828
NONE = 99
@@ -3811,30 +3837,50 @@ class NiceStatusRank(StrEnum):
38113837
aMinus = "A-"
38123838
aPlus3 = "A+++"
38133839
aQuestion = "A?"
3840+
aB = "A(B)"
3841+
aC = "A(C)"
3842+
aD = "A(D)"
3843+
aE = "A(E)"
38143844
b = "B"
38153845
bPlus = "B+"
38163846
bPlus2 = "B++"
38173847
bMinus = "B-"
38183848
bPlus3 = "B+++"
38193849
bQuestion = "B?"
3850+
bA = "B(A)"
3851+
bC = "B(C)"
3852+
bD = "B(D)"
3853+
bE = "B(E)"
38203854
c = "C"
38213855
cPlus = "C+"
38223856
cPlus2 = "C++"
38233857
cMinus = "C-"
38243858
cPlus3 = "C+++"
38253859
cQuestion = "C?"
3860+
cA = "C(A)"
3861+
cB = "C(B)"
3862+
cD = "C(D)"
3863+
cE = "C(E)"
38263864
d = "D"
38273865
dPlus = "D+"
38283866
dPlus2 = "D++"
38293867
dMinus = "D-"
38303868
dPlus3 = "D+++"
38313869
dQuestion = "D?"
3870+
dA = "D(A)"
3871+
dB = "D(B)"
3872+
dC = "D(C)"
3873+
dE = "D(E)"
38323874
e = "E"
38333875
ePlus = "E+"
38343876
ePlus2 = "E++"
38353877
eMinus = "E-"
38363878
ePlus3 = "E+++"
38373879
eQuestion = "E?"
3880+
eA = "E(A)"
3881+
eB = "E(B)"
3882+
eC = "E(C)"
3883+
eD = "E(D)"
38383884
ex = "EX"
38393885
question = "?"
38403886
none = "None"
@@ -3848,30 +3894,50 @@ class NiceStatusRank(StrEnum):
38483894
14: NiceStatusRank.aMinus,
38493895
15: NiceStatusRank.aPlus3,
38503896
16: NiceStatusRank.aQuestion,
3897+
17: NiceStatusRank.aB,
3898+
18: NiceStatusRank.aC,
3899+
19: NiceStatusRank.aD,
3900+
20: NiceStatusRank.aE,
38513901
21: NiceStatusRank.b,
38523902
22: NiceStatusRank.bPlus,
38533903
23: NiceStatusRank.bPlus2,
38543904
24: NiceStatusRank.bMinus,
38553905
25: NiceStatusRank.bPlus3,
38563906
26: NiceStatusRank.bQuestion,
3907+
27: NiceStatusRank.bA,
3908+
28: NiceStatusRank.bC,
3909+
29: NiceStatusRank.bD,
3910+
30: NiceStatusRank.bE,
38573911
31: NiceStatusRank.c,
38583912
32: NiceStatusRank.cPlus,
38593913
33: NiceStatusRank.cPlus2,
38603914
34: NiceStatusRank.cMinus,
38613915
35: NiceStatusRank.cPlus3,
38623916
36: NiceStatusRank.cQuestion,
3917+
37: NiceStatusRank.cA,
3918+
38: NiceStatusRank.cB,
3919+
39: NiceStatusRank.cD,
3920+
40: NiceStatusRank.cE,
38633921
41: NiceStatusRank.d,
38643922
42: NiceStatusRank.dPlus,
38653923
43: NiceStatusRank.dPlus2,
38663924
44: NiceStatusRank.dMinus,
38673925
45: NiceStatusRank.dPlus3,
38683926
46: NiceStatusRank.dQuestion,
3927+
47: NiceStatusRank.dA,
3928+
48: NiceStatusRank.dB,
3929+
49: NiceStatusRank.dC,
3930+
50: NiceStatusRank.dE,
38693931
51: NiceStatusRank.e,
38703932
52: NiceStatusRank.ePlus,
38713933
53: NiceStatusRank.ePlus2,
38723934
54: NiceStatusRank.eMinus,
38733935
55: NiceStatusRank.ePlus3,
38743936
56: NiceStatusRank.eQuestion,
3937+
57: NiceStatusRank.eA,
3938+
58: NiceStatusRank.eB,
3939+
59: NiceStatusRank.eC,
3940+
60: NiceStatusRank.eD,
38753941
61: NiceStatusRank.ex,
38763942
98: NiceStatusRank.question,
38773943
99: NiceStatusRank.none,

‎app/schemas/nice.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2901,6 +2901,8 @@ class NiceQuestPhaseExtraDetail(BaseModelORJson):
29012901
masterSkillDelay: int | None = None
29022902
masterSkillDelayInfo: str | None = None
29032903
isUseGrandBoard: int | None = None
2904+
turn: int | None = None
2905+
limitAct: StageLimitActType | None = None
29042906

29052907

29062908
class NiceRestriction(BaseModelORJson):

‎scripts/extract_enums.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,30 +104,50 @@ def out_intenum(input_dict: dict[int, str], className: str) -> list[str]:
104104
"aMinus": "A-",
105105
"aPlus3": "A+++",
106106
"aQuestion": "A?",
107+
"aB": "A(B)",
108+
"aC": "A(C)",
109+
"aD": "A(D)",
110+
"aE": "A(E)",
107111
"b": "B",
108112
"bPlus": "B+",
109113
"bPlus2": "B++",
110114
"bMinus": "B-",
111115
"bPlus3": "B+++",
112116
"bQuestion": "B?",
117+
"bA": "B(A)",
118+
"bC": "B(C)",
119+
"bD": "B(D)",
120+
"bE": "B(E)",
113121
"c": "C",
114122
"cPlus": "C+",
115123
"cPlus2": "C++",
116124
"cMinus": "C-",
117125
"cPlus3": "C+++",
118126
"cQuestion": "C?",
127+
"cA": "C(A)",
128+
"cB": "C(B)",
129+
"cD": "C(D)",
130+
"cE": "C(E)",
119131
"d": "D",
120132
"dPlus": "D+",
121133
"dPlus2": "D++",
122134
"dMinus": "D-",
123135
"dPlus3": "D+++",
124136
"dQuestion": "D?",
137+
"dA": "D(A)",
138+
"dB": "D(B)",
139+
"dC": "D(C)",
140+
"dE": "D(E)",
125141
"e": "E",
126142
"ePlus": "E+",
127143
"ePlus2": "E++",
128144
"eMinus": "E-",
129145
"ePlus3": "E+++",
130146
"eQuestion": "E?",
147+
"eA": "E(A)",
148+
"eB": "E(B)",
149+
"eC": "E(C)",
150+
"eD": "E(D)",
131151
"ex": "EX",
132152
"question": "?",
133153
"none": "None",

0 commit comments

Comments
 (0)