msb-public
/
pinball
mirror of https://github.com/flutter/pinball.git
1
0
Code Issues Projects Releases Wiki Activity

refactor: changed all ocurrences of scoretext to use score enum as value

Browse Source
pull/276/head
RuiAlonso 3 years ago
parent 4940afe62b
commit 9d8d5421fc
10 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File

6
lib/game/components/android_acres.dart
Unescape View File

@ -16,17 +16,17 @@ class AndroidAcres extends Blueprint {
components: [ components: [
AndroidBumper.a( AndroidBumper.a(
children: [ children: [
ScoringBehavior(points: 20000), ScoringBehavior(points: Score.points_20k),
], ],
)..initialPosition = Vector2(-25, 1.3), )..initialPosition = Vector2(-25, 1.3),
AndroidBumper.b( AndroidBumper.b(
children: [ children: [
ScoringBehavior(points: 20000), ScoringBehavior(points: Score.points_20k),
], ],
)..initialPosition = Vector2(-32.8, -9.2), )..initialPosition = Vector2(-32.8, -9.2),
AndroidBumper.cow( AndroidBumper.cow(
children: [ children: [
ScoringBehavior(points: 20), ScoringBehavior(points: Score.points_20k),
], ],
)..initialPosition = Vector2(-20.5, -13.8), )..initialPosition = Vector2(-20.5, -13.8),
], ],

2
lib/game/components/bottom_group.dart
Unescape View File

@ -49,7 +49,7 @@ class _BottomGroupSide extends Component {
final kicker = Kicker( final kicker = Kicker(
side: _side, side: _side,
children: [ children: [
ScoringBehavior(points: 5000), ScoringBehavior(points: Score.points_5k),
], ],
)..initialPosition = Vector2( )..initialPosition = Vector2(
(22.4 * direction) + centerXAdjustment, (22.4 * direction) + centerXAdjustment,

8
lib/game/components/flutter_forest/flutter_forest.dart
Unescape View File

@ -18,22 +18,22 @@ class FlutterForest extends Component {
children: [ children: [
Signpost( Signpost(
children: [ children: [
ScoringBehavior(points: 20), ScoringBehavior(points: Score.points_5k),
], ],
)..initialPosition = Vector2(8.35, -58.3), )..initialPosition = Vector2(8.35, -58.3),
DashNestBumper.main( DashNestBumper.main(
children: [ children: [
ScoringBehavior(points: 200000), ScoringBehavior(points: Score.points_200k),
], ],
)..initialPosition = Vector2(18.55, -59.35), )..initialPosition = Vector2(18.55, -59.35),
DashNestBumper.a( DashNestBumper.a(
children: [ children: [
ScoringBehavior(points: 20000), ScoringBehavior(points: Score.points_20k),
], ],
)..initialPosition = Vector2(8.95, -51.95), )..initialPosition = Vector2(8.95, -51.95),
DashNestBumper.b( DashNestBumper.b(
children: [ children: [
ScoringBehavior(points: 20000), ScoringBehavior(points: Score.points_20k),
], ],
)..initialPosition = Vector2(23.3, -46.75), )..initialPosition = Vector2(23.3, -46.75),
DashAnimatronic()..position = Vector2(20, -66), DashAnimatronic()..position = Vector2(20, -66),

12
lib/game/components/google_word/google_word.dart
Unescape View File

@ -15,27 +15,27 @@ class GoogleWord extends Component {
children: [ children: [
GoogleLetter( GoogleLetter(
0, 0,
children: [ScoringBehavior(points: 5000)], children: [ScoringBehavior(points: Score.points_5k)],
)..initialPosition = position + Vector2(-12.92, 1.82), )..initialPosition = position + Vector2(-12.92, 1.82),
GoogleLetter( GoogleLetter(
1, 1,
children: [ScoringBehavior(points: 5000)], children: [ScoringBehavior(points: Score.points_5k)],
)..initialPosition = position + Vector2(-8.33, -0.65), )..initialPosition = position + Vector2(-8.33, -0.65),
GoogleLetter( GoogleLetter(
2, 2,
children: [ScoringBehavior(points: 5000)], children: [ScoringBehavior(points: Score.points_5k)],
)..initialPosition = position + Vector2(-2.88, -1.75), )..initialPosition = position + Vector2(-2.88, -1.75),
GoogleLetter( GoogleLetter(
3, 3,
children: [ScoringBehavior(points: 5000)], children: [ScoringBehavior(points: Score.points_5k)],
)..initialPosition = position + Vector2(2.88, -1.75), )..initialPosition = position + Vector2(2.88, -1.75),
GoogleLetter( GoogleLetter(
4, 4,
children: [ScoringBehavior(points: 5000)], children: [ScoringBehavior(points: Score.points_5k)],
)..initialPosition = position + Vector2(8.33, -0.65), )..initialPosition = position + Vector2(8.33, -0.65),
GoogleLetter( GoogleLetter(
5, 5,
children: [ScoringBehavior(points: 5000)], children: [ScoringBehavior(points: Score.points_5k)],
)..initialPosition = position + Vector2(12.92, 1.82), )..initialPosition = position + Vector2(12.92, 1.82),
GoogleWordBonusBehavior(), GoogleWordBonusBehavior(),
], ],

8
lib/game/components/scoring_behavior.dart
Unescape View File

@ -12,21 +12,21 @@ import 'package:pinball_flame/pinball_flame.dart';
class ScoringBehavior extends ContactBehavior with HasGameRef<PinballGame> { class ScoringBehavior extends ContactBehavior with HasGameRef<PinballGame> {
/// {@macro scoring_behavior} /// {@macro scoring_behavior}
ScoringBehavior({ ScoringBehavior({
required int points, required Score points,
}) : _points = points; }) : _points = points;
final int _points; final Score _points;
@override @override
void beginContact(Object other, Contact contact) { void beginContact(Object other, Contact contact) {
super.beginContact(other, contact); super.beginContact(other, contact);
if (other is! Ball) return; if (other is! Ball) return;
gameRef.read<GameBloc>().add(Scored(points: _points)); gameRef.read<GameBloc>().add(Scored(points: _points.value));
gameRef.audio.score(); gameRef.audio.score();
gameRef.add( gameRef.add(
ScoreText( ScoreText(
text: _points.toString(), score: _points,
position: other.body.position, position: other.body.position,
), ),
); );

8
lib/game/components/sparky_fire_zone.dart
Unescape View File

@ -18,17 +18,17 @@ class SparkyFireZone extends Blueprint {
components: [ components: [
SparkyBumper.a( SparkyBumper.a(
children: [ children: [
ScoringBehavior(points: 20000), ScoringBehavior(points: Score.points_20k),
], ],
)..initialPosition = Vector2(-22.9, -41.65), )..initialPosition = Vector2(-22.9, -41.65),
SparkyBumper.b( SparkyBumper.b(
children: [ children: [
ScoringBehavior(points: 20000), ScoringBehavior(points: Score.points_20k),
], ],
)..initialPosition = Vector2(-21.25, -57.9), )..initialPosition = Vector2(-21.25, -57.9),
SparkyBumper.c( SparkyBumper.c(
children: [ children: [
ScoringBehavior(points: 20000), ScoringBehavior(points: Score.points_20k),
], ],
)..initialPosition = Vector2(-3.3, -52.55), )..initialPosition = Vector2(-3.3, -52.55),
SparkyComputerSensor()..initialPosition = Vector2(-13, -49.8), SparkyComputerSensor()..initialPosition = Vector2(-13, -49.8),
@ -51,7 +51,7 @@ class SparkyComputerSensor extends BodyComponent
: super( : super(
renderBody: false, renderBody: false,
children: [ children: [
ScoringBehavior(points: 200000), ScoringBehavior(points: Score.points_20k),
], ],
); );

5
packages/pinball_components/sandbox/lib/stories/backboard/backboard_game_over_game.dart
Unescape View File

@ -42,9 +42,10 @@ class BackboardGameOverGame extends AssetsGame
onSubmit: (initials) { onSubmit: (initials) {
add( add(
ScoreText( ScoreText(
text: 'User $initials made $score', score: Score.points_6m,
//text: 'User $initials made $score',
position: Vector2(0, 50), position: Vector2(0, 50),
color: Colors.pink, //color: Colors.pink,
), ),
); );
}, },

6
packages/pinball_components/sandbox/lib/stories/score_text/score_text_game.dart
Unescape View File

@ -21,10 +21,12 @@ class ScoreTextGame extends AssetsGame with TapDetector {
@override @override
void onTapUp(TapUpInfo info) { void onTapUp(TapUpInfo info) {
final index = random.nextInt(Score.values.length);
final score = Score.values[index];
add( add(
ScoreText( ScoreText(
text: random.nextInt(100000).toString(), score: score,
color: Colors.white,
position: info.eventPosition.game..multiply(Vector2(1, -1)), position: info.eventPosition.game..multiply(Vector2(1, -1)),
), ),
); );

9
packages/pinball_components/test/src/components/score_text_effects_test.dart
Unescape View File

@ -19,9 +19,8 @@ void main() {
game.camera.followVector2(Vector2.zero()); game.camera.followVector2(Vector2.zero());
await game.ensureAdd( await game.ensureAdd(
ScoreText( ScoreText(
text: '123', score: Score.points_6m,
position: Vector2.zero(), position: Vector2.zero(),
color: Colors.white,
), ),
); );
}, },
@ -37,9 +36,8 @@ void main() {
game.camera.followVector2(Vector2.zero()); game.camera.followVector2(Vector2.zero());
await game.ensureAdd( await game.ensureAdd(
ScoreText( ScoreText(
text: '123', score: Score.points_6m,
position: Vector2.zero(), position: Vector2.zero(),
color: Colors.white,
), ),
); );
@ -58,9 +56,8 @@ void main() {
game.camera.followVector2(Vector2.zero()); game.camera.followVector2(Vector2.zero());
await game.ensureAdd( await game.ensureAdd(
ScoreText( ScoreText(
text: '123', score: Score.points_6m,
position: Vector2.zero(), position: Vector2.zero(),
color: Colors.white,
), ),
); );

11
test/game/components/scoring_behavior_test.dart
Unescape View File

@ -56,7 +56,7 @@ void main() {
'emits Scored event with points', 'emits Scored event with points',
setUp: (game, tester) async { setUp: (game, tester) async {
const points = 20; const points = 20;
final scoringBehavior = ScoringBehavior(points: points); final scoringBehavior = ScoringBehavior(points: Score.points_6m);
await parent.add(scoringBehavior); await parent.add(scoringBehavior);
await game.ensureAdd(parent); await game.ensureAdd(parent);
@ -74,7 +74,7 @@ void main() {
'plays score sound', 'plays score sound',
setUp: (game, tester) async { setUp: (game, tester) async {
const points = 20; const points = 20;
final scoringBehavior = ScoringBehavior(points: points); final scoringBehavior = ScoringBehavior(points: Score.points_6m);
await parent.add(scoringBehavior); await parent.add(scoringBehavior);
await game.ensureAdd(parent); await game.ensureAdd(parent);
@ -87,8 +87,7 @@ void main() {
flameBlocTester.testGameWidget( flameBlocTester.testGameWidget(
"adds a ScoreText component at Ball's position with points", "adds a ScoreText component at Ball's position with points",
setUp: (game, tester) async { setUp: (game, tester) async {
const points = 20; final scoringBehavior = ScoringBehavior(points: Score.points_6m);
final scoringBehavior = ScoringBehavior(points: points);
await parent.add(scoringBehavior); await parent.add(scoringBehavior);
await game.ensureAdd(parent); await game.ensureAdd(parent);
@ -98,8 +97,8 @@ void main() {
final scoreText = game.descendants().whereType<ScoreText>(); final scoreText = game.descendants().whereType<ScoreText>();
expect(scoreText.length, equals(1)); expect(scoreText.length, equals(1));
expect( expect(
scoreText.first.text, scoreText.first.score,
equals(points.toString()), equals(Score.points_6m),
); );
expect( expect(
scoreText.first.position, scoreText.first.position,

Write Preview
Loading…
Cancel
Save