I've finally merged Sjoerd's gataxx code into CVS. Gataxx is as functional as it was but more modular and with a better AI. In the process I've noticed all the things that weren't finished when it was branched from iagno (like networking and sound). So now gataxx is stripped down and relatively clean my intention is to incrementally port the stuff from iagno and eventually make the two games one program. I reckon I can do it incrementally so for a long time there will be gataxx with a non-functioning iagno mode and a fully functional iagno in parallel.
I say "long time" because I'm going to force myself to finally do the aisleriot rescaling work before-hand. There appear to be plenty of volunteers prepared to draw SVG card decks so that bit should work out. This weekend I'm going to look at the stuff jrb did for gdeck/Aisleriot2 and see what code I can steal. I think I'm going to have to throw out the current model for card decks, with luck the 2.6 release should condition people to not expect an infinite number of pointless choices for the look and feel of their cards and we can just have set decks (with perhaps a choice of reverse).