The blacker VTVs sort to the end, and Blacker Broccoli loses a note
They are palette variants of machines already in the list, so interleaved they read as duplicates. The console's own name decides it - eleven of the thirty-eight are called Black or Blacker something - so they sort last within a hull tab as well as overall. Blacker Broccoli's console picture is a Bug, but the game draws it on the Mule hull like every other Broccoli: the console entry is simply wrong, and saying so on the card raised a question the card could not answer. Blacker Tarantula keeps its note, where the console and the game really do disagree about the hull.
This commit is contained in:
@@ -36,7 +36,22 @@ for v in data.values():
|
||||
masks[art], sizes[art] = hull_mask(art)
|
||||
|
||||
BUTTONS = ['trigger', 'thumb high', 'thumb low', 'pinky'] # index to little finger
|
||||
ORDER = sorted(data, key=lambda v: (-len(data[v]['weapons']), v))
|
||||
|
||||
# The blacker machines are palette variants of ones already in the list, so
|
||||
# they read as duplicates when interleaved. Sort them to the end of whatever
|
||||
# list they land in - within a hull tab as well as overall - and the originals
|
||||
# come first. The console's own name is what decides it: eleven of the
|
||||
# thirty-eight are called Black or Blacker something.
|
||||
def is_variant(key):
|
||||
return (data[key].get('display') or key).lower().startswith('black')
|
||||
|
||||
|
||||
ORDER = sorted(data, key=lambda v: (is_variant(v), -len(data[v]['weapons']), v))
|
||||
|
||||
# blkrbroc's console picture is a Bug, but the game draws it on the Mule hull
|
||||
# like every other Broccoli - the console entry is simply wrong. Saying so on
|
||||
# the card raises a question the card cannot answer.
|
||||
CONSOLE_PICTURE_WRONG = {'blkrbroc'}
|
||||
|
||||
|
||||
def kind(fn):
|
||||
@@ -118,7 +133,7 @@ for name in ORDER:
|
||||
if art:
|
||||
w, h = sizes[art]
|
||||
note = ''
|
||||
if v.get('hullMismatch'):
|
||||
if v.get('hullMismatch') and name not in CONSOLE_PICTURE_WRONG:
|
||||
note = (' <span class="warn" title="The console showed a %s '
|
||||
'picture for this vehicle; the game draws the %s hull">'
|
||||
'(console says %s)</span>'
|
||||
|
||||
Reference in New Issue
Block a user