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

fix Berserk stack description

Browse Source
This commit is contained in:
jendave
2011-08-06 23:49:54 +00:00
parent 7240002584
commit 9e3ee705f3
2 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/forge/EndOfTurn.java
View File

@@ -88,11 +88,11 @@ public class EndOfTurn implements java.io.Serializable
final SpellAbility sac = new Ability(card, "0") {
@Override
public void resolve() {
if(AllZoneUtil.isCardInPlay(card)) AllZone.GameAction.sacrifice(card);
if(AllZoneUtil.isCardInPlay(card)) AllZone.GameAction.destroy(card);
}
};
StringBuilder sb = new StringBuilder();
sb.append("Sacrifice ").append(card);
sb.append("Destroy ").append(card);
sac.setStackDescription(sb.toString());
AllZone.Stack.addSimultaneousStackEntry(sac);
@@ -133,7 +133,7 @@ public class EndOfTurn implements java.io.Serializable
}
};
StringBuilder sb = new StringBuilder();
sb.append(raider.getName()).append(" deals 2 damage to controller.");
sb.append(raider).append(" deals 2 damage to controller.");
change.setStackDescription(sb.toString());
AllZone.Stack.addSimultaneousStackEntry(change);

16
src/forge/GameActionUtil.java
View File

@@ -384,17 +384,7 @@ public class GameActionUtil {
Ability ability = new Ability(card, "0") {
@Override
public void resolve() {
if(controller.isHuman()){
Object[] possibleValues = {"Yes", "No"};
Object q = JOptionPane.showOptionDialog(null, "Return Vengevine from the graveyard?", "Vengevine Ability",
JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE,
null, possibleValues, possibleValues[0]);
if(q.equals(0)) {
if(AllZoneUtil.isCardInPlayerGraveyard(controller, card)) {
AllZone.GameAction.moveTo(play, card);
}
}
} else {
if(controller.isComputer() || GameActionUtil.showYesNoDialog(card, "Return Vengevine from the graveyard?")){
if(AllZoneUtil.isCardInPlayerGraveyard(controller, card)) {
AllZone.GameAction.moveTo(play, card);
}
@@ -403,14 +393,14 @@ public class GameActionUtil {
}; // ability
StringBuilder sb = new StringBuilder();
sb.append(card.getName()).append(" - ").append("Whenever you cast a spell, if it's the second creature ");
sb.append(card).append(" - ").append("Whenever you cast a spell, if it's the second creature ");
sb.append("spell you cast this turn, you may return Vengevine from your graveyard to the battlefield.");
ability.setStackDescription(sb.toString());
AllZone.Stack.addSimultaneousStackEntry(ability);
}//if
}
}//if
}
}//playCard_Vengevine()