From b25eb2ff4175b196888905562b30139883003d18 Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Wed, 28 Jun 2017 02:04:25 +0300 Subject: [PATCH] Regenerated drules. --- data/colors.txt | 1 + data/drules_proto.bin | Bin 200202 -> 199873 bytes data/drules_proto.txt | 168 ++++++++------------------- data/drules_proto_clear.bin | Bin 199438 -> 199473 bytes data/drules_proto_clear.txt | 6 + data/drules_proto_dark.bin | Bin 198103 -> 198138 bytes data/drules_proto_dark.txt | 6 + data/drules_proto_vehicle_clear.bin | Bin 128177 -> 127644 bytes data/drules_proto_vehicle_clear.txt | 169 +--------------------------- data/drules_proto_vehicle_dark.bin | Bin 127225 -> 126708 bytes data/drules_proto_vehicle_dark.txt | 169 +--------------------------- data/visibility.txt | 6 +- 12 files changed, 76 insertions(+), 449 deletions(-) diff --git a/data/colors.txt b/data/colors.txt index 807c9e1f8a..52ed7ad91e 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -29,6 +29,7 @@ 1844736 1913758 1973790 +2004720 2038026 2038555 2171163 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 8593781bf2d38834030871598937c3b6152429d8..e2fda68bd125b20aa56e2679412f20d060fb9aca 100644 GIT binary patch delta 82 zcmeC0!*g&ZPeTji7N(28w|o3y%3|8C`Jd?v6VrOe>GDj>5~_k6+*Z6?>>Qi|yEji_ al9<`TC?v?igC;cn_D`nb?OM#t54Zqrrx|zv delta 346 zcmX>&lc#GAPeTji7N(28B}%zO%M(jdi^>x#byG4+k~4HmO7rqkbEdET%cRNJI6e0_ zlOAK^_S3(a3Ybt87bRxqVOMPWkLec^Qy0^8Lq=u^A4v`_AyG~SF!*3Eu>avLMukRx z14au*AxREy+)_MPq^2K?W)!JMHG&U|I;iRVxTOSeO9|qZ5&}sHVR~izeMaU-TmZd^ BT~7c2 diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 84ac6bdd80..57ff080738 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -64550,37 +64550,6 @@ cont { } } } -cont { - name: "waterway-ditch-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} cont { name: "waterway-dock" element { @@ -64769,37 +64738,6 @@ cont { } } } -cont { - name: "waterway-drain-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} cont { name: "waterway-lock" element { @@ -65046,94 +64984,84 @@ cont { } cont { name: "waterway-river-tunnel" - element { - scale: 10 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP - } - } element { scale: 11 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP + path_text { + primary { + height: 9 + color: 4495803 + } + priority: 16921 } } element { scale: 12 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP + path_text { + primary { + height: 9 + color: 4495803 + } + priority: 16921 } } element { scale: 13 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP + path_text { + primary { + height: 9 + color: 4495803 + } + priority: 16921 } } element { scale: 14 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP + path_text { + primary { + height: 9 + color: 4495803 + } + priority: 16921 } } element { scale: 15 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP + path_text { + primary { + height: 9 + color: 4495803 + } + priority: 16921 } } element { scale: 16 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP + path_text { + primary { + height: 9 + color: 4495803 + } + priority: 16921 } } element { scale: 17 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP + path_text { + primary { + height: 9 + color: 4495803 + } + priority: 16921 } } element { scale: 18 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP + path_text { + primary { + height: 9 + color: 4495803 + } + priority: 16921 } } } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 77b0a2d11ed42f377cc34326c2ef9b880d16a35b..4d72b847d0ea3c085c6d2c6a2612a2b58c604ca9 100644 GIT binary patch delta 59 zcmeC1#?8|fhvgD JI-S{p6#z%i5yb!i delta 22 ecmey>&2zn*r=f+hg=q@&RHg%5TX!)#umS*UNC-Lr diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 3f615e2799..0fada5a547 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -65323,6 +65323,12 @@ cont { } } colors { + value { + name: "DefaultTrackColor" + color: 2004720 + x: 0 + y: 0 + } value { name: "RoadShieldWhiteText" color: 12039862 diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 6b837394501e6b03fe3efc1e7befdbd370987a21..fe15d23f5db232d2b27ccbc523891157cbae5956 100644 GIT binary patch delta 169 zcmdn^l6}ro_J%Etn;vhEe8QN;v_0!NV>1)eA;#(NUouLl3UY8;@p7?qa0=|+Jc&tS zW(%W`AO{bc(DcxUjQZ-_$VvpjN>GFZAwttvKV&r6KIb*#Rc6(PTwID=f-b3PiKRIu fAw`MF+0OYn`9%UB)>g?f0D&rq*k1ge(T)`Wv}Q71 delta 109 zcmbR9lzrn%_J%Etn;uIpVdN4mPb^6-Do?D`P01`t&d@C>&C5&8ncnx5v2XjP$BbD_ wXo`vwGxMN|wgVLjGBd4Vp1$w}qr`Tu=ZsSsx2L>hyvoe9k869}TShxp0F=EeHvj+t diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 5f34f6bc1a..e093f7438c 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -39587,51 +39587,6 @@ cont { } } } -cont { - name: "waterway-ditch-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 19 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} cont { name: "waterway-dock" element { @@ -39820,51 +39775,6 @@ cont { } } } -cont { - name: "waterway-drain-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 19 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} cont { name: "waterway-lock" element { @@ -40111,25 +40021,8 @@ cont { } cont { name: "waterway-river-tunnel" - element { - scale: 10 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP - } - } element { scale: 11 - lines { - width: 1.2 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP - } path_text { primary { height: 9 @@ -40140,13 +40033,6 @@ cont { } element { scale: 12 - lines { - width: 1.2 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP - } path_text { primary { height: 9 @@ -40157,13 +40043,6 @@ cont { } element { scale: 13 - lines { - width: 1.6 - color: 3584191 - priority: 1921 - join: ROUNDJOIN - cap: BUTTCAP - } path_text { primary { height: 9 @@ -40174,13 +40053,6 @@ cont { } element { scale: 14 - lines { - width: 1.8 - color: 3584191 - priority: 1921 - join: ROUNDJOIN - cap: BUTTCAP - } path_text { primary { height: 9 @@ -40191,13 +40063,6 @@ cont { } element { scale: 15 - lines { - width: 2.2 - color: 3584191 - priority: 1921 - join: ROUNDJOIN - cap: BUTTCAP - } path_text { primary { height: 11 @@ -40208,13 +40073,6 @@ cont { } element { scale: 16 - lines { - width: 2.2 - color: 3584191 - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } path_text { primary { height: 11 @@ -40225,13 +40083,6 @@ cont { } element { scale: 17 - lines { - width: 2.2 - color: 3584191 - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } path_text { primary { height: 11 @@ -40242,13 +40093,6 @@ cont { } element { scale: 18 - lines { - width: 2.2 - color: 3584191 - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } path_text { primary { height: 11 @@ -40259,13 +40103,6 @@ cont { } element { scale: 19 - lines { - width: 2.2 - color: 3584191 - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } path_text { primary { height: 11 @@ -40605,6 +40442,12 @@ cont { } } colors { + value { + name: "DefaultTrackColor" + color: 2004720 + x: 0 + y: 0 + } value { name: "RoadShieldWhiteText" color: 16777215 diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index d3ea1e3709435a4b09221f5122b4d5020e0e074c..96b2fc70973072939b69c65908188e356a11d7be 100644 GIT binary patch delta 183 zcmezQkp0VD_J%EtlOJq1f5>Rhv|Z{6V-Az;PDU=#^2CzVqVmK_-J;C0)FR!I(!9LX z93cS?ZYv%xHV#gKn^PDiX0|W_MR-s}ru*Du)K%q1QXl|UfGi>i5t%*@sC2v13&yF; ts*kz26uAUlQqvMkb4o&r5|gu?^Ka#=W9j>RsfX!HC_M! delta 109 zcmexzm;L8M_J%EtlOISfWaJVpPb^6-Do?D`P01`t&d@C>&C5&8+0OBR@e~u9d{JU% w9#nohP`-QnrALf8OiVMGr#n1ll-R!KF=G?s_FqpKr!q4g;M%_BC8Gl?0Gco?D*ylh diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index c6d6f33420..fb44e5f3bb 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -39587,51 +39587,6 @@ cont { } } } -cont { - name: "waterway-ditch-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 19 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} cont { name: "waterway-dock" element { @@ -39820,51 +39775,6 @@ cont { } } } -cont { - name: "waterway-drain-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 19 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} cont { name: "waterway-lock" element { @@ -40111,25 +40021,8 @@ cont { } cont { name: "waterway-river-tunnel" - element { - scale: 10 - lines { - width: 1.0 - color: 401446 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP - } - } element { scale: 11 - lines { - width: 1.2 - color: 401446 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP - } path_text { primary { height: 9 @@ -40140,13 +40033,6 @@ cont { } element { scale: 12 - lines { - width: 1.2 - color: 401446 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP - } path_text { primary { height: 9 @@ -40157,13 +40043,6 @@ cont { } element { scale: 13 - lines { - width: 1.6 - color: 401446 - priority: 1921 - join: ROUNDJOIN - cap: BUTTCAP - } path_text { primary { height: 9 @@ -40174,13 +40053,6 @@ cont { } element { scale: 14 - lines { - width: 1.8 - color: 401446 - priority: 1921 - join: ROUNDJOIN - cap: BUTTCAP - } path_text { primary { height: 9 @@ -40191,13 +40063,6 @@ cont { } element { scale: 15 - lines { - width: 2.2 - color: 401446 - priority: 1921 - join: ROUNDJOIN - cap: BUTTCAP - } path_text { primary { height: 11 @@ -40208,13 +40073,6 @@ cont { } element { scale: 16 - lines { - width: 2.2 - color: 401446 - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } path_text { primary { height: 11 @@ -40225,13 +40083,6 @@ cont { } element { scale: 17 - lines { - width: 2.2 - color: 401446 - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } path_text { primary { height: 11 @@ -40242,13 +40093,6 @@ cont { } element { scale: 18 - lines { - width: 2.2 - color: 401446 - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } path_text { primary { height: 11 @@ -40259,13 +40103,6 @@ cont { } element { scale: 19 - lines { - width: 2.2 - color: 401446 - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } path_text { primary { height: 11 @@ -40605,6 +40442,12 @@ cont { } } colors { + value { + name: "DefaultTrackColor" + color: 2004720 + x: 0 + y: 0 + } value { name: "RoadShieldWhiteText" color: 12039862 diff --git a/data/visibility.txt b/data/visibility.txt index 7bd8a73d5a..c5b224a3ea 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -887,16 +887,16 @@ world 00000000000000000000 + {} dam 00000000000000011111 - ditch 00000000000000000111 + - tunnel 00000000000000000111 - + tunnel 00000000000000000000 - {} dock 11111111111111111111 - drain 00000000000000000111 + - tunnel 00000000000000000111 - + tunnel 00000000000000000000 - {} lock 00000000000000001111 - lock_gate 00000000000000001111 - river 00000000001111111111 + - tunnel 00000000001111111111 - + tunnel 00000000000111111111 - {} riverbank 11111111111111111111 - stream 00000000000000000000 +