Finish functionality

LinwoodDev · May 9, 2023 · dc3437c · dc3437c
1 parent 1c03334
commit dc3437c
Show file tree

Hide file tree

Showing 10 changed files with 1,093 additions and 153 deletions.
diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb
@@ -32,5 +32,8 @@
   "remove": "Remove",
   "move": "Move",
   "deck": "Deck",
-  "moveCards": "Move cards"
+  "moveCards": "Move cards",
+  "location": "Location",
+  "count": "Count",
+  "putCards": "Put cards"
 }
diff --git a/app/lib/logic/connection/client.dart b/app/lib/logic/connection/client.dart
@@ -118,4 +118,20 @@ class ClientGameConnection with GameConnection, ConnectedGameConnection {
   void removeCards(List<CardIndex> cards) {
     send(ServerConnectionMessage.removeCards(cards));
   }
+
+  void putCards(int deckIndex, int? seatIndex, PickLocation location, int count,
+      int movedDeckIndex, int? movedSeatIndex) {
+    send(ServerConnectionMessage.putCards(
+      deckIndex,
+      seatIndex,
+      location,
+      count,
+      movedDeckIndex,
+      movedSeatIndex,
+    ));
+  }
+
+  void removeDeck(int deckIndex, int? seatIndex) {
+    send(ServerConnectionMessage.removeDeck(deckIndex, seatIndex));
+  }
 }
diff --git a/app/lib/logic/connection/server.dart b/app/lib/logic/connection/server.dart
@@ -33,6 +33,15 @@ class ServerConnectionMessage with _$ServerConnectionMessage {
           List<CardIndex> cards, int deckIndex, int? seatIndex) =
       AddCardsServerConnectionMessage;
 
+  const factory ServerConnectionMessage.putCards(
+    int deckIndex,
+    int? seatIndex,
+    PickLocation location,
+    int count,
+    int movedDeckIndex,
+    int? movedSeatIndex,
+  ) = PutCardsServerConnectionMessage;
+
   const factory ServerConnectionMessage.removeCards(List<CardIndex> cards) =
       RemoveCardsServerConnectionMessage;
 
@@ -160,7 +169,9 @@ class ServerGameConnection with GameConnection {
                       final found = deckIndexes.any((element) =>
                           element.deckIndex == de.key &&
                           element.cardIndex == e.key);
-                      addingCards.add(e.value);
+                      if (found) {
+                        addingCards.add(e.value);
+                      }
                       return !found;
                     })
                     .map((e) => e.value)
@@ -181,7 +192,9 @@ class ServerGameConnection with GameConnection {
                           element.deckIndex == de.key &&
                           element.seatIndex == se.key &&
                           element.cardIndex == e.key);
-                      addingCards.add(e.value);
+                      if (found) {
+                        addingCards.add(e.value);
+                      }
                       return !found;
                     })
                     .map((e) => e.value)
@@ -286,6 +299,51 @@ class ServerGameConnection with GameConnection {
         _removeCards(cards);
         _changeState(state);
       },
+      putCards: (deckIndex, seatIndex, location, count, movedDeckIndex,
+          movedSeatIndex) {
+        var cards = [];
+        var newState = state;
+        if (seatIndex != null) {
+          final removeState = state.seats[seatIndex].decks[deckIndex]
+              .removeCards(count, location);
+          newState = state.copyWith(
+              seats: List<GameSeat>.from(state.seats)
+                ..[seatIndex] = state.seats[seatIndex].copyWith(
+                    decks: List<GameDeck>.from(state.seats[seatIndex].decks)
+                      ..[deckIndex] = removeState.deck));
+          cards.addAll(removeState.removedCards);
+        } else {
+          final removeState =
+              state.decks[deckIndex].removeCards(count, location);
+          newState = state.copyWith(
+              decks: List<GameDeck>.from(state.decks)
+                ..[deckIndex] = removeState.deck);
+          cards.addAll(removeState.removedCards);
+        }
+        if (movedSeatIndex != null) {
+          newState = newState.copyWith(
+              seats: List<GameSeat>.from(newState.seats)
+                ..[movedSeatIndex] = newState.seats[movedSeatIndex].copyWith(
+                    decks: List<GameDeck>.from(
+                        newState.seats[movedSeatIndex].decks)
+                      ..[movedDeckIndex] = newState
+                          .seats[movedSeatIndex].decks[movedDeckIndex]
+                          .copyWith(
+                        cards: [
+                          ...newState.seats[movedSeatIndex]
+                              .decks[movedDeckIndex].cards,
+                          ...cards
+                        ],
+                      )));
+        } else {
+          newState = newState.copyWith(
+              decks: List<GameDeck>.from(newState.decks)
+                ..[movedDeckIndex] = newState.decks[movedDeckIndex].copyWith(
+                  cards: [...newState.decks[movedDeckIndex].cards, ...cards],
+                ));
+        }
+        _changeState(newState);
+      },
     );
   }
 }