So I got a little sidetracked... again.

[moomarc]

Hey, Marc, I was probably a bit unclear about where References$ is needed, sorry about that

Static abilities and Trigger lines do not need References$ (The ability part of triggers do, though), only AB,SP and DB abilities do, including those inside SVars.

Gonna merge in the trunk changes then keep on trucking.

Not a problem. I should have asked about the condition/isPresent/checkSvar stuff. I just figured that if the reference to an svar had to have the Referenced param then they'd need it too I'm just glad I could help out with some of the more brain-numbing work. Unfortunately (well fortunately for me I guess) I just landed a massive job that's going to keep me busy for the next few weeks, and that's on top of another potential job that'll keep my pc busy for a week solid doing some intense render work. So I doubt I'll be able to contribute enough to be helpful, but at least my bond repayment won't bounce

[Hellfish]

I'll echo that "Not a problem" Also, thanks,every little bit helps

[Sloth]

Are we finished? Is it time for a merge?

[Hellfish]

Hah, ninja commits. Thanks, Sloth!

I think we're done with adding References$. The only question is wether or not to wait until after tomorrows beta to merge. I'm fairly confident the system'll do fine but maybe it's better to keep it limited to snapshot builds before it's big debut.

[Sloth]

Yes, maybe it's better to wait until the next beta. I will search for some missing pieces in the meantime.

[Hellfish]

Whoop Whoop, merging!
EDIT: Looks like it's gonna take a while
EDIT: Or not. This is hell on a mobile broadband :S Take 2 tomorrow probably.

[Hellfish]

And things should be good! I'll give it a while to verify everythings green before deleting the branch,though. Had to pull a bit of a stunt to make it, but it seems okay

[ArsenalNut]

And things should be good! I'll give it a while to verify everythings green before deleting the branch,though. Had to pull a bit of a stunt to make it, but it seems okay

I don't see any of the new cards in the Trunk, but I can find them in the branch. Did you do this on purpose?

[Hellfish]

Oh yeah...Might be a good idea to actually add the cards to the project Will fix tonight!

[ArsenalNut]

I was looking through the code changes for the ability copiers. I noticed that mana abilities are not being copied. The mana abilities are kept in a separate array list from the activated abilities.

[Hellfish]

Yeah they are, I'm positive. They copy all AbilityActivated's of Card.getSpellAbilities() which sums ordinary and mana abilities into a single list.

Also, Fyndhorn Elder was one of my Havengul Lich test cases, so I'm doubly positive.

[ArsenalNut]

Yeah they are, I'm positive. They copy all AbilityActivated's of Card.getSpellAbilities() which sums ordinary and mana abilities into a single list.

Also, Fyndhorn Elder was one of my Havengul Lich test cases, so I'm doubly positive.

I tested Experiment Kraj and Llanowar Elves. The Experiment Kraj didn't get the mana ability after I put a p1p1 counter on Llanowar Elves. I was working in my CloneFix branch after I merged the lastest Trunk changes though. I'll test again in a clean Trunk workspace.

[Hellfish]

On second thoughts, there *is* something funky going on... Thanks for bringing it to my attention

EDIT: Found it. As of r15928, the GainsAbilitiesOf parameter of continuous static abilities gained the ability to affect other cards than the host card via Affected$. So I added Affected$ to the other abilitystealers. "Self" != "Card.Self" though.. They didn't steal anything at all!

Thanks for the report!