Add basic hand deck and figure support

app/lib/game/board/background.dart

@@ -6,7 +6,7 @@ import 'package:quokka/game/board/game.dart';
 class GameBoardBackground extends SpriteComponent
     with HasGameReference<BoardGame> {
   GameBoardBackground({super.size})
-      : super(paint: Paint()..isAntiAlias = true);
+      : super(paint: Paint()..isAntiAlias = false);
   @override
   void onLoad() {
     sprite = game.gridSprite;

app/lib/game/board/cell.dart

@@ -30,7 +30,7 @@ class GameCell extends PositionComponent
   Future<void> onLoad() async {
     add(GameBoardBackground(size: size));
     _selectionComponent = SpriteComponent(
-      sprite: await Sprite.load('selection.png'),
+      sprite: game.selectionSprite,
       size: size,
     );
     add(_selectionComponent..opacity = 0);
@@ -72,7 +72,6 @@ class GameCell extends PositionComponent
   @override
   void update(double dt) {
     if (_selected == (game.selectedCell == position)) return;
-
     _selected = !_selected;
     final controller = EffectController(
       duration: 0.1,

app/lib/game/board/game.dart

@@ -16,7 +16,7 @@ class BoardGame extends FlameGame with ScrollDetector, ScaleDetector {
   final GameTable table;
   final Map<String, PackData> _loadedPacks = {};
   Vector2? selectedCell;
-  late final Sprite gridSprite;
+  late final Sprite gridSprite, selectionSprite;
   late final GameHand _hand;
 
   BoardGame({
@@ -36,6 +36,7 @@ class BoardGame extends FlameGame with ScrollDetector, ScaleDetector {
     }
     final image = await decodeImageFromList(data);
     gridSprite = Sprite(image);
+    selectionSprite = await Sprite.load('selection.png');
     _hand = GameHand();
     camera.viewport.add(_hand);
     world.add(BoardGrid(cellSize: Vector2.all(256), createCell: GameCell.new));
@@ -91,5 +92,6 @@ class BoardGame extends FlameGame with ScrollDetector, ScaleDetector {
 
   void showAdd() {
     selectedCell = null;
+    _hand.show();
   }
 }

app/lib/game/board/hand/deck.dart

@@ -1,7 +1,22 @@
+import 'package:flame/components.dart';
+import 'package:quokka/game/board/game.dart';
 import 'package:quokka/game/board/hand/item.dart';
+import 'package:quokka/game/board/hand/view.dart';
 import 'package:quokka/models/definitions/deck.dart';
 import 'package:quokka/models/definitions/pack.dart';
 
-class DeckDefinitionHandItem extends HandItem<PackItem<DeckDefinition>> {
+class DeckDefinitionHandItem extends HandItem<PackItem<DeckDefinition>>
+    with HasGameRef<BoardGame> {
   DeckDefinitionHandItem({required super.item});
+
+  @override
+  String get label => item.id;
+
+  @override
+  void onTapUp(event) {
+    final hand = parent;
+    if (hand is GameHand) {
+      hand.selectDeck(item);
+    }
+  }
 }

app/lib/game/board/hand/figure.dart

@@ -2,6 +2,10 @@ import 'package:quokka/game/board/hand/item.dart';
 import 'package:quokka/models/definitions/object.dart';
 import 'package:quokka/models/definitions/pack.dart';
 
-class FigureDefinitionHandItem extends HandItem<PackItem<FigureDefinition>> {
+class FigureDefinitionHandItem
+    extends HandItem<(PackItem<FigureDefinition>, String?)> {
   FigureDefinitionHandItem({required super.item});
+
+  @override
+  String get label => item.$2 ?? item.$1.id;
 }

app/lib/game/board/hand/item.dart

@@ -1,7 +1,20 @@
 import 'package:flame/components.dart';
+import 'package:flame/events.dart';
 
-abstract class HandItem<T> extends PositionComponent {
+abstract class HandItem<T> extends PositionComponent with TapCallbacks {
   final T item;
 
-  HandItem({required this.item});
+  HandItem({required this.item}) : super(size: Vector2(100, 0));
+
+  String get label;
+
+  @override
+  void onLoad() {
+    add(TextComponent(text: label));
+  }
+
+  @override
+  void onParentResize(Vector2 maxSize) {
+    height = maxSize.y;
+  }
 }

app/lib/game/board/hand/object.dart

@@ -3,4 +3,7 @@ import 'package:quokka/models/table.dart';
 
 class GameObjectHandItem extends HandItem<MapEntry<GridLocation, GameObject>> {
   GameObjectHandItem({required super.item});
+
+  @override
+  String get label => item.value.asset.id;
 }

app/lib/game/board/hand/view.dart

@@ -2,6 +2,7 @@ import 'dart:math';
 
 import 'package:collection/collection.dart';
 import 'package:flame/components.dart';
+import 'package:flutter/material.dart';
 import 'package:quokka/game/board/game.dart';
 import 'package:quokka/game/board/hand/deck.dart';
 import 'package:quokka/game/board/hand/figure.dart';
@@ -12,15 +13,32 @@ import 'package:quokka/models/definitions/object.dart';
 import 'package:quokka/models/definitions/pack.dart';
 import 'package:quokka/models/table.dart';
 
-class GameHand extends PositionComponent with HasGameRef<BoardGame> {
+class GameHandCustomPainter extends CustomPainter {
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint = Paint()
+      ..color = Colors.black
+      ..style = PaintingStyle.fill
+      ..strokeWidth = 2;
+    canvas.drawRect(Rect.fromLTWH(0, 0, size.width, size.height), paint);
+  }
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) {
+    return true;
+  }
+}
+
+class GameHand extends CustomPainterComponent with HasGameRef<BoardGame> {
   Vector2? _lastPosition;
   double _delta = 0, _nextItemPos = 0;
   bool _showing = false, _lastShowing = false;
   PackItem<DeckDefinition>? _selectedDeck;
 
   GameHand()
       : super(
-          anchor: Anchor.bottomCenter,
+          anchor: Anchor.topLeft,
+          painter: GameHandCustomPainter(),
         );
 
   @override
@@ -39,17 +57,20 @@ class GameHand extends PositionComponent with HasGameRef<BoardGame> {
       return;
     }
     _lastPosition = game.selectedCell;
-    removeAll(children);
     _buildHand();
-    _repositionChildren();
+  }
+
+  @override
+  void onParentResize(Vector2 maxSize) {
+    _updatePosition();
   }
 
   void _updatePosition() {
     final game = gameRef;
     final size = game.canvasSize;
     width = size.x;
-    height = min(size.y / 3, 256);
-    position = Vector2(0, -height * (_showing ? 1 : 0.5));
+    height = min(size.y / 3, 256) * (_showing ? 1 : 0.5);
+    position = Vector2(0, size.y - height);
   }
 
   void _repositionChildren() {
@@ -64,6 +85,7 @@ class GameHand extends PositionComponent with HasGameRef<BoardGame> {
   }
 
   void _buildHand() {
+    removeAll(children.whereType<HandItem>());
     if (_lastPosition == null) {
       if (_selectedDeck != null) {
         _buildDeckHand(_selectedDeck!);
@@ -73,42 +95,48 @@ class GameHand extends PositionComponent with HasGameRef<BoardGame> {
     } else {
       _buildCellHand(_lastPosition!);
     }
+    _repositionChildren();
   }
 
   void _buildFreeHand() {
     final game = gameRef;
     final decks = game.packs.expand((e) => e.value.getDeckItems());
+    _nextItemPos = 0;
     for (final deck in decks) {
       _addChild(DeckDefinitionHandItem(item: deck));
     }
   }
 
-  void _addFigures(Iterable<PackItem<FigureDefinition>> figures) {
+  void _addFigures(Iterable<(PackItem<FigureDefinition>, String?)> figures) {
+    _nextItemPos = 0;
     for (final figure in figures) {
       _addChild(FigureDefinitionHandItem(item: figure));
     }
   }
 
   void _buildDeckHand(PackItem<DeckDefinition> deck) {
     final deckFigures = deck.item.figures;
-    final figures = deckFigures
-        .map((e) => deck.pack.getFigureItem(e.name, deck.namespace))
-        .whereNotNull();
+    final figures = deckFigures.map((e) {
+      final figure = deck.pack.getFigureItem(e.name, deck.namespace);
+      if (figure == null) return null;
+      return (figure, e.variation);
+    }).whereNotNull();
     _addFigures(figures);
   }
 
   void _buildCellHand(Vector2 cell) {
     final location = GridLocation(cell.x.toInt(), cell.y.toInt());
     final tableCell = game.table.cells[location];
+    _nextItemPos = 0;
     for (final object in tableCell?.objects ?? <GameObject>[]) {
       _addChild(GameObjectHandItem(item: MapEntry(location, object)));
     }
   }
 
   void _addChild(HandItem item) {
+    add(item);
     item.position = Vector2(_nextItemPos, 0);
     _nextItemPos += item.size.x;
-    add(item);
   }
 
   void show() {
@@ -120,4 +148,9 @@ class GameHand extends PositionComponent with HasGameRef<BoardGame> {
   void hide() {
     _showing = false;
   }
+
+  void selectDeck(PackItem<DeckDefinition> item) {
+    _selectedDeck = item;
+    _buildHand();
+  }
 }

app/lib/models/definitions/deck.dart

@@ -19,10 +19,12 @@ class DeckDefinition with DeckDefinitionMappable {
 @MappableClass()
 class FigureDeckDefinition with FigureDeckDefinitionMappable {
   final String name;
+  final String? variation;
   final VectorDefinition location;
 
   FigureDeckDefinition({
     required this.name,
+    this.variation,
     this.location = VectorDefinition.zero,
   });
 }

app/lib/models/definitions/deck.mapper.dart

@@ -164,19 +164,25 @@ class FigureDeckDefinitionMapper extends ClassMapperBase<FigureDeckDefinition> {
   static String _$name(FigureDeckDefinition v) => v.name;
   static const Field<FigureDeckDefinition, String> _f$name =
       Field('name', _$name);
+  static String? _$variation(FigureDeckDefinition v) => v.variation;
+  static const Field<FigureDeckDefinition, String> _f$variation =
+      Field('variation', _$variation, opt: true);
   static VectorDefinition _$location(FigureDeckDefinition v) => v.location;
   static const Field<FigureDeckDefinition, VectorDefinition> _f$location =
       Field('location', _$location, opt: true, def: VectorDefinition.zero);
 
   @override
   final MappableFields<FigureDeckDefinition> fields = const {
     #name: _f$name,
+    #variation: _f$variation,
     #location: _f$location,
   };
 
   static FigureDeckDefinition _instantiate(DecodingData data) {
     return FigureDeckDefinition(
-        name: data.dec(_f$name), location: data.dec(_f$location));
+        name: data.dec(_f$name),
+        variation: data.dec(_f$variation),
+        location: data.dec(_f$location));
   }
 
   @override
@@ -237,7 +243,7 @@ abstract class FigureDeckDefinitionCopyWith<
     $In extends FigureDeckDefinition,
     $Out> implements ClassCopyWith<$R, $In, $Out> {
   VectorDefinitionCopyWith<$R, VectorDefinition, VectorDefinition> get location;
-  $R call({String? name, VectorDefinition? location});
+  $R call({String? name, String? variation, VectorDefinition? location});
   FigureDeckDefinitionCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(
       Then<$Out2, $R2> t);
 }
@@ -254,14 +260,19 @@ class _FigureDeckDefinitionCopyWithImpl<$R, $Out>
   VectorDefinitionCopyWith<$R, VectorDefinition, VectorDefinition>
       get location => $value.location.copyWith.$chain((v) => call(location: v));
   @override
-  $R call({String? name, VectorDefinition? location}) =>
+  $R call(
+          {String? name,
+          Object? variation = $none,
+          VectorDefinition? location}) =>
       $apply(FieldCopyWithData({
         if (name != null) #name: name,
+        if (variation != $none) #variation: variation,
         if (location != null) #location: location
       }));
   @override
   FigureDeckDefinition $make(CopyWithData data) => FigureDeckDefinition(
       name: data.get(#name, or: $value.name),
+      variation: data.get(#variation, or: $value.variation),
       location: data.get(#location, or: $value.location));
 
   @override

app/lib/models/definitions/pack.dart

@@ -49,7 +49,7 @@ class PackData {
         return e.substring(0, startExtension);
       });
 
-  Iterable<String> getDecks() => getAssets(kPackDecksPath);
+  Iterable<String> getDecks() => getAssets(kPackDecksPath, true);
 
   DeckDefinition? getDeck(String id) {
     final data = getAsset('$kPackDecksPath/$id.json');

app/lib/pages/game/page.dart

@@ -20,6 +20,7 @@ class GamePage extends StatelessWidget {
     return Scaffold(
       appBar: WindowTitleBar<SettingsCubit, QuokkaSettings>(
         title: Text(AppLocalizations.of(context).game),
+        height: 50,
         actions: [
           IconButton(
             icon: const PhosphorIcon(PhosphorIconsLight.plusCircle),