Added new svt class and graph detail fields

Author: narumi147

app/core/nice/grand_graph.py

@@ -23,10 +23,12 @@ def get_nice_grand_graph_detail(detail: MstGrandGraphDetail) -> NiceGrandGraphDe
         grandClass=get_class_name(detail.grandClassId),
         adjustHp=detail.adjustHp,
         adjustAtk=detail.adjustAtk,
+        closedMessage=detail.closedMessage or "",
         condType=COND_TYPE_NAME[detail.condType],
         condTargetId=detail.condTargetId,
         condNum=detail.condNum,
         adjustIndividuality=get_traits_list(detail.adjustIndividuality),
+        nameFull=detail.nameFull,
     )
 
 

app/core/nice/svt/card.py

@@ -23,6 +23,7 @@ def get_nice_card(
         attackNpRate=script.get("attackNpRate"),
         defenseNpRate=script.get("defenseNpRate"),
         dropStarRate=script.get("dropStarRate"),
+        forceAttackFunctionTargetAll=script.get("ForceAttackFunctionTargetAll"),
         positionDamageRates=script.get("positionDamageRates"),
         positionDamageRatesSlideType=(
             SVT_CARD_POSITION_DAMAGE_RATES_SLIDE_TYPE_NAME[

app/models/raw.py

@@ -2806,10 +2806,12 @@
     Column("grandClassId", Integer),
     Column("adjustHp", Integer),
     Column("adjustAtk", Integer),
+    Column("closedMessage", String),
     Column("condType", Integer),
     Column("condTargetId", Integer),
     Column("condNum", Integer),
     Column("adjustIndividuality", ARRAY(Integer)),
+    Column("nameFull", String),
 )
 
 

app/schemas/enums.py

@@ -364,6 +364,7 @@ class SvtClass(StrEnum):
     beastEresh = "beastEresh"
     uOlgaMarieAqua = "uOlgaMarieAqua"
     uOlgaMarieGrand = "uOlgaMarieGrand"
+    aquaFragment = "aquaFragment"
     unknown = "unknown"
     agarthaPenth = "agarthaPenth"
     cccFinaleEmiyaAlter = "cccFinaleEmiyaAlter"
@@ -386,6 +387,17 @@ class SvtClass(StrEnum):
     grandCaster = "grandCaster"
     grandAssassin = "grandAssassin"
     grandBerserker = "grandBerserker"
+    grandShielder = "grandShielder"
+    grandRuler = "grandRuler"
+    grandAlterego = "grandAlterego"
+    grandAvenger = "grandAvenger"
+    grandMoonCancer = "grandMoonCancer"
+    grandForeigner = "grandForeigner"
+    grandPretender = "grandPretender"
+    grandUnBeastUPlanetOlgaMarie = "grandUnBeastUPlanetOlgaMarie"
+    grandUnBeastDoraco = "grandUnBeastDoraco"
+    grandUnBeastEresh = "grandUnBeastEresh"
+    grandUnBeastUOlgaMarie = "grandUnBeastUOlgaMarie"
     unBeast = "unBeast"
 
 
@@ -430,6 +442,7 @@ class SvtClass(StrEnum):
     37: SvtClass.uOlgaMarieAqua,
     39: SvtClass.uOlgaMarieGrand,
     40: SvtClass.unBeast,
+    96: SvtClass.aquaFragment,
     97: SvtClass.unknown,
     # 98
     # 99
@@ -455,6 +468,17 @@ class SvtClass(StrEnum):
     10005: SvtClass.grandCaster,
     10006: SvtClass.grandAssassin,
     10007: SvtClass.grandBerserker,
+    10008: SvtClass.grandShielder,
+    10009: SvtClass.grandRuler,
+    10010: SvtClass.grandAlterego,
+    10011: SvtClass.grandAvenger,
+    10023: SvtClass.grandMoonCancer,
+    10025: SvtClass.grandForeigner,
+    10028: SvtClass.grandPretender,
+    10031: SvtClass.grandUnBeastUPlanetOlgaMarie,
+    10033: SvtClass.grandUnBeastDoraco,
+    10038: SvtClass.grandUnBeastEresh,
+    10040: SvtClass.grandUnBeastUOlgaMarie,
 }
 
 

app/schemas/nice.py

@@ -651,6 +651,7 @@ class BaseVals(BaseModel):
     ApplySupportSvt: int | None = None
     ApplyHighestValueInFieldGroup: int | None = None
     IsClassIconChangeSaveGrand: int | None = None
+    PriorityUpHate: int | None = None
     # These are not DataVals but guesses from SkillLvEntity and EventDropUpValInfo
     Individuality: Optional[int] = None
     EventId: Optional[int] = None
@@ -1037,6 +1038,7 @@ class NiceCardDetail(BaseModel):
     attackNpRate: int | None = None
     defenseNpRate: int | None = None
     dropStarRate: int | None = None
+    forceAttackFunctionTargetAll: int | None = None
     positionDamageRates: list[int] | None = None
     positionDamageRatesSlideType: NiceSvtCardPositionDamageRatesSlideType | None = None
     overwriteRates: list[SvtCardAddOverwriteRateData] | None = None
@@ -3237,10 +3239,12 @@ class NiceGrandGraphDetail(BaseModelORJson):
     grandClass: SvtClass | str
     adjustHp: int
     adjustAtk: int
+    closedMessage: str
     condType: NiceCondType
     condTargetId: int
     condNum: int
     adjustIndividuality: list[NiceTrait]
+    nameFull: str | None = None
 
 
 class NiceGrandGraph(BaseModelORJson):

app/schemas/raw.py

@@ -2628,10 +2628,12 @@ class MstGrandGraphDetail(BaseModelORJson):
     grandClassId: int
     adjustHp: int
     adjustAtk: int
+    closedMessage: str | None = None
     condType: int
     condTargetId: int
     condNum: int
     adjustIndividuality: list[int]
+    nameFull: str | None = None
 
 
 class MstFuncDisp(BaseModelORJson):