mirror of https://github.com/flutter/pinball.git
feat: adding bonus letters to board (#35)
* feat: adding ball spawming upon click on debug mode * PR suggestions * fix: rebase * feat: adding bonus letter component * feat: bonus letter callback * feat: removing flip * feat: adding bonus letters to board * Apply suggestions from code review Co-authored-by: Allison Ryan <77211884+allisonryan0002@users.noreply.github.com> * feat: improving bonus letters grouping * feat: removing not needed pump * feat: rebase fix * fix: re adding wrongly removed code during rebase * fix: lint * fix: flaky test * Apply suggestions from code review Co-authored-by: Allison Ryan <77211884+allisonryan0002@users.noreply.github.com> Co-authored-by: Allison Ryan <77211884+allisonryan0002@users.noreply.github.com>pull/41/head
Erick
4 years ago
committed by
GitHub
parent
f6f171b7c7
commit
03d48eac40
@ -0,0 +1,134 @@
|
||||
// ignore_for_file: avoid_renaming_method_parameters
|
||||
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flame/components.dart';
|
||||
import 'package:flame/effects.dart';
|
||||
import 'package:flame_bloc/flame_bloc.dart';
|
||||
import 'package:flame_forge2d/flame_forge2d.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:pinball/game/game.dart';
|
||||
|
||||
/// {@template bonus_word}
|
||||
/// Loads all [BonusLetter]s to compose a [BonusWord].
|
||||
/// {@endtemplate}
|
||||
class BonusWord extends Component {
|
||||
/// {@macro bonus_word}
|
||||
BonusWord({required Vector2 position}) : _position = position;
|
||||
|
||||
final Vector2 _position;
|
||||
|
||||
@override
|
||||
Future<void> onLoad() async {
|
||||
await super.onLoad();
|
||||
final letters = GameBloc.bonusWord.split('');
|
||||
|
||||
for (var i = 0; i < letters.length; i++) {
|
||||
unawaited(
|
||||
add(
|
||||
BonusLetter(
|
||||
position: _position - Vector2(16 - (i * 6), -30),
|
||||
letter: letters[i],
|
||||
index: i,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// {@template bonus_letter}
|
||||
/// [BodyType.static] sensor component, part of a word bonus,
|
||||
/// which will activate its letter after contact with a [Ball].
|
||||
/// {@endtemplate}
|
||||
class BonusLetter extends BodyComponent<PinballGame>
|
||||
with BlocComponent<GameBloc, GameState> {
|
||||
/// {@macro bonus_letter}
|
||||
BonusLetter({
|
||||
required Vector2 position,
|
||||
required String letter,
|
||||
required int index,
|
||||
}) : _position = position,
|
||||
_letter = letter,
|
||||
_index = index {
|
||||
paint = Paint()..color = _disableColor;
|
||||
}
|
||||
|
||||
/// The area size of this [BonusLetter].
|
||||
static final areaSize = Vector2.all(4);
|
||||
|
||||
static const _activeColor = Colors.green;
|
||||
static const _disableColor = Colors.red;
|
||||
|
||||
final Vector2 _position;
|
||||
final String _letter;
|
||||
final int _index;
|
||||
|
||||
@override
|
||||
Future<void> onLoad() async {
|
||||
await super.onLoad();
|
||||
|
||||
await add(
|
||||
TextComponent(
|
||||
position: Vector2(-1, -1),
|
||||
text: _letter,
|
||||
textRenderer: TextPaint(
|
||||
style: const TextStyle(fontSize: 2, color: Colors.white),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Body createBody() {
|
||||
final shape = CircleShape()..radius = areaSize.x / 2;
|
||||
|
||||
final fixtureDef = FixtureDef(shape)..isSensor = true;
|
||||
|
||||
final bodyDef = BodyDef()
|
||||
..userData = this
|
||||
..position = _position
|
||||
..type = BodyType.static;
|
||||
|
||||
return world.createBody(bodyDef)..createFixture(fixtureDef);
|
||||
}
|
||||
|
||||
@override
|
||||
bool listenWhen(GameState? previousState, GameState newState) {
|
||||
final wasActive = previousState?.isLetterActivated(_index) ?? false;
|
||||
final isActive = newState.isLetterActivated(_index);
|
||||
|
||||
return wasActive != isActive;
|
||||
}
|
||||
|
||||
@override
|
||||
void onNewState(GameState state) {
|
||||
final isActive = state.isLetterActivated(_index);
|
||||
|
||||
add(
|
||||
ColorEffect(
|
||||
isActive ? _activeColor : _disableColor,
|
||||
const Offset(0, 1),
|
||||
EffectController(duration: 0.25),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// Activates this [BonusLetter], if it's not already activated.
|
||||
void activate() {
|
||||
final isActive = state?.isLetterActivated(_index) ?? false;
|
||||
if (!isActive) {
|
||||
gameRef.read<GameBloc>().add(BonusLetterActivated(_index));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Triggers [BonusLetter.activate] method when a [BonusLetter] and a [Ball]
|
||||
/// come in contact.
|
||||
class BonusLetterBallContactCallback
|
||||
extends ContactCallback<Ball, BonusLetter> {
|
||||
@override
|
||||
void begin(Ball ball, BonusLetter bonusLetter, Contact contact) {
|
||||
bonusLetter.activate();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,244 @@
|
||||
// ignore_for_file: cascade_invocations
|
||||
|
||||
import 'package:bloc_test/bloc_test.dart';
|
||||
import 'package:flame/effects.dart';
|
||||
import 'package:flame_forge2d/flame_forge2d.dart';
|
||||
import 'package:flame_test/flame_test.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:mocktail/mocktail.dart';
|
||||
import 'package:pinball/game/game.dart';
|
||||
|
||||
import '../../helpers/helpers.dart';
|
||||
|
||||
void main() {
|
||||
TestWidgetsFlutterBinding.ensureInitialized();
|
||||
|
||||
group('BonusWord', () {
|
||||
final flameTester = FlameTester(PinballGameTest.create);
|
||||
|
||||
flameTester.test(
|
||||
'loads the letters correctly',
|
||||
(game) async {
|
||||
await game.ready();
|
||||
|
||||
final bonusWord = game.children.whereType<BonusWord>().first;
|
||||
final letters = bonusWord.children.whereType<BonusLetter>();
|
||||
expect(letters.length, equals(GameBloc.bonusWord.length));
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
group('BonusLetter', () {
|
||||
final flameTester = FlameTester(PinballGameTest.create);
|
||||
|
||||
flameTester.test(
|
||||
'loads correctly',
|
||||
(game) async {
|
||||
final bonusLetter = BonusLetter(
|
||||
position: Vector2.zero(),
|
||||
letter: 'G',
|
||||
index: 0,
|
||||
);
|
||||
await game.ensureAdd(bonusLetter);
|
||||
await game.ready();
|
||||
|
||||
expect(game.contains(bonusLetter), isTrue);
|
||||
},
|
||||
);
|
||||
|
||||
group('body', () {
|
||||
flameTester.test(
|
||||
'positions correctly',
|
||||
(game) async {
|
||||
final position = Vector2.all(10);
|
||||
final bonusLetter = BonusLetter(
|
||||
position: position,
|
||||
letter: 'G',
|
||||
index: 0,
|
||||
);
|
||||
await game.ensureAdd(bonusLetter);
|
||||
game.contains(bonusLetter);
|
||||
|
||||
expect(bonusLetter.body.position, position);
|
||||
},
|
||||
);
|
||||
|
||||
flameTester.test(
|
||||
'is static',
|
||||
(game) async {
|
||||
final bonusLetter = BonusLetter(
|
||||
position: Vector2.zero(),
|
||||
letter: 'G',
|
||||
index: 0,
|
||||
);
|
||||
await game.ensureAdd(bonusLetter);
|
||||
|
||||
expect(bonusLetter.body.bodyType, equals(BodyType.static));
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
group('fixture', () {
|
||||
flameTester.test(
|
||||
'exists',
|
||||
(game) async {
|
||||
final bonusLetter = BonusLetter(
|
||||
position: Vector2.zero(),
|
||||
letter: 'G',
|
||||
index: 0,
|
||||
);
|
||||
await game.ensureAdd(bonusLetter);
|
||||
|
||||
expect(bonusLetter.body.fixtures[0], isA<Fixture>());
|
||||
},
|
||||
);
|
||||
|
||||
flameTester.test(
|
||||
'is sensor',
|
||||
(game) async {
|
||||
final bonusLetter = BonusLetter(
|
||||
position: Vector2.zero(),
|
||||
letter: 'G',
|
||||
index: 0,
|
||||
);
|
||||
await game.ensureAdd(bonusLetter);
|
||||
|
||||
final fixture = bonusLetter.body.fixtures[0];
|
||||
expect(fixture.isSensor, isTrue);
|
||||
},
|
||||
);
|
||||
|
||||
flameTester.test(
|
||||
'shape is circular',
|
||||
(game) async {
|
||||
final bonusLetter = BonusLetter(
|
||||
position: Vector2.zero(),
|
||||
letter: 'G',
|
||||
index: 0,
|
||||
);
|
||||
await game.ensureAdd(bonusLetter);
|
||||
|
||||
final fixture = bonusLetter.body.fixtures[0];
|
||||
expect(fixture.shape.shapeType, equals(ShapeType.circle));
|
||||
expect(fixture.shape.radius, equals(2));
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
group('bonus letter activation', () {
|
||||
final gameBloc = MockGameBloc();
|
||||
|
||||
BonusLetter _getBonusLetter(PinballGame game) {
|
||||
return game.children
|
||||
.whereType<BonusWord>()
|
||||
.first
|
||||
.children
|
||||
.whereType<BonusLetter>()
|
||||
.first;
|
||||
}
|
||||
|
||||
setUp(() {
|
||||
whenListen(
|
||||
gameBloc,
|
||||
const Stream<GameState>.empty(),
|
||||
initialState: const GameState.initial(),
|
||||
);
|
||||
});
|
||||
|
||||
final tester = flameBlocTester(gameBloc: () => gameBloc);
|
||||
|
||||
tester.widgetTest(
|
||||
'adds BonusLetterActivated to GameBloc when not activated',
|
||||
(game, tester) async {
|
||||
await game.ready();
|
||||
|
||||
_getBonusLetter(game).activate();
|
||||
|
||||
await tester.pump();
|
||||
|
||||
verify(() => gameBloc.add(const BonusLetterActivated(0))).called(1);
|
||||
},
|
||||
);
|
||||
|
||||
tester.widgetTest(
|
||||
"doesn't add BonusLetterActivated to GameBloc when already activated",
|
||||
(game, tester) async {
|
||||
const state = GameState(
|
||||
score: 0,
|
||||
balls: 2,
|
||||
activatedBonusLetters: [0],
|
||||
bonusHistory: [],
|
||||
);
|
||||
whenListen(
|
||||
gameBloc,
|
||||
Stream.value(state),
|
||||
initialState: state,
|
||||
);
|
||||
await game.ready();
|
||||
|
||||
_getBonusLetter(game).activate();
|
||||
await game.ready(); // Making sure that all additions are done
|
||||
|
||||
verifyNever(() => gameBloc.add(const BonusLetterActivated(0)));
|
||||
},
|
||||
);
|
||||
|
||||
tester.widgetTest(
|
||||
'adds a ColorEffect',
|
||||
(game, tester) async {
|
||||
await game.ready();
|
||||
|
||||
const state = GameState(
|
||||
score: 0,
|
||||
balls: 2,
|
||||
activatedBonusLetters: [0],
|
||||
bonusHistory: [],
|
||||
);
|
||||
|
||||
final bonusLetter = _getBonusLetter(game);
|
||||
|
||||
bonusLetter.onNewState(state);
|
||||
await tester.pump();
|
||||
|
||||
expect(
|
||||
bonusLetter.children.whereType<ColorEffect>().length,
|
||||
equals(1),
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
tester.widgetTest(
|
||||
'only listens when there is a change on the letter status',
|
||||
(game, tester) async {
|
||||
await game.ready();
|
||||
|
||||
const state = GameState(
|
||||
score: 0,
|
||||
balls: 2,
|
||||
activatedBonusLetters: [0],
|
||||
bonusHistory: [],
|
||||
);
|
||||
|
||||
final bonusLetter = _getBonusLetter(game);
|
||||
|
||||
expect(
|
||||
bonusLetter.listenWhen(const GameState.initial(), state),
|
||||
isTrue,
|
||||
);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
group('BonusLetterBallContactCallback', () {
|
||||
test('calls ball.activate', () {
|
||||
final ball = MockBall();
|
||||
final bonusLetter = MockBonusLetter();
|
||||
|
||||
final contactCallback = BonusLetterBallContactCallback();
|
||||
contactCallback.begin(ball, bonusLetter, MockContact());
|
||||
|
||||
verify(bonusLetter.activate).called(1);
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
Loading…
Reference in new issue