diff --git a/lib/game/components/android_acres/behaviors/ramp_bonus_behavior.dart b/lib/game/components/android_acres/behaviors/ramp_bonus_behavior.dart index 497186a1..300c83ef 100644 --- a/lib/game/components/android_acres/behaviors/ramp_bonus_behavior.dart +++ b/lib/game/components/android_acres/behaviors/ramp_bonus_behavior.dart @@ -23,11 +23,10 @@ class RampBonusBehavior extends Component SpaceshipRampState previousState, SpaceshipRampState newState, ) { - final hasChanged = previousState.hits != newState.hits; - final hasHit = newState.hits != 0; + final hitsIncreased = previousState.hits < newState.hits; final achievedOneMillionPoints = newState.hits % 10 == 0; - return hasChanged && hasHit && achievedOneMillionPoints; + return hitsIncreased && achievedOneMillionPoints; } @override diff --git a/lib/game/components/android_acres/behaviors/ramp_multiplier_behavior.dart b/lib/game/components/android_acres/behaviors/ramp_multiplier_behavior.dart index 835ae4b3..a427b95a 100644 --- a/lib/game/components/android_acres/behaviors/ramp_multiplier_behavior.dart +++ b/lib/game/components/android_acres/behaviors/ramp_multiplier_behavior.dart @@ -13,11 +13,10 @@ class RampMultiplierBehavior extends Component SpaceshipRampState previousState, SpaceshipRampState newState, ) { - final hasChanged = - previousState.hits != newState.hits && newState.hits != 0; + final hitsIncreased = previousState.hits < newState.hits; final achievedFiveShots = newState.hits % 5 == 0; final canIncrease = readBloc().state.multiplier != 6; - return hasChanged && achievedFiveShots && canIncrease; + return hitsIncreased & achievedFiveShots && canIncrease; } @override diff --git a/lib/game/components/android_acres/behaviors/ramp_progress_behavior.dart b/lib/game/components/android_acres/behaviors/ramp_progress_behavior.dart index d9381edb..ab2926f7 100644 --- a/lib/game/components/android_acres/behaviors/ramp_progress_behavior.dart +++ b/lib/game/components/android_acres/behaviors/ramp_progress_behavior.dart @@ -12,7 +12,7 @@ class RampProgressBehavior extends Component SpaceshipRampState previousState, SpaceshipRampState newState, ) { - return previousState.hits != newState.hits && newState.hits != 0; + return previousState.hits < newState.hits; } @override diff --git a/lib/game/components/android_acres/behaviors/ramp_shot_behavior.dart b/lib/game/components/android_acres/behaviors/ramp_shot_behavior.dart index 2447873d..2d2c6855 100644 --- a/lib/game/components/android_acres/behaviors/ramp_shot_behavior.dart +++ b/lib/game/components/android_acres/behaviors/ramp_shot_behavior.dart @@ -23,7 +23,7 @@ class RampShotBehavior extends Component SpaceshipRampState previousState, SpaceshipRampState newState, ) { - return previousState.hits != newState.hits && newState.hits != 0; + return previousState.hits < newState.hits; } @override diff --git a/packages/pinball_components/test/src/components/spaceship_ramp/spaceship_ramp_test.dart b/packages/pinball_components/test/src/components/spaceship_ramp/spaceship_ramp_test.dart index 4c0b0b35..7970a8d1 100644 --- a/packages/pinball_components/test/src/components/spaceship_ramp/spaceship_ramp_test.dart +++ b/packages/pinball_components/test/src/components/spaceship_ramp/spaceship_ramp_test.dart @@ -103,9 +103,7 @@ void main() { ); }, ); - }); - group('adds', () { flameTester.test('new children', (game) async { final component = Component(); final ramp = SpaceshipRamp(children: [component]);