Well, the armour is included, but that's because it can't be negated or upgraded, so it essentially is just fluff stating what armour they have
Also, I don't think I've seen ANYone take Terror + weapon bonus into account and I know that I previously hadn't, lol

Of course, Two-handed weapons and Terror would have to be worked out: is the minimum stat 0 or is Fight an exception?

Now I'm just being a pain, but it's something to check! At least with your opponent (if the book doesn't say a minimum stat, then you can get -1F! If it says that the lowest is 0, then you have your answer

).