refactor: renaming noisy to noise (#353)

pull/354/head
Erick 3 years ago committed by GitHub
parent df7408728e
commit 135b4ed5c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,4 +1,4 @@
export 'ball_spawning_behavior.dart'; export 'ball_spawning_behavior.dart';
export 'bumper_noisy_behavior.dart'; export 'bumper_noise_behavior.dart';
export 'camera_focusing_behavior.dart'; export 'camera_focusing_behavior.dart';
export 'scoring_behavior.dart'; export 'scoring_behavior.dart';

@ -6,7 +6,7 @@ import 'package:pinball/game/pinball_game.dart';
import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_audio/pinball_audio.dart';
import 'package:pinball_flame/pinball_flame.dart'; import 'package:pinball_flame/pinball_flame.dart';
class BumperNoisyBehavior extends ContactBehavior with HasGameRef<PinballGame> { class BumperNoiseBehavior extends ContactBehavior with HasGameRef<PinballGame> {
@override @override
void beginContact(Object other, Contact contact) { void beginContact(Object other, Contact contact) {
super.beginContact(other, contact); super.beginContact(other, contact);

@ -35,19 +35,19 @@ class AndroidAcres extends Component {
AndroidBumper.a( AndroidBumper.a(
children: [ children: [
ScoringContactBehavior(points: Points.twentyThousand), ScoringContactBehavior(points: Points.twentyThousand),
BumperNoisyBehavior(), BumperNoiseBehavior(),
], ],
)..initialPosition = Vector2(-25, 1.3), )..initialPosition = Vector2(-25, 1.3),
AndroidBumper.b( AndroidBumper.b(
children: [ children: [
ScoringContactBehavior(points: Points.twentyThousand), ScoringContactBehavior(points: Points.twentyThousand),
BumperNoisyBehavior(), BumperNoiseBehavior(),
], ],
)..initialPosition = Vector2(-32.8, -9.2), )..initialPosition = Vector2(-32.8, -9.2),
AndroidBumper.cow( AndroidBumper.cow(
children: [ children: [
ScoringContactBehavior(points: Points.twentyThousand), ScoringContactBehavior(points: Points.twentyThousand),
BumperNoisyBehavior(), BumperNoiseBehavior(),
], ],
)..initialPosition = Vector2(-20.5, -13.8), )..initialPosition = Vector2(-20.5, -13.8),
AndroidSpaceshipBonusBehavior(), AndroidSpaceshipBonusBehavior(),

@ -20,13 +20,13 @@ class ControlledPlunger extends Plunger with Controls<PlungerController> {
void release() { void release() {
super.release(); super.release();
add(PlungerNoisyBehavior()); add(PlungerNoiseBehavior());
} }
} }
/// A behavior attached to the plunger when it launches the ball /// A behavior attached to the plunger when it launches the ball
/// which plays the related sound effects. /// which plays the related sound effects.
class PlungerNoisyBehavior extends Component with HasGameRef<PinballGame> { class PlungerNoiseBehavior extends Component with HasGameRef<PinballGame> {
@override @override
Future<void> onLoad() async { Future<void> onLoad() async {
await super.onLoad(); await super.onLoad();

@ -19,25 +19,25 @@ class FlutterForest extends Component with ZIndex {
Signpost( Signpost(
children: [ children: [
ScoringContactBehavior(points: Points.fiveThousand), ScoringContactBehavior(points: Points.fiveThousand),
BumperNoisyBehavior(), BumperNoiseBehavior(),
], ],
)..initialPosition = Vector2(8.35, -58.3), )..initialPosition = Vector2(8.35, -58.3),
DashNestBumper.main( DashNestBumper.main(
children: [ children: [
ScoringContactBehavior(points: Points.twoHundredThousand), ScoringContactBehavior(points: Points.twoHundredThousand),
BumperNoisyBehavior(), BumperNoiseBehavior(),
], ],
)..initialPosition = Vector2(18.55, -59.35), )..initialPosition = Vector2(18.55, -59.35),
DashNestBumper.a( DashNestBumper.a(
children: [ children: [
ScoringContactBehavior(points: Points.twentyThousand), ScoringContactBehavior(points: Points.twentyThousand),
BumperNoisyBehavior(), BumperNoiseBehavior(),
], ],
)..initialPosition = Vector2(8.95, -51.95), )..initialPosition = Vector2(8.95, -51.95),
DashNestBumper.b( DashNestBumper.b(
children: [ children: [
ScoringContactBehavior(points: Points.twentyThousand), ScoringContactBehavior(points: Points.twentyThousand),
BumperNoisyBehavior(), BumperNoiseBehavior(),
], ],
)..initialPosition = Vector2(22.3, -46.75), )..initialPosition = Vector2(22.3, -46.75),
DashAnimatronic()..position = Vector2(20, -66), DashAnimatronic()..position = Vector2(20, -66),

@ -18,19 +18,19 @@ class SparkyScorch extends Component {
SparkyBumper.a( SparkyBumper.a(
children: [ children: [
ScoringContactBehavior(points: Points.twentyThousand), ScoringContactBehavior(points: Points.twentyThousand),
BumperNoisyBehavior(), BumperNoiseBehavior(),
], ],
)..initialPosition = Vector2(-22.9, -41.65), )..initialPosition = Vector2(-22.9, -41.65),
SparkyBumper.b( SparkyBumper.b(
children: [ children: [
ScoringContactBehavior(points: Points.twentyThousand), ScoringContactBehavior(points: Points.twentyThousand),
BumperNoisyBehavior(), BumperNoiseBehavior(),
], ],
)..initialPosition = Vector2(-21.25, -57.9), )..initialPosition = Vector2(-21.25, -57.9),
SparkyBumper.c( SparkyBumper.c(
children: [ children: [
ScoringContactBehavior(points: Points.twentyThousand), ScoringContactBehavior(points: Points.twentyThousand),
BumperNoisyBehavior(), BumperNoiseBehavior(),
], ],
)..initialPosition = Vector2(-3.3, -52.55), )..initialPosition = Vector2(-3.3, -52.55),
SparkyComputerSensor()..initialPosition = Vector2(-13, -49.9), SparkyComputerSensor()..initialPosition = Vector2(-13, -49.9),

@ -23,7 +23,7 @@ class _MockContact extends Mock implements Contact {}
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();
group('BumperNoisyBehavior', () {}); group('BumperNoiseBehavior', () {});
late PinballPlayer player; late PinballPlayer player;
final flameTester = FlameTester( final flameTester = FlameTester(
@ -37,7 +37,7 @@ void main() {
flameTester.testGameWidget( flameTester.testGameWidget(
'plays bumper sound', 'plays bumper sound',
setUp: (game, _) async { setUp: (game, _) async {
final behavior = BumperNoisyBehavior(); final behavior = BumperNoiseBehavior();
final parent = _TestBodyComponent(); final parent = _TestBodyComponent();
await game.ensureAdd(parent); await game.ensureAdd(parent);
await parent.ensureAdd(behavior); await parent.ensureAdd(behavior);

@ -2,7 +2,7 @@
import 'package:flame_test/flame_test.dart'; import 'package:flame_test/flame_test.dart';
import 'package:flutter_test/flutter_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/components/android_acres/behaviors/behaviors.dart';
import 'package:pinball/game/game.dart'; import 'package:pinball/game/game.dart';
import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/pinball_components.dart';
@ -103,13 +103,13 @@ void main() {
); );
flameTester.test( flameTester.test(
'three AndroidBumpers with BumperNoisyBehavior', 'three AndroidBumpers with BumperNoiseBehavior',
(game) async { (game) async {
await game.ensureAdd(AndroidAcres()); await game.ensureAdd(AndroidAcres());
final bumpers = game.descendants().whereType<AndroidBumper>(); final bumpers = game.descendants().whereType<AndroidBumper>();
for (final bumper in bumpers) { for (final bumper in bumpers) {
expect( expect(
bumper.firstChild<BumperNoisyBehavior>(), bumper.firstChild<BumperNoiseBehavior>(),
isNotNull, isNotNull,
); );
} }

@ -135,7 +135,7 @@ void main() {
}); });
flameTester.test( flameTester.test(
'adds the PlungerNoisyBehavior plunger is released', 'adds the PlungerNoiseBehavior plunger is released',
(game) async { (game) async {
await game.ensureAdd(plunger); await game.ensureAdd(plunger);
plunger.body.setTransform(Vector2(0, 1), 0); plunger.body.setTransform(Vector2(0, 1), 0);
@ -143,23 +143,23 @@ void main() {
await game.ready(); await game.ready();
final count = final count =
game.descendants().whereType<PlungerNoisyBehavior>().length; game.descendants().whereType<PlungerNoiseBehavior>().length;
expect(count, equals(1)); expect(count, equals(1));
}, },
); );
}); });
group('PlungerNoisyBehavior', () { group('PlungerNoiseBehavior', () {
late PinballGame game; late PinballGame game;
late PinballPlayer player; late PinballPlayer player;
late PlungerNoisyBehavior behavior; late PlungerNoiseBehavior behavior;
setUp(() { setUp(() {
game = _MockPinballGame(); game = _MockPinballGame();
player = _MockPinballPlayer(); player = _MockPinballPlayer();
when(() => game.player).thenReturn(player); when(() => game.player).thenReturn(player);
behavior = PlungerNoisyBehavior(); behavior = PlungerNoiseBehavior();
behavior.mockGameRef(game); behavior.mockGameRef(game);
}); });

@ -76,14 +76,14 @@ void main() {
); );
flameTester.test( flameTester.test(
'three DashNestBumpers with BumperNoisyBehavior', 'three DashNestBumpers with BumperNoiseBehavior',
(game) async { (game) async {
final flutterForest = FlutterForest(); final flutterForest = FlutterForest();
await game.ensureAdd(ZCanvasComponent(children: [flutterForest])); await game.ensureAdd(ZCanvasComponent(children: [flutterForest]));
final bumpers = game.descendants().whereType<DashNestBumper>(); final bumpers = game.descendants().whereType<DashNestBumper>();
for (final bumper in bumpers) { for (final bumper in bumpers) {
expect( expect(
bumper.firstChild<BumperNoisyBehavior>(), bumper.firstChild<BumperNoiseBehavior>(),
isNotNull, isNotNull,
); );
} }

@ -77,13 +77,13 @@ void main() {
); );
flameTester.test( flameTester.test(
'three SparkyBumpers with BumperNoisyBehavior', 'three SparkyBumpers with BumperNoiseBehavior',
(game) async { (game) async {
await game.ensureAdd(SparkyScorch()); await game.ensureAdd(SparkyScorch());
final bumpers = game.descendants().whereType<SparkyBumper>(); final bumpers = game.descendants().whereType<SparkyBumper>();
for (final bumper in bumpers) { for (final bumper in bumpers) {
expect( expect(
bumper.firstChild<BumperNoisyBehavior>(), bumper.firstChild<BumperNoiseBehavior>(),
isNotNull, isNotNull,
); );
} }

Loading…
Cancel
Save