From 7ad74cb5e55e3d455f190813e93c740d8144bc56 Mon Sep 17 00:00:00 2001 From: Allison Ryan Date: Tue, 12 Apr 2022 11:12:32 -0500 Subject: [PATCH] refactor: ramp opening and score text --- .../lib/src/components/ramp_opening.dart | 6 +++--- .../lib/src/components/score_text.dart | 2 +- .../test/src/components/ramp_opening_test.dart | 16 +++++++++++++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/packages/pinball_components/lib/src/components/ramp_opening.dart b/packages/pinball_components/lib/src/components/ramp_opening.dart index cb6066f2..a76c0d9e 100644 --- a/packages/pinball_components/lib/src/components/ramp_opening.dart +++ b/packages/pinball_components/lib/src/components/ramp_opening.dart @@ -29,13 +29,13 @@ abstract class RampOpening extends BodyComponent with InitialPosition, Layered { RampOpening({ required Layer insideLayer, Layer? outsideLayer, - int? insidePriority, + required int insidePriority, int? outsidePriority, required this.orientation, }) : _insideLayer = insideLayer, _outsideLayer = outsideLayer ?? Layer.board, - _insidePriority = insidePriority ?? 0, - _outsidePriority = outsidePriority ?? 0 { + _insidePriority = insidePriority, + _outsidePriority = outsidePriority ?? Ball.boardPriority { layer = Layer.opening; } final Layer _insideLayer; diff --git a/packages/pinball_components/lib/src/components/score_text.dart b/packages/pinball_components/lib/src/components/score_text.dart index 70fb6c7f..6fe5f6a3 100644 --- a/packages/pinball_components/lib/src/components/score_text.dart +++ b/packages/pinball_components/lib/src/components/score_text.dart @@ -18,7 +18,7 @@ class ScoreText extends TextComponent { text: text, position: position, anchor: Anchor.center, - priority: 5, + priority: Ball.spaceshipRampPriority + 1, ); late final Effect _effect; diff --git a/packages/pinball_components/test/src/components/ramp_opening_test.dart b/packages/pinball_components/test/src/components/ramp_opening_test.dart index 46e56e3d..e79842bd 100644 --- a/packages/pinball_components/test/src/components/ramp_opening_test.dart +++ b/packages/pinball_components/test/src/components/ramp_opening_test.dart @@ -10,9 +10,11 @@ import '../../helpers/helpers.dart'; class TestRampOpening extends RampOpening { TestRampOpening({ required RampOrientation orientation, + required int insidePriority, required Layer pathwayLayer, }) : super( insideLayer: pathwayLayer, + insidePriority: insidePriority, orientation: orientation, ); @@ -34,16 +36,15 @@ class TestRampOpeningBallContactCallback void main() { TestWidgetsFlutterBinding.ensureInitialized(); final flameTester = FlameTester(TestGame.new); + const insidePriority = 1; group('RampOpening', () { - TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(TestGame.new); - flameTester.test( 'loads correctly', (game) async { final ramp = TestRampOpening( orientation: RampOrientation.down, + insidePriority: insidePriority, pathwayLayer: Layer.spaceshipEntranceRamp, ); await game.ready(); @@ -59,6 +60,7 @@ void main() { (game) async { final ramp = TestRampOpening( orientation: RampOrientation.down, + insidePriority: insidePriority, pathwayLayer: Layer.spaceshipEntranceRamp, ); await game.ensureAdd(ramp); @@ -76,6 +78,7 @@ void main() { (game) async { final ramp = TestRampOpening( orientation: RampOrientation.down, + insidePriority: insidePriority, pathwayLayer: pathwayLayer, )..layer = openingLayer; await game.ensureAdd(ramp); @@ -89,6 +92,7 @@ void main() { (game) async { final ramp = TestRampOpening( orientation: RampOrientation.down, + insidePriority: insidePriority, pathwayLayer: pathwayLayer, )..layer = openingLayer; await game.ensureAdd(ramp); @@ -103,6 +107,7 @@ void main() { (game) async { final ramp = TestRampOpening( orientation: RampOrientation.down, + insidePriority: insidePriority, pathwayLayer: pathwayLayer, )..layer = openingLayer; await game.ensureAdd(ramp); @@ -124,6 +129,7 @@ void main() { final body = MockBody(); final area = TestRampOpening( orientation: RampOrientation.down, + insidePriority: insidePriority, pathwayLayer: Layer.spaceshipEntranceRamp, ); final callback = TestRampOpeningBallContactCallback(); @@ -145,6 +151,7 @@ void main() { final body = MockBody(); final area = TestRampOpening( orientation: RampOrientation.up, + insidePriority: insidePriority, pathwayLayer: Layer.spaceshipEntranceRamp, ); final callback = TestRampOpeningBallContactCallback(); @@ -165,6 +172,7 @@ void main() { final body = MockBody(); final area = TestRampOpening( orientation: RampOrientation.down, + insidePriority: insidePriority, pathwayLayer: Layer.spaceshipEntranceRamp, )..initialPosition = Vector2(0, 10); final callback = TestRampOpeningBallContactCallback(); @@ -189,6 +197,7 @@ void main() { final body = MockBody(); final area = TestRampOpening( orientation: RampOrientation.up, + insidePriority: insidePriority, pathwayLayer: Layer.spaceshipEntranceRamp, )..initialPosition = Vector2(0, 10); final callback = TestRampOpeningBallContactCallback(); @@ -213,6 +222,7 @@ void main() { final body = MockBody(); final area = TestRampOpening( orientation: RampOrientation.down, + insidePriority: insidePriority, pathwayLayer: Layer.spaceshipEntranceRamp, )..initialPosition = Vector2(0, 10); final callback = TestRampOpeningBallContactCallback();