I'm using the latest barb combat cs found in this thread, dnl the one from the most recent post just to be sure, although I think that it doesn't matter, you just have to re-paste it after DB updates.
Trinity is the same, you just have to look and tune it like the screenshot found in this...