refactor: renamed ScoringBehavior to ScoringContactBehavior

pull/329/head
alestiago 3 years ago
parent f38f18d60a
commit 6e42bea150

@ -6,12 +6,13 @@ import 'package:pinball/game/game.dart';
import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart'; import 'package:pinball_flame/pinball_flame.dart';
/// {@template scoring_behavior} /// {@template scoring_contact_behavior}
/// Adds points to the score when the [Ball] contacts the [parent]. /// Adds points to the score when the [Ball] contacts the [parent].
/// {@endtemplate} /// {@endtemplate}
class ScoringBehavior extends ContactBehavior with HasGameRef<PinballGame> { class ScoringContactBehavior extends ContactBehavior
/// {@macro scoring_behavior} with HasGameRef<PinballGame> {
ScoringBehavior({ /// {@macro scoring_contact_behavior}
ScoringContactBehavior({
required Points points, required Points points,
}) : _points = points; }) : _points = points;

@ -20,24 +20,24 @@ class AndroidAcres extends Component {
AndroidSpaceship(position: Vector2(-26.5, -28.5)), AndroidSpaceship(position: Vector2(-26.5, -28.5)),
AndroidAnimatronic( AndroidAnimatronic(
children: [ children: [
ScoringBehavior(points: Points.twoHundredThousand), ScoringContactBehavior(points: Points.twoHundredThousand),
], ],
)..initialPosition = Vector2(-26, -28.25), )..initialPosition = Vector2(-26, -28.25),
AndroidBumper.a( AndroidBumper.a(
children: [ children: [
ScoringBehavior(points: Points.twentyThousand), ScoringContactBehavior(points: Points.twentyThousand),
BumperNoisyBehavior(), BumperNoisyBehavior(),
], ],
)..initialPosition = Vector2(-25, 1.3), )..initialPosition = Vector2(-25, 1.3),
AndroidBumper.b( AndroidBumper.b(
children: [ children: [
ScoringBehavior(points: Points.twentyThousand), ScoringContactBehavior(points: Points.twentyThousand),
BumperNoisyBehavior(), BumperNoisyBehavior(),
], ],
)..initialPosition = Vector2(-32.8, -9.2), )..initialPosition = Vector2(-32.8, -9.2),
AndroidBumper.cow( AndroidBumper.cow(
children: [ children: [
ScoringBehavior(points: Points.twentyThousand), ScoringContactBehavior(points: Points.twentyThousand),
BumperNoisyBehavior(), BumperNoisyBehavior(),
], ],
)..initialPosition = Vector2(-20.5, -13.8), )..initialPosition = Vector2(-20.5, -13.8),

@ -52,7 +52,8 @@ class _BottomGroupSide extends Component {
final kicker = Kicker( final kicker = Kicker(
side: _side, side: _side,
children: [ children: [
ScoringBehavior(points: Points.fiveThousand)..applyTo(['bouncy_edge']), ScoringContactBehavior(points: Points.fiveThousand)
..applyTo(['bouncy_edge']),
], ],
)..initialPosition = Vector2( )..initialPosition = Vector2(
(22.64 * direction) + centerXAdjustment, (22.64 * direction) + centerXAdjustment,

@ -17,7 +17,7 @@ class DinoDesert extends Component {
children: [ children: [
ChromeDino( ChromeDino(
children: [ children: [
ScoringBehavior(points: Points.twoHundredThousand) ScoringContactBehavior(points: Points.twoHundredThousand)
..applyTo(['inside_mouth']), ..applyTo(['inside_mouth']),
], ],
)..initialPosition = Vector2(12.6, -6.9), )..initialPosition = Vector2(12.6, -6.9),

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

@ -16,27 +16,27 @@ class GoogleWord extends Component with ZIndex {
children: [ children: [
GoogleLetter( GoogleLetter(
0, 0,
children: [ScoringBehavior(points: Points.fiveThousand)], children: [ScoringContactBehavior(points: Points.fiveThousand)],
)..initialPosition = position + Vector2(-13.1, 1.72), )..initialPosition = position + Vector2(-13.1, 1.72),
GoogleLetter( GoogleLetter(
1, 1,
children: [ScoringBehavior(points: Points.fiveThousand)], children: [ScoringContactBehavior(points: Points.fiveThousand)],
)..initialPosition = position + Vector2(-8.33, -0.75), )..initialPosition = position + Vector2(-8.33, -0.75),
GoogleLetter( GoogleLetter(
2, 2,
children: [ScoringBehavior(points: Points.fiveThousand)], children: [ScoringContactBehavior(points: Points.fiveThousand)],
)..initialPosition = position + Vector2(-2.88, -1.85), )..initialPosition = position + Vector2(-2.88, -1.85),
GoogleLetter( GoogleLetter(
3, 3,
children: [ScoringBehavior(points: Points.fiveThousand)], children: [ScoringContactBehavior(points: Points.fiveThousand)],
)..initialPosition = position + Vector2(2.88, -1.85), )..initialPosition = position + Vector2(2.88, -1.85),
GoogleLetter( GoogleLetter(
4, 4,
children: [ScoringBehavior(points: Points.fiveThousand)], children: [ScoringContactBehavior(points: Points.fiveThousand)],
)..initialPosition = position + Vector2(8.33, -0.75), )..initialPosition = position + Vector2(8.33, -0.75),
GoogleLetter( GoogleLetter(
5, 5,
children: [ScoringBehavior(points: Points.fiveThousand)], children: [ScoringContactBehavior(points: Points.fiveThousand)],
)..initialPosition = position + Vector2(13.1, 1.72), )..initialPosition = position + Vector2(13.1, 1.72),
GoogleWordBonusBehavior(), GoogleWordBonusBehavior(),
], ],

@ -17,19 +17,19 @@ class SparkyScorch extends Component {
children: [ children: [
SparkyBumper.a( SparkyBumper.a(
children: [ children: [
ScoringBehavior(points: Points.twentyThousand), ScoringContactBehavior(points: Points.twentyThousand),
BumperNoisyBehavior(), BumperNoisyBehavior(),
], ],
)..initialPosition = Vector2(-22.9, -41.65), )..initialPosition = Vector2(-22.9, -41.65),
SparkyBumper.b( SparkyBumper.b(
children: [ children: [
ScoringBehavior(points: Points.twentyThousand), ScoringContactBehavior(points: Points.twentyThousand),
BumperNoisyBehavior(), BumperNoisyBehavior(),
], ],
)..initialPosition = Vector2(-21.25, -57.9), )..initialPosition = Vector2(-21.25, -57.9),
SparkyBumper.c( SparkyBumper.c(
children: [ children: [
ScoringBehavior(points: Points.twentyThousand), ScoringContactBehavior(points: Points.twentyThousand),
BumperNoisyBehavior(), BumperNoisyBehavior(),
], ],
)..initialPosition = Vector2(-3.3, -52.55), )..initialPosition = Vector2(-3.3, -52.55),
@ -51,7 +51,7 @@ class SparkyComputerSensor extends BodyComponent
: super( : super(
renderBody: false, renderBody: false,
children: [ children: [
ScoringBehavior(points: Points.twentyThousand), ScoringContactBehavior(points: Points.twentyThousand),
], ],
); );

@ -34,7 +34,7 @@ void main() {
Assets.images.score.oneMillion.keyName, Assets.images.score.oneMillion.keyName,
]; ];
group('ScoringBehavior', () { group('ScoringContactBehavior', () {
group('beginContact', () { group('beginContact', () {
late GameBloc bloc; late GameBloc bloc;
late Ball ball; late Ball ball;
@ -69,12 +69,12 @@ void main() {
'emits Scored event with points', 'emits Scored event with points',
setUp: (game, tester) async { setUp: (game, tester) async {
const points = Points.oneMillion; const points = Points.oneMillion;
final scoringBehavior = ScoringBehavior(points: points); final behavior = ScoringContactBehavior(points: points);
await parent.add(scoringBehavior); await parent.add(behavior);
final canvas = ZCanvasComponent(children: [parent]); final canvas = ZCanvasComponent(children: [parent]);
await game.ensureAdd(canvas); await game.ensureAdd(canvas);
scoringBehavior.beginContact(ball, _MockContact()); behavior.beginContact(ball, _MockContact());
verify( verify(
() => bloc.add( () => bloc.add(
@ -88,12 +88,12 @@ void main() {
"adds a ScoreComponent at Ball's position with points", "adds a ScoreComponent at Ball's position with points",
setUp: (game, tester) async { setUp: (game, tester) async {
const points = Points.oneMillion; const points = Points.oneMillion;
final scoringBehavior = ScoringBehavior(points: points); final behavior = ScoringContactBehavior(points: points);
await parent.add(scoringBehavior); await parent.add(behavior);
final canvas = ZCanvasComponent(children: [parent]); final canvas = ZCanvasComponent(children: [parent]);
await game.ensureAdd(canvas); await game.ensureAdd(canvas);
scoringBehavior.beginContact(ball, _MockContact()); behavior.beginContact(ball, _MockContact());
await game.ready(); await game.ready();
final scoreText = game.descendants().whereType<ScoreComponent>(); final scoreText = game.descendants().whereType<ScoreComponent>();

@ -68,13 +68,13 @@ void main() {
group('adds', () { group('adds', () {
flameTester.test( flameTester.test(
'ScoringBehavior to ChromeDino', 'ScoringContactBehavior to ChromeDino',
(game) async { (game) async {
await game.ensureAdd(DinoDesert()); await game.ensureAdd(DinoDesert());
final chromeDino = game.descendants().whereType<ChromeDino>().single; final chromeDino = game.descendants().whereType<ChromeDino>().single;
expect( expect(
chromeDino.firstChild<ScoringBehavior>(), chromeDino.firstChild<ScoringContactBehavior>(),
isNotNull, isNotNull,
); );
}, },

Loading…
Cancel
Save