Updated attack phase logic