Weapon Definitions, Updated Combat

Weapon Definitions are up for change at anytime to store more
information, and Combat will be reworked entirely.