From 7aadc8ed9df689c7e53780e06f82bb241128c785 Mon Sep 17 00:00:00 2001
From: BetaSteward <betasteward@gmail>
Date: Fri, 10 Dec 2010 04:23:09 +0000
Subject: [PATCH] fixes

---
 Mage.Client/release/sample-decks/UWR Walker.dck  | Bin 0 -> 1178 bytes
 .../src/mage/sets/shardsofalara/WildNacatl.java  |  14 ++++++++++----
 Mage/src/mage/abilities/AbilityImpl.java         |   3 +++
 .../ActivateOncePerTurnActivatedAbility.java     |   6 +++---
 4 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 Mage.Client/release/sample-decks/UWR Walker.dck

diff --git a/Mage.Client/release/sample-decks/UWR Walker.dck b/Mage.Client/release/sample-decks/UWR Walker.dck
new file mode 100644
index 0000000000000000000000000000000000000000..24a692a1c9517db2e00f959c3547d3392985e9e3
GIT binary patch
literal 1178
zcmZ{jOHUL*5XTDv72;z>l(%AhCMJU@H@)y!2{@Z2>?&S76f?Cm%{JX@cMS|2O#B!g
z{04px?|u(2-aKjdY+`4FTq-lEU;XRf)z#mA!l*TH=MXcB5;UoeQcAiu+Hi5*{l~(x
zU5Wo3{rWKf`vMHdFj`>@wfF#!aH(J+mpt_{h7pB_#4yp%NL1NUi;Ym3%Z*u)(!O?*
zAK?=Wl|9$?rdNo(LbPfOo_Lw^^N)ou-|_1(3~j-P6{l480N~Z}h>PzT9#&Q@v5jo*
z4eJg{G#ITOpc3y$WrT`-kBe1cm<tuBq*BpE<JyU|K^8r7DFlW`0Y277rpMT&Xq_Zk
z7AV)X)JkDWzT|QU4EI8v`x43XXUogc2A(uK+eMlkQs2@T!_xo``mamdBhKF_k>y->
z<LH-+4;<MDOS;23kxUJqifGeKRjcj7AjAD29XxDGOq}!A+OQ#Oz2_?-FieFab}sX1
z%esq8S3GmI3JiAx6NI-hp*1%cL&{^<7#;^K%+6!&oEk!<t)!4W*2d%4t8mWTVm|`q
z_GV4X>MCoVt})Dq4#7wR6~=^J&)f)sVJ6W1qcwD)7=?P_sR@P$0T{fC=Drk1LaSZp
zfngzFiB=t1l+g}y-q!U}$Z8cPz2M}3hPfkMJG<=Dx2iCp7S6C^NSoBL9=bg+@qatp
zN>HZGP#aB!O?h^T;YqM}W<6Sjo5<8OnDm`a`=aS{CfO=fTQFAYGYpGCINWEO64pv2
y^)#!FKI;W%2OiED7kemWv(t31pxVDVUouxRjKAI6U3AGVnJVF*I8+aPy!;ErZh@)*

literal 0
HcmV?d00001

diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java b/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java
index 69fb10bd48c..3e6ae469259 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/WildNacatl.java
@@ -36,6 +36,7 @@ import mage.MageInt;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.BoostSourceWhileControlsEffect;
 import mage.cards.CardImpl;
