Make player weapon sprite darker again

As well as some minor refactoring.