From 2db80115d6eee0ae9f6498473d7b9b8cea375112 Mon Sep 17 00:00:00 2001
From: RuiAlonso <rui.alonso@verygood.ventures>
Date: Fri, 1 Apr 2022 17:45:12 +0200
Subject: [PATCH] refactor: removed position and changed sprite load method

---
 lib/game/components/jetpack_ramp.dart | 30 +++++++++++++--------------
 lib/game/pinball_game.dart            |  6 +-----
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/lib/game/components/jetpack_ramp.dart b/lib/game/components/jetpack_ramp.dart
index a4df6301..34b00dd4 100644
--- a/lib/game/components/jetpack_ramp.dart
+++ b/lib/game/components/jetpack_ramp.dart
@@ -11,10 +11,7 @@ import 'package:pinball_components/pinball_components.dart' hide Assets;
 /// A [Blueprint] which creates the [JetpackRamp].
 class Jetpack extends Forge2DBlueprint {
   /// {@macro spaceship}
-  Jetpack({required this.position});
-
-  /// The [position] where the elements will be created
-  final Vector2 position;
+  Jetpack();
 
   static const int ballPriorityInsideRamp = 4;
 
@@ -29,22 +26,21 @@ class Jetpack extends Forge2DBlueprint {
       outsidePriority: 1,
       rotation: math.pi,
     )
-      ..initialPosition = position + Vector2(1.7, 19)
+      ..initialPosition = Vector2(1.7, 19)
       ..layer = Layer.opening;
     final leftOpening = _JetpackRampOpening(
       outsideLayer: Layer.spaceship,
       outsidePriority: Spaceship.ballPriorityWhenOnSpaceship,
       rotation: math.pi,
     )
-      ..initialPosition = position + Vector2(-13.7, 19)
+      ..initialPosition = Vector2(-13.7, 19)
       ..layer = Layer.jetpack;
 
-    final jetpackRamp = JetpackRamp()..initialPosition = position;
+    final jetpackRamp = JetpackRamp();
 
-    final jetpackRampWallFg = _JetpackRampWallFg()..initialPosition = position;
+    final jetpackRampWallFg = _JetpackRampForegroundRailing();
 
-    final baseRight = _JetpackBase()
-      ..initialPosition = position + Vector2(1.7, 20);
+    final baseRight = _JetpackBase()..initialPosition = Vector2(1.7, 20);
 
     addAll([
       rightOpening,
@@ -112,10 +108,10 @@ class JetpackRamp extends BodyComponent with InitialPosition, Layered {
   @override
   Future<void> onLoad() async {
     await super.onLoad();
-    await _loadBackground();
+    await _loadSprites();
   }
 
-  Future<void> _loadBackground() async {
+  Future<void> _loadSprites() async {
     final spriteRamp = await gameRef.loadSprite(
       Assets.images.components.spaceshipRamp.path,
     );
@@ -144,8 +140,10 @@ class JetpackRamp extends BodyComponent with InitialPosition, Layered {
   }
 }
 
-class _JetpackRampWallFg extends BodyComponent with InitialPosition, Layered {
-  _JetpackRampWallFg() : super(priority: Jetpack.ballPriorityInsideRamp + 1) {
+class _JetpackRampForegroundRailing extends BodyComponent
+    with InitialPosition, Layered {
+  _JetpackRampForegroundRailing()
+      : super(priority: Jetpack.ballPriorityInsideRamp + 1) {
     layer = Layer.jetpack;
   }
 
@@ -194,10 +192,10 @@ class _JetpackRampWallFg extends BodyComponent with InitialPosition, Layered {
   @override
   Future<void> onLoad() async {
     await super.onLoad();
-    await _loadBackground();
+    await _loadSprites();
   }
 
-  Future<void> _loadBackground() async {
+  Future<void> _loadSprites() async {
     final spriteRailingFg = await gameRef.loadSprite(
       Assets.images.components.spaceshipRailingFg.path,
     );
diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart
index cac338fe..095a5f53 100644
--- a/lib/game/pinball_game.dart
+++ b/lib/game/pinball_game.dart
@@ -93,11 +93,7 @@ class PinballGame extends Forge2DGame
 
   Future<void> _addPaths() async {
     unawaited(
-      addFromBlueprint(
-        Jetpack(
-          position: Vector2(0, 0),
-        ),
-      ),
+      addFromBlueprint(Jetpack()),
     );
     unawaited(addFromBlueprint(Launcher()));
   }