fix: fixed merge conflicts with assets

packages/pinball_components/lib/gen/assets.gen.dart

@@ -15,9 +15,9 @@ class $AssetsImagesGen {
   $AssetsImagesBallGen get ball => const $AssetsImagesBallGen();
   $AssetsImagesBaseboardGen get baseboard => const $AssetsImagesBaseboardGen();
 
-  /// File path: assets/images/board-background.png
+  /// File path: assets/images/board_background.png
   AssetGenImage get boardBackground =>
-      const AssetGenImage('assets/images/board-background.png');
+      const AssetGenImage('assets/images/board_background.png');
 
   $AssetsImagesBoundaryGen get boundary => const $AssetsImagesBoundaryGen();
   $AssetsImagesDashGen get dash => const $AssetsImagesDashGen();
@@ -62,9 +62,9 @@ class $AssetsImagesBackboxGen {
   $AssetsImagesBackboxButtonGen get button =>
       const $AssetsImagesBackboxButtonGen();
 
-  /// File path: assets/images/backbox/display-divider.png
+  /// File path: assets/images/backbox/display_divider.png
   AssetGenImage get displayDivider =>
-      const AssetGenImage('assets/images/backbox/display-divider.png');
+      const AssetGenImage('assets/images/backbox/display_divider.png');
 
   /// File path: assets/images/backbox/display_title_decoration.png
   AssetGenImage get displayTitleDecoration =>
@@ -102,13 +102,13 @@ class $AssetsImagesBoundaryGen {
   AssetGenImage get bottom =>
       const AssetGenImage('assets/images/boundary/bottom.png');
 
-  /// File path: assets/images/boundary/outer-bottom.png
-  AssetGenImage get outerBottom =>
-      const AssetGenImage('assets/images/boundary/outer-bottom.png');
-
   /// File path: assets/images/boundary/outer.png
   AssetGenImage get outer =>
       const AssetGenImage('assets/images/boundary/outer.png');
+
+  /// File path: assets/images/boundary/outer_bottom.png
+  AssetGenImage get outerBottom =>
+      const AssetGenImage('assets/images/boundary/outer_bottom.png');
 }
 
 class $AssetsImagesDashGen {
@@ -127,33 +127,33 @@ class $AssetsImagesDinoGen {
   $AssetsImagesDinoAnimatronicGen get animatronic =>
       const $AssetsImagesDinoAnimatronicGen();
 
-  /// File path: assets/images/dino/bottom-wall.png
+  /// File path: assets/images/dino/bottom_wall.png
   AssetGenImage get bottomWall =>
-      const AssetGenImage('assets/images/dino/bottom-wall.png');
+      const AssetGenImage('assets/images/dino/bottom_wall.png');
 
-  /// File path: assets/images/dino/top-wall-tunnel.png
-  AssetGenImage get topWallTunnel =>
-      const AssetGenImage('assets/images/dino/top-wall-tunnel.png');
-
-  /// File path: assets/images/dino/top-wall.png
+  /// File path: assets/images/dino/top_wall.png
   AssetGenImage get topWall =>
-      const AssetGenImage('assets/images/dino/top-wall.png');
+      const AssetGenImage('assets/images/dino/top_wall.png');
+
+  /// File path: assets/images/dino/top_wall_tunnel.png
+  AssetGenImage get topWallTunnel =>
+      const AssetGenImage('assets/images/dino/top_wall_tunnel.png');
 }
 
 class $AssetsImagesFlapperGen {
   const $AssetsImagesFlapperGen();
 
-  /// File path: assets/images/flapper/back-support.png
+  /// File path: assets/images/flapper/back_support.png
   AssetGenImage get backSupport =>
-      const AssetGenImage('assets/images/flapper/back-support.png');
+      const AssetGenImage('assets/images/flapper/back_support.png');
 
   /// File path: assets/images/flapper/flap.png
   AssetGenImage get flap =>
       const AssetGenImage('assets/images/flapper/flap.png');
 
-  /// File path: assets/images/flapper/front-support.png
+  /// File path: assets/images/flapper/front_support.png
   AssetGenImage get frontSupport =>
-      const AssetGenImage('assets/images/flapper/front-support.png');
+      const AssetGenImage('assets/images/flapper/front_support.png');
 }
 
 class $AssetsImagesFlipperGen {
@@ -195,13 +195,13 @@ class $AssetsImagesKickerGen {
 class $AssetsImagesLaunchRampGen {
   const $AssetsImagesLaunchRampGen();
 
-  /// File path: assets/images/launch_ramp/background-railing.png
+  /// File path: assets/images/launch_ramp/background_railing.png
   AssetGenImage get backgroundRailing =>
-      const AssetGenImage('assets/images/launch_ramp/background-railing.png');
+      const AssetGenImage('assets/images/launch_ramp/background_railing.png');
 
-  /// File path: assets/images/launch_ramp/foreground-railing.png
+  /// File path: assets/images/launch_ramp/foreground_railing.png
   AssetGenImage get foregroundRailing =>
-      const AssetGenImage('assets/images/launch_ramp/foreground-railing.png');
+      const AssetGenImage('assets/images/launch_ramp/foreground_railing.png');
 
   /// File path: assets/images/launch_ramp/ramp.png
   AssetGenImage get ramp =>
@@ -245,21 +245,21 @@ class $AssetsImagesPlungerGen {
 class $AssetsImagesScoreGen {
   const $AssetsImagesScoreGen();
 
-  /// File path: assets/images/score/five-thousand.png
+  /// File path: assets/images/score/five_thousand.png
   AssetGenImage get fiveThousand =>
-      const AssetGenImage('assets/images/score/five-thousand.png');
+      const AssetGenImage('assets/images/score/five_thousand.png');
 
-  /// File path: assets/images/score/one-million.png
+  /// File path: assets/images/score/one_million.png
   AssetGenImage get oneMillion =>
-      const AssetGenImage('assets/images/score/one-million.png');
+      const AssetGenImage('assets/images/score/one_million.png');
 
-  /// File path: assets/images/score/twenty-thousand.png
+  /// File path: assets/images/score/twenty_thousand.png
   AssetGenImage get twentyThousand =>
-      const AssetGenImage('assets/images/score/twenty-thousand.png');
+      const AssetGenImage('assets/images/score/twenty_thousand.png');
 
-  /// File path: assets/images/score/two-hundred-thousand.png
+  /// File path: assets/images/score/two_hundred_thousand.png
   AssetGenImage get twoHundredThousand =>
-      const AssetGenImage('assets/images/score/two-hundred-thousand.png');
+      const AssetGenImage('assets/images/score/two_hundred_thousand.png');
 }
 
 class $AssetsImagesSignpostGen {
@@ -356,21 +356,21 @@ class $AssetsImagesAndroidRampGen {
   $AssetsImagesAndroidRampArrowGen get arrow =>
       const $AssetsImagesAndroidRampArrowGen();
 
-  /// File path: assets/images/android/ramp/board-opening.png
+  /// File path: assets/images/android/ramp/board_opening.png
   AssetGenImage get boardOpening =>
-      const AssetGenImage('assets/images/android/ramp/board-opening.png');
+      const AssetGenImage('assets/images/android/ramp/board_opening.png');
 
   /// File path: assets/images/android/ramp/main.png
   AssetGenImage get main =>
       const AssetGenImage('assets/images/android/ramp/main.png');
 
-  /// File path: assets/images/android/ramp/railing-background.png
+  /// File path: assets/images/android/ramp/railing_background.png
   AssetGenImage get railingBackground =>
-      const AssetGenImage('assets/images/android/ramp/railing-background.png');
+      const AssetGenImage('assets/images/android/ramp/railing_background.png');
 
-  /// File path: assets/images/android/ramp/railing-foreground.png
+  /// File path: assets/images/android/ramp/railing_foreground.png
   AssetGenImage get railingForeground =>
-      const AssetGenImage('assets/images/android/ramp/railing-foreground.png');
+      const AssetGenImage('assets/images/android/ramp/railing_foreground.png');
 }
 
 class $AssetsImagesAndroidSpaceshipGen {
@@ -380,9 +380,9 @@ class $AssetsImagesAndroidSpaceshipGen {
   AssetGenImage get animatronic =>
       const AssetGenImage('assets/images/android/spaceship/animatronic.png');
 
-  /// File path: assets/images/android/spaceship/light-beam.png
+  /// File path: assets/images/android/spaceship/light_beam.png
   AssetGenImage get lightBeam =>
-      const AssetGenImage('assets/images/android/spaceship/light-beam.png');
+      const AssetGenImage('assets/images/android/spaceship/light_beam.png');
 
   /// File path: assets/images/android/spaceship/saucer.png
   AssetGenImage get saucer =>

packages/pinball_components/test/src/components/board_background_sprite_component_test.dart

@@ -40,7 +40,7 @@ void main() {
       verify: (game, tester) async {
         await expectLater(
           find.byGame<TestGame>(),
-          matchesGoldenFile('golden/board-background.png'),
+          matchesGoldenFile('golden/board_background.png'),
         );
       },
     );

packages/pinball_components/test/src/components/dino_walls_test.dart

@@ -37,7 +37,7 @@ void main() {
       verify: (game, tester) async {
         await expectLater(
           find.byGame<TestGame>(),
-          matchesGoldenFile('golden/dino-walls.png'),
+          matchesGoldenFile('golden/dino_walls.png'),
         );
       },
     );

packages/pinball_components/test/src/components/launch_ramp_test.dart

@@ -36,7 +36,7 @@ void main() {
       verify: (game, tester) async {
         await expectLater(
           find.byGame<TestGame>(),
-          matchesGoldenFile('golden/launch-ramp.png'),
+          matchesGoldenFile('golden/launch_ramp.png'),
         );
       },
     );

packages/pinball_components/test/src/components/multiplier/multiplier_test.dart

@@ -122,7 +122,7 @@ void main() {
 
             await expectLater(
               find.byGame<_TestGame>(),
-              matchesGoldenFile('../golden/multipliers/x2-lit.png'),
+              matchesGoldenFile('../golden/multipliers/x2_lit.png'),
             );
           },
         );
@@ -162,7 +162,7 @@ void main() {
 
             await expectLater(
               find.byGame<_TestGame>(),
-              matchesGoldenFile('../golden/multipliers/x2-dimmed.png'),
+              matchesGoldenFile('../golden/multipliers/x2_dimmed.png'),
             );
           },
         );
@@ -206,7 +206,7 @@ void main() {
 
             await expectLater(
               find.byGame<_TestGame>(),
-              matchesGoldenFile('../golden/multipliers/x3-lit.png'),
+              matchesGoldenFile('../golden/multipliers/x3_lit.png'),
             );
           },
         );
@@ -246,7 +246,7 @@ void main() {
 
             await expectLater(
               find.byGame<_TestGame>(),
-              matchesGoldenFile('../golden/multipliers/x3-dimmed.png'),
+              matchesGoldenFile('../golden/multipliers/x3_dimmed.png'),
             );
           },
         );
@@ -290,7 +290,7 @@ void main() {
 
             await expectLater(
               find.byGame<_TestGame>(),
-              matchesGoldenFile('../golden/multipliers/x4-lit.png'),
+              matchesGoldenFile('../golden/multipliers/x4_lit.png'),
             );
           },
         );
@@ -330,7 +330,7 @@ void main() {
 
             await expectLater(
               find.byGame<_TestGame>(),
-              matchesGoldenFile('../golden/multipliers/x4-dimmed.png'),
+              matchesGoldenFile('../golden/multipliers/x4_dimmed.png'),
             );
           },
         );
@@ -374,7 +374,7 @@ void main() {
 
             await expectLater(
               find.byGame<_TestGame>(),
-              matchesGoldenFile('../golden/multipliers/x5-lit.png'),
+              matchesGoldenFile('../golden/multipliers/x5_lit.png'),
             );
           },
         );
@@ -414,7 +414,7 @@ void main() {
 
             await expectLater(
               find.byGame<_TestGame>(),
-              matchesGoldenFile('../golden/multipliers/x5-dimmed.png'),
+              matchesGoldenFile('../golden/multipliers/x5_dimmed.png'),
             );
           },
         );
@@ -458,7 +458,7 @@ void main() {
 
             await expectLater(
               find.byGame<_TestGame>(),
-              matchesGoldenFile('../golden/multipliers/x6-lit.png'),
+              matchesGoldenFile('../golden/multipliers/x6_lit.png'),
             );
           },
         );
@@ -498,7 +498,7 @@ void main() {
 
             await expectLater(
               find.byGame<_TestGame>(),
-              matchesGoldenFile('../golden/multipliers/x6-dimmed.png'),
+              matchesGoldenFile('../golden/multipliers/x6_dimmed.png'),
             );
           },
         );

packages/pinball_components/test/src/components/spaceship_rail_test.dart

@@ -35,7 +35,7 @@ void main() {
       verify: (game, tester) async {
         await expectLater(
           find.byGame<TestGame>(),
-          matchesGoldenFile('golden/spaceship-rail.png'),
+          matchesGoldenFile('golden/spaceship_rail.png'),
         );
       },
     );

packages/pinball_components/test/src/components/sparky_computer/sparky_computer_test.dart

@@ -42,7 +42,7 @@ void main() {
       verify: (game, tester) async {
         await expectLater(
           find.byGame<TestGame>(),
-          matchesGoldenFile('../golden/sparky-computer.png'),
+          matchesGoldenFile('../golden/sparky_computer.png'),
         );
       },
     );