Entity class and improved battle sequence