I am going to run a 1E game (that borrows some from 2E, mostly spells) and, I think that your method of handling combat is the best I have seen for what I want to do! (y) What you described begins with: "I cut WSF in half, and have them apply to the roll every round (rather than only 1 round in...