From 9e3ee705f39d451f07b55f9e928a148d221d8724 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 23:49:54 +0000
Subject: [PATCH] fix Berserk stack description

---
 src/forge/EndOfTurn.java      |  6 +++---
 src/forge/GameActionUtil.java | 40 +++++++++++++----------------------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/src/forge/EndOfTurn.java b/src/forge/EndOfTurn.java
index 7f9a363a53d..9db72ba6172 100644
--- a/src/forge/EndOfTurn.java
+++ b/src/forge/EndOfTurn.java
@@ -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);
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index e8a2cb5a47a..49ee9ac8ee7 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -374,43 +374,33 @@ public class GameActionUtil {
 	public static void playCard_Vengevine(Card c) {
 		if (c.isCreature() == true && (Phase.PlayerCreatureSpellCount == 2 || Phase.ComputerCreatureSpellCount == 2))
 		{
-		final Player controller = c.getController();
-		final PlayerZone play = AllZone.getZone(Constant.Zone.Battlefield, controller);
-		CardList list = AllZoneUtil.getPlayerGraveyard(controller);
-		list = list.getName("Vengevine");
-		if(list.size() > 0) {
+			final Player controller = c.getController();
+			final PlayerZone play = AllZone.getZone(Constant.Zone.Battlefield, controller);
+			CardList list = AllZoneUtil.getPlayerGraveyard(controller);
+			list = list.getName("Vengevine");
+			if(list.size() > 0) {
 				for(int i = 0; i < list.size(); i++) {
 					final Card card = list.get(i);
 					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(AllZoneUtil.isCardInPlayerGraveyard(controller, card)) {
-			                        AllZone.GameAction.moveTo(play, card);
-			                    }
-				        	}
+							if(controller.isComputer() || GameActionUtil.showYesNoDialog(card, "Return Vengevine from the graveyard?")){
+								if(AllZoneUtil.isCardInPlayerGraveyard(controller, card)) {
+									AllZone.GameAction.moveTo(play, card);
+								}
+							}
 						}
 					}; // 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);
+					AllZone.Stack.addSimultaneousStackEntry(ability);
 
-				}//if
-			}
+				}
+			}//if
 		}
 	}//playCard_Vengevine()