Fix weapon swap algorithm

[errantSquam]

Weapon ranks still wacky, look into jeorge

[errantSquam]

Also change thieves and lords into unpromoted classes