Added adjustIndividuality to grand graph

Author: narumi147

app/core/nice/grand_graph.py

@@ -7,6 +7,7 @@
 from ...schemas.nice import NiceGrandGraph, NiceGrandGraphDetail
 from ...schemas.raw import MstGrandGraph, MstGrandGraphDetail
 from .. import raw
+from ..utils import get_traits_list
 from .item import get_nice_item_amount, get_nice_item_from_raw
 
 
@@ -15,6 +16,7 @@
 
 def get_nice_grand_graph_detail(detail: MstGrandGraphDetail) -> NiceGrandGraphDetail:
     return NiceGrandGraphDetail(
+        grandGraphId=detail.grandGraphId,
         baseClassId=detail.baseClassId,
         grandClassId=detail.grandClassId,
         baseClass=get_class_name(detail.baseClassId),
@@ -24,6 +26,7 @@ def get_nice_grand_graph_detail(detail: MstGrandGraphDetail) -> NiceGrandGraphDe
         condType=COND_TYPE_NAME[detail.condType],
         condTargetId=detail.condTargetId,
         condNum=detail.condNum,
+        adjustIndividuality=get_traits_list(detail.adjustIndividuality),
     )
 
 

app/models/raw.py

@@ -2809,6 +2809,7 @@
     Column("condType", Integer),
     Column("condTargetId", Integer),
     Column("condNum", Integer),
+    Column("adjustIndividuality", ARRAY(Integer)),
 )
 
 

app/schemas/nice.py

@@ -3208,7 +3208,7 @@ class NiceClassBoard(BaseModelORJson):
 
 
 class NiceGrandGraphDetail(BaseModelORJson):
-    # grandGraphId: int
+    grandGraphId: int
     baseClassId: int
     grandClassId: int
     baseClass: SvtClass | str
@@ -3218,6 +3218,7 @@ class NiceGrandGraphDetail(BaseModelORJson):
     condType: NiceCondType
     condTargetId: int
     condNum: int
+    adjustIndividuality: list[NiceTrait]
 
 
 class NiceGrandGraph(BaseModelORJson):

app/schemas/raw.py

@@ -2631,6 +2631,7 @@ class MstGrandGraphDetail(BaseModelORJson):
     condType: int
     condTargetId: int
     condNum: int
+    adjustIndividuality: list[int]
 
 
 class MstFuncDisp(BaseModelORJson):