Merge branch 'main' into feat/improved-extra-ball-logic

lib/game/components/plunger.dart

@@ -1,8 +1,8 @@
 import 'package:flame/components.dart';
 import 'package:flame_forge2d/flame_forge2d.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:pinball_components/pinball_components.dart';
+import 'package:pinball/gen/assets.gen.dart';
+import 'package:pinball_components/pinball_components.dart' hide Assets;
 
 /// {@template plunger}
 /// [Plunger] serves as a spring, that shoots the ball on the right side of the
@@ -14,10 +14,9 @@ class Plunger extends BodyComponent with KeyboardHandler, InitialPosition {
   /// {@macro plunger}
   Plunger({
     required this.compressionDistance,
-  }) : super(
-          // TODO(allisonryan0002): remove paint after asset is added.
-          paint: Paint()..color = const Color.fromARGB(255, 241, 8, 8),
-        );
+    // TODO(ruimiguel): set to priority +1 over LaunchRamp once all priorities
+    // are fixed.
+  }) : super(priority: 0);
 
   /// Distance the plunger can lower.
   final double compressionDistance;
@@ -88,13 +87,36 @@ class Plunger extends BodyComponent with KeyboardHandler, InitialPosition {
       plunger: this,
       anchor: anchor,
     );
-    world.createJoint(PrismaticJoint(jointDef));
+
+    world.createJoint(
+      PrismaticJoint(jointDef)..setLimits(-compressionDistance, 0),
+    );
   }
 
   @override
   Future<void> onLoad() async {
     await super.onLoad();
     await _anchorToJoint();
+
+    renderBody = false;
+
+    await _loadSprite();
+  }
+
+  Future<void> _loadSprite() async {
+    final sprite = await gameRef.loadSprite(
+      Assets.images.components.plunger.path,
+    );
+
+    await add(
+      SpriteComponent(
+        sprite: sprite,
+        size: Vector2(5.5, 40),
+        anchor: Anchor.center,
+        position: Vector2(2, 19),
+        angle: -0.033,
+      ),
+    );
   }
 }
 
@@ -111,6 +133,16 @@ class PlungerAnchor extends JointAnchor {
       plunger.body.position.y - plunger.compressionDistance,
     );
   }
+
+  @override
+  Body createBody() {
+    final shape = CircleShape()..radius = 0.5;
+    final fixtureDef = FixtureDef(shape);
+    final bodyDef = BodyDef()
+      ..position = initialPosition
+      ..type = BodyType.static;
+    return world.createBody(bodyDef)..createFixture(fixtureDef);
+  }
 }
 
 /// {@template plunger_anchor_prismatic_joint_def}

lib/game/pinball_game.dart

@@ -2,7 +2,6 @@
 import 'dart:async';
 
 import 'package:flame/components.dart';
-import 'package:flame/extensions.dart';
 import 'package:flame/input.dart';
 import 'package:flame_bloc/flame_bloc.dart';
 import 'package:flame_forge2d/flame_forge2d.dart';

lib/gen/assets.gen.dart

@@ -17,6 +17,10 @@ class $AssetsImagesComponentsGen {
 
   AssetGenImage get background =>
       const AssetGenImage('assets/images/components/background.png');
+
+  /// File path: assets/images/components/plunger.png
+  AssetGenImage get plunger =>
+      const AssetGenImage('assets/images/components/plunger.png');
 }
 
 class Assets {

test/game/components/plunger_test.dart

@@ -12,11 +12,32 @@ import '../../helpers/helpers.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
-  final flameTester = FlameTester(Forge2DGame.new);
+  final flameTester = FlameTester(TestGame.new);
 
   group('Plunger', () {
     const compressionDistance = 0.0;
 
+    flameTester.testGameWidget(
+      'renders correctly',
+      setUp: (game, tester) async {
+        await game.add(
+          Plunger(
+            compressionDistance: compressionDistance,
+          ),
+        );
+        await game.ready();
+        game.camera.followVector2(Vector2.zero());
+        game.camera.zoom = 4.1;
+      },
+      // TODO(ruimiguel): enable test when workflows are fixed.
+      // verify: (game, tester) async {
+      //   await expectLater(
+      //     find.byGame<Forge2DGame>(),
+      //     matchesGoldenFile('golden/plunger.png'),
+      //   );
+      // },
+    );
+
     flameTester.test(
       'loads correctly',
       (game) async {