- Added AI support for the Time Vault + Voltaic Key combo.

forge-ai/src/main/java/forge/ai/ability/UntapAi.java

@@ -159,12 +159,23 @@ public class UntapAi extends SpellAbilityAi {
                 }
             } 
             else {
+            	//Untap Time Vault? - Yes please!
+            	for (Card c : untapList) {
+            		if (c.getName().equals("Time Vault")) {
+            			choice = c;
+            			break;
+            		}
+            	}
+            	if (choice == null) {
 	            	if (CardLists.getNotType(untapList, "Creature").isEmpty()) {
 		                choice = ComputerUtilCard.getBestCreatureAI(untapList); // if only creatures take the best
 		            } else {
+		            	if (!sa.getPayCosts().hasManaCost() || sa.isTrigger()) {
 		            		choice = ComputerUtilCard.getMostExpensivePermanentAI(untapList, sa, false);
 		            	}
 		            }
+            	}
+            }
 
             if (choice == null) { // can't find anything left
                 if (sa.getTargets().getNumTargeted() < tgt.getMinTargets(sa.getHostCard(), sa) || sa.getTargets().getNumTargeted() == 0) {

forge-gui/res/cardsfolder/t/time_vault.txt

@@ -5,6 +5,7 @@ Text:If you would begin your turn while CARDNAME is tapped, you may skip that tu
 K:CARDNAME doesn't untap during your untap step.
 K:CARDNAME enters the battlefield tapped.
 A:AB$ AddTurn | Cost$ T | NumTurns$ 1 | SpellDescription$ Take an extra turn after this one.
+SVar:PlayMain1:Always
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/time_vault.jpg
 Oracle:Time Vault enters the battlefield tapped.\nTime Vault doesn't untap during your untap step.\nIf you would begin your turn while Time Vault is tapped, you may skip that turn instead. If you do, untap Time Vault.\n{T}: Take an extra turn after this one.