Initial

Mage/build.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="Mage" default="default" basedir=".">
+    <description>Builds, tests, and runs the project Mage.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="Mage-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>

Mage/manifest.mf

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+

Mage/nbproject/build-impl.xml

@@ -0,0 +1,742 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+
+For the purpose of easier reading the script
+is divided into following sections:
+
+  - initialization
+  - compilation
+  - jar
+  - execution
+  - debugging
+  - javadoc
+  - junit compilation
+  - junit execution
+  - junit debugging
+  - applet
+  - cleanup
+
+        -->
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="Mage-impl">
+    <fail message="Please build using Ant 1.7.1 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.1"/>
+            </not>
+        </condition>
+    </fail>
+    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
+    <!-- 
+                ======================
+                INITIALIZATION SECTION 
+                ======================
+            -->
+    <target name="-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init" name="-init-private">
+        <property file="nbproject/private/config.properties"/>
+        <property file="nbproject/private/configs/${config}.properties"/>
+        <property file="nbproject/private/private.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private" name="-init-user">
+        <property file="${user.properties.file}"/>
+        <!-- The two properties below are usually overridden -->
+        <!-- by the active platform. Just a fallback. -->
+        <property name="default.javac.source" value="1.4"/>
+        <property name="default.javac.target" value="1.4"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
+        <property file="nbproject/configs/${config}.properties"/>
+        <property file="nbproject/project.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
+        <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
+        <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
+        <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
+        <condition property="platform.javac" value="${platform.home}/bin/javac">
+            <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
+        </condition>
+        <property name="platform.javac" value="${platform.javac.tmp}"/>
+        <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
+        <condition property="platform.java" value="${platform.home}/bin/java">
+            <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
+        </condition>
+        <property name="platform.java" value="${platform.java.tmp}"/>
+        <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
+        <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
+            <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
+        </condition>
+        <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
+        <condition property="platform.invalid" value="true">
+            <or>
+                <contains string="${platform.javac}" substring="$${platforms."/>
+                <contains string="${platform.java}" substring="$${platforms."/>
+                <contains string="${platform.javadoc}" substring="$${platforms."/>
+            </or>
+        </condition>
+        <fail unless="platform.home">Must set platform.home</fail>
+        <fail unless="platform.bootcp">Must set platform.bootcp</fail>
+        <fail unless="platform.java">Must set platform.java</fail>
+        <fail unless="platform.javac">Must set platform.javac</fail>
+        <fail if="platform.invalid">
+ The J2SE Platform is not correctly set up.
+ Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. 
+ Either open the project in the IDE and setup the Platform with the same name or add it manually.
+ For example like this:
+     ant -Duser.properties.file=&lt;path_to_property_file&gt; jar (where you put the property "platforms.${platform.active}.home" in a .properties file)
+  or ant -Dplatforms.${platform.active}.home=&lt;path_to_JDK_home&gt; jar (where no properties file is used) 
+  </fail>
+        <available file="${manifest.file}" property="manifest.available"/>
+        <condition property="manifest.available+main.class">
+            <and>
+                <isset property="manifest.available"/>
+                <isset property="main.class"/>
+                <not>
+                    <equals arg1="${main.class}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class+mkdist.available">
+            <and>
+                <istrue value="${manifest.available+main.class}"/>
+                <isset property="libs.CopyLibs.classpath"/>
+            </and>
+        </condition>
+        <condition property="have.tests">
+            <or>
+                <available file="${test.src.dir}"/>
+            </or>
+        </condition>
+        <condition property="have.sources">
+            <or>
+                <available file="${src.dir}"/>
+            </or>
+        </condition>
+        <condition property="netbeans.home+have.tests">
+            <and>
+                <isset property="netbeans.home"/>
+                <isset property="have.tests"/>
+            </and>
+        </condition>
+        <condition property="no.javadoc.preview">
+            <and>
+                <isset property="javadoc.preview"/>
+                <isfalse value="${javadoc.preview}"/>
+            </and>
+        </condition>
+        <property name="run.jvmargs" value=""/>
+        <property name="javac.compilerargs" value=""/>
+        <property name="work.dir" value="${basedir}"/>
+        <condition property="no.deps">
+            <and>
+                <istrue value="${no.dependencies}"/>
+            </and>
+        </condition>
+        <property name="javac.debug" value="true"/>
+        <property name="javadoc.preview" value="true"/>
+        <property name="application.args" value=""/>
+        <property name="source.encoding" value="${file.encoding}"/>
+        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+            <and>
+                <isset property="javadoc.encoding"/>
+                <not>
+                    <equals arg1="${javadoc.encoding}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <property name="javadoc.encoding.used" value="${source.encoding}"/>
+        <property name="includes" value="**"/>
+        <property name="excludes" value=""/>
+        <property name="do.depend" value="false"/>
+        <condition property="do.depend.true">
+            <istrue value="${do.depend}"/>
+        </condition>
+        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
+            <and>
+                <isset property="jaxws.endorsed.dir"/>
+                <available file="nbproject/jaxws-build.xml"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.dir">Must set src.dir</fail>
+        <fail unless="test.src.dir">Must set test.src.dir</fail>
+        <fail unless="build.dir">Must set build.dir</fail>
+        <fail unless="dist.dir">Must set dist.dir</fail>
+        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+        <fail unless="dist.jar">Must set dist.jar</fail>
+    </target>
+    <target name="-init-macrodef-property">
+        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${@{value}}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-javac">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="," property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <delete>
+                    <files includes="${javac.includes.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-junit">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <sequential>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <attribute default="" name="stopclassname"/>
+            <sequential>
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <bootclasspath>
+                        <path path="${platform.bootcp}"/>
+                    </bootclasspath>
+                </nbjpdastart>
+            </sequential>
+        </macrodef>
+        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${build.classes.dir}" name="dir"/>
+            <sequential>
+                <nbjpdareload>
+                    <fileset dir="@{dir}" includes="${fix.classes}">
+                        <include name="${fix.includes}*.class"/>
+                    </fileset>
+                </nbjpdareload>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-debug-args">
+        <exec executable="${platform.java}" outputproperty="version-output">
+            <arg value="-version"/>
+        </exec>
+        <condition property="have-jdk-older-than-1.4">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+            </or>
+        </condition>
+        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
+            <istrue value="${have-jdk-older-than-1.4}"/>
+        </condition>
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-debug">
+        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg value="-Dfile.encoding=${source.encoding}"/>
+                    <redirector errorencoding="${source.encoding}" inputencoding="${source.encoding}" outputencoding="${source.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-java">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">
+                    <jvmarg value="-Dfile.encoding=${source.encoding}"/>
+                    <redirector errorencoding="${source.encoding}" inputencoding="${source.encoding}" outputencoding="${source.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-presetdef-jar">
+        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <jar compress="${jar.compress}" jarfile="${dist.jar}">
+                <j2seproject1:fileset dir="${build.classes.dir}"/>
+            </jar>
+        </presetdef>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
+    <!--
+                ===================
+                COMPILATION SECTION
+                ===================
+            -->
+    <target depends="init" name="deps-jar" unless="no.deps"/>
+    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+    <target depends="init" name="-check-automatic-build">
+        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+    </target>
+    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+        <antcall target="clean"/>
+    </target>
+    <target depends="init,deps-jar" name="-pre-pre-compile">
+        <mkdir dir="${build.classes.dir}"/>
+    </target>
+    <target name="-pre-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-depend">
+        <pathconvert property="build.generated.subdirs">
+            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="*"/>
+            </dirset>
+        </pathconvert>
+        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
+        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target name="-pre-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
+    </target>
+    <target name="-post-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <!--
+                ====================
+                JAR BUILDING SECTION
+                ====================
+            -->
+    <target depends="init" name="-pre-pre-jar">
+        <dirname file="${dist.jar}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+    </target>
+    <target name="-pre-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
+        <j2seproject1:jar/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
+        <j2seproject1:jar manifest="${manifest.file}"/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
+        <j2seproject1:jar manifest="${manifest.file}">
+            <j2seproject1:manifest>
+                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
+            </j2seproject1:manifest>
+        </j2seproject1:jar>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <echo>${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <pathconvert property="run.classpath.without.build.classes.dir">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to=""/>
+        </pathconvert>
+        <pathconvert pathsep=" " property="jar.classpath">
+            <path path="${run.classpath.without.build.classes.dir}"/>
+            <chainedmapper>
+                <flattenmapper/>
+                <globmapper from="*" to="lib/*"/>
+            </chainedmapper>
+        </pathconvert>
+        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+            <fileset dir="${build.classes.dir}"/>
+            <manifest>
+                <attribute name="Main-Class" value="${main.class}"/>
+                <attribute name="Class-Path" value="${jar.classpath}"/>
+            </manifest>
+        </copylibs>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo>${platform.java} -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="libs.CopyLibs.classpath" name="-do-jar-with-libraries-without-manifest" unless="manifest.available+main.class">
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <pathconvert property="run.classpath.without.build.classes.dir">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to=""/>
+        </pathconvert>
+        <pathconvert pathsep=" " property="jar.classpath">
+            <path path="${run.classpath.without.build.classes.dir}"/>
+            <chainedmapper>
+                <flattenmapper/>
+                <globmapper from="*" to="lib/*"/>
+            </chainedmapper>
+        </pathconvert>
+        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+            <fileset dir="${build.classes.dir}"/>
+        </copylibs>
+    </target>
+    <target name="-post-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-do-jar-with-libraries-without-manifest,-post-jar" description="Build JAR." name="jar"/>
+    <!--
+                =================
+                EXECUTION SECTION
+                =================
+            -->
+    <target depends="init,compile" description="Run a main class." name="run">
+        <j2seproject1:java>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <target name="-do-not-recompile">
+        <property name="javac.includes.binary" value=""/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-single" name="run-single">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}"/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-test-single" name="run-test-with-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
+    </target>
+    <!--
+                =================
+                DEBUGGING SECTION
+                =================
+            -->
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
+        <j2seproject1:nbjpdastart name="${debug.class}"/>
+    </target>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
+    </target>
+    <target depends="init,compile" name="-debug-start-debuggee">
+        <j2seproject3:debug>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
+        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
+    </target>
+    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}"/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
+    <target depends="init" name="-pre-debug-fix">
+        <fail unless="fix.includes">Must set fix.includes</fail>
+        <property name="javac.includes" value="${fix.includes}.java"/>
+    </target>
+    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
+        <j2seproject1:nbjpdareload/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
+    <!--
+                ===============
+                JAVADOC SECTION
+                ===============
+            -->
+    <target depends="init" name="-javadoc-build">
+        <mkdir dir="${dist.javadoc.dir}"/>
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+            <classpath>
+                <path path="${javac.classpath}"/>
+            </classpath>
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/*.java"/>
+            </fileset>
+        </javadoc>
+    </target>
+    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
+        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+    </target>
+    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
+    <!--
+                =========================
+                JUNIT COMPILATION SECTION
+                =========================
+            -->
+    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+        <mkdir dir="${build.test.classes.dir}"/>
+    </target>
+    <target name="-pre-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-test-depend">
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
+    <target name="-pre-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+    <!--
+                =======================
+                JUNIT EXECUTION SECTION
+                =======================
+            -->
+    <target depends="init" if="have.tests" name="-pre-test-run">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+        <j2seproject3:junit testincludes="**/*Test.java"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init" if="have.tests" name="test-report"/>
+    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+    <target depends="init" if="have.tests" name="-pre-test-run-single">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <j2seproject3:junit excludes="" includes="${test.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <!--
+                =======================
+                JUNIT DEBUGGING SECTION
+                =======================
+            -->
+    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
+        <delete file="${test.report.file}"/>
+        <mkdir dir="${build.test.results.dir}"/>
+        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
+            <customize>
+                <syspropertyset>
+                    <propertyref prefix="test-sys-prop."/>
+                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                </syspropertyset>
+                <arg value="${test.class}"/>
+                <arg value="showoutput=true"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+    <!--
+                =========================
+                APPLET EXECUTION SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" name="run-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject1:java classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <!--
+                =========================
+                APPLET DEBUGGING  SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject3:debug classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
+    <!--
+                ===============
+                CLEANUP SECTION
+                ===============
+            -->
+    <target depends="init" name="deps-clean" unless="no.deps"/>
+    <target depends="init" name="-do-clean">
+        <delete dir="${build.dir}"/>
+        <delete dir="${dist.dir}"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
+</project>

Mage/nbproject/genfiles.properties

@@ -0,0 +1,8 @@
+build.xml.data.CRC32=a914693d
+build.xml.script.CRC32=2b92e42a
+build.xml.stylesheet.CRC32=958a1d3e@1.26.2.45
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=a914693d
+nbproject/build-impl.xml.script.CRC32=d85ef4d8
+nbproject/build-impl.xml.stylesheet.CRC32=5c621a33@1.26.2.45

Mage/nbproject/project.properties

