Added types to weapons and upgraded inventory

The weapon you want to fire now gets the same coordinates as your
character. Also added weapon type in the active weapon class to know
which weapon you want to fire