improved weapon-choosing window