diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 8b48b4e18b..18a2900823 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 16ec3b0d9f..5c0eabbea1 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -29742,6 +29742,23 @@ cont { } apply_if: "name" } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + apply_if: "!name" + } } cont { name: "historic-ship" @@ -31319,6 +31336,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 12372094 + priority: -15941 + } + apply_if: "!name" + } element { scale: 13 area { @@ -31341,6 +31366,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 11781233 + priority: -15941 + } + apply_if: "!name" + } element { scale: 14 area { @@ -31604,6 +31637,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 12372094 + priority: -15941 + } + apply_if: "!name" + } element { scale: 13 area { @@ -31626,6 +31667,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 11781233 + priority: -15941 + } + apply_if: "!name" + } element { scale: 14 area { @@ -31889,6 +31938,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 12372094 + priority: -15941 + } + apply_if: "!name" + } element { scale: 13 area { @@ -31911,6 +31968,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 11781233 + priority: -15941 + } + apply_if: "!name" + } element { scale: 14 area { @@ -32174,6 +32239,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 12372094 + priority: -15941 + } + apply_if: "!name" + } element { scale: 13 area { @@ -32196,6 +32269,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 11781233 + priority: -15941 + } + apply_if: "!name" + } element { scale: 14 area { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index ba7e9e74ce..860cc8002f 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 7652067192..e04a5fc742 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -29534,6 +29534,23 @@ cont { } apply_if: "name" } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + apply_if: "!name" + } } cont { name: "historic-ship" @@ -31111,6 +31128,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 12372094 + priority: -15941 + } + apply_if: "!name" + } element { scale: 13 area { @@ -31133,6 +31158,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 11781233 + priority: -15941 + } + apply_if: "!name" + } element { scale: 14 area { @@ -31396,6 +31429,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 12372094 + priority: -15941 + } + apply_if: "!name" + } element { scale: 13 area { @@ -31418,6 +31459,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 11781233 + priority: -15941 + } + apply_if: "!name" + } element { scale: 14 area { @@ -31681,6 +31730,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 12372094 + priority: -15941 + } + apply_if: "!name" + } element { scale: 13 area { @@ -31703,6 +31760,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 11781233 + priority: -15941 + } + apply_if: "!name" + } element { scale: 14 area { @@ -31966,6 +32031,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 12372094 + priority: -15941 + } + apply_if: "!name" + } element { scale: 13 area { @@ -31988,6 +32061,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 11781233 + priority: -15941 + } + apply_if: "!name" + } element { scale: 14 area { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 903ba8a9b2..7a86bfaca5 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 ce296c1a81..9f26b573f1 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -29690,6 +29690,23 @@ cont { } apply_if: "name" } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + apply_if: "!name" + } } cont { name: "historic-ship" @@ -31262,6 +31279,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 1317888 + priority: -15941 + } + apply_if: "!name" + } element { scale: 13 area { @@ -31284,6 +31309,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 1317888 + priority: -15941 + } + apply_if: "!name" + } element { scale: 14 area { @@ -31547,6 +31580,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 1317888 + priority: -15941 + } + apply_if: "!name" + } element { scale: 13 area { @@ -31569,6 +31610,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 1317888 + priority: -15941 + } + apply_if: "!name" + } element { scale: 14 area { @@ -31832,6 +31881,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 1317888 + priority: -15941 + } + apply_if: "!name" + } element { scale: 13 area { @@ -31854,6 +31911,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 1317888 + priority: -15941 + } + apply_if: "!name" + } element { scale: 14 area { @@ -32117,6 +32182,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 1317888 + priority: -15941 + } + apply_if: "!name" + } element { scale: 13 area { @@ -32139,6 +32212,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 1317888 + priority: -15941 + } + apply_if: "!name" + } element { scale: 14 area { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 9a0e0a0462..28c3552777 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 ec623ba319..bbeb83b325 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -18336,6 +18336,22 @@ cont { } apply_if: "name" } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16764 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15764 + } + apply_if: "!name" + } } cont { name: "historic-ship" @@ -19053,6 +19069,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 13031851 + priority: -15906 + } + apply_if: "!name" + } element { scale: 13 area { @@ -19075,6 +19099,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 13031851 + priority: -15906 + } + apply_if: "!name" + } element { scale: 14 area { @@ -19302,6 +19334,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 13031851 + priority: -15906 + } + apply_if: "!name" + } element { scale: 13 area { @@ -19324,6 +19364,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 13031851 + priority: -15906 + } + apply_if: "!name" + } element { scale: 14 area { @@ -19551,6 +19599,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 13031851 + priority: -15906 + } + apply_if: "!name" + } element { scale: 13 area { @@ -19573,6 +19629,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 13031851 + priority: -15906 + } + apply_if: "!name" + } element { scale: 14 area { @@ -19800,6 +19864,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 13031851 + priority: -15906 + } + apply_if: "!name" + } element { scale: 13 area { @@ -19822,6 +19894,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 13031851 + priority: -15906 + } + apply_if: "!name" + } element { scale: 14 area { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index b1b209f965..6be236c0b9 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 a80734bee7..9fc421b6f3 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -18726,6 +18726,22 @@ cont { } apply_if: "name" } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16764 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15764 + } + apply_if: "!name" + } } cont { name: "historic-ship" @@ -19443,6 +19459,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 593674 + priority: -15906 + } + apply_if: "!name" + } element { scale: 13 area { @@ -19465,6 +19489,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 593674 + priority: -15906 + } + apply_if: "!name" + } element { scale: 14 area { @@ -19692,6 +19724,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 593674 + priority: -15906 + } + apply_if: "!name" + } element { scale: 13 area { @@ -19714,6 +19754,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 593674 + priority: -15906 + } + apply_if: "!name" + } element { scale: 14 area { @@ -19941,6 +19989,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 593674 + priority: -15906 + } + apply_if: "!name" + } element { scale: 13 area { @@ -19963,6 +20019,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 593674 + priority: -15906 + } + apply_if: "!name" + } element { scale: 14 area { @@ -20190,6 +20254,14 @@ cont { } apply_if: "name" } + element { + scale: 12 + area { + color: 593674 + priority: -15906 + } + apply_if: "!name" + } element { scale: 13 area { @@ -20212,6 +20284,14 @@ cont { } apply_if: "name" } + element { + scale: 13 + area { + color: 593674 + priority: -15906 + } + apply_if: "!name" + } element { scale: 14 area { diff --git a/data/resources-6plus_clear/symbols-ad.png b/data/resources-6plus_clear/symbols-ad.png index 9f616ba041..1c43e695aa 100644 Binary files a/data/resources-6plus_clear/symbols-ad.png and b/data/resources-6plus_clear/symbols-ad.png differ diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png index 6395eb0f6d..884510eb19 100644 Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ diff --git a/data/resources-6plus_dark/symbols-ad.png b/data/resources-6plus_dark/symbols-ad.png index 4e1a8b8b89..20c3a2a306 100644 Binary files a/data/resources-6plus_dark/symbols-ad.png and b/data/resources-6plus_dark/symbols-ad.png differ diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png index 225015c05a..1900b161fc 100644 Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ diff --git a/data/resources-hdpi_clear/symbols-ad.png b/data/resources-hdpi_clear/symbols-ad.png index c7d197d91d..998b3ebfb3 100644 Binary files a/data/resources-hdpi_clear/symbols-ad.png and b/data/resources-hdpi_clear/symbols-ad.png differ diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png index 5117a45ac1..ad58f6dcee 100644 Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ diff --git a/data/resources-hdpi_dark/symbols-ad.png b/data/resources-hdpi_dark/symbols-ad.png index dacf2897b8..f135ca2854 100644 Binary files a/data/resources-hdpi_dark/symbols-ad.png and b/data/resources-hdpi_dark/symbols-ad.png differ diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png index 9309f7b5dd..ca21a4d411 100644 Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ diff --git a/data/resources-mdpi_clear/symbols-ad.png b/data/resources-mdpi_clear/symbols-ad.png index a53ccdc702..5a7249ef72 100644 Binary files a/data/resources-mdpi_clear/symbols-ad.png and b/data/resources-mdpi_clear/symbols-ad.png differ diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png index fc0f1b624a..23e8f8a6cc 100644 Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ diff --git a/data/resources-mdpi_dark/symbols-ad.png b/data/resources-mdpi_dark/symbols-ad.png index 1dde59c1a8..da357d244f 100644 Binary files a/data/resources-mdpi_dark/symbols-ad.png and b/data/resources-mdpi_dark/symbols-ad.png differ diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png index a939172355..423e89ef38 100644 Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ diff --git a/data/resources-xhdpi_clear/symbols-ad.png b/data/resources-xhdpi_clear/symbols-ad.png index 949895001c..0ff1c75b1f 100644 Binary files a/data/resources-xhdpi_clear/symbols-ad.png and b/data/resources-xhdpi_clear/symbols-ad.png differ diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png index fefcc910f8..b539a3e905 100644 Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ diff --git a/data/resources-xhdpi_dark/symbols-ad.png b/data/resources-xhdpi_dark/symbols-ad.png index d7a678de22..915c0eaba2 100644 Binary files a/data/resources-xhdpi_dark/symbols-ad.png and b/data/resources-xhdpi_dark/symbols-ad.png differ diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png index e392a81016..ed1d7cd3ee 100644 Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ diff --git a/data/resources-xxhdpi_clear/symbols-ad.png b/data/resources-xxhdpi_clear/symbols-ad.png index e22816fbb9..528b00dc3f 100644 Binary files a/data/resources-xxhdpi_clear/symbols-ad.png and b/data/resources-xxhdpi_clear/symbols-ad.png differ diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png index b8c2e512ee..7449631fab 100644 Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ diff --git a/data/resources-xxhdpi_dark/symbols-ad.png b/data/resources-xxhdpi_dark/symbols-ad.png index a45c91b39d..c4e60f57ec 100644 Binary files a/data/resources-xxhdpi_dark/symbols-ad.png and b/data/resources-xxhdpi_dark/symbols-ad.png differ diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png index b53f5c9071..d766938e65 100644 Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ diff --git a/data/resources-xxxhdpi_clear/symbols-ad.png b/data/resources-xxxhdpi_clear/symbols-ad.png index ce2b8aa0ff..4849fe60f8 100644 Binary files a/data/resources-xxxhdpi_clear/symbols-ad.png and b/data/resources-xxxhdpi_clear/symbols-ad.png differ diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png index e4e32944a8..916ae7f0b6 100644 Binary files a/data/resources-xxxhdpi_clear/symbols.png and b/data/resources-xxxhdpi_clear/symbols.png differ diff --git a/data/resources-xxxhdpi_dark/symbols-ad.png b/data/resources-xxxhdpi_dark/symbols-ad.png index 901439f4c4..922fe088d5 100644 Binary files a/data/resources-xxxhdpi_dark/symbols-ad.png and b/data/resources-xxxhdpi_dark/symbols-ad.png differ diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png index cdc875bdb2..e236457d2d 100644 Binary files a/data/resources-xxxhdpi_dark/symbols.png and b/data/resources-xxxhdpi_dark/symbols.png differ