replace fight_on_without_leader with defeat_condition

i'll merge as soon a the travis passes