Friendly/Enemy AP gain

Should merge now.