diff --git a/data/colors.txt b/data/colors.txt index 4203a2eb07..cdce7719f1 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -8,6 +8,8 @@ 401446 462602 593674 +657933 +731131 854541 855309 988160 @@ -31,6 +33,7 @@ 2038555 2171163 2171169 +2229797 2236945 2236962 2302755 @@ -84,6 +87,7 @@ 6052956 6164237 6173981 +6286126 6381914 6381921 6438271 @@ -166,6 +170,7 @@ 16308697 16311482 16316664 +16518683 16557154 16571904 16575614 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index e4f54fb896..a5ebad4340 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 87cbe7d06c..49505f38d9 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -41281,7 +41281,7 @@ cont { scale: 14 lines { width: 1.0 - color: 12876543 + color: 657933 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41291,7 +41291,7 @@ cont { scale: 15 lines { width: 1.1 - color: 12876543 + color: 657933 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41301,7 +41301,7 @@ cont { scale: 16 lines { width: 1.1 - color: 12876543 + color: 657933 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41311,7 +41311,7 @@ cont { scale: 17 lines { width: 1.5 - color: 12876543 + color: 657933 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41321,7 +41321,7 @@ cont { scale: 18 lines { width: 1.5 - color: 12876543 + color: 657933 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41331,7 +41331,7 @@ cont { scale: 19 lines { width: 1.5 - color: 12876543 + color: 657933 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41344,7 +41344,7 @@ cont { scale: 14 lines { width: 1.0 - color: 12876543 + color: 731131 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41354,7 +41354,7 @@ cont { scale: 15 lines { width: 1.1 - color: 12876543 + color: 731131 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41364,7 +41364,7 @@ cont { scale: 16 lines { width: 1.1 - color: 12876543 + color: 731131 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41374,7 +41374,7 @@ cont { scale: 17 lines { width: 1.5 - color: 12876543 + color: 731131 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41384,7 +41384,7 @@ cont { scale: 18 lines { width: 1.5 - color: 12876543 + color: 731131 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41394,7 +41394,7 @@ cont { scale: 19 lines { width: 1.5 - color: 12876543 + color: 731131 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41407,7 +41407,7 @@ cont { scale: 14 lines { width: 1.0 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41417,7 +41417,7 @@ cont { scale: 15 lines { width: 1.1 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41427,7 +41427,7 @@ cont { scale: 16 lines { width: 1.1 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41437,7 +41437,7 @@ cont { scale: 17 lines { width: 1.5 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41447,7 +41447,7 @@ cont { scale: 18 lines { width: 1.5 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41457,7 +41457,7 @@ cont { scale: 19 lines { width: 1.5 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41470,7 +41470,7 @@ cont { scale: 14 lines { width: 1.0 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41480,7 +41480,7 @@ cont { scale: 15 lines { width: 1.1 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41490,7 +41490,7 @@ cont { scale: 16 lines { width: 1.1 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41500,7 +41500,7 @@ cont { scale: 17 lines { width: 1.5 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41510,7 +41510,7 @@ cont { scale: 18 lines { width: 1.5 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41520,7 +41520,7 @@ cont { scale: 19 lines { width: 1.5 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41533,7 +41533,7 @@ cont { scale: 14 lines { width: 1.0 - color: 12876543 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41543,7 +41543,7 @@ cont { scale: 15 lines { width: 1.1 - color: 12876543 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41553,7 +41553,7 @@ cont { scale: 16 lines { width: 1.1 - color: 12876543 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41563,7 +41563,7 @@ cont { scale: 17 lines { width: 1.5 - color: 12876543 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41573,7 +41573,7 @@ cont { scale: 18 lines { width: 1.5 - color: 12876543 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41583,7 +41583,7 @@ cont { scale: 19 lines { width: 1.5 - color: 12876543 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41596,7 +41596,7 @@ cont { scale: 14 lines { width: 1.0 - color: 12876543 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41606,7 +41606,7 @@ cont { scale: 15 lines { width: 1.1 - color: 12876543 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41616,7 +41616,7 @@ cont { scale: 16 lines { width: 1.1 - color: 12876543 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41626,7 +41626,7 @@ cont { scale: 17 lines { width: 1.5 - color: 12876543 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41636,7 +41636,7 @@ cont { scale: 18 lines { width: 1.5 - color: 12876543 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41646,7 +41646,7 @@ cont { scale: 19 lines { width: 1.5 - color: 12876543 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index e2bfb9f930..a796eedb39 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 2584f7153c..308356d7f2 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -40981,7 +40981,7 @@ cont { scale: 14 lines { width: 1.0 - color: 12876543 + color: 657933 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -40991,7 +40991,7 @@ cont { scale: 15 lines { width: 1.1 - color: 12876543 + color: 657933 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41001,7 +41001,7 @@ cont { scale: 16 lines { width: 1.1 - color: 12876543 + color: 657933 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41011,7 +41011,7 @@ cont { scale: 17 lines { width: 1.5 - color: 12876543 + color: 657933 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41021,7 +41021,7 @@ cont { scale: 18 lines { width: 1.5 - color: 12876543 + color: 657933 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41031,7 +41031,7 @@ cont { scale: 19 lines { width: 1.5 - color: 12876543 + color: 657933 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41044,7 +41044,7 @@ cont { scale: 14 lines { width: 1.0 - color: 12876543 + color: 731131 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41054,7 +41054,7 @@ cont { scale: 15 lines { width: 1.1 - color: 12876543 + color: 731131 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41064,7 +41064,7 @@ cont { scale: 16 lines { width: 1.1 - color: 12876543 + color: 731131 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41074,7 +41074,7 @@ cont { scale: 17 lines { width: 1.5 - color: 12876543 + color: 731131 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41084,7 +41084,7 @@ cont { scale: 18 lines { width: 1.5 - color: 12876543 + color: 731131 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41094,7 +41094,7 @@ cont { scale: 19 lines { width: 1.5 - color: 12876543 + color: 731131 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41107,7 +41107,7 @@ cont { scale: 14 lines { width: 1.0 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41117,7 +41117,7 @@ cont { scale: 15 lines { width: 1.1 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41127,7 +41127,7 @@ cont { scale: 16 lines { width: 1.1 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41137,7 +41137,7 @@ cont { scale: 17 lines { width: 1.5 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41147,7 +41147,7 @@ cont { scale: 18 lines { width: 1.5 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41157,7 +41157,7 @@ cont { scale: 19 lines { width: 1.5 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41170,7 +41170,7 @@ cont { scale: 14 lines { width: 1.0 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41180,7 +41180,7 @@ cont { scale: 15 lines { width: 1.1 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41190,7 +41190,7 @@ cont { scale: 16 lines { width: 1.1 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41200,7 +41200,7 @@ cont { scale: 17 lines { width: 1.5 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41210,7 +41210,7 @@ cont { scale: 18 lines { width: 1.5 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41220,7 +41220,7 @@ cont { scale: 19 lines { width: 1.5 - color: 12876543 + color: 2229797 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41233,7 +41233,7 @@ cont { scale: 14 lines { width: 1.0 - color: 12876543 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41243,7 +41243,7 @@ cont { scale: 15 lines { width: 1.1 - color: 12876543 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41253,7 +41253,7 @@ cont { scale: 16 lines { width: 1.1 - color: 12876543 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41263,7 +41263,7 @@ cont { scale: 17 lines { width: 1.5 - color: 12876543 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41273,7 +41273,7 @@ cont { scale: 18 lines { width: 1.5 - color: 12876543 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41283,7 +41283,7 @@ cont { scale: 19 lines { width: 1.5 - color: 12876543 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41296,7 +41296,7 @@ cont { scale: 14 lines { width: 1.0 - color: 12876543 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41306,7 +41306,7 @@ cont { scale: 15 lines { width: 1.1 - color: 12876543 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41316,7 +41316,7 @@ cont { scale: 16 lines { width: 1.1 - color: 12876543 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41326,7 +41326,7 @@ cont { scale: 17 lines { width: 1.5 - color: 12876543 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41336,7 +41336,7 @@ cont { scale: 18 lines { width: 1.5 - color: 12876543 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41346,7 +41346,7 @@ cont { scale: 19 lines { width: 1.5 - color: 12876543 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 2c1b243835..3da0b862d0 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 2168840bac..0df0a31b81 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -40981,7 +40981,7 @@ cont { scale: 14 lines { width: 1.0 - color: 6438271 + color: 2236962 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -40991,7 +40991,7 @@ cont { scale: 15 lines { width: 1.1 - color: 6438271 + color: 2236962 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41001,7 +41001,7 @@ cont { scale: 16 lines { width: 1.1 - color: 6438271 + color: 2236962 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41011,7 +41011,7 @@ cont { scale: 17 lines { width: 1.5 - color: 6438271 + color: 2236962 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41021,7 +41021,7 @@ cont { scale: 18 lines { width: 1.5 - color: 6438271 + color: 2236962 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41031,7 +41031,7 @@ cont { scale: 19 lines { width: 1.5 - color: 6438271 + color: 2236962 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41044,7 +41044,7 @@ cont { scale: 14 lines { width: 1.0 - color: 6438271 + color: 731131 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41054,7 +41054,7 @@ cont { scale: 15 lines { width: 1.1 - color: 6438271 + color: 731131 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41064,7 +41064,7 @@ cont { scale: 16 lines { width: 1.1 - color: 6438271 + color: 731131 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41074,7 +41074,7 @@ cont { scale: 17 lines { width: 1.5 - color: 6438271 + color: 731131 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41084,7 +41084,7 @@ cont { scale: 18 lines { width: 1.5 - color: 6438271 + color: 731131 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41094,7 +41094,7 @@ cont { scale: 19 lines { width: 1.5 - color: 6438271 + color: 731131 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41107,7 +41107,7 @@ cont { scale: 14 lines { width: 1.0 - color: 6438271 + color: 3355443 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41117,7 +41117,7 @@ cont { scale: 15 lines { width: 1.1 - color: 6438271 + color: 3355443 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41127,7 +41127,7 @@ cont { scale: 16 lines { width: 1.1 - color: 6438271 + color: 3355443 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41137,7 +41137,7 @@ cont { scale: 17 lines { width: 1.5 - color: 6438271 + color: 3355443 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41147,7 +41147,7 @@ cont { scale: 18 lines { width: 1.5 - color: 6438271 + color: 3355443 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41157,7 +41157,7 @@ cont { scale: 19 lines { width: 1.5 - color: 6438271 + color: 3355443 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41170,7 +41170,7 @@ cont { scale: 14 lines { width: 1.0 - color: 6438271 + color: 3355443 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41180,7 +41180,7 @@ cont { scale: 15 lines { width: 1.1 - color: 6438271 + color: 3355443 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41190,7 +41190,7 @@ cont { scale: 16 lines { width: 1.1 - color: 6438271 + color: 3355443 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41200,7 +41200,7 @@ cont { scale: 17 lines { width: 1.5 - color: 6438271 + color: 3355443 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41210,7 +41210,7 @@ cont { scale: 18 lines { width: 1.5 - color: 6438271 + color: 3355443 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41220,7 +41220,7 @@ cont { scale: 19 lines { width: 1.5 - color: 6438271 + color: 3355443 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41233,7 +41233,7 @@ cont { scale: 14 lines { width: 1.0 - color: 6438271 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41243,7 +41243,7 @@ cont { scale: 15 lines { width: 1.1 - color: 6438271 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41253,7 +41253,7 @@ cont { scale: 16 lines { width: 1.1 - color: 6438271 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41263,7 +41263,7 @@ cont { scale: 17 lines { width: 1.5 - color: 6438271 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41273,7 +41273,7 @@ cont { scale: 18 lines { width: 1.5 - color: 6438271 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41283,7 +41283,7 @@ cont { scale: 19 lines { width: 1.5 - color: 6438271 + color: 16518683 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41296,7 +41296,7 @@ cont { scale: 14 lines { width: 1.0 - color: 6438271 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41306,7 +41306,7 @@ cont { scale: 15 lines { width: 1.1 - color: 6438271 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: BUTTCAP @@ -41316,7 +41316,7 @@ cont { scale: 16 lines { width: 1.1 - color: 6438271 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41326,7 +41326,7 @@ cont { scale: 17 lines { width: 1.5 - color: 6438271 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41336,7 +41336,7 @@ cont { scale: 18 lines { width: 1.5 - color: 6438271 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP @@ -41346,7 +41346,7 @@ cont { scale: 19 lines { width: 1.5 - color: 6438271 + color: 6286126 priority: 1250 join: ROUNDJOIN cap: ROUNDCAP