refactor: removed unused points and changed enum names

pull/276/head
RuiAlonso 3 years ago
parent 03f666f9f9
commit 965d7ad70d

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

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

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

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

@ -16,17 +16,17 @@ class SparkyScorch extends Blueprint {
components: [ components: [
SparkyBumper.a( SparkyBumper.a(
children: [ children: [
ScoringBehavior(points: Points.points_20k), ScoringBehavior(points: Points.twentyThousand),
], ],
)..initialPosition = Vector2(-22.9, -41.65), )..initialPosition = Vector2(-22.9, -41.65),
SparkyBumper.b( SparkyBumper.b(
children: [ children: [
ScoringBehavior(points: Points.points_20k), ScoringBehavior(points: Points.twentyThousand),
], ],
)..initialPosition = Vector2(-21.25, -57.9), )..initialPosition = Vector2(-21.25, -57.9),
SparkyBumper.c( SparkyBumper.c(
children: [ children: [
ScoringBehavior(points: Points.points_20k), ScoringBehavior(points: Points.twentyThousand),
], ],
)..initialPosition = Vector2(-3.3, -52.55), )..initialPosition = Vector2(-3.3, -52.55),
SparkyComputerSensor()..initialPosition = Vector2(-13, -49.8), SparkyComputerSensor()..initialPosition = Vector2(-13, -49.8),
@ -49,7 +49,7 @@ class SparkyComputerSensor extends BodyComponent
: super( : super(
renderBody: false, renderBody: false,
children: [ children: [
ScoringBehavior(points: Points.points_20k), ScoringBehavior(points: Points.twentyThousand),
], ],
); );

@ -116,29 +116,10 @@ extension PinballGameAssetsX on PinballGame {
images.load(components.Assets.images.multiplier.x5.dimmed.keyName), images.load(components.Assets.images.multiplier.x5.dimmed.keyName),
images.load(components.Assets.images.multiplier.x6.lit.keyName), images.load(components.Assets.images.multiplier.x6.lit.keyName),
images.load(components.Assets.images.multiplier.x6.dimmed.keyName), images.load(components.Assets.images.multiplier.x6.dimmed.keyName),
images.load(components.Assets.images.score.points5k.keyName), images.load(components.Assets.images.score.fiveThousand.keyName),
images.load(components.Assets.images.score.points10k.keyName), images.load(components.Assets.images.score.twentyThousand.keyName),
images.load(components.Assets.images.score.points15k.keyName), images.load(components.Assets.images.score.twoHundredThousand.keyName),
images.load(components.Assets.images.score.points20k.keyName), images.load(components.Assets.images.score.oneMillion.keyName),
images.load(components.Assets.images.score.points25k.keyName),
images.load(components.Assets.images.score.points30k.keyName),
images.load(components.Assets.images.score.points40k.keyName),
images.load(components.Assets.images.score.points50k.keyName),
images.load(components.Assets.images.score.points60k.keyName),
images.load(components.Assets.images.score.points80k.keyName),
images.load(components.Assets.images.score.points100k.keyName),
images.load(components.Assets.images.score.points120k.keyName),
images.load(components.Assets.images.score.points200k.keyName),
images.load(components.Assets.images.score.points400k.keyName),
images.load(components.Assets.images.score.points600k.keyName),
images.load(components.Assets.images.score.points800k.keyName),
images.load(components.Assets.images.score.points1m.keyName),
images.load(components.Assets.images.score.points1m2.keyName),
images.load(components.Assets.images.score.points2m.keyName),
images.load(components.Assets.images.score.points3m.keyName),
images.load(components.Assets.images.score.points4m.keyName),
images.load(components.Assets.images.score.points5m.keyName),
images.load(components.Assets.images.score.points6m.keyName),
images.load(dashTheme.leaderboardIcon.keyName), images.load(dashTheme.leaderboardIcon.keyName),
images.load(sparkyTheme.leaderboardIcon.keyName), images.load(sparkyTheme.leaderboardIcon.keyName),
images.load(androidTheme.leaderboardIcon.keyName), images.load(androidTheme.leaderboardIcon.keyName),

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

@ -221,97 +221,21 @@ class $AssetsImagesPlungerGen {
class $AssetsImagesScoreGen { class $AssetsImagesScoreGen {
const $AssetsImagesScoreGen(); const $AssetsImagesScoreGen();
/// File path: assets/images/score/points-100k.png /// File path: assets/images/score/five-thousand.png
AssetGenImage get points100k => AssetGenImage get fiveThousand =>
const AssetGenImage('assets/images/score/points-100k.png'); const AssetGenImage('assets/images/score/five-thousand.png');
/// File path: assets/images/score/points-10k.png /// File path: assets/images/score/one-million.png
AssetGenImage get points10k => AssetGenImage get oneMillion =>
const AssetGenImage('assets/images/score/points-10k.png'); const AssetGenImage('assets/images/score/one-million.png');
/// File path: assets/images/score/points-120k.png /// File path: assets/images/score/twenty-thousand.png
AssetGenImage get points120k => AssetGenImage get twentyThousand =>
const AssetGenImage('assets/images/score/points-120k.png'); const AssetGenImage('assets/images/score/twenty-thousand.png');
/// File path: assets/images/score/points-15k.png /// File path: assets/images/score/two-hundred-thousand.png
AssetGenImage get points15k => AssetGenImage get twoHundredThousand =>
const AssetGenImage('assets/images/score/points-15k.png'); const AssetGenImage('assets/images/score/two-hundred-thousand.png');
/// File path: assets/images/score/points-1m.png
AssetGenImage get points1m =>
const AssetGenImage('assets/images/score/points-1m.png');
/// File path: assets/images/score/points-1m2.png
AssetGenImage get points1m2 =>
const AssetGenImage('assets/images/score/points-1m2.png');
/// File path: assets/images/score/points-200k.png
AssetGenImage get points200k =>
const AssetGenImage('assets/images/score/points-200k.png');
/// File path: assets/images/score/points-20k.png
AssetGenImage get points20k =>
const AssetGenImage('assets/images/score/points-20k.png');
/// File path: assets/images/score/points-25k.png
AssetGenImage get points25k =>
const AssetGenImage('assets/images/score/points-25k.png');
/// File path: assets/images/score/points-2m.png
AssetGenImage get points2m =>
const AssetGenImage('assets/images/score/points-2m.png');
/// File path: assets/images/score/points-30k.png
AssetGenImage get points30k =>
const AssetGenImage('assets/images/score/points-30k.png');
/// File path: assets/images/score/points-3m.png
AssetGenImage get points3m =>
const AssetGenImage('assets/images/score/points-3m.png');
/// File path: assets/images/score/points-400k.png
AssetGenImage get points400k =>
const AssetGenImage('assets/images/score/points-400k.png');
/// File path: assets/images/score/points-40k.png
AssetGenImage get points40k =>
const AssetGenImage('assets/images/score/points-40k.png');
/// File path: assets/images/score/points-4m.png
AssetGenImage get points4m =>
const AssetGenImage('assets/images/score/points-4m.png');
/// File path: assets/images/score/points-50k.png
AssetGenImage get points50k =>
const AssetGenImage('assets/images/score/points-50k.png');
/// File path: assets/images/score/points-5k.png
AssetGenImage get points5k =>
const AssetGenImage('assets/images/score/points-5k.png');
/// File path: assets/images/score/points-5m.png
AssetGenImage get points5m =>
const AssetGenImage('assets/images/score/points-5m.png');
/// File path: assets/images/score/points-600k.png
AssetGenImage get points600k =>
const AssetGenImage('assets/images/score/points-600k.png');
/// File path: assets/images/score/points-60k.png
AssetGenImage get points60k =>
const AssetGenImage('assets/images/score/points-60k.png');
/// File path: assets/images/score/points-6m.png
AssetGenImage get points6m =>
const AssetGenImage('assets/images/score/points-6m.png');
/// File path: assets/images/score/points-800k.png
AssetGenImage get points800k =>
const AssetGenImage('assets/images/score/points-800k.png');
/// File path: assets/images/score/points-80k.png
AssetGenImage get points80k =>
const AssetGenImage('assets/images/score/points-80k.png');
} }
class $AssetsImagesSignpostGen { class $AssetsImagesSignpostGen {

@ -7,29 +7,10 @@ import 'package:flame/effects.dart';
import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/pinball_components.dart';
enum Points { enum Points {
points_5k, fiveThousand,
points_10k, twentyThousand,
points_15k, twoHundredThousand,
points_20k, oneMillion,
points_25k,
points_30k,
points_40k,
points_50k,
points_60k,
points_80k,
points_100k,
points_120k,
points_200k,
points_400k,
points_600k,
points_800k,
points_1m,
points_1m2,
points_2m,
points_3m,
points_4m,
points_5m,
points_6m,
} }
/// {@template score_component} /// {@template score_component}
@ -81,52 +62,14 @@ class ScoreComponent extends SpriteComponent with HasGameRef {
extension PointsX on Points { extension PointsX on Points {
int get value { int get value {
switch (this) { switch (this) {
case Points.points_5k: case Points.fiveThousand:
return 5000; return 5000;
case Points.points_10k: case Points.twentyThousand:
return 10000;
case Points.points_15k:
return 15000;
case Points.points_20k:
return 20000; return 20000;
case Points.points_25k: case Points.twoHundredThousand:
return 25000;
case Points.points_30k:
return 30000;
case Points.points_40k:
return 40000;
case Points.points_50k:
return 50000;
case Points.points_60k:
return 60000;
case Points.points_80k:
return 80000;
case Points.points_100k:
return 100000;
case Points.points_120k:
return 120000;
case Points.points_200k:
return 200000; return 200000;
case Points.points_400k: case Points.oneMillion:
return 400000;
case Points.points_600k:
return 600000;
case Points.points_800k:
return 800000;
case Points.points_1m:
return 1000000; return 1000000;
case Points.points_1m2:
return 1200000;
case Points.points_2m:
return 2000000;
case Points.points_3m:
return 3000000;
case Points.points_4m:
return 4000000;
case Points.points_5m:
return 5000000;
case Points.points_6m:
return 6000000;
} }
} }
} }
@ -134,52 +77,14 @@ extension PointsX on Points {
extension on Points { extension on Points {
String get asset { String get asset {
switch (this) { switch (this) {
case Points.points_5k: case Points.fiveThousand:
return Assets.images.score.points5k.keyName; return Assets.images.score.fiveThousand.keyName;
case Points.points_10k: case Points.twentyThousand:
return Assets.images.score.points10k.keyName; return Assets.images.score.twentyThousand.keyName;
case Points.points_15k: case Points.twoHundredThousand:
return Assets.images.score.points15k.keyName; return Assets.images.score.twoHundredThousand.keyName;
case Points.points_20k: case Points.oneMillion:
return Assets.images.score.points20k.keyName; return Assets.images.score.oneMillion.keyName;
case Points.points_25k:
return Assets.images.score.points25k.keyName;
case Points.points_30k:
return Assets.images.score.points30k.keyName;
case Points.points_40k:
return Assets.images.score.points40k.keyName;
case Points.points_50k:
return Assets.images.score.points50k.keyName;
case Points.points_60k:
return Assets.images.score.points60k.keyName;
case Points.points_80k:
return Assets.images.score.points80k.keyName;
case Points.points_100k:
return Assets.images.score.points100k.keyName;
case Points.points_120k:
return Assets.images.score.points120k.keyName;
case Points.points_200k:
return Assets.images.score.points200k.keyName;
case Points.points_400k:
return Assets.images.score.points400k.keyName;
case Points.points_600k:
return Assets.images.score.points600k.keyName;
case Points.points_800k:
return Assets.images.score.points800k.keyName;
case Points.points_1m:
return Assets.images.score.points1m.keyName;
case Points.points_1m2:
return Assets.images.score.points1m2.keyName;
case Points.points_2m:
return Assets.images.score.points2m.keyName;
case Points.points_3m:
return Assets.images.score.points3m.keyName;
case Points.points_4m:
return Assets.images.score.points4m.keyName;
case Points.points_5m:
return Assets.images.score.points5m.keyName;
case Points.points_6m:
return Assets.images.score.points6m.keyName;
} }
} }
} }

@ -8,29 +8,10 @@ class BackboardGameOverGame extends AssetsGame
BackboardGameOverGame(this.score, this.character) BackboardGameOverGame(this.score, this.character)
: super( : super(
imagesFileNames: [ imagesFileNames: [
components.Assets.images.score.points5k.keyName, components.Assets.images.score.fiveThousand.keyName,
components.Assets.images.score.points10k.keyName, components.Assets.images.score.twentyThousand.keyName,
components.Assets.images.score.points15k.keyName, components.Assets.images.score.twoHundredThousand.keyName,
components.Assets.images.score.points20k.keyName, components.Assets.images.score.oneMillion.keyName,
components.Assets.images.score.points25k.keyName,
components.Assets.images.score.points30k.keyName,
components.Assets.images.score.points40k.keyName,
components.Assets.images.score.points50k.keyName,
components.Assets.images.score.points60k.keyName,
components.Assets.images.score.points80k.keyName,
components.Assets.images.score.points100k.keyName,
components.Assets.images.score.points120k.keyName,
components.Assets.images.score.points200k.keyName,
components.Assets.images.score.points400k.keyName,
components.Assets.images.score.points600k.keyName,
components.Assets.images.score.points800k.keyName,
components.Assets.images.score.points1m.keyName,
components.Assets.images.score.points1m2.keyName,
components.Assets.images.score.points2m.keyName,
components.Assets.images.score.points3m.keyName,
components.Assets.images.score.points4m.keyName,
components.Assets.images.score.points5m.keyName,
components.Assets.images.score.points6m.keyName,
...characterIconPaths.values.toList(), ...characterIconPaths.values.toList(),
], ],
); );

@ -8,29 +8,10 @@ class ScoreGame extends AssetsGame with TapDetector {
ScoreGame() ScoreGame()
: super( : super(
imagesFileNames: [ imagesFileNames: [
Assets.images.score.points5k.keyName, Assets.images.score.fiveThousand.keyName,
Assets.images.score.points10k.keyName, Assets.images.score.twentyThousand.keyName,
Assets.images.score.points15k.keyName, Assets.images.score.twoHundredThousand.keyName,
Assets.images.score.points20k.keyName, Assets.images.score.oneMillion.keyName,
Assets.images.score.points25k.keyName,
Assets.images.score.points30k.keyName,
Assets.images.score.points40k.keyName,
Assets.images.score.points50k.keyName,
Assets.images.score.points60k.keyName,
Assets.images.score.points80k.keyName,
Assets.images.score.points100k.keyName,
Assets.images.score.points120k.keyName,
Assets.images.score.points200k.keyName,
Assets.images.score.points400k.keyName,
Assets.images.score.points600k.keyName,
Assets.images.score.points800k.keyName,
Assets.images.score.points1m.keyName,
Assets.images.score.points1m2.keyName,
Assets.images.score.points2m.keyName,
Assets.images.score.points3m.keyName,
Assets.images.score.points4m.keyName,
Assets.images.score.points5m.keyName,
Assets.images.score.points6m.keyName,
], ],
); );

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

@ -12,29 +12,10 @@ void main() {
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();
final assets = [ final assets = [
Assets.images.score.points5k.keyName, Assets.images.score.fiveThousand.keyName,
Assets.images.score.points10k.keyName, Assets.images.score.twentyThousand.keyName,
Assets.images.score.points15k.keyName, Assets.images.score.twoHundredThousand.keyName,
Assets.images.score.points20k.keyName, Assets.images.score.oneMillion.keyName,
Assets.images.score.points25k.keyName,
Assets.images.score.points30k.keyName,
Assets.images.score.points40k.keyName,
Assets.images.score.points50k.keyName,
Assets.images.score.points60k.keyName,
Assets.images.score.points80k.keyName,
Assets.images.score.points100k.keyName,
Assets.images.score.points120k.keyName,
Assets.images.score.points200k.keyName,
Assets.images.score.points400k.keyName,
Assets.images.score.points600k.keyName,
Assets.images.score.points800k.keyName,
Assets.images.score.points1m.keyName,
Assets.images.score.points1m2.keyName,
Assets.images.score.points2m.keyName,
Assets.images.score.points3m.keyName,
Assets.images.score.points4m.keyName,
Assets.images.score.points5m.keyName,
Assets.images.score.points6m.keyName,
]; ];
final flameTester = FlameTester(() => TestGame(assets)); final flameTester = FlameTester(() => TestGame(assets));
@ -46,7 +27,7 @@ void main() {
await game.images.loadAll(assets); await game.images.loadAll(assets);
await game.ensureAdd( await game.ensureAdd(
ScoreComponent( ScoreComponent(
points: Points.points_5k, points: Points.fiveThousand,
position: Vector2.zero(), position: Vector2.zero(),
), ),
); );
@ -65,63 +46,13 @@ void main() {
}, },
); );
flameTester.testGameWidget(
'10000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_10k,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/10k.png'),
);
},
);
flameTester.testGameWidget(
'15000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_15k,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/15k.png'),
);
},
);
flameTester.testGameWidget( flameTester.testGameWidget(
'20000 points', '20000 points',
setUp: (game, tester) async { setUp: (game, tester) async {
await game.images.loadAll(assets); await game.images.loadAll(assets);
await game.ensureAdd( await game.ensureAdd(
ScoreComponent( ScoreComponent(
points: Points.points_20k, points: Points.twentyThousand,
position: Vector2.zero(), position: Vector2.zero(),
), ),
); );
@ -140,213 +71,13 @@ void main() {
}, },
); );
flameTester.testGameWidget(
'25000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_25k,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/25k.png'),
);
},
);
flameTester.testGameWidget(
'30000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_30k,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/30k.png'),
);
},
);
flameTester.testGameWidget(
'40000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_40k,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/40k.png'),
);
},
);
flameTester.testGameWidget(
'50000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_50k,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/50k.png'),
);
},
);
flameTester.testGameWidget(
'60000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_60k,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/60k.png'),
);
},
);
flameTester.testGameWidget(
'80000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_80k,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/80k.png'),
);
},
);
flameTester.testGameWidget(
'100000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_100k,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/100k.png'),
);
},
);
flameTester.testGameWidget(
'120000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_120k,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/120k.png'),
);
},
);
flameTester.testGameWidget( flameTester.testGameWidget(
'200000 points', '200000 points',
setUp: (game, tester) async { setUp: (game, tester) async {
await game.images.loadAll(assets); await game.images.loadAll(assets);
await game.ensureAdd( await game.ensureAdd(
ScoreComponent( ScoreComponent(
points: Points.points_200k, points: Points.twoHundredThousand,
position: Vector2.zero(), position: Vector2.zero(),
), ),
); );
@ -365,88 +96,13 @@ void main() {
}, },
); );
flameTester.testGameWidget(
'400000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_400k,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/400k.png'),
);
},
);
flameTester.testGameWidget(
'600000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_600k,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/600k.png'),
);
},
);
flameTester.testGameWidget(
'800000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_800k,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/800k.png'),
);
},
);
flameTester.testGameWidget( flameTester.testGameWidget(
'1000000 points', '1000000 points',
setUp: (game, tester) async { setUp: (game, tester) async {
await game.images.loadAll(assets); await game.images.loadAll(assets);
await game.ensureAdd( await game.ensureAdd(
ScoreComponent( ScoreComponent(
points: Points.points_1m, points: Points.oneMillion,
position: Vector2.zero(), position: Vector2.zero(),
), ),
); );
@ -464,246 +120,24 @@ void main() {
); );
}, },
); );
flameTester.testGameWidget(
'1200000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_1m2,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/1m2.png'),
);
},
);
flameTester.testGameWidget(
'2000000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_2m,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/2m.png'),
);
},
);
flameTester.testGameWidget(
'3000000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_3m,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/3m.png'),
);
},
);
flameTester.testGameWidget(
'4000000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_4m,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/4m.png'),
);
},
);
flameTester.testGameWidget(
'5000000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_5m,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/5m.png'),
);
},
);
flameTester.testGameWidget(
'6000000 points',
setUp: (game, tester) async {
await game.images.loadAll(assets);
await game.ensureAdd(
ScoreComponent(
points: Points.points_6m,
position: Vector2.zero(),
),
);
game.camera
..followVector2(Vector2.zero())
..zoom = 8;
await tester.pump();
},
verify: (game, tester) async {
await expectLater(
find.byGame<TestGame>(),
matchesGoldenFile('golden/score/6m.png'),
);
},
);
}); });
}); });
group('PointsX', () { group('PointsX', () {
test('5k value return 5000', () { test('5k value return 5000', () {
expect(Points.points_5k.value, 5000); expect(Points.fiveThousand.value, 5000);
});
test('10k value return 10000', () {
expect(Points.points_10k.value, 10000);
});
test('15k value return 15000', () {
expect(Points.points_15k.value, 15000);
}); });
test('20k value return 20000', () { test('20k value return 20000', () {
expect(Points.points_20k.value, 20000); expect(Points.twentyThousand.value, 20000);
});
test('25k value return 25000', () {
expect(Points.points_25k.value, 25000);
});
test('30k value return 30000', () {
expect(Points.points_30k.value, 30000);
});
test('40k value return 40000', () {
expect(Points.points_40k.value, 40000);
});
test('50k value return 50000', () {
expect(Points.points_50k.value, 50000);
});
test('60k value return 60000', () {
expect(Points.points_60k.value, 60000);
});
test('80k value return 80000', () {
expect(Points.points_80k.value, 80000);
});
test('100k value return 100000', () {
expect(Points.points_100k.value, 100000);
});
test('120k value return 120000', () {
expect(Points.points_120k.value, 120000);
}); });
test('200k value return 200000', () { test('200k value return 200000', () {
expect(Points.points_200k.value, 200000); expect(Points.twoHundredThousand.value, 200000);
});
test('400k value return 400000', () {
expect(Points.points_400k.value, 400000);
});
test('600k value return 600000', () {
expect(Points.points_600k.value, 600000);
}); });
test('1m value return 1000000', () { test('1m value return 1000000', () {
expect(Points.points_1m.value, 1000000); expect(Points.oneMillion.value, 1000000);
});
test('1m2 value return 1200000', () {
expect(Points.points_1m2.value, 1200000);
});
test('2m value return 2000000', () {
expect(Points.points_2m.value, 2000000);
});
test('3m value return 3000000', () {
expect(Points.points_3m.value, 3000000);
});
test('4m value return 4000000', () {
expect(Points.points_4m.value, 4000000);
});
test('5m value return 5000000', () {
expect(Points.points_5m.value, 5000000);
});
test('6m value return 6000000', () {
expect(Points.points_6m.value, 6000000);
}); });
}); });
@ -717,7 +151,7 @@ void main() {
game.camera.followVector2(Vector2.zero()); game.camera.followVector2(Vector2.zero());
await game.ensureAdd( await game.ensureAdd(
ScoreComponent( ScoreComponent(
points: Points.points_6m, points: Points.oneMillion,
position: Vector2.zero(), position: Vector2.zero(),
), ),
); );
@ -735,7 +169,7 @@ void main() {
game.camera.followVector2(Vector2.zero()); game.camera.followVector2(Vector2.zero());
await game.ensureAdd( await game.ensureAdd(
ScoreComponent( ScoreComponent(
points: Points.points_6m, points: Points.oneMillion,
position: Vector2.zero(), position: Vector2.zero(),
), ),
); );
@ -756,7 +190,7 @@ void main() {
game.camera.followVector2(Vector2.zero()); game.camera.followVector2(Vector2.zero());
await game.ensureAdd( await game.ensureAdd(
ScoreComponent( ScoreComponent(
points: Points.points_6m, points: Points.oneMillion,
position: Vector2.zero(), position: Vector2.zero(),
), ),
); );

@ -19,29 +19,10 @@ class _TestBodyComponent extends BodyComponent {
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();
final assets = [ final assets = [
Assets.images.score.points1m.keyName, Assets.images.score.fiveThousand.keyName,
Assets.images.score.points1m2.keyName, Assets.images.score.twentyThousand.keyName,
Assets.images.score.points2m.keyName, Assets.images.score.twoHundredThousand.keyName,
Assets.images.score.points3m.keyName, Assets.images.score.oneMillion.keyName,
Assets.images.score.points4m.keyName,
Assets.images.score.points5k.keyName,
Assets.images.score.points5m.keyName,
Assets.images.score.points6m.keyName,
Assets.images.score.points10k.keyName,
Assets.images.score.points15k.keyName,
Assets.images.score.points20k.keyName,
Assets.images.score.points25k.keyName,
Assets.images.score.points30k.keyName,
Assets.images.score.points40k.keyName,
Assets.images.score.points50k.keyName,
Assets.images.score.points60k.keyName,
Assets.images.score.points80k.keyName,
Assets.images.score.points100k.keyName,
Assets.images.score.points120k.keyName,
Assets.images.score.points200k.keyName,
Assets.images.score.points400k.keyName,
Assets.images.score.points600k.keyName,
Assets.images.score.points800k.keyName,
]; ];
group('ScoringBehavior', () { group('ScoringBehavior', () {
@ -83,7 +64,7 @@ void main() {
flameBlocTester.testGameWidget( flameBlocTester.testGameWidget(
'emits Scored event with points', 'emits Scored event with points',
setUp: (game, tester) async { setUp: (game, tester) async {
const points = Points.points_6m; const points = Points.oneMillion;
final scoringBehavior = ScoringBehavior(points: points); final scoringBehavior = ScoringBehavior(points: points);
await parent.add(scoringBehavior); await parent.add(scoringBehavior);
await game.ensureAdd(parent); await game.ensureAdd(parent);
@ -101,7 +82,7 @@ void main() {
flameBlocTester.testGameWidget( flameBlocTester.testGameWidget(
'plays score sound', 'plays score sound',
setUp: (game, tester) async { setUp: (game, tester) async {
final scoringBehavior = ScoringBehavior(points: Points.points_6m); final scoringBehavior = ScoringBehavior(points: Points.oneMillion);
await parent.add(scoringBehavior); await parent.add(scoringBehavior);
await game.ensureAdd(parent); await game.ensureAdd(parent);
@ -114,7 +95,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 = Points.points_6m; const points = Points.oneMillion;
final scoringBehavior = ScoringBehavior(points: points); final scoringBehavior = ScoringBehavior(points: points);
await parent.add(scoringBehavior); await parent.add(scoringBehavior);
await game.ensureAdd(parent); await game.ensureAdd(parent);

Loading…
Cancel
Save