New scoremethod in model+score popups in view
Weapons now come from the armory again