Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue a cause of "Could not find step name" (2.6 bug). #11773

Merged
merged 11 commits into from
Jul 15, 2023
Merged

Fix issue a cause of "Could not find step name" (2.6 bug). #11773

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9a5b74d
Fix issue a cause of "Could not find step name".
asvitkine Jul 12, 2023
a2d3fb2
Update mock expectations.
asvitkine Jul 12, 2023
8c78dda
More test fixes.
asvitkine Jul 12, 2023
ed2618e
Remove imports.
asvitkine Jul 13, 2023
d964d64
Fix existing tests.
asvitkine Jul 13, 2023
3366181
Fix formatting.
asvitkine Jul 13, 2023
8ac3a17
More test fixing.
asvitkine Jul 13, 2023
61544cb
Use lenient properties in BattleStepsTest.
asvitkine Jul 14, 2023
ad5e6ce
More formatting.
asvitkine Jul 14, 2023
da5435a
Add a test for the fix.
asvitkine Jul 14, 2023
49eeb41
Add comment to MustFightBattle.removeNonCombatants().
asvitkine Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions ...games/strategy/triplea/delegate/battle/steps/fire/general/FiringGroupSplitterGeneral.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,28 @@ public enum Type {

@Override
public List<FiringGroup> apply(final BattleState battleState) {
final Collection<Unit> enemyUnits =
CollectionUtils.getMatches(
battleState.filterUnits(ALIVE, side.getOpposite()),
PredicateBuilder.of(Matches.unitIsNotInfrastructure())
.andIf(side == DEFENSE, Matches.unitIsSuicideOnAttack().negate())
.andIf(side == OFFENSE, Matches.unitIsSuicideOnDefense().negate())
.build());

// Filter participants (same as is done in MustFightBattle.removeNonCombatants()), so that we
asvitkine marked this conversation as resolved.
Show resolved Hide resolved
// don't end up generating combat step names for units that will be excluded.
final Predicate<Unit> canParticipateInCombat =
Matches.unitCanParticipateInCombat(
side == OFFENSE,
battleState.getPlayer(OFFENSE),
battleState.getBattleSite(),
1,
enemyUnits);
final Collection<Unit> canFire =
CollectionUtils.getMatches(
battleState.filterUnits(ACTIVE, side),
PredicateBuilder.of(getFiringUnitPredicate(battleState))
.and(canParticipateInCombat)
// Remove offense allied units if allied air can not participate
.andIf(
side == OFFENSE
Expand All @@ -68,14 +86,6 @@ public List<FiringGroup> apply(final BattleState battleState) {
Matches.unitIsOwnedBy(battleState.getPlayer(side)))
.build());

final Collection<Unit> enemyUnits =
CollectionUtils.getMatches(
battleState.filterUnits(ALIVE, side.getOpposite()),
PredicateBuilder.of(Matches.unitIsNotInfrastructure())
.andIf(side == DEFENSE, Matches.unitIsSuicideOnAttack().negate())
.andIf(side == OFFENSE, Matches.unitIsSuicideOnDefense().negate())
.build());

final List<FiringGroup> firingGroups = new ArrayList<>();

final List<TargetGroup> targetGroups = TargetGroup.newTargetGroups(canFire, enemyUnits);
Expand Down
Loading