Finish implementing new shop

Some stuff is untested
Fix weapon purchases