+import mage.filter.Filter.ComparisonScope;
 import mage.filter.FilterPermanent;
 
 /**
@@ -44,8 +45,15 @@ import mage.filter.FilterPermanent;
  */
 public class WildNacatl extends CardImpl<WildNacatl> {
 
-	private FilterPermanent filter1 = new FilterPermanent("Mountain");
-	private FilterPermanent filter2 = new FilterPermanent("Plains");
+	private static FilterPermanent filter1 = new FilterPermanent("Mountain");
+	private static FilterPermanent filter2 = new FilterPermanent("Plains");
+
+	static {
+		filter1.getSubtype().add("Mountain");
+		filter1.setScopeSubtype(ComparisonScope.Any);
+		filter2.getSubtype().add("Plains");
+		filter2.setScopeSubtype(ComparisonScope.Any);
+	}
 
 	public WildNacatl(UUID ownerId) {
 		super(ownerId, 152, "Wild Nacatl", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}");
@@ -55,8 +63,6 @@ public class WildNacatl extends CardImpl<WildNacatl> {
 		this.subtype.add("Warrior");
 		this.power = new MageInt(1);
 		this.toughness = new MageInt(1);
-		filter1.getName().add("Mountain");
-		filter2.getName().add("Plains");
 		this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter1, 1, 1)));
 		this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter2, 1, 1)));
 	}
diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/mage/abilities/AbilityImpl.java
index c41cadc3a4e..b8149c48050 100644
--- a/Mage/src/mage/abilities/AbilityImpl.java
+++ b/Mage/src/mage/abilities/AbilityImpl.java
@@ -63,6 +63,7 @@ public abstract class AbilityImpl<T extends AbilityImpl<T>> implements Ability {
 	private final static transient Logger logger = Logging.getLogger(AbilityImpl.class.getName());
 
 	protected UUID id;
+	protected UUID originalId;
 	protected AbilityType abilityType;
 	protected UUID controllerId;
 	protected UUID sourceId;
@@ -82,6 +83,7 @@ public abstract class AbilityImpl<T extends AbilityImpl<T>> implements Ability {
 
 	public AbilityImpl(AbilityType abilityType, Zone zone) {
 		this.id = UUID.randomUUID();
+		this.originalId = id;
 		this.abilityType = abilityType;
 		this.zone = zone;
 		this.manaCosts = new ManaCostsImpl<ManaCost>();
@@ -94,6 +96,7 @@ public abstract class AbilityImpl<T extends AbilityImpl<T>> implements Ability {
 
 	public AbilityImpl(AbilityImpl<T> ability) {
 		this.id = ability.id;
+		this.originalId = ability.originalId;
 		this.abilityType = ability.abilityType;
 		this.controllerId = ability.controllerId;
 		this.sourceId = ability.sourceId;
diff --git a/Mage/src/mage/abilities/common/ActivateOncePerTurnActivatedAbility.java b/Mage/src/mage/abilities/common/ActivateOncePerTurnActivatedAbility.java
index e16fabd11e1..e1ab8075106 100644
--- a/Mage/src/mage/abilities/common/ActivateOncePerTurnActivatedAbility.java
+++ b/Mage/src/mage/abilities/common/ActivateOncePerTurnActivatedAbility.java
@@ -52,7 +52,7 @@ public class ActivateOncePerTurnActivatedAbility extends ActivatedAbilityImpl<Ac
 
 	@Override
 	public boolean canActivate(UUID playerId, Game game) {
-		Boolean activated = (Boolean)game.getState().getValue(this.id.toString() + "activated");
+		Boolean activated = (Boolean)game.getState().getValue(this.originalId.toString() + "activated");
 		if (activated == null)
 			return true;
 		else
@@ -63,7 +63,7 @@ public class ActivateOncePerTurnActivatedAbility extends ActivatedAbilityImpl<Ac
 	public boolean activate(Game game, boolean noMana) {
 		if (canActivate(this.controllerId, game)) {
 			if (super.activate(game, noMana)) {
-				game.getState().setValue(this.id.toString() + "activated", Boolean.TRUE);
+				game.getState().setValue(this.originalId.toString() + "activated", Boolean.TRUE);
 				return true;
 			}
 		}
@@ -72,7 +72,7 @@ public class ActivateOncePerTurnActivatedAbility extends ActivatedAbilityImpl<Ac
 
 	@Override
 	public void reset(Game game) {
-		game.getState().setValue(this.id.toString() + "activated", Boolean.FALSE);
+		game.getState().setValue(this.originalId.toString() + "activated", Boolean.FALSE);
 	}
 
 	@Override