Fixed Bug #6305

Brandish spear can now be used by rune knights riding dragons. Made riding state check for both peco and dragon, created a new state for peco-only so that the functionality isn't lost.
http://hercules.ws/board/tracker/issue-6305-brandish-spear-bug-for-rune-knight/

Signed-off-by: shennetsind <ind@henn.et>
Fixed battle_calc_cardfix typo, Thanks to MaminhA's hawk eyes

Signed-off-by: shennetsind <ind@henn.et>