Okay, will be committing the updated version with the following differences. The first noted will (generally) be the CanAdv version.
1) Usual differences regarding default visibility (6 v. 9) and guild unlocking (possible v. not).
2) Closed event zones follow the normal 'one per line' configuration rather than being compressed as that makes readability slightly more difficult.
3) Pump Up Mysticality and The Sunken Party Yacht are zone checks and therefore included in the zone check section, rather than having an additional manual zone check call later.
4) The Arid, Extra-Dry Desert and The Oasis have special eligibility checks for Ed which were not included in the proposed merge version, and so would have provided incorrect results.
5) There is a proposed change to try to break down the wall in the manor basement during the boss check. I could be convinced to change this, but I'm not sure if KoL provides the same html if you try to break down the wall that's already been removed.
6) The proposed check for Ed's warehouse was wrong, as it suggested that you could adventure there as soon as you hit level 13, rather than after you'd started the warehouse quest. Changed in our version to use the warehouse quest status.
7) The Red Zeppelin zone is named for its mooring, so we include that in its zone description.
8) Most of the NS quest checks were wrong - all but the contestants. Specifically, contestant complete is 2, coronation is 3, and the door is 5. These numbers must be skipped in the quest checks.
9) Most of the 'never open' zones were already being blocked through their zone checks. Added Crimbo13 as a closed zone and removed the other duplicate lookups, which reduces our NO zones to two.
10) We don't add a spurious space to the available check.
Of those, 5 is the only rejected change which seems like it might be worth approving if someone can validate that re-breaking the wall over and over and over again still provides the chamberboss link. I'll make sure that the script still validates, but it should be committed in the next few minutes.