github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 19:16:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Flattened out CarnelianOrbOfDragonkind and GeneratorServant to make more readable

Browse source
This commit is contained in:
Alex Vasile 2022-05-30 08:49:25 -06:00
parent 3a58e20adf
commit 178a5bf346
2 changed files with 59 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Mage.Sets/src/mage/cards/c/CarnelianOrbOfDragonkind.java
View file

@ -36,7 +36,6 @@ public final class CarnelianOrbOfDragonkind extends CardImpl {
public CarnelianOrbOfDragonkind(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}{R}");
// {T}: Add {R}. If that mana is spent on a Dragon creature spell, it gains haste until end of turn.
Mana mana = Mana.RedMana(1);
@ -68,14 +67,26 @@ class CarnelianOrbOfDragonkindWatcher extends Watcher {
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.MANA_PAID) {
MageObject target = game.getObject(event.getTargetId());
if (event.getSourceId() != null
&& event.getSourceId().equals(this.getSourceId()) && target != null && target.isCreature(game) && target.hasSubtype(SubType.DRAGON, game) && event.getFlag()) {
if (target instanceof Spell) {
this.creatures.add(((Spell) target).getCard().getId());
}
}
if (event.getType() != GameEvent.EventType.MANA_PAID) {
return;
}
MageObject target = game.getObject(event.getTargetId());
if (target == null || !(target instanceof Spell)) {
return;
}
// Mana from Orb
if (!event.getFlag()) {
return;
}
if (event.getSourceId() == null || !event.getSourceId().equals(this.getSourceId())) {
return;
}
if (target.isCreature(game) && target.hasSubtype(SubType.DRAGON, game)) {
this.creatures.add(((Spell) target).getCard().getId());
}
}
@ -109,15 +120,15 @@ class CarnelianOrbOfDragonkindHasteEffect extends ContinuousEffectImpl {
@Override
public boolean apply(Game game, Ability source) {
CarnelianOrbOfDragonkindWatcher watcher = game.getState().getWatcher(CarnelianOrbOfDragonkindWatcher.class, source.getSourceId());
if (watcher != null) {
for (Permanent perm : game.getBattlefield().getAllActivePermanents()) {
if (watcher.creatureCastWithOrbsMana(perm.getId())) {
perm.addAbility(HasteAbility.getInstance(), source.getSourceId(), game);
}
}
return true;
if (watcher == null) {
return false;
}
return false;
}
for (Permanent perm : game.getBattlefield().getAllActivePermanents()) {
if (watcher.creatureCastWithOrbsMana(perm.getId())) {
perm.addAbility(HasteAbility.getInstance(), source.getSourceId(), game);
}
}
return true;
}
}

48
Mage.Sets/src/mage/cards/g/GeneratorServant.java
View file

@ -37,7 +37,7 @@ public final class GeneratorServant extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(1);
// {T}, Sacrifice Generator Servant: Add {C}{C}. If that mana is spent on a creature spell, it gains haste until end of turn.
// {T}, Sacrifice Generator Servant: Add {C}{C}. If that mana is spent on a creature spell, it gains haste until end of turn.
Mana mana = Mana.ColorlessMana(2);
mana.setFlag(true); // used to indicate this mana ability
SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, mana, new TapSourceCost());
@ -68,14 +68,26 @@ class GeneratorServantWatcher extends Watcher {
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.MANA_PAID) {
MageObject target = game.getObject(event.getTargetId());
if (event.getSourceId() != null
&& event.getSourceId().equals(this.getSourceId()) && target != null && target.isCreature(game) && event.getFlag()) {
if (target instanceof Spell) {
this.creatures.add(((Spell) target).getCard().getId());
}
}
if (event.getType() != GameEvent.EventType.MANA_PAID) {
return;
}
MageObject target = game.getObject(event.getTargetId());
if (target == null || !(target instanceof Spell)) {
return;
}
// Mana from Generator Servant
if (!event.getFlag()) {
return;
}
if (event.getSourceId() == null || !event.getSourceId().equals(this.getSourceId())) {
return;
}
if (target.isCreature(game)) {
this.creatures.add(((Spell) target).getCard().getId());
}
}
@ -109,15 +121,15 @@ class GeneratorServantHasteEffect extends ContinuousEffectImpl {
@Override
public boolean apply(Game game, Ability source) {
GeneratorServantWatcher watcher = game.getState().getWatcher(GeneratorServantWatcher.class, source.getSourceId());
if (watcher != null) {
for (Permanent perm : game.getBattlefield().getAllActivePermanents()) {
if (watcher.creatureCastWithServantsMana(perm.getId())) {
perm.addAbility(HasteAbility.getInstance(), source.getSourceId(), game);
}
}
return true;
if (watcher == null) {
return false;
}
return false;
}
for (Permanent perm : game.getBattlefield().getAllActivePermanents()) {
if (watcher.creatureCastWithServantsMana(perm.getId())) {
perm.addAbility(HasteAbility.getInstance(), source.getSourceId(), game);
}
}
return true;
}
}