Commit 3f1814a7 authored by DarkGod's avatar DarkGod
Browse files

Merge branch 'arcane_combat_resources' into 'master'

Arcane Combat resources

Support multiple resources for Arcane Combat

-The only visible change in the core game is that Arcane Combat
now interacts correctly with the Hidden Resources prodigy. The rest
of the changes are for addon support.

-Previously, Arcane Combat do_trigger function assumed that allowed
talents cost mana and not other resources. This is fine in the core
game, but if an addon wants to allow triggering a talent that costs
Vim or Paradox, for example, the logic was not appropriate.
Now, all resource types should be handled correctly.
parents c0f2889c f8222deb
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment