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

Some changes to how counter is moved

Browse source
This commit is contained in:
Zzooouhh 2017-12-25 20:49:19 +01:00 committed by GitHub
parent 4b434f92b3
commit 4910d17272
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -200,13 +200,12 @@ class BaronVonCountMoveDoomCounterEffect extends OneShotEffect {
}
Integer doomNumber = (Integer) game.getState().getValue(mageObject.getId() + "_doom");
if (doomNumber <= 1) {
doomNumber = 5;
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.CUSTOM_EVENT, source.getSourceId(), source.getSourceId(), controller.getId(), "DoomCounterReset", 1));
} else {
doomNumber--;
game.getState().setValue(mageObject.getId() + "_doom", doomNumber);
((Permanent) mageObject).addInfo("doom counter", CardUtil.addToolTipMarkTags("Doom counter at: " + doomNumber), game);
}
game.getState().setValue(mageObject.getId() + "_doom", doomNumber);
((Permanent) mageObject).addInfo("doom counter", CardUtil.addToolTipMarkTags("Doom counter at: " + doomNumber), game);
return true;
}
return false;
@ -267,6 +266,15 @@ class BaronVonCountDestroyPlayerEffect extends OneShotEffect {
if (targetPlayer != null && targetPlayer.canLose(game)) {
game.informPlayers(targetPlayer.getLogName() + " was destroyed");
targetPlayer.lost(game); // double checks canLose, but seems more future-proof than lostForced
}
MageObject mageObject = game.getObject(source.getSourceId());
if (mageObject != null) {
if (game.getState().getValue(mageObject.getId() + "_doom") == null) {
return false;
}
Integer doomNumber = 5;
game.getState().setValue(mageObject.getId() + "_doom", doomNumber);
((Permanent) mageObject).addInfo("doom counter", CardUtil.addToolTipMarkTags("Doom counter at: " + doomNumber), game);
return true;
}
return false;