refactor: removed duplicated images for multiball

pull/235/head
RuiAlonso 3 years ago
parent bf21ed919b
commit e989f87978

@ -101,14 +101,8 @@ extension PinballGameAssetsX on PinballGame {
images.load(components.Assets.images.googleWord.letter5.keyName), images.load(components.Assets.images.googleWord.letter5.keyName),
images.load(components.Assets.images.googleWord.letter6.keyName), images.load(components.Assets.images.googleWord.letter6.keyName),
images.load(components.Assets.images.backboard.display.keyName), images.load(components.Assets.images.backboard.display.keyName),
images.load(components.Assets.images.multiball.a.lit.keyName), images.load(components.Assets.images.multiball.lit.keyName),
images.load(components.Assets.images.multiball.a.dimmed.keyName), images.load(components.Assets.images.multiball.dimmed.keyName),
images.load(components.Assets.images.multiball.b.lit.keyName),
images.load(components.Assets.images.multiball.b.dimmed.keyName),
images.load(components.Assets.images.multiball.c.lit.keyName),
images.load(components.Assets.images.multiball.c.dimmed.keyName),
images.load(components.Assets.images.multiball.d.lit.keyName),
images.load(components.Assets.images.multiball.d.dimmed.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: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

@ -203,10 +203,13 @@ class $AssetsImagesLaunchRampGen {
class $AssetsImagesMultiballGen { class $AssetsImagesMultiballGen {
const $AssetsImagesMultiballGen(); const $AssetsImagesMultiballGen();
$AssetsImagesMultiballAGen get a => const $AssetsImagesMultiballAGen(); /// File path: assets/images/multiball/dimmed.png
$AssetsImagesMultiballBGen get b => const $AssetsImagesMultiballBGen(); AssetGenImage get dimmed =>
$AssetsImagesMultiballCGen get c => const $AssetsImagesMultiballCGen(); const AssetGenImage('assets/images/multiball/dimmed.png');
$AssetsImagesMultiballDGen get d => const $AssetsImagesMultiballDGen();
/// File path: assets/images/multiball/lit.png
AssetGenImage get lit =>
const AssetGenImage('assets/images/multiball/lit.png');
} }
class $AssetsImagesPlungerGen { class $AssetsImagesPlungerGen {
@ -316,54 +319,6 @@ class $AssetsImagesDashBumperGen {
const $AssetsImagesDashBumperMainGen(); const $AssetsImagesDashBumperMainGen();
} }
class $AssetsImagesMultiballAGen {
const $AssetsImagesMultiballAGen();
/// File path: assets/images/multiball/a/dimmed.png
AssetGenImage get dimmed =>
const AssetGenImage('assets/images/multiball/a/dimmed.png');
/// File path: assets/images/multiball/a/lit.png
AssetGenImage get lit =>
const AssetGenImage('assets/images/multiball/a/lit.png');
}
class $AssetsImagesMultiballBGen {
const $AssetsImagesMultiballBGen();
/// File path: assets/images/multiball/b/dimmed.png
AssetGenImage get dimmed =>
const AssetGenImage('assets/images/multiball/b/dimmed.png');
/// File path: assets/images/multiball/b/lit.png
AssetGenImage get lit =>
const AssetGenImage('assets/images/multiball/b/lit.png');
}
class $AssetsImagesMultiballCGen {
const $AssetsImagesMultiballCGen();
/// File path: assets/images/multiball/c/dimmed.png
AssetGenImage get dimmed =>
const AssetGenImage('assets/images/multiball/c/dimmed.png');
/// File path: assets/images/multiball/c/lit.png
AssetGenImage get lit =>
const AssetGenImage('assets/images/multiball/c/lit.png');
}
class $AssetsImagesMultiballDGen {
const $AssetsImagesMultiballDGen();
/// File path: assets/images/multiball/d/dimmed.png
AssetGenImage get dimmed =>
const AssetGenImage('assets/images/multiball/d/dimmed.png');
/// File path: assets/images/multiball/d/lit.png
AssetGenImage get lit =>
const AssetGenImage('assets/images/multiball/d/lit.png');
}
class $AssetsImagesSpaceshipRailGen { class $AssetsImagesSpaceshipRailGen {
const $AssetsImagesSpaceshipRailGen(); const $AssetsImagesSpaceshipRailGen();

@ -74,10 +74,7 @@ flutter:
- assets/images/backboard/ - assets/images/backboard/
- assets/images/google_word/ - assets/images/google_word/
- assets/images/signpost/ - assets/images/signpost/
- assets/images/multiball/a/ - assets/images/multiball/
- assets/images/multiball/b/
- assets/images/multiball/c/
- assets/images/multiball/d/
flutter_gen: flutter_gen:
line_length: 80 line_length: 80

@ -8,14 +8,8 @@ class MultiballGame extends BallGame with KeyboardEvents {
MultiballGame() MultiballGame()
: super( : super(
imagesFileNames: [ imagesFileNames: [
Assets.images.multiball.a.lit.keyName, Assets.images.multiball.lit.keyName,
Assets.images.multiball.a.dimmed.keyName, Assets.images.multiball.dimmed.keyName,
Assets.images.multiball.b.lit.keyName,
Assets.images.multiball.b.dimmed.keyName,
Assets.images.multiball.c.lit.keyName,
Assets.images.multiball.c.dimmed.keyName,
Assets.images.multiball.d.lit.keyName,
Assets.images.multiball.d.dimmed.keyName,
], ],
); );
@ -51,7 +45,7 @@ class MultiballGame extends BallGame with KeyboardEvents {
if (event is RawKeyDownEvent && if (event is RawKeyDownEvent &&
event.logicalKey == LogicalKeyboardKey.space) { event.logicalKey == LogicalKeyboardKey.space) {
for (final multiball in multiballs) { for (final multiball in multiballs) {
multiball.bloc.animate(); multiball.bloc.onLit();
} }
return KeyEventResult.handled; return KeyEventResult.handled;

@ -11,14 +11,8 @@ import '../../../helpers/helpers.dart';
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();
final assets = [ final assets = [
Assets.images.multiball.a.lit.keyName, Assets.images.multiball.lit.keyName,
Assets.images.multiball.a.dimmed.keyName, Assets.images.multiball.dimmed.keyName,
Assets.images.multiball.b.lit.keyName,
Assets.images.multiball.b.dimmed.keyName,
Assets.images.multiball.c.lit.keyName,
Assets.images.multiball.c.dimmed.keyName,
Assets.images.multiball.d.lit.keyName,
Assets.images.multiball.d.dimmed.keyName,
]; ];
late GameBloc gameBloc; late GameBloc gameBloc;

@ -56,14 +56,8 @@ void main() {
Assets.images.slingshot.lower.keyName, Assets.images.slingshot.lower.keyName,
Assets.images.dino.dinoLandTop.keyName, Assets.images.dino.dinoLandTop.keyName,
Assets.images.dino.dinoLandBottom.keyName, Assets.images.dino.dinoLandBottom.keyName,
Assets.images.multiball.a.lit.keyName, Assets.images.multiball.lit.keyName,
Assets.images.multiball.a.dimmed.keyName, Assets.images.multiball.dimmed.keyName,
Assets.images.multiball.b.lit.keyName,
Assets.images.multiball.b.dimmed.keyName,
Assets.images.multiball.c.lit.keyName,
Assets.images.multiball.c.dimmed.keyName,
Assets.images.multiball.d.lit.keyName,
Assets.images.multiball.d.dimmed.keyName,
]; ];
final flameTester = FlameTester( final flameTester = FlameTester(
() => PinballTestGame(assets: assets), () => PinballTestGame(assets: assets),

Loading…
Cancel
Save