Fleshed out combat system