fix: assets merge conflict

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/game_assets.dart

@@ -77,10 +77,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.chromeDino.mouth.keyName),
       images.load(components.Assets.images.chromeDino.head.keyName),
       images.load(components.Assets.images.sparky.computer.top.keyName),

lib/game/pinball_game.dart

@@ -53,20 +53,10 @@ 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()));
-    unawaited(addFromBlueprint(SpaceshipRamp()));
-    unawaited(
-      addFromBlueprint(
-        Spaceship(
-          position: Vector2(-26.5, -28.5),
-        ),
-      ),
-    );
-    unawaited(addFromBlueprint(SpaceshipRail()));
     await add(
       GoogleWord(
         position: Vector2(

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();
@@ -33,11 +33,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 {
@@ -269,28 +271,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/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),
+        );
+      },
+    );
+  });
+}

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/pinball_game_test.dart

@@ -13,23 +13,22 @@ import '../helpers/helpers.dart';
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
   final assets = [
+    Assets.images.androidBumper.a.lit.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.signpost.inactive.keyName,
-    Assets.images.signpost.active1.keyName,
-    Assets.images.signpost.active2.keyName,
-    Assets.images.signpost.active3.keyName,
-    Assets.images.flipper.left.keyName,
-    Assets.images.flipper.right.keyName,
     Assets.images.baseboard.left.keyName,
     Assets.images.baseboard.right.keyName,
-    Assets.images.kicker.left.keyName,
+    Assets.images.boundary.bottom.keyName,
-    Assets.images.kicker.right.keyName,
+    Assets.images.boundary.outer.keyName,
-    Assets.images.slingshot.upper.keyName,
+    Assets.images.boundary.outerBottom.keyName,
-    Assets.images.slingshot.lower.keyName,
+    Assets.images.chromeDino.mouth.keyName,
-    Assets.images.launchRamp.ramp.keyName,
+    Assets.images.chromeDino.head.keyName,
-    Assets.images.launchRamp.foregroundRailing.keyName,
-    Assets.images.launchRamp.backgroundRailing.keyName,
     Assets.images.dino.dinoLandTop.keyName,
     Assets.images.dino.dinoLandBottom.keyName,
     Assets.images.dash.animatronic.keyName,
@@ -39,11 +38,27 @@ void main() {
     Assets.images.dash.bumper.b.inactive.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.boundary.bottom.keyName,
+    Assets.images.signpost.inactive.keyName,
-    Assets.images.boundary.outer.keyName,
+    Assets.images.signpost.active1.keyName,
-    Assets.images.boundary.outerBottom.keyName,
+    Assets.images.signpost.active2.keyName,
+    Assets.images.signpost.active3.keyName,
+    Assets.images.slingshot.upper.keyName,
+    Assets.images.slingshot.lower.keyName,
     Assets.images.spaceship.saucer.keyName,
     Assets.images.spaceship.bridge.keyName,
     Assets.images.spaceship.ramp.boardOpening.keyName,
@@ -58,12 +73,13 @@ void main() {
     Assets.images.spaceship.ramp.arrow.active5.keyName,
     Assets.images.spaceship.rail.main.keyName,
     Assets.images.spaceship.rail.foreground.keyName,
-    Assets.images.alienBumper.a.active.keyName,
+    Assets.images.sparky.bumper.a.active.keyName,
-    Assets.images.alienBumper.a.inactive.keyName,
+    Assets.images.sparky.bumper.a.inactive.keyName,
-    Assets.images.alienBumper.b.active.keyName,
+    Assets.images.sparky.bumper.b.active.keyName,
-    Assets.images.alienBumper.b.inactive.keyName,
+    Assets.images.sparky.bumper.b.inactive.keyName,
-    Assets.images.chromeDino.mouth.keyName,
+    Assets.images.sparky.bumper.c.active.keyName,
-    Assets.images.chromeDino.head.keyName,
+    Assets.images.sparky.bumper.c.inactive.keyName,
+    Assets.images.sparky.animatronic.keyName,
     Assets.images.sparky.computer.top.keyName,
     Assets.images.sparky.computer.base.keyName,
     Assets.images.sparky.animatronic.keyName,
@@ -73,15 +89,6 @@ void main() {
     Assets.images.sparky.bumper.b.inactive.keyName,
     Assets.images.sparky.bumper.c.active.keyName,
     Assets.images.sparky.bumper.c.inactive.keyName,
-    Assets.images.backboard.backboardScores.keyName,
-    Assets.images.backboard.backboardGameOver.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.backboard.display.keyName,
   ];
 
   final flameTester = FlameTester(

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 {}