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

- AdditionalCostsPaid will now be cleared when a card hits the graveyard.

Browse Source
This commit is contained in:
Sloth
2012-11-13 20:32:37 +00:00
parent 960eddf543
commit b36d711d75
2 changed files with 13 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/forge/Card.java
View File

@@ -1257,9 +1257,6 @@ public class Card extends GameEntity implements Comparable<Card> {
Singletons.getModel().getGame().getTriggerHandler().runTrigger(TriggerType.CounterAdded, runParams);
}
// play the Add Counter sound
Sounds.AddCounter.play();
this.updateObservers();
}
@@ -1293,9 +1290,6 @@ public class Card extends GameEntity implements Comparable<Card> {
Singletons.getModel().getGame().getTriggerHandler().runTrigger(TriggerType.CounterAdded, runParams);
}
// play the Add Counter sound
Sounds.AddCounter.play();
this.updateObservers();
}
@@ -1366,10 +1360,6 @@ public class Card extends GameEntity implements Comparable<Card> {
}
}
}
// play the Subtract Counter sound
Sounds.RemoveCounter.play();
this.updateObservers();
}
}
@@ -3865,9 +3855,6 @@ public class Card extends GameEntity implements Comparable<Card> {
this.addEquipping(c);
c.addEquippedBy(this);
this.equip();
// Play the Equip sound
Sounds.Equip.play();
}
/**
@@ -5828,6 +5815,17 @@ public class Card extends GameEntity implements Comparable<Card> {
this.optionalAdditionalCostsPaid.add(cost);
}
/**
* <p>
* optionalAdditionalCostsPaid.
* </p>
*/
public final void clearAdditionalCostsPaid() {
if (optionalAdditionalCostsPaid != null) {
optionalAdditionalCostsPaid.clear();
}
}
/**
* <p>
* isOptionalAdditionalCostsPaid.

29
src/main/java/forge/GameAction.java
View File

@@ -131,8 +131,6 @@ public class GameAction {
return c;
}
// System.err.println(String.format("%s moves from %s to %s", c.toString(), zoneFrom.getZoneType().name(), zoneTo.getZoneType().name()));
boolean suppress;
if ((zoneFrom == null) && !c.isToken()) {
suppress = true;
@@ -299,6 +297,7 @@ public class GameAction {
if (!zoneTo.is(ZoneType.Graveyard) || !c.getName().equals("Skullbriar, the Walking Grave")) {
copied.clearCounters();
}
copied.clearAdditionalCostsPaid();
if (copied.isFaceDown()) {
copied.turnFaceUp();
}
@@ -322,6 +321,7 @@ public class GameAction {
copied.removeHiddenExtrinsicKeyword(s);
}
}
copied.clearAdditionalCostsPaid();
if (copied.isFaceDown()) {
copied.turnFaceUp();
}
@@ -1254,9 +1254,6 @@ public class GameAction {
if (c.getCounters(Counters.LOYALTY) <= 0) {
Singletons.getModel().getGame().getAction().moveToGraveyard(c);
// Play the Destroy sound
Sounds.Destroy.play();
}
final ArrayList<String> types = c.getType();
@@ -1301,9 +1298,6 @@ public class GameAction {
for (int i = 0; i < b.size(); i++) {
Singletons.getModel().getGame().getAction().sacrificeDestroy(b.get(i));
}
// Play the Destroy sound
Sounds.Destroy.play();
}
}
} // destroyLegendaryCreatures()
@@ -1331,9 +1325,6 @@ public class GameAction {
}
this.sacrificeDestroy(c);
// Play the Sacrifice sound
Sounds.Sacrifice.play();
// Run triggers
final HashMap<String, Object> runParams = new HashMap<String, Object>();
runParams.put("Card", c);
@@ -1385,8 +1376,6 @@ public class GameAction {
GameAction.this.destroy(crd);
card.setDamage(0);
// Play the Destroy sound
Sounds.Destroy.play();
}
};
@@ -1399,9 +1388,6 @@ public class GameAction {
}
} // totem armor
// Play the Destroy sound
Sounds.Destroy.play();
return this.sacrificeDestroy(c);
}
@@ -1547,10 +1533,6 @@ public class GameAction {
c.tap();
c.addRegeneratedThisTurn();
game.getCombat().removeFromCombat(c);
// Play the Regeneration sound
Sounds.Regen.play();
return false;
}
@@ -1578,18 +1560,11 @@ public class GameAction {
c.setDamage(0);
this.destroy(crd);
// Play the Destroy sound
Sounds.Destroy.play();
System.out.println("Totem armor destroyed instead of original card");
return false;
}
} // totem armor
// Play the Destroy sound
Sounds.Destroy.play();
return this.sacrificeDestroy(c);
}