From 38d7bfa3fc29dd3c4eb0f4de816fff367615656f Mon Sep 17 00:00:00 2001 From: alestiago Date: Wed, 27 Apr 2022 17:32:59 +0100 Subject: [PATCH] feat: adjusted FlutterForest priorities --- lib/game/components/flutter_forest/flutter_forest.dart | 5 +++-- .../lib/src/components/dash_animatronic.dart | 1 - .../src/components/dash_nest_bumper/dash_nest_bumper.dart | 1 - .../lib/src/components/render_priority.dart | 6 +----- .../pinball_components/lib/src/components/signpost.dart | 1 - 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/game/components/flutter_forest/flutter_forest.dart b/lib/game/components/flutter_forest/flutter_forest.dart index 327b23fb..02483159 100644 --- a/lib/game/components/flutter_forest/flutter_forest.dart +++ b/lib/game/components/flutter_forest/flutter_forest.dart @@ -7,13 +7,14 @@ import 'package:pinball/game/game.dart'; import 'package:pinball_components/pinball_components.dart'; /// {@template flutter_forest} -/// Area positioned at the top right of the [Board] where the [Ball] -/// can bounce off [DashNestBumper]s. +/// Area positioned at the top right of the [Board] where the [Ball] can bounce +/// off [DashNestBumper]s. /// {@endtemplate} class FlutterForest extends Component { /// {@macro flutter_forest} FlutterForest() : super( + priority: RenderPriority.flutterForest, children: [ Signpost( children: [ diff --git a/packages/pinball_components/lib/src/components/dash_animatronic.dart b/packages/pinball_components/lib/src/components/dash_animatronic.dart index 47e1e08f..faa604e9 100644 --- a/packages/pinball_components/lib/src/components/dash_animatronic.dart +++ b/packages/pinball_components/lib/src/components/dash_animatronic.dart @@ -10,7 +10,6 @@ class DashAnimatronic extends SpriteAnimationComponent with HasGameRef { : super( anchor: Anchor.center, playing: false, - priority: RenderPriority.dashAnimatronic, ); @override diff --git a/packages/pinball_components/lib/src/components/dash_nest_bumper/dash_nest_bumper.dart b/packages/pinball_components/lib/src/components/dash_nest_bumper/dash_nest_bumper.dart index 9c24e826..82ec0036 100644 --- a/packages/pinball_components/lib/src/components/dash_nest_bumper/dash_nest_bumper.dart +++ b/packages/pinball_components/lib/src/components/dash_nest_bumper/dash_nest_bumper.dart @@ -25,7 +25,6 @@ class DashNestBumper extends BodyComponent with InitialPosition { }) : _majorRadius = majorRadius, _minorRadius = minorRadius, super( - priority: RenderPriority.dashBumper, renderBody: false, children: [ _DashNestBumperSpriteGroupComponent( diff --git a/packages/pinball_components/lib/src/components/render_priority.dart b/packages/pinball_components/lib/src/components/render_priority.dart index d2438db9..cf523029 100644 --- a/packages/pinball_components/lib/src/components/render_priority.dart +++ b/packages/pinball_components/lib/src/components/render_priority.dart @@ -69,11 +69,7 @@ abstract class RenderPriority { // Flutter Forest - static const int signpost = _above + launchRampForegroundRailing; - - static const int dashBumper = _above + ballOnBoard; - - static const int dashAnimatronic = 2 * _above + launchRamp; + static const int flutterForest = _above + launchRampForegroundRailing; // Sparky Fire Zone diff --git a/packages/pinball_components/lib/src/components/signpost.dart b/packages/pinball_components/lib/src/components/signpost.dart index 50cc6ccf..13425342 100644 --- a/packages/pinball_components/lib/src/components/signpost.dart +++ b/packages/pinball_components/lib/src/components/signpost.dart @@ -49,7 +49,6 @@ class Signpost extends BodyComponent with InitialPosition { Signpost({ Iterable? children, }) : super( - priority: RenderPriority.signpost, renderBody: false, children: [ _SignpostSpriteComponent(),