In battle menu

Also, slight rework of damage calc, turn skipping,