From 199f3bf9a8dea421165e19d3906e0915023e9f3b Mon Sep 17 00:00:00 2001 From: Erick Zanardo Date: Fri, 18 Mar 2022 14:52:44 -0300 Subject: [PATCH] feat: pr suggestions --- lib/game/components/spaceship.dart | 9 +++++---- lib/game/pinball_game.dart | 26 +++++++------------------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/lib/game/components/spaceship.dart b/lib/game/components/spaceship.dart index 929906ca..eb03c5a4 100644 --- a/lib/game/components/spaceship.dart +++ b/lib/game/components/spaceship.dart @@ -297,7 +297,7 @@ class SpaceshipWall extends BodyComponent with InitialPosition { class SpaceshipEntranceBallContactCallback extends ContactCallback { @override - void begin(SpaceshipEntrance entrance, Ball ball, Contact contact) { + void begin(SpaceshipEntrance entrance, Ball ball, _) { ball ..priority = 3 ..gameRef.reorderChildren(); @@ -318,9 +318,10 @@ class SpaceshipEntranceBallContactCallback class SpaceshipHoleBallContactCallback extends ContactCallback { @override - void begin(SpaceshipHole hole, Ball ball, Contact contact) { - ball.priority = 1; - ball.gameRef.reorderChildren(); + void begin(SpaceshipHole hole, Ball ball, _) { + ball + ..priority = 1 + ..gameRef.reorderChildren(); for (final fixture in ball.body.fixtures) { fixture.filterData.categoryBits = 0xFFFF; diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart index bb68fea6..c02b74cd 100644 --- a/lib/game/pinball_game.dart +++ b/lib/game/pinball_game.dart @@ -82,28 +82,16 @@ class PinballGame extends Forge2DGame Future _addSpaceship() async { final position = Vector2(20, -24); - unawaited(add(SpaceshipSaucer()..initialPosition = position)); - unawaited(add(SpaceshipEntrance()..initialPosition = position)); - unawaited(add(SpaceshipBridge()..initialPosition = position)); - unawaited( - add( + await addAll( + [ + SpaceshipSaucer()..initialPosition = position, + SpaceshipEntrance()..initialPosition = position, + SpaceshipBridge()..initialPosition = position, SpaceshipBridgeTop()..initialPosition = position + Vector2(0, 5.5), - ), - ); - - unawaited( - add( SpaceshipHole()..initialPosition = position - Vector2(5, 4), - ), - ); - unawaited( - add( SpaceshipHole()..initialPosition = position - Vector2(-5, 4), - ), - ); - - unawaited( - add(SpaceshipWall()..initialPosition = position), + SpaceshipWall()..initialPosition = position, + ], ); }