Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update painlands to use better mana abilities #12871

Merged
merged 2 commits into from
Sep 15, 2024
Merged

Update painlands to use better mana abilities #12871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
200c469
Update painlands to use simpler tapping
Dunkoro Sep 14, 2024
984e040
Optimise imports
Dunkoro Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions Mage.Sets/src/mage/cards/a/AdarkarWastes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
package mage.cards.a;

import java.util.UUID;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.DamageControllerEffect;
import mage.abilities.mana.ColorlessManaAbility;
import mage.abilities.mana.SimpleManaAbility;
import mage.abilities.mana.*;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Zone;

/**
*
Expand All @@ -24,10 +20,10 @@ public AdarkarWastes(UUID ownerId, CardSetInfo setInfo) {

this.addAbility(new ColorlessManaAbility());

Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new TapSourceCost());
Ability whiteManaAbility = new WhiteManaAbility();
whiteManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(whiteManaAbility);
Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new TapSourceCost());
Ability blueManaAbility = new BlueManaAbility();
blueManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(blueManaAbility);
}
Expand Down
10 changes: 3 additions & 7 deletions Mage.Sets/src/mage/cards/b/BattlefieldForge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
package mage.cards.b;

import java.util.UUID;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.DamageControllerEffect;
import mage.abilities.mana.ColorlessManaAbility;
import mage.abilities.mana.SimpleManaAbility;
import mage.abilities.mana.*;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Zone;

/**
*
Expand All @@ -26,10 +22,10 @@ public BattlefieldForge(UUID ownerId, CardSetInfo setInfo) {
this.addAbility(new ColorlessManaAbility());

// Tap: Add Red or White. Battlefield Forge deals 1 damage to you.
Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new TapSourceCost());
Ability redManaAbility = new RedManaAbility();
redManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(redManaAbility);
Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new TapSourceCost());
Ability whiteManaAbility = new WhiteManaAbility();
whiteManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(whiteManaAbility);
}
Expand Down
10 changes: 3 additions & 7 deletions Mage.Sets/src/mage/cards/b/Brushland.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
package mage.cards.b;

import java.util.UUID;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.DamageControllerEffect;
import mage.abilities.mana.ColorlessManaAbility;
import mage.abilities.mana.SimpleManaAbility;
import mage.abilities.mana.*;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Zone;

/**
*
Expand All @@ -23,10 +19,10 @@ public Brushland(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
this.addAbility(new ColorlessManaAbility());

Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new TapSourceCost());
Ability greenManaAbility = new GreenManaAbility();
greenManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(greenManaAbility);
Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new TapSourceCost());
Ability whiteManaAbility = new WhiteManaAbility();
whiteManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(whiteManaAbility);
}
Expand Down
10 changes: 3 additions & 7 deletions Mage.Sets/src/mage/cards/c/CavesOfKoilos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
package mage.cards.c;

import java.util.UUID;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.DamageControllerEffect;
import mage.abilities.mana.ColorlessManaAbility;
import mage.abilities.mana.SimpleManaAbility;
import mage.abilities.mana.*;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Zone;

/**
*
Expand All @@ -27,10 +23,10 @@ public CavesOfKoilos(UUID ownerId, CardSetInfo setInfo) {
this.addAbility(new ColorlessManaAbility());

// Tap: Add White or Black. Caves of Koilos deals 1 damage to you.
Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new TapSourceCost());
Ability whiteManaAbility = new WhiteManaAbility();
whiteManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(whiteManaAbility);
Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new TapSourceCost());
Ability blackManaAbility = new BlackManaAbility();
blackManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(blackManaAbility);
}
Expand Down
10 changes: 3 additions & 7 deletions Mage.Sets/src/mage/cards/k/KarplusanForest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
package mage.cards.k;

import java.util.UUID;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.DamageControllerEffect;
import mage.abilities.mana.ColorlessManaAbility;
import mage.abilities.mana.SimpleManaAbility;
import mage.abilities.mana.*;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Zone;

/**
*
Expand All @@ -24,10 +20,10 @@ public KarplusanForest(UUID ownerId, CardSetInfo setInfo) {

this.addAbility(new ColorlessManaAbility());

Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new TapSourceCost());
Ability redManaAbility = new RedManaAbility();
redManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(redManaAbility);
Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new TapSourceCost());
Ability greenManaAbility = new GreenManaAbility();
greenManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(greenManaAbility);
}
Expand Down
10 changes: 3 additions & 7 deletions Mage.Sets/src/mage/cards/l/LlanowarWastes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
package mage.cards.l;

import java.util.UUID;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.DamageControllerEffect;
import mage.abilities.mana.ColorlessManaAbility;
import mage.abilities.mana.SimpleManaAbility;
import mage.abilities.mana.*;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Zone;

/**
*
Expand All @@ -26,10 +22,10 @@ public LlanowarWastes(UUID ownerId, CardSetInfo setInfo) {
this.addAbility(new ColorlessManaAbility());

// Tap: Add Black or Green. Llanowar Wastes deals 1 damage to you.
Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new TapSourceCost());
Ability blackManaAbility = new BlackManaAbility();
blackManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(blackManaAbility);
Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new TapSourceCost());
Ability greenManaAbility = new GreenManaAbility();
greenManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(greenManaAbility);
}
Expand Down
10 changes: 3 additions & 7 deletions Mage.Sets/src/mage/cards/s/ShivanReef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
package mage.cards.s;

import java.util.UUID;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.DamageControllerEffect;
import mage.abilities.mana.ColorlessManaAbility;
import mage.abilities.mana.SimpleManaAbility;
import mage.abilities.mana.*;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Zone;

/**
*
Expand All @@ -26,10 +22,10 @@ public ShivanReef(UUID ownerId, CardSetInfo setInfo) {
this.addAbility(new ColorlessManaAbility());

//Tap: Add Blue or Red. Shivan Reef deals 1 damage to you.
Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new TapSourceCost());
Ability blueManaAbility = new BlueManaAbility();
blueManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(blueManaAbility);
Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new TapSourceCost());
Ability redManaAbility = new RedManaAbility();
redManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(redManaAbility);
}
Expand Down
10 changes: 3 additions & 7 deletions Mage.Sets/src/mage/cards/s/SulfurousSprings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
package mage.cards.s;

import java.util.UUID;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.DamageControllerEffect;
import mage.abilities.mana.ColorlessManaAbility;
import mage.abilities.mana.SimpleManaAbility;
import mage.abilities.mana.*;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Zone;

/**
*
Expand All @@ -24,10 +20,10 @@ public SulfurousSprings(UUID ownerId, CardSetInfo setInfo) {

this.addAbility(new ColorlessManaAbility());

Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new TapSourceCost());
Ability blackManaAbility = new BlackManaAbility();
blackManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(blackManaAbility);
Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new TapSourceCost());
Ability redManaAbility = new RedManaAbility();
redManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(redManaAbility);
}
Expand Down
10 changes: 3 additions & 7 deletions Mage.Sets/src/mage/cards/u/UndergroundRiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
package mage.cards.u;

import java.util.UUID;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.DamageControllerEffect;
import mage.abilities.mana.ColorlessManaAbility;
import mage.abilities.mana.SimpleManaAbility;
import mage.abilities.mana.*;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Zone;

/**
*
Expand All @@ -24,10 +20,10 @@ public UndergroundRiver(UUID ownerId, CardSetInfo setInfo) {

this.addAbility(new ColorlessManaAbility());

Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new TapSourceCost());
Ability blueManaAbility = new BlueManaAbility();
blueManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(blueManaAbility);
Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new TapSourceCost());
Ability blackManaAbility = new BlackManaAbility();
blackManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(blackManaAbility);
}
Expand Down
10 changes: 3 additions & 7 deletions Mage.Sets/src/mage/cards/y/YavimayaCoast.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
package mage.cards.y;

import java.util.UUID;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.DamageControllerEffect;
import mage.abilities.mana.ColorlessManaAbility;
import mage.abilities.mana.SimpleManaAbility;
import mage.abilities.mana.*;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Zone;

/**
*
Expand All @@ -26,10 +22,10 @@ public YavimayaCoast(UUID ownerId, CardSetInfo setInfo) {
this.addAbility(new ColorlessManaAbility());

// Tap: Add Green or Blue. Yavimaya Coast deals 1 damage to you.
Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new TapSourceCost());
Ability greenManaAbility = new GreenManaAbility();
greenManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(greenManaAbility);
Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new TapSourceCost());
Ability blueManaAbility = new BlueManaAbility();
blueManaAbility.addEffect(new DamageControllerEffect(1));
this.addAbility(blueManaAbility);
}
Expand Down
Loading