From d2c25602dcd8cd9d9d21736e2abf5535ffa1ee16 Mon Sep 17 00:00:00 2001
From: RuiAlonso <rui.alonso@verygood.ventures>
Date: Fri, 8 Apr 2022 16:52:39 +0200
Subject: [PATCH] refactor: moved alien from board to pinball and fixed sprites

---
 lib/game/components/board.dart                       |  2 --
 lib/game/pinball_game.dart                           |  1 +
 .../lib/src/components/alien_bumper.dart             |  4 +---
 test/game/pinball_game_test.dart                     | 12 ++++++++++++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/game/components/board.dart b/lib/game/components/board.dart
index 0be75a6d..a312daee 100644
--- a/lib/game/components/board.dart
+++ b/lib/game/components/board.dart
@@ -15,7 +15,6 @@ class Board extends Component {
     final bottomGroup = _BottomGroup();
 
     final flutterForest = FlutterForest();
-    final alienZone = AlienZone();
 
     // TODO(alestiago): adjust positioning to real design.
     final dino = ChromeDino()
@@ -28,7 +27,6 @@ class Board extends Component {
       bottomGroup,
       dino,
       flutterForest,
-      alienZone,
     ]);
   }
 }
diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart
index 2ccf8fe8..2b87b7da 100644
--- a/lib/game/pinball_game.dart
+++ b/lib/game/pinball_game.dart
@@ -46,6 +46,7 @@ class PinballGame extends Forge2DGame
     await add(plunger);
 
     unawaited(add(Board()));
+    unawaited(add(AlienZone()));
     unawaited(addFromBlueprint(Slingshots()));
     unawaited(addFromBlueprint(DinoWalls()));
     unawaited(_addBonusWord());
diff --git a/packages/pinball_components/lib/src/components/alien_bumper.dart b/packages/pinball_components/lib/src/components/alien_bumper.dart
index 5fe2de40..7fcb1ea1 100644
--- a/packages/pinball_components/lib/src/components/alien_bumper.dart
+++ b/packages/pinball_components/lib/src/components/alien_bumper.dart
@@ -32,7 +32,6 @@ class AlienBumper extends BodyComponent with InitialPosition {
           spriteComponent: SpriteComponent(
             anchor: Anchor.center,
             position: Vector2(0, -0.1),
-            angle: 15.9 * math.pi / 180,
           ),
         );
 
@@ -46,7 +45,6 @@ class AlienBumper extends BodyComponent with InitialPosition {
           spriteComponent: SpriteComponent(
             anchor: Anchor.center,
             position: Vector2(0, -0.1),
-            angle: 15.9 * math.pi / 180,
           ),
         );
 
@@ -78,7 +76,7 @@ class AlienBumper extends BodyComponent with InitialPosition {
       center: Vector2.zero(),
       majorRadius: _majorRadius,
       minorRadius: _minorRadius,
-    )..rotate(math.pi / 1.9);
+    )..rotate(15.9 * math.pi / 180);
     final fixtureDef = FixtureDef(shape)
       ..friction = 0
       ..restitution = 4;
diff --git a/test/game/pinball_game_test.dart b/test/game/pinball_game_test.dart
index d83bb396..b0f6fc25 100644
--- a/test/game/pinball_game_test.dart
+++ b/test/game/pinball_game_test.dart
@@ -62,6 +62,18 @@ void main() {
         );
       });
 
+      flameTester.test(
+        'one AlienZone',
+        (game) async {
+          final alienZone = AlienZone();
+          await game.ready();
+          await game.ensureAdd(alienZone);
+
+          final flutterForest = alienZone.descendants().whereType<AlienZone>();
+          expect(flutterForest.length, equals(1));
+        },
+      );
+
       group('controller', () {
         // TODO(alestiago): Write test to be controller agnostic.
         group('listenWhen', () {