image updates and combat resolution re-added