diff --git a/lib/how_to_play/widgets/how_to_play_dialog.dart b/lib/how_to_play/widgets/how_to_play_dialog.dart index 426fcbe5..5ac1ef2a 100644 --- a/lib/how_to_play/widgets/how_to_play_dialog.dart +++ b/lib/how_to_play/widgets/how_to_play_dialog.dart @@ -96,7 +96,9 @@ class _HowToPlayDialogState extends State { child: PinballDialog( title: l10n.howToPlay, subtitle: l10n.tipsForFlips, - child: isMobile ? const _MobileBody() : const _DesktopBody(), + child: FittedBox( + child: isMobile ? const _MobileBody() : const _DesktopBody(), + ), ), ); } @@ -109,18 +111,16 @@ class _MobileBody extends StatelessWidget { Widget build(BuildContext context) { final paddingWidth = MediaQuery.of(context).size.width * 0.15; final paddingHeight = MediaQuery.of(context).size.height * 0.075; - return FittedBox( - child: Padding( - padding: EdgeInsets.symmetric( - horizontal: paddingWidth, - ), - child: Column( - children: [ - const _MobileLaunchControls(), - SizedBox(height: paddingHeight), - const _MobileFlipperControls(), - ], - ), + return Padding( + padding: EdgeInsets.symmetric( + horizontal: paddingWidth, + ), + child: Column( + children: [ + const _MobileLaunchControls(), + SizedBox(height: paddingHeight), + const _MobileFlipperControls(), + ], ), ); } @@ -189,13 +189,15 @@ class _DesktopBody extends StatelessWidget { @override Widget build(BuildContext context) { - return ListView( - children: const [ - SizedBox(height: 16), - _DesktopLaunchControls(), - SizedBox(height: 16), - _DesktopFlipperControls(), - ], + return Padding( + padding: const EdgeInsets.all(16), + child: Column( + children: const [ + _DesktopLaunchControls(), + SizedBox(height: 16), + _DesktopFlipperControls(), + ], + ), ); } } diff --git a/packages/pinball_components/assets/images/android/spaceship/animatronic.png b/packages/pinball_components/assets/images/android/spaceship/animatronic.png index d4b165f3..733e794f 100644 Binary files a/packages/pinball_components/assets/images/android/spaceship/animatronic.png and b/packages/pinball_components/assets/images/android/spaceship/animatronic.png differ diff --git a/packages/pinball_components/assets/images/android/spaceship/saucer.png b/packages/pinball_components/assets/images/android/spaceship/saucer.png index 6c77525a..ff80f99c 100644 Binary files a/packages/pinball_components/assets/images/android/spaceship/saucer.png and b/packages/pinball_components/assets/images/android/spaceship/saucer.png differ diff --git a/packages/pinball_components/assets/images/boundary/outer.png b/packages/pinball_components/assets/images/boundary/outer.png index 1f3bab69..75ccdb6b 100644 Binary files a/packages/pinball_components/assets/images/boundary/outer.png and b/packages/pinball_components/assets/images/boundary/outer.png differ diff --git a/packages/pinball_components/assets/images/dash/bumper/a/active.png b/packages/pinball_components/assets/images/dash/bumper/a/active.png index 57330eb4..bd37498d 100644 Binary files a/packages/pinball_components/assets/images/dash/bumper/a/active.png and b/packages/pinball_components/assets/images/dash/bumper/a/active.png differ diff --git a/packages/pinball_components/assets/images/dash/bumper/a/inactive.png b/packages/pinball_components/assets/images/dash/bumper/a/inactive.png index bd37498d..57330eb4 100644 Binary files a/packages/pinball_components/assets/images/dash/bumper/a/inactive.png and b/packages/pinball_components/assets/images/dash/bumper/a/inactive.png differ diff --git a/packages/pinball_components/assets/images/dash/bumper/b/active.png b/packages/pinball_components/assets/images/dash/bumper/b/active.png index fe871847..81cd775a 100644 Binary files a/packages/pinball_components/assets/images/dash/bumper/b/active.png and b/packages/pinball_components/assets/images/dash/bumper/b/active.png differ diff --git a/packages/pinball_components/assets/images/dash/bumper/b/inactive.png b/packages/pinball_components/assets/images/dash/bumper/b/inactive.png index 81cd775a..fe871847 100644 Binary files a/packages/pinball_components/assets/images/dash/bumper/b/inactive.png and b/packages/pinball_components/assets/images/dash/bumper/b/inactive.png differ diff --git a/packages/pinball_components/assets/images/dash/bumper/main/active.png b/packages/pinball_components/assets/images/dash/bumper/main/active.png index 9508b56c..51df02ee 100644 Binary files a/packages/pinball_components/assets/images/dash/bumper/main/active.png and b/packages/pinball_components/assets/images/dash/bumper/main/active.png differ diff --git a/packages/pinball_components/assets/images/dash/bumper/main/inactive.png b/packages/pinball_components/assets/images/dash/bumper/main/inactive.png index 51df02ee..9508b56c 100644 Binary files a/packages/pinball_components/assets/images/dash/bumper/main/inactive.png and b/packages/pinball_components/assets/images/dash/bumper/main/inactive.png differ diff --git a/packages/pinball_components/assets/images/sparky/computer/glow.png b/packages/pinball_components/assets/images/sparky/computer/glow.png index 07ffdb0c..4386dfba 100644 Binary files a/packages/pinball_components/assets/images/sparky/computer/glow.png and b/packages/pinball_components/assets/images/sparky/computer/glow.png differ diff --git a/packages/pinball_components/lib/src/components/android_spaceship/android_spaceship.dart b/packages/pinball_components/lib/src/components/android_spaceship/android_spaceship.dart index 4d98b419..d15a5516 100644 --- a/packages/pinball_components/lib/src/components/android_spaceship/android_spaceship.dart +++ b/packages/pinball_components/lib/src/components/android_spaceship/android_spaceship.dart @@ -122,7 +122,7 @@ class _SpaceshipSaucerSpriteAnimationComponent extends SpriteAnimationComponent SpriteAnimationData.sequenced( amount: amountPerRow * amountPerColumn, amountPerRow: amountPerRow, - stepTime: 1 / 24, + stepTime: 1 / 12, textureSize: textureSize, ), ); diff --git a/packages/pinball_components/lib/src/components/dash_nest_bumper/dash_nest_bumper.dart b/packages/pinball_components/lib/src/components/dash_nest_bumper/dash_nest_bumper.dart index 208936c8..4495053d 100644 --- a/packages/pinball_components/lib/src/components/dash_nest_bumper/dash_nest_bumper.dart +++ b/packages/pinball_components/lib/src/components/dash_nest_bumper/dash_nest_bumper.dart @@ -60,10 +60,10 @@ class DashNestBumper extends BodyComponent with InitialPosition { Iterable? children, }) : this._( majorRadius: 3, - minorRadius: 2.5, + minorRadius: 2.2, activeAssetPath: Assets.images.dash.bumper.a.active.keyName, inactiveAssetPath: Assets.images.dash.bumper.a.inactive.keyName, - spritePosition: Vector2(0.35, -1.2), + spritePosition: Vector2(0.3, -1.3), bloc: DashNestBumperCubit(), children: [ ...?children, @@ -75,11 +75,11 @@ class DashNestBumper extends BodyComponent with InitialPosition { DashNestBumper.b({ Iterable? children, }) : this._( - majorRadius: 3, - minorRadius: 2.5, + majorRadius: 3.1, + minorRadius: 2.2, activeAssetPath: Assets.images.dash.bumper.b.active.keyName, inactiveAssetPath: Assets.images.dash.bumper.b.inactive.keyName, - spritePosition: Vector2(0.35, -1.2), + spritePosition: Vector2(0.4, -1.2), bloc: DashNestBumperCubit(), children: [ ...?children, diff --git a/packages/pinball_components/lib/src/components/sparky_computer.dart b/packages/pinball_components/lib/src/components/sparky_computer.dart index 512c9d48..3495c83a 100644 --- a/packages/pinball_components/lib/src/components/sparky_computer.dart +++ b/packages/pinball_components/lib/src/components/sparky_computer.dart @@ -32,18 +32,18 @@ class _ComputerBase extends BodyComponent with InitialPosition, ZIndex { List _createFixtureDefs() { final leftEdge = EdgeShape() ..set( - Vector2(-14.9, -46), - Vector2(-15.3, -49.6), + Vector2(-15.1, -45.9), + Vector2(-15.5, -49.5), ); final topEdge = EdgeShape() ..set( - Vector2(-15.3, -49.6), - Vector2(-10.7, -50.6), + leftEdge.vertex2, + Vector2(-10.9, -50.5), ); final rightEdge = EdgeShape() ..set( - Vector2(-10.7, -50.6), - Vector2(-9, -47.2), + topEdge.vertex2, + Vector2(-9.2, -47.1), ); return [ @@ -67,7 +67,7 @@ class _ComputerBaseSpriteComponent extends SpriteComponent with HasGameRef { _ComputerBaseSpriteComponent() : super( anchor: Anchor.center, - position: Vector2(-12.1, -48.15), + position: Vector2(-12.24, -48.15), ); @override @@ -89,7 +89,7 @@ class _ComputerTopSpriteComponent extends SpriteComponent _ComputerTopSpriteComponent() : super( anchor: Anchor.center, - position: Vector2(-12.52, -49.37), + position: Vector2(-12.66, -49.37), ) { zIndex = ZIndexes.computerTop; } @@ -113,9 +113,9 @@ class _ComputerGlowSpriteComponent extends SpriteComponent _ComputerGlowSpriteComponent() : super( anchor: Anchor.center, - position: Vector2(7.4, 10), + position: Vector2(4.2, 11), ) { - zIndex = ZIndexes.computerGlow; + zIndex = ZIndexes.computerGlow + 4; } @override diff --git a/packages/pinball_components/test/src/components/golden/android_animatronic/end.png b/packages/pinball_components/test/src/components/golden/android_animatronic/end.png index 3d54999f..d6ddbb68 100644 Binary files a/packages/pinball_components/test/src/components/golden/android_animatronic/end.png and b/packages/pinball_components/test/src/components/golden/android_animatronic/end.png differ diff --git a/packages/pinball_components/test/src/components/golden/android_animatronic/middle.png b/packages/pinball_components/test/src/components/golden/android_animatronic/middle.png index 44916338..00f4da13 100644 Binary files a/packages/pinball_components/test/src/components/golden/android_animatronic/middle.png and b/packages/pinball_components/test/src/components/golden/android_animatronic/middle.png differ diff --git a/packages/pinball_components/test/src/components/golden/android_animatronic/start.png b/packages/pinball_components/test/src/components/golden/android_animatronic/start.png index 95580e91..31d8bfdf 100644 Binary files a/packages/pinball_components/test/src/components/golden/android_animatronic/start.png and b/packages/pinball_components/test/src/components/golden/android_animatronic/start.png differ diff --git a/packages/pinball_components/test/src/components/golden/android_spaceship/end.png b/packages/pinball_components/test/src/components/golden/android_spaceship/end.png index a64b4724..ce8cdd24 100644 Binary files a/packages/pinball_components/test/src/components/golden/android_spaceship/end.png and b/packages/pinball_components/test/src/components/golden/android_spaceship/end.png differ diff --git a/packages/pinball_components/test/src/components/golden/android_spaceship/middle.png b/packages/pinball_components/test/src/components/golden/android_spaceship/middle.png index 90361e22..49f6c9ce 100644 Binary files a/packages/pinball_components/test/src/components/golden/android_spaceship/middle.png and b/packages/pinball_components/test/src/components/golden/android_spaceship/middle.png differ diff --git a/packages/pinball_components/test/src/components/golden/android_spaceship/start.png b/packages/pinball_components/test/src/components/golden/android_spaceship/start.png index 649a8654..eb109628 100644 Binary files a/packages/pinball_components/test/src/components/golden/android_spaceship/start.png and b/packages/pinball_components/test/src/components/golden/android_spaceship/start.png differ diff --git a/packages/pinball_components/test/src/components/golden/boundaries.png b/packages/pinball_components/test/src/components/golden/boundaries.png index 9e9b5633..f2987360 100644 Binary files a/packages/pinball_components/test/src/components/golden/boundaries.png and b/packages/pinball_components/test/src/components/golden/boundaries.png differ diff --git a/packages/pinball_components/test/src/components/golden/sparky-computer.png b/packages/pinball_components/test/src/components/golden/sparky-computer.png index 1ade03c2..9567d231 100644 Binary files a/packages/pinball_components/test/src/components/golden/sparky-computer.png and b/packages/pinball_components/test/src/components/golden/sparky-computer.png differ