diff --git a/docs/vtv-presets.html b/docs/vtv-presets.html index aa05afe..e0b4d47 100644 --- a/docs/vtv-presets.html +++ b/docs/vtv-presets.html @@ -271,26 +271,6 @@ td.fn {
-
-
-
Police hull · shared with Dragon
-

BLACKER DRAGON

-

blkrdragon

-

2× BOOSTCHUTERIVET 1RIVET 2SLAVER

-

6 subsystems38 mappings

-
-
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1SLAVERBOOST 1CHUTE
2SLAVERBOOST 1CHUTELIFT CUT
3SLAVERBOOST 1LIFT CUT
4SLAVERBOOST 1LIFT CUT
5SLAVERBOOST 1HORNLIFT CUT
6LIFT CUTBOOST 1SLAVER
-
-
-
-
Armadillo hull · shared with Armadillo, Blacker Armadillo
-

BLACKER PUCK

-

dark

-

1× BOOSTLASER 2DEMO PACKDEMOPACKDROPPER2

-

4 subsystems26 mappings

-
-
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1LASER 2BOOST 1HORN
2LASER 2BOOST 1HORNLIFT CUT
3LASER 2BOOST 1LIFT CUT
4LASER 2BOOST 1LIFT CUTHORN
5LASER 2BOOST 1DEMOPACKDROPPER2LIFT CUT
6LIFT CUTBOOST 1LASER 2
-
Police hull · shared with Blacker Dragon
@@ -361,26 +341,6 @@ td.fn {
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1RIVET 2BOOST 1CHUTE
2RIVET 2BOOST 1CHUTELIFT CUT
3RIVET 2BOOST 1LIFT CUT
4RIVET 2BOOST 1LIFT CUT
5RIVET 2BOOST 1HORNLIFT CUT
6LIFT CUTBOOST 1RIVET 2
-
-
-
Armadillo hull · shared with Armadillo, Blacker Puck
-

BLACKER ARMADILLO

-

blkrpuck

-

1× BOOSTLASER 2

-

2 subsystems16 mappings

-
-
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1LASER 2BOOST 1HORN
2LASER 2BOOST 1HORNLIFT CUT
3LASER 2BOOST 1LIFT CUT
4LASER 2BOOST 1LIFT CUTHORN
5LASER 2BOOST 1HORNLIFT CUT
6LIFT CUTBOOST 1LASER 2
-
-
-
-
Skeeter hull · shared with Chigger, Flea, Roach, Skeeter, Wasp
-

BLACKER WASP

-

blkrwasp

-

2× BOOSTCHUTEDEMO PACK

-

4 subsystems26 mappings

-
-
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1DEMO PACKBOOST 1CHUTE
2DEMO PACKBOOST 1CHUTELIFT CUT
3DEMO PACKBOOST 1LIFT CUT
4DEMO PACKBOOST 1LIFT CUTCHUTE
5DEMO PACKBOOST 1HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2DEMO PACK
-
Skeeter hull · shared with Blacker Wasp, Flea, Roach, Skeeter, Wasp
@@ -491,76 +451,6 @@ td.fn {
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 1BOOST 2CHUTE
2BOOST 1BOOST 2CHUTELIFT CUT
3BOOST 1BOOST 2LIFT CUT
4BOOST 1BOOST 2LIFT CUTCHUTE
5BOOST 1BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
-
-
-
Mule hull · shared with Barge, Burro, Mule, Screaming Broccoli (console says Bug)
-

BLACKER BROCCOLI

-

blkrbroc

-

3× BOOSTCHUTEUNARMED

-

4 subsystems28 mappings

-
-
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 1BOOST 2CHUTE
2BOOST 1BOOST 2CHUTELIFT CUT
3BOOST 1BOOST 2LIFT CUT
4BOOST 1BOOST 3LIFT CUTCHUTE
5BOOST 1BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
-
-
-
-
Quark hull · shared with Blacker Quark, Lepton, Neutrino, Quark
-

BLACKER LEPTON

-

blkrlepton

-

2× BOOSTCHUTEUNARMED

-

3 subsystems23 mappings

-
-
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 1BOOST 2CHUTE
2BOOST 1BOOST 2CHUTELIFT CUT
3BOOST 1BOOST 2LIFT CUT
4BOOST 1BOOST 2LIFT CUTCHUTE
5BOOST 1BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
-
-
-
-
Quark hull · shared with Blacker Lepton, Lepton, Neutrino, Quark
-

BLACKER QUARK

-

blkrquark

-

2× BOOSTUNARMED

-

2 subsystems17 mappings

-
-
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 1BOOST 2
2BOOST 1BOOST 2LIFT CUT
3BOOST 1BOOST 2LIFT CUT
4BOOST 1BOOST 2LIFT CUT
5BOOST 1BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2
-
-
-
-
Bug hull · shared with Black Speck, Bug, Speck
-

BLACKER SPECK

-

blkrspk

-

3× BOOSTCHUTEUNARMED

-

4 subsystems28 mappings

-
-
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 1BOOST 2CHUTE
2BOOST 1BOOST 2CHUTELIFT CUT
3BOOST 1BOOST 2LIFT CUT
4BOOST 1BOOST 3LIFT CUTCHUTE
5BOOST 1BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
-
-
-
-
Bull hull · shared with Black Tarantula, Bull, Tarantula (console says Bug)
-

BLACKER TARANTULA

-

blkrtran

-

4× BOOSTCHUTEUNARMED

-

5 subsystems33 mappings

-
-
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 2CHUTE
2BOOST 2CHUTELIFT CUT
3BOOST 2LIFT CUT
4BOOST 2BOOST 4LIFT CUTCHUTE
5BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
-
-
-
-
Bug hull · shared with Blacker Speck, Bug, Speck
-

BLACK SPECK

-

blkspk

-

3× BOOSTCHUTEUNARMED

-

4 subsystems28 mappings

-
-
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 1BOOST 2CHUTE
2BOOST 1BOOST 2CHUTELIFT CUT
3BOOST 1BOOST 2LIFT CUT
4BOOST 1BOOST 3LIFT CUTCHUTE
5BOOST 1BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
-
-
-
-
Bull hull · shared with Blacker Tarantula, Bull, Tarantula
-

BLACK TARANTULA

-

blktrn

-

4× BOOSTCHUTEUNARMED

-

5 subsystems33 mappings

-
-
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 2CHUTE
2BOOST 2CHUTELIFT CUT
3BOOST 2LIFT CUT
4BOOST 2BOOST 4LIFT CUTCHUTE
5BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
-
Mule hull · shared with Barge, Blacker Broccoli, Burro, Mule
@@ -650,6 +540,116 @@ td.fn {

4 subsystems28 mappings

Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 1BOOST 2CHUTE
2BOOST 1BOOST 2CHUTELIFT CUT
3BOOST 1BOOST 2LIFT CUT
4BOOST 1BOOST 3LIFT CUTCHUTE
5BOOST 1BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
+
+
+
+
Police hull · shared with Dragon
+

BLACKER DRAGON

+

blkrdragon

+

2× BOOSTCHUTERIVET 1RIVET 2SLAVER

+

6 subsystems38 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1SLAVERBOOST 1CHUTE
2SLAVERBOOST 1CHUTELIFT CUT
3SLAVERBOOST 1LIFT CUT
4SLAVERBOOST 1LIFT CUT
5SLAVERBOOST 1HORNLIFT CUT
6LIFT CUTBOOST 1SLAVER
+
+
+
+
Armadillo hull · shared with Armadillo, Blacker Armadillo
+

BLACKER PUCK

+

dark

+

1× BOOSTLASER 2DEMO PACKDEMOPACKDROPPER2

+

4 subsystems26 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1LASER 2BOOST 1HORN
2LASER 2BOOST 1HORNLIFT CUT
3LASER 2BOOST 1LIFT CUT
4LASER 2BOOST 1LIFT CUTHORN
5LASER 2BOOST 1DEMOPACKDROPPER2LIFT CUT
6LIFT CUTBOOST 1LASER 2
+
+
+
+
Armadillo hull · shared with Armadillo, Blacker Puck
+

BLACKER ARMADILLO

+

blkrpuck

+

1× BOOSTLASER 2

+

2 subsystems16 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1LASER 2BOOST 1HORN
2LASER 2BOOST 1HORNLIFT CUT
3LASER 2BOOST 1LIFT CUT
4LASER 2BOOST 1LIFT CUTHORN
5LASER 2BOOST 1HORNLIFT CUT
6LIFT CUTBOOST 1LASER 2
+
+
+
+
Skeeter hull · shared with Chigger, Flea, Roach, Skeeter, Wasp
+

BLACKER WASP

+

blkrwasp

+

2× BOOSTCHUTEDEMO PACK

+

4 subsystems26 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1DEMO PACKBOOST 1CHUTE
2DEMO PACKBOOST 1CHUTELIFT CUT
3DEMO PACKBOOST 1LIFT CUT
4DEMO PACKBOOST 1LIFT CUTCHUTE
5DEMO PACKBOOST 1HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2DEMO PACK
+
+
+
+
Mule hull · shared with Barge, Burro, Mule, Screaming Broccoli
+

BLACKER BROCCOLI

+

blkrbroc

+

3× BOOSTCHUTEUNARMED

+

4 subsystems28 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 1BOOST 2CHUTE
2BOOST 1BOOST 2CHUTELIFT CUT
3BOOST 1BOOST 2LIFT CUT
4BOOST 1BOOST 3LIFT CUTCHUTE
5BOOST 1BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
+
+
+
+
Quark hull · shared with Blacker Quark, Lepton, Neutrino, Quark
+

BLACKER LEPTON

+

blkrlepton

+

2× BOOSTCHUTEUNARMED

+

3 subsystems23 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 1BOOST 2CHUTE
2BOOST 1BOOST 2CHUTELIFT CUT
3BOOST 1BOOST 2LIFT CUT
4BOOST 1BOOST 2LIFT CUTCHUTE
5BOOST 1BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
+
+
+
+
Quark hull · shared with Blacker Lepton, Lepton, Neutrino, Quark
+

BLACKER QUARK

+

blkrquark

+

2× BOOSTUNARMED

+

2 subsystems17 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 1BOOST 2
2BOOST 1BOOST 2LIFT CUT
3BOOST 1BOOST 2LIFT CUT
4BOOST 1BOOST 2LIFT CUT
5BOOST 1BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2
+
+
+
+
Bug hull · shared with Black Speck, Bug, Speck
+

BLACKER SPECK

+

blkrspk

+

3× BOOSTCHUTEUNARMED

+

4 subsystems28 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 1BOOST 2CHUTE
2BOOST 1BOOST 2CHUTELIFT CUT
3BOOST 1BOOST 2LIFT CUT
4BOOST 1BOOST 3LIFT CUTCHUTE
5BOOST 1BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
+
+
+
+
Bull hull · shared with Black Tarantula, Bull, Tarantula (console says Bug)
+

BLACKER TARANTULA

+

blkrtran

+

4× BOOSTCHUTEUNARMED

+

5 subsystems33 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 2CHUTE
2BOOST 2CHUTELIFT CUT
3BOOST 2LIFT CUT
4BOOST 2BOOST 4LIFT CUTCHUTE
5BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
+
+
+
+
Bug hull · shared with Blacker Speck, Bug, Speck
+

BLACK SPECK

+

blkspk

+

3× BOOSTCHUTEUNARMED

+

4 subsystems28 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 1BOOST 2CHUTE
2BOOST 1BOOST 2CHUTELIFT CUT
3BOOST 1BOOST 2LIFT CUT
4BOOST 1BOOST 3LIFT CUTCHUTE
5BOOST 1BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
+
+
+
+
Bull hull · shared with Blacker Tarantula, Bull, Tarantula
+

BLACK TARANTULA

+

blktrn

+

4× BOOSTCHUTEUNARMED

+

5 subsystems33 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 2CHUTE
2BOOST 2CHUTELIFT CUT
3BOOST 2LIFT CUT
4BOOST 2BOOST 4LIFT CUTCHUTE
5BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
diff --git a/tools/pages/build_page.py b/tools/pages/build_page.py index b178b17..6557f75 100644 --- a/tools/pages/build_page.py +++ b/tools/pages/build_page.py @@ -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 = (' ' '(console says %s)'