external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Spelling error

Browse Source
This commit is contained in:
Adam Pantel
2021-03-07 23:41:46 -05:00
parent 5625c9ae28
commit 726163dc97
21 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -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);

2
forge-game/src/main/java/forge/game/ability/effects/AddTurnEffect.java
View File

@@ -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);
}
}
}

2
forge-game/src/main/java/forge/game/ability/effects/BidLifeEffect.java
View File

@@ -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);
}
}
}

2
forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java
View File

@@ -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")) {

2
forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java
View File

@@ -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);
}
}
}

2
forge-game/src/main/java/forge/game/ability/effects/ChooseEvenOddEffect.java
View File

@@ -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);
}
}
}

2
forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java
View File

@@ -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);

6
forge-game/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java
View File

@@ -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");

2
forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java
View File

@@ -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;

4
forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java
View File

@@ -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<AbilityKey, Object> runParams = AbilityKey.newMap();

4
forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java
View File

@@ -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()) {

2
forge-game/src/main/java/forge/game/ability/effects/MultiplePilesEffect.java
View File

@@ -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);
}
}

2
forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java
View File

@@ -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()) {

2
forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java
View File

@@ -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()) {

2
forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java
View File

@@ -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")) {

2
forge-game/src/main/java/forge/game/ability/effects/RollPlanarDiceEffect.java
View File

@@ -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);
}
}

2
forge-game/src/main/java/forge/game/ability/effects/SubgameEffect.java
View File

@@ -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);

2
forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java
View File

@@ -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")) {

2
forge-game/src/main/java/forge/game/ability/effects/VoteEffect.java
View File

@@ -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);
}
}

2
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -2992,7 +2992,7 @@ public class Player extends GameEntity implements Comparable<Player> {
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);