diff --git a/lib/game/game_assets.dart b/lib/game/game_assets.dart index 9918465f..421caf8f 100644 --- a/lib/game/game_assets.dart +++ b/lib/game/game_assets.dart @@ -101,14 +101,8 @@ extension PinballGameAssetsX on PinballGame { images.load(components.Assets.images.googleWord.letter5.keyName), images.load(components.Assets.images.googleWord.letter6.keyName), images.load(components.Assets.images.backboard.display.keyName), - images.load(components.Assets.images.multiball.a.lit.keyName), - images.load(components.Assets.images.multiball.a.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(components.Assets.images.multiball.lit.keyName), + images.load(components.Assets.images.multiball.dimmed.keyName), images.load(dashTheme.leaderboardIcon.keyName), images.load(sparkyTheme.leaderboardIcon.keyName), images.load(androidTheme.leaderboardIcon.keyName), diff --git a/packages/pinball_components/assets/images/multiball/b/dimmed.png b/packages/pinball_components/assets/images/multiball/b/dimmed.png deleted file mode 100644 index ff020364..00000000 Binary files a/packages/pinball_components/assets/images/multiball/b/dimmed.png and /dev/null differ diff --git a/packages/pinball_components/assets/images/multiball/b/lit.png b/packages/pinball_components/assets/images/multiball/b/lit.png deleted file mode 100644 index cf52f1b9..00000000 Binary files a/packages/pinball_components/assets/images/multiball/b/lit.png and /dev/null differ diff --git a/packages/pinball_components/assets/images/multiball/c/dimmed.png b/packages/pinball_components/assets/images/multiball/c/dimmed.png deleted file mode 100644 index 296e0058..00000000 Binary files a/packages/pinball_components/assets/images/multiball/c/dimmed.png and /dev/null differ diff --git a/packages/pinball_components/assets/images/multiball/c/lit.png b/packages/pinball_components/assets/images/multiball/c/lit.png deleted file mode 100644 index 7ea0a8e2..00000000 Binary files a/packages/pinball_components/assets/images/multiball/c/lit.png and /dev/null differ diff --git a/packages/pinball_components/assets/images/multiball/d/dimmed.png b/packages/pinball_components/assets/images/multiball/d/dimmed.png deleted file mode 100644 index eb3539f9..00000000 Binary files a/packages/pinball_components/assets/images/multiball/d/dimmed.png and /dev/null differ diff --git a/packages/pinball_components/assets/images/multiball/d/lit.png b/packages/pinball_components/assets/images/multiball/d/lit.png deleted file mode 100644 index b284b119..00000000 Binary files a/packages/pinball_components/assets/images/multiball/d/lit.png and /dev/null differ diff --git a/packages/pinball_components/assets/images/multiball/a/dimmed.png b/packages/pinball_components/assets/images/multiball/dimmed.png similarity index 100% rename from packages/pinball_components/assets/images/multiball/a/dimmed.png rename to packages/pinball_components/assets/images/multiball/dimmed.png diff --git a/packages/pinball_components/assets/images/multiball/a/lit.png b/packages/pinball_components/assets/images/multiball/lit.png similarity index 100% rename from packages/pinball_components/assets/images/multiball/a/lit.png rename to packages/pinball_components/assets/images/multiball/lit.png diff --git a/packages/pinball_components/lib/gen/assets.gen.dart b/packages/pinball_components/lib/gen/assets.gen.dart index ec6c1a1a..997c7855 100644 --- a/packages/pinball_components/lib/gen/assets.gen.dart +++ b/packages/pinball_components/lib/gen/assets.gen.dart @@ -203,10 +203,13 @@ class $AssetsImagesLaunchRampGen { class $AssetsImagesMultiballGen { const $AssetsImagesMultiballGen(); - $AssetsImagesMultiballAGen get a => const $AssetsImagesMultiballAGen(); - $AssetsImagesMultiballBGen get b => const $AssetsImagesMultiballBGen(); - $AssetsImagesMultiballCGen get c => const $AssetsImagesMultiballCGen(); - $AssetsImagesMultiballDGen get d => const $AssetsImagesMultiballDGen(); + /// File path: assets/images/multiball/dimmed.png + AssetGenImage get dimmed => + const AssetGenImage('assets/images/multiball/dimmed.png'); + + /// File path: assets/images/multiball/lit.png + AssetGenImage get lit => + const AssetGenImage('assets/images/multiball/lit.png'); } class $AssetsImagesPlungerGen { @@ -316,54 +319,6 @@ class $AssetsImagesDashBumperGen { 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 { const $AssetsImagesSpaceshipRailGen(); diff --git a/packages/pinball_components/pubspec.yaml b/packages/pinball_components/pubspec.yaml index cfb3c014..19c169da 100644 --- a/packages/pinball_components/pubspec.yaml +++ b/packages/pinball_components/pubspec.yaml @@ -74,10 +74,7 @@ flutter: - assets/images/backboard/ - assets/images/google_word/ - assets/images/signpost/ - - assets/images/multiball/a/ - - assets/images/multiball/b/ - - assets/images/multiball/c/ - - assets/images/multiball/d/ + - assets/images/multiball/ flutter_gen: line_length: 80 diff --git a/packages/pinball_components/sandbox/lib/stories/multiball/multiball_game.dart b/packages/pinball_components/sandbox/lib/stories/multiball/multiball_game.dart index 32202d22..ac95854d 100644 --- a/packages/pinball_components/sandbox/lib/stories/multiball/multiball_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/multiball/multiball_game.dart @@ -8,14 +8,8 @@ class MultiballGame extends BallGame with KeyboardEvents { MultiballGame() : super( imagesFileNames: [ - Assets.images.multiball.a.lit.keyName, - Assets.images.multiball.a.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, + Assets.images.multiball.lit.keyName, + Assets.images.multiball.dimmed.keyName, ], ); @@ -51,7 +45,7 @@ class MultiballGame extends BallGame with KeyboardEvents { if (event is RawKeyDownEvent && event.logicalKey == LogicalKeyboardKey.space) { for (final multiball in multiballs) { - multiball.bloc.animate(); + multiball.bloc.onLit(); } return KeyEventResult.handled; diff --git a/test/game/components/multiballs/multiballs_test.dart b/test/game/components/multiballs/multiballs_test.dart index 8e830a9f..79afe895 100644 --- a/test/game/components/multiballs/multiballs_test.dart +++ b/test/game/components/multiballs/multiballs_test.dart @@ -11,14 +11,8 @@ import '../../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ - Assets.images.multiball.a.lit.keyName, - Assets.images.multiball.a.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, + Assets.images.multiball.lit.keyName, + Assets.images.multiball.dimmed.keyName, ]; late GameBloc gameBloc; diff --git a/test/game/pinball_game_test.dart b/test/game/pinball_game_test.dart index 50bbbf7d..d7c384b1 100644 --- a/test/game/pinball_game_test.dart +++ b/test/game/pinball_game_test.dart @@ -56,14 +56,8 @@ void main() { Assets.images.slingshot.lower.keyName, Assets.images.dino.dinoLandTop.keyName, Assets.images.dino.dinoLandBottom.keyName, - Assets.images.multiball.a.lit.keyName, - Assets.images.multiball.a.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, + Assets.images.multiball.lit.keyName, + Assets.images.multiball.dimmed.keyName, ]; final flameTester = FlameTester( () => PinballTestGame(assets: assets),