ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improving skirmish log message specificity

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2025-03-23 18:41:26 -05:00
parent e3d3ce6843
commit 123dc2e6cf
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ResolveSkirmishEffect.java
View File

@@ -37,7 +37,7 @@ public class ResolveSkirmishEffect extends AbstractEffect {
public Result getUpcomingResult(LotroGame game) {
final Skirmish skirmish = game.getGameState().getSkirmish();
if (skirmish.getShadowCharacters().size() == 0)
if (skirmish.getShadowCharacters().isEmpty())
return Result.SHADOW_LOSES;
if (skirmish.getFellowshipCharacter() == null)
return Result.FELLOWSHIP_LOSES;
@@ -76,7 +76,7 @@ public class ResolveSkirmishEffect extends AbstractEffect {
involving.addAll(skirmish.getShadowCharacters());
if (result == Result.FELLOWSHIP_LOSES) {
game.getGameState().sendMessage("Skirmish resolved with a normal win");
game.getGameState().sendMessage("Skirmish resolved with a normal win for Free Peoples");
game.getActionsEnvironment().emitEffectResult(new NormalSkirmishResult(skirmish.getShadowCharacters(), fpList(skirmish.getFellowshipCharacter()), skirmish.getRemovedFromSkirmish()));
for (PhysicalCard minion : skirmish.getShadowCharacters())
@@ -86,7 +86,7 @@ public class ResolveSkirmishEffect extends AbstractEffect {
for (PhysicalCard removedCharacter : skirmish.getRemovedFromSkirmish())
game.getActionsEnvironment().emitEffectResult(new CharacterLostSkirmishResult(CharacterLostSkirmishResult.SkirmishType.NORMAL, removedCharacter, involving));
} else if (result == Result.SHADOW_LOSES) {
game.getGameState().sendMessage("Skirmish resolved with a normal win");
game.getGameState().sendMessage("Skirmish resolved with a normal win for Shadow");
game.getActionsEnvironment().emitEffectResult(new NormalSkirmishResult(fpList(skirmish.getFellowshipCharacter()), skirmish.getShadowCharacters(), skirmish.getRemovedFromSkirmish()));
for (PhysicalCard minion : skirmish.getShadowCharacters())
@@ -96,7 +96,7 @@ public class ResolveSkirmishEffect extends AbstractEffect {
for (PhysicalCard removedCharacter : skirmish.getRemovedFromSkirmish())
game.getActionsEnvironment().emitEffectResult(new CharacterLostSkirmishResult(CharacterLostSkirmishResult.SkirmishType.NORMAL, removedCharacter, involving));
} else if (result == Result.FELLOWSHIP_OVERWHELMED) {
game.getGameState().sendMessage("Skirmish resolved with an overwhelm");
game.getGameState().sendMessage("Skirmish resolved with an overwhelm win for Shadow");
game.getActionsEnvironment().emitEffectResult(new OverwhelmSkirmishResult(skirmish.getShadowCharacters(), fpList(skirmish.getFellowshipCharacter()), skirmish.getRemovedFromSkirmish()));
for (PhysicalCard minion : skirmish.getShadowCharacters())
@@ -106,7 +106,7 @@ public class ResolveSkirmishEffect extends AbstractEffect {
for (PhysicalCard removedCharacter : skirmish.getRemovedFromSkirmish())
game.getActionsEnvironment().emitEffectResult(new CharacterLostSkirmishResult(CharacterLostSkirmishResult.SkirmishType.OVERWHELM, removedCharacter, involving));
} else {
game.getGameState().sendMessage("Skirmish resolved with an overwhelm");
game.getGameState().sendMessage("Skirmish resolved with an overwhelm win for Free Peoples");
game.getActionsEnvironment().emitEffectResult(new OverwhelmSkirmishResult(fpList(skirmish.getFellowshipCharacter()), skirmish.getShadowCharacters(), skirmish.getRemovedFromSkirmish()));
for (PhysicalCard minion : skirmish.getShadowCharacters())

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/PlayoutSkirmishesGameProcess.java
View File

@@ -30,7 +30,7 @@ public class PlayoutSkirmishesGameProcess implements GameProcess {
final GameState gameState = game.getGameState();
final List<Assignment> assignments = gameState.getAssignments();
if (assignments.size() > 0) {
if (!assignments.isEmpty()) {
Set<PhysicalCard> nonLurkerSkirmishFps = new HashSet<>();
Set<PhysicalCard> lurkerSkirmishFps = new HashSet<>();
for (Assignment assignment : assignments) {
@@ -51,7 +51,7 @@ public class PlayoutSkirmishesGameProcess implements GameProcess {
SystemQueueAction chooseNextSkirmishAction = new SystemQueueAction();
Set<PhysicalCard> skirmishChoice;
if (nonLurkerSkirmishFps.size() > 0)
if (!nonLurkerSkirmishFps.isEmpty())
skirmishChoice = nonLurkerSkirmishFps;
else
skirmishChoice = lurkerSkirmishFps;