chiark / gitweb /
Merge branch 'keyboard'
authorIan Jackson <ian@liberator.relativity.greenend.org.uk>
Wed, 27 May 2009 22:57:54 +0000 (23:57 +0100)
committerIan Jackson <ian@liberator.relativity.greenend.org.uk>
Wed, 27 May 2009 22:57:54 +0000 (23:57 +0100)
1  2 
yoweb-scrape

diff --cc yoweb-scrape
@@@ -332,17 -348,10 +348,10 @@@ class CrewInfo(SomethingSoupInfo)
  #---------- pretty-printer for tables of pirate puzzle standings ----------
  
  class StandingsTable:
 -      def __init__(self, use_puzzles=None, col_width=6):
 +      def __init__(self, use_puzzles=None, col_width=6, gap_every=5):
                if use_puzzles is None:
                        if opts.ship_duty:
-                               use_puzzles=[
-                                       'Navigating','Battle Navigation',
-                                       'Gunning',
-                                       ['Sailing','Rigging'],
-                                       'Bilging',
-                                       'Carpentry',
-                                       'Treasure Haul'
-                               ]
+                               use_puzzles=duty_puzzles
                        else:
                                use_puzzles=puzzles
                self._puzzles = use_puzzles