From 3015fb0899c08f9a0a0e66999f945e51c3a4aefd Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 02:54:41 +0000 Subject: [PATCH] - Added Artifact type to Thopter Foundry tokens. - Fixed a Standstill bug. - Changed token image names: Marit Lage => c_20_20_marit_lage.jpg, Voja => gw_2_2_voja.jpg. --- res/main.properties | 2 +- src/forge/CardFactory.java | 5 +++-- src/forge/CardFactory_Creatures.java | 2 ++ src/forge/CardFactory_Lands.java | 1 + src/forge/GameActionUtil.java | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/res/main.properties b/res/main.properties index a61af0147cc..ada821fa78b 100644 --- a/res/main.properties +++ b/res/main.properties @@ -1,6 +1,6 @@ program/mail=mtgerror@yahoo.com program/forum=http://www.slightlymagic.net/forum/viewforum.php?f=26 -program/version=MTG Forge -- official beta: 09/12/03, SVN revision: 128 +program/version=MTG Forge -- official beta: 09/11/25, SVN revision: 129 tokens--file=AllTokens.txt diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 6ccb0827804..16abcd40cef 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -16954,8 +16954,6 @@ return land.size() > 1 && CardFactoryUtil.AI_isMainPhase(); PlayerLife life = AllZone.GameAction.getPlayerLife(card.getController()); life.addLife(1); } - - }//resolve public void makeToken() @@ -16971,6 +16969,7 @@ return land.size() > 1 && CardFactoryUtil.AI_isMainPhase(); c.setManaCost("U"); c.setToken(true); + c.addType("Artifact"); c.addType("Creature"); c.addType("Thopter"); c.setBaseAttack(1); @@ -17090,6 +17089,8 @@ return land.size() > 1 && CardFactoryUtil.AI_isMainPhase(); card.clearSpellAbility(); card.addSpellAbility(spell); }//*************** END ************ END ************************** + + //*************** START *********** START ************************** if (cardName.equals("Celestial Purge")) { final Spell spell = new Spell(card) diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 3eb09f70e85..a644c72a381 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -9358,6 +9358,7 @@ public class CardFactory_Creatures { Card c = new Card(); c.setName("Stangg Twin"); + c.setImageName("RG 3 4 Stangg Twin"); c.setOwner(card.getController()); c.setController(card.getController()); @@ -13699,6 +13700,7 @@ public class CardFactory_Creatures { Card c = new Card(); c.setName("Voja"); + c.setImageName("GW 2 2 Voja"); c.setOwner(card.getController()); c.setController(card.getController()); diff --git a/src/forge/CardFactory_Lands.java b/src/forge/CardFactory_Lands.java index 14cc4af6cf3..ee1c2ad82bb 100644 --- a/src/forge/CardFactory_Lands.java +++ b/src/forge/CardFactory_Lands.java @@ -934,6 +934,7 @@ class CardFactory_Lands { c.setController(card.getController()); c.setName("Marit Lage"); + c.setName("C 20 20 Marit Lage"); c.setManaCost("B"); c.setToken(true); diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index d575a33dca4..6f62a77e0d5 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -113,7 +113,7 @@ public class GameActionUtil { final String drawer = AllZone.GameAction.getOpponent(c .getController()); - final Card card = list.get(0); + final Card card = list.get(i); Ability ability2 = new Ability(card, "0") {