Combat 2

Incomplete combat system