Adding appropriate AP gain
Merge remote-tracking branch 'game/master'