termcol: move generated xcolors include to data/

[sheet.git] / termcol.inc.pl

diff --git a/termcol.inc.pl b/termcol.inc.pl
index 38696cef1002f56ed29c3d1977e5098fe3403477..3c3b365c30ff28f00b4ec3e2038c93a4abf0110e 100644 (file)
--- a/termcol.inc.pl
+++ b/termcol.inc.pl
@@ -8,7 +8,7 @@ use Shiar_Sheet::Colour 1.05;
        legacy  => [qw( c64 msx mac2 risc arnegame dawnbringer cpc cpcboy shiar32 ppu shovel 64 )],
 
        xcolors => sub {
-               my $pals = do 'termcol-xcolor.inc.pl' or die $! || $@;
+               my $pals = do 'data/termcol-xcolor.inc.pl' or die $! || $@;
                $_[0]->{$_} = $pals->{$_} for keys %{$pals};
                return 'xcolor';
        },
@@ -266,10 +266,11 @@ use Shiar_Sheet::Colour 1.05;
                                        54BF47 37C79F 35CFE4  8DD836 B8D1B5 97E9D1  EDD446 EBE4A4 FFFFFF
                                )]->[$index]
                        },
-                       [ # gameboy ramp
-                               map { [ 27 + (state $index)++, map { hex } /(..)/g ] }
-                               qw( F2EFE7 BAC375 859550 485D48 293941 )
-                       ],
+               ],
+               table => [
+                       # gameboy ramp
+                       [qw( 293941:31       :   F2EFE7:27 )],
+                       [qw( 485D48:30 859550:29 BAC375:28 )],
                ],
                parent => 'cpc',
        },
@@ -288,7 +289,6 @@ use Shiar_Sheet::Colour 1.05;
                        [qw(         0 6C71C4:3J         0 )],
                        [qw( 362747:1K 75507B:3K F06FCB:5K )],
                        [qw(         0 D33662:3L         0 )],
-                       undef,
                        [qw( 000000:0  686868:2  CCCCCC:4  )],
                        [qw( 444444:1  B0B0B0:3  FFFFFF:5  )],
                ],
@@ -323,6 +323,7 @@ use Shiar_Sheet::Colour 1.05;
                                ] } 0..13
                        }
                ],
+               hueorder => [6..12, 1..5, 13, 0],
        },
        shovel => {
                name => 'NES for Shovel Knight',
@@ -344,6 +345,7 @@ use Shiar_Sheet::Colour 1.05;
                        [qw( 22123B:0S 360900:1S 824E00:2S 9E9E5C:3S )],
                ],
                parent => 'ppu',
+               hueorder => [6..12, 1..5, 13, 0, 14],
        },
 
        64 => {