Tune trapped rook penalty

Passed STC
LLR: 2.96 (-2.94,2.94) [-1.50,4.50]
Total: 15687 W: 3352 L: 3199 D: 9136

and LTC (parameter tweaks)
LLR: 2.95 (-2.94,2.94) [0.00,4.00]
Total: 27983 W: 5046 L: 4797 D: 18140

bench: 8330705
Revert "Threats -25% to compensate (8443537)"

This reverts commit ce7a284e22640f6f97cb67ff75d6664abcc8f0a8.
take 3: -15% (7853193)
Merge branch 'master' into nolsb