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

- Oracle Update: place -> put (part 2 + code support)

Browse Source
This commit is contained in:
Agetian
2017-04-30 05:29:57 +00:00
parent c3ec36e275
commit c5d36b3086
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
View File

@@ -854,7 +854,7 @@ public class ComputerUtilCombat {
if (dealsFirstStrikeDamage(attacker, withoutAbilities, null)
&& (attacker.hasKeyword("Wither") || attacker.hasKeyword("Infect"))
&& !dealsFirstStrikeDamage(blocker, withoutAbilities, null)
&& !blocker.hasKeyword("CARDNAME can't have counters placed on it.")) {
&& !blocker.hasKeyword("CARDNAME can't have counters put on it.")) {
power -= attacker.getNetCombatDamage();
}
@@ -1192,7 +1192,7 @@ public class ComputerUtilCombat {
if (ComputerUtilCombat.dealsFirstStrikeDamage(blocker, withoutAbilities, combat)
&& (blocker.hasKeyword("Wither") || blocker.hasKeyword("Infect"))
&& !ComputerUtilCombat.dealsFirstStrikeDamage(attacker, withoutAbilities, combat)
&& !attacker.hasKeyword("CARDNAME can't have counters placed on it.")) {
&& !attacker.hasKeyword("CARDNAME can't have counters put on it.")) {
power -= blocker.getNetCombatDamage();
}
theTriggers.addAll(blocker.getTriggers());

4
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -957,12 +957,12 @@ public class Card extends GameEntity implements Comparable<Card> {
@Override
public final boolean canReceiveCounters(final CounterType type) {
if (hasKeyword("CARDNAME can't have counters placed on it.")) {
if (hasKeyword("CARDNAME can't have counters put on it.")) {
return false;
}
if (isCreature() && type == CounterType.M1M1) {
for (final Card c : getController().getCreaturesInPlay()) { // look for Melira, Sylvok Outcast
if (c.hasKeyword("Creatures you control can't have -1/-1 counters placed on them.")) {
if (c.hasKeyword("Creatures you control can't have -1/-1 counters put on them.")) {
return false;
}
}

2
forge-game/src/main/java/forge/game/keyword/Keyword.java
View File

@@ -128,7 +128,7 @@ public enum Keyword {
TRAMPLE(SimpleKeyword.class, true, "If this creature would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker."),
TRANSFIGURE(KeywordWithCost.class, false, "%s, Sacrifice this permanent: Search your library for a creature card with the same converted mana cost as this permanent and put it onto the battlefield. Then shuffle your library. Activate this ability only any time you could cast a sorcery."),
TRANSMUTE(KeywordWithCost.class, false, "%s, Discard this card: Search your library for a card with the same converted mana cost as the discarded card, reveal that card, and put it into your hand. Then shuffle your library. Activate this ability only any time you could cast a sorcery."),
TRIBUTE(KeywordWithAmount.class, false, "As this creature enters the battlefield, an opponent of your choice may place {%d:+1/+1 counter} on it."),
TRIBUTE(KeywordWithAmount.class, false, "As this creature enters the battlefield, an opponent of your choice may put {%d:+1/+1 counter} on it."),
UNDAUNTED(SimpleKeyword.class, false, "This spell costs {1} less to cast for each opponent."),
UNDYING(SimpleKeyword.class, true, "When this permanent is put into a graveyard from the battlefield, if it had no +1/+1 counters on it, return it to the battlefield under its owner's control with a +1/+1 counter on it."),
UNEARTH(KeywordWithCost.class, false, "%s: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step. If it would leave the battlefield, exile it instead of putting it anywhere else. Activate this ability only any time you could cast a sorcery."),

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

@@ -868,7 +868,7 @@ public class Player extends GameEntity implements Comparable<Player> {
}
public final boolean canReceiveCounters(final CounterType type) {
if (hasKeyword("PLAYER can't have counters placed on him or her.")) {
if (hasKeyword("PLAYER can't have counters put on him or her.")) {
return false;
}
if (type == CounterType.POISON) {

2
forge-gui/res/cardsfolder/m/meliras_keepers.txt
View File

@@ -2,6 +2,6 @@ Name:Melira's Keepers
ManaCost:4 G
Types:Creature Human Warrior
PT:4/4
K:CARDNAME can't have counters placed on it.
K:CARDNAME can't have counters put on it.
SVar:Picture:http://www.wizards.com/global/images/magic/general/meliras_keepers.jpg
Oracle:Melira's Keepers can't have counters put on it.

2
forge-gui/res/cardsfolder/t/tatterkite.txt
View File

@@ -3,6 +3,6 @@ ManaCost:3
Types:Artifact Creature Scarecrow
PT:2/1
K:Flying
K:CARDNAME can't have counters placed on it.
K:CARDNAME can't have counters put on it.
SVar:Picture:http://www.wizards.com/global/images/magic/general/tatterkite.jpg
Oracle:Flying\nTatterkite can't have counters put on it.