Finished up rudimentary combat

I would use a random number bonus to the attacks to make it more
interesting, but honestly that would take even more time and I want to
move on