Engine and Combat system edit