More building questions:

10. Valour bonuses and building lines. I'll use VI as an example, since there are more cases here. The Bowyer line has the Butts, Bowyer, and Bowyer's Workshop. The Gnome Editor has the following under Troop upgrades:
Code:
"{}, {UPGRADE_VALOUR(1)},{UPGRADE_VALOUR(2)}"
So this would lead me to believe that units available with the Butts would get +1 with a Bowyer, and +2 with a Bowyer's Workshop (this is what the tech tree says anyway). However, it's not clear what happens when the Bowyer is needed to produce a troop (Mounted Crossbows) and the higher level building is present. Does the engine figure the valour difference between the required build level and the top level building?

(Might not be the best example, since Mounteds require another building line...)

11. Building line bonus replacements (this one has come up recently I think). Again using VI, I'll use the Church line. The happiness bonus for the Church line is listed as "10, 20, 30". My assumption is that each upgrade replaces the previous building in the line, so a Catholic Chapel gives 20%, not 10% + 20%. Is this right?

Then comes the Cathedral, which is a separate building line. It has a 40% happiness bonus. Does the Cathedral replace the Church, for a 40% total, or do they co-exist for a 30% + 40% bonus?