Fix some missed charge conversions
Convert tools.json to new weight system
Small weight tweak
Convert melee.json to new weight system