diff --git a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java index ab50c1a806f..06192d87258 100644 --- a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java +++ b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java @@ -522,7 +522,7 @@ public class PlayerControllerAi extends PlayerController { chosen = validTypes.iterator().next(); System.err.println("AI has no idea how to choose " + kindOfType +", defaulting to arbitrary element: chosen"); } - getGame().getAction().nofityOfValue(sa, player, chosen, player); + getGame().getAction().notifyOfValue(sa, player, chosen, player); return chosen; } diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index 5eebcf0539e..55fd0e7b103 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -1678,8 +1678,7 @@ public class GameAction { } /** Delivers a message to all players. (use reveal to show Cards) */ - // TODO: Refactor for spelling - public void nofityOfValue(SpellAbility saSource, GameObject relatedTarget, String value, Player playerExcept) { + public void notifyOfValue(SpellAbility saSource, GameObject relatedTarget, String value, Player playerExcept) { for (Player p : game.getPlayers()) { if (playerExcept == p) continue; p.getController().notifyOfValue(saSource, relatedTarget, value); diff --git a/forge-game/src/main/java/forge/game/ability/effects/AddTurnEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AddTurnEffect.java index 2a1353e03be..2d31436de09 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/AddTurnEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/AddTurnEffect.java @@ -62,7 +62,7 @@ public class AddTurnEffect extends SpellAbilityEffect { extra.setCantSetSchemesInMotion(true); } if (sa.hasParam("ShowMessage")) { - p.getGame().getAction().nofityOfValue(sa, p, Localizer.getInstance().getMessage("lblPlayerTakesExtraTurn", p.toString()), null); + p.getGame().getAction().notifyOfValue(sa, p, Localizer.getInstance().getMessage("lblPlayerTakesExtraTurn", p.toString()), null); } } } diff --git a/forge-game/src/main/java/forge/game/ability/effects/BidLifeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/BidLifeEffect.java index 2561aa7b3ae..4083e5fe8de 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/BidLifeEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/BidLifeEffect.java @@ -60,7 +60,7 @@ public class BidLifeEffect extends SpellAbilityEffect { if (result) { // a different choose number bid += p.getController().chooseNumber(sa, Localizer.getInstance().getMessage("lblBidLife") + ":", 1, 9); winner = p; - host.getGame().getAction().nofityOfValue(sa, p, Localizer.getInstance().getMessage("lblTopBidWithValueLife", String.valueOf(bid)), p); + host.getGame().getAction().notifyOfValue(sa, p, Localizer.getInstance().getMessage("lblTopBidWithValueLife", String.valueOf(bid)), p); } } } diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java index 945bfb7e7a0..6526ab32cd2 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java @@ -126,7 +126,7 @@ public class ChooseCardNameEffect extends SpellAbilityEffect { host.setNamedCard(chosen); if(!randomChoice) { - p.getGame().getAction().nofityOfValue(sa, host, Localizer.getInstance().getMessage("lblPlayerPickedChosen", p.getName(), chosen), p); + p.getGame().getAction().notifyOfValue(sa, host, Localizer.getInstance().getMessage("lblPlayerPickedChosen", p.getName(), chosen), p); p.setNamedCard(chosen); } if (sa.hasParam("NoteFor")) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java index c308e29ee8a..f9b0d07380c 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java @@ -76,7 +76,7 @@ public class ChooseColorEffect extends SpellAbilityEffect { return; } card.setChosenColors(chosenColors); - p.getGame().getAction().nofityOfValue(sa, card, Localizer.getInstance().getMessage("lblPlayerPickedChosen", p.getName(), Lang.joinHomogenous(chosenColors)), p); + p.getGame().getAction().notifyOfValue(sa, card, Localizer.getInstance().getMessage("lblPlayerPickedChosen", p.getName(), Lang.joinHomogenous(chosenColors)), p); } } } diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseEvenOddEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseEvenOddEffect.java index 6d7388ddfd4..01687bc9780 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseEvenOddEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseEvenOddEffect.java @@ -34,7 +34,7 @@ public class ChooseEvenOddEffect extends SpellAbilityEffect { EvenOdd chosen = p.getController().chooseBinary(sa, "odd or even", BinaryChoiceType.OddsOrEvens) ? EvenOdd.Odd : EvenOdd.Even; card.setChosenEvenOdd(chosen); if (sa.hasParam("Notify")) { - p.getGame().getAction().nofityOfValue(sa, card, Localizer.getInstance().getMessage("lblPlayerPickedChosen", p.getName(), chosen), p); + p.getGame().getAction().notifyOfValue(sa, card, Localizer.getInstance().getMessage("lblPlayerPickedChosen", p.getName(), chosen), p); } } } diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java index 1d65a388948..f4a6d34daee 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java @@ -76,7 +76,7 @@ public class ChooseGenericEffect extends SpellAbilityEffect { String chosenValue = chosenSA.getDescription(); if (sa.hasParam("ShowChoice")) { boolean dontNotifySelf = sa.getParam("ShowChoice").equals("ExceptSelf"); - p.getGame().getAction().nofityOfValue(sa, p, chosenValue, dontNotifySelf ? p : null); + p.getGame().getAction().notifyOfValue(sa, p, chosenValue, dontNotifySelf ? p : null); } if (sa.hasParam("SetChosenMode")) { sa.getHostCard().setChosenMode(chosenValue); diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java index 939fe632e51..406a0ca52eb 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java @@ -56,7 +56,7 @@ public class ChooseNumberEffect extends SpellAbilityEffect { int chosen; if (random) { chosen = MyRandom.getRandom().nextInt(max - min) + min; - p.getGame().getAction().nofityOfValue(sa, p, Integer.toString(chosen), null); + p.getGame().getAction().notifyOfValue(sa, p, Integer.toString(chosen), null); } else { String title = sa.hasParam("ListTitle") ? sa.getParam("ListTitle") : Localizer.getInstance().getMessage("lblChooseNumber"); if (anyNumber) { @@ -73,7 +73,7 @@ public class ChooseNumberEffect extends SpellAbilityEffect { card.setChosenNumber(chosen); } if (sa.hasParam("Notify")) { - p.getGame().getAction().nofityOfValue(sa, card, Localizer.getInstance().getMessage("lblPlayerPickedChosen", p.getName(), chosen), p); + p.getGame().getAction().notifyOfValue(sa, card, Localizer.getInstance().getMessage("lblPlayerPickedChosen", p.getName(), chosen), p); } } } @@ -103,7 +103,7 @@ public class ChooseNumberEffect extends SpellAbilityEffect { lowestNum.add(player); } } - card.getGame().getAction().nofityOfValue(sa, card, sb.toString(), null); + card.getGame().getAction().notifyOfValue(sa, card, sb.toString(), null); if (sa.hasParam("ChooseNumberSubAbility")) { AbilitySub sub = sa.getAdditionalAbility("ChooseNumberSubAbility"); diff --git a/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java index a775ddd281d..9234835251f 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java @@ -117,7 +117,7 @@ public class ClashEffect extends SpellAbilityEffect { reveal.append("\r\n\r\n"); reveal.append(player).append(pCMC > oCMC ? " " + Localizer.getInstance().getMessage("lblWinsClash") + "." : " " + Localizer.getInstance().getMessage("lblLosesClash") + "."); - player.getGame().getAction().nofityOfValue(sa, source, reveal.toString(), null); + player.getGame().getAction().notifyOfValue(sa, source, reveal.toString(), null); clashMoveToTopOrBottom(player, pCard, sa); clashMoveToTopOrBottom(opponent, oCard, sa); return pCMC > oCMC; diff --git a/forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java b/forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java index b8e20cb1ba5..9da08f5d7f5 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java @@ -164,7 +164,7 @@ public class FlipCoinEffect extends SpellAbilityEffect { if (result) { numSuccesses++; } - flipper.getGame().getAction().nofityOfValue(sa, flipper, result ? Localizer.getInstance().getMessage("lblHeads") : Localizer.getInstance().getMessage("lblTails"), null); + flipper.getGame().getAction().notifyOfValue(sa, flipper, result ? Localizer.getInstance().getMessage("lblHeads") : Localizer.getInstance().getMessage("lblTails"), null); } while (sa.hasParam("FlipUntilYouLose") && result != false); if (sa.hasParam("FlipUntilYouLose") && sa.hasAdditionalAbility("LoseSubAbility")) { @@ -207,7 +207,7 @@ public class FlipCoinEffect extends SpellAbilityEffect { numSuccesses++; } - caller.getGame().getAction().nofityOfValue(sa, caller, wonFlip ? Localizer.getInstance().getMessage("lblWin") : Localizer.getInstance().getMessage("lblLose"), null); + caller.getGame().getAction().notifyOfValue(sa, caller, wonFlip ? Localizer.getInstance().getMessage("lblWin") : Localizer.getInstance().getMessage("lblLose"), null); // Run triggers final Map runParams = AbilityKey.newMap(); diff --git a/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java index 24f4d5e94be..a39274131d2 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java @@ -96,7 +96,7 @@ public class ManaEffect extends SpellAbilityEffect { return; } - game.getAction().nofityOfValue(sa, card, Localizer.getInstance().getMessage("lblPlayerPickedChosen", p.getName(), choiceString), p); + game.getAction().notifyOfValue(sa, card, Localizer.getInstance().getMessage("lblPlayerPickedChosen", p.getName(), choiceString), p); abMana.setExpressChoice(choiceString.toString()); } else if (abMana.isAnyMana()) { @@ -118,7 +118,7 @@ public class ManaEffect extends SpellAbilityEffect { } choice = MagicColor.toShortString(val); - game.getAction().nofityOfValue(sa, card, Localizer.getInstance().getMessage("lblPlayerPickedChosen", p.getName(), choice), p); + game.getAction().notifyOfValue(sa, card, Localizer.getInstance().getMessage("lblPlayerPickedChosen", p.getName(), choice), p); abMana.setExpressChoice(choice); } else if (abMana.isSpecialMana()) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/MultiplePilesEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MultiplePilesEffect.java index 57b74d34c9b..d38c971d04b 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/MultiplePilesEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/MultiplePilesEffect.java @@ -92,7 +92,7 @@ public class MultiplePilesEffect extends SpellAbilityEffect { } pileList.add(pool); - p.getGame().getAction().nofityOfValue(sa, p, pileList.toString(), p); + p.getGame().getAction().notifyOfValue(sa, p, pileList.toString(), p); record.put(p, pileList); } } diff --git a/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java index 88f6fc9a419..5a037887b68 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java @@ -56,7 +56,7 @@ public class ProtectAllEffect extends SpellAbilityEffect { if( null == choice) return; gains.add(choice); - game.getAction().nofityOfValue(sa, choser, Lang.joinHomogenous(gains), choser); + game.getAction().notifyOfValue(sa, choser, Lang.joinHomogenous(gains), choser); } else { if (sa.getParam("Gains").equals("ChosenColor")) { for (final String color : host.getChosenColors()) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java index e66e233c620..be1e21a78ca 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java @@ -113,7 +113,7 @@ public class ProtectEffect extends SpellAbilityEffect { if( null == choice) return; gains.add(choice); - game.getAction().nofityOfValue(sa, choser, Lang.joinHomogenous(gains), choser); + game.getAction().notifyOfValue(sa, choser, Lang.joinHomogenous(gains), choser); } else { if (sa.getParam("Gains").equals("ChosenColor")) { for (final String color : host.getChosenColors()) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java index f3b91129369..0380da94df9 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java @@ -70,7 +70,7 @@ public class RollDiceEffect extends SpellAbilityEffect { if (amount > 0) { String message = Localizer.getInstance().getMessage("lblPlayerRolledResult", player, StringUtils.join(rolls, ", ")); - player.getGame().getAction().nofityOfValue(sa, player, message, null); + player.getGame().getAction().notifyOfValue(sa, player, message, null); } if (sa.hasParam("ResultSVar")) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/RollPlanarDiceEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RollPlanarDiceEffect.java index 6f71242efdd..221a3182d1e 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RollPlanarDiceEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RollPlanarDiceEffect.java @@ -27,7 +27,7 @@ public class RollPlanarDiceEffect extends SpellAbilityEffect { } PlanarDice result = PlanarDice.roll(activator, null); String message = Localizer.getInstance().getMessage("lblPlayerRolledResult", activator.getName(), result.toString()); - game.getAction().nofityOfValue(sa, activator, message, null); + game.getAction().notifyOfValue(sa, activator, message, null); } } diff --git a/forge-game/src/main/java/forge/game/ability/effects/SubgameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SubgameEffect.java index e886bad65b0..071a12eeae3 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/SubgameEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/SubgameEffect.java @@ -80,7 +80,7 @@ public class SubgameEffect extends SpellAbilityEffect { SpellAbility cmdColorsa = new SpellAbility.EmptySa(ApiType.ChooseColor, cmd, player); chosenColors = player.getController().chooseColors(prompt,cmdColorsa, 1, 1, colorChoices); cmd.setChosenColors(chosenColors); - subgame.getAction().nofityOfValue(cmdColorsa, cmd, Localizer.getInstance().getMessage("lblPlayerPickedChosen", player.getName(), Lang.joinHomogenous(chosenColors)), player); + subgame.getAction().notifyOfValue(cmdColorsa, cmd, Localizer.getInstance().getMessage("lblPlayerPickedChosen", player.getName(), Lang.joinHomogenous(chosenColors)), player); } cmd.setCommander(true); com.add(cmd); diff --git a/forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java index d5b03eb83eb..500be595980 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java @@ -116,7 +116,7 @@ public class TwoPilesEffect extends SpellAbilityEffect { notification.append("(" + Localizer.getInstance().getMessage("lblEmptyPile") + ")"); } - p.getGame().getAction().nofityOfValue(sa, chooser, notification.toString(), chooser); + p.getGame().getAction().notifyOfValue(sa, chooser, notification.toString(), chooser); // take action on the chosen pile if (sa.hasParam("ChosenPile")) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/VoteEffect.java b/forge-game/src/main/java/forge/game/ability/effects/VoteEffect.java index cc572a9c5fd..9a611532836 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/VoteEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/VoteEffect.java @@ -90,7 +90,7 @@ public class VoteEffect extends SpellAbilityEffect { Object result = realVoter.getController().vote(sa, host + Localizer.getInstance().getMessage("lblVote") + ":", voteType, votes, p); votes.put(result, p); - host.getGame().getAction().nofityOfValue(sa, p, result + "\r\n" + Localizer.getInstance().getMessage("lblCurrentVote") + ":" + votes, p); + host.getGame().getAction().notifyOfValue(sa, p, result + "\r\n" + Localizer.getInstance().getMessage("lblCurrentVote") + ":" + votes, p); } } diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java index f82b12b53ef..02d3cde2fc7 100644 --- a/forge-game/src/main/java/forge/game/player/Player.java +++ b/forge-game/src/main/java/forge/game/player/Player.java @@ -2992,7 +2992,7 @@ public class Player extends GameEntity implements Comparable { SpellAbility cmdColorsa = new SpellAbility.EmptySa(ApiType.ChooseColor, cmd, p); chosenColors = p.getController().chooseColors(prompt,cmdColorsa, 1, 1, colorChoices); cmd.setChosenColors(chosenColors); - p.getGame().getAction().nofityOfValue(cmdColorsa, cmd, Localizer.getInstance().getMessage("lblPlayerPickedChosen", p.getName(), Lang.joinHomogenous(chosenColors)), p); + p.getGame().getAction().notifyOfValue(cmdColorsa, cmd, Localizer.getInstance().getMessage("lblPlayerPickedChosen", p.getName(), Lang.joinHomogenous(chosenColors)), p); } cmd.setCommander(true); com.add(cmd);