Merge branch 'main' into feat/google-rollovers

lib/game/bloc/game_bloc.dart

@@ -16,6 +16,8 @@ class GameBloc extends Bloc<GameEvent, GameState> {
     on<GameStarted>(_onGameStarted);
   }
 
+  static const _maxScore = 9999999999;
+
   void _onGameStarted(GameStarted _, Emitter emit) {
     emit(state.copyWith(status: GameStatus.playing));
   }
@@ -25,7 +27,10 @@ class GameBloc extends Bloc<GameEvent, GameState> {
   }
 
   void _onRoundLost(RoundLost event, Emitter emit) {
-    final score = state.totalScore + state.roundScore * state.multiplier;
+    final score = math.min(
+      state.totalScore + state.roundScore * state.multiplier,
+      _maxScore,
+    );
     final roundsLeft = math.max(state.rounds - 1, 0);
 
     emit(
@@ -41,9 +46,11 @@ class GameBloc extends Bloc<GameEvent, GameState> {
 
   void _onScored(Scored event, Emitter emit) {
     if (state.status.isPlaying) {
-      emit(
-        state.copyWith(roundScore: state.roundScore + event.points),
+      final combinedScore = math.min(
+        state.totalScore + state.roundScore + event.points,
+        _maxScore,
       );
+      emit(state.copyWith(roundScore: combinedScore - state.totalScore));
     }
   }
 

lib/game/components/android_acres/android_acres.dart

@@ -47,6 +47,7 @@ class AndroidAcres extends Component {
                 AndroidBumper.cow(
                   children: [
                     ScoringContactBehavior(points: Points.twentyThousand),
+                    BumperNoiseBehavior(),
                     CowBumperNoiseBehavior(),
                   ],
                 )..initialPosition = Vector2(-20.7, -13),

lib/game/view/pinball_game_page.dart

@@ -5,7 +5,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:leaderboard_repository/leaderboard_repository.dart';
 import 'package:pinball/assets_manager/assets_manager.dart';
 import 'package:pinball/game/game.dart';
-import 'package:pinball/gen/gen.dart';
 import 'package:pinball/l10n/l10n.dart';
 import 'package:pinball/more_information/more_information.dart';
 import 'package:pinball/select_character/select_character.dart';
@@ -167,7 +166,7 @@ class _PositionedInfoIcon extends StatelessWidget {
             visible: state.status.isGameOver,
             child: IconButton(
               iconSize: 50,
-              icon: Assets.images.linkBox.infoIcon.image(),
+              icon: const Icon(Icons.info, color: PinballColors.white),
               onPressed: () => showMoreInformationDialog(context),
             ),
           );

lib/gen/assets.gen.dart

@@ -14,7 +14,6 @@ class $AssetsImagesGen {
       const $AssetsImagesBonusAnimationGen();
   $AssetsImagesComponentsGen get components =>
       const $AssetsImagesComponentsGen();
-  $AssetsImagesLinkBoxGen get linkBox => const $AssetsImagesLinkBoxGen();
   $AssetsImagesLoadingGameGen get loadingGame =>
       const $AssetsImagesLoadingGameGen();
   $AssetsImagesScoreGen get score => const $AssetsImagesScoreGen();
@@ -56,14 +55,6 @@ class $AssetsImagesComponentsGen {
       const AssetGenImage('assets/images/components/space.png');
 }
 
-class $AssetsImagesLinkBoxGen {
-  const $AssetsImagesLinkBoxGen();
-
-  /// File path: assets/images/link_box/info_icon.png
-  AssetGenImage get infoIcon =>
-      const AssetGenImage('assets/images/link_box/info_icon.png');
-}
-
 class $AssetsImagesLoadingGameGen {
   const $AssetsImagesLoadingGameGen();
 

pubspec.yaml

@@ -64,7 +64,6 @@ flutter:
     - assets/images/components/
     - assets/images/bonus_animation/
     - assets/images/score/
-    - assets/images/link_box/
     - assets/images/loading_game/
 
 flutter_gen:

test/game/bloc/game_bloc_test.dart

@@ -91,6 +91,28 @@ void main() {
         ],
       );
 
+      blocTest<GameBloc, GameState>(
+        "multiplier doesn't increase score above the max score",
+        build: GameBloc.new,
+        seed: () => const GameState(
+          totalScore: 9999999998,
+          roundScore: 1,
+          multiplier: 2,
+          rounds: 1,
+          bonusHistory: [],
+          status: GameStatus.playing,
+        ),
+        act: (bloc) => bloc.add(const RoundLost()),
+        expect: () => [
+          isA<GameState>()
+            ..having(
+              (state) => state.totalScore,
+              'totalScore',
+              9999999999,
+            )
+        ],
+      );
+
       blocTest<GameBloc, GameState>(
         'resets multiplier when round is lost',
         build: GameBloc.new,
@@ -167,6 +189,23 @@ void main() {
             ),
         ],
       );
+
+      blocTest<GameBloc, GameState>(
+        "doesn't increase score above the max score",
+        build: GameBloc.new,
+        seed: () => const GameState(
+          totalScore: 9999999998,
+          roundScore: 0,
+          multiplier: 1,
+          rounds: 1,
+          bonusHistory: [],
+          status: GameStatus.playing,
+        ),
+        act: (bloc) => bloc.add(const Scored(points: 2)),
+        expect: () => [
+          isA<GameState>()..having((state) => state.roundScore, 'roundScore', 1)
+        ],
+      );
     });
 
     group('MultiplierIncreased', () {

test/game/components/android_acres/android_acres_test.dart

@@ -117,18 +117,16 @@ void main() {
       );
 
       flameTester.test(
-        'two AndroidBumpers with BumperNoiseBehavior',
+        'three AndroidBumpers with BumperNoiseBehavior',
         (game) async {
           await game.pump(AndroidAcres());
           final bumpers = game.descendants().whereType<AndroidBumper>();
-          var behaviorCount = 0;
           for (final bumper in bumpers) {
-            if (bumper.firstChild<BumperNoiseBehavior>() != null) {
-              behaviorCount++;
-            }
+            expect(
+              bumper.firstChild<BumperNoiseBehavior>(),
+              isA<BumperNoiseBehavior>(),
+            );
           }
-
-          expect(behaviorCount, equals(2));
         },
       );
 

test/game/view/pinball_game_page_test.dart

@@ -10,7 +10,6 @@ import 'package:leaderboard_repository/leaderboard_repository.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:pinball/assets_manager/assets_manager.dart';
 import 'package:pinball/game/game.dart';
-import 'package:pinball/gen/gen.dart';
 import 'package:pinball/l10n/l10n.dart';
 import 'package:pinball/more_information/more_information.dart';
 import 'package:pinball/select_character/select_character.dart';
@@ -316,7 +315,7 @@ void main() {
           gameBloc: gameBloc,
           startGameBloc: startGameBloc,
         );
-        expect(find.image(Assets.images.linkBox.infoIcon), findsOneWidget);
+        expect(find.byIcon(Icons.info), findsOneWidget);
       });
 
       testWidgets('opens MoreInformationDialog when tapped', (tester) async {