CardReset remove donotSelectCommandcard

chaldea-center · Aug 15, 2024 · 46e1c0f · 46e1c0f
1 parent b37190c
commit 46e1c0f
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/lib/app/battle/functions/function_executor.dart b/lib/app/battle/functions/function_executor.dart
@@ -395,7 +395,10 @@ class FunctionExecutor {
           break;
         case FuncType.cardReset:
           for (final svt in battleData.nonnullPlayers) {
-            svt.battleBuff.removeBuffWithTrait(NiceTrait(id: Trait.buffLockCardsDeck.value));
+            svt.battleBuff.removeBuffOfType(BuffType.fixCommandcard);
+            for (final buff in collectBuffsPerType(svt.battleBuff.validBuffs, BuffType.donotSelectCommandcard)) {
+              buff.setUsed(svt);
+            }
           }
           for (final target in targets) {
             battleData.setFuncResult(target.uniqueId, true);

diff --git a/lib/app/battle/functions/replace_member.dart b/lib/app/battle/functions/replace_member.dart
@@ -22,7 +22,7 @@ class ReplaceMember {
     }
 
     for (final svt in battleData.nonnullPlayers) {
-      svt.battleBuff.removeBuffWithTrait(NiceTrait(id: Trait.buffLockCardsDeck.value));
+      svt.battleBuff.removeBuffOfType(BuffType.fixCommandcard);
     }
 
     final List<BattleServantData?> onFieldList = battleData.onFieldAllyServants;

diff --git a/lib/app/battle/models/battle.dart b/lib/app/battle/models/battle.dart
@@ -1390,7 +1390,7 @@ class BattleData {
         actor.fieldIndex = -1;
         if (actor.isPlayer) {
           for (final svt in nonnullPlayers) {
-            svt.battleBuff.removeBuffWithTrait(NiceTrait(id: Trait.buffLockCardsDeck.value));
+            svt.battleBuff.removeBuffOfType(BuffType.fixCommandcard);
           }
         }
       }

diff --git a/lib/app/battle/models/buff.dart b/lib/app/battle/models/buff.dart
@@ -71,6 +71,13 @@ class BattleBuff {
         ));
   }
 
+  void removeBuffOfType(final BuffType type, {bool includeNoAct = false, bool includeNoField = false}) {
+    _activeList.removeWhere((buff) =>
+    (includeNoAct || !buff.checkState(BuffState.noAct)) &&
+        (includeNoField || !buff.checkState(BuffState.noField)) &&
+        buff.buff.type == type);
+  }
+
   void turnProgress() {
     for (final buff in getAllBuffs()) {
       if (!buff.checkField()) continue;

diff --git a/test/app/battle/functions/function_executor_test.dart b/test/app/battle/functions/function_executor_test.dart
@@ -1276,5 +1276,23 @@ void main() async {
       await battle.activateSvtSkill(0, 0);
       expect(eliz.np, 8000);
     });
+
+    test('cardRest clear fixCommandCard & donotSelectCommand', () async {
+      final List<PlayerSvtData> setting = [
+        PlayerSvtData.id(2300200), // bb SSR
+        PlayerSvtData.id(2300900), // ciel
+      ];
+      final battle = BattleData();
+      await battle.init(db.gameData.questPhases[9300040603]!, setting, null);
+
+      final bb = battle.onFieldAllyServants[0]!;
+
+      await battle.activateSvtSkill(0, 2);
+      expect(bb.battleBuff.validBuffs.any((buff) => buff.buff.type == BuffType.fixCommandcard), true);
+
+      await battle.activateSvtSkill(1, 2);
+      expect(bb.battleBuff.validBuffs.any((buff) => buff.buff.type == BuffType.fixCommandcard), false);
+      expect(bb.battleBuff.validBuffs.any((buff) => buff.buff.type == BuffType.donotSelectCommandcard), false);
+    });
   });
 }