FIX BATTLE LOGIC