@@ -0,0 +1,65 @@
+application.title=Mage
+application.vendor=BetaSteward_at_googlemail.com
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/Mage.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+excludes=
+includes=**
+jar.compress=false
+javac.classpath=
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.source=1.6
+javac.target=1.6
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${libs.junit.classpath}:\
+    ${libs.junit_4.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+main.class=
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+platform.active=JDK_1.6
+project.license=bsd
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test

Mage/nbproject/project.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>Mage</name>
+            <explicit-platform explicit-source-supported="true"/>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"/>
+    </configuration>
+</project>

Mage/src/mage/Constants.java

@@ -0,0 +1,271 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public final class Constants {
+
+	public enum ColoredManaSymbol {
+		W("W"), U("U"), B("B"), R("R"), G("G");
+
+		private String text;
+
+		ColoredManaSymbol(String text) {
+			this.text = text;
+		}
+
+		@Override
+		public String toString() {
+			return text;
+		}
+
+		public static ColoredManaSymbol lookup(char c) {
+			switch (c) {
+				case 'W':
+					return W;
+				case 'R':
+					return R;
+				case 'G':
+					return G;
+				case 'B':
+					return B;
+				case 'U':
+					return U;
+			}
+			return null;
+		}
+
+	}
+
+	public enum DeckType {
+		CONSTRUCTED_STANDARD ("Constructed - Standard"),
+		CONSTRUCTED_EXTENDED ("Constructed - Extended"),
+		LIMITED ("Limited");
+
+		private String text;
+
+		DeckType(String text) {
+			this.text = text;
+		}
+
+		@Override
+		public String toString() {
+			return text;
+		}
+
+	}
+
+	public enum CardType {
+		ARTIFACT ("Artifact"),
+		CREATURE ("Creature"),
+		ENCHANTMENT ("Enchantment"),
+		INSTANT ("Instant"),
+		LAND ("Land"),
+		PLANESWALKER ("Planeswalker"),
+		SORCERY ("Sorcery"),
+		TRIBAL ("Tribal");
+
+		private String text;
+
+		CardType(String text) {
+			this.text = text;
+		}
+
+		@Override
+		public String toString() {
+			return text;
+		}
+		
+	}
+
+	public enum Duration {
+		OneShot,
+		OneUse,
+		EndOfGame,
+		WhileInPlay,
+		EndOfTurn,
+		EndOfCombat,
+		Conditional
+	}
+
+	public enum Layer {
+		CopyEffects_1,
+		ControlChangingEffects_2,
+		TextChangingEffects_3,
+		TypeChangingEffects_4,
+		ColorChangingEffects_5,
+		AbilityAddingRemovingEffects_6,
+		PTChangingEffects_7,
+		PlayerEffects,
+		RulesEffects
+	}
+
+	public enum SubLayer {
+		CharacteristicDefining_7a,
+		SetPT_7b,
+		ModifyPT_7c,
+		Counters_7d,
+		SwitchPT_e,
+		NA
+	}
+
+	public enum TableState {
+		WAITING ("Waiting for players"),
+		STARTING ("Waiting to start"),
+		DUELING ("Dueling"),
+		SIDEBOARDING ("Sideboarding"),
+		FINISHED ("Finished");
+
+		private String text;
+
+		TableState(String text) {
+			this.text = text;
+		}
+
+		@Override
+		public String toString() {
+			return text;
+		}
+
+	}
+
+	public enum TurnPhase {
+		BEGINNING ("Beginning"),
+		PRECOMBAT_MAIN ("Precombat Main"),
+		COMBAT ("Combat"),
+		POSTCOMBAT_MAIN ("Postcombat Main"),
+		END ("End");
+
+		private String text;
+
+		TurnPhase(String text) {
+			this.text = text;
+		}
+
+		@Override
+		public String toString() {
+			return text;
+		}
+
+	}
+
+	public enum PhaseStep {
+		UNTAP ("Untap"),
+		UPKEEP ("Upkeep"),
+		DRAW ("Draw"),
+		PRECOMBAT_MAIN ("Precombat Main"),
+		BEGIN_COMBAT ("Begin Combat"),
+		DECLARE_ATTACKERS ("Declare Attackers"),
+		DECLARE_BLOCKERS ("Declare Blockers"),
+		FIRST_COMBAT_DAMAGE ("First Combat Damage"),
+		COMBAT_DAMAGE ("Combat Damage"),
+		END_COMBAT ("End Combat"),
+		POSTCOMBAT_MAIN ("Postcombat Main"),
+		END_TURN ("End Turn"),
+		CLEANUP ("Cleanup");
+
+		private String text;
+
+		PhaseStep(String text) {
+			this.text = text;
+		}
+
+		@Override
+		public String toString() {
+			return text;
+		}
+
+	}
+
+	public enum Outcome {
+		Damage(false),
+		DestroyPermanent(false),
+		BoostCreature(true),
+		UnboostCreature(false),
+		AddAbility(true),
+		GainLife(true),
+		BecomeCreature(true),
+		PutCreatureInPlay(true),
+		PutCardInPlay(true),
+		PutLandInPlay(true),
+		GainControl(true),
+		DrawCard(true),
+		Discard(false),
+		Exile(false),
+		Protect(true),
+		PutManaInPool(true),
+		Regenerate(true),
+		PreventDamage(true),
+		Tap(false),
+		Untap(true),
+		Win(true),
+		Benefit(true),
+		Detriment(false),
+		Neutral(true);
+
+		private boolean good;
+
+		Outcome(boolean good) {
+			this.good = good;
+		}
+
+		public boolean isGood() {
+			return good;
+		}
+
+	}
+
+	public enum Zone {
+		HAND, GRAVEYARD, LIBRARY, BATTLEFIELD, STACK, EXILED, ALL, OUTSIDE, CARD_PICKER, REVEALED, PLAYER, ATTACKERS, BLOCKERS;
+		
+		public boolean match(Zone zone) {
+			if (this == zone || this == ALL || zone == ALL)
+				return true;
+			return false;
+		}
+	}
+
+	public enum TimingRule {
+		INSTANT, SORCERY
+	}
+
+	public enum TargetController {
+		ANY, YOU, NOT_YOU, OPPONENT
+	}
+
+	public static List<String> PlaneswalkerTypes = new ArrayList<String>()
+		{{add("Ajani"); add("Bolas"); add("Chandra"); add("Elspeth");add("Garruk"); add("Jace"); add("Liliana"); add("Nissa"); add("Sarkhan"); add("Sorin"); add("Tezzeret");}};
+	
+	private Constants() {
+		throw new AssertionError();
+	}
+	
+}

Mage/src/mage/MageInt.java

@@ -0,0 +1,68 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage;
+
+import java.io.Serializable;
+
+public class MageInt implements Serializable {
+
+	public static MageInt EmptyMageInt = new MageInt(0, "");
+	
+	protected int baseValue;
+	protected String cardValue = "";
+	
+	public MageInt(int value) {
+		this.baseValue = value;
+		this.cardValue = Integer.toString(value);
+	}
+
+	public MageInt(int baseValue, String cardValue) {
+		this.baseValue = baseValue;
+		this.cardValue = cardValue;
+	}
+	
+	public int getValue() {
+		return baseValue;
+	}
+	
+	public void setValue(int value) {
+		this.baseValue = value;
+	}
+	
+	public void boostValue(int amount) {
+		this.baseValue += amount;
+		if (this.baseValue < 0)
+			this.baseValue = 0;
+	}
+
+	@Override
+	public String toString() {
+		return cardValue;
+	}
+}

Mage/src/mage/MageItem.java

@@ -0,0 +1,42 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage;
+
+import java.io.Serializable;
+import java.util.UUID;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public interface MageItem extends Serializable {
+
+	public UUID getId();
+
+}

Mage/src/mage/MageObject.java

@@ -0,0 +1,29 @@
+package mage;
+
+import java.io.Serializable;
+import java.util.List;
+import mage.Constants.CardType;
+import mage.Constants.Zone;
+import mage.abilities.Abilities;
+import mage.abilities.costs.mana.ManaCosts;
+
+public interface MageObject extends MageItem, Serializable {
+
+	public String getName();
+
+	public List<CardType> getCardType();
+	public List<String> getSubtype();
+	public List<String> getSupertype();
+
+	public Abilities getAbilities();
+	public ObjectColor getColor();
+	public ManaCosts getManaCost();
+	
+	public MageInt getPower();
+	public MageInt getToughness();
+	public MageInt getLoyalty();
+
+	public Zone getZone();
+	public void setZone(Zone zone);
+	
+}

Mage/src/mage/MageObjectImpl.java

@@ -0,0 +1,131 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import mage.Constants.*;
+import mage.abilities.Abilities;
+import mage.abilities.AbilitiesImpl;
+import mage.abilities.costs.mana.ManaCosts;
+
+public abstract class MageObjectImpl implements MageObject {
+
+	protected UUID objectId;
+	
+	protected String name;
+	protected ManaCosts manaCost = new ManaCosts("");
+	protected ObjectColor color = new ObjectColor();
+	protected List<CardType> cardType = new ArrayList<CardType>();
+	protected List<String> subtype = new ArrayList<String>();
+	protected List<String> supertype = new ArrayList<String>();
+	protected Abilities abilities = new AbilitiesImpl();
+	protected String text;
+	protected MageInt power = new MageInt(0);
+	protected MageInt toughness = new MageInt(0);
+	protected MageInt loyalty = new MageInt(0);
+	protected Zone zone;
+
+	public MageObjectImpl() {
+		objectId = UUID.randomUUID();
+	}
+	
+	@Override
+	public UUID getId() {
+		 return objectId;
+	}
+
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public List<CardType> getCardType() {
+		return cardType;
+	}
+
+	@Override
+	public List<String> getSubtype(){
+		return subtype;
+	}
+	
+	@Override
+	public List<String> getSupertype(){
+		return supertype;
+	}
+
+	@Override
+	public Abilities getAbilities(){
+		return abilities;
+	}
+
+	@Override
+	public MageInt getPower() {
+//		if (power != null)
+			return power;
+//		return MageInt.EmptyMageInt;
+	}
+
+	@Override
+	public MageInt getToughness() {
+//		if (toughness != null)
+			return toughness;
+//		return MageInt.EmptyMageInt;
+	}
+
+	@Override
+	public MageInt getLoyalty() {
+//		if (loyalty != null)
+			return loyalty;
+//		return MageInt.EmptyMageInt;
+	}
+
+	@Override
+	public ObjectColor getColor() {
+		return color;
+	}
+
+	@Override
+	public ManaCosts getManaCost() {
+		return manaCost;
+	}
+
+	@Override
+	public Zone getZone() {
+		return zone;
+	}
+
+	@Override
+	public void setZone(Zone zone) {
+		this.zone = zone;
+	}
+}

Mage/src/mage/MageObjects.java

@@ -0,0 +1,40 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage;
+
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public interface MageObjects extends Map<UUID, MageObject> {
+
+}

Mage/src/mage/MageObjectsImpl.java

@@ -0,0 +1,40 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage;
+
+import java.util.LinkedHashMap;
+import java.util.UUID;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class MageObjectsImpl extends LinkedHashMap<UUID, MageObject> implements MageObjects {
+
+}

Mage/src/mage/Mana.java

@@ -0,0 +1,356 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage;
+
+import java.io.Serializable;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class Mana implements Comparable<Mana>, Serializable {
+
+	private int red = 0;
+	private int green = 0;
+	private int blue = 0;
+	private int white = 0;
+	private int black = 0;
+	private int colorless = 0;
+	private int any = 0;
+
+	public static Mana RedMana = RedMana(1);
+	public static Mana GreenMana = GreenMana(1);
+	public static Mana BlueMana = BlueMana(1);
+	public static Mana WhiteMana = WhiteMana(1);
+	public static Mana BlackMana = BlackMana(1);
+	public static Mana ColorlessMana = ColorlessMana(1);
+
+	public Mana() {}
+
+	public static Mana RedMana(int num) {
+		return new Mana(num, 0, 0, 0, 0, 0, 0);
+	}
+
+	public static Mana GreenMana(int num) {
+		return new Mana(0, num, 0, 0, 0, 0, 0);
+	}
+
+	public static Mana BlueMana(int num) {
+		return new Mana(0, 0, num, 0, 0, 0, 0);
+	}
+
+	public static Mana WhiteMana(int num) {
+		return new Mana(0, 0, 0, num, 0, 0, 0);
+	}
+
+	public static Mana BlackMana(int num) {
+		return new Mana(0, 0, 0, 0, num, 0, 0);
+	}
+
+	public static Mana ColorlessMana(int num) {
+		return new Mana(0, 0, 0, 0, 0, num, 0);
+	}
+
+	public Mana(int red, int green, int blue, int white, int black, int colorless, int any) {
+		this.red = red;
+		this.green = green;
+		this.blue = blue;
+		this.white = white;
+		this.black = black;
+		this.colorless = colorless;
+		this.any = any;
+	}
+
+	public void add(Mana mana) {
+		red += mana.getRed();
+		green += mana.getGreen();
+		blue += mana.getBlue();
+		white += mana.getWhite();
+		black += mana.getBlack();
+		colorless += mana.getColorless();
+		any += mana.getAny();
+	}
+
+	public void addRed() {
+		red++;
+	}
+
+	public void addGreen() {
+		green++;
+	}
+
+	public void addBlue() {
+		blue++;
+	}
+
+	public void addWhite() {
+		white++;
+	}
+
+	public void addBlack() {
+		black++;
+	}
+
+	public void addColorless() {
+		colorless++;
+	}
+
+	public void subtract(Mana mana) {
+		red -= mana.getRed();
+		green -= mana.getGreen();
+		blue -= mana.getBlue();
+		white -= mana.getWhite();
+		black -= mana.getBlack();
+		colorless -= mana.getColorless();
+		any -= mana.getAny();
+	}
+
+	public int count() {
+		return red +green + blue + white + black + colorless + any;
+	}
+
+	public void clear() {
+		red = 0;
+		green = 0;
+		blue = 0;
+		white = 0;
+		black = 0;
+		colorless = 0;
+		any = 0;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sbMana = new StringBuilder();
+
+		for (int i = 0; i < red; i++)
+			sbMana.append("{R}");
+		for (int i = 0; i < green; i++)
+			sbMana.append("{G}");
+		for (int i = 0; i < blue; i++)
+			sbMana.append("{U}");
+		for (int i = 0; i < black; i++)
+			sbMana.append("{B}");
+		for (int i = 0; i < white; i++)
+			sbMana.append("{W}");
+		if (colorless > 0) {
+			sbMana.append("{");
+			sbMana.append(Integer.toString(colorless));
+			sbMana.append("}");
+		}
+		return sbMana.toString();
+	}
+
+	public Mana copy() {
+		Mana copy = new Mana();
+		copy.add(this);
+		return copy;
+	}
+
+	public boolean enough(Mana avail) {
+		Mana compare = avail.copy();
+		compare.subtract(this);
+		if (compare.getRed() < 0) {
+			compare.setAny(compare.getAny() + compare.getRed());
+			if (compare.getAny() < 0)
+				return false;
+			compare.setRed(0);
+		}
+		if (compare.getGreen() < 0) {
+			compare.setAny(compare.getAny() + compare.getGreen());
+			if (compare.getAny() < 0)
+				return false;
+			compare.setGreen(0);
+		}
+		if (compare.getBlue() < 0) {
+			compare.setAny(compare.getAny() + compare.getBlue());
+			if (compare.getAny() < 0)
+				return false;
+			compare.setBlue(0);
+		}
+		if (compare.getBlack() < 0) {
+			compare.setAny(compare.getAny() + compare.getBlack());
+			if (compare.getAny() < 0)
+				return false;
+			compare.setBlack(0);
+		}
+		if (compare.getWhite() < 0) {
+			compare.setAny(compare.getAny() + compare.getWhite());
+			if (compare.getAny() < 0)
+				return false;
+			compare.setWhite(0);
+		}
+		if (compare.getColorless() < 0) {
+			int remaining = compare.getRed() + compare.getGreen() + compare.getBlack() + compare.getBlue() + compare.getWhite();
+			if (compare.getColorless() + remaining < 0)
+				return false;
+		}
+		return true;
+	}
+
+	public Mana needed(Mana avail) {
+		Mana compare = avail.copy();
+		compare.subtract(this);
+		if (compare.getRed() < 0 && compare.getAny() > 0) {
+			int diff = Math.min( compare.getAny(), Math.abs(compare.getRed()));
+			compare.setAny(compare.getAny() - diff);
+			compare.setRed(compare.getRed() + diff);
+		}
+		if (compare.getGreen() < 0 && compare.getAny() > 0) {
+			int diff = Math.min( compare.getAny(), Math.abs(compare.getGreen()));
+			compare.setAny(compare.getAny() - diff);
+			compare.setGreen(compare.getGreen() + diff);
+		}
+		if (compare.getBlue() < 0 && compare.getAny() > 0) {
+			int diff = Math.min( compare.getAny(), Math.abs(compare.getBlue()));
+			compare.setAny(compare.getAny() - diff);
+			compare.setBlue(compare.getBlue() + diff);
+		}
+		if (compare.getBlack() < 0 && compare.getAny() > 0) {
+			int diff = Math.min( compare.getAny(), Math.abs(compare.getBlack()));
+			compare.setAny(compare.getAny() - diff);
+			compare.setBlack(compare.getBlack() + diff);
+		}
+		if (compare.getWhite() < 0 && compare.getAny() > 0) {
+			int diff = Math.min( compare.getAny(), Math.abs(compare.getWhite()));
+			compare.setAny(compare.getAny() - diff);
+			compare.setWhite(compare.getWhite() + diff);
+		}
+		if (compare.getColorless() < 0) {
+			int remaining = 0;
+			remaining += Math.min(0,compare.getRed());
+			remaining += Math.min(0,compare.getWhite());
+			remaining += Math.min(0,compare.getGreen());
+			remaining += Math.min(0,compare.getBlack());
+			remaining += Math.min(0,compare.getBlue());
+			remaining += Math.min(0,compare.getAny());
+			if (remaining > 0) {
+				int diff = Math.min(remaining, Math.abs(compare.getColorless()));
+				compare.setColorless(compare.getColorless() + diff);
+			}
+		}
+		Mana needed = new Mana();
+		if (compare.getRed() < 0)
+			needed.setRed(Math.abs(compare.getRed()));
+		if (compare.getWhite() < 0)
+			needed.setWhite(Math.abs(compare.getWhite()));
+		if (compare.getGreen() < 0)
+			needed.setGreen(Math.abs(compare.getGreen()));
+		if (compare.getBlack() < 0)
+			needed.setBlack(Math.abs(compare.getBlack()));
+		if (compare.getBlue() < 0)
+			needed.setBlue(Math.abs(compare.getBlue()));
+		if (compare.getColorless() < 0)
+			needed.setColorless(Math.abs(compare.getColorless()));
+		return needed;
+	}
+
+	public int getRed() {
+		return red;
+	}
+
+	public void setRed(int red) {
+		this.red = red;
+	}
+
+	public int getGreen() {
+		return green;
+	}
+
+	public void setGreen(int green) {
+		this.green = green;
+	}
+
+	public int getBlue() {
+		return blue;
+	}
+
+	public void setBlue(int blue) {
+		this.blue = blue;
+	}
+
+	public int getWhite() {
+		return white;
+	}
+
+	public void setWhite(int white) {
+		this.white = white;
+	}
+
+	public int getBlack() {
+		return black;
+	}
+
+	public void setBlack(int black) {
+		this.black = black;
+	}
+
+	public int getColorless() {
+		return colorless;
+	}
+
+	public void setColorless(int colorless) {
+		this.colorless = colorless;
+	}
+
+	public int getAny() {
+		return any;
+	}
+
+	public void setAny(int any) {
+		this.any = any;
+	}
+
+	public int compareTo(Mana o) {
+		return this.count() - o.count();
+	}
+
+	/**
+	 *
+	 * @param netMana
+	 * @return true if this contains any values that mana has
+	 */
+	public boolean contains(Mana mana) {
+		if (mana.black > 0 && this.black > 0)
+			return true;
+		if (mana.blue > 0 && this.blue > 0)
+			return true;
+		if (mana.red > 0 && this.red > 0)
+			return true;
+		if (mana.white > 0 && this.white > 0)
+			return true;
+		if (mana.green > 0 && this.green > 0)
+			return true;
+		if (mana.colorless > 0 && this.count() > 0)
+			return true;
+		
+		return false;
+	}
+
+}

Mage/src/mage/ObjectColor.java

@@ -0,0 +1,192 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage;
+
+import java.io.Serializable;
+
+public class ObjectColor implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	
+	public static final ObjectColor WHITE = new ObjectColor("W");
+	public static final ObjectColor BLUE = new ObjectColor("U");
+	public static final ObjectColor BLACK = new ObjectColor("B");
+	public static final ObjectColor RED = new ObjectColor("R");
+	public static final ObjectColor GREEN = new ObjectColor("G");
+	
+	private boolean white;
+	private boolean blue;
+	private boolean black;
+	private boolean red;
+	private boolean green;
+
+	public ObjectColor() {}
+	
+	public ObjectColor(String color) {
+		for (int i = 0; i < color.length(); i++) {
+			switch (color.charAt(i)) {
+			case 'W':
+				white = true;
+			case 'U':
+				blue = true;
+			case 'B':
+				black = true;
+			case 'R':
+				red = true;
+			case 'G':
+				green = true;
+			}
+		}
+	}
+
+	public void setColor(ObjectColor color) {
+		this.setBlack(color.isBlack());
+		this.setBlue(color.isBlue());
+		this.setGreen(color.isGreen());
+		this.setRed(color.isRed());
+		this.setWhite(color.isWhite());
+	}
+
+	public boolean isColorless() {
+		return !(hasColor());
+	}
+	
+	public boolean hasColor() {
+		return white | blue | black | red | green;
+	}
+
+	public boolean isMulticolored() {
+		if (isColorless())
+			return false;
+		if (white && (blue | black | red | green))
+			return true;
+		if (blue && (black | red | green))
+			return true;
+		if (black && (red | green))
+			return true;
+		if (red && green)
+			return true;
+		return false;
+	}
+	
+	public boolean isWhite() {
+		return white;
+	}
+	public void setWhite(boolean white) {
+		this.white = white;
+	}
+	public boolean isBlue() {
+		return blue;
+	}
+	public void setBlue(boolean blue) {
+		this.blue = blue;
+	}
+	public boolean isBlack() {
+		return black;
+	}
+	public void setBlack(boolean black) {
+		this.black = black;
+	}
+	public boolean isRed() {
+		return red;
+	}
+	public void setRed(boolean red) {
+		this.red = red;
+	}
+	public boolean isGreen() {
+		return green;
+	}
+	public void setGreen(boolean green) {
+		this.green = green;
+	}
+	
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		if (white) 
+			sb.append("W");
+		if (blue) 
+			sb.append("U");
+		if (black) 
+			sb.append("B");
+		if (red) 
+			sb.append("R");
+		if (green) 
+			sb.append("G");
+		return sb.toString();
+	}
+	
+	@Override
+	public boolean equals(Object color) {
+		if (this == color) 
+			return true;
+		if (!(color instanceof ObjectColor)) 
+			return false;
+		ObjectColor test = (ObjectColor) color;
+		if (test.white != this.white)
+			return false;
+		if (test.blue != this.blue)
+			return false;
+		if (test.black != this.black)
+			return false;
+		if (test.red != this.red)
+			return false;
+		if (test.green != this.green)
+			return false;
+		return true;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 3;
+		hash = 23 * hash + (this.white ? 1 : 0);
+		hash = 23 * hash + (this.blue ? 1 : 0);
+		hash = 23 * hash + (this.black ? 1 : 0);
+		hash = 23 * hash + (this.red ? 1 : 0);
+		hash = 23 * hash + (this.green ? 1 : 0);
+		return hash;
+	}
+
+	public boolean contains(ObjectColor color) {
+		if (this == color)
+			return true;
+		if (color.white & this.white)
+			return true;
+		if (color.blue & this.blue)
+			return true;
+		if (color.black & this.black)
+			return true;
+		if (color.red & this.red)
+			return true;
+		if (color.green & this.green)
+			return true;
+		return false;
+	}
+	
+}

