refactor: suggestions

pull/407/head
Allison Ryan 3 years ago
parent 01fda6613a
commit a11933cd93

@ -5,8 +5,7 @@ import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
/// Adds a [GameBonus.googleWord] when all [GoogleLetter]s are activated.
class GoogleWordBonusBehavior extends Component
with FlameBlocReader<GameBloc, GameState> {
class GoogleWordBonusBehavior extends Component {
@override
Future<void> onLoad() async {
await super.onLoad();
@ -15,7 +14,8 @@ class GoogleWordBonusBehavior extends Component
listenWhen: (_, state) => state.letterSpriteStates.values
.every((element) => element == GoogleLetterSpriteState.lit),
onNewState: (state) {
bloc.add(const BonusActivated(GameBonus.googleWord));
readBloc<GameBloc, GameState>()
.add(const BonusActivated(GameBonus.googleWord));
readBloc<GoogleWordCubit, GoogleWordState>().onBonusAwarded();
},
),

@ -30,7 +30,7 @@ class GoogleRollover extends BodyComponent {
..setAsBox(
0.1,
3.4,
(_side.isLeft) ? Vector2(-14.8, -11) : Vector2(5.9, -11),
Vector2(_side.isLeft ? -14.8 : 5.9, -11),
0.19 * _side.direction,
);
final fixtureDef = FixtureDef(shape, isSensor: true);
@ -43,7 +43,7 @@ class _RolloverDecalSpriteComponent extends SpriteComponent with HasGameRef {
: _side = side,
super(
anchor: Anchor.center,
position: (side.isLeft) ? Vector2(-14.8, -11) : Vector2(5.9, -11),
position: Vector2(side.isLeft ? -14.8 : 5.9, -11),
angle: 0.18 * side.direction,
);
@ -71,7 +71,7 @@ class _PinSpriteAnimationComponent extends SpriteAnimationComponent
: _side = side,
super(
anchor: Anchor.center,
position: (side.isLeft) ? Vector2(-14.9, -11) : Vector2(5.95, -11),
position: Vector2(side.isLeft ? -14.9 : 5.95, -11),
angle: 0,
playing: false,
);

@ -7,9 +7,10 @@ part 'google_word_state.dart';
class GoogleWordCubit extends Cubit<GoogleWordState> {
GoogleWordCubit() : super(GoogleWordState.initial());
int _lastLitLetter = 0;
static const _lettersInGoogle = 6;
int _lastLitLetter = 0;
void onRolloverContacted() {
final spriteStatesMap = {...state.letterSpriteStates};
if (_lastLitLetter < _lettersInGoogle) {

@ -5,13 +5,8 @@ class GoogleWordState extends Equatable {
GoogleWordState.initial()
: this(
letterSpriteStates: <int, GoogleLetterSpriteState>{
0: GoogleLetterSpriteState.dimmed,
1: GoogleLetterSpriteState.dimmed,
2: GoogleLetterSpriteState.dimmed,
3: GoogleLetterSpriteState.dimmed,
4: GoogleLetterSpriteState.dimmed,
5: GoogleLetterSpriteState.dimmed,
letterSpriteStates: {
for (var i = 0; i <= 5; i++) i: GoogleLetterSpriteState.dimmed
},
);

Loading…
Cancel
Save