Ok, in continuation of my efforts to figure out what is causing Battalion not to work in the current builds, I have at least identified the spot where it's failing and I have found what may potentially restore this functionality, albeit I have not found a way to make it work in such a way that will not break anything else. That's why I'm not committing this to SVN obviously (it's not a real "fix").
Anyhow, the problem seems to be in CombatUtil.checkDeclaredAttacker (or at least some related code) - the "Attacks" trigger for Battalion does not register correctly in CombatUtil.checkDeclaredAttacker, which causes the Battalion trigger not to fire.
In particular, line 946 that calls runTrigger (with mode=Attacks) seems to do nothing - it adds a waiting trigger but that waiting trigger never fires.
Adding this line:
- Code: Select all
game.getTriggerHandler().registerActiveTrigger(c, false);
Right in front of this line (946 in CombatUtil.java):
- Code: Select all
game.getTriggerHandler().runTrigger(TriggerType.Attacks, runParams, false);
will make Battalion apparently work (at least the simple test case with
Legion Loyalist, 2
Raging Goblin passes). However, it breaks other things because it will register other ("basic") Attacks triggers twice, thus causing them to fire two times (e.g. for
Frenzied Goblin). Therefore, something else probably needs to be done instead.
I hope this little investigation will at least shed some light onto what may be failing and where to look for the potential places to fix.
EDIT: Making the following change in addition to what is done above appears to both fix Battalion *and* avoid duplication of registration of Attacks triggers for everything else, but it feels super hacky and most likely breaks something else somewhere (especially if registering the same trigger two or more times is actually viable in some circumstances - note that this does not include cases when the same card trigger multiple times in a row, such as
Deathgreeter after
Wrath of God, these cards still trigger correctly, once for each card that makes its trigger fire [e.g. four times if four creatures die at once]).
A better fix is still needed, so consider this change just a "meditation" on what the possible locations of importance are for the Battalion mechanic.
Line 206 in TriggerHandler.java:
- Code: Select all
if (isTriggerActive(t) && !activeTriggers.contains(t)) {
I'm pretty sure that the actual, real fix involves actually adding an extra registration of an Attacks trigger *elsewhere in the code*, but so far I failed to identify the precise location of this extra registration.- Agetian
Posted: 27 Sep 2014, 09:37
The HTML characters were the only ones that seemed to work on the desktop version when I added it, though I can't recall if I actually tried unicode. I'll definitely keep this in mind for future updates.
I'm afraid I won't be able to tackle this one either, please assist if someone knows how to fix this (it doesn't break too many cards but it breaks a whole mechanic with a good enough deal of Modern-legal cards in order for it to be relevant).