External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 12:02:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow trigger to recognize double digit P/T

Browse source
This commit is contained in:
Zzooouhh 2017-12-25 21:15:05 +01:00 • committed by GitHub
parent 4910d17272
commit 8538e6d157
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage.Sets/src/mage/cards/b/BaronVonCount.java
View file

@ -157,13 +157,14 @@ class BaronVonCountTriggeredAbility extends TriggeredAbilityImpl {
} }
Integer doomNumber = (Integer) game.getState().getValue(mageObject.getId() + "_doom"); Integer doomNumber = (Integer) game.getState().getValue(mageObject.getId() + "_doom");
if (spell != null && sourcePermanent != null && mageObject != null) { if (spell != null && sourcePermanent != null && mageObject != null) {
if (spell.getCard().getManaCost().getText().contains(doomNumber.toString()) String doomString = doomNumber.toString();
|| spell.getPower().getBaseValue() == doomNumber if (spell.getCard().getManaCost().getText().contains(doomString)
|| spell.getToughness().getBaseValue() == doomNumber) { || String.valueOf(spell.getPower().getBaseValue()).contains(doomString)
|| String.valueOf(spell.getToughness().getBaseValue()).contains(doomString)) {
return true; return true;
} else { } else {
for (String string : spell.getCard().getRules()) { for (String string : spell.getCard().getRules()) {
if (string.contains(doomNumber.toString())) { if (string.contains(doomString)) {
return true; return true;
} }
} }
@ -200,6 +201,7 @@ class BaronVonCountMoveDoomCounterEffect extends OneShotEffect {
} }
Integer doomNumber = (Integer) game.getState().getValue(mageObject.getId() + "_doom"); Integer doomNumber = (Integer) game.getState().getValue(mageObject.getId() + "_doom");
if (doomNumber <= 1) { if (doomNumber <= 1) {
// not completely sure if counter should be moving here or not (relevant in case the second trigger gets countered)
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.CUSTOM_EVENT, source.getSourceId(), source.getSourceId(), controller.getId(), "DoomCounterReset", 1)); game.fireEvent(GameEvent.getEvent(GameEvent.EventType.CUSTOM_EVENT, source.getSourceId(), source.getSourceId(), controller.getId(), "DoomCounterReset", 1));
} else { } else {
doomNumber--; doomNumber--;