Refactors weapon method names and adds ternary to player class