Hide trigger skill lv if lv depends on OC(Miyu)

chaldea-center · Aug 10, 2023 · 161a7ca · 161a7ca
1 parent 0d25f1c
commit 161a7ca
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/lib/app/descriptors/func/func.dart b/lib/app/descriptors/func/func.dart
@@ -1026,9 +1026,11 @@ class FuncDescriptor extends StatelessWidget {
     final trigger = kBuffValueTriggerTypes[func.buff?.type];
     if (trigger == null) return null;
     final details = func.svals.map((e) => trigger(e)).toList();
+    final ocDetails = func.ocVals(0).map((e) => trigger(e)).toList();
     final detail = details.getOrNull((level ?? -1) - 1) ?? details.firstOrNull;
-    bool noLevel =
-        details.isEmpty || ((level == null || level == -1) && details.map((e) => e.level).toSet().length > 1);
+    bool noLevel = details.isEmpty ||
+        ((level == null || level == -1) && details.map((e) => e.level).toSet().length > 1) ||
+        (ocDetails.map((e) => e.level).toSet().length > 1);
 
     DataVals? vals;
     vals = func.svals.getOrNull((level ?? 1) - 1);

diff --git a/lib/models/gamedata/func.dart b/lib/models/gamedata/func.dart
@@ -168,11 +168,11 @@ class NiceFunction with RouteInfo implements BaseFunction {
     return valList;
   }
 
-  List<DataVals> ocVals(int lv) {
-    assert(lv >= 0 && lv < svals.length, lv);
+  List<DataVals> ocVals(int index) {
+    assert(index >= 0 && index < svals.length, index);
     return [
       for (final sv in [svals, svals2, svals3, svals4, svals5])
-        if (sv != null) sv[lv]
+        if (sv != null) sv[index]
     ];
   }
 

diff --git a/lib/models/gamedata/servant.dart b/lib/models/gamedata/servant.dart
@@ -140,7 +140,7 @@ class BasicServant with GameCardMixin {
 
   factory BasicServant.fromJson(Map<String, dynamic> json) {
     final id = json["id"] as int;
-    if (json["rarity"] == null) {
+    if (json["type"] == null) {
       // classId and attribute can be overridden
       json = Map.from(GameDataLoader.instance.tmp.gameJson!["entities"][id.toString()])..addAll(json);
     }