Changed signature of Weapons. Simplified an if statement in KeyPadLayer