github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed "getSubtype().contains" to "hasSubtype" where creature types are concerned to support Changeling keyword.

Browse source
This commit is contained in:
LevelX2 2013-01-12 15:23:38 +01:00
parent 6b9a35e0c4
commit 5662fd1145
13 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java
View file

@ -158,7 +158,7 @@ class CavernOfSoulsManaCondition extends CreatureCastManaCondition {
Object value = game.getState().getValue(manaProducer + "_type");
if (value != null && value instanceof String) {
MageObject object = game.getObject(source.getSourceId());
if (object.getSubtype().contains(value)) {
if (object.hasSubtype((String) value)) {
return true;
}
}

2
Mage.Sets/src/mage/sets/avacynrestored/HeraldOfWar.java
View file

@ -109,7 +109,7 @@ class HeraldOfWarCostReductionEffect extends CostModificationEffectImpl<HeraldOf
public boolean applies(Ability abilityToModify, Ability source, Game game) {
if (abilityToModify instanceof SpellAbility) {
Card sourceCard = game.getCard(((SpellAbility) abilityToModify).getSourceId());
if (sourceCard != null && abilityToModify.getControllerId().equals(source.getControllerId()) && (sourceCard.getSubtype().contains("Angel") || sourceCard.getSubtype().contains("Human"))) {
if (sourceCard != null && abilityToModify.getControllerId().equals(source.getControllerId()) && (sourceCard.hasSubtype("Angel") || sourceCard.hasSubtype("Human"))) {
return true;
}
}

2
Mage.Sets/src/mage/sets/avacynrestored/HuntedGhoul.java
View file

@ -114,7 +114,7 @@ class HuntedGhoulEffect extends RestrictionEffect<HuntedGhoulEffect> {
@Override
public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) {
if (attacker != null && attacker.getSubtype().contains("Human")) {
if (attacker != null && attacker.hasSubtype("Human")) {
return false;
}
return true;

2
Mage.Sets/src/mage/sets/betrayersofkamigawa/KentaroTheSmilingCat.java
View file

@ -100,7 +100,7 @@ public class KentaroTheSmilingCat extends CardImpl<KentaroTheSmilingCat> {
SpellAbility spell = (SpellAbility) abilityToModify;
if (spell.getControllerId().equals(source.getControllerId())) {
Card sourceCard = game.getCard(spell.getSourceId());
if (sourceCard != null && sourceCard.getSubtype().contains("Samurai")) {
if (sourceCard != null && sourceCard.hasSubtype("Samurai")) {
String manaCostsString = "{" + sourceCard.getManaCost().convertedManaCost() + "}";
Player player = game.getPlayer(spell.getControllerId());
if (player != null && player.chooseUse(Constants.Outcome.Benefit, "Pay converted mana cost rather than pay the mana cost for Samurai creature?", game)) {

2
Mage.Sets/src/mage/sets/betrayersofkamigawa/UncheckedGrowth.java
View file

@ -89,7 +89,7 @@ public class UncheckedGrowth extends CardImpl<UncheckedGrowth> {
int affectedTargets = 0;
for (UUID permanentId : targetPointer.getTargets(game, source)) {
Permanent permanent = game.getPermanent(permanentId);
if (permanent != null && permanent.getSubtype().contains("Spirit")) {
if (permanent != null && permanent.hasSubtype("Spirit")) {
permanent.addAbility(TrampleAbility.getInstance(), game);
affectedTargets++;
}

2
Mage.Sets/src/mage/sets/championsofkamigawa/SosukeSonOfSeshiro.java
View file

@ -110,7 +110,7 @@ class SosukeSonOfSeshiroTriggeredAbility extends TriggeredAbilityImpl<SosukeSonO
Permanent sourceCreature = game.getPermanent(event.getSourceId());
Permanent targetCreature = game.getPermanent(event.getTargetId());
if (sourceCreature != null && sourceCreature.getControllerId().equals(this.getControllerId())
&& targetCreature != null && sourceCreature.getSubtype().contains("Warrior")) {
&& targetCreature != null && sourceCreature.hasSubtype("Warrior")) {
this.getEffects().get(0).setTargetPointer(new FixedTarget(targetCreature.getId()));
return true;
}

3
Mage.Sets/src/mage/sets/darkascension/Seance.java
View file

@ -98,8 +98,9 @@ class SeanceEffect extends OneShotEffect<SeanceEffect> {
EmptyToken token = new EmptyToken();
CardUtil.copyTo(token).from(card);
if (!token.getSubtype().contains("Spirit"))
if (!token.hasSubtype("Spirit")) {
token.getSubtype().add("Spirit");
}
token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId());
ExileTargetEffect exileEffect = new ExileTargetEffect();

2
Mage.Sets/src/mage/sets/innistrad/RooftopStorm.java
View file

@ -96,7 +96,7 @@ class RooftopStormCostReductionEffect extends CostModificationEffectImpl<Rooftop
SpellAbility spell = (SpellAbility) abilityToModify;
if (spell.getControllerId().equals(source.getControllerId())) {
Card sourceCard = game.getCard(spell.getSourceId());
if (sourceCard != null && sourceCard.getSubtype().contains("Zombie")) {
if (sourceCard != null && sourceCard.hasSubtype("Zombie")) {
Player player = game.getPlayer(spell.getControllerId());
if (player != null && player.chooseUse(Outcome.Benefit, "Pay {0} rather than pay the mana cost for Zombie creature", game)) {
spell.getManaCostsToPay().clear();

2
Mage.Sets/src/mage/sets/innistrad/UndeadAlchemist.java
View file

@ -154,7 +154,7 @@ class UndeadAlchemistEffect extends ReplacementEffectImpl<UndeadAlchemistEffect>
DamagePlayerEvent damageEvent = (DamagePlayerEvent) event;
if (damageEvent.isCombatDamage()) {
Permanent permanent = game.getPermanent(event.getSourceId());
if (permanent != null && permanent.getSubtype().contains("Zombie"))
if (permanent != null && permanent.hasSubtype("Zombie"))
return true;
}
}

2
Mage.Sets/src/mage/sets/worldwake/AgadeemOccultist.java
View file

@ -99,7 +99,7 @@ class AgadeemOccultistEffect extends OneShotEffect<AgadeemOccultistEffect> {
Player you = game.getPlayer(source.getControllerId());
int allycount = 0;
for (Permanent permanent : game.getBattlefield().getAllActivePermanents(source.getControllerId())) {
if (permanent.getSubtype().contains("Ally")) {
if (permanent.hasSubtype("Ally")) {
allycount++;
}
}

2
Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java
View file

@ -102,7 +102,7 @@ class QuestForTheGoblinLordTriggeredAbility extends TriggeredAbilityImpl<QuestFo
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent) event).getToZone() == Constants.Zone.BATTLEFIELD) {
Permanent permanent = game.getPermanent(event.getTargetId());
if (permanent != null && permanent.getSubtype().contains("Goblin") && permanent.getControllerId().equals(super.getControllerId())) {
if (permanent != null && permanent.hasSubtype("Goblin") && permanent.getControllerId().equals(super.getControllerId())) {
return true;
}
}

2
Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java
View file

@ -107,7 +107,7 @@ class TalusPaladinTriggeredAbility extends TriggeredAbilityImpl<TalusPaladinTrig
if (event.getType() == GameEvent.EventType.ZONE_CHANGE) {
Permanent ally = game.getPermanent(event.getTargetId());
if (ally != null) {
if (ally.getSubtype().contains("Ally")
if (ally.hasSubtype("Ally")
&& ally.getControllerId().equals(this.getControllerId())) {
if (event.getTargetId().equals(this.getSourceId())
|| event.getTargetId().equals(ally.getId())) {

2
Mage.Sets/src/mage/sets/worldwake/TuktukScrapper.java
View file

@ -104,7 +104,7 @@ class TuktukScrapperTriggeredAbility extends TriggeredAbilityImpl<TuktukScrapper
return true;
}
if (permanent != null
&& permanent.getSubtype().contains("Ally")
&& permanent.hasSubtype("Ally")
&& permanent.getControllerId().equals(this.getControllerId())) {
return true;
}