Adds WBLOCK_2 to more weaponry in tools.json

Also tweaked the formatting a bit and added WBLOCK_1 to some axes