Un-revert combat traits to new versions
Merge pull request #104 from zijistark/alpha

Un-revert combat traits to new versions