From d446be45662139612c015e115f1d874b15218986 Mon Sep 17 00:00:00 2001 From: RuiAlonso Date: Fri, 1 Apr 2022 18:15:48 +0200 Subject: [PATCH] refactor: renamed JetpackRamp to SpaceshipEntranceRamp --- lib/game/components/components.dart | 2 +- ...ramp.dart => spaceship_entrance_ramp.dart} | 67 ++++++++++--------- lib/game/components/spaceship_exit_rail.dart | 2 +- lib/game/pinball_game.dart | 2 +- 4 files changed, 38 insertions(+), 35 deletions(-) rename lib/game/components/{jetpack_ramp.dart => spaceship_entrance_ramp.dart} (76%) diff --git a/lib/game/components/components.dart b/lib/game/components/components.dart index 591f6cdb..3c17ac16 100644 --- a/lib/game/components/components.dart +++ b/lib/game/components/components.dart @@ -4,7 +4,7 @@ export 'chrome_dino.dart'; export 'controlled_ball.dart'; export 'controlled_flipper.dart'; export 'flutter_forest.dart'; -export 'jetpack_ramp.dart'; +export 'spaceship_entrance_ramp.dart'; export 'kicker.dart'; export 'launcher_ramp.dart'; export 'plunger.dart'; diff --git a/lib/game/components/jetpack_ramp.dart b/lib/game/components/spaceship_entrance_ramp.dart similarity index 76% rename from lib/game/components/jetpack_ramp.dart rename to lib/game/components/spaceship_entrance_ramp.dart index 34b00dd4..2f8e56ae 100644 --- a/lib/game/components/jetpack_ramp.dart +++ b/lib/game/components/spaceship_entrance_ramp.dart @@ -8,56 +8,59 @@ import 'package:pinball/game/game.dart'; import 'package:pinball/gen/assets.gen.dart'; import 'package:pinball_components/pinball_components.dart' hide Assets; -/// A [Blueprint] which creates the [JetpackRamp]. -class Jetpack extends Forge2DBlueprint { - /// {@macro spaceship} - Jetpack(); +/// {@template spaceship_entrance_ramp} +/// A [Blueprint] which creates the [SpaceshipRamp]. +/// {@endtemplate} +class SpaceshipEntranceRamp extends Forge2DBlueprint { + /// {@macro spaceship_entrance_ramp} + SpaceshipEntranceRamp(); static const int ballPriorityInsideRamp = 4; @override void build(_) { addAllContactCallback([ - RampOpeningBallContactCallback<_JetpackRampOpening>(), + RampOpeningBallContactCallback<_SpaceshipRampOpening>(), ]); - final rightOpening = _JetpackRampOpening( + final rightOpening = _SpaceshipRampOpening( // TODO(ruimiguel): set Board priority when defined. outsidePriority: 1, rotation: math.pi, ) ..initialPosition = Vector2(1.7, 19) ..layer = Layer.opening; - final leftOpening = _JetpackRampOpening( + final leftOpening = _SpaceshipRampOpening( outsideLayer: Layer.spaceship, outsidePriority: Spaceship.ballPriorityWhenOnSpaceship, rotation: math.pi, ) ..initialPosition = Vector2(-13.7, 19) - ..layer = Layer.jetpack; + ..layer = Layer.spaceshipEntranceRamp; - final jetpackRamp = JetpackRamp(); + final spaceshipRamp = _SpaceshipRamp(); - final jetpackRampWallFg = _JetpackRampForegroundRailing(); + final spaceshipRampForegroundRailing = _SpaceshipRampForegroundRailing(); - final baseRight = _JetpackBase()..initialPosition = Vector2(1.7, 20); + final baseRight = _SpaceshipRampBase()..initialPosition = Vector2(1.7, 20); addAll([ rightOpening, leftOpening, baseRight, - jetpackRamp, - jetpackRampWallFg, + spaceshipRamp, + spaceshipRampForegroundRailing, ]); } } -/// {@template jetpack_ramp} +/// {@template spaceship_ramp} /// Represents the upper left blue ramp of the [Board]. /// {@endtemplate} -class JetpackRamp extends BodyComponent with InitialPosition, Layered { - JetpackRamp() : super(priority: Jetpack.ballPriorityInsideRamp - 1) { - layer = Layer.jetpack; +class _SpaceshipRamp extends BodyComponent with InitialPosition, Layered { + _SpaceshipRamp() + : super(priority: SpaceshipEntranceRamp.ballPriorityInsideRamp - 1) { + layer = Layer.spaceshipEntranceRamp; } /// Width between walls of the ramp. @@ -140,11 +143,11 @@ class JetpackRamp extends BodyComponent with InitialPosition, Layered { } } -class _JetpackRampForegroundRailing extends BodyComponent +class _SpaceshipRampForegroundRailing extends BodyComponent with InitialPosition, Layered { - _JetpackRampForegroundRailing() - : super(priority: Jetpack.ballPriorityInsideRamp + 1) { - layer = Layer.jetpack; + _SpaceshipRampForegroundRailing() + : super(priority: SpaceshipEntranceRamp.ballPriorityInsideRamp + 1) { + layer = Layer.spaceshipEntranceRamp; } List _createFixtureDefs() { @@ -210,8 +213,8 @@ class _JetpackRampForegroundRailing extends BodyComponent } } -class _JetpackBase extends BodyComponent with InitialPosition, Layered { - _JetpackBase() { +class _SpaceshipRampBase extends BodyComponent with InitialPosition, Layered { + _SpaceshipRampBase() { layer = Layer.board; } @@ -240,28 +243,28 @@ class _JetpackBase extends BodyComponent with InitialPosition, Layered { } } -/// {@template jetpack_ramp_opening} -/// [RampOpening] with [Layer.jetpack] to filter [Ball] collisions -/// inside [JetpackRamp]. +/// {@template spaceship_ramp_opening} +/// [RampOpening] with [Layer.spaceshipEntranceRamp] to filter [Ball] collisions +/// inside [_SpaceshipRamp]. /// {@endtemplate} -class _JetpackRampOpening extends RampOpening { - /// {@macro jetpack_ramp_opening} - _JetpackRampOpening({ +class _SpaceshipRampOpening extends RampOpening { + /// {@macro spaceship_ramp_opening} + _SpaceshipRampOpening({ Layer? outsideLayer, int? outsidePriority, required double rotation, }) : _rotation = rotation, super( - insideLayer: Layer.jetpack, + insideLayer: Layer.spaceshipEntranceRamp, outsideLayer: outsideLayer, orientation: RampOrientation.down, - insidePriority: Jetpack.ballPriorityInsideRamp, + insidePriority: SpaceshipEntranceRamp.ballPriorityInsideRamp, outsidePriority: outsidePriority, ); final double _rotation; - static final Vector2 _size = Vector2(JetpackRamp.width / 4, .1); + static final Vector2 _size = Vector2(_SpaceshipRamp.width / 4, .1); @override Shape get shape { diff --git a/lib/game/components/spaceship_exit_rail.dart b/lib/game/components/spaceship_exit_rail.dart index e4be9b31..ac971c78 100644 --- a/lib/game/components/spaceship_exit_rail.dart +++ b/lib/game/components/spaceship_exit_rail.dart @@ -14,7 +14,7 @@ class SpaceshipExitRail extends Forge2DBlueprint { /// {@macro spaceship_exit_rail} SpaceshipExitRail(); - /// Base priority for wall while be on jetpack ramp. + /// Base priority for wall while be on [_SpaceshipExitRailRamp]. static const ballPriorityWhenOnSpaceshipExitRail = 2; @override diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart index 095a5f53..2e115015 100644 --- a/lib/game/pinball_game.dart +++ b/lib/game/pinball_game.dart @@ -93,7 +93,7 @@ class PinballGame extends Forge2DGame Future _addPaths() async { unawaited( - addFromBlueprint(Jetpack()), + addFromBlueprint(SpaceshipEntranceRamp()), ); unawaited(addFromBlueprint(Launcher())); }