diff --git a/lib/game/components/controlled_ball.dart b/lib/game/components/controlled_ball.dart index 7251cec8..132639d4 100644 --- a/lib/game/components/controlled_ball.dart +++ b/lib/game/components/controlled_ball.dart @@ -16,7 +16,7 @@ class ControlledBall extends Ball with Controls { /// A [Ball] that launches from the [Plunger]. ControlledBall.launch({ required CharacterTheme characterTheme, - }) : super(spriteAsset: characterTheme.ball.keyName) { + }) : super(assetPath: characterTheme.ball.keyName) { controller = BallController(this); layer = Layer.launcher; zIndex = ZIndexes.ballOnLaunchRamp; @@ -27,7 +27,7 @@ class ControlledBall extends Ball with Controls { /// {@endtemplate} ControlledBall.bonus({ required CharacterTheme characterTheme, - }) : super(spriteAsset: characterTheme.ball.keyName) { + }) : super(assetPath: characterTheme.ball.keyName) { controller = BallController(this); zIndex = ZIndexes.ballOnBoard; } diff --git a/packages/pinball_components/lib/src/components/ball/ball.dart b/packages/pinball_components/lib/src/components/ball/ball.dart index 8c5c1687..eceb9c87 100644 --- a/packages/pinball_components/lib/src/components/ball/ball.dart +++ b/packages/pinball_components/lib/src/components/ball/ball.dart @@ -15,11 +15,11 @@ export 'behaviors/behaviors.dart'; class Ball extends BodyComponent with Layered, InitialPosition, ZIndex { /// {@macro ball} Ball({ - String? spriteAsset, + String? assetPath, }) : super( renderBody: false, children: [ - _BallSpriteComponent(spriteAsset: spriteAsset), + _BallSpriteComponent(spriteAsset: assetPath), BallScalingBehavior(), BallGravitatingBehavior(), ], diff --git a/packages/pinball_components/sandbox/lib/stories/ball/basic_ball_game.dart b/packages/pinball_components/sandbox/lib/stories/ball/basic_ball_game.dart index 78c0c331..f3ba50f3 100644 --- a/packages/pinball_components/sandbox/lib/stories/ball/basic_ball_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/ball/basic_ball_game.dart @@ -40,7 +40,7 @@ class BallGame extends AssetsGame with TapDetector, Traceable { void onTapUp(TapUpInfo info) { add( Ball( - spriteAsset: characterBallPaths[character], + assetPath: characterBallPaths[character], ) ..initialPosition = info.eventPosition.game ..layer = ballLayer diff --git a/packages/pinball_components/sandbox/lib/stories/plunger/plunger_game.dart b/packages/pinball_components/sandbox/lib/stories/plunger/plunger_game.dart index cae4c05d..0ee58cc9 100644 --- a/packages/pinball_components/sandbox/lib/stories/plunger/plunger_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/plunger/plunger_game.dart @@ -6,8 +6,6 @@ import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; class PlungerGame extends BallGame with KeyboardEvents, Traceable { - PlungerGame() : super(); - static const description = ''' Shows how Plunger is rendered. diff --git a/packages/pinball_components/test/src/components/ball/ball_test.dart b/packages/pinball_components/test/src/components/ball/ball_test.dart index 03d1daef..9195e0b2 100644 --- a/packages/pinball_components/test/src/components/ball/ball_test.dart +++ b/packages/pinball_components/test/src/components/ball/ball_test.dart @@ -11,7 +11,6 @@ import '../../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ - Assets.images.ball.flameEffect.keyName, theme.Assets.images.android.ball.keyName, theme.Assets.images.dash.ball.keyName, theme.Assets.images.dino.ball.keyName, diff --git a/test/game/components/controlled_ball_test.dart b/test/game/components/controlled_ball_test.dart index 6085ec8c..dc142ffd 100644 --- a/test/game/components/controlled_ball_test.dart +++ b/test/game/components/controlled_ball_test.dart @@ -34,7 +34,6 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ theme.Assets.images.dash.ball.keyName, - Assets.images.ball.flameEffect.keyName, ]; group('BallController', () { diff --git a/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart b/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart index 9daa9036..71b41029 100644 --- a/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart +++ b/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart @@ -24,7 +24,6 @@ void main() { final assets = [ Assets.images.dash.animatronic.keyName, theme.Assets.images.dash.ball.keyName, - theme.Assets.images.dash.ball.keyName, ]; setUp(() {