added code to calculate combat plus changes to fix display of tactical UI move phase parts