Merge branch 'main' into refactor/include-game-status

lib/how_to_play/widgets/how_to_play_dialog.dart

@@ -96,7 +96,9 @@ class _HowToPlayDialogState extends State<HowToPlayDialog> {
       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(
+    return Padding(
-      child: Padding(
+      padding: EdgeInsets.symmetric(
-        padding: EdgeInsets.symmetric(
+        horizontal: paddingWidth,
-          horizontal: paddingWidth,
+      ),
-        ),
+      child: Column(
-        child: Column(
+        children: [
-          children: [
+          const _MobileLaunchControls(),
-            const _MobileLaunchControls(),
+          SizedBox(height: paddingHeight),
-            SizedBox(height: paddingHeight),
+          const _MobileFlipperControls(),
-            const _MobileFlipperControls(),
+        ],
-          ],
-        ),
       ),
     );
   }
@@ -189,13 +189,15 @@ class _DesktopBody extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ListView(
+    return Padding(
-      children: const [
+      padding: const EdgeInsets.all(16),
-        SizedBox(height: 16),
+      child: Column(
-        _DesktopLaunchControls(),
+        children: const [
-        SizedBox(height: 16),
+          _DesktopLaunchControls(),
-        _DesktopFlipperControls(),
+          SizedBox(height: 16),
-      ],
+          _DesktopFlipperControls(),
+        ],
+      ),
     );
   }
 }

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,
       ),
     );

packages/pinball_components/lib/src/components/dash_nest_bumper/dash_nest_bumper.dart

@@ -60,10 +60,10 @@ class DashNestBumper extends BodyComponent with InitialPosition {
     Iterable<Component>? 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<Component>? children,
   }) : this._(
-          majorRadius: 3,
+          majorRadius: 3.1,
-          minorRadius: 2.5,
+          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,

packages/pinball_components/lib/src/components/sparky_computer.dart

@@ -32,18 +32,18 @@ class _ComputerBase extends BodyComponent with InitialPosition, ZIndex {
   List<FixtureDef> _createFixtureDefs() {
     final leftEdge = EdgeShape()
       ..set(
-        Vector2(-14.9, -46),
+        Vector2(-15.1, -45.9),
-        Vector2(-15.3, -49.6),
+        Vector2(-15.5, -49.5),
       );
     final topEdge = EdgeShape()
       ..set(
-        Vector2(-15.3, -49.6),
+        leftEdge.vertex2,
-        Vector2(-10.7, -50.6),
+        Vector2(-10.9, -50.5),
       );
     final rightEdge = EdgeShape()
       ..set(
-        Vector2(-10.7, -50.6),
+        topEdge.vertex2,
-        Vector2(-9, -47.2),
+        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