Merge pull request #1284 from dorkster/fixes

Obey power cooldowns; introduce "combat_style"; collision bugfixes