Shocking execution fixes
Merge pull request #4 from nilsbrummond/shocking-execution-fix

Shocking execution fixes for base damage of zero.