diff --git a/lib/game/behaviors/behaviors.dart b/lib/game/behaviors/behaviors.dart index 243fff82..44cce1df 100644 --- a/lib/game/behaviors/behaviors.dart +++ b/lib/game/behaviors/behaviors.dart @@ -1,4 +1,4 @@ export 'ball_spawning_behavior.dart'; -export 'bumper_noisy_behavior.dart'; +export 'bumper_noise_behavior.dart'; export 'camera_focusing_behavior.dart'; export 'scoring_behavior.dart'; diff --git a/lib/game/behaviors/bumper_noisy_behavior.dart b/lib/game/behaviors/bumper_noise_behavior.dart similarity index 87% rename from lib/game/behaviors/bumper_noisy_behavior.dart rename to lib/game/behaviors/bumper_noise_behavior.dart index 11bf876e..9c5da701 100644 --- a/lib/game/behaviors/bumper_noisy_behavior.dart +++ b/lib/game/behaviors/bumper_noise_behavior.dart @@ -4,7 +4,7 @@ import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_flame/pinball_flame.dart'; -class BumperNoisyBehavior extends ContactBehavior { +class BumperNoiseBehavior extends ContactBehavior { @override void beginContact(Object other, Contact contact) { super.beginContact(other, contact); diff --git a/lib/game/components/android_acres/android_acres.dart b/lib/game/components/android_acres/android_acres.dart index 649ef196..af4ec451 100644 --- a/lib/game/components/android_acres/android_acres.dart +++ b/lib/game/components/android_acres/android_acres.dart @@ -35,19 +35,19 @@ class AndroidAcres extends Component { AndroidBumper.a( children: [ ScoringContactBehavior(points: Points.twentyThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(-25, 1.3), AndroidBumper.b( children: [ ScoringContactBehavior(points: Points.twentyThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(-32.8, -9.2), AndroidBumper.cow( children: [ ScoringContactBehavior(points: Points.twentyThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(-20.5, -13.8), AndroidSpaceshipBonusBehavior(), diff --git a/lib/game/components/controlled_plunger.dart b/lib/game/components/controlled_plunger.dart index f6695f47..c8cb90fb 100644 --- a/lib/game/components/controlled_plunger.dart +++ b/lib/game/components/controlled_plunger.dart @@ -20,13 +20,13 @@ class ControlledPlunger extends Plunger with Controls { void release() { super.release(); - add(PlungerNoisyBehavior()); + add(PlungerNoiseBehavior()); } } /// A behavior attached to the plunger when it launches the ball which plays the /// related sound effects. -class PlungerNoisyBehavior extends Component { +class PlungerNoiseBehavior extends Component { @override Future onLoad() async { await super.onLoad(); diff --git a/lib/game/components/flutter_forest/flutter_forest.dart b/lib/game/components/flutter_forest/flutter_forest.dart index 259b6bb2..a9219ba0 100644 --- a/lib/game/components/flutter_forest/flutter_forest.dart +++ b/lib/game/components/flutter_forest/flutter_forest.dart @@ -19,25 +19,25 @@ class FlutterForest extends Component with ZIndex { Signpost( children: [ ScoringContactBehavior(points: Points.fiveThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(8.35, -58.3), DashNestBumper.main( children: [ ScoringContactBehavior(points: Points.twoHundredThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(18.55, -59.35), DashNestBumper.a( children: [ ScoringContactBehavior(points: Points.twentyThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(8.95, -51.95), DashNestBumper.b( children: [ ScoringContactBehavior(points: Points.twentyThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(22.3, -46.75), DashAnimatronic()..position = Vector2(20, -66), diff --git a/lib/game/components/sparky_scorch.dart b/lib/game/components/sparky_scorch.dart index 5a266b4e..e7e5004a 100644 --- a/lib/game/components/sparky_scorch.dart +++ b/lib/game/components/sparky_scorch.dart @@ -18,19 +18,19 @@ class SparkyScorch extends Component { SparkyBumper.a( children: [ ScoringContactBehavior(points: Points.twentyThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(-22.9, -41.65), SparkyBumper.b( children: [ ScoringContactBehavior(points: Points.twentyThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(-21.25, -57.9), SparkyBumper.c( children: [ ScoringContactBehavior(points: Points.twentyThousand), - BumperNoisyBehavior(), + BumperNoiseBehavior(), ], )..initialPosition = Vector2(-3.3, -52.55), SparkyComputerSensor()..initialPosition = Vector2(-13, -49.9), diff --git a/packages/pinball_audio/assets/sfx/google.mp3 b/packages/pinball_audio/assets/sfx/google.mp3 index 34167d44..97659b02 100644 Binary files a/packages/pinball_audio/assets/sfx/google.mp3 and b/packages/pinball_audio/assets/sfx/google.mp3 differ diff --git a/packages/pinball_components/lib/src/components/z_indexes.dart b/packages/pinball_components/lib/src/components/z_indexes.dart index b59a9a4b..e98ac3cb 100644 --- a/packages/pinball_components/lib/src/components/z_indexes.dart +++ b/packages/pinball_components/lib/src/components/z_indexes.dart @@ -33,7 +33,7 @@ abstract class ZIndexes { static const outerBoundary = _above + boardBackground; - static const outerBottomBoundary = _above + rocket; + static const outerBottomBoundary = _above + bottomBoundary; // Bottom Group diff --git a/test/game/behaviors/bumper_noisy_behavior_test.dart b/test/game/behaviors/bumper_noisy_behavior_test.dart index 91e4e4ce..d8075726 100644 --- a/test/game/behaviors/bumper_noisy_behavior_test.dart +++ b/test/game/behaviors/bumper_noisy_behavior_test.dart @@ -33,7 +33,7 @@ class _MockContact extends Mock implements Contact {} void main() { TestWidgetsFlutterBinding.ensureInitialized(); - group('BumperNoisyBehavior', () {}); + group('BumperNoiseBehavior', () {}); late PinballPlayer player; final flameTester = FlameTester(_TestGame.new); @@ -45,7 +45,7 @@ void main() { flameTester.testGameWidget( 'plays bumper sound', setUp: (game, _) async { - final behavior = BumperNoisyBehavior(); + final behavior = BumperNoiseBehavior(); final parent = _TestBodyComponent(); await game.pump(parent, player: player); await parent.ensureAdd(behavior); diff --git a/test/game/components/android_acres/android_acres_test.dart b/test/game/components/android_acres/android_acres_test.dart index dc42d53f..e88d1608 100644 --- a/test/game/components/android_acres/android_acres_test.dart +++ b/test/game/components/android_acres/android_acres_test.dart @@ -4,7 +4,7 @@ import 'package:flame_bloc/flame_bloc.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:pinball/game/behaviors/bumper_noisy_behavior.dart'; +import 'package:pinball/game/behaviors/bumper_noise_behavior.dart'; import 'package:pinball/game/components/android_acres/behaviors/behaviors.dart'; import 'package:pinball/game/game.dart'; import 'package:pinball_components/pinball_components.dart'; @@ -117,13 +117,13 @@ void main() { ); flameTester.test( - 'three AndroidBumpers with BumperNoisyBehavior', + 'three AndroidBumpers with BumperNoiseBehavior', (game) async { await game.pump(AndroidAcres()); final bumpers = game.descendants().whereType(); for (final bumper in bumpers) { expect( - bumper.firstChild(), + bumper.firstChild(), isNotNull, ); } diff --git a/test/game/components/controlled_plunger_test.dart b/test/game/components/controlled_plunger_test.dart index 56f9f23a..25b1f739 100644 --- a/test/game/components/controlled_plunger_test.dart +++ b/test/game/components/controlled_plunger_test.dart @@ -143,7 +143,7 @@ void main() { }); flameTester.test( - 'adds the PlungerNoisyBehavior plunger is released', + 'adds the PlungerNoiseBehavior plunger is released', (game) async { await game.pump(plunger); plunger.body.setTransform(Vector2(0, 1), 0); @@ -151,13 +151,13 @@ void main() { await game.ready(); final count = - game.descendants().whereType().length; + game.descendants().whereType().length; expect(count, equals(1)); }, ); }); - group('PlungerNoisyBehavior', () { + group('PlungerNoiseBehavior', () { late PinballPlayer player; setUp(() { @@ -167,13 +167,13 @@ void main() { flameTester.test('plays the correct sound on load', (game) async { final parent = ControlledPlunger(compressionDistance: 10); await game.pump(parent, pinballPlayer: player); - await parent.ensureAdd(PlungerNoisyBehavior()); + await parent.ensureAdd(PlungerNoiseBehavior()); verify(() => player.play(PinballAudio.launcher)).called(1); }); test('is removed on the first update', () { final parent = Component(); - final behavior = PlungerNoisyBehavior(); + final behavior = PlungerNoiseBehavior(); parent.add(behavior); parent.update(0); // Run a tick to ensure it is added diff --git a/test/game/components/flutter_forest/flutter_forest_test.dart b/test/game/components/flutter_forest/flutter_forest_test.dart index 6a9ccae4..470719d8 100644 --- a/test/game/components/flutter_forest/flutter_forest_test.dart +++ b/test/game/components/flutter_forest/flutter_forest_test.dart @@ -103,14 +103,14 @@ void main() { ); flameTester.test( - 'three DashNestBumpers with BumperNoisyBehavior', + 'three DashNestBumpers with BumperNoiseBehavior', (game) async { final component = FlutterForest(); await game.pump(component); final bumpers = game.descendants().whereType(); for (final bumper in bumpers) { expect( - bumper.firstChild(), + bumper.firstChild(), isNotNull, ); } diff --git a/test/game/components/sparky_scorch_test.dart b/test/game/components/sparky_scorch_test.dart index ba62a2ae..92a3ab01 100644 --- a/test/game/components/sparky_scorch_test.dart +++ b/test/game/components/sparky_scorch_test.dart @@ -80,13 +80,13 @@ void main() { ); flameTester.test( - 'three SparkyBumpers with BumperNoisyBehavior', + 'three SparkyBumpers with BumperNoiseBehavior', (game) async { await game.ensureAdd(SparkyScorch()); final bumpers = game.descendants().whereType(); for (final bumper in bumpers) { expect( - bumper.firstChild(), + bumper.firstChild(), isNotNull, ); }