refactor: ramp opening and score text

pull/183/head
Allison Ryan 4 years ago
parent 8daeda43da
commit 7ad74cb5e5

@ -29,13 +29,13 @@ abstract class RampOpening extends BodyComponent with InitialPosition, Layered {
RampOpening({ RampOpening({
required Layer insideLayer, required Layer insideLayer,
Layer? outsideLayer, Layer? outsideLayer,
int? insidePriority, required int insidePriority,
int? outsidePriority, int? outsidePriority,
required this.orientation, required this.orientation,
}) : _insideLayer = insideLayer, }) : _insideLayer = insideLayer,
_outsideLayer = outsideLayer ?? Layer.board, _outsideLayer = outsideLayer ?? Layer.board,
_insidePriority = insidePriority ?? 0, _insidePriority = insidePriority,
_outsidePriority = outsidePriority ?? 0 { _outsidePriority = outsidePriority ?? Ball.boardPriority {
layer = Layer.opening; layer = Layer.opening;
} }
final Layer _insideLayer; final Layer _insideLayer;

@ -18,7 +18,7 @@ class ScoreText extends TextComponent {
text: text, text: text,
position: position, position: position,
anchor: Anchor.center, anchor: Anchor.center,
priority: 5, priority: Ball.spaceshipRampPriority + 1,
); );
late final Effect _effect; late final Effect _effect;

@ -10,9 +10,11 @@ import '../../helpers/helpers.dart';
class TestRampOpening extends RampOpening { class TestRampOpening extends RampOpening {
TestRampOpening({ TestRampOpening({
required RampOrientation orientation, required RampOrientation orientation,
required int insidePriority,
required Layer pathwayLayer, required Layer pathwayLayer,
}) : super( }) : super(
insideLayer: pathwayLayer, insideLayer: pathwayLayer,
insidePriority: insidePriority,
orientation: orientation, orientation: orientation,
); );
@ -34,16 +36,15 @@ class TestRampOpeningBallContactCallback
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();
final flameTester = FlameTester(TestGame.new); final flameTester = FlameTester(TestGame.new);
const insidePriority = 1;
group('RampOpening', () { group('RampOpening', () {
TestWidgetsFlutterBinding.ensureInitialized();
final flameTester = FlameTester(TestGame.new);
flameTester.test( flameTester.test(
'loads correctly', 'loads correctly',
(game) async { (game) async {
final ramp = TestRampOpening( final ramp = TestRampOpening(
orientation: RampOrientation.down, orientation: RampOrientation.down,
insidePriority: insidePriority,
pathwayLayer: Layer.spaceshipEntranceRamp, pathwayLayer: Layer.spaceshipEntranceRamp,
); );
await game.ready(); await game.ready();
@ -59,6 +60,7 @@ void main() {
(game) async { (game) async {
final ramp = TestRampOpening( final ramp = TestRampOpening(
orientation: RampOrientation.down, orientation: RampOrientation.down,
insidePriority: insidePriority,
pathwayLayer: Layer.spaceshipEntranceRamp, pathwayLayer: Layer.spaceshipEntranceRamp,
); );
await game.ensureAdd(ramp); await game.ensureAdd(ramp);
@ -76,6 +78,7 @@ void main() {
(game) async { (game) async {
final ramp = TestRampOpening( final ramp = TestRampOpening(
orientation: RampOrientation.down, orientation: RampOrientation.down,
insidePriority: insidePriority,
pathwayLayer: pathwayLayer, pathwayLayer: pathwayLayer,
)..layer = openingLayer; )..layer = openingLayer;
await game.ensureAdd(ramp); await game.ensureAdd(ramp);
@ -89,6 +92,7 @@ void main() {
(game) async { (game) async {
final ramp = TestRampOpening( final ramp = TestRampOpening(
orientation: RampOrientation.down, orientation: RampOrientation.down,
insidePriority: insidePriority,
pathwayLayer: pathwayLayer, pathwayLayer: pathwayLayer,
)..layer = openingLayer; )..layer = openingLayer;
await game.ensureAdd(ramp); await game.ensureAdd(ramp);
@ -103,6 +107,7 @@ void main() {
(game) async { (game) async {
final ramp = TestRampOpening( final ramp = TestRampOpening(
orientation: RampOrientation.down, orientation: RampOrientation.down,
insidePriority: insidePriority,
pathwayLayer: pathwayLayer, pathwayLayer: pathwayLayer,
)..layer = openingLayer; )..layer = openingLayer;
await game.ensureAdd(ramp); await game.ensureAdd(ramp);
@ -124,6 +129,7 @@ void main() {
final body = MockBody(); final body = MockBody();
final area = TestRampOpening( final area = TestRampOpening(
orientation: RampOrientation.down, orientation: RampOrientation.down,
insidePriority: insidePriority,
pathwayLayer: Layer.spaceshipEntranceRamp, pathwayLayer: Layer.spaceshipEntranceRamp,
); );
final callback = TestRampOpeningBallContactCallback(); final callback = TestRampOpeningBallContactCallback();
@ -145,6 +151,7 @@ void main() {
final body = MockBody(); final body = MockBody();
final area = TestRampOpening( final area = TestRampOpening(
orientation: RampOrientation.up, orientation: RampOrientation.up,
insidePriority: insidePriority,
pathwayLayer: Layer.spaceshipEntranceRamp, pathwayLayer: Layer.spaceshipEntranceRamp,
); );
final callback = TestRampOpeningBallContactCallback(); final callback = TestRampOpeningBallContactCallback();
@ -165,6 +172,7 @@ void main() {
final body = MockBody(); final body = MockBody();
final area = TestRampOpening( final area = TestRampOpening(
orientation: RampOrientation.down, orientation: RampOrientation.down,
insidePriority: insidePriority,
pathwayLayer: Layer.spaceshipEntranceRamp, pathwayLayer: Layer.spaceshipEntranceRamp,
)..initialPosition = Vector2(0, 10); )..initialPosition = Vector2(0, 10);
final callback = TestRampOpeningBallContactCallback(); final callback = TestRampOpeningBallContactCallback();
@ -189,6 +197,7 @@ void main() {
final body = MockBody(); final body = MockBody();
final area = TestRampOpening( final area = TestRampOpening(
orientation: RampOrientation.up, orientation: RampOrientation.up,
insidePriority: insidePriority,
pathwayLayer: Layer.spaceshipEntranceRamp, pathwayLayer: Layer.spaceshipEntranceRamp,
)..initialPosition = Vector2(0, 10); )..initialPosition = Vector2(0, 10);
final callback = TestRampOpeningBallContactCallback(); final callback = TestRampOpeningBallContactCallback();
@ -213,6 +222,7 @@ void main() {
final body = MockBody(); final body = MockBody();
final area = TestRampOpening( final area = TestRampOpening(
orientation: RampOrientation.down, orientation: RampOrientation.down,
insidePriority: insidePriority,
pathwayLayer: Layer.spaceshipEntranceRamp, pathwayLayer: Layer.spaceshipEntranceRamp,
)..initialPosition = Vector2(0, 10); )..initialPosition = Vector2(0, 10);
final callback = TestRampOpeningBallContactCallback(); final callback = TestRampOpeningBallContactCallback();

Loading…
Cancel
Save