Mage/src/mage/abilities/Abilities.java

@@ -0,0 +1,60 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities;
+
+import java.util.List;
+import java.util.UUID;
+import mage.Constants.Zone;
+import mage.abilities.keyword.KickerAbility;
+import mage.abilities.keyword.ProtectionAbility;
+import mage.abilities.mana.ManaAbility;
+
+public interface Abilities extends List<Ability> {
+
+	public List<String> getRules();
+	public List<ActivatedAbility> getActivatedAbilities(Zone zone);
+	public List<ManaAbility> getManaAbilities(Zone zone);
+	public List<StaticAbility> getStaticAbilities(Zone zone);
+	public List<EvasionAbility> getEvasionAbilities();
+	public List<TriggeredAbility> getTriggeredAbilities(Zone zone);
+	public List<ProtectionAbility> getProtectionAbilities();
+	public List<KickerAbility> getKickerAbilities();
+	
+	public Abilities copy();
+
+	public void setControllerId(UUID controllerId);
+	public void setSourceId(UUID sourceId);
+	public boolean containsKey(UUID abilityId);
+	public Ability get(UUID abilityId);
+
+	public boolean containsAll(Abilities abilities);
+
+
+
+}

Mage/src/mage/abilities/AbilitiesImpl.java

@@ -0,0 +1,189 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import mage.Constants.Zone;
+import mage.abilities.keyword.KickerAbility;
+import mage.abilities.keyword.ProtectionAbility;
+import mage.abilities.mana.ManaAbility;
+import mage.util.Copier;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class AbilitiesImpl extends ArrayList<Ability> implements Abilities, Serializable {
+
+
+	@Override
+	public List<String> getRules() {
+		List<String> rules = new ArrayList<String>();
+
+		for (Ability ability:this) {
+			if (!(ability instanceof SpellAbility || ability instanceof PlayLandAbility))
+				rules.add(ability.getRule());
+		}
+
+		return rules;
+	}
+
+	@Override
+	public List<ActivatedAbility> getActivatedAbilities(Zone zone) {
+		List<ActivatedAbility> zonedAbilities = new ArrayList<ActivatedAbility>();
+		for (Ability ability: this) {
+			if (ability.isEnabled() && ability instanceof ActivatedAbility && ability.getZone().match(zone)) {
+				zonedAbilities.add((ActivatedAbility)ability);
+			}
+		}
+		return zonedAbilities;
+	}
+
+	@Override
+	public Abilities copy() {
+		return new Copier<Abilities>().copy(this);
+	}
+
+	@Override
+	public List<ManaAbility> getManaAbilities(Zone zone) {
+		List<ManaAbility> abilities = new ArrayList<ManaAbility>();
+		for (Ability ability: this) {
+			if (ability.isEnabled() && ability instanceof ManaAbility && ability.getZone().match(zone)) {
+				abilities.add((ManaAbility)ability);
+			}
+		}
+		return abilities;
+	}
+
+	@Override
+	public List<EvasionAbility> getEvasionAbilities() {
+		List<EvasionAbility> abilities = new ArrayList<EvasionAbility>();
+		for (Ability ability: this) {
+			if (ability.isEnabled() && ability instanceof EvasionAbility) {
+				abilities.add((EvasionAbility)ability);
+			}
+		}
+		return abilities;
+	}
+
+	@Override
+	public List<StaticAbility> getStaticAbilities(Zone zone) {
+		List<StaticAbility> zonedAbilities = new ArrayList<StaticAbility>();
+		for (Ability ability: this) {
+			if (ability.isEnabled() && ability instanceof StaticAbility && ability.getZone().match(zone)) {
+				zonedAbilities.add((StaticAbility)ability);
+			}
+		}
+		return zonedAbilities;
+	}
+
+	@Override
+	public List<TriggeredAbility> getTriggeredAbilities(Zone zone) {
+		List<TriggeredAbility> zonedAbilities = new ArrayList<TriggeredAbility>();
+		for (Ability ability: this) {
+			if (ability.isEnabled() && ability instanceof TriggeredAbility && ability.getZone().match(zone)) {
+				zonedAbilities.add((TriggeredAbility)ability);
+			}
+		}
+		return zonedAbilities;
+	}
+
+	@Override
+	public List<ProtectionAbility> getProtectionAbilities() {
+		List<ProtectionAbility> abilities = new ArrayList<ProtectionAbility>();
+		for (Ability ability: this) {
+			if (ability.isEnabled() && ability instanceof ProtectionAbility) {
+				abilities.add((ProtectionAbility)ability);
+			}
+		}
+		return abilities;
+	}
+
+	@Override
+	public List<KickerAbility> getKickerAbilities() {
+		List<KickerAbility> abilities = new ArrayList<KickerAbility>();
+		for (Ability ability: this) {
+			if (ability.isEnabled() && ability instanceof KickerAbility) {
+				abilities.add((KickerAbility)ability);
+			}
+		}
+		return abilities;
+	}
+
+	@Override
+	public void setControllerId(UUID controllerId) {
+		for (Ability ability: this) {
+			ability.setControllerId(controllerId);
+		}
+	}
+
+	@Override
+	public void setSourceId(UUID sourceId) {
+		for (Ability ability: this) {
+			ability.setSourceId(sourceId);
+		}
+	}
+
+	public boolean containsAll(Abilities abilities) {
+		if (this.size() < abilities.size())
+			return false;
+		for (Ability ability: abilities) {
+			boolean found = false;
+			for (Ability test: this) {
+				if (ability.getRule().equals(test.getRule())) {
+					found = true;
+					break;
+				}
+				if (!found)
+					return false;
+			}
+		}
+		return true;
+	}
+
+	public boolean containsKey(UUID abilityId) {
+		for (Ability ability: this) {
+			if (ability.getId().equals(abilityId))
+				return true;
+		}
+		return false;
+	}
+
+	public Ability get(UUID abilityId) {
+		for (Ability ability: this) {
+			if (ability.getId().equals(abilityId))
+				return ability;
+		}
+		return null;
+	}
+
+}

Mage/src/mage/abilities/Ability.java

@@ -0,0 +1,72 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities;
+
+import java.io.Serializable;
+import java.util.UUID;
+import mage.Constants.Zone;
+import mage.abilities.costs.Cost;
+import mage.abilities.costs.Costs;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.Effects;
+import mage.choices.Choice;
+import mage.choices.Choices;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.target.Target;
+import mage.target.Targets;
+
+public interface Ability extends Serializable {
+
+	public UUID getId();
+	public UUID getControllerId();
+	public UUID getSourceId();
+	public Costs<Cost> getCosts();
+	public void addCost(Cost cost);
+	public Effects getEffects();
+	public void addEffect(Effect effect);
+	public Targets getTargets();
+	public UUID getFirstTarget();
+	public void addTarget(Target target);
+	public Choices getChoices();
+	public void addChoice(Choice choice);
+	public Zone getZone();
+	public String getRule();
+	public String getName();
+	public boolean isEnabled();
+	public void setEnabled(boolean enabled);
+	public boolean activate(Game game, boolean noMana);
+	public boolean resolve(Game game);
+	public void handleEvent(GameEvent event, Game game);
+
+	public void setControllerId(UUID controllerId);
+	public void setSourceId(UUID sourceID);
+	public Ability copy();
+	
+}

Mage/src/mage/abilities/AbilityImpl.java

@@ -0,0 +1,231 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities;
+
+import java.io.Serializable;
+import java.util.UUID;
+import mage.Constants.Zone;
+import mage.abilities.costs.Cost;
+import mage.abilities.costs.Costs;
+import mage.abilities.costs.CostsImpl;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.Effects;
+import mage.abilities.effects.OneShotEffect;
+import mage.choices.Choice;
+import mage.choices.Choices;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.target.Target;
+import mage.target.Targets;
+import mage.util.Copier;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public abstract class AbilityImpl implements Ability, Serializable {
+
+	protected static Copier<Ability> copier = new Copier<Ability>();
+
+	protected UUID id;
+	protected UUID controllerId;
+	protected UUID sourceId;
+	protected Costs<Cost> costs = new CostsImpl<Cost>(this);
+	protected Targets targets = new Targets(this);
+	protected Choices choices = new Choices(this);
+	protected Effects effects = new Effects(this);
+	protected Zone zone;
+	protected String name;
+	protected boolean enabled = true;
+
+	public AbilityImpl(Zone zone) {
+		this.id = UUID.randomUUID();
+		this.zone = zone;
+		targets.setSource(this);
+		costs.setAbility(this);
+		choices.setSource(this);
+		effects.setSource(this);
+	}
+
+	@Override
+	public UUID getId() {
+		return id;
+	}
+
+	@Override
+	public boolean resolve(Game game) {
+		boolean result = true;
+		if (enabled) {
+			for (Effect effect: getEffects()) {
+				if (effect instanceof OneShotEffect) {
+					result &= effect.apply(game);
+				}
+				else {
+					game.addEffect((ContinuousEffectImpl) effect);
+				}
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public boolean activate(Game game, boolean noMana) {
+		if (choices.size() > 0 && choices.choose(game) == false)
+			return false;
+		if (targets.size() > 0 && targets.choose(effects.get(0).getOutcome(), game) == false)
+			return false;
+		return getCosts().pay(game, noMana);
+	}
+
+	@Override
+	public UUID getControllerId() {
+		return controllerId;
+	}
+
+	@Override
+	public void setControllerId(UUID controllerId) {
+		this.controllerId = controllerId;
+	}
+
+
+	@Override
+	public UUID getSourceId() {
+		return sourceId;
+	}
+
+	@Override
+	public void setSourceId(UUID sourceId) {
+		this.sourceId = sourceId;
+	}
+
+	@Override
+	public Costs getCosts() {
+		return costs;
+	}
+
+	@Override
+	public Effects getEffects() {
+		return effects;
+	}
+
+	@Override
+	public Choices getChoices() {
+		return choices;
+	}
+
+	@Override
+	public Zone getZone() {
+		return zone;
+	}
+
+	@Override
+	public String getRule() {
+		StringBuilder sbRule = new StringBuilder();
+
+		if (!(this instanceof SpellAbility)) {
+			if (!costs.getText().equals("")) {
+				sbRule.append(costs.getText());
+				sbRule.append(": ");
+			}
+		}
+		sbRule.append(effects.getText());
+
+		return sbRule.toString();
+	}
+
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	@Override
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	@Override
+	public void handleEvent(GameEvent event, Game game) {
+		
+	}
+
+	@Override
+	public void addCost(Cost cost) {
+		if (cost != null) {
+			cost.setAbility(this);
+			this.costs.add(cost);
+		}
+	}
+
+	@Override
+	public void addEffect(Effect effect) {
+		if (effect != null) {
+			effect.setSource(this);
+			this.effects.add(effect);
+		}
+	}
+
+	@Override
+	public void addTarget(Target target) {
+		if (target != null) {
+			target.setAbility(this);
+			this.targets.add(target);
+		}
+	}
+
+	@Override
+	public void addChoice(Choice choice) {
+		if (choice != null) {
+			choice.setAbility(this);
+			this.choices.add(choice);
+		}
+	}
+
+	@Override
+	public Targets getTargets() {
+		return this.targets;
+	}
+
+	@Override
+	public UUID getFirstTarget() {
+		if (this.targets.size() > 0)
+			return this.targets.get(0).getFirstTarget();
+		return null;
+	}
+
+	@Override
+	public Ability copy() {
+		return copier.copy(this);
+	}
+}

Mage/src/mage/abilities/ActivatedAbility.java

@@ -0,0 +1,44 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities;
+
+import java.util.UUID;
+import mage.game.Game;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public interface ActivatedAbility extends Ability {
+
+	public boolean canActivate(UUID playerId, Game game);
+	public boolean isActivated(Game game);
+	public String getActivatedMessage(Game game);
+	
+}

Mage/src/mage/abilities/ActivatedAbilityImpl.java

@@ -0,0 +1,130 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities;
+
+import java.util.UUID;
+import mage.Constants.TimingRule;
+import mage.Constants.Zone;
+import mage.abilities.costs.Cost;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.Effects;
+import mage.cards.Card;
+import mage.game.Game;
+import mage.target.Target;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public abstract class ActivatedAbilityImpl extends AbilityImpl implements ActivatedAbility {
+
+	protected TimingRule timing = TimingRule.INSTANT;
+	protected UUID effectId;
+
+	public ActivatedAbilityImpl(Zone zone, Cost cost) {
+		super(zone);
+		if (cost != null)
+			this.addCost(cost);
+	}
+
+	public ActivatedAbilityImpl(Zone zone, Effect effect, Cost cost) {
+		super(zone);
+		if (effect != null) {
+			this.addEffect(effect);
+			effectId = effect.getId();
+		}
+		if (cost != null)
+			this.addCost(cost);
+	}
+
+	public ActivatedAbilityImpl(Zone zone, Effects effects, Cost cost) {
+		super(zone);
+		for (Effect effect: effects) {
+			if (effect != null) {
+				this.addEffect(effect);
+			}
+		}
+		if (cost != null)
+			this.addCost(cost);
+	}
+
+	@Override
+	public boolean canActivate(UUID playerId, Game game) {
+		//20091005 - 602.2
+		if (!controlsAbility(playerId, game))
+			return false;
+		//20091005 - 602.5d/602.5e
+		if (timing == TimingRule.INSTANT || (game.isMainPhase() &&
+				game.getStack().isEmpty() &&
+				game.getActivePlayerId().equals(playerId)) &&
+				costs.canPay(playerId, game) &&
+				targets.canChoose(sourceId, game)
+			) {
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean isActivated(Game game) {
+
+		if (effectId != null)
+			return game.getContinuousEffects().effectExists(this.id);
+		return false;
+	}
+
+	protected boolean controlsAbility(UUID playerId, Game game) {
+		if (this.controllerId != null && this.controllerId.equals(playerId))
+			return true;
+		else {
+			Card card = (Card)game.getObject(this.sourceId);
+			if (card != null)
+				return card.getOwnerId().equals(playerId);
+		}
+		return false;
+	}
+
+	@Override
+	public String getActivatedMessage(Game game) {
+		return " activates ability from " + getMessageText(game);
+	}
+
+	protected String getMessageText(Game game) {
+		StringBuilder sb = new StringBuilder();
+		sb.append(game.getObject(this.sourceId).getName());
+		if (this.targets.size() > 0) {
+			sb.append(" targeting ");
+			for (Target target: targets) {
+				sb.append(target.getTargetedName(game));
+			}
+		}
+		return sb.toString();
+	}
+
+}

Mage/src/mage/abilities/EvasionAbility.java

@@ -0,0 +1,43 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities;
+
+import java.util.UUID;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public interface EvasionAbility {
+
+	public boolean canBlock(Permanent permanent, Game game);
+
+}

Mage/src/mage/abilities/EvasionAbilityImpl.java

@@ -0,0 +1,43 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities;
+
+import mage.Constants.Zone;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public abstract class EvasionAbilityImpl extends StaticAbility implements EvasionAbility {
+
+	public EvasionAbilityImpl() {
+		super(Zone.BATTLEFIELD, null);
+	}
+
+}

Mage/src/mage/abilities/LoyaltyAbility.java

@@ -0,0 +1,53 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities;
+
+import mage.Constants.TimingRule;
+import mage.Constants.Zone;
+import mage.abilities.costs.common.PayLoyaltyCost;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.Effects;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class LoyaltyAbility extends ActivatedAbilityImpl {
+
+	public LoyaltyAbility(Effect effect, int loyalty) {
+		super(Zone.BATTLEFIELD, effect, new PayLoyaltyCost(loyalty));
+		this.timing = TimingRule.SORCERY;
+	}
+
+	public LoyaltyAbility(Effects effects, int loyalty) {
+		super(Zone.BATTLEFIELD, effects, new PayLoyaltyCost(loyalty));
+		this.timing = TimingRule.SORCERY;
+	}
+
+}

Mage/src/mage/abilities/PlayLandAbility.java

@@ -0,0 +1,61 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities;
+
+import java.util.UUID;
+import mage.Constants.Zone;
+import mage.game.Game;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class PlayLandAbility extends ActivatedAbilityImpl {
+
+	public PlayLandAbility() {
+		super(Zone.HAND, null);
+		this.name = "Play";
+	}
+
+	@Override
+	public boolean canActivate(UUID playerId, Game game) {
+		if (!controlsAbility(playerId, game))
+			return false;
+		//20091005 - 114.2a
+		if (game.getActivePlayerId().equals(playerId) && game.getStack().isEmpty() && game.isMainPhase()) {
+			return game.getPlayer(playerId).canPlayLand();
+		}
+		return false;
+	}
+
+	@Override
+	public String getActivatedMessage(Game game) {
+		return " plays " + getMessageText(game);
+	}
+}

Mage/src/mage/abilities/SpellAbility.java

@@ -0,0 +1,65 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities;
+
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Zone;
+import mage.abilities.costs.Cost;
+import mage.game.Game;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class SpellAbility extends ActivatedAbilityImpl {
+
+	public SpellAbility(Cost cost) {
+		super(Zone.HAND, cost);
+		this.name = "Cast";
+	}
+
+	@Override
+	public boolean canActivate(UUID playerId, Game game) {
+		if (game.getObject(sourceId).getCardType().contains(CardType.INSTANT) ||
+				(game.isMainPhase() &&
+				game.getStack().isEmpty() &&
+				game.getActivePlayerId().equals(playerId)) &&
+				costs.canPay(playerId, game) &&
+				targets.canChoose(sourceId, game))
+			return true;
+		return false;
+	}
+
+	@Override
+	public String getActivatedMessage(Game game) {
+		return " casts " + getMessageText(game);
+	}
+
+}

Mage/src/mage/abilities/StaticAbility.java

@@ -0,0 +1,45 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities;
+
+import mage.Constants.Zone;
+import mage.abilities.effects.Effect;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public abstract class StaticAbility extends AbilityImpl {
+
+	public StaticAbility(Zone zone, Effect effect) {
+		super(zone);
+		if (effect != null)
+			this.addEffect(effect);
+	}
+}

Mage/src/mage/abilities/TriggeredAbilities.java

@@ -0,0 +1,57 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities;
+
+import java.util.ArrayList;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class TriggeredAbilities extends ArrayList<TriggeredAbility> {
+
+	public void handleEvent(GameEvent event, Game game) {
+		for(TriggeredAbility ability: this) {
+			ability.handleEvent(event, game);
+		} 
+	}
+
+	public boolean check(Game game) {
+		boolean played = false;
+		for (TriggeredAbility ability: this) {
+			played |= game.getPlayer(ability.getControllerId()).triggerAbility(ability, game);
+		}
+		clear();
+		return played;
+	}
+
+
+}

Mage/src/mage/abilities/TriggeredAbility.java

@@ -0,0 +1,42 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities;
+
+import java.util.UUID;
+import mage.game.Game;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public interface TriggeredAbility extends Ability {
+
+	public void trigger(Game game, UUID controllerId);
+	
+}

Mage/src/mage/abilities/TriggeredAbilityImpl.java

@@ -0,0 +1,75 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities;
+
+import java.util.UUID;
+import mage.Constants.Outcome;
+import mage.Constants.Zone;
+import mage.abilities.effects.Effect;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public abstract class TriggeredAbilityImpl extends AbilityImpl implements TriggeredAbility {
+
+	protected boolean optional;
+
+	public TriggeredAbilityImpl(Zone zone, Effect effect) {
+		this(zone, effect, false);
+	}
+	
+	public TriggeredAbilityImpl(Zone zone, Effect effect, boolean optional) {
+		super(zone);
+		if (effect != null)
+			addEffect(effect);
+		this.optional = optional;
+	}
+
+	@Override
+	public void trigger(Game game, UUID controllerId) {
+		this.controllerId = controllerId;
+		game.addTriggeredAbility(this);
+	}
+
+	@Override
+	public boolean resolve(Game game) {
+		if (optional) {
+			Player player = game.getPlayer(this.getControllerId());
+			Permanent permanent = game.getPermanent(sourceId);
+			if (!player.chooseUse(this.effects.get(0).getOutcome(), "Use " + this.getRule() + " ability from " + permanent.getName() + "?", game)) {
+				return false;
+			}
+		}
+		return super.resolve(game);
+	}
+}

Mage/src/mage/abilities/common/ActivateOncePerTurnActivatedAbility.java

@@ -0,0 +1,68 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.common;
+
+import java.util.UUID;
+import mage.Constants.Zone;
+import mage.abilities.ActivatedAbilityImpl;
+import mage.abilities.costs.Cost;
+import mage.abilities.effects.Effect;
+import mage.game.Game;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class ActivateOncePerTurnActivatedAbility extends ActivatedAbilityImpl {
+
+	public ActivateOncePerTurnActivatedAbility(Zone zone, Effect effect, Cost cost) {
+		super(zone, effect, cost);
+	}
+
+	@Override
+	public boolean canActivate(UUID playerId, Game game) {
+		if (isActivated(game))
+			return false;
+		return super.canActivate(playerId, game);
+	}
+
+	@Override
+	public boolean resolve(Game game) {
+		if (super.resolve(game)) {
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public String getRule() {
+		return super.getRule() + " Activate this ability only once each turn.";
+	}
+
+}

Mage/src/mage/abilities/common/AsRequiredTriggeredAbility.java

@@ -0,0 +1,50 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.common;
+
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class AsRequiredTriggeredAbility extends TriggeredAbilityImpl {
+
+	public AsRequiredTriggeredAbility(Effect effect) {
+		super(null, effect);
+
+	}
+
+	@Override
+	public void handleEvent(GameEvent event, Game game) {
+	}
+}

Mage/src/mage/abilities/common/CantCounterAbility.java

@@ -0,0 +1,49 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.common;
+
+import mage.Constants.Zone;
+import mage.abilities.StaticAbility;
+import mage.abilities.effects.common.CantCounterSourceEffect;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class CantCounterAbility extends StaticAbility {
+
+	public CantCounterAbility() {
+		super(Zone.STACK, new CantCounterSourceEffect());
+	}
+
+	@Override
+	public String getRule() {
+		return "{this} can't be countered";
+	}
+}

Mage/src/mage/abilities/common/CreateTokenActivatedAbility.java

@@ -0,0 +1,47 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.common;
+
+import mage.Constants.Zone;
+import mage.abilities.ActivatedAbilityImpl;
+import mage.abilities.costs.Cost;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.game.permanent.token.Token;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class CreateTokenActivatedAbility extends ActivatedAbilityImpl {
+
+	public CreateTokenActivatedAbility(Zone zone, Token token, Cost cost) {
+		super(zone, new CreateTokenEffect(token), cost);
+	}
+
+}

Mage/src/mage/abilities/common/EntersBattlefieldStaticAbility.java

@@ -0,0 +1,45 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.common;
+
+import mage.Constants.Zone;
+import mage.abilities.StaticAbility;
+import mage.abilities.effects.EntersBattlefieldEffect;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class EntersBattlefieldStaticAbility extends StaticAbility {
+
+	public EntersBattlefieldStaticAbility(EntersBattlefieldEffect effect) {
+		super(Zone.BATTLEFIELD, effect);
+	}
+
+}

Mage/src/mage/abilities/common/EntersBattlefieldTriggeredAbility.java

@@ -0,0 +1,63 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.common;
+
+import mage.Constants.Zone;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.events.ZoneChangeEvent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class EntersBattlefieldTriggeredAbility extends TriggeredAbilityImpl {
+
+	public EntersBattlefieldTriggeredAbility(Effect effect, boolean optional) {
+		super(Zone.BATTLEFIELD, effect, optional);
+	}
+
+	@Override
+	public void handleEvent(GameEvent event, Game game) {
+		if (event.getType() == EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId()) ) {
+			ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
+			if (zEvent.getToZone() == Zone.BATTLEFIELD)
+				trigger(game, this.controllerId);
+		}
+	}
+
+	@Override
+	public String getRule() {
+		return "When {this} enters the battlefield, " + super.getRule();
+	}
+
+}

Mage/src/mage/abilities/common/LandfallAbility.java

@@ -0,0 +1,67 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.common;
+
+import mage.Constants.CardType;
+import mage.Constants.Zone;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.events.ZoneChangeEvent;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class LandfallAbility extends TriggeredAbilityImpl {
+
+	public LandfallAbility(Effect effect, boolean optional) {
+		super(Zone.BATTLEFIELD, effect, optional);
+	}
+
+	@Override
+	public void handleEvent(GameEvent event, Game game) {
+		if (event.getType() == EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).getToZone() == Zone.BATTLEFIELD) {
+			Permanent permanent = game.getPermanent(event.getTargetId());
+			if (permanent != null && permanent.getCardType().contains(CardType.LAND) && permanent.getControllerId().equals(this.controllerId))
+				trigger(game, this.controllerId);
+		}
+	}
+
+	@Override
+	public String getRule() {
+		return "Landfall - Whenever a land enters the battlefield under your control, " + (optional?" you may ":"") + super.getRule();
+	}
+
+
+
+}

Mage/src/mage/abilities/common/LeavesBattlefieldTriggeredAbility.java

@@ -0,0 +1,63 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.common;
+
+import mage.Constants.Zone;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.events.ZoneChangeEvent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class LeavesBattlefieldTriggeredAbility extends TriggeredAbilityImpl {
+
+	public LeavesBattlefieldTriggeredAbility(Effect effect, boolean optional) {
+		super(Zone.BATTLEFIELD, effect, optional);
+	}
+
+	@Override
+	public void handleEvent(GameEvent event, Game game) {
+		if (event.getType() == EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId()) ) {
+			ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
+			if (zEvent.getFromZone() == Zone.BATTLEFIELD)
+				trigger(game, this.controllerId);
+		}
+	}
+
+	@Override
+	public String getRule() {
+		return "When {this} leaves the battlefield, " + super.getRule();
+	}
+
+}

Mage/src/mage/abilities/common/OnEventTriggeredAbility.java

@@ -0,0 +1,75 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.common;
+
+import mage.Constants.Zone;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class OnEventTriggeredAbility extends TriggeredAbilityImpl {
+
+	private EventType eventType;
+	private String eventName;
+	private boolean allPlayers = false;
+
+	public OnEventTriggeredAbility(EventType eventType, String eventName, Effect effect) {
+		super(Zone.BATTLEFIELD, effect);
+		this.eventType = eventType;
+		this.eventName = eventName;
+	}
+
+	public OnEventTriggeredAbility(EventType eventType, String eventName, boolean allPlayers, Effect effect) {
+		super(Zone.BATTLEFIELD, effect);
+		this.eventType = eventType;
+		this.eventName = eventName;
+		this.allPlayers = allPlayers;
+	}
+
+	@Override
+	public void handleEvent(GameEvent event, Game game) {
+		if (event.getType() == eventType) {
+			if (allPlayers || event.getPlayerId().equals(this.controllerId) ) {
+				trigger(game, this.controllerId);
+			}
+		}
+	}
+
+	@Override
+	public String getRule() {
+		return "At the " + eventName + ", " + super.getRule();
+	}
+
+}

Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java

@@ -0,0 +1,63 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.common;
+
+import mage.Constants.Zone;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.events.ZoneChangeEvent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class PutIntoGraveFromBattlefieldTriggeredAbility extends TriggeredAbilityImpl {
+
+	public PutIntoGraveFromBattlefieldTriggeredAbility(Effect effect, boolean optional) {
+		super(Zone.GRAVEYARD, effect, optional);
+	}
+
+	@Override
+	public void handleEvent(GameEvent event, Game game) {
+		if (event.getType() == EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId()) ) {
+			ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
+			if (zEvent.getFromZone() == Zone.BATTLEFIELD && zEvent.getToZone() == Zone.GRAVEYARD)
+				trigger(game, event.getPlayerId());
+		}
+	}
+
+	@Override
+	public String getRule() {
+		return "When {this} is put into a graveyard from the battlefield, " + super.getRule();
+	}
+
+}

Mage/src/mage/abilities/common/SimpleActivatedAbility.java

@@ -0,0 +1,46 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.common;
+
+import mage.Constants.Zone;
+import mage.abilities.ActivatedAbilityImpl;
+import mage.abilities.costs.Cost;
+import mage.abilities.effects.Effect;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class SimpleActivatedAbility extends ActivatedAbilityImpl {
+
+	public SimpleActivatedAbility(Zone zone, Effect effect, Cost cost) {
+		super(zone, effect, cost);
+	}
+	
+}

Mage/src/mage/abilities/common/SimpleStaticAbility.java

@@ -0,0 +1,45 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.common;
+
+import mage.Constants.Zone;
+import mage.abilities.StaticAbility;
+import mage.abilities.effects.Effect;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class SimpleStaticAbility extends StaticAbility {
+
+	public SimpleStaticAbility(Zone zone, Effect effect) {
+		super(zone, effect);
+	}
+
+}

Mage/src/mage/abilities/common/SimpleTriggeredAbility.java

@@ -0,0 +1,57 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.common;
+
+import mage.Constants.Zone;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class SimpleTriggeredAbility extends TriggeredAbilityImpl {
+
+	EventType eventType;
+
+	public SimpleTriggeredAbility(Zone zone, EventType eventType, Effect effect) {
+		super(zone, effect);
+		this.eventType = eventType;
+	}
+
+	@Override
+	public void handleEvent(GameEvent event, Game game) {
+		if (event.getType() == eventType) {
+			trigger(game, event.getPlayerId());
+		}
+	}
+}

Mage/src/mage/abilities/costs/AbstractCosts.java

@@ -0,0 +1,136 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.costs.mana.ManaCosts;
+import mage.game.Game;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public abstract class AbstractCosts<T extends Cost> extends ArrayList<T> implements Costs<T> {
+
+	private Ability ability;
+
+	public AbstractCosts(Ability ability) {
+		this.ability = ability;
+	}
+
+	@Override
+	public String getText() {
+		if (this.size() == 0)
+			return "";
+
+		StringBuilder sbText = new StringBuilder();
+		for (T cost: this) {
+			sbText.append(cost.getText());
+			sbText.append(", ");
+		}
+		sbText.setLength(sbText.length() - 2);
+		return sbText.toString();
+	}
+
+	@Override
+	public boolean canPay(UUID playerId, Game game) {
+		for (Cost cost: this) {
+			if (!cost.canPay(playerId, game))
+				return false;
+		}
+		return true;
+	}
+
+	@Override
+	public boolean pay(Game game, boolean noMana) {
+		if (this.size() > 0) {
+			while (!isPaid()) {
+				Cost cost = getFirstUnpaid();
+				if (!cost.pay(game, noMana))
+					return false;
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public boolean isPaid() {
+		for (T cost: this) {
+			if (!cost.isPaid())
+				return false;
+		}
+		return true;
+	}
+
+	@Override
+	public void clearPaid() {
+		for (T cost: this) {
+			cost.clearPaid();
+		}
+	}
+
+	@Override
+	public Ability getAbility() {
+		return ability;
+	}
+
+	@Override
+	public void setAbility(Ability ability) {
+		this.ability = ability;
+		for (T cost: this) {
+			cost.setAbility(ability);
+		}
+	}
+
+	@Override
+	public boolean add(T cost) {
+		cost.setAbility(ability);
+		return super.add(cost);
+	}
+
+	@Override
+	public List<T> getUnpaid() {
+		List<T> unpaid = new ArrayList<T>();
+		for (T cost: this) {
+			if (!cost.isPaid())
+				unpaid.add(cost);
+		}
+		return unpaid;
+	}
+
+	protected T getFirstUnpaid() {
+		if (this.size() > 0) {
+			return this.get(0);
+		}
+		return null;
+ 	}
+}

Mage/src/mage/abilities/costs/Cost.java

@@ -0,0 +1,48 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs;
+
+import java.io.Serializable;
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.game.Game;
+
+public interface Cost extends Serializable {
+
+	public String getText();
+	public boolean canPay(UUID playerId, Game game);
+	public boolean pay(Game game, boolean noMana);
+	public boolean isPaid();
+	public void clearPaid();
+	public void setPaid();
+
+	public Ability getAbility();
+	public void setAbility(Ability ability);
+
+}

Mage/src/mage/abilities/costs/CostImpl.java

@@ -0,0 +1,76 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs;
+
+import mage.abilities.Ability;
+
+public abstract class CostImpl implements Cost {
+
+	protected String text;
+	protected Ability ability;
+	protected boolean paid = false;
+
+//	public CostImpl(Ability ability) {
+//		this.ability = ability;
+//	}
+
+	public CostImpl() {
+	}
+
+	@Override
+	public String getText() {
+		return text;
+	}
+	
+	@Override
+	public Ability getAbility() {
+		return ability;
+	}
+
+	@Override
+	public void setAbility(Ability ability) {
+		this.ability = ability;
+	}
+
+	@Override
+	public boolean isPaid() {
+		return paid;
+	}
+
+	@Override
+	public void clearPaid() {
+		paid = false;
+	}
+
+	@Override
+	public void setPaid() {
+		paid = true;
+	}
+
+}

Mage/src/mage/abilities/costs/Costs.java

@@ -0,0 +1,43 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs;
+
+import java.util.List;
+import mage.abilities.costs.mana.ManaCosts;
+import mage.abilities.costs.mana.VariableManaCost;
+
+public interface Costs<T extends Cost> extends List<T>, Cost {
+	@Override
+	public boolean add(T cost);
+
+	public List<T> getUnpaid();
+	public List<VariableManaCost> getVariableCosts();
+	public ManaCosts getManaCosts();
+
+}

Mage/src/mage/abilities/costs/CostsImpl.java

@@ -0,0 +1,168 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.costs.mana.ManaCost;
+import mage.abilities.costs.mana.ManaCosts;
+import mage.abilities.costs.mana.VariableManaCost;
+import mage.game.Game;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class CostsImpl<T extends Cost> extends ArrayList<T> implements Costs<T> {
+
+	protected Ability ability;
+
+	public CostsImpl() {}
+
+	public CostsImpl(Ability ability) {
+		this.ability = ability;
+	}
+
+	@Override
+	public String getText() {
+		if (this.size() == 0)
+			return "";
+
+		StringBuilder sbText = new StringBuilder();
+		for (T cost: this) {
+			sbText.append(cost.getText());
+			sbText.append(", ");
+		}
+		sbText.setLength(sbText.length() - 2);
+		return sbText.toString();
+	}
+
+	@Override
+	public boolean canPay(UUID playerId, Game game) {
+		for (Cost cost: this) {
+			if (!cost.canPay(playerId, game))
+				return false;
+		}
+		return true;
+	}
+
+	@Override
+	public boolean pay(Game game, boolean noMana) {
+		if (this.size() > 0) {
+			while (!isPaid()) {
+				Cost cost = getFirstUnpaid();
+				if (!cost.pay(game, noMana))
+					return false;
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public boolean isPaid() {
+		for (T cost: this) {
+			if (!(cost instanceof VariableManaCost) && !cost.isPaid())
+				return false;
+		}
+		return true;
+	}
+
+	@Override
+	public void clearPaid() {
+		for (T cost: this) {
+			cost.clearPaid();
+		}
+	}
+
+	@Override
+	public void setPaid() {
+		for (T cost: this) {
+			cost.setPaid();
+		}
+	}
+
+	@Override
+	public Ability getAbility() {
+		return ability;
+	}
+
+	@Override
+	public void setAbility(Ability ability) {
+		this.ability = ability;
+		for (T cost: this) {
+			cost.setAbility(ability);
+		}
+	}
+
+	@Override
+	public boolean add(T cost) {
+		cost.setAbility(ability);
+		return super.add(cost);
+	}
+
+	@Override
+	public Costs<T> getUnpaid() {
+		Costs<T> unpaid = new CostsImpl<T>(ability);
+		for (T cost: this) {
+			if (!cost.isPaid())
+				unpaid.add(cost);
+		}
+		return unpaid;
+	}
+
+	protected T getFirstUnpaid() {
+		Costs<T> unpaid = getUnpaid();
+		if (unpaid.size() > 0) {
+			return unpaid.get(0);
+		}
+		return null;
+ 	}
+
+	@Override
+	public ManaCosts getManaCosts() {
+		ManaCosts manaCosts = new ManaCosts(ability);
+		for (T cost: this) {
+			if (cost instanceof ManaCost)
+				manaCosts.add((ManaCost)cost);
+		}
+		return manaCosts;
+	}
+
+	@Override
+	public List<VariableManaCost> getVariableCosts() {
+		List<VariableManaCost> variableCosts = new ArrayList<VariableManaCost>();
+		for (T cost: this) {
+			if (cost instanceof ManaCosts)
+				variableCosts.addAll(((ManaCosts)cost).getVariableCosts());
+		}
+		return variableCosts;
+	}
+}

Mage/src/mage/abilities/costs/common/PayLifeCost.java

@@ -0,0 +1,60 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs.common;
+
+import java.util.UUID;
+import mage.abilities.costs.CostImpl;
+import mage.game.Game;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class PayLifeCost extends CostImpl {
+
+	private int amount;
+
+	public PayLifeCost(int amount) {
+//		super(ability);
+		this.amount = amount;
+		this.text = "Pay " + Integer.toString(amount) + " life";
+	}
+
+	public boolean canPay(UUID playerId, Game game) {
+		if (ability.getControllerId().equals(playerId))
+			return game.getPlayer(playerId).getLife() >= amount;
+		return false;
+	}
+
+	public boolean pay(Game game, boolean noMana) {
+		this.paid = game.getPlayer(ability.getControllerId()).loseLife(amount, game) == amount;
+		return paid;
+	}
+
+}

Mage/src/mage/abilities/costs/common/PayLoyaltyCost.java

@@ -0,0 +1,68 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs.common;
+
+import java.util.UUID;
+import mage.abilities.costs.CostImpl;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class PayLoyaltyCost extends CostImpl {
+
+	private int amount;
+
+	public PayLoyaltyCost(int amount) {
+		this.amount = amount;
+		this.text = Integer.toString(amount) + " loyalty";
+	}
+
+	@Override
+	public boolean canPay(UUID playerId, Game game) {
+		Permanent planeswalker = game.getPermanent(this.ability.getSourceId());
+		if (planeswalker.getLoyalty().getValue() + amount >= 0 && !planeswalker.isLoyaltyUsed())
+			return true;
+		return false;
+	}
+
+	@Override
+	public boolean pay(Game game, boolean noMana) {
+		Permanent planeswalker = game.getPermanent(this.ability.getSourceId());
+		if (planeswalker.getLoyalty().getValue() + amount > 0 && !planeswalker.isLoyaltyUsed()) {
+			planeswalker.getLoyalty().boostValue(amount);
+			planeswalker.setLoyaltyUsed(true);
+			this.paid = true;
+		}
+		return paid;
+	}
+
+}

Mage/src/mage/abilities/costs/common/SacrificeSourceCost.java

@@ -0,0 +1,63 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs.common;
+
+import java.util.UUID;
+import mage.abilities.costs.CostImpl;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class SacrificeSourceCost extends CostImpl {
+
+	public SacrificeSourceCost() {
+		this.text = "Sacrifice {this}";
+	}
+
+	@Override
+	public boolean pay(Game game, boolean noMana) {
+		Permanent source = game.getPermanent(ability.getSourceId());
+		if (source != null) {
+			paid = source.sacrifice(this.ability.getSourceId(), game);
+		}
+		return paid;
+	}
+
+	public boolean canPay(UUID playerId, Game game) {
+		Permanent source = game.getPermanent(ability.getSourceId());
+		if (source != null) {
+			return true;
+		}
+		return false;
+	}
+
+}

Mage/src/mage/abilities/costs/common/TapSourceCost.java

@@ -0,0 +1,70 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs.common;
+
+import java.util.UUID;
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.costs.CostImpl;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class TapSourceCost extends CostImpl {
+
+	public TapSourceCost() {
+		this.text = "{T}";
+	}
+
+	@Override
+	public boolean pay(Game game, boolean noMana) {
+		Permanent source = game.getPermanent(ability.getSourceId());
+		if (source != null) {
+			paid = source.tap(game);
+		}
+		return paid;
+	}
+
+	public boolean canPay(UUID playerId, Game game) {
+		Permanent source = game.getPermanent(ability.getSourceId());
+		if (source != null) {
+			return !source.isTapped() && source.canTap();
+		}
+		return false;
+	}
+
+	@Override
+	public void setAbility(Ability ability) {
+		this.ability = ability;
+	}
+
+}

Mage/src/mage/abilities/costs/mana/ColoredManaCost.java

@@ -0,0 +1,92 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs.mana;
+
+import mage.Constants.ColoredManaSymbol;
+import mage.Mana;
+import mage.players.ManaPool;
+
+public class ColoredManaCost extends ManaCostImpl implements ManaCost {
+
+	protected ColoredManaSymbol mana;
+
+	public ColoredManaCost(ColoredManaSymbol mana) {
+		this.mana = mana;
+		addColoredOption(mana);
+	}
+
+	public ColoredManaSymbol getMana() {
+		return mana;
+	}
+
+	@Override
+	public int convertedManaCost() {
+		return 1;
+	}
+
+	@Override
+	public boolean isPaid() {
+		if (paid)
+			return true;
+		return this.isColoredPaid(mana);
+	}
+
+	@Override
+	public void assignPayment(ManaPool pool) {
+		this.assignColored(pool, mana);
+	}
+
+	@Override
+	public String getText() {
+		return "{" + mana.toString() + "}";
+	}
+
+	@Override
+	public ColoredManaCost getUnpaid() {
+		return this;
+	}
+
+	@Override
+	public boolean testPay(Mana testMana) {
+		switch (mana) {
+			case B:
+				return testMana.getBlack() > 0;
+			case U:
+				return testMana.getBlue() > 0;
+			case R:
+				return testMana.getRed() > 0;
+			case W:
+				return testMana.getWhite() > 0;
+			case G:
+				return testMana.getGreen() > 0;
+		}
+		return false;
+	}
+
+}

Mage/src/mage/abilities/costs/mana/GenericManaCost.java

@@ -0,0 +1,79 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs.mana;
+
+import mage.Mana;
+import mage.players.ManaPool;
+
+public class GenericManaCost extends ManaCostImpl implements ManaCost {
+
+	protected int mana;
+
+	public GenericManaCost(int mana) {
+		this.mana = mana;
+		this.options.addMana(Mana.ColorlessMana(mana));
+	}
+
+	public int getMana() {
+		return mana;
+	}
+
+	@Override
+	public int convertedManaCost() {
+		return mana;
+	}
+
+	@Override
+	public boolean isPaid() {
+		if (paid)
+			return true;
+		return this.isColorlessPaid(mana);
+	}
+
+	@Override
+	public void assignPayment(ManaPool pool) {
+		this.assignColorless(pool, mana);
+	}
+
+	@Override
+	public String getText() {
+		return "{" + Integer.toString(mana) + "}";
+	}
+
+	@Override
+	public GenericManaCost getUnpaid() {
+		return new GenericManaCost(mana - this.payment.count());
+	}
+
+	@Override
+	public boolean testPay(Mana testMana) {
+		return testMana.count() > 0;
+	}
+
+}

Mage/src/mage/abilities/costs/mana/HybridManaCost.java

@@ -0,0 +1,116 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs.mana;
+
+import mage.Constants.ColoredManaSymbol;
+import mage.Mana;
+import mage.players.ManaPool;
+
+public class HybridManaCost extends ManaCostImpl implements ManaCost {
+	private ColoredManaSymbol mana1;
+	private ColoredManaSymbol mana2;
+
+	public HybridManaCost(ColoredManaSymbol mana1, ColoredManaSymbol mana2) {
+		this.mana1 = mana1;
+		this.mana2 = mana2;
+		addColoredOption(mana1);
+		addColoredOption(mana2);
+	}
+
+	@Override
+	public int convertedManaCost() {
+		return 1;
+	}
+
+	public ColoredManaSymbol getMana1() {
+		return mana1;
+	}
+
+	public ColoredManaSymbol getMana2() {
+		return mana2;
+	}
+
+	@Override
+	public boolean isPaid() {
+		if (paid || isColoredPaid(this.mana1) || isColoredPaid(this.mana2))
+			return true;
+		return false;
+	}
+
+	@Override
+	public void assignPayment(ManaPool pool) {
+		if (assignColored(pool, this.mana1))
+			return;
+		assignColored(pool, this.mana2);
+	}
+
+	@Override
+	public String getText() {
+		return "{" + mana1.toString() + "/" + mana2.toString() + "}";
+	}
+
+	@Override
+	public HybridManaCost getUnpaid() {
+		return this;
+	}
+
+	@Override
+	public boolean testPay(Mana testMana) {
+		switch (mana1) {
+			case B:
+				if (testMana.getBlack() > 0)
+					return true;
+			case U:
+				if (testMana.getBlue() >0)
+					return true;
+			case R:
+				if (testMana.getRed() > 0)
+					return true;
+			case W:
+				if (testMana.getWhite() > 0)
+					return true;
+			case G:
+				if  (testMana.getGreen() > 0)
+					return true;
+		}
+		switch (mana2) {
+			case B:
+				return testMana.getBlack() > 0;
+			case U:
+				return testMana.getBlue() > 0;
+			case R:
+				return testMana.getRed() > 0;
+			case W:
+				return testMana.getWhite() > 0;
+			case G:
+				return testMana.getGreen() > 0;
+		}
+		return false;
+	}
+}

Mage/src/mage/abilities/costs/mana/ManaCost.java

@@ -0,0 +1,47 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs.mana;
+
+import mage.abilities.costs.*;
+import mage.Mana;
+import mage.abilities.mana.ManaOptions;
+import mage.players.ManaPool;
+
+public interface ManaCost extends Cost {
+
+	public int convertedManaCost();
+	public Mana getPayment();
+	public void assignPayment(ManaPool pool);
+	@Override
+	public String getText();
+	public ManaCost getUnpaid();
+	public ManaOptions getOptions();
+	public boolean testPay(Mana testMana);
+	
+}

Mage/src/mage/abilities/costs/mana/ManaCostImpl.java

@@ -0,0 +1,209 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs.mana;
+
+import java.util.UUID;
+import mage.Constants.ColoredManaSymbol;
+import mage.Mana;
+import mage.abilities.costs.CostImpl;
+import mage.abilities.mana.ManaOptions;
+import mage.game.Game;
+import mage.players.ManaPool;
+import mage.players.Player;
+
+public abstract class ManaCostImpl extends CostImpl implements ManaCost {
+
+	protected Mana payment = new Mana();
+	protected ManaOptions options = new ManaOptions();
+
+	public ManaCostImpl() {
+	}
+
+	@Override
+	public Mana getPayment() {
+		return payment;
+	}
+
+	@Override
+	public ManaOptions getOptions() {
+		return options;
+	}
+
+	protected boolean assignColored(ManaPool pool, ColoredManaSymbol mana) {
+		switch (mana) {
+			case B:
+				if (pool.getBlack() > 0) {
+					this.payment.addBlack();
+					pool.removeBlack();
+					return true;
+				}
+				break;
+			case U:
+				if (pool.getBlue() > 0) {
+					this.payment.addBlue();
+					pool.removeBlue();
+					return true;
+				}
+				break;
+			case W:
+				if (pool.getWhite() > 0) {
+					this.payment.addWhite();
+					pool.removeWhite();
+					return true;
+				}
+				break;
+			case G:
+				if (pool.getGreen() > 0) {
+					this.payment.addGreen();
+					pool.removeGreen();
+					return true;
+				}
+				break;
+			case R:
+				if (pool.getRed() > 0) {
+					this.payment.addRed();
+					pool.removeRed();
+					return true;
+				}
+				break;
+		}
+		return false;
+	}
+
+	protected boolean assignColorless(ManaPool pool, int mana) {
+		while (mana > payment.count() && pool.count() > 0) {
+			if (pool.getColorless() > 0) {
+				this.payment.addColorless();
+				pool.removeColorless();
+				continue;
+			}
+			if (pool.getBlack() > 0) {
+				this.payment.addBlack();
+				pool.removeBlack();
+				continue;
+			}
+			if (pool.getBlue() > 0) {
+				this.payment.addBlue();
+				pool.removeBlue();
+				continue;
+			}
+			if (pool.getWhite() > 0) {
+				this.payment.addWhite();
+				pool.removeWhite();
+				continue;
+			}
+			if (pool.getGreen() > 0) {
+				this.payment.addGreen();
+				pool.removeGreen();
+				continue;
+			}
+			if (pool.getRed() > 0) {
+				this.payment.addRed();
+				pool.removeRed();
+				continue;
+			}
+		}
+		return mana > payment.count();
+	}
+
+	protected boolean isColoredPaid(ColoredManaSymbol mana) {
+		switch (mana) {
+			case B:
+				if (this.payment.getBlack() > 0)
+					return true;
+			case U:
+				if (this.payment.getBlue() > 0)
+					return true;
+			case W:
+				if (this.payment.getWhite() > 0)
+					return true;
+			case G:
+				if (this.payment.getGreen() > 0)
+					return true;
+			case R:
+				if (this.payment.getRed() > 0)
+					return true;
+		}
+		return false;
+	}
+
+	protected boolean isColorlessPaid(int mana) {
+		if (this.payment.count() >= mana)
+			return true;
+		return false;
+	}
+
+	@Override
+	public boolean canPay(UUID playerId, Game game) {
+		return true;
+	}
+
+	@Override
+	public boolean pay(Game game, boolean noMana) {
+		if (noMana) {
+			setPaid();
+			return true;
+		}
+		Player player = game.getPlayer(this.getAbility().getControllerId());
+		assignPayment(player.getManaPool());
+		while (!isPaid()) {
+			if (player.playMana(this, game))
+				assignPayment(player.getManaPool());
+			else
+				return false;
+		}
+		return true;
+	}
+
+	@Override
+	public void setPaid() {
+		this.paid = true;
+	}
+
+	protected void addColoredOption(ColoredManaSymbol symbol) {
+		switch (symbol) {
+			case B:
+				this.options.add(Mana.BlackMana);
+				break;
+			case U:
+				this.options.add(Mana.BlueMana);
+				break;
+			case W:
+				this.options.add(Mana.WhiteMana);
+				break;
+			case R:
+				this.options.add(Mana.RedMana);
+				break;
+			case G:
+				this.options.add(Mana.GreenMana);
+				break;
+		}
+	}
+
+}

Mage/src/mage/abilities/costs/mana/ManaCosts.java

@@ -0,0 +1,236 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs.mana;
+
+import java.util.ArrayList;
+import java.util.List;
+import mage.Constants.ColoredManaSymbol;
+import mage.Mana;
+import mage.abilities.Ability;
+import mage.abilities.costs.Costs;
+import mage.abilities.costs.CostsImpl;
+import mage.abilities.mana.ManaOptions;
+import mage.game.Game;
+import mage.players.ManaPool;
+import mage.players.Player;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class ManaCosts extends CostsImpl<ManaCost> implements Costs<ManaCost>, ManaCost {
+
+	public ManaCosts(String mana) {
+		load(mana);
+	}
+
+	public ManaCosts(Ability ability) {
+		super(ability);
+	}
+
+	public ManaCosts(Ability ability, String mana) {
+		super(ability);
+		load(mana);
+	}
+
+	@Override
+	public int convertedManaCost() {
+		int total = 0;
+		for (ManaCost cost: this) {
+			total += cost.convertedManaCost();
+		}
+		return total;
+	}
+
+	@Override
+	public Mana getPayment() {
+		Mana manaTotal = new Mana();
+		for (ManaCost cost: this) {
+			manaTotal.add(cost.getPayment());
+		}
+		return manaTotal;
+	}
+
+	@Override
+	public boolean pay(Game game, boolean noMana) {
+		if (noMana) {
+			setPaid();
+			return true;
+		}
+		Player player = game.getPlayer(this.getAbility().getControllerId());
+		assignPayment(player.getManaPool());
+		while (!isPaid()) {
+			if (player.playMana(this.getUnpaid(), game))
+				assignPayment(player.getManaPool());
+			else
+				return false;
+		}
+		for (ManaCost cost: this.getUnpaidVariableCosts()) {
+			VariableManaCost vCost = (VariableManaCost) cost;
+			while (!vCost.isPaid()) {
+				if (player.playXMana(vCost, game))
+					vCost.assignPayment(player.getManaPool());
+				else
+					return false;
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public ManaCosts getUnpaid() {
+		ManaCosts unpaid = new ManaCosts(ability);
+		for (ManaCost cost: this) {
+			if (!(cost instanceof VariableManaCost) && !cost.isPaid())
+				unpaid.add(cost.getUnpaid());
+		}
+		return unpaid;
+	}
+
+	public ManaCosts getUnpaidVariableCosts() {
+		ManaCosts unpaid = new ManaCosts(ability);
+		for (ManaCost cost: this) {
+			if (cost instanceof VariableManaCost && !cost.isPaid())
+				unpaid.add(cost.getUnpaid());
+		}
+		return unpaid;
+	}
+
+	@Override
+	public List<VariableManaCost> getVariableCosts() {
+		List<VariableManaCost> variableCosts = new ArrayList<VariableManaCost>();
+		for (ManaCost cost: this) {
+			if (cost instanceof VariableManaCost)
+				variableCosts.add((VariableManaCost) cost);
+		}
+		return variableCosts;
+	}
+
+	@Override
+	public void assignPayment(ManaPool pool) {
+		//attempt to pay colored costs first
+		for (ManaCost cost: this) {
+			if (!cost.isPaid() && cost instanceof ColoredManaCost) {
+				cost.assignPayment(pool);
+			}
+		}
+
+		for (ManaCost cost: this) {
+			if (!cost.isPaid() && cost instanceof HybridManaCost) {
+				cost.assignPayment(pool);
+			}
+		}
+
+		for (ManaCost cost: this) {
+			if (!cost.isPaid() && cost instanceof MonoHybridManaCost) {
+				cost.assignPayment(pool);
+			}
+		}
+
+		for (ManaCost cost: this) {
+			if (!cost.isPaid() && cost instanceof GenericManaCost) {
+				cost.assignPayment(pool);
+			}
+		}
+
+		for (ManaCost cost: this) {
+			if (!cost.isPaid() && cost instanceof VariableManaCost) {
+				cost.assignPayment(pool);
+			}
+		}
+	}
+
+	public void load(String mana) {
+		this.clear();
+		if (mana == null || mana.length() == 0)
+			return;
+		String[] symbols = mana.split("^\\{|\\}\\{|\\}$");
+		for (String symbol: symbols) {
+			if (symbol.length() > 0) {
+				if (symbol.length() == 1) {
+					if (Character.isDigit(symbol.charAt(0))) {
+						this.add(new GenericManaCost(Integer.valueOf(symbol)));
+					}
+					else {
+						if (!symbol.equals("X"))
+							this.add(new ColoredManaCost(ColoredManaSymbol.lookup(symbol.charAt(0))));
+						else
+							this.add(new VariableManaCost());
+						//TODO: handle multiple {X} and/or {Y} symbols
+					}
+				}
+				else {
+					if (Character.isDigit(symbol.charAt(0))) {
+						this.add(new MonoHybridManaCost(ColoredManaSymbol.lookup(symbol.charAt(2))));
+					}
+					else {
+						this.add(new HybridManaCost(ColoredManaSymbol.lookup(symbol.charAt(0)), ColoredManaSymbol.lookup(symbol.charAt(2))));
+					}
+				}
+			}
+		}
+	}
+
+	public List<String> getSymbols() {
+		List<String> symbols = new ArrayList<String>();
+		for (ManaCost cost: this) {
+			symbols.add(cost.getText());
+		}
+		return symbols;
+	}
+	
+	@Override
+	public String getText() {
+		if (this.size() == 0)
+			return "";
+
+		StringBuilder sbText = new StringBuilder();
+		for (ManaCost cost: this) {
+			sbText.append(cost.getText());
+		}
+		return sbText.toString();
+	}
+
+	public ManaOptions getOptions() {
+		ManaOptions options = new ManaOptions();
+		for (ManaCost cost: this) {
+			options.addMana(cost.getOptions());
+		}
+		return options;
+	}
+
+	public boolean testPay(Mana testMana) {
+		for (ManaCost cost: this) {
+			if (cost.testPay(testMana))
+				return true;
+		}
+		return false;
+	}
+
+}

Mage/src/mage/abilities/costs/mana/MonoHybridManaCost.java

@@ -0,0 +1,100 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs.mana;
+
+import mage.Constants.ColoredManaSymbol;
+import mage.Mana;
+import mage.players.ManaPool;
+
+public class MonoHybridManaCost extends ManaCostImpl implements ManaCost {
+
+	private ColoredManaSymbol mana;
+	private int mana2 = 2;
+
+	public MonoHybridManaCost(ColoredManaSymbol mana) {
+		this.mana = mana;
+		addColoredOption(mana);
+		options.add(Mana.ColorlessMana(2));
+	}
+
+	@Override
+	public int convertedManaCost() {
+		return 2;
+	}
+
+	public ColoredManaSymbol getMana() {
+		return mana;
+	}
+
+	@Override
+	public boolean isPaid() {
+		if (paid || isColoredPaid(this.mana))
+			return true;
+		return isColorlessPaid(this.mana2);
+	}
+
+	@Override
+	public void assignPayment(ManaPool pool) {
+		if (!assignColored(pool, mana)) {
+			assignColorless(pool, mana2);
+		}
+	}
+
+	@Override
+	public String getText() {
+		return "{2/" + mana.toString() + "}";
+	}
+
+	@Override
+	public MonoHybridManaCost getUnpaid() {
+		return this;
+	}
+
+	public boolean testPay(Mana testMana) {
+		switch (mana) {
+			case B:
+				if (testMana.getBlack() > 0)
+					return true;
+			case U:
+				if (testMana.getBlue() > 0)
+					return true;
+			case R:
+				if (testMana.getRed() > 0)
+					return true;
+			case W:
+				if (testMana.getWhite() > 0)
+					return true;
+			case G:
+				if  (testMana.getGreen() > 0)
+					return true;
+		}
+		return testMana.count() > 0;
+	}
+
+}

Mage/src/mage/abilities/costs/mana/VariableManaCost.java

@@ -0,0 +1,101 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs.mana;
+
+import mage.Mana;
+import mage.players.ManaPool;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class VariableManaCost extends ManaCostImpl implements ManaCost {
+
+	protected Mana manaPaid = new Mana();
+	protected int multiplier;
+
+	public VariableManaCost() {
+		this(1);
+		options.add(new Mana());
+	}
+	
+	public VariableManaCost(int multiplier) {
+		this.multiplier = multiplier;
+	}
+
+	@Override
+	public int convertedManaCost() {
+		return 0;
+	}
+
+	@Override
+	public void assignPayment(ManaPool pool) {
+		manaPaid.add(pool.getMana());
+		pool.emptyPool();
+	}
+
+	@Override
+	public String getText() {
+		if (multiplier > 1) {
+			String symbol = "";
+			for (int i = 0; i < multiplier; i++) {
+				symbol += "{X}";
+			}
+			return symbol;
+		}
+		else {
+			return "{X}";
+		}
+	}
+
+	@Override
+	public VariableManaCost getUnpaid() {
+		return this;
+	}
+
+	@Override
+	public void clearPaid() {
+		paid = false;
+		manaPaid.clear();
+	}
+
+	public Mana getPaid() {
+		return manaPaid;
+	}
+
+	public int getValue() {
+		return manaPaid.count() / multiplier;
+	}
+
+	@Override
+	public boolean testPay(Mana testMana) {
+		return true;
+	}
+	
+}

Mage/src/mage/abilities/effects/ContinuousEffect.java

@@ -0,0 +1,48 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects;
+
+import java.util.Date;
+import mage.Constants.Duration;
+import mage.Constants.Layer;
+import mage.Constants.SubLayer;
+import mage.game.Game;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public interface ContinuousEffect extends Effect {
+
+	public Duration getDuration();
+//	public Layer getLayer();
+//	public SubLayer getSubLayer();
+	public Date getTimestamp();
+	public boolean apply(Layer layer, SubLayer sublayer, Game game);
+}

Mage/src/mage/abilities/effects/ContinuousEffectImpl.java

@@ -0,0 +1,90 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects;
+
+import java.util.Date;
+import mage.Constants.Duration;
+import mage.Constants.Layer;
+import mage.Constants.Outcome;
+import mage.Constants.SubLayer;
+import mage.game.Game;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public abstract class ContinuousEffectImpl extends EffectImpl implements ContinuousEffect {
+
+	protected Duration duration;
+	protected Layer layer;
+	protected SubLayer sublayer;
+	protected Date timestamp = new Date();
+
+	public ContinuousEffectImpl(Duration duration, Outcome outcome) {
+		super(outcome);
+		this.duration = duration;
+	}
+
+	public ContinuousEffectImpl(Duration duration, Layer layer, SubLayer sublayer, Outcome outcome) {
+		super(outcome);
+		this.duration = duration;
+		this.layer = layer;
+		this.sublayer = sublayer;
+	}
+
+	@Override
+	public Duration getDuration() {
+		return duration;
+	}
+
+	@Override
+	public boolean apply(Layer layer, SubLayer sublayer, Game game) {
+		if (this.layer == layer && this.sublayer == sublayer) {
+			return apply(game);
+		}
+		return false;
+	}
+
+//	@Override
+//	public Layer getLayer() {
+//		return layer;
+//	}
+//
+//	@Override
+//	public SubLayer getSubLayer() {
+//		return sublayer;
+//	}
+
+	@Override
+	public Date getTimestamp() {
+		return timestamp;
+	}
+
+
+}

Mage/src/mage/abilities/effects/ContinuousEffects.java

@@ -0,0 +1,299 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Duration;
+import mage.Constants.Layer;
+import mage.Constants.SubLayer;
+import mage.counters.BoostCounter;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class ContinuousEffects implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private List<ContinuousEffect> effects = new ArrayList<ContinuousEffect>();
+
+	public void removeEndOfTurnEffects() {
+		for (Iterator<ContinuousEffect> i = effects.iterator(); i.hasNext();) {
+			ContinuousEffect entry = i.next();
+			if (entry.getDuration() == Duration.EndOfTurn)
+				i.remove();
+		}
+	}
+
+	public void removeInactiveEffects(Game game) {
+		for (Iterator<ContinuousEffect> i = effects.iterator(); i.hasNext();) {
+			ContinuousEffect entry = i.next();
+			if (entry.getDuration() == Duration.WhileInPlay) {
+				Permanent permanent = (Permanent)game.getPermanent(entry.getSource().getSourceId());
+				if (permanent == null || !permanent.isPhasedIn())
+					i.remove();
+			}
+			if (entry.getDuration() == Duration.OneUse) {
+				if (entry instanceof ReplacementEffect) {
+					if (((ReplacementEffect)entry).isUsed())
+						i.remove();
+				}
+			}
+		}
+	}
+
+	private List<ContinuousEffect> getLayeredEffects() {
+		List<ContinuousEffect> layerEffects = new ArrayList<ContinuousEffect>();
+		for (ContinuousEffect effect: effects) {
+			if (!(effect instanceof ReplacementEffect) && !(effect instanceof PreventionEffect)) {
+				layerEffects.add(effect);
+			}
+		}
+		Collections.sort(layerEffects, new TimestampSorter());
+		return layerEffects;
+	}
+
+
+//	private List<ContinuousEffect> getLayer(Layer layer, SubLayer sublayer) {
+//		List<ContinuousEffect> layerEffects = new ArrayList<ContinuousEffect>();
+//		for (ContinuousEffect effect: effects) {
+//			if (effect.getLayer() == layer && effect.getSubLayer() == sublayer) {
+//				layerEffects.add(effect);
+//			}
+//		}
+//		Collections.sort(layerEffects, new TimestampSorter());
+//		return layerEffects;
+//	}
+
+//	private List<PreventionEffect> GetApplicablePreventionEffects(GameEvent event, Game game) {
+//		List<PreventionEffect> effects = new ArrayList<PreventionEffect>();
+//		for (IEffect effect: this) {
+//			if (effect instanceof PreventionEffect && ((PreventionEffect)effect).Applies(event, game)) {
+//				effects.add((PreventionEffect)effect);
+//			}
+//		}
+//		return effects;
+//	}
+
+//	public List<PreventionEffect> GetApplicablePreventionEffects(IMageObject source, IPermanent target, Game game) {
+//		List<PreventionEffect> effects = new ArrayList<PreventionEffect>();
+//		for (IEffect effect: this) {
+//			if (effect instanceof PreventionEffect && ((PreventionEffect)effect).Applies(source, target, game)) {
+//				effects.add((PreventionEffect)effect);
+//			}
+//		}
+//		return effects;
+//	}
+//
+//	public List<PreventionEffect> GetApplicablePreventionEffects(IMageObject source, IPlayer target, Game game) {
+//		List<PreventionEffect> effects = new ArrayList<PreventionEffect>();
+//		for (IEffect effect: this) {
+//			if (effect instanceof PreventionEffect && ((PreventionEffect)effect).Applies(source, target, game)) {
+//				effects.add((PreventionEffect)effect);
+//			}
+//		}
+//		return effects;
+//	}
+
+	private List<ReplacementEffect> getApplicableReplacementEffects(GameEvent event, Game game) {
+		List<ReplacementEffect> replacementEffects = new ArrayList<ReplacementEffect>();
+		for (Effect effect: effects) {
+			if (effect instanceof ReplacementEffect && ((ReplacementEffect)effect).applies(event, game)) {
+				if (((ReplacementEffect)effect).getDuration() != Duration.OneUse || !((ReplacementEffect)effect).isUsed())
+					replacementEffects.add((ReplacementEffect)effect);
+			}
+		}
+		return replacementEffects;
+	}
+
+//	private List<SelfReplacementEffect> GetApplicableSelfReplacementEffects(GameEvent event, Game game) {
+//		List<SelfReplacementEffect> effects = new ArrayList<SelfReplacementEffect>();
+//		for (IEffect effect: this) {
+//			if (effect instanceof SelfReplacementEffect && ((SelfReplacementEffect)effect).Applies(event, game)) {
+//				effects.add((SelfReplacementEffect)effect);
+//			}
+//		}
+//		return effects;
+//	}
+
+	public boolean replaceEvent(GameEvent event, Game game) {
+		boolean caught = false;
+//		List<SelfReplacementEffect> srEffects = GetApplicableSelfReplacementEffects(event, game);
+//
+//		if (srEffects.size() > 0) {
+//			if (srEffects.size() == 1) {
+//				caught = srEffects.get(0).ReplaceEvent(event, game);
+//			}
+//			else {
+//				//TODO: handle multiple
+//			}
+//		}
+
+		if (!caught) {
+			List<ReplacementEffect> rEffects = getApplicableReplacementEffects(event, game);
+			if (rEffects.size() > 0) {
+				if (rEffects.size() == 1) {
+					caught = rEffects.get(0).replaceEvent(event, game);
+				}
+				else {
+					Player player = game.getPlayer(event.getPlayerId());
+					caught = rEffects.get(player.chooseEffect(rEffects, game)).replaceEvent(event, game);
+				}
+			}
+		}
+
+//		if (!caught) {
+//			List<PreventionEffect> pEffects = GetApplicablePreventionEffects(event, game);
+//			if (pEffects.size() > 0) {
+//				if (pEffects.size() == 1) {
+//					caught = pEffects.get(0).ReplaceEvent(event, game);
+//				}
+//				else {
+//					//TODO: handle multiple
+//				}
+//			}
+//		}
+
+		return caught;
+	}
+
+	//20091005 - 613
+	public void apply(Game game) {
+		removeInactiveEffects(game);
+		List<ContinuousEffect> layeredEffects = getLayeredEffects();
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.CopyEffects_1, SubLayer.CharacteristicDefining_7a, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.CopyEffects_1, SubLayer.NA, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.ControlChangingEffects_2, SubLayer.CharacteristicDefining_7a, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.ControlChangingEffects_2, SubLayer.NA, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.TextChangingEffects_3, SubLayer.CharacteristicDefining_7a, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.TextChangingEffects_3, SubLayer.NA, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.TypeChangingEffects_4, SubLayer.CharacteristicDefining_7a, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.TypeChangingEffects_4, SubLayer.NA, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.ColorChangingEffects_5, SubLayer.CharacteristicDefining_7a, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.ColorChangingEffects_5, SubLayer.NA, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.AbilityAddingRemovingEffects_6, SubLayer.CharacteristicDefining_7a, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.PTChangingEffects_7, SubLayer.CharacteristicDefining_7a, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.PTChangingEffects_7, SubLayer.SetPT_7b, game);
+		}
+		applyCounters(game);
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.PTChangingEffects_7, SubLayer.Counters_7d, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.PTChangingEffects_7, SubLayer.SwitchPT_e, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.PlayerEffects, SubLayer.NA, game);
+		}
+		for (ContinuousEffect effect: layeredEffects) {
+			effect.apply(Layer.RulesEffects, SubLayer.NA, game);
+		}
+	}
+
+	protected void applyCounters(Game game) {
+		for (Permanent permanent: game.getBattlefield().getActivePermanents(CardType.CREATURE)) {
+			for (BoostCounter counter: permanent.getCounters().getBoostCounters()) {
+				permanent.addPower(counter.getPower() * counter.getCount());
+				permanent.addToughness(counter.getToughness() * counter.getCount());
+			}
+		}
+	}
+
+	public String getText() {
+		StringBuilder sbText = new StringBuilder();
+		for (ContinuousEffect effect: effects) {
+			sbText.append(effect.getText() + " ");
+		}
+		return sbText.toString();
+	}
+
+	public void addEffect(ContinuousEffect effect) {
+		effects.add(effect);
+	}
+
+	public boolean effectExists(UUID abilityId) {
+		for (ContinuousEffect effect: effects) {
+			if (effect.getSource().getId().equals(abilityId))
+				return true;
+		}
+		return false;
+	}
+
+}
+
+class TimestampSorter implements Comparator<ContinuousEffect> {
+	@Override
+	public int compare(ContinuousEffect one, ContinuousEffect two) {
+		return one.getTimestamp().compareTo(two.getTimestamp());
+	}
+}

Mage/src/mage/abilities/effects/Effect.java

@@ -0,0 +1,50 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects;
+
+import java.io.Serializable;
+import java.util.UUID;
+import mage.Constants.Outcome;
+import mage.abilities.Ability;
+import mage.game.Game;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public interface Effect extends Serializable {
+
+	public UUID getId();
+	public String getText();
+	public boolean apply(Game game);
+	public Ability getSource();
+	public Outcome getOutcome();
+	public void setSource(Ability ability);
+	
+}

Mage/src/mage/abilities/effects/EffectImpl.java

@@ -0,0 +1,75 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects;
+
+import java.util.UUID;
+import mage.Constants.Outcome;
+import mage.abilities.Ability;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public abstract class EffectImpl implements Effect {
+
+	protected UUID id;
+	protected String text = "";
+	protected Ability source;
+	protected Outcome outcome;
+
+	public EffectImpl(Outcome outcome) {
+		this.id = UUID.randomUUID();
+		this.outcome = outcome;
+	}
+	
+	@Override
+	public String getText() {
+		return text;
+	}
+
+	@Override
+	public Ability getSource() {
+		return source;
+	}
+
+	@Override
+	public void setSource(Ability ability) {
+		this.source = ability;
+	}
+
+	@Override
+	public UUID getId() {
+		return id;
+	}
+
+	@Override
+	public Outcome getOutcome() {
+		return outcome;
+	}
+}

Mage/src/mage/abilities/effects/Effects.java

@@ -0,0 +1,75 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects;
+
+import java.util.ArrayList;
+import mage.Constants.Outcome;
+import mage.abilities.Ability;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class Effects extends ArrayList<Effect> {
+
+	private Ability source;
+
+	public Effects(Ability ability) {
+		this.source = ability;
+	}
+
+	public String getText() {
+		StringBuilder sbText = new StringBuilder();
+		for (Effect effect: this) {
+			sbText.append(effect.getText() + ". ");
+		}
+		return sbText.toString();
+	}
+
+	public void setSource(Ability ability) {
+		this.source = ability;
+		for (Effect effect: this) {
+			effect.setSource(ability);
+		}
+	}
+
+	@Override
+	public boolean add(Effect effect) {
+		effect.setSource(source);
+		return super.add(effect);
+	}
+
+	public boolean hasOutcome(Outcome outcome) {
+		for (Effect effect: this) {
+			if (effect.getOutcome() == outcome)
+				return true;
+		}
+		return false;
+	}
+}

Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java

@@ -0,0 +1,98 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects;
+
+import mage.Constants.Duration;
+import mage.Constants.Layer;
+import mage.Constants.SubLayer;
+import mage.Constants.Zone;
+import mage.abilities.Ability;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.events.ZoneChangeEvent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class EntersBattlefieldEffect extends ReplacementEffectImpl {
+
+	protected Effects baseEffects = new Effects(null);
+
+	public EntersBattlefieldEffect(Effect baseEffect) {
+		super(Duration.OneShot, baseEffect.getOutcome());
+		this.baseEffects.add(baseEffect);
+	}
+
+	@Override
+	public boolean applies(GameEvent event, Game game) {
+		if (event.getType() == EventType.ZONE_CHANGE && event.getTargetId().equals(this.source.getSourceId())) {
+			ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
+			if (zEvent.getToZone() == Zone.BATTLEFIELD)
+				return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		for (Effect effect: baseEffects) {
+			if (effect instanceof ContinuousEffect) {
+				game.addEffect((ContinuousEffect) effect);
+			}
+			else
+				effect.apply(game);
+		}
+		return true;
+	}
+
+	@Override
+	public boolean replaceEvent(GameEvent event, Game game) {
+		return apply(game);
+	}
+
+
+	@Override
+	public void setSource(Ability source) {
+		this.source = source;
+		baseEffects.setSource(source);
+	}
+
+	@Override
+	public String getText() {
+		return "When {this} enters the battlefield, " + baseEffects.getText();
+	}
+
+	@Override
+	public boolean apply(Layer layer, SubLayer sublayer, Game game) {
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+}

Mage/src/mage/abilities/effects/OneShotEffect.java

@@ -0,0 +1,43 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects;
+
+import mage.Constants.Outcome;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public abstract class OneShotEffect extends EffectImpl {
+
+	public OneShotEffect(Outcome outcome) {
+		super(outcome);
+	}
+
+}

Mage/src/mage/abilities/effects/ReplacementEffect.java

@@ -0,0 +1,44 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects;
+
+import mage.game.Game;
+import mage.game.events.GameEvent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public interface ReplacementEffect extends ContinuousEffect {
+
+	public boolean replaceEvent(GameEvent event, Game game);
+	public boolean applies(GameEvent event, Game game);
+	boolean isUsed();
+
+}

Mage/src/mage/abilities/effects/ReplacementEffectImpl.java

@@ -0,0 +1,51 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects;
+
+import mage.Constants.Duration;
+import mage.Constants.Outcome;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public abstract class ReplacementEffectImpl extends ContinuousEffectImpl implements ReplacementEffect {
+
+	protected boolean used = false;
+
+	public ReplacementEffectImpl(Duration duration, Outcome outcome) {
+		super(duration, outcome);
+	}
+
+	@Override
+	public boolean isUsed() {
+		return used;
+	}
+
+}

Mage/src/mage/abilities/effects/WhileControlsContinuousEffect.java

@@ -0,0 +1,66 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects;
+
+import mage.Constants.Duration;
+import mage.Constants.Layer;
+import mage.Constants.Outcome;
+import mage.Constants.SubLayer;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.filter.FilterPermanent;
+import mage.game.Game;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public abstract class WhileControlsContinuousEffect extends ContinuousEffectImpl {
+
+	protected FilterPermanent filter;
+	
+	public WhileControlsContinuousEffect(Duration duration, Layer layer, SubLayer sublayer, FilterPermanent filter, Outcome outcome) {
+		super(duration, outcome);
+		this.filter = filter;
+		this.layer = layer;
+		this.sublayer = sublayer;
+	}
+	
+	@Override
+	public boolean apply(Game game) {
+		filter.getControllerId().clear();
+		filter.getControllerId().add(this.source.getControllerId());
+		if (game.getBattlefield().count(filter) > 0) {
+			return applyEffect(game);
+		}
+		return false;
+	}
+
+	protected abstract boolean applyEffect(Game game);
+
+}

Mage/src/mage/abilities/effects/common/AddPlusOneCountersSourceEffect.java

@@ -0,0 +1,67 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Outcome;
+import mage.abilities.effects.OneShotEffect;
+import mage.counters.PlusOneCounter;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class AddPlusOneCountersSourceEffect extends OneShotEffect {
+
+	private int amount;
+
+	public AddPlusOneCountersSourceEffect(int amount) {
+		super(Outcome.BoostCreature);
+		this.amount = amount;
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		Permanent permanent = game.getPermanent(this.source.getSourceId());
+		if (permanent != null) {
+			permanent.getCounters().addCounter(new PlusOneCounter(amount));
+		}
+		return true;
+	}
+
+	@Override
+	public String getText() {
+		if (amount > 1)
+			return "put " + Integer.toString(amount) + " +1/+1 counters on {this}";
+		else
+			return "put a +1/+1 counter on {this}";
+	}
+
+}

Mage/src/mage/abilities/effects/common/BoostControlledEOTEffect.java

@@ -0,0 +1,69 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.CardType;
+import mage.Constants.Duration;
+import mage.Constants.Layer;
+import mage.Constants.Outcome;
+import mage.Constants.SubLayer;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class BoostControlledEOTEffect extends ContinuousEffectImpl {
+
+	private int power;
+	private int toughness;
+
+	public BoostControlledEOTEffect(int power, int toughness) {
+		super(Duration.EndOfTurn, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature);
+		this.power = power;
+		this.toughness = toughness;
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		for (Permanent perm: game.getBattlefield().getActivePermanents(this.source.getControllerId(), CardType.CREATURE)) {
+			perm.addPower(power);
+			perm.addToughness(toughness);
+		}
+		return true;
+	}
+
+	@Override
+	public String getText() {
+		return "Creatures you control get " + String.format("%1$+d/%2$+d", power, toughness) + " until end of turn.";
+	}
+
+}

Mage/src/mage/abilities/effects/common/BoostControlledEffect.java

@@ -0,0 +1,94 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.CardType;
+import mage.Constants.Duration;
+import mage.Constants.Layer;
+import mage.Constants.Outcome;
+import mage.Constants.SubLayer;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class BoostControlledEffect extends ContinuousEffectImpl {
+
+	private int power;
+	private int toughness;
+	protected FilterCreaturePermanent filter;
+
+	public BoostControlledEffect(int power, int toughness, Duration duration) {
+		this(power, toughness, duration, null);
+	}
+
+	public BoostControlledEffect(int power, int toughness, Duration duration, FilterCreaturePermanent filter) {
+		super(duration, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature);
+		this.power = power;
+		this.toughness = toughness;
+		this.filter = filter;
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		if (filter != null) {
+			filter.getControllerId().clear();
+			filter.getControllerId().add(this.source.getControllerId());
+			for (Permanent perm: game.getBattlefield().getActivePermanents(filter)) {
+				perm.addPower(power);
+				perm.addToughness(toughness);
+			}
+		}
+		else {
+			for (Permanent perm: game.getBattlefield().getActivePermanents(this.source.getControllerId(), CardType.CREATURE)) {
+				perm.addPower(power);
+				perm.addToughness(toughness);
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public String getText() {
+		StringBuilder sb = new StringBuilder();
+		if (filter == null)
+			sb.append("Creatures");
+		else
+			sb.append(filter.getMessage());
+		sb.append(" you control get ");
+		sb.append(String.format("%1$+d/%2$+d", power, toughness));
+		sb.append((duration==Duration.EndOfTurn?" until end of turn":""));
+		return sb.toString();
+	}
+
+}

Mage/src/mage/abilities/effects/common/BoostSourceEOTEffect.java

@@ -0,0 +1,70 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Duration;
+import mage.Constants.Layer;
+import mage.Constants.Outcome;
+import mage.Constants.SubLayer;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class BoostSourceEOTEffect extends ContinuousEffectImpl {
+
+	private int power;
+	private int toughness;
+
+	public BoostSourceEOTEffect(int power, int toughness) {
+		super(Duration.EndOfTurn, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature);
+		this.power = power;
+		this.toughness = toughness;
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		Permanent target = (Permanent) game.getPermanent(this.source.getSourceId());
+		if (target != null) {
+			target.addPower(power);
+			target.addToughness(toughness);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public String getText() {
+		return "{this} gets " + String.format("%1$+d/%2$+d", power, toughness) + " until end of turn";
+	}
+
+}

Mage/src/mage/abilities/effects/common/BoostSourceWhileControlsEffect.java

@@ -0,0 +1,69 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.abilities.effects.WhileControlsContinuousEffect;
+import mage.Constants.Duration;
+import mage.Constants.Layer;
+import mage.Constants.Outcome;
+import mage.Constants.SubLayer;
+import mage.filter.FilterPermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class BoostSourceWhileControlsEffect extends WhileControlsContinuousEffect {
+
+	private int power;
+	private int toughness;
+
+	public BoostSourceWhileControlsEffect(FilterPermanent filter, int power, int toughness) {
+		super(Duration.WhileInPlay, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, filter, Outcome.BoostCreature);
+		this.power = power;
+		this.toughness = toughness;
+	}
+
+	@Override
+	protected boolean applyEffect(Game game) {
+		Permanent permanent = game.getPermanent(this.source.getSourceId());
+		if (permanent != null) {
+			permanent.addPower(power);
+			permanent.addToughness(toughness);
+		}
+		return true;
+	}
+
+	@Override
+	public String getText() {
+		return "{this} gets " + String.format("%1$+d/%2$+d", power, toughness) + " as long as you control a " + filter.getName();
+	}
+}

Mage/src/mage/abilities/effects/common/CantCounterControlledEffect.java

@@ -0,0 +1,80 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Duration;
+import mage.Constants.Outcome;
+import mage.abilities.effects.ReplacementEffectImpl;
+import mage.filter.FilterSpell;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.stack.Spell;
+import mage.game.stack.StackObject;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class CantCounterControlledEffect extends ReplacementEffectImpl {
+
+	private FilterSpell filter;
+
+	public CantCounterControlledEffect(FilterSpell filter) {
+		super(Duration.OneShot, Outcome.Benefit);
+		this.filter = filter;
+	}
+
+	public boolean apply(Game game) {
+		return true;
+	}
+
+	public boolean replaceEvent(GameEvent event, Game game) {
+		return true;
+	}
+
+	public boolean applies(GameEvent event, Game game) {
+		if (event.getType() == EventType.COUNTER) {
+			filter.getControllerId().clear();
+			filter.getControllerId().add(this.source.getControllerId());
+			StackObject stackObject = game.getStack().getStackObject(event.getTargetId());
+			if (stackObject instanceof Spell) {
+				if (filter.match((Spell) stackObject))
+					return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public String getText() {
+		return filter.getMessage() + " can't be countered";
+	}
+
+}

Mage/src/mage/abilities/effects/common/CantCounterSourceEffect.java

@@ -0,0 +1,67 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Duration;
+import mage.Constants.Outcome;
+import mage.abilities.effects.ReplacementEffectImpl;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class CantCounterSourceEffect extends ReplacementEffectImpl {
+
+	public CantCounterSourceEffect() {
+		super(Duration.OneShot, Outcome.Benefit);
+	}
+	
+	public boolean apply(Game game) {
+		return true;
+	}
+
+	public boolean replaceEvent(GameEvent event, Game game) {
+		return true;
+	}
+
+	public boolean applies(GameEvent event, Game game) {
+		if (event.getType() == EventType.COUNTER && event.getTargetId().equals(source.getSourceId()))
+			return true;
+		return false;
+	}
+
+	@Override
+	public String getText() {
+		return "{this} can't be countered";
+	}
+
+}

Mage/src/mage/abilities/effects/common/CounterTargetEffect.java

@@ -0,0 +1,54 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Outcome;
+import mage.abilities.effects.OneShotEffect;
+import mage.game.Game;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class CounterTargetEffect extends OneShotEffect {
+
+	public CounterTargetEffect() {
+		super(Outcome.Detriment);
+	}
+
+	public boolean apply(Game game) {
+		return game.getStack().counter(this.source.getFirstTarget(), source.getSourceId(), game);
+	}
+
+	@Override
+	public String getText() {
+		return "Counter target " + this.source.getTargets().get(0).getTargetName();
+	}
+
+}

Mage/src/mage/abilities/effects/common/CreateTokenEffect.java

@@ -0,0 +1,72 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Outcome;
+import mage.abilities.effects.OneShotEffect;
+import mage.game.Game;
+import mage.game.permanent.token.Token;
+import mage.players.Player;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class CreateTokenEffect extends OneShotEffect {
+
+	private Token token;
+	private int amount;
+
+	public CreateTokenEffect(Token token) {
+		this(token, 1);
+	}
+
+	public CreateTokenEffect(Token token, int amount) {
+		super(Outcome.PutCreatureInPlay);
+		this.token = token;
+		this.amount = amount;
+		if (amount == 1) {
+			text = "put a " + token.getDescription();
+		}
+		else {
+			text =  "put " + Integer.toString(amount) + " " + token.getDescription();
+		}
+		text +=  " onto the battlefield";
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		Player controller = game.getPlayer(this.source.getControllerId());
+		for (int i = 0; i < amount; i++) {
+			controller.putOntoBattlefield(token, game);
+		}
+		return true;
+	}
+
+}

Mage/src/mage/abilities/effects/common/DamageTargetEffect.java

@@ -0,0 +1,70 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Outcome;
+import mage.abilities.effects.OneShotEffect;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class DamageTargetEffect extends OneShotEffect {
+
+	protected int amount;
+
+	public DamageTargetEffect(int amount) {
+		super(Outcome.Damage);
+		this.amount = amount;
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		Permanent permanent = game.getPermanent(this.source.getFirstTarget());
+		if (permanent != null) {
+			permanent.damage(amount, this.source.getSourceId(), game);
+			return true;
+		}
+		Player player = game.getPlayer(this.source.getFirstTarget());
+		if (player != null) {
+			player.damage(amount, this.source.getSourceId(), game);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public String getText() {
+		return "{source} deals " + Integer.toString(amount) + " damage to target " + this.source.getTargets().get(0).getTargetName();
+	}
+
+}

Mage/src/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java

@@ -0,0 +1,65 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Outcome;
+import mage.abilities.effects.OneShotEffect;
+import mage.filter.FilterPermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class DestroyAllControlledTargetEffect extends OneShotEffect {
+
+	private FilterPermanent filter;
+
+	public DestroyAllControlledTargetEffect(FilterPermanent filter) {
+		super(Outcome.DestroyPermanent);
+		this.filter = filter;
+	}
+
+	public boolean apply(Game game) {
+		filter.getControllerId().clear();
+		filter.getControllerId().add(this.source.getFirstTarget());
+		filter.setNotController(false);
+		for (Permanent permanent: game.getBattlefield().getActivePermanents(filter)) {
+			permanent.destroy(this.source.getSourceId(), game, false);
+		}
+		return true;
+	}
+
+	@Override
+	public String getText() {
+		return "Destroy all " + filter.getMessage() + " controlled by target player";
+	}
+
+}

Mage/src/mage/abilities/effects/common/DestroyAllEffect.java

@@ -0,0 +1,62 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Outcome;
+import mage.abilities.effects.OneShotEffect;
+import mage.filter.FilterPermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class DestroyAllEffect extends OneShotEffect {
+
+	private FilterPermanent filter;
+
+	public DestroyAllEffect(FilterPermanent filter) {
+		super(Outcome.DestroyPermanent);
+		this.filter = filter;
+	}
+
+	public boolean apply(Game game) {
+		for (Permanent permanent: game.getBattlefield().getActivePermanents(filter)) {
+			permanent.destroy(this.source.getSourceId(), game, false);
+		}
+		return true;
+	}
+
+	@Override
+	public String getText() {
+		return "Destroy all " + filter.getMessage();
+	}
+
+}

Mage/src/mage/abilities/effects/common/DestroyAllNamedPermanentsEffect.java

@@ -0,0 +1,65 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Outcome;
+import mage.abilities.effects.OneShotEffect;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class DestroyAllNamedPermanentsEffect extends OneShotEffect {
+
+	public DestroyAllNamedPermanentsEffect() {
+		super(Outcome.DestroyPermanent);
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		Permanent permanent = game.getPermanent(this.source.getFirstTarget());
+		String name = permanent.getName();
+
+		permanent.destroy(this.source.getSourceId(), game, false);
+		for (Permanent perm: game.getBattlefield().getActivePermanents()) {
+			if (perm.getName().equals(name))
+				perm.destroy(this.source.getSourceId(), game, false);
+		}
+
+		return true;
+	}
+
+	@Override
+	public String getText() {
+		return "Destroy target " + this.source.getTargets().get(0).getTargetName() + " and all other permanents with the same name as that permanent";
+	}
+
+}

Mage/src/mage/abilities/effects/common/DestroyNoRegenTargetEffect.java

@@ -0,0 +1,57 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Outcome;
+import mage.abilities.effects.OneShotEffect;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class DestroyNoRegenTargetEffect extends OneShotEffect {
+
+	public DestroyNoRegenTargetEffect() {
+		super(Outcome.DestroyPermanent);
+	}
+
+	public boolean apply(Game game) {
+		Permanent permanent = game.getPermanent(this.source.getFirstTarget());
+		permanent.destroy(this.source.getSourceId(), game, true);
+		return true;
+	}
+
+	@Override
+	public String getText() {
+		return "Destroy target " + this.source.getTargets().get(0).getTargetName() + ".  It can't be regenerated";
+	}
+
+}

Mage/src/mage/abilities/effects/common/DestroyTargetEffect.java

@@ -0,0 +1,67 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Outcome;
+import mage.abilities.effects.OneShotEffect;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class DestroyTargetEffect extends OneShotEffect {
+
+	protected boolean noRegen;
+
+	public DestroyTargetEffect() {
+		this(false);
+	}
+	
+	public DestroyTargetEffect(boolean noRegen) {
+		super(Outcome.DestroyPermanent);
+		this.noRegen = noRegen;
+	}
+
+	public boolean apply(Game game) {
+		Permanent permanent = game.getPermanent(this.source.getFirstTarget());
+		if (permanent != null) {
+			permanent.destroy(this.source.getSourceId(), game, noRegen);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public String getText() {
+		return "Destroy target " + source.getTargets().get(0).getTargetName();
+	}
+
+}

Mage/src/mage/abilities/effects/common/DiscardTargetEffect.java

@@ -0,0 +1,64 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Outcome;
+import mage.abilities.effects.OneShotEffect;
+import mage.game.Game;
+import mage.players.Player;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class DiscardTargetEffect extends OneShotEffect {
+
+	protected int amount;
+
+	public DiscardTargetEffect(int amount) {
+		super(Outcome.Discard);
+		this.amount = amount;
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		Player player = game.getPlayer(this.source.getFirstTarget());
+		if (player != null) {
+			player.discard(amount, game);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public String getText() {
+		return "Target player discards " + Integer.toString(amount) + " card" + (amount == 1?"":"s");
+	}
+
+}

Mage/src/mage/abilities/effects/common/EntersBattlefieldTappedEffect.java

@@ -0,0 +1,47 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.abilities.effects.EntersBattlefieldEffect;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class EntersBattlefieldTappedEffect extends EntersBattlefieldEffect {
+
+	public EntersBattlefieldTappedEffect() {
+		super(new TapSourceEffect());
+	}
+
+	@Override
+	public String getText() {
+		return "{this} enters the battlefield tapped";
+	}
+}

Mage/src/mage/abilities/effects/common/ExileSourceEffect.java

@@ -0,0 +1,66 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import java.io.ObjectStreamException;
+import mage.Constants.Outcome;
+import mage.abilities.effects.OneShotEffect;
+import mage.game.Game;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class ExileSourceEffect extends OneShotEffect {
+
+	private static final ExileSourceEffect fINSTANCE =  new ExileSourceEffect();
+
+	private Object readResolve() throws ObjectStreamException {
+		return fINSTANCE;
+	}
+
+	private ExileSourceEffect() {
+		super(Outcome.Exile);
+	}
+	
+	public static ExileSourceEffect getInstance() {
+		return fINSTANCE;
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		//this effect is applied when a spell resolves - see Spell.java
+		return true;
+	}
+
+	@Override
+	public String getText() {
+		return "Exile {this}";
+	}
+}

Mage/src/mage/abilities/effects/common/ExileTargetEffect.java

@@ -0,0 +1,71 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import java.util.UUID;
+import mage.Constants.Outcome;
+import mage.Constants.Zone;
+import mage.abilities.effects.OneShotEffect;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class ExileTargetEffect extends OneShotEffect {
+
+	private String exileZone = null;
+	private UUID exileId = null;
+
+	public ExileTargetEffect(UUID exileId, String exileZone) {
+		this();
+		this.exileZone = exileZone;
+		this.exileId = exileId;
+	}
+
+	public ExileTargetEffect() {
+		super(Outcome.Exile);
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		Permanent permanent = game.getPermanent(this.source.getFirstTarget());
+		if (permanent != null) {
+			return permanent.moveToExile(exileId, exileZone, game);
+		}
+		return false;
+	}
+
+	@Override
+	public String getText() {
+		return "Exile target " + this.source.getTargets().get(0).getTargetName();
+	}
+
+}

Mage/src/mage/abilities/effects/common/GainAbilityControlledEOTEffect.java

@@ -0,0 +1,67 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.CardType;
+import mage.Constants.Duration;
+import mage.Constants.Layer;
+import mage.Constants.Outcome;
+import mage.Constants.SubLayer;
+import mage.abilities.Ability;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class GainAbilityControlledEOTEffect extends ContinuousEffectImpl {
+
+	protected Ability ability;
+
+	public GainAbilityControlledEOTEffect(Ability ability) {
+		super(Duration.EndOfTurn, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility);
+		this.ability = ability;
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		for (Permanent perm: game.getBattlefield().getActivePermanents(this.source.getControllerId(), CardType.CREATURE)) {
+			perm.addAbility(ability);
+		}
+		return true;
+	}
+
+	@Override
+	public String getText() {
+		return "Creatures you control gain " + ability.getRule() + " until end of turn";
+	}
+
+}

Mage/src/mage/abilities/effects/common/GainAbilityTargetEOTEffect.java

@@ -0,0 +1,69 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.CardType;
+import mage.Constants.Duration;
+import mage.Constants.Layer;
+import mage.Constants.Outcome;
+import mage.Constants.SubLayer;
+import mage.abilities.Ability;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class GainAbilityTargetEOTEffect extends ContinuousEffectImpl {
+
+	private Ability ability;
+
+	public GainAbilityTargetEOTEffect(Ability ability) {
+		super(Duration.EndOfTurn, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility);
+		this.ability = ability;
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		Permanent permanent = game.getPermanent(this.source.getFirstTarget());
+		if (permanent != null) {
+			permanent.addAbility(ability);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public String getText() {
+		return "Target creature gains " + ability.getRule() + " until end of turn";
+	}
+
+}

Mage/src/mage/abilities/effects/common/GainControlTargetEOTEffect.java

@@ -0,0 +1,62 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Duration;
+import mage.Constants.Layer;
+import mage.Constants.Outcome;
+import mage.Constants.SubLayer;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class GainControlTargetEOTEffect extends ContinuousEffectImpl {
+
+	public GainControlTargetEOTEffect() {
+		super(Duration.EndOfTurn, Layer.ControlChangingEffects_2, SubLayer.NA, Outcome.GainControl);
+	}
+
+	public boolean apply(Game game) {
+		Permanent permanent = game.getPermanent(this.source.getFirstTarget());
+		if (permanent != null) {
+			permanent.setControllerId(this.source.getControllerId());
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public String getText() {
+		return "Gain control of target " + this.source.getTargets().get(0).getTargetName() + " until end of turn";
+	}
+}

Mage/src/mage/abilities/effects/common/GainLifeEffect.java

@@ -0,0 +1,63 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Outcome;
+import mage.abilities.effects.OneShotEffect;
+import mage.game.Game;
+import mage.players.Player;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class GainLifeEffect extends OneShotEffect {
+
+	private int life;
+
+	public GainLifeEffect(int life) {
+		super(Outcome.GainLife);
+		this.life = life;
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		Player player = game.getPlayer(this.source.getControllerId());
+		if (player != null) {
+			player.gainLife(life, game);
+		}
+		return false;
+	}
+
+	@Override
+	public String getText() {
+		return "you gain " + Integer.toString(life) + " life";
+	}
+
+}

Mage/src/mage/abilities/effects/common/ManaEffect.java

@@ -0,0 +1,63 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Outcome;
+import mage.Mana;
+import mage.abilities.effects.OneShotEffect;
+import mage.game.Game;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class ManaEffect extends OneShotEffect {
+
+	protected Mana mana;
+
+	public ManaEffect(Mana mana) {
+		super(Outcome.PutManaInPool);
+		this.mana = mana;
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		game.getPlayer(this.source.getControllerId()).getManaPool().changeMana(mana);
+		return true;
+	}
+
+	@Override
+	public String getText() {
+		return "Add " + mana.toString() + " to your mana pool";
+	}
+
+	public Mana getMana() {
+		return mana;
+	}
+}

Mage/src/mage/abilities/effects/common/PlayTargetWithoutPayingManaEffect.java

@@ -0,0 +1,58 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Outcome;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.Card;
+import mage.game.Game;
+import mage.players.Player;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class PlayTargetWithoutPayingManaEffect extends OneShotEffect {
+
+	private Card target;
+
+	public PlayTargetWithoutPayingManaEffect() {
+		super(Outcome.GainControl);
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		Player controller = game.getPlayer(this.source.getControllerId());
+		return controller.cast(target, game, true);
+	}
+
+	public void setTarget(Card card) {
+		this.target = card;
+	}
+}

Mage/src/mage/abilities/effects/common/ReturnFromExileEffect.java

@@ -0,0 +1,92 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import java.util.UUID;
+import mage.Constants.Outcome;
+import mage.Constants.Zone;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.Card;
+import mage.game.Game;
+import mage.players.Player;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class ReturnFromExileEffect extends OneShotEffect {
+
+	private UUID exileId;
+	private Zone zone;
+
+	public ReturnFromExileEffect(UUID exileId, Zone zone) {
+		super(Outcome.PutCardInPlay);
+		this.exileId = exileId;
+		this.zone = zone;
+	}
+
+	public boolean apply(Game game) {
+		Player player;
+		for (Card card: game.getExile().getExileZone(exileId).values()) {
+			player = game.getPlayer(card.getOwnerId());
+			switch(zone) {
+				case BATTLEFIELD:
+					player.putOntoBattlefield(card, game);
+					break;
+				case HAND:
+					player.putInHand(card, game);
+					break;
+				case GRAVEYARD:
+					player.putInGraveyard(card, game, false);
+					break;
+			}
+		}
+		game.getExile().getExileZone(exileId).clear();
+		return true;
+	}
+
+	@Override
+	public String getText() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("return the exiled cards ");
+		switch(zone) {
+			case BATTLEFIELD:
+				sb.append("to the battlefield under its owner's control");
+				break;
+			case HAND:
+				sb.append("to their owner's hand");
+				break;
+			case GRAVEYARD:
+				sb.append("to their owner's graveyard");
+				break;
+		}
+		return sb.toString();
+	}
+
+}

Mage/src/mage/abilities/effects/common/SearchLibraryPutInPlayEffect.java

@@ -0,0 +1,112 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import java.util.UUID;
+import mage.Constants.Outcome;
+import mage.abilities.Ability;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.Card;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.common.TargetCardInLibrary;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class SearchLibraryPutInPlayEffect extends OneShotEffect {
+
+	private TargetCardInLibrary target;
+	private boolean tapped;
+
+	public SearchLibraryPutInPlayEffect(TargetCardInLibrary target) {
+		this(target, false, Outcome.PutCardInPlay);
+	}
+	
+	public SearchLibraryPutInPlayEffect(TargetCardInLibrary target, boolean tapped) {
+		this(target, tapped, Outcome.PutCardInPlay);
+	}
+
+	public SearchLibraryPutInPlayEffect(TargetCardInLibrary target, boolean tapped, Outcome outcome) {
+		super(outcome);
+		this.target = target;
+		this.tapped = tapped;
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		Player player = game.getPlayer(this.source.getControllerId());
+		player.searchLibrary(target, game);
+		if (target.getTargets().size() > 0) {
+			for (UUID cardId: target.getTargets()) {
+				Card card = player.getLibrary().remove(cardId);
+				if (card != null) {
+					if (player.putOntoBattlefield(card, game)) {
+						if (tapped) {
+							Permanent permanent = game.getPermanent(card.getId());
+							if (permanent != null)
+								permanent.setTapped(true);
+						}
+					}
+				}
+			}
+			player.shuffleLibrary(game);
+		}
+		return true;
+	}
+
+	@Override
+	public String getText() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("Search your library for ");
+		if (target.getNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) {
+			sb.append("up to ");
+			sb.append(target.getMaxNumberOfTargets());
+			sb.append(" ");
+			sb.append(target.getTargetName());
+			sb.append(", and put them onto the battlefield");
+		}
+		else {
+			sb.append("a ");
+			sb.append(target.getTargetName());
+			sb.append(", and put it onto the battlefield");
+		}
+		sb.append(". Then shuffle your library");
+		return sb.toString();
+	}
+
+	@Override
+	public void setSource(Ability ability) {
+		super.setSource(ability);
+		target.setAbility(ability);
+	}
+
+}

Mage/src/mage/abilities/effects/common/SearchLibraryRevealPutInHandEffect.java

@@ -0,0 +1,101 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ * 
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ * 
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ * 
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ * 
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+
+package mage.abilities.effects.common;
+
+import java.util.UUID;
+import mage.Constants.Outcome;
+import mage.Constants.Zone;
+import mage.abilities.Ability;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.Card;
+import mage.cards.Cards;
+import mage.cards.CardsImpl;
+import mage.game.Game;
+import mage.players.Player;
+import mage.target.common.TargetCardInLibrary;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class SearchLibraryRevealPutInHandEffect extends OneShotEffect {
+
+	private TargetCardInLibrary target;
+
+	public SearchLibraryRevealPutInHandEffect(TargetCardInLibrary target) {
+		super(Outcome.DrawCard);
+		this.target = target;
+	}
+
+	@Override
+	public boolean apply(Game game) {
+		Player player = game.getPlayer(this.source.getControllerId());
+		player.searchLibrary(target, game);
+		if (target.getTargets().size() > 0) {
+			Cards revealed = new CardsImpl(Zone.REVEALED);
+			for (UUID cardId: target.getTargets()) {
+				Card card = player.getLibrary().remove(cardId);
+				if (card != null) {
+					player.putInHand(card, game);
+				}
+			}
+			player.shuffleLibrary(game);
+			player.revealCards(revealed, game);
+		}
+		return true;
+	}
+
+	@Override
+	public String getText() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("Search your library for ");
+		if (target.getNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) {
+			sb.append("up to ");
+			sb.append(target.getMaxNumberOfTargets());
+			sb.append(" ");
+			sb.append(target.getTargetName());
+			sb.append(", reveal them, and put them into your hand");
+		}
+		else {
+			sb.append("a ");
+			sb.append(target.getTargetName());
+			sb.append(", reveal that card, and put it into your hand");
+		}
+		sb.append(". Then shuffle your library");
+
+		return sb.toString();
+	}
+
+	@Override
+	public void setSource(Ability ability) {
+		super.setSource(ability);
+		target.setAbility(ability);
+	}
+
+}

Mage/src/mage/abilities/effects/common/SkipNextUntapTargetEffect.java

@@ -0,0 +1,71 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.effects.common;
+
+import mage.Constants.Duration;
+import mage.Constants.Outcome;
+import mage.Constants.PhaseStep;
+import mage.abilities.effects.ReplacementEffectImpl;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class SkipNextUntapTargetEffect extends ReplacementEffectImpl {
+
+	public SkipNextUntapTargetEffect() {
+		super(Duration.OneUse, Outcome.Detriment);
+	}
+
+	public boolean apply(Game game) {
+		return false;
+	}
+
+	public boolean replaceEvent(GameEvent event, Game game) {
+		return true;
+	}
+
+	public boolean applies(GameEvent event, Game game) {
+		if (game.getStep() == PhaseStep.UNTAP &&
+				event.getType() == EventType.UNTAP &&
+				event.getSourceId().equals(source.getFirstTarget())) {
+			used = true;
+		}
+		return used;
+	}
+
+	@Override
+	public String getText() {
+		return "Target " + source.getTargets().get(0).getTargetName() + " doesn't untap during its controller's next untap step";
+	}
+
+}