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

- Refactored AddCounterFromCostOrEffect -> addCounterFromNonEffect.

Browse Source
This commit is contained in:
jendave
2011-08-06 03:21:17 +00:00
parent 08038c5480
commit ed4abaed2d
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/Card.java
View File

@@ -188,7 +188,7 @@ public class Card extends MyObservable
}; };
//for Planeswalker abilities and Effects (like Wither), Doubling Season gets ignored. //for Planeswalker abilities and Effects (like Wither), Doubling Season gets ignored.
public void addCounterFromCostOrEffect(Counters counterName, int n) public void addCounterFromNonEffect(Counters counterName, int n)
{ {
if(counters.containsKey(counterName)) if(counters.containsKey(counterName))
{ {

30
src/forge/CardFactory_Planeswalkers.java
View File

@@ -36,7 +36,7 @@ class CardFactory_Planeswalkers {
public void resolve() public void resolve()
{ {
card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); card2.addCounterFromNonEffect(Counters.LOYALTY, 1);
turn[0] = AllZone.Phase.getTurn(); turn[0] = AllZone.Phase.getTurn();
@@ -176,7 +176,7 @@ class CardFactory_Planeswalkers {
{ {
public void resolve() public void resolve()
{ {
card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); card2.addCounterFromNonEffect(Counters.LOYALTY, 1);
turn[0] = AllZone.Phase.getTurn(); turn[0] = AllZone.Phase.getTurn();
CardFactoryUtil.makeToken("Soldier", "W 1 1 Soldier", card2, "W", new String[]{"Creature", "Soldier"}, 1, 1, new String[] {""}); CardFactoryUtil.makeToken("Soldier", "W 1 1 Soldier", card2, "W", new String[]{"Creature", "Soldier"}, 1, 1, new String[] {""});
@@ -267,7 +267,7 @@ class CardFactory_Planeswalkers {
public void resolve() public void resolve()
{ {
card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); card2.addCounterFromNonEffect(Counters.LOYALTY, 1);
turn[0] = AllZone.Phase.getTurn(); turn[0] = AllZone.Phase.getTurn();
@@ -394,7 +394,7 @@ class CardFactory_Planeswalkers {
{ {
public void resolve() public void resolve()
{ {
card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); card2.addCounterFromNonEffect(Counters.LOYALTY, 1);
turn[0] = AllZone.Phase.getTurn(); turn[0] = AllZone.Phase.getTurn();
if (card2.getController().equals(Constant.Player.Human)){ if (card2.getController().equals(Constant.Player.Human)){
@@ -729,7 +729,7 @@ class CardFactory_Planeswalkers {
{ {
public void resolve() public void resolve()
{ {
card2.addCounterFromCostOrEffect(Counters.LOYALTY, 3); card2.addCounterFromNonEffect(Counters.LOYALTY, 3);
turn[0] = AllZone.Phase.getTurn(); turn[0] = AllZone.Phase.getTurn();
Card c = getTargetCard(); Card c = getTargetCard();
@@ -1000,7 +1000,7 @@ class CardFactory_Planeswalkers {
{ {
public void resolve() public void resolve()
{ {
card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); card2.addCounterFromNonEffect(Counters.LOYALTY, 1);
turn[0] = AllZone.Phase.getTurn(); turn[0] = AllZone.Phase.getTurn();
@@ -1239,7 +1239,7 @@ class CardFactory_Planeswalkers {
{ {
public void resolve() public void resolve()
{ {
card2.addCounterFromCostOrEffect(Counters.LOYALTY,1); card2.addCounterFromNonEffect(Counters.LOYALTY,1);
turn[0] = AllZone.Phase.getTurn(); turn[0] = AllZone.Phase.getTurn();
String s = getTargetPlayer(); String s = getTargetPlayer();
@@ -1335,7 +1335,7 @@ class CardFactory_Planeswalkers {
{ {
public void resolve() public void resolve()
{ {
card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); card2.addCounterFromNonEffect(Counters.LOYALTY, 1);
turn[0] = AllZone.Phase.getTurn(); turn[0] = AllZone.Phase.getTurn();
if(getTargetCard() != null) if(getTargetCard() != null)
@@ -1602,7 +1602,7 @@ class CardFactory_Planeswalkers {
{ {
public void resolve() public void resolve()
{ {
card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); card2.addCounterFromNonEffect(Counters.LOYALTY, 1);
turn[0] = AllZone.Phase.getTurn(); turn[0] = AllZone.Phase.getTurn();
@@ -1656,7 +1656,7 @@ class CardFactory_Planeswalkers {
{ {
count = 0; count = 0;
turn[0] = AllZone.Phase.getTurn(); turn[0] = AllZone.Phase.getTurn();
card2.addCounterFromCostOrEffect(Counters.LOYALTY,1); card2.addCounterFromNonEffect(Counters.LOYALTY,1);
stop(); stop();
} }
}//selectCard() }//selectCard()
@@ -1850,7 +1850,7 @@ class CardFactory_Planeswalkers {
{ {
public void resolve() public void resolve()
{ {
card2.addCounterFromCostOrEffect(Counters.LOYALTY, 2); card2.addCounterFromNonEffect(Counters.LOYALTY, 2);
turn[0] = AllZone.Phase.getTurn(); turn[0] = AllZone.Phase.getTurn();
@@ -1988,7 +1988,7 @@ class CardFactory_Planeswalkers {
{ {
public void resolve() public void resolve()
{ {
card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); card2.addCounterFromNonEffect(Counters.LOYALTY, 1);
turn[0] = AllZone.Phase.getTurn(); turn[0] = AllZone.Phase.getTurn();
Card c = getTargetCard(); Card c = getTargetCard();
@@ -2222,7 +2222,7 @@ class CardFactory_Planeswalkers {
{ {
public void resolve() public void resolve()
{ {
card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); card2.addCounterFromNonEffect(Counters.LOYALTY, 1);
turn[0] = AllZone.Phase.getTurn(); turn[0] = AllZone.Phase.getTurn();
@@ -2276,7 +2276,7 @@ class CardFactory_Planeswalkers {
{ {
count = 0; count = 0;
turn[0] = AllZone.Phase.getTurn(); turn[0] = AllZone.Phase.getTurn();
card2.addCounterFromCostOrEffect(Counters.LOYALTY,1); card2.addCounterFromNonEffect(Counters.LOYALTY,1);
stop(); stop();
} }
}//selectCard() }//selectCard()
@@ -2532,7 +2532,7 @@ class CardFactory_Planeswalkers {
{ {
public void resolve() public void resolve()
{ {
card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); card2.addCounterFromNonEffect(Counters.LOYALTY, 1);
turn[0] = AllZone.Phase.getTurn(); turn[0] = AllZone.Phase.getTurn();
final int boost = 1; final int boost = 1;

4
src/forge/GameAction.java
View File

@@ -1514,7 +1514,7 @@ private int getDifferentLand(CardList list, String land)
card.isCreature()) card.isCreature())
{ {
damageToAdd = 0; damageToAdd = 0;
card.addCounterFromCostOrEffect(Counters.M1M1, damage); card.addCounterFromNonEffect(Counters.M1M1, damage);
} }
if (source.getName().equals("Spiritmonger") || source.getName().equals("Mirri the Cursed")) if (source.getName().equals("Spiritmonger") || source.getName().equals("Mirri the Cursed"))
{ {
@@ -1552,7 +1552,7 @@ private int getDifferentLand(CardList list, String land)
card.isCreature()) card.isCreature())
{ {
damageToAdd = 0; damageToAdd = 0;
card.addCounterFromCostOrEffect(Counters.M1M1, damage); card.addCounterFromNonEffect(Counters.M1M1, damage);
} }
if (source.getName().equals("Spiritmonger") || source.getName().equals("Mirri the Cursed")) if (source.getName().equals("Spiritmonger") || source.getName().equals("Mirri the Cursed"))
{ {