diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 1ff5d3aa2f..c424685b6f 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 db943c9de2..f0f2956a41 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -2712,6 +2712,7 @@ cont { color: 4473924 offset_y: 1 } + priority: -9960 } } } @@ -7871,6 +7872,7 @@ cont { scale: 16 area { color: 15591638 + priority: -1760 } symbol { name: "mormon-m" @@ -7891,6 +7893,7 @@ cont { scale: 17 area { color: 15591638 + priority: -1760 } symbol { name: "mormon-m" @@ -7911,6 +7914,7 @@ cont { scale: 18 area { color: 15591638 + priority: -1760 } symbol { name: "mormon-m" @@ -7931,6 +7935,7 @@ cont { scale: 19 area { color: 15591638 + priority: -1760 } symbol { name: "mormon-m" @@ -58299,6 +58304,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58311,6 +58317,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58323,6 +58330,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58335,6 +58343,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58347,6 +58356,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58362,6 +58372,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58374,6 +58385,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58386,6 +58398,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58398,6 +58411,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58410,6 +58424,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -58789,6 +58804,7 @@ cont { lines { width: 1.4 color: 9868678 + priority: 320 join: BEVELJOIN cap: BUTTCAP } @@ -58798,6 +58814,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58806,6 +58823,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58814,6 +58832,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58822,6 +58841,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58829,6 +58849,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58836,6 +58857,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58843,6 +58865,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } } @@ -58853,6 +58876,7 @@ cont { lines { width: 1.4 color: 9868678 + priority: 320 join: BEVELJOIN cap: BUTTCAP } @@ -58862,6 +58886,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58870,6 +58895,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58878,6 +58904,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58886,6 +58913,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58893,6 +58921,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58900,6 +58929,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58907,6 +58937,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } } @@ -58917,6 +58948,7 @@ cont { lines { width: 1.4 color: 9868678 + priority: 320 join: BEVELJOIN cap: BUTTCAP } @@ -58926,6 +58958,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58934,6 +58967,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58942,6 +58976,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58950,6 +58985,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58957,6 +58993,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58964,6 +59001,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58971,6 +59009,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 81a3bd3066..e67886c7b0 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 8da99845ab..6d50f33e79 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -2712,6 +2712,7 @@ cont { color: 4473924 offset_y: 1 } + priority: -9960 } } } @@ -7745,6 +7746,7 @@ cont { scale: 16 area { color: 15591638 + priority: -1760 } symbol { name: "mormon-m" @@ -7765,6 +7767,7 @@ cont { scale: 17 area { color: 15591638 + priority: -1760 } symbol { name: "mormon-m" @@ -7785,6 +7788,7 @@ cont { scale: 18 area { color: 15591638 + priority: -1760 } symbol { name: "mormon-m" @@ -7805,6 +7809,7 @@ cont { scale: 19 area { color: 15591638 + priority: -1760 } symbol { name: "mormon-m" @@ -58355,6 +58360,7 @@ cont { lines { width: 1.4 color: 9868678 + priority: 320 join: BEVELJOIN cap: BUTTCAP } @@ -58364,6 +58370,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58372,6 +58379,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58380,6 +58388,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58388,6 +58397,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58395,6 +58405,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58402,6 +58413,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58409,6 +58421,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } } @@ -58419,6 +58432,7 @@ cont { lines { width: 1.4 color: 9868678 + priority: 320 join: BEVELJOIN cap: BUTTCAP } @@ -58428,6 +58442,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58436,6 +58451,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58444,6 +58460,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58452,6 +58469,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58459,6 +58477,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58466,6 +58485,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58473,6 +58493,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } } @@ -58483,6 +58504,7 @@ cont { lines { width: 1.4 color: 9868678 + priority: 320 join: BEVELJOIN cap: BUTTCAP } @@ -58492,6 +58514,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58500,6 +58523,7 @@ cont { lines { width: 2.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58508,6 +58532,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 cap: BUTTCAP } } @@ -58516,6 +58541,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58523,6 +58549,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58530,6 +58557,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } element { @@ -58537,6 +58565,7 @@ cont { lines { width: 3.0 color: 9868678 + priority: 320 } } } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index f22064bb63..f01dd71a97 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 f87b455924..9d2b9d319f 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -2712,6 +2712,7 @@ cont { color: 5592405 offset_y: 1 } + priority: -9960 } } } @@ -7745,6 +7746,7 @@ cont { scale: 16 area { color: 2499106 + priority: -1760 } symbol { name: "mormon-m" @@ -7765,6 +7767,7 @@ cont { scale: 17 area { color: 2499106 + priority: -1760 } symbol { name: "mormon-m" @@ -7785,6 +7788,7 @@ cont { scale: 18 area { color: 2499106 + priority: -1760 } symbol { name: "mormon-m" @@ -7805,6 +7809,7 @@ cont { scale: 19 area { color: 2499106 + priority: -1760 } symbol { name: "mormon-m" @@ -58441,6 +58446,7 @@ cont { lines { width: 1.4 color: 4470602 + priority: 320 join: BEVELJOIN cap: BUTTCAP } @@ -58450,6 +58456,7 @@ cont { lines { width: 2.0 color: 4470602 + priority: 320 cap: BUTTCAP } } @@ -58458,6 +58465,7 @@ cont { lines { width: 2.0 color: 4470602 + priority: 320 cap: BUTTCAP } } @@ -58466,6 +58474,7 @@ cont { lines { width: 3.0 color: 4470602 + priority: 320 cap: BUTTCAP } } @@ -58474,6 +58483,7 @@ cont { lines { width: 3.0 color: 4470602 + priority: 320 } } element { @@ -58481,6 +58491,7 @@ cont { lines { width: 3.0 color: 4470602 + priority: 320 } } element { @@ -58488,6 +58499,7 @@ cont { lines { width: 3.0 color: 4470602 + priority: 320 } } element { @@ -58495,6 +58507,7 @@ cont { lines { width: 3.0 color: 4470602 + priority: 320 } } } @@ -58505,6 +58518,7 @@ cont { lines { width: 1.4 color: 4470602 + priority: 320 join: BEVELJOIN cap: BUTTCAP } @@ -58514,6 +58528,7 @@ cont { lines { width: 2.0 color: 4470602 + priority: 320 cap: BUTTCAP } } @@ -58522,6 +58537,7 @@ cont { lines { width: 2.0 color: 4470602 + priority: 320 cap: BUTTCAP } } @@ -58530,6 +58546,7 @@ cont { lines { width: 3.0 color: 4470602 + priority: 320 cap: BUTTCAP } } @@ -58538,6 +58555,7 @@ cont { lines { width: 3.0 color: 4470602 + priority: 320 } } element { @@ -58545,6 +58563,7 @@ cont { lines { width: 3.0 color: 4470602 + priority: 320 } } element { @@ -58552,6 +58571,7 @@ cont { lines { width: 3.0 color: 4470602 + priority: 320 } } element { @@ -58559,6 +58579,7 @@ cont { lines { width: 3.0 color: 4470602 + priority: 320 } } } @@ -58569,6 +58590,7 @@ cont { lines { width: 1.4 color: 4470602 + priority: 320 join: BEVELJOIN cap: BUTTCAP } @@ -58578,6 +58600,7 @@ cont { lines { width: 2.0 color: 4470602 + priority: 320 cap: BUTTCAP } } @@ -58586,6 +58609,7 @@ cont { lines { width: 2.0 color: 4470602 + priority: 320 cap: BUTTCAP } } @@ -58594,6 +58618,7 @@ cont { lines { width: 3.0 color: 4470602 + priority: 320 cap: BUTTCAP } } @@ -58602,6 +58627,7 @@ cont { lines { width: 3.0 color: 4470602 + priority: 320 } } element { @@ -58609,6 +58635,7 @@ cont { lines { width: 3.0 color: 4470602 + priority: 320 } } element { @@ -58616,6 +58643,7 @@ cont { lines { width: 3.0 color: 4470602 + priority: 320 } } element { @@ -58623,6 +58651,7 @@ cont { lines { width: 3.0 color: 4470602 + priority: 320 } } } diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 4a9b1035b5..bcd28eee46 100644 Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 5578921ad6..f5e5e1d83c 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -3017,6 +3017,7 @@ cont { scale: 16 symbol { name: "mormon-m" + priority: 650 min_distance: 10 } } @@ -3024,6 +3025,7 @@ cont { scale: 17 symbol { name: "mormon-m" + priority: 650 min_distance: 10 } caption { @@ -3031,13 +3033,16 @@ cont { height: 13 color: 4473924 offset_y: 1 + is_optional: true } + priority: -9350 } } element { scale: 18 symbol { name: "mormon-m" + priority: 650 min_distance: 10 } caption { @@ -3045,13 +3050,16 @@ cont { height: 14 color: 4473924 offset_y: 1 + is_optional: true } + priority: -9350 } } element { scale: 19 symbol { name: "mormon-m" + priority: 650 min_distance: 10 } caption { @@ -3059,7 +3067,9 @@ cont { height: 14 color: 4473924 offset_y: 1 + is_optional: true } + priority: -9350 } } } @@ -26600,48 +26610,56 @@ cont { scale: 12 area { color: 15590876 + priority: -1930 } } element { scale: 13 area { color: 15590876 + priority: -1930 } } element { scale: 14 area { color: 15590876 + priority: -1930 } } element { scale: 15 area { color: 15590876 + priority: -1930 } } element { scale: 16 area { color: 15590876 + priority: -1930 } } element { scale: 17 area { color: 15590876 + priority: -1930 } } element { scale: 18 area { color: 15590876 + priority: -1930 } } element { scale: 19 area { color: 15590876 + priority: -1930 } } } @@ -36734,6 +36752,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -36746,6 +36765,7 @@ cont { dd: 2.2 dd: 1.26 } + priority: 120 cap: BUTTCAP } } @@ -36758,6 +36778,7 @@ cont { dd: 3.3 dd: 1.8 } + priority: 120 } } element { @@ -36769,6 +36790,7 @@ cont { dd: 4.0 dd: 1.8 } + priority: 120 } } element { @@ -36780,6 +36802,7 @@ cont { dd: 4.0 dd: 1.8 } + priority: 120 } } element { @@ -36791,6 +36814,7 @@ cont { dd: 6.3 dd: 2.7 } + priority: 120 } } } @@ -36805,6 +36829,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -36817,6 +36842,7 @@ cont { dd: 2.2 dd: 1.26 } + priority: 120 cap: BUTTCAP } } @@ -36829,6 +36855,7 @@ cont { dd: 3.3 dd: 1.8 } + priority: 120 } } element { @@ -36840,6 +36867,7 @@ cont { dd: 4.0 dd: 1.8 } + priority: 120 } } element { @@ -36851,6 +36879,7 @@ cont { dd: 4.0 dd: 1.8 } + priority: 120 } } element { @@ -36862,6 +36891,7 @@ cont { dd: 6.3 dd: 2.7 } + priority: 120 } } } diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index a38288d013..d3a85185f2 100644 Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index a94377875d..e42de262f4 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -3017,6 +3017,7 @@ cont { scale: 16 symbol { name: "mormon-m" + priority: 650 min_distance: 10 } } @@ -3024,6 +3025,7 @@ cont { scale: 17 symbol { name: "mormon-m" + priority: 650 min_distance: 10 } caption { @@ -3031,13 +3033,16 @@ cont { height: 13 color: 6710886 offset_y: 1 + is_optional: true } + priority: -9350 } } element { scale: 18 symbol { name: "mormon-m" + priority: 650 min_distance: 10 } caption { @@ -3045,13 +3050,16 @@ cont { height: 14 color: 6710886 offset_y: 1 + is_optional: true } + priority: -9350 } } element { scale: 19 symbol { name: "mormon-m" + priority: 650 min_distance: 10 } caption { @@ -3059,7 +3067,9 @@ cont { height: 14 color: 6710886 offset_y: 1 + is_optional: true } + priority: -9350 } } } @@ -26976,48 +26986,56 @@ cont { scale: 12 area { color: 3156522 + priority: -1930 } } element { scale: 13 area { color: 3156522 + priority: -1930 } } element { scale: 14 area { color: 3156522 + priority: -1930 } } element { scale: 15 area { color: 3156522 + priority: -1930 } } element { scale: 16 area { color: 3156522 + priority: -1930 } } element { scale: 17 area { color: 3156522 + priority: -1930 } } element { scale: 18 area { color: 3156522 + priority: -1930 } } element { scale: 19 area { color: 3156522 + priority: -1930 } } } @@ -37110,6 +37128,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -37122,6 +37141,7 @@ cont { dd: 2.2 dd: 1.26 } + priority: 120 cap: BUTTCAP } } @@ -37134,6 +37154,7 @@ cont { dd: 3.3 dd: 1.8 } + priority: 120 } } element { @@ -37145,6 +37166,7 @@ cont { dd: 4.0 dd: 1.8 } + priority: 120 } } element { @@ -37156,6 +37178,7 @@ cont { dd: 4.0 dd: 1.8 } + priority: 120 } } element { @@ -37167,6 +37190,7 @@ cont { dd: 6.3 dd: 2.7 } + priority: 120 } } } @@ -37181,6 +37205,7 @@ cont { dd: 2.0 dd: 1.35 } + priority: 120 cap: BUTTCAP } } @@ -37193,6 +37218,7 @@ cont { dd: 2.2 dd: 1.26 } + priority: 120 cap: BUTTCAP } } @@ -37205,6 +37231,7 @@ cont { dd: 3.3 dd: 1.8 } + priority: 120 } } element { @@ -37216,6 +37243,7 @@ cont { dd: 4.0 dd: 1.8 } + priority: 120 } } element { @@ -37227,6 +37255,7 @@ cont { dd: 4.0 dd: 1.8 } + priority: 120 } } element { @@ -37238,6 +37267,7 @@ cont { dd: 6.3 dd: 2.7 } + priority: 120 } } }