Fyi, the hard-code limit for move bonus through traits seems to be 10. With 20 base moves, that's less than vanilla, as I've found out. So go with 30 or 40 default moves if you want the total amount to equal vanilla levels.