E1S6: improved map and scenario coding (no gameplay yet)