made enemy ships a bit more discerning about when they fire weapons; set FOV for enemy vision to adjust based on difficulty level
fixed merge conflict