Replaced all in-game messages using "his or her" or "his/her" with "their" for brevity's sake.

This commit is contained in:
Christian 'ketura' McCarty
2022-03-08 22:43:10 -06:00
parent 7e48665290
commit 966a2d23d9
15 changed files with 15 additions and 15 deletions

View File

@@ -88,7 +88,7 @@ public class AttachPermanentAction extends AbstractCostToEffectAction {
else
game.getGameState().addCardToZone(game, _cardToAttach, Zone.VOID);
if (playedFromZone == Zone.DECK) {
game.getGameState().sendMessage(_cardToAttach.getOwner() + " shuffles his or her deck");
game.getGameState().sendMessage(_cardToAttach.getOwner() + " shuffles their deck");
game.getGameState().shuffleDeck(_cardToAttach.getOwner());
}
}

View File

@@ -79,7 +79,7 @@ public class PlayEventAction extends AbstractCostToEffectAction {
game.getGameState().addCardToZone(game, _eventPlayed, Zone.VOID);
if (playedFromZone == Zone.DECK) {
game.getGameState().sendMessage(_eventPlayed.getOwner() + " shuffles his or her deck");
game.getGameState().sendMessage(_eventPlayed.getOwner() + " shuffles their deck");
game.getGameState().shuffleDeck(_eventPlayed.getOwner());
}

View File

@@ -79,7 +79,7 @@ public class PlayPermanentAction extends AbstractCostToEffectAction {
else
game.getGameState().addCardToZone(game, _permanentPlayed, Zone.VOID);
if (playedFromZone == Zone.DECK && !_skipShuffling) {
game.getGameState().sendMessage(_permanentPlayed.getOwner() + " shuffles his or her deck");
game.getGameState().sendMessage(_permanentPlayed.getOwner() + " shuffles their deck");
game.getGameState().shuffleDeck(_permanentPlayed.getOwner());
}
}

View File

@@ -36,7 +36,7 @@ public class DiscardBottomCardFromDeckEffect extends AbstractEffect {
if (success) {
GameState gameState = game.getGameState();
PhysicalCard card = gameState.removeBottomDeckCard(_playerId);
gameState.sendMessage(_playerId + " discards bottom card from his or her deck - " + GameUtils.getCardLink(card));
gameState.sendMessage(_playerId + " discards bottom card from their deck - " + GameUtils.getCardLink(card));
gameState.addCardToZone(game, card, Zone.DISCARD);
discardedCardCallback(card);

View File

@@ -58,7 +58,7 @@ public class DiscardTopCardFromDeckEffect extends AbstractEffect {
}
}
if (cardsDiscarded.size() > 0) {
gameState.sendMessage(_playerId + " discards top cards from his or her deck - " + getAppendedNames(cardsDiscarded));
gameState.sendMessage(_playerId + " discards top cards from their deck - " + getAppendedNames(cardsDiscarded));
cardsDiscardedCallback(cardsDiscarded);
}

View File

@@ -37,7 +37,7 @@ public class PutCardFromDeckIntoHandEffect extends AbstractEffect {
if ((!game.getFormat().hasRuleOfFour() || game.getModifiersQuerying().canDrawCardAndIncrementForRuleOfFour(game, _card.getOwner()))
&& _card.getZone() == Zone.DECK) {
GameState gameState = game.getGameState();
gameState.sendMessage(_card.getOwner() + " puts " + GameUtils.getCardLink(_card) + " from deck into his or her hand");
gameState.sendMessage(_card.getOwner() + " puts " + GameUtils.getCardLink(_card) + " from deck into their hand");
gameState.removeCardsFromZone(_card.getOwner(), Collections.singleton(_card));
gameState.addCardToZone(game, _card, Zone.HAND);
game.getActionsEnvironment().emitEffectResult(new DrawCardOrPutIntoHandResult(_card.getOwner()));

View File

@@ -40,7 +40,7 @@ public class PutCardFromDeckIntoHandOrDiscardEffect extends AbstractEffect {
protected FullEffectResult playEffectReturningResult(LotroGame game) {
if (_physicalCard.getZone() == Zone.DECK) {
if ((!game.getFormat().hasRuleOfFour() || game.getModifiersQuerying().canDrawCardAndIncrementForRuleOfFour(game, _physicalCard.getOwner()))) {
game.getGameState().sendMessage(_physicalCard.getOwner() + " puts " + GameUtils.getCardLink(_physicalCard) + " from deck into his or her hand");
game.getGameState().sendMessage(_physicalCard.getOwner() + " puts " + GameUtils.getCardLink(_physicalCard) + " from deck into their hand");
game.getGameState().removeCardsFromZone(_physicalCard.getOwner(), Collections.singleton(_physicalCard));
game.getGameState().addCardToZone(game, _physicalCard, Zone.HAND);
game.getActionsEnvironment().emitEffectResult(new DrawCardOrPutIntoHandResult(_physicalCard.getOwner()));

View File

@@ -38,7 +38,7 @@ public class PutCardFromDiscardIntoHandEffect extends AbstractEffect {
if ((!game.getFormat().hasRuleOfFour() || game.getModifiersQuerying().canDrawCardAndIncrementForRuleOfFour(game, _card.getOwner()))
&& _card.getZone() == Zone.DISCARD) {
GameState gameState = game.getGameState();
gameState.sendMessage(_card.getOwner() + " puts " + GameUtils.getCardLink(_card) + " from discard into his or her hand");
gameState.sendMessage(_card.getOwner() + " puts " + GameUtils.getCardLink(_card) + " from discard into their hand");
gameState.removeCardsFromZone(_card.getOwner(), Collections.singleton(_card));
gameState.addCardToZone(game, _card, Zone.HAND);
game.getActionsEnvironment().emitEffectResult(new DrawCardOrPutIntoHandResult(_card.getOwner()));

View File

@@ -42,7 +42,7 @@ public class PutCardFromHandOnBottomOfDeckEffect extends AbstractEffect {
GameState gameState = game.getGameState();
gameState.removeCardsFromZone(physicalCards[0].getOwner(), Arrays.asList(physicalCards));
for (PhysicalCard physicalCard : physicalCards) {
gameState.sendMessage(physicalCard.getOwner() + " puts a card from hand on bottom of his or her deck");
gameState.sendMessage(physicalCard.getOwner() + " puts a card from hand on bottom of their deck");
gameState.putCardOnBottomOfDeck(physicalCard);
}

View File

@@ -36,7 +36,7 @@ public class PutCardFromHandOnTopOfDeckEffect extends AbstractEffect {
protected FullEffectResult playEffectReturningResult(LotroGame game) {
if (isPlayableInFull(game)) {
GameState gameState = game.getGameState();
gameState.sendMessage(_physicalCard.getOwner() + " puts a card from hand on top of his or her deck");
gameState.sendMessage(_physicalCard.getOwner() + " puts a card from hand on top of their deck");
gameState.removeCardsFromZone(_physicalCard.getOwner(), Collections.singleton(_physicalCard));
gameState.putCardOnTopOfDeck(_physicalCard);
return new FullEffectResult(true);

View File

@@ -38,7 +38,7 @@ public class PutCardFromStackedIntoHandEffect extends AbstractEffect {
if (_card.getZone() == Zone.STACKED
&& (!game.getFormat().hasRuleOfFour() || game.getModifiersQuerying().canDrawCardAndIncrementForRuleOfFour(game, _card.getOwner()))) {
GameState gameState = game.getGameState();
gameState.sendMessage(_card.getOwner() + " puts " + GameUtils.getCardLink(_card) + " from " + GameUtils.getCardLink(_card.getStackedOn()) + " into his or her hand");
gameState.sendMessage(_card.getOwner() + " puts " + GameUtils.getCardLink(_card) + " from " + GameUtils.getCardLink(_card.getStackedOn()) + " into their hand");
gameState.removeCardsFromZone(_card.getOwner(), Collections.singleton(_card));
gameState.addCardToZone(game, _card, Zone.HAND);
game.getActionsEnvironment().emitEffectResult(new DrawCardOrPutIntoHandResult(_card.getOwner()));

View File

@@ -34,7 +34,7 @@ public class PutPlayedEventOnBottomOfDeckEffect extends AbstractEffect {
@Override
protected FullEffectResult playEffectReturningResult(LotroGame game) {
if (isPlayableInFull(game)) {
game.getGameState().sendMessage(card.getOwner() + " puts " + GameUtils.getCardLink(card) + " on bottom of his/her deck");
game.getGameState().sendMessage(card.getOwner() + " puts " + GameUtils.getCardLink(card) + " on bottom of their deck");
game.getGameState().removeCardsFromZone(card.getOwner(), Collections.singletonList(card));
game.getGameState().putCardOnBottomOfDeck(card);
return new FullEffectResult(true);

View File

@@ -36,7 +36,7 @@ public class PutPlayedEventOnTopOfDeckEffect extends AbstractEffect {
protected FullEffectResult playEffectReturningResult(LotroGame game) {
if (isPlayableInFull(game)) {
PhysicalCard eventPlayed = _action.getEventPlayed();
game.getGameState().sendMessage(_action.getPerformingPlayer() + " puts " + GameUtils.getCardLink(eventPlayed) + " on top of his/her deck");
game.getGameState().sendMessage(_action.getPerformingPlayer() + " puts " + GameUtils.getCardLink(eventPlayed) + " on top of their deck");
game.getGameState().removeCardsFromZone(eventPlayed.getOwner(), Collections.singletonList(eventPlayed));
game.getGameState().putCardOnTopOfDeck(eventPlayed);
return new FullEffectResult(true);

View File

@@ -37,7 +37,7 @@ public class PutRandomCardFromHandOnBottomOfDeckEffect extends AbstractEffect {
GameState gameState = game.getGameState();
final List<PhysicalCard> randomCards = GameUtils.getRandomCards(gameState.getHand(_playerId), 1);
for (PhysicalCard randomCard : randomCards) {
gameState.sendMessage(randomCard.getOwner() + " puts a card at random from hand on bottom of his or her deck");
gameState.sendMessage(randomCard.getOwner() + " puts a card at random from hand on bottom of their deck");
gameState.removeCardsFromZone(randomCard.getOwner(), Collections.singleton(randomCard));
gameState.putCardOnBottomOfDeck(randomCard);
putCardFromHandOnBottomOfDeckCallback(randomCard);

View File

@@ -12,7 +12,7 @@ public class ShuffleDeckEffect extends UnrespondableEffect {
@Override
public void doPlayEffect(LotroGame game) {
game.getGameState().sendMessage(_playerId + " shuffles his or her deck");
game.getGameState().sendMessage(_playerId + " shuffles their deck");
game.getGameState().shuffleDeck(_playerId);
}
}