combat changes, can engage in combat in the first room now