Merge branch 'main' into feat/animate-dino-mouth

lib/game/bloc/game_bloc.dart

@@ -1,5 +1,5 @@
 // ignore_for_file: public_member_api_docs
-
+import 'dart:math' as math;
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:meta/meta.dart';
@@ -9,19 +9,41 @@ part 'game_state.dart';
 
 class GameBloc extends Bloc<GameEvent, GameState> {
   GameBloc() : super(const GameState.initial()) {
-    on<BallLost>(_onBallLost);
+    on<RoundLost>(_onRoundLost);
     on<Scored>(_onScored);
+    on<MultiplierIncreased>(_onIncreasedMultiplier);
     on<BonusActivated>(_onBonusActivated);
     on<SparkyTurboChargeActivated>(_onSparkyTurboChargeActivated);
   }
 
-  void _onBallLost(BallLost event, Emitter emit) {
+  void _onRoundLost(RoundLost event, Emitter emit) {
-    emit(state.copyWith(balls: state.balls - 1));
+    final score = state.score * state.multiplier;
+    final roundsLeft = math.max(state.rounds - 1, 0);
+
+    emit(
+      state.copyWith(
+        score: score,
+        multiplier: 1,
+        rounds: roundsLeft,
+      ),
+    );
   }
 
   void _onScored(Scored event, Emitter emit) {
     if (!state.isGameOver) {
-      emit(state.copyWith(score: state.score + event.points));
+      emit(
+        state.copyWith(score: state.score + event.points),
+      );
+    }
+  }
+
+  void _onIncreasedMultiplier(MultiplierIncreased event, Emitter emit) {
+    if (!state.isGameOver) {
+      emit(
+        state.copyWith(
+          multiplier: math.min(state.multiplier + 1, 6),
+        ),
+      );
     }
   }
 

lib/game/bloc/game_event.dart

@@ -7,12 +7,12 @@ abstract class GameEvent extends Equatable {
   const GameEvent();
 }
 
-/// {@template ball_lost_game_event}
+/// {@template round_lost_game_event}
-/// Event added when a user drops a ball off the screen.
+/// Event added when a user drops all balls off the screen and loses a round.
 /// {@endtemplate}
-class BallLost extends GameEvent {
+class RoundLost extends GameEvent {
-  /// {@macro ball_lost_game_event}
+  /// {@macro round_lost_game_event}
-  const BallLost();
+  const RoundLost();
 
   @override
   List<Object?> get props => [];
@@ -48,3 +48,14 @@ class SparkyTurboChargeActivated extends GameEvent {
   @override
   List<Object?> get props => [];
 }
+
+/// {@template multiplier_increased_game_event}
+/// Added when a multiplier is gained.
+/// {@endtemplate}
+class MultiplierIncreased extends GameEvent {
+  /// {@macro multiplier_increased_game_event}
+  const MultiplierIncreased();
+
+  @override
+  List<Object?> get props => [];
+}

lib/game/bloc/game_state.dart

@@ -27,34 +27,42 @@ class GameState extends Equatable {
   /// {@macro game_state}
   const GameState({
     required this.score,
-    required this.balls,
+    required this.multiplier,
+    required this.rounds,
     required this.bonusHistory,
   })  : assert(score >= 0, "Score can't be negative"),
-        assert(balls >= 0, "Number of balls can't be negative");
+        assert(multiplier > 0, 'Multiplier must be greater than zero'),
+        assert(rounds >= 0, "Number of rounds can't be negative");
 
   const GameState.initial()
       : score = 0,
-        balls = 3,
+        multiplier = 1,
+        rounds = 3,
         bonusHistory = const [];
 
   /// The current score of the game.
   final int score;
 
-  /// The number of balls left in the game.
+  /// The current multiplier for the score.
+  final int multiplier;
+
+  /// The number of rounds left in the game.
   ///
-  /// When the number of balls is 0, the game is over.
+  /// When the number of rounds is 0, the game is over.
-  final int balls;
+  final int rounds;
 
   /// Holds the history of all the [GameBonus]es earned by the player during a
   /// PinballGame.
   final List<GameBonus> bonusHistory;
 
   /// Determines when the game is over.
-  bool get isGameOver => balls == 0;
+  bool get isGameOver => rounds == 0;
 
   GameState copyWith({
     int? score,
+    int? multiplier,
     int? balls,
+    int? rounds,
     List<GameBonus>? bonusHistory,
   }) {
     assert(
@@ -64,7 +72,8 @@ class GameState extends Equatable {
 
     return GameState(
       score: score ?? this.score,
-      balls: balls ?? this.balls,
+      multiplier: multiplier ?? this.multiplier,
+      rounds: rounds ?? this.rounds,
       bonusHistory: bonusHistory ?? this.bonusHistory,
     );
   }
@@ -72,7 +81,8 @@ class GameState extends Equatable {
   @override
   List<Object?> get props => [
         score,
-        balls,
+        multiplier,
+        rounds,
         bonusHistory,
       ];
 }

lib/game/components/android_acres.dart

@@ -5,25 +5,30 @@ import 'package:pinball/game/game.dart';
 import 'package:pinball_components/pinball_components.dart';
 import 'package:pinball_flame/pinball_flame.dart';
 
-/// {@template alien_zone}
+/// {@template android_acres}
-/// Area positioned below [Spaceship] where the [Ball]
+/// Area positioned on the left side of the board containing the [Spaceship],
-/// can bounce off [AlienBumper]s.
+/// [SpaceshipRamp], [SpaceshipRail], and [AndroidBumper]s.
 /// {@endtemplate}
-class AlienZone extends Blueprint {
+class AndroidAcres extends Blueprint {
-  /// {@macro alien_zone}
+  /// {@macro android_acres}
-  AlienZone()
+  AndroidAcres()
       : super(
           components: [
-            AlienBumper.a(
+            AndroidBumper.a(
               children: [
                 ScoringBehavior(points: 20),
               ],
             )..initialPosition = Vector2(-32.52, -9.1),
-            AlienBumper.b(
+            AndroidBumper.b(
               children: [
                 ScoringBehavior(points: 20),
               ],
             )..initialPosition = Vector2(-22.89, -17.35),
           ],
+          blueprints: [
+            SpaceshipRamp(),
+            Spaceship(position: Vector2(-26.5, -28.5)),
+            SpaceshipRail(),
+          ],
         );
 }

lib/game/components/components.dart

@@ -1,4 +1,4 @@
-export 'alien_zone.dart';
+export 'android_acres.dart';
 export 'board.dart';
 export 'camera_controller.dart';
 export 'controlled_ball.dart';

lib/game/components/controlled_ball.dart

@@ -1,5 +1,4 @@
 import 'package:flame/components.dart';
-import 'package:flame_forge2d/forge2d_game.dart';
 import 'package:flutter/material.dart';
 import 'package:pinball/game/game.dart';
 import 'package:pinball_components/pinball_components.dart';
@@ -8,12 +7,12 @@ import 'package:pinball_theme/pinball_theme.dart';
 
 /// {@template controlled_ball}
 /// A [Ball] with a [BallController] attached.
+///
+/// When a [Ball] is lost, if there aren't more [Ball]s in play and the game is
+/// not over, a new [Ball] will be spawned.
 /// {@endtemplate}
 class ControlledBall extends Ball with Controls<BallController> {
   /// A [Ball] that launches from the [Plunger].
-  ///
-  /// When a launched [Ball] is lost, it will decrease the [GameState.balls]
-  /// count, and a new [Ball] is spawned.
   ControlledBall.launch({
     required CharacterTheme characterTheme,
   }) : super(baseColor: characterTheme.ballColor) {
@@ -24,8 +23,6 @@ class ControlledBall extends Ball with Controls<BallController> {
 
   /// {@template bonus_ball}
   /// {@macro controlled_ball}
-  ///
-  /// When a bonus [Ball] is lost, the [GameState.balls] doesn't change.
   /// {@endtemplate}
   ControlledBall.bonus({
     required CharacterTheme characterTheme,
@@ -36,7 +33,7 @@ class ControlledBall extends Ball with Controls<BallController> {
 
   /// [Ball] used in [DebugPinballGame].
   ControlledBall.debug() : super(baseColor: const Color(0xFFFF0000)) {
-    controller = DebugBallController(this);
+    controller = BallController(this);
     priority = RenderPriority.ballOnBoard;
   }
 }
@@ -74,15 +71,9 @@ class BallController extends ComponentController<Ball>
   @override
   void onRemove() {
     super.onRemove();
-    gameRef.read<GameBloc>().add(const BallLost());
+    final noBallsLeft = gameRef.descendants().whereType<Ball>().isEmpty;
+    if (noBallsLeft) {
+      gameRef.read<GameBloc>().add(const RoundLost());
     }
   }
-
-/// {@macro ball_controller}
-class DebugBallController extends BallController {
-  /// {@macro ball_controller}
-  DebugBallController(Ball<Forge2DGame> component) : super(component);
-
-  @override
-  void onRemove() {}
 }

lib/game/game_assets.dart

@@ -79,10 +79,10 @@ extension PinballGameAssetsX on PinballGame {
       ),
       images.load(components.Assets.images.spaceship.rail.main.keyName),
       images.load(components.Assets.images.spaceship.rail.foreground.keyName),
-      images.load(components.Assets.images.alienBumper.a.active.keyName),
+      images.load(components.Assets.images.androidBumper.a.lit.keyName),
-      images.load(components.Assets.images.alienBumper.a.inactive.keyName),
+      images.load(components.Assets.images.androidBumper.a.dimmed.keyName),
-      images.load(components.Assets.images.alienBumper.b.active.keyName),
+      images.load(components.Assets.images.androidBumper.b.lit.keyName),
-      images.load(components.Assets.images.alienBumper.b.inactive.keyName),
+      images.load(components.Assets.images.androidBumper.b.dimmed.keyName),
       images.load(components.Assets.images.sparky.computer.top.keyName),
       images.load(components.Assets.images.sparky.computer.base.keyName),
       images.load(components.Assets.images.sparky.animatronic.keyName),

lib/game/pinball_game.dart

@@ -53,21 +53,11 @@ class PinballGame extends Forge2DGame
     final launcher = Launcher();
     unawaited(addFromBlueprint(launcher));
     unawaited(add(Board()));
-    await addFromBlueprint(AlienZone());
-
     await addFromBlueprint(SparkyFireZone());
+    await addFromBlueprint(AndroidAcres());
     unawaited(addFromBlueprint(Slingshots()));
     unawaited(addFromBlueprint(DinoWalls()));
     await add(ChromeDino()..initialPosition = Vector2(12.3, -6.9));
-    unawaited(addFromBlueprint(SpaceshipRamp()));
-    unawaited(
-      addFromBlueprint(
-        Spaceship(
-          position: Vector2(-26.5, -28.5),
-        ),
-      ),
-    );
-    unawaited(addFromBlueprint(SpaceshipRail()));
     await add(
       GoogleWord(
         position: Vector2(
@@ -83,7 +73,7 @@ class PinballGame extends Forge2DGame
 }
 
 class _GameBallsController extends ComponentController<PinballGame>
-    with BlocComponent<GameBloc, GameState>, HasGameRef<PinballGame> {
+    with BlocComponent<GameBloc, GameState> {
   _GameBallsController(PinballGame game) : super(game);
 
   late final Plunger _plunger;
@@ -91,9 +81,9 @@ class _GameBallsController extends ComponentController<PinballGame>
   @override
   bool listenWhen(GameState? previousState, GameState newState) {
     final noBallsLeft = component.descendants().whereType<Ball>().isEmpty;
-    final canBallRespawn = newState.balls > 0;
+    final notGameOver = !newState.isGameOver;
 
-    return noBallsLeft && canBallRespawn;
+    return noBallsLeft && notGameOver;
   }
 
   @override
@@ -110,7 +100,7 @@ class _GameBallsController extends ComponentController<PinballGame>
 
   void _spawnBall() {
     final ball = ControlledBall.launch(
-      characterTheme: gameRef.characterTheme,
+      characterTheme: component.characterTheme,
     )..initialPosition = Vector2(
         _plunger.body.position.x,
         _plunger.body.position.y - Ball.size.y,
@@ -171,20 +161,10 @@ class DebugPinballGame extends PinballGame with FPSCounter, TapDetector {
 
 class _DebugGameBallsController extends _GameBallsController {
   _DebugGameBallsController(PinballGame game) : super(game);
-
-  @override
-  bool listenWhen(GameState? previousState, GameState newState) {
-    final noBallsLeft = component
-        .descendants()
-        .whereType<ControlledBall>()
-        .where((ball) => ball.controller is! DebugBallController)
-        .isEmpty;
-    final canBallRespawn = newState.balls > 0;
-
-    return noBallsLeft && canBallRespawn;
-  }
 }
 
+// TODO(wolfenrain): investigate this CI failure.
+// coverage:ignore-start
 class _DebugInformation extends Component with HasGameRef<DebugPinballGame> {
   _DebugInformation() : super(priority: RenderPriority.debugInfo);
 
@@ -216,3 +196,4 @@ class _DebugInformation extends Component with HasGameRef<DebugPinballGame> {
     _debugTextPaint.render(canvas, debugText, position);
   }
 }
+// coverage:ignore-end

lib/game/view/widgets/game_hud.dart

@@ -7,7 +7,7 @@ import 'package:pinball/theme/app_colors.dart';
 /// {@template game_hud}
 /// Overlay on the [PinballGame].
 ///
-/// Displays the current [GameState.score], [GameState.balls] and animates when
+/// Displays the current [GameState.score], [GameState.rounds] and animates when
 /// the player gets a [GameBonus].
 /// {@endtemplate}
 class GameHud extends StatefulWidget {

lib/game/view/widgets/round_count_display.dart

@@ -14,9 +14,7 @@ class RoundCountDisplay extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final l10n = context.l10n;
-    // TODO(arturplaczek): refactor when GameState handle balls and rounds and
+    final rounds = context.select((GameBloc bloc) => bloc.state.rounds);
-    // select state.rounds property instead of state.ball
-    final balls = context.select((GameBloc bloc) => bloc.state.balls);
 
     return Row(
       children: [
@@ -29,9 +27,9 @@ class RoundCountDisplay extends StatelessWidget {
         const SizedBox(width: 8),
         Row(
           children: [
-            RoundIndicator(isActive: balls >= 1),
+            RoundIndicator(isActive: rounds >= 1),
-            RoundIndicator(isActive: balls >= 2),
+            RoundIndicator(isActive: rounds >= 2),
-            RoundIndicator(isActive: balls >= 3),
+            RoundIndicator(isActive: rounds >= 3),
           ],
         ),
       ],

packages/pinball_components/lib/gen/assets.gen.dart

@@ -10,8 +10,8 @@ import 'package:flutter/widgets.dart';
 class $AssetsImagesGen {
   const $AssetsImagesGen();
 
-  $AssetsImagesAlienBumperGen get alienBumper =>
+  $AssetsImagesAndroidBumperGen get androidBumper =>
-      const $AssetsImagesAlienBumperGen();
+      const $AssetsImagesAndroidBumperGen();
   $AssetsImagesBackboardGen get backboard => const $AssetsImagesBackboardGen();
   $AssetsImagesBallGen get ball => const $AssetsImagesBallGen();
   $AssetsImagesBaseboardGen get baseboard => const $AssetsImagesBaseboardGen();
@@ -31,11 +31,13 @@ class $AssetsImagesGen {
   $AssetsImagesSparkyGen get sparky => const $AssetsImagesSparkyGen();
 }
 
-class $AssetsImagesAlienBumperGen {
+class $AssetsImagesAndroidBumperGen {
-  const $AssetsImagesAlienBumperGen();
+  const $AssetsImagesAndroidBumperGen();
 
-  $AssetsImagesAlienBumperAGen get a => const $AssetsImagesAlienBumperAGen();
+  $AssetsImagesAndroidBumperAGen get a =>
-  $AssetsImagesAlienBumperBGen get b => const $AssetsImagesAlienBumperBGen();
+      const $AssetsImagesAndroidBumperAGen();
+  $AssetsImagesAndroidBumperBGen get b =>
+      const $AssetsImagesAndroidBumperBGen();
 }
 
 class $AssetsImagesBackboardGen {
@@ -258,28 +260,28 @@ class $AssetsImagesSparkyGen {
       const $AssetsImagesSparkyComputerGen();
 }
 
-class $AssetsImagesAlienBumperAGen {
+class $AssetsImagesAndroidBumperAGen {
-  const $AssetsImagesAlienBumperAGen();
+  const $AssetsImagesAndroidBumperAGen();
 
-  /// File path: assets/images/alien_bumper/a/active.png
+  /// File path: assets/images/android_bumper/a/dimmed.png
-  AssetGenImage get active =>
+  AssetGenImage get dimmed =>
-      const AssetGenImage('assets/images/alien_bumper/a/active.png');
+      const AssetGenImage('assets/images/android_bumper/a/dimmed.png');
 
-  /// File path: assets/images/alien_bumper/a/inactive.png
+  /// File path: assets/images/android_bumper/a/lit.png
-  AssetGenImage get inactive =>
+  AssetGenImage get lit =>
-      const AssetGenImage('assets/images/alien_bumper/a/inactive.png');
+      const AssetGenImage('assets/images/android_bumper/a/lit.png');
 }
 
-class $AssetsImagesAlienBumperBGen {
+class $AssetsImagesAndroidBumperBGen {
-  const $AssetsImagesAlienBumperBGen();
+  const $AssetsImagesAndroidBumperBGen();
 
-  /// File path: assets/images/alien_bumper/b/active.png
+  /// File path: assets/images/android_bumper/b/dimmed.png
-  AssetGenImage get active =>
+  AssetGenImage get dimmed =>
-      const AssetGenImage('assets/images/alien_bumper/b/active.png');
+      const AssetGenImage('assets/images/android_bumper/b/dimmed.png');
 
-  /// File path: assets/images/alien_bumper/b/inactive.png
+  /// File path: assets/images/android_bumper/b/lit.png
-  AssetGenImage get inactive =>
+  AssetGenImage get lit =>
-      const AssetGenImage('assets/images/alien_bumper/b/inactive.png');
+      const AssetGenImage('assets/images/android_bumper/b/lit.png');
 }
 
 class $AssetsImagesDashBumperGen {

packages/pinball_components/lib/src/components/alien_bumper/behaviors/behaviors.dart

@@ -1,2 +0,0 @@
-export 'alien_bumper_ball_contact_behavior.dart';
-export 'alien_bumper_blinking_behavior.dart';

packages/pinball_components/lib/src/components/alien_bumper/cubit/alien_bumper_cubit.dart

@@ -1,17 +0,0 @@
-// ignore_for_file: public_member_api_docs
-
-import 'package:bloc/bloc.dart';
-
-part 'alien_bumper_state.dart';
-
-class AlienBumperCubit extends Cubit<AlienBumperState> {
-  AlienBumperCubit() : super(AlienBumperState.active);
-
-  void onBallContacted() {
-    emit(AlienBumperState.inactive);
-  }
-
-  void onBlinked() {
-    emit(AlienBumperState.active);
-  }
-}

packages/pinball_components/lib/src/components/alien_bumper/cubit/alien_bumper_state.dart

@@ -1,10 +0,0 @@
-part of 'alien_bumper_cubit.dart';
-
-/// Indicates the [AlienBumperCubit]'s current state.
-enum AlienBumperState {
-  /// A lit up bumper.
-  active,
-
-  /// A dimmed bumper.
-  inactive,
-}

packages/pinball_components/lib/src/components/android_bumper/android_bumper.dart

@@ -4,71 +4,71 @@ import 'package:flame/components.dart';
 import 'package:flame_forge2d/flame_forge2d.dart';
 import 'package:flutter/material.dart';
 import 'package:pinball_components/pinball_components.dart';
-import 'package:pinball_components/src/components/alien_bumper/behaviors/behaviors.dart';
+import 'package:pinball_components/src/components/android_bumper/behaviors/behaviors.dart';
 import 'package:pinball_flame/pinball_flame.dart';
 
-export 'cubit/alien_bumper_cubit.dart';
+export 'cubit/android_bumper_cubit.dart';
 
-/// {@template alien_bumper}
+/// {@template android_bumper}
 /// Bumper for area under the [Spaceship].
 /// {@endtemplate}
-class AlienBumper extends BodyComponent with InitialPosition {
+class AndroidBumper extends BodyComponent with InitialPosition {
-  /// {@macro alien_bumper}
+  /// {@macro android_bumper}
-  AlienBumper._({
+  AndroidBumper._({
     required double majorRadius,
     required double minorRadius,
-    required String onAssetPath,
+    required String litAssetPath,
-    required String offAssetPath,
+    required String dimmedAssetPath,
     Iterable<Component>? children,
     required this.bloc,
   })  : _majorRadius = majorRadius,
         _minorRadius = minorRadius,
         super(
-          priority: RenderPriority.alienBumper,
+          priority: RenderPriority.androidBumper,
           renderBody: false,
           children: [
-            AlienBumperBallContactBehavior(),
+            AndroidBumperBallContactBehavior(),
-            AlienBumperBlinkingBehavior(),
+            AndroidBumperBlinkingBehavior(),
-            _AlienBumperSpriteGroupComponent(
+            _AndroidBumperSpriteGroupComponent(
-              offAssetPath: offAssetPath,
+              dimmedAssetPath: dimmedAssetPath,
-              onAssetPath: onAssetPath,
+              litAssetPath: litAssetPath,
               state: bloc.state,
             ),
             ...?children,
           ],
         );
 
-  /// {@macro alien_bumper}
+  /// {@macro android_bumper}
-  AlienBumper.a({
+  AndroidBumper.a({
     Iterable<Component>? children,
   }) : this._(
           majorRadius: 3.52,
           minorRadius: 2.97,
-          onAssetPath: Assets.images.alienBumper.a.active.keyName,
+          litAssetPath: Assets.images.androidBumper.a.lit.keyName,
-          offAssetPath: Assets.images.alienBumper.a.inactive.keyName,
+          dimmedAssetPath: Assets.images.androidBumper.a.dimmed.keyName,
-          bloc: AlienBumperCubit(),
+          bloc: AndroidBumperCubit(),
           children: children,
         );
 
-  /// {@macro alien_bumper}
+  /// {@macro android_bumper}
-  AlienBumper.b({
+  AndroidBumper.b({
     Iterable<Component>? children,
   }) : this._(
           majorRadius: 3.19,
           minorRadius: 2.79,
-          onAssetPath: Assets.images.alienBumper.b.active.keyName,
+          litAssetPath: Assets.images.androidBumper.b.lit.keyName,
-          offAssetPath: Assets.images.alienBumper.b.inactive.keyName,
+          dimmedAssetPath: Assets.images.androidBumper.b.dimmed.keyName,
-          bloc: AlienBumperCubit(),
+          bloc: AndroidBumperCubit(),
           children: children,
         );
 
-  /// Creates an [AlienBumper] without any children.
+  /// Creates an [AndroidBumper] without any children.
   ///
-  /// This can be used for testing [AlienBumper]'s behaviors in isolation.
+  /// This can be used for testing [AndroidBumper]'s behaviors in isolation.
   // TODO(alestiago): Refactor injecting bloc once the following is merged:
   // https://github.com/flame-engine/flame/pull/1538
   @visibleForTesting
-  AlienBumper.test({
+  AndroidBumper.test({
     required this.bloc,
   })  : _majorRadius = 3.52,
         _minorRadius = 2.97;
@@ -80,7 +80,7 @@ class AlienBumper extends BodyComponent with InitialPosition {
   // TODO(alestiago): Consider refactoring once the following is merged:
   // https://github.com/flame-engine/flame/pull/1538
   // ignore: public_member_api_docs
-  final AlienBumperCubit bloc;
+  final AndroidBumperCubit bloc;
 
   @override
   void onRemove() {
@@ -107,23 +107,23 @@ class AlienBumper extends BodyComponent with InitialPosition {
   }
 }
 
-class _AlienBumperSpriteGroupComponent
+class _AndroidBumperSpriteGroupComponent
-    extends SpriteGroupComponent<AlienBumperState>
+    extends SpriteGroupComponent<AndroidBumperState>
-    with HasGameRef, ParentIsA<AlienBumper> {
+    with HasGameRef, ParentIsA<AndroidBumper> {
-  _AlienBumperSpriteGroupComponent({
+  _AndroidBumperSpriteGroupComponent({
-    required String onAssetPath,
+    required String litAssetPath,
-    required String offAssetPath,
+    required String dimmedAssetPath,
-    required AlienBumperState state,
+    required AndroidBumperState state,
-  })  : _onAssetPath = onAssetPath,
+  })  : _litAssetPath = litAssetPath,
-        _offAssetPath = offAssetPath,
+        _dimmedAssetPath = dimmedAssetPath,
         super(
           anchor: Anchor.center,
           position: Vector2(0, -0.1),
           current: state,
         );
 
-  final String _onAssetPath;
+  final String _litAssetPath;
-  final String _offAssetPath;
+  final String _dimmedAssetPath;
 
   @override
   Future<void> onLoad() async {
@@ -131,11 +131,11 @@ class _AlienBumperSpriteGroupComponent
     parent.bloc.stream.listen((state) => current = state);
 
     final sprites = {
-      AlienBumperState.active: Sprite(
+      AndroidBumperState.lit: Sprite(
-        gameRef.images.fromCache(_onAssetPath),
+        gameRef.images.fromCache(_litAssetPath),
       ),
-      AlienBumperState.inactive:
+      AndroidBumperState.dimmed:
-          Sprite(gameRef.images.fromCache(_offAssetPath)),
+          Sprite(gameRef.images.fromCache(_dimmedAssetPath)),
     };
     this.sprites = sprites;
     size = sprites[current]!.originalSize / 10;

packages/pinball_components/lib/src/components/android_bumper/behaviors/android_bumper_ball_contact_behavior.dart

@@ -4,7 +4,7 @@ import 'package:flame_forge2d/flame_forge2d.dart';
 import 'package:pinball_components/pinball_components.dart';
 import 'package:pinball_flame/pinball_flame.dart';
 
-class AlienBumperBallContactBehavior extends ContactBehavior<AlienBumper> {
+class AndroidBumperBallContactBehavior extends ContactBehavior<AndroidBumper> {
   @override
   void beginContact(Object other, Contact contact) {
     super.beginContact(other, contact);

packages/pinball_components/lib/src/components/android_bumper/behaviors/android_bumper_blinking_behavior.dart

@@ -2,20 +2,20 @@ import 'package:flame/components.dart';
 import 'package:pinball_components/pinball_components.dart';
 import 'package:pinball_flame/pinball_flame.dart';
 
-/// {@template alien_bumper_blinking_behavior}
+/// {@template android_bumper_blinking_behavior}
-/// Makes a [AlienBumper] blink back to [AlienBumperState.active] when
+/// Makes an [AndroidBumper] blink back to [AndroidBumperState.lit] when
-/// [AlienBumperState.inactive].
+/// [AndroidBumperState.dimmed].
 /// {@endtemplate}
-class AlienBumperBlinkingBehavior extends TimerComponent
+class AndroidBumperBlinkingBehavior extends TimerComponent
-    with ParentIsA<AlienBumper> {
+    with ParentIsA<AndroidBumper> {
-  /// {@macro alien_bumper_blinking_behavior}
+  /// {@macro android_bumper_blinking_behavior}
-  AlienBumperBlinkingBehavior() : super(period: 0.05);
+  AndroidBumperBlinkingBehavior() : super(period: 0.05);
 
-  void _onNewState(AlienBumperState state) {
+  void _onNewState(AndroidBumperState state) {
     switch (state) {
-      case AlienBumperState.active:
+      case AndroidBumperState.lit:
         break;
-      case AlienBumperState.inactive:
+      case AndroidBumperState.dimmed:
         timer
           ..reset()
           ..start();

packages/pinball_components/lib/src/components/android_bumper/behaviors/behaviors.dart

@@ -0,0 +1,2 @@
+export 'android_bumper_ball_contact_behavior.dart';
+export 'android_bumper_blinking_behavior.dart';

packages/pinball_components/lib/src/components/android_bumper/cubit/android_bumper_cubit.dart

@@ -0,0 +1,17 @@
+// ignore_for_file: public_member_api_docs
+
+import 'package:bloc/bloc.dart';
+
+part 'android_bumper_state.dart';
+
+class AndroidBumperCubit extends Cubit<AndroidBumperState> {
+  AndroidBumperCubit() : super(AndroidBumperState.dimmed);
+
+  void onBallContacted() {
+    emit(AndroidBumperState.dimmed);
+  }
+
+  void onBlinked() {
+    emit(AndroidBumperState.lit);
+  }
+}

packages/pinball_components/lib/src/components/android_bumper/cubit/android_bumper_state.dart

@@ -0,0 +1,8 @@
+// ignore_for_file: public_member_api_docs
+
+part of 'android_bumper_cubit.dart';
+
+enum AndroidBumperState {
+  lit,
+  dimmed,
+}

packages/pinball_components/lib/src/components/boundaries.dart

@@ -102,28 +102,59 @@ class _OuterBoundary extends BodyComponent with InitialPosition {
         Vector2(3.6, -70.2),
         Vector2(-14.1, -70.2),
       );
-    final topWallFixtureDef = FixtureDef(topWall);
 
     final topLeftCurve = BezierCurveShape(
       controlPoints: [
-        Vector2(-32.3, -57.2),
+        topWall.vertex1,
         Vector2(-31.5, -69.9),
-        Vector2(-14.1, -70.2),
+        Vector2(-32.3, -57.2),
       ],
     );
-    final topLeftCurveFixtureDef = FixtureDef(topLeftCurve);
 
-    final leftWall = EdgeShape()
+    final topLeftWall = EdgeShape()
       ..set(
-        Vector2(-32.3, -57.2),
+        topLeftCurve.vertices.last,
+        Vector2(-33.5, -44),
+      );
+
+    final upperLeftWallCurve = BezierCurveShape(
+      controlPoints: [
+        topLeftWall.vertex1,
+        Vector2(-33.9, -40.7),
+        Vector2(-32.5, -39),
+      ],
+    );
+
+    final middleLeftWallCurve = BezierCurveShape(
+      controlPoints: [
+        upperLeftWallCurve.vertices.last,
+        Vector2(-23.2, -31.4),
+        Vector2(-33.9, -21.8),
+      ],
+    );
+
+    final lowerLeftWallCurve = BezierCurveShape(
+      controlPoints: [
+        middleLeftWallCurve.vertices.last,
+        Vector2(-32.4, -17.6),
+        Vector2(-37.3, -11),
+      ],
+    );
+
+    final bottomLeftWall = EdgeShape()
+      ..set(
+        lowerLeftWallCurve.vertices.last,
         Vector2(-43.9, 41.8),
       );
-    final leftWallFixtureDef = FixtureDef(leftWall);
 
     return [
-      topWallFixtureDef,
+      FixtureDef(topWall),
-      topLeftCurveFixtureDef,
+      FixtureDef(topLeftCurve),
-      leftWallFixtureDef,
+      FixtureDef(topLeftWall),
+      FixtureDef(upperLeftWallCurve),
+      FixtureDef(middleLeftWallCurve),
+      FixtureDef(lowerLeftWallCurve),
+      FixtureDef(bottomLeftWall),
     ];
   }
 

packages/pinball_components/lib/src/components/bumping_behavior.dart

@@ -0,0 +1,25 @@
+import 'package:flame_forge2d/flame_forge2d.dart';
+import 'package:pinball_flame/pinball_flame.dart';
+
+/// {@template bumping_behavior}
+/// Makes any [BodyComponent] that contacts with [parent] bounce off.
+/// {@endtemplate}
+class BumpingBehavior extends ContactBehavior {
+  /// {@macro bumping_behavior}
+  BumpingBehavior({required double strength}) : _strength = strength;
+
+  /// Determines how strong the bump is.
+  final double _strength;
+
+  @override
+  void postSolve(Object other, Contact contact, ContactImpulse impulse) {
+    super.postSolve(other, contact, impulse);
+    if (other is! BodyComponent) return;
+
+    other.body.applyLinearImpulse(
+      contact.manifold.localPoint
+        ..normalize()
+        ..multiply(Vector2.all(other.body.mass * _strength)),
+    );
+  }
+}

packages/pinball_components/lib/src/components/components.dart

@@ -1,4 +1,4 @@
-export 'alien_bumper/alien_bumper.dart';
+export 'android_bumper/android_bumper.dart';
 export 'backboard/backboard.dart';
 export 'ball.dart';
 export 'baseboard.dart';

packages/pinball_components/lib/src/components/render_priority.dart

@@ -83,7 +83,7 @@ abstract class RenderPriority {
 
   static const int turboChargeFlame = _above + ballOnBoard;
 
-  // Android Spaceship
+  // Android Acres
 
   static const int spaceshipRail = _above + bottomGroup;
 
@@ -106,7 +106,7 @@ abstract class RenderPriority {
 
   static const int spaceshipRampBoardOpening = _below + ballOnBoard;
 
-  static const int alienBumper = _above + ballOnBoard;
+  static const int androidBumper = _above + ballOnBoard;
 
   // Score Text
 

packages/pinball_components/pubspec.yaml

@@ -64,8 +64,8 @@ flutter:
     - assets/images/kicker/
     - assets/images/plunger/
     - assets/images/slingshot/
-    - assets/images/alien_bumper/a/
+    - assets/images/android_bumper/a/
-    - assets/images/alien_bumper/b/
+    - assets/images/android_bumper/b/
     - assets/images/sparky/
     - assets/images/sparky/computer/
     - assets/images/sparky/bumper/a/

packages/pinball_components/sandbox/lib/main.dart

@@ -23,7 +23,7 @@ void main() {
   addPlungerStories(dashbook);
   addSlingshotStories(dashbook);
   addSparkyBumperStories(dashbook);
-  addAlienZoneStories(dashbook);
+  addAndroidAcresStories(dashbook);
   addBoundariesStories(dashbook);
   addGoogleWordStories(dashbook);
   addLaunchRampStories(dashbook);

packages/pinball_components/sandbox/lib/stories/alien_zone/stories.dart

@@ -1,36 +0,0 @@
-import 'package:dashbook/dashbook.dart';
-import 'package:sandbox/common/common.dart';
-import 'package:sandbox/stories/alien_zone/alien_bumper_a_game.dart';
-import 'package:sandbox/stories/alien_zone/alien_bumper_b_game.dart';
-import 'package:sandbox/stories/alien_zone/spaceship_game.dart';
-import 'package:sandbox/stories/alien_zone/spaceship_rail_game.dart';
-import 'package:sandbox/stories/alien_zone/spaceship_ramp_game.dart';
-
-void addAlienZoneStories(Dashbook dashbook) {
-  dashbook.storiesOf('Alien Zone')
-    ..addGame(
-      title: 'Alien Bumper A',
-      description: AlienBumperAGame.description,
-      gameBuilder: (_) => AlienBumperAGame(),
-    )
-    ..addGame(
-      title: 'Alien Bumper B',
-      description: AlienBumperBGame.description,
-      gameBuilder: (_) => AlienBumperBGame(),
-    )
-    ..addGame(
-      title: 'Spaceship',
-      description: SpaceshipGame.description,
-      gameBuilder: (_) => SpaceshipGame(),
-    )
-    ..addGame(
-      title: 'Spaceship Rail',
-      description: SpaceshipRailGame.description,
-      gameBuilder: (_) => SpaceshipRailGame(),
-    )
-    ..addGame(
-      title: 'Spaceship Ramp',
-      description: SpaceshipRampGame.description,
-      gameBuilder: (_) => SpaceshipRampGame(),
-    );
-}

packages/pinball_components/sandbox/lib/stories/android_acres/android_bumper_a_game.dart

@@ -4,18 +4,18 @@ import 'package:flame/extensions.dart';
 import 'package:pinball_components/pinball_components.dart';
 import 'package:sandbox/stories/ball/basic_ball_game.dart';
 
-class AlienBumperAGame extends BallGame {
+class AndroidBumperAGame extends BallGame {
-  AlienBumperAGame()
+  AndroidBumperAGame()
       : super(
           color: const Color(0xFF0000FF),
           imagesFileNames: [
-            Assets.images.alienBumper.a.active.keyName,
+            Assets.images.androidBumper.a.lit.keyName,
-            Assets.images.alienBumper.a.inactive.keyName,
+            Assets.images.androidBumper.a.dimmed.keyName,
           ],
         );
 
   static const description = '''
-    Shows how a AlienBumperA is rendered.
+    Shows how a AndroidBumperA is rendered.
 
     - Activate the "trace" parameter to overlay the body.
 ''';
@@ -26,7 +26,7 @@ class AlienBumperAGame extends BallGame {
 
     camera.followVector2(Vector2.zero());
     await add(
-      AlienBumper.a()..priority = 1,
+      AndroidBumper.a()..priority = 1,
     );
 
     await traceAllBodies();

packages/pinball_components/sandbox/lib/stories/android_acres/android_bumper_b_game.dart

@@ -4,18 +4,18 @@ import 'package:flame/extensions.dart';
 import 'package:pinball_components/pinball_components.dart';
 import 'package:sandbox/stories/ball/basic_ball_game.dart';
 
-class AlienBumperBGame extends BallGame {
+class AndroidBumperBGame extends BallGame {
-  AlienBumperBGame()
+  AndroidBumperBGame()
       : super(
           color: const Color(0xFF0000FF),
           imagesFileNames: [
-            Assets.images.alienBumper.b.active.keyName,
+            Assets.images.androidBumper.b.lit.keyName,
-            Assets.images.alienBumper.b.inactive.keyName,
+            Assets.images.androidBumper.b.dimmed.keyName,
           ],
         );
 
   static const description = '''
-    Shows how a AlienBumperB is rendered.
+    Shows how a AndroidBumperB is rendered.
 
     - Activate the "trace" parameter to overlay the body.
 ''';
@@ -26,7 +26,7 @@ class AlienBumperBGame extends BallGame {
 
     camera.followVector2(Vector2.zero());
     await add(
-      AlienBumper.b()..priority = 1,
+      AndroidBumper.b()..priority = 1,
     );
 
     await traceAllBodies();

packages/pinball_components/sandbox/lib/stories/android_acres/stories.dart

@@ -0,0 +1,36 @@
+import 'package:dashbook/dashbook.dart';
+import 'package:sandbox/common/common.dart';
+import 'package:sandbox/stories/android_acres/android_bumper_a_game.dart';
+import 'package:sandbox/stories/android_acres/android_bumper_b_game.dart';
+import 'package:sandbox/stories/android_acres/spaceship_game.dart';
+import 'package:sandbox/stories/android_acres/spaceship_rail_game.dart';
+import 'package:sandbox/stories/android_acres/spaceship_ramp_game.dart';
+
+void addAndroidAcresStories(Dashbook dashbook) {
+  dashbook.storiesOf('Android Acres')
+    ..addGame(
+      title: 'Android Bumper A',
+      description: AndroidBumperAGame.description,
+      gameBuilder: (_) => AndroidBumperAGame(),
+    )
+    ..addGame(
+      title: 'Android Bumper B',
+      description: AndroidBumperBGame.description,
+      gameBuilder: (_) => AndroidBumperBGame(),
+    )
+    ..addGame(
+      title: 'Spaceship',
+      description: SpaceshipGame.description,
+      gameBuilder: (_) => SpaceshipGame(),
+    )
+    ..addGame(
+      title: 'Spaceship Rail',
+      description: SpaceshipRailGame.description,
+      gameBuilder: (_) => SpaceshipRailGame(),
+    )
+    ..addGame(
+      title: 'Spaceship Ramp',
+      description: SpaceshipRampGame.description,
+      gameBuilder: (_) => SpaceshipRampGame(),
+    );
+}

packages/pinball_components/sandbox/lib/stories/stories.dart

@@ -1,4 +1,4 @@
-export 'alien_zone/stories.dart';
+export 'android_acres/stories.dart';
 export 'backboard/stories.dart';
 export 'ball/stories.dart';
 export 'baseboard/stories.dart';

packages/pinball_components/test/helpers/mocks.dart

@@ -17,7 +17,7 @@ class MockContact extends Mock implements Contact {}
 
 class MockComponent extends Mock implements Component {}
 
-class MockAlienBumperCubit extends Mock implements AlienBumperCubit {}
+class MockAndroidBumperCubit extends Mock implements AndroidBumperCubit {}
 
 class MockGoogleLetterCubit extends Mock implements GoogleLetterCubit {}
 

packages/pinball_components/test/src/components/alien_bumper/cubit/alien_bumper_cubit_test.dart

@@ -1,24 +0,0 @@
-import 'package:bloc_test/bloc_test.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:pinball_components/pinball_components.dart';
-
-void main() {
-  group(
-    'AlienBumperCubit',
-    () {
-      blocTest<AlienBumperCubit, AlienBumperState>(
-        'onBallContacted emits inactive',
-        build: AlienBumperCubit.new,
-        act: (bloc) => bloc.onBallContacted(),
-        expect: () => [AlienBumperState.inactive],
-      );
-
-      blocTest<AlienBumperCubit, AlienBumperState>(
-        'onBlinked emits active',
-        build: AlienBumperCubit.new,
-        act: (bloc) => bloc.onBlinked(),
-        expect: () => [AlienBumperState.active],
-      );
-    },
-  );
-}

packages/pinball_components/test/src/components/android_bumper/android_bumper_test.dart

@@ -6,48 +6,48 @@ import 'package:flame_test/flame_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:pinball_components/pinball_components.dart';
-import 'package:pinball_components/src/components/alien_bumper/behaviors/behaviors.dart';
+import 'package:pinball_components/src/components/android_bumper/behaviors/behaviors.dart';
 
 import '../../../helpers/helpers.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
   final assets = [
-    Assets.images.alienBumper.a.active.keyName,
+    Assets.images.androidBumper.a.lit.keyName,
-    Assets.images.alienBumper.a.inactive.keyName,
+    Assets.images.androidBumper.a.dimmed.keyName,
-    Assets.images.alienBumper.b.active.keyName,
+    Assets.images.androidBumper.b.lit.keyName,
-    Assets.images.alienBumper.b.inactive.keyName,
+    Assets.images.androidBumper.b.dimmed.keyName,
   ];
   final flameTester = FlameTester(() => TestGame(assets));
 
-  group('AlienBumper', () {
+  group('AndroidBumper', () {
     flameTester.test('"a" loads correctly', (game) async {
-      final alienBumper = AlienBumper.a();
+      final androidBumper = AndroidBumper.a();
-      await game.ensureAdd(alienBumper);
+      await game.ensureAdd(androidBumper);
-      expect(game.contains(alienBumper), isTrue);
+      expect(game.contains(androidBumper), isTrue);
     });
 
     flameTester.test('"b" loads correctly', (game) async {
-      final alienBumper = AlienBumper.b();
+      final androidBumper = AndroidBumper.b();
-      await game.ensureAdd(alienBumper);
+      await game.ensureAdd(androidBumper);
-      expect(game.contains(alienBumper), isTrue);
+      expect(game.contains(androidBumper), isTrue);
     });
 
     // TODO(alestiago): Consider refactoring once the following is merged:
     // https://github.com/flame-engine/flame/pull/1538
     // ignore: public_member_api_docs
     flameTester.test('closes bloc when removed', (game) async {
-      final bloc = MockAlienBumperCubit();
+      final bloc = MockAndroidBumperCubit();
       whenListen(
         bloc,
-        const Stream<AlienBumperState>.empty(),
+        const Stream<AndroidBumperState>.empty(),
-        initialState: AlienBumperState.active,
+        initialState: AndroidBumperState.lit,
       );
       when(bloc.close).thenAnswer((_) async {});
-      final alienBumper = AlienBumper.test(bloc: bloc);
+      final androidBumper = AndroidBumper.test(bloc: bloc);
 
-      await game.ensureAdd(alienBumper);
+      await game.ensureAdd(androidBumper);
-      game.remove(alienBumper);
+      game.remove(androidBumper);
       await game.ready();
 
       verify(bloc.close).called(1);
@@ -56,19 +56,19 @@ void main() {
     group('adds', () {
       flameTester.test('new children', (game) async {
         final component = Component();
-        final alienBumper = AlienBumper.a(
+        final androidBumper = AndroidBumper.a(
           children: [component],
         );
-        await game.ensureAdd(alienBumper);
+        await game.ensureAdd(androidBumper);
-        expect(alienBumper.children, contains(component));
+        expect(androidBumper.children, contains(component));
       });
 
-      flameTester.test('an AlienBumperBallContactBehavior', (game) async {
+      flameTester.test('an AndroidBumperBallContactBehavior', (game) async {
-        final alienBumper = AlienBumper.a();
+        final androidBumper = AndroidBumper.a();
-        await game.ensureAdd(alienBumper);
+        await game.ensureAdd(androidBumper);
         expect(
-          alienBumper.children
+          androidBumper.children
-              .whereType<AlienBumperBallContactBehavior>()
+              .whereType<AndroidBumperBallContactBehavior>()
               .single,
           isNotNull,
         );

packages/pinball_components/test/src/components/android_bumper/behaviors/android_bumper_ball_contact_behavior_test.dart

@@ -5,7 +5,7 @@ import 'package:flame_test/flame_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:pinball_components/pinball_components.dart';
-import 'package:pinball_components/src/components/alien_bumper/behaviors/behaviors.dart';
+import 'package:pinball_components/src/components/android_bumper/behaviors/behaviors.dart';
 
 import '../../../../helpers/helpers.dart';
 
@@ -14,33 +14,33 @@ void main() {
   final flameTester = FlameTester(TestGame.new);
 
   group(
-    'AlienBumperBallContactBehavior',
+    'AndroidBumperBallContactBehavior',
     () {
       test('can be instantiated', () {
         expect(
-          AlienBumperBallContactBehavior(),
+          AndroidBumperBallContactBehavior(),
-          isA<AlienBumperBallContactBehavior>(),
+          isA<AndroidBumperBallContactBehavior>(),
         );
       });
 
       flameTester.test(
         'beginContact emits onBallContacted when contacts with a ball',
         (game) async {
-          final behavior = AlienBumperBallContactBehavior();
+          final behavior = AndroidBumperBallContactBehavior();
-          final bloc = MockAlienBumperCubit();
+          final bloc = MockAndroidBumperCubit();
           whenListen(
             bloc,
-            const Stream<AlienBumperState>.empty(),
+            const Stream<AndroidBumperState>.empty(),
-            initialState: AlienBumperState.active,
+            initialState: AndroidBumperState.lit,
           );
 
-          final alienBumper = AlienBumper.test(bloc: bloc);
+          final androidBumper = AndroidBumper.test(bloc: bloc);
-          await alienBumper.add(behavior);
+          await androidBumper.add(behavior);
-          await game.ensureAdd(alienBumper);
+          await game.ensureAdd(androidBumper);
 
           behavior.beginContact(MockBall(), MockContact());
 
-          verify(alienBumper.bloc.onBallContacted).called(1);
+          verify(androidBumper.bloc.onBallContacted).called(1);
         },
       );
     },

packages/pinball_components/test/src/components/android_bumper/behaviors/android_bumper_blinking_behavior_test.dart

@@ -5,7 +5,7 @@ import 'package:flame_test/flame_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:pinball_components/pinball_components.dart';
-import 'package:pinball_components/src/components/alien_bumper/behaviors/behaviors.dart';
+import 'package:pinball_components/src/components/android_bumper/behaviors/behaviors.dart';
 
 import '../../../../helpers/helpers.dart';
 
@@ -14,25 +14,25 @@ void main() {
   final flameTester = FlameTester(TestGame.new);
 
   group(
-    'AlienBumperBlinkingBehavior',
+    'AndroidBumperBlinkingBehavior',
     () {
       flameTester.testGameWidget(
-        'calls onBlinked after 0.05 seconds when inactive',
+        'calls onBlinked after 0.05 seconds when dimmed',
         setUp: (game, tester) async {
-          final behavior = AlienBumperBlinkingBehavior();
+          final behavior = AndroidBumperBlinkingBehavior();
-          final bloc = MockAlienBumperCubit();
+          final bloc = MockAndroidBumperCubit();
-          final streamController = StreamController<AlienBumperState>();
+          final streamController = StreamController<AndroidBumperState>();
           whenListen(
             bloc,
             streamController.stream,
-            initialState: AlienBumperState.active,
+            initialState: AndroidBumperState.lit,
           );
 
-          final alienBumper = AlienBumper.test(bloc: bloc);
+          final androidBumper = AndroidBumper.test(bloc: bloc);
-          await alienBumper.add(behavior);
+          await androidBumper.add(behavior);
-          await game.ensureAdd(alienBumper);
+          await game.ensureAdd(androidBumper);
 
-          streamController.add(AlienBumperState.inactive);
+          streamController.add(AndroidBumperState.dimmed);
           await tester.pump();
           game.update(0.05);
 

packages/pinball_components/test/src/components/android_bumper/cubit/android_bumper_cubit_test.dart

@@ -0,0 +1,24 @@
+import 'package:bloc_test/bloc_test.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:pinball_components/pinball_components.dart';
+
+void main() {
+  group(
+    'AndroidBumperCubit',
+    () {
+      blocTest<AndroidBumperCubit, AndroidBumperState>(
+        'onBallContacted emits dimmed',
+        build: AndroidBumperCubit.new,
+        act: (bloc) => bloc.onBallContacted(),
+        expect: () => [AndroidBumperState.dimmed],
+      );
+
+      blocTest<AndroidBumperCubit, AndroidBumperState>(
+        'onBlinked emits lit',
+        build: AndroidBumperCubit.new,
+        act: (bloc) => bloc.onBlinked(),
+        expect: () => [AndroidBumperState.lit],
+      );
+    },
+  );
+}

packages/pinball_components/test/src/components/bumping_behavior_test.dart

@@ -0,0 +1,84 @@
+// ignore_for_file: cascade_invocations
+
+import 'package:flame_forge2d/flame_forge2d.dart';
+import 'package:flame_test/flame_test.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mocktail/mocktail.dart';
+import 'package:pinball_components/src/components/bumping_behavior.dart';
+
+import '../../helpers/helpers.dart';
+import 'layer_test.dart';
+
+class MockContactImpulse extends Mock implements ContactImpulse {}
+
+class MockManifold extends Mock implements Manifold {}
+
+class TestHeavyBodyComponent extends BodyComponent {
+  @override
+  Body createBody() {
+    final shape = CircleShape();
+    return world.createBody(
+      BodyDef(
+        type: BodyType.dynamic,
+      ),
+    )..createFixtureFromShape(shape, 20);
+  }
+}
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+  final flameTester = FlameTester(TestGame.new);
+
+  group('BumpingBehavior', () {
+    flameTester.test('can be added', (game) async {
+      final behavior = BumpingBehavior(strength: 0);
+      final component = TestBodyComponent();
+      await component.add(behavior);
+      await game.ensureAdd(component);
+    });
+
+    flameTester.testGameWidget(
+      'the bump is greater when the strengh is greater',
+      setUp: (game, tester) async {
+        final component1 = TestBodyComponent();
+        final behavior1 = BumpingBehavior(strength: 1);
+        await component1.add(behavior1);
+
+        final component2 = TestBodyComponent();
+        final behavior2 = BumpingBehavior(strength: 2);
+        await component2.add(behavior2);
+
+        final dummy1 = TestHeavyBodyComponent();
+        final dummy2 = TestHeavyBodyComponent();
+
+        await game.ensureAddAll([
+          component1,
+          component2,
+          dummy1,
+          dummy2,
+        ]);
+
+        expect(dummy1.body.inverseMass, greaterThan(0));
+        expect(dummy2.body.inverseMass, greaterThan(0));
+
+        final contact = MockContact();
+        final manifold = MockManifold();
+        final contactImpulse = MockContactImpulse();
+        when(() => manifold.localPoint).thenReturn(Vector2.all(1));
+        when(() => contact.manifold).thenReturn(manifold);
+
+        behavior1.postSolve(dummy1, contact, contactImpulse);
+        behavior2.postSolve(dummy2, contact, contactImpulse);
+
+        expect(
+          dummy2.body.linearVelocity.x,
+          greaterThan(dummy1.body.linearVelocity.x),
+        );
+        expect(
+          dummy2.body.linearVelocity.y,
+          greaterThan(dummy1.body.linearVelocity.y),
+        );
+      },
+    );
+  });
+}

pubspec.lock

@@ -7,14 +7,14 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "39.0.0"
+    version: "31.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.0"
+    version: "2.8.0"
   args:
     dependency: transitive
     description:
@@ -71,6 +71,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.1"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.5"
   clock:
     dependency: transitive
     description:
@@ -316,7 +323,7 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.4"
+    version: "0.6.3"
   json_annotation:
     dependency: transitive
     description:
@@ -351,7 +358,7 @@ packages:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -414,7 +421,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.0"
   path_provider:
     dependency: transitive
     description:
@@ -587,7 +594,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
@@ -629,21 +636,21 @@ packages:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.21.1"
+    version: "1.19.5"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.8"
   test_core:
     dependency: transitive
     description:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.13"
+    version: "0.4.9"
   typed_data:
     dependency: transitive
     description:
@@ -664,7 +671,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   very_good_analysis:
     dependency: "direct dev"
     description:

test/game/bloc/game_bloc_test.dart

@@ -4,27 +4,69 @@ import 'package:pinball/game/game.dart';
 
 void main() {
   group('GameBloc', () {
-    test('initial state has 3 balls and empty score', () {
+    test('initial state has 3 rounds and empty score', () {
       final gameBloc = GameBloc();
       expect(gameBloc.state.score, equals(0));
-      expect(gameBloc.state.balls, equals(3));
+      expect(gameBloc.state.rounds, equals(3));
     });
 
-    group('LostBall', () {
+    group('RoundLost', () {
       blocTest<GameBloc, GameState>(
-        'decreases number of balls',
+        'decreases number of rounds '
+        'when there are already available rounds',
         build: GameBloc.new,
         act: (bloc) {
-          bloc.add(const BallLost());
+          bloc.add(const RoundLost());
         },
         expect: () => [
           const GameState(
             score: 0,
-            balls: 2,
+            multiplier: 1,
+            rounds: 2,
             bonusHistory: [],
           ),
         ],
       );
+
+      blocTest<GameBloc, GameState>(
+        'apply multiplier to score '
+        'when round is lost',
+        build: GameBloc.new,
+        seed: () => const GameState(
+          score: 5,
+          multiplier: 3,
+          rounds: 2,
+          bonusHistory: [],
+        ),
+        act: (bloc) {
+          bloc.add(const RoundLost());
+        },
+        expect: () => [
+          isA<GameState>()
+            ..having((state) => state.score, 'score', 15)
+            ..having((state) => state.rounds, 'rounds', 1),
+        ],
+      );
+
+      blocTest<GameBloc, GameState>(
+        'resets multiplier '
+        'when round is lost',
+        build: GameBloc.new,
+        seed: () => const GameState(
+          score: 5,
+          multiplier: 3,
+          rounds: 2,
+          bonusHistory: [],
+        ),
+        act: (bloc) {
+          bloc.add(const RoundLost());
+        },
+        expect: () => [
+          isA<GameState>()
+            ..having((state) => state.multiplier, 'multiplier', 1)
+            ..having((state) => state.rounds, 'rounds', 1),
+        ],
+      );
     });
 
     group('Scored', () {
@@ -36,16 +78,12 @@ void main() {
           ..add(const Scored(points: 2))
           ..add(const Scored(points: 3)),
         expect: () => [
-          const GameState(
+          isA<GameState>()
-            score: 2,
+            ..having((state) => state.score, 'score', 2)
-            balls: 3,
+            ..having((state) => state.isGameOver, 'isGameOver', false),
-            bonusHistory: [],
+          isA<GameState>()
-          ),
+            ..having((state) => state.score, 'score', 5)
-          const GameState(
+            ..having((state) => state.isGameOver, 'isGameOver', false),
-            score: 5,
-            balls: 3,
-            bonusHistory: [],
-          ),
         ],
       );
 
@@ -54,27 +92,85 @@ void main() {
         'when game is over',
         build: GameBloc.new,
         act: (bloc) {
-          for (var i = 0; i < bloc.state.balls; i++) {
+          for (var i = 0; i < bloc.state.rounds; i++) {
-            bloc.add(const BallLost());
+            bloc.add(const RoundLost());
           }
           bloc.add(const Scored(points: 2));
         },
         expect: () => [
-          const GameState(
+          isA<GameState>()
-            score: 0,
+            ..having((state) => state.score, 'score', 0)
-            balls: 2,
+            ..having((state) => state.rounds, 'rounds', 2)
-            bonusHistory: [],
+            ..having((state) => state.isGameOver, 'isGameOver', false),
-          ),
+          isA<GameState>()
-          const GameState(
+            ..having((state) => state.score, 'score', 0)
-            score: 0,
+            ..having((state) => state.rounds, 'rounds', 1)
-            balls: 1,
+            ..having((state) => state.isGameOver, 'isGameOver', false),
-            bonusHistory: [],
+          isA<GameState>()
-          ),
+            ..having((state) => state.score, 'score', 0)
-          const GameState(
+            ..having((state) => state.rounds, 'rounds', 0)
+            ..having((state) => state.isGameOver, 'isGameOver', true),
+        ],
+      );
+    });
+
+    group('MultiplierIncreased', () {
+      blocTest<GameBloc, GameState>(
+        'increases multiplier '
+        'when multiplier is below 6 and game is not over',
+        build: GameBloc.new,
+        act: (bloc) => bloc
+          ..add(const MultiplierIncreased())
+          ..add(const MultiplierIncreased()),
+        expect: () => [
+          isA<GameState>()
+            ..having((state) => state.score, 'score', 0)
+            ..having((state) => state.multiplier, 'multiplier', 2)
+            ..having((state) => state.isGameOver, 'isGameOver', false),
+          isA<GameState>()
+            ..having((state) => state.score, 'score', 0)
+            ..having((state) => state.multiplier, 'multiplier', 3)
+            ..having((state) => state.isGameOver, 'isGameOver', false),
+        ],
+      );
+
+      blocTest<GameBloc, GameState>(
+        "doesn't increase multiplier "
+        'when multiplier is 6 and game is not over',
+        build: GameBloc.new,
+        seed: () => const GameState(
           score: 0,
-            balls: 0,
+          multiplier: 6,
+          rounds: 3,
           bonusHistory: [],
         ),
+        act: (bloc) => bloc..add(const MultiplierIncreased()),
+        expect: () => const <GameState>[],
+      );
+
+      blocTest<GameBloc, GameState>(
+        "doesn't increase multiplier "
+        'when game is over',
+        build: GameBloc.new,
+        act: (bloc) {
+          for (var i = 0; i < bloc.state.rounds; i++) {
+            bloc.add(const RoundLost());
+          }
+          bloc.add(const MultiplierIncreased());
+        },
+        expect: () => [
+          isA<GameState>()
+            ..having((state) => state.score, 'score', 0)
+            ..having((state) => state.multiplier, 'multiplier', 1)
+            ..having((state) => state.isGameOver, 'isGameOver', false),
+          isA<GameState>()
+            ..having((state) => state.score, 'score', 0)
+            ..having((state) => state.multiplier, 'multiplier', 1)
+            ..having((state) => state.isGameOver, 'isGameOver', false),
+          isA<GameState>()
+            ..having((state) => state.score, 'score', 0)
+            ..having((state) => state.multiplier, 'multiplier', 1)
+            ..having((state) => state.isGameOver, 'isGameOver', true),
         ],
       );
     });
@@ -88,16 +184,18 @@ void main() {
           act: (bloc) => bloc
             ..add(const BonusActivated(GameBonus.googleWord))
             ..add(const BonusActivated(GameBonus.dashNest)),
-          expect: () => const [
+          expect: () => [
-            GameState(
+            isA<GameState>()
-              score: 0,
+              ..having(
-              balls: 3,
+                (state) => state.bonusHistory,
-              bonusHistory: [GameBonus.googleWord],
+                'bonusHistory',
+                [GameBonus.googleWord],
               ),
-            GameState(
+            isA<GameState>()
-              score: 0,
+              ..having(
-              balls: 3,
+                (state) => state.bonusHistory,
-              bonusHistory: [GameBonus.googleWord, GameBonus.dashNest],
+                'bonusHistory',
+                [GameBonus.googleWord, GameBonus.dashNest],
               ),
           ],
         );
@@ -109,11 +207,12 @@ void main() {
         'adds game bonus',
         build: GameBloc.new,
         act: (bloc) => bloc..add(const SparkyTurboChargeActivated()),
-        expect: () => const [
+        expect: () => [
-          GameState(
+          isA<GameState>()
-            score: 0,
+            ..having(
-            balls: 3,
+              (state) => state.bonusHistory,
-            bonusHistory: [GameBonus.sparkyTurboCharge],
+              'bonusHistory',
+              [GameBonus.sparkyTurboCharge],
             ),
         ],
       );

test/game/bloc/game_event_test.dart

@@ -5,15 +5,15 @@ import 'package:pinball/game/game.dart';
 
 void main() {
   group('GameEvent', () {
-    group('BallLost', () {
+    group('RoundLost', () {
       test('can be instantiated', () {
-        expect(const BallLost(), isNotNull);
+        expect(const RoundLost(), isNotNull);
       });
 
       test('supports value equality', () {
         expect(
-          BallLost(),
+          RoundLost(),
-          equals(const BallLost()),
+          equals(const RoundLost()),
         );
       });
     });
@@ -41,6 +41,19 @@ void main() {
       });
     });
 
+    group('MultiplierIncreased', () {
+      test('can be instantiated', () {
+        expect(const MultiplierIncreased(), isNotNull);
+      });
+
+      test('supports value equality', () {
+        expect(
+          MultiplierIncreased(),
+          equals(const MultiplierIncreased()),
+        );
+      });
+    });
+
     group('BonusActivated', () {
       test('can be instantiated', () {
         expect(const BonusActivated(GameBonus.dashNest), isNotNull);

test/game/bloc/game_state_test.dart

@@ -9,13 +9,15 @@ void main() {
       expect(
         GameState(
           score: 0,
-          balls: 0,
+          multiplier: 1,
+          rounds: 3,
           bonusHistory: const [],
         ),
         equals(
           const GameState(
             score: 0,
-            balls: 0,
+            multiplier: 1,
+            rounds: 3,
             bonusHistory: [],
           ),
         ),
@@ -27,7 +29,8 @@ void main() {
         expect(
           const GameState(
             score: 0,
-            balls: 0,
+            multiplier: 1,
+            rounds: 3,
             bonusHistory: [],
           ),
           isNotNull,
@@ -37,12 +40,13 @@ void main() {
 
     test(
       'throws AssertionError '
-      'when balls are negative',
+      'when score is negative',
       () {
         expect(
           () => GameState(
-            balls: -1,
+            score: -1,
-            score: 0,
+            multiplier: 1,
+            rounds: 3,
             bonusHistory: const [],
           ),
           throwsAssertionError,
@@ -52,12 +56,29 @@ void main() {
 
     test(
       'throws AssertionError '
-      'when score is negative',
+      'when multiplier is less than 1',
       () {
         expect(
           () => GameState(
-            balls: 0,
+            score: 1,
-            score: -1,
+            multiplier: 0,
+            rounds: 3,
+            bonusHistory: const [],
+          ),
+          throwsAssertionError,
+        );
+      },
+    );
+
+    test(
+      'throws AssertionError '
+      'when rounds is negative',
+      () {
+        expect(
+          () => GameState(
+            score: 1,
+            multiplier: 1,
+            rounds: -1,
             bonusHistory: const [],
           ),
           throwsAssertionError,
@@ -68,10 +89,11 @@ void main() {
     group('isGameOver', () {
       test(
           'is true '
-          'when no balls are left', () {
+          'when no rounds are left', () {
         const gameState = GameState(
-          balls: 0,
           score: 0,
+          multiplier: 1,
+          rounds: 0,
           bonusHistory: [],
         );
         expect(gameState.isGameOver, isTrue);
@@ -79,10 +101,11 @@ void main() {
 
       test(
           'is false '
-          'when one 1 ball left', () {
+          'when one 1 round left', () {
         const gameState = GameState(
-          balls: 1,
           score: 0,
+          multiplier: 1,
+          rounds: 1,
           bonusHistory: [],
         );
         expect(gameState.isGameOver, isFalse);
@@ -95,8 +118,9 @@ void main() {
         'when scored is decreased',
         () {
           const gameState = GameState(
-            balls: 0,
             score: 2,
+            multiplier: 1,
+            rounds: 3,
             bonusHistory: [],
           );
           expect(
@@ -111,8 +135,9 @@ void main() {
         'when no argument specified',
         () {
           const gameState = GameState(
-            balls: 0,
             score: 2,
+            multiplier: 1,
+            rounds: 3,
             bonusHistory: [],
           );
           expect(
@@ -128,12 +153,14 @@ void main() {
         () {
           const gameState = GameState(
             score: 2,
-            balls: 0,
+            multiplier: 1,
+            rounds: 3,
             bonusHistory: [],
           );
           final otherGameState = GameState(
             score: gameState.score + 1,
-            balls: gameState.balls + 1,
+            multiplier: gameState.multiplier + 1,
+            rounds: gameState.rounds + 1,
             bonusHistory: const [GameBonus.googleWord],
           );
           expect(gameState, isNot(equals(otherGameState)));
@@ -141,7 +168,8 @@ void main() {
           expect(
             gameState.copyWith(
               score: otherGameState.score,
-              balls: otherGameState.balls,
+              multiplier: otherGameState.multiplier,
+              rounds: otherGameState.rounds,
               bonusHistory: otherGameState.bonusHistory,
             ),
             equals(otherGameState),

test/game/components/alien_zone_test.dart

@@ -1,48 +0,0 @@
-// ignore_for_file: cascade_invocations
-
-import 'package:flame_test/flame_test.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:pinball/game/game.dart';
-import 'package:pinball_components/pinball_components.dart';
-import 'package:pinball_flame/pinball_flame.dart';
-
-import '../../helpers/helpers.dart';
-
-void main() {
-  TestWidgetsFlutterBinding.ensureInitialized();
-  final assets = [
-    Assets.images.alienBumper.a.active.keyName,
-    Assets.images.alienBumper.a.inactive.keyName,
-    Assets.images.alienBumper.b.active.keyName,
-    Assets.images.alienBumper.b.inactive.keyName,
-  ];
-  final flameTester = FlameTester(
-    () => EmptyPinballTestGame(assets: assets),
-  );
-
-  group('AlienZone', () {
-    flameTester.test(
-      'loads correctly',
-      (game) async {
-        await game.addFromBlueprint(AlienZone());
-        await game.ready();
-      },
-    );
-
-    group('loads', () {
-      flameTester.test(
-        'two AlienBumper',
-        (game) async {
-          final alienZone = AlienZone();
-          await game.addFromBlueprint(alienZone);
-          await game.ready();
-
-          expect(
-            game.descendants().whereType<AlienBumper>().length,
-            equals(2),
-          );
-        },
-      );
-    });
-  });
-}

test/game/components/android_acres_test.dart

@@ -0,0 +1,88 @@
+// ignore_for_file: cascade_invocations
+
+import 'package:flame_test/flame_test.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:pinball/game/game.dart';
+import 'package:pinball_components/pinball_components.dart';
+import 'package:pinball_flame/pinball_flame.dart';
+
+import '../../helpers/helpers.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+  final assets = [
+    Assets.images.spaceship.ramp.boardOpening.keyName,
+    Assets.images.spaceship.ramp.railingForeground.keyName,
+    Assets.images.spaceship.ramp.railingBackground.keyName,
+    Assets.images.spaceship.ramp.main.keyName,
+    Assets.images.spaceship.ramp.arrow.inactive.keyName,
+    Assets.images.spaceship.ramp.arrow.active1.keyName,
+    Assets.images.spaceship.ramp.arrow.active2.keyName,
+    Assets.images.spaceship.ramp.arrow.active3.keyName,
+    Assets.images.spaceship.ramp.arrow.active4.keyName,
+    Assets.images.spaceship.ramp.arrow.active5.keyName,
+    Assets.images.androidBumper.a.lit.keyName,
+    Assets.images.androidBumper.a.dimmed.keyName,
+    Assets.images.androidBumper.b.lit.keyName,
+    Assets.images.androidBumper.b.dimmed.keyName,
+  ];
+  final flameTester = FlameTester(
+    () => EmptyPinballTestGame(assets: assets),
+  );
+
+  group('AndroidAcres', () {
+    flameTester.test(
+      'loads correctly',
+      (game) async {
+        await game.addFromBlueprint(AndroidAcres());
+        await game.ready();
+      },
+    );
+
+    group('loads', () {
+      flameTester.test(
+        'a Spaceship',
+        (game) async {
+          expect(
+            AndroidAcres().blueprints.whereType<Spaceship>().single,
+            isNotNull,
+          );
+        },
+      );
+
+      flameTester.test(
+        'a SpaceshipRamp',
+        (game) async {
+          expect(
+            AndroidAcres().blueprints.whereType<SpaceshipRamp>().single,
+            isNotNull,
+          );
+        },
+      );
+
+      flameTester.test(
+        'a SpaceshipRail',
+        (game) async {
+          expect(
+            AndroidAcres().blueprints.whereType<SpaceshipRail>().single,
+            isNotNull,
+          );
+        },
+      );
+
+      flameTester.test(
+        'two AndroidBumper',
+        (game) async {
+          final androidZone = AndroidAcres();
+          await game.addFromBlueprint(androidZone);
+          await game.ready();
+
+          expect(
+            game.descendants().whereType<AndroidBumper>().length,
+            equals(2),
+          );
+        },
+      );
+    });
+  });
+}

test/game/components/controlled_ball_test.dart

@@ -53,16 +53,39 @@ void main() {
     });
 
     flameBlocTester.testGameWidget(
-      'lost adds BallLost to GameBloc',
+      "lost doesn't adds RoundLost to GameBloc "
+      'when there are balls left',
+      setUp: (game, tester) async {
+        final controller = BallController(ball);
+        await ball.add(controller);
+        await game.ensureAdd(ball);
+
+        final otherBall = Ball(baseColor: const Color(0xFF00FFFF));
+        final otherController = BallController(otherBall);
+        await otherBall.add(otherController);
+        await game.ensureAdd(otherBall);
+
+        controller.lost();
+        await game.ready();
+      },
+      verify: (game, tester) async {
+        verifyNever(() => gameBloc.add(const RoundLost()));
+      },
+    );
+
+    flameBlocTester.testGameWidget(
+      'lost adds RoundLost to GameBloc '
+      'when there are no balls left',
       setUp: (game, tester) async {
         final controller = BallController(ball);
         await ball.add(controller);
         await game.ensureAdd(ball);
 
         controller.lost();
+        await game.ready();
       },
       verify: (game, tester) async {
-        verify(() => gameBloc.add(const BallLost())).called(1);
+        verify(() => gameBloc.add(const RoundLost())).called(1);
       },
     );
 

test/game/components/controlled_flipper_test.dart

@@ -25,7 +25,8 @@ void main() {
       final bloc = MockGameBloc();
       const state = GameState(
         score: 0,
-        balls: 0,
+        multiplier: 1,
+        rounds: 0,
         bonusHistory: [],
       );
       whenListen(bloc, Stream.value(state), initialState: state);

test/game/components/controlled_plunger_test.dart

@@ -20,7 +20,8 @@ void main() {
       final bloc = MockGameBloc();
       const state = GameState(
         score: 0,
-        balls: 0,
+        multiplier: 1,
+        rounds: 0,
         bonusHistory: [],
       );
       whenListen(bloc, Stream.value(state), initialState: state);

test/game/components/game_flow_controller_test.dart

@@ -15,7 +15,8 @@ void main() {
       test('is true when the game over state has changed', () {
         final state = GameState(
           score: 10,
-          balls: 0,
+          multiplier: 1,
+          rounds: 0,
           bonusHistory: const [],
         );
 
@@ -66,7 +67,8 @@ void main() {
           gameFlowController.onNewState(
             GameState(
               score: 10,
-              balls: 0,
+              multiplier: 1,
+              rounds: 0,
               bonusHistory: const [],
             ),
           );

test/game/components/scoring_behavior_test.dart

@@ -43,7 +43,8 @@ void main() {
           bloc = MockGameBloc();
           const state = GameState(
             score: 0,
-            balls: 0,
+            multiplier: 1,
+            rounds: 3,
             bonusHistory: [],
           );
           whenListen(bloc, Stream.value(state), initialState: state);

test/game/components/wall_test.dart

@@ -146,9 +146,9 @@ void main() {
           },
         );
 
-        flameTester.test(
+        flameBlocTester.testGameWidget(
           'when ball is debug',
-          (game) async {
+          setUp: (game, tester) async {
             final ball = ControlledBall.debug();
             final wall = BottomWall();
             await game.ensureAddAll([ball, wall]);

test/game/pinball_game_test.dart

@@ -13,28 +13,54 @@ import '../helpers/helpers.dart';
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
   final assets = [
-    Assets.images.dash.bumper.main.active.keyName,
+    Assets.images.androidBumper.a.lit.keyName,
-    Assets.images.dash.bumper.main.inactive.keyName,
+    Assets.images.androidBumper.a.dimmed.keyName,
+    Assets.images.androidBumper.b.lit.keyName,
+    Assets.images.androidBumper.b.dimmed.keyName,
+    Assets.images.backboard.backboardScores.keyName,
+    Assets.images.backboard.backboardGameOver.keyName,
+    Assets.images.backboard.display.keyName,
+    Assets.images.ball.ball.keyName,
+    Assets.images.ball.flameEffect.keyName,
+    Assets.images.baseboard.left.keyName,
+    Assets.images.baseboard.right.keyName,
+    Assets.images.boundary.bottom.keyName,
+    Assets.images.boundary.outer.keyName,
+    Assets.images.boundary.outerBottom.keyName,
+    Assets.images.dino.animatronic.mouth.keyName,
+    Assets.images.dino.animatronic.head.keyName,
+    Assets.images.dino.topWall.keyName,
+    Assets.images.dino.bottomWall.keyName,
+    Assets.images.dash.animatronic.keyName,
     Assets.images.dash.bumper.a.active.keyName,
     Assets.images.dash.bumper.a.inactive.keyName,
     Assets.images.dash.bumper.b.active.keyName,
     Assets.images.dash.bumper.b.inactive.keyName,
-    Assets.images.dash.animatronic.keyName,
+    Assets.images.dash.bumper.main.active.keyName,
+    Assets.images.dash.bumper.main.inactive.keyName,
+    Assets.images.flipper.left.keyName,
+    Assets.images.flipper.right.keyName,
+    Assets.images.googleWord.letter1.keyName,
+    Assets.images.googleWord.letter2.keyName,
+    Assets.images.googleWord.letter3.keyName,
+    Assets.images.googleWord.letter4.keyName,
+    Assets.images.googleWord.letter5.keyName,
+    Assets.images.googleWord.letter6.keyName,
+    Assets.images.kicker.left.keyName,
+    Assets.images.kicker.right.keyName,
+    Assets.images.launchRamp.ramp.keyName,
+    Assets.images.launchRamp.foregroundRailing.keyName,
+    Assets.images.launchRamp.backgroundRailing.keyName,
+    Assets.images.plunger.plunger.keyName,
+    Assets.images.plunger.rocket.keyName,
     Assets.images.signpost.inactive.keyName,
     Assets.images.signpost.active1.keyName,
     Assets.images.signpost.active2.keyName,
     Assets.images.signpost.active3.keyName,
-    Assets.images.alienBumper.a.active.keyName,
+    Assets.images.slingshot.upper.keyName,
-    Assets.images.alienBumper.a.inactive.keyName,
+    Assets.images.slingshot.lower.keyName,
-    Assets.images.alienBumper.b.active.keyName,
+    Assets.images.spaceship.saucer.keyName,
-    Assets.images.alienBumper.b.inactive.keyName,
+    Assets.images.spaceship.bridge.keyName,
-    Assets.images.sparky.bumper.a.active.keyName,
-    Assets.images.sparky.bumper.a.inactive.keyName,
-    Assets.images.sparky.bumper.b.active.keyName,
-    Assets.images.sparky.bumper.b.inactive.keyName,
-    Assets.images.sparky.bumper.c.active.keyName,
-    Assets.images.sparky.bumper.c.inactive.keyName,
-    Assets.images.sparky.animatronic.keyName,
     Assets.images.spaceship.ramp.boardOpening.keyName,
     Assets.images.spaceship.ramp.railingForeground.keyName,
     Assets.images.spaceship.ramp.railingBackground.keyName,
@@ -45,20 +71,26 @@ void main() {
     Assets.images.spaceship.ramp.arrow.active3.keyName,
     Assets.images.spaceship.ramp.arrow.active4.keyName,
     Assets.images.spaceship.ramp.arrow.active5.keyName,
-    Assets.images.dino.animatronic.head.keyName,
+    Assets.images.spaceship.rail.main.keyName,
-    Assets.images.dino.animatronic.mouth.keyName,
+    Assets.images.spaceship.rail.foreground.keyName,
-    Assets.images.baseboard.left.keyName,
+    Assets.images.sparky.bumper.a.active.keyName,
-    Assets.images.baseboard.right.keyName,
+    Assets.images.sparky.bumper.a.inactive.keyName,
-    Assets.images.flipper.left.keyName,
+    Assets.images.sparky.bumper.b.active.keyName,
-    Assets.images.flipper.right.keyName,
+    Assets.images.sparky.bumper.b.inactive.keyName,
-    Assets.images.boundary.outer.keyName,
+    Assets.images.sparky.bumper.c.active.keyName,
-    Assets.images.boundary.outerBottom.keyName,
+    Assets.images.sparky.bumper.c.inactive.keyName,
-    Assets.images.boundary.bottom.keyName,
+    Assets.images.sparky.animatronic.keyName,
-    Assets.images.slingshot.upper.keyName,
+    Assets.images.sparky.computer.top.keyName,
-    Assets.images.slingshot.lower.keyName,
+    Assets.images.sparky.computer.base.keyName,
-    Assets.images.dino.topWall.keyName,
+    Assets.images.sparky.animatronic.keyName,
-    Assets.images.dino.bottomWall.keyName,
+    Assets.images.sparky.bumper.a.inactive.keyName,
+    Assets.images.sparky.bumper.a.active.keyName,
+    Assets.images.sparky.bumper.b.active.keyName,
+    Assets.images.sparky.bumper.b.inactive.keyName,
+    Assets.images.sparky.bumper.c.active.keyName,
+    Assets.images.sparky.bumper.c.inactive.keyName,
   ];
+
   final flameTester = FlameTester(
     () => PinballTestGame(assets: assets),
   );
@@ -74,7 +106,6 @@ void main() {
         'has only one BottomWall',
         (game) async {
           await game.ready();
-
           expect(
             game.children.whereType<BottomWall>().length,
             equals(1),
@@ -93,34 +124,34 @@ void main() {
         },
       );
 
-      flameTester.test('has one Board', (game) async {
+      flameTester.test(
+        'has one Board',
+        (game) async {
           await game.ready();
           expect(
             game.children.whereType<Board>().length,
             equals(1),
           );
-      });
+        },
-
+      );
-      group('controller', () {
-        // TODO(alestiago): Write test to be controller agnostic.
-        group('listenWhen', () {
-          late GameBloc gameBloc;
-
-          setUp(() {
-            gameBloc = GameBloc();
-          });
 
-          final flameBlocTester = FlameBlocTester<PinballGame, GameBloc>(
+      flameTester.test(
-            gameBuilder: EmptyPinballTestGame.new,
+        'one GoogleWord',
-            blocBuilder: () => gameBloc,
+        (game) async {
-            // assets: assets,
+          await game.ready();
+          expect(game.children.whereType<GoogleWord>().length, equals(1));
+        },
       );
 
-          flameBlocTester.testGameWidget(
+      group('controller', () {
-            'listens when all balls are lost and there are more than 0 balls',
+        group('listenWhen', () {
+          flameTester.testGameWidget(
+            'listens when all balls are lost and there are more than 0 rounds',
             setUp: (game, tester) async {
+              // TODO(ruimiguel): check why testGameWidget doesn't add any ball
+              // to the game. Test needs to have no balls, so fortunately works.
               final newState = MockGameState();
-              when(() => newState.balls).thenReturn(2);
+              when(() => newState.isGameOver).thenReturn(false);
               game.descendants().whereType<ControlledBall>().forEach(
                     (ball) => ball.controller.lost(),
                   );
@@ -137,10 +168,10 @@ void main() {
             "doesn't listen when some balls are left",
             (game) async {
               final newState = MockGameState();
-              when(() => newState.balls).thenReturn(1);
+              when(() => newState.isGameOver).thenReturn(false);
 
               expect(
-                game.descendants().whereType<Ball>().length,
+                game.descendants().whereType<ControlledBall>().length,
                 greaterThan(0),
               );
               expect(
@@ -150,19 +181,20 @@ void main() {
             },
           );
 
-          flameBlocTester.test(
+          flameTester.testGameWidget(
-            "doesn't listen when no balls left",
+            "doesn't listen when game is over",
-            (game) async {
+            setUp: (game, tester) async {
+              // TODO(ruimiguel): check why testGameWidget doesn't add any ball
+              // to the game. Test needs to have no balls, so fortunately works.
               final newState = MockGameState();
-              when(() => newState.balls).thenReturn(0);
+              when(() => newState.isGameOver).thenReturn(true);
-
               game.descendants().whereType<ControlledBall>().forEach(
                     (ball) => ball.controller.lost(),
                   );
               await game.ready();
 
               expect(
-                game.descendants().whereType<Ball>().isEmpty,
+                game.descendants().whereType<ControlledBall>().isEmpty,
                 isTrue,
               );
               expect(
@@ -179,14 +211,13 @@ void main() {
             flameTester.test(
               'spawns a ball',
               (game) async {
-                await game.ready();
                 final previousBalls =
-                    game.descendants().whereType<Ball>().toList();
+                    game.descendants().whereType<ControlledBall>().toList();
 
                 game.controller.onNewState(MockGameState());
                 await game.ready();
                 final currentBalls =
-                    game.descendants().whereType<Ball>().toList();
+                    game.descendants().whereType<ControlledBall>().toList();
 
                 expect(
                   currentBalls.length,
@@ -201,57 +232,26 @@ void main() {
   });
 
   group('DebugPinballGame', () {
-    debugModeFlameTester.test('adds a ball on tap up', (game) async {
+    debugModeFlameTester.test(
-      await game.ready();
+      'adds a ball on tap up',
-
+      (game) async {
         final eventPosition = MockEventPosition();
         when(() => eventPosition.game).thenReturn(Vector2.all(10));
 
         final tapUpEvent = MockTapUpInfo();
         when(() => tapUpEvent.eventPosition).thenReturn(eventPosition);
 
-      final previousBalls = game.descendants().whereType<Ball>().toList();
+        final previousBalls =
+            game.descendants().whereType<ControlledBall>().toList();
 
         game.onTapUp(tapUpEvent);
         await game.ready();
 
         expect(
-        game.children.whereType<Ball>().length,
+          game.children.whereType<ControlledBall>().length,
           equals(previousBalls.length + 1),
         );
-    });
-
-    group('controller', () {
-      late GameBloc gameBloc;
-
-      setUp(() {
-        gameBloc = GameBloc();
-      });
-
-      final debugModeFlameBlocTester =
-          FlameBlocTester<DebugPinballGame, GameBloc>(
-        gameBuilder: DebugPinballTestGame.new,
-        blocBuilder: () => gameBloc,
-        assets: assets,
-      );
-
-      debugModeFlameBlocTester.testGameWidget(
-        'ignores debug balls',
-        setUp: (game, tester) async {
-          final newState = MockGameState();
-          when(() => newState.balls).thenReturn(1);
-
-          await game.ready();
-          game.children.removeWhere((component) => component is Ball);
-          await game.ready();
-          await game.ensureAdd(ControlledBall.debug());
-
-          expect(
-            game.controller.listenWhen(MockGameState(), newState),
-            isTrue,
-          );
       },
     );
   });
-  });
 }

test/game/view/widgets/game_hud_test.dart

@@ -28,7 +28,8 @@ void main() {
 
     const initialState = GameState(
       score: 1000,
-      balls: 2,
+      multiplier: 1,
+      rounds: 1,
       bonusHistory: [],
     );
 

test/game/view/widgets/round_count_display_test.dart

@@ -11,7 +11,8 @@ void main() {
     late GameBloc gameBloc;
     const initialState = GameState(
       score: 0,
-      balls: 3,
+      multiplier: 1,
+      rounds: 3,
       bonusHistory: [],
     );
 
@@ -37,7 +38,7 @@ void main() {
 
     testWidgets('two active round indicator', (tester) async {
       final state = initialState.copyWith(
-        balls: 2,
+        rounds: 2,
       );
       whenListen(
         gameBloc,
@@ -68,7 +69,7 @@ void main() {
 
     testWidgets('one active round indicator', (tester) async {
       final state = initialState.copyWith(
-        balls: 1,
+        rounds: 1,
       );
       whenListen(
         gameBloc,

test/game/view/widgets/score_view_test.dart

@@ -15,7 +15,8 @@ void main() {
   const score = 123456789;
   const initialState = GameState(
     score: score,
-    balls: 1,
+    multiplier: 1,
+    rounds: 1,
     bonusHistory: [],
   );
 
@@ -46,7 +47,7 @@ void main() {
 
       stateController.add(
         initialState.copyWith(
-          balls: 0,
+          rounds: 0,
         ),
       );
 

test/helpers/mocks.dart

@@ -82,6 +82,6 @@ class MockActiveOverlaysNotifier extends Mock
 
 class MockGameFlowController extends Mock implements GameFlowController {}
 
-class MockAlienBumper extends Mock implements AlienBumper {}
+class MockAndroidBumper extends Mock implements AndroidBumper {}
 
 class MockSparkyBumper extends Mock implements SparkyBumper {}