Adding new consumable items to catalog and tested on player
Adding weapon triangle bonus computation method
Intermediate work on hooking up weapon triangle bonuses
More work and testing on integration of weapon triangle
Finished weapon triangle bonuses
Merging
Fixing merge conflicts
Fixing bugs with weapon bonus computation
Merging
Fixing all bugs for weapon bonuses
Merge pull request #33 from DrkSephy/master

Implemented weapon bonus system and fixed bugs