Skip to content

Commit 75fd257

Browse files
committed
script: update conflicting overrides tags
1 parent e4bb23f commit 75fd257

13 files changed

Lines changed: 297 additions & 297 deletions

Controller/RUL2/06_Road_Viaducts/Sec6a_L1.txt

Lines changed: 111 additions & 111 deletions
Large diffs are not rendered by default.

Controller/RUL2/06_Road_Viaducts/Sec6b_L2.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7897,13 +7897,13 @@
78977897
0x571513A0,0,1,0x57051390,0,1=0x571513A0,0,1,0x570513A0,0,1
78987898
0x571513A0,2,0,0x57051390,2,0=0x571513A0,2,0,0x570513A0,2,0
78997899
;
7900-
0x57051320,0,0,0x57051390,0,1=0x57051320,0,0,0x570513A0,0,1; conflicting-override
7901-
0x57051320,2,1,0x57051390,2,0=0x57051320,2,1,0x570513A0,2,0; conflicting-override
7900+
0x57051320,0,0,0x57051390,0,1=0x57051320,0,0,0x570513A0,0,1
7901+
0x57051320,2,1,0x57051390,2,0=0x57051320,2,1,0x570513A0,2,0
79027902
0x57151320,0,0,0x57051390,0,1=0x57151320,0,0,0x570513A0,0,1
79037903
0x57151320,2,1,0x57051390,2,0=0x57151320,2,1,0x570513A0,2,0
79047904
;
7905-
0x57061320,0,0,0x57051390,0,1=0x57061320,0,0,0x570513A0,0,1; conflicting-override
7906-
0x57061320,2,1,0x57051390,2,0=0x57061320,2,1,0x570513A0,2,0; conflicting-override
7905+
0x57061320,0,0,0x57051390,0,1=0x57061320,0,0,0x570513A0,0,1
7906+
0x57061320,2,1,0x57051390,2,0=0x57061320,2,1,0x570513A0,2,0
79077907
0x57161320,0,0,0x57051390,0,1=0x57161320,0,0,0x570513A0,0,1
79087908
0x57161320,2,1,0x57051390,2,0=0x57161320,2,1,0x570513A0,2,0
79097909
;
@@ -7930,13 +7930,13 @@
79307930
;
79317931
0x57051320,0,0,0x57151380,0,1=0x57051320,0,0,0x571513A0,0,1
79327932
0x57051320,2,1,0x57151380,2,0=0x57051320,2,1,0x571513A0,2,0
7933-
0x57151320,0,0,0x57151380,0,1=0x57151320,0,0,0x571513A0,0,1; conflicting-override
7934-
0x57151320,2,1,0x57151380,2,0=0x57151320,2,1,0x571513A0,2,0; conflicting-override
7933+
0x57151320,0,0,0x57151380,0,1=0x57151320,0,0,0x571513A0,0,1
7934+
0x57151320,2,1,0x57151380,2,0=0x57151320,2,1,0x571513A0,2,0
79357935
;
79367936
0x57061320,0,0,0x57151380,0,1=0x57061320,0,0,0x571513A0,0,1
79377937
0x57061320,2,1,0x57151380,2,0=0x57061320,2,1,0x571513A0,2,0
7938-
0x57161320,0,0,0x57151380,0,1=0x57161320,0,0,0x571513A0,0,1; conflicting-override
7939-
0x57161320,2,1,0x57151380,2,0=0x57161320,2,1,0x571513A0,2,0; conflicting-override
7938+
0x57161320,0,0,0x57151380,0,1=0x57161320,0,0,0x571513A0,0,1
7939+
0x57161320,2,1,0x57151380,2,0=0x57161320,2,1,0x571513A0,2,0
79407940
;
79417941
0x57081320,0,0,0x57151380,0,1=0x57081320,0,0,0x571513A0,0,1
79427942
0x57081320,2,1,0x57151380,2,0=0x57081320,2,1,0x571513A0,2,0
@@ -21410,7 +21410,7 @@
2141021410
0x5C057309,0,0,0x04003800,3,1=0x5C057309,0,0,0x5C050300,0,0; conflicting-override
2141121411
0x5C057309,0,0,0x04003800,2,0=0x5C057309,0,0,0x5C050300,0,0; conflicting-override
2141221412
0x5C057309,0,0,0x04003800,1,1=0x5C057309,0,0,0x5C050300,0,0; conflicting-override
21413-
0x5C057380,0,1,0x04003500,0,1=0x5C057380,0,1,0x5C050200,3,0; conflicting-override
21413+
0x5C057380,0,1,0x04003500,0,1=0x5C057380,0,1,0x5C050200,3,0
2141421414
0x5C057380,2,0,0x04003500,2,0=0x5C057380,2,0,0x5C050200,2,0; conflicting-override
2141521415
0x5C057380,3,0,0x04000200,3,0=0x5C057380,3,0,0x5C050200,3,0
2141621416
0x5C057380,1,1,0x04000200,2,0=0x5C057380,1,1,0x5C050200,2,0

Controller/RUL2/07_RHW/Sec7c_RHWxRHW/Supplement_L2_RHW-2xL2 RHW-2_Crossings.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@
205205
0x57201A20,0,0,0x57151A00,0,0=0x57201A20,0,0,0x57202010,1,1 ;include
206206
0x57204A20,2,0,0x57154A00,0,0=0x57204A20,2,0,0x57208015,1,0 ;include; missing_paths
207207
0x57204A20,2,0,0x57154A00,0,0=0x57204A20,2,0,0x57208095,1,0 ;include; conflicting-override; missing_paths
208-
0x57207A20,2,0,0x57157A40,0,0=0x57207A20,2,0,0x57205090,3,0 ;include; conflicting-override; missing_paths
209-
0x5720AA20,2,0,0x5715AA40,0,0=0x5720AA20,2,0,0x5720B090,0,1 ;include; conflicting-override; missing_paths
208+
0x57207A20,2,0,0x57157A40,0,0=0x57207A20,2,0,0x57205090,3,0 ;include; missing_paths
209+
0x5720AA20,2,0,0x5715AA40,0,0=0x5720AA20,2,0,0x5720B090,0,1 ;include; missing_paths
210210
0x57201A20,2,0,0x57061A00,0,0=0x57201A20,2,0,0x57202100,3,0 ;include; missing_paths
211211
0x57201A20,0,0,0x57061A00,0,0=0x57201A20,0,0,0x57202100,1,1 ;include; missing_paths
212212
0x57204A20,2,0,0x57064A00,0,0=0x57204A20,2,0,0x57208105,1,0 ;include; missing_paths
@@ -218,8 +218,8 @@
218218
0x57201A20,0,0,0x57161A00,0,0=0x57201A20,0,0,0x57202110,1,1 ;include
219219
0x57204A20,2,0,0x57164A00,0,0=0x57204A20,2,0,0x57208115,1,0 ;include; missing_paths
220220
0x57204A20,2,0,0x57164A00,0,0=0x57204A20,2,0,0x57208195,1,0 ;include; conflicting-override; missing_paths
221-
0x57207A20,2,0,0x57167A40,0,0=0x57207A20,2,0,0x57205190,3,0 ;include; conflicting-override; missing_paths
222-
0x5720AA20,2,0,0x5716AA40,0,0=0x5720AA20,2,0,0x5720B190,0,1 ;include; conflicting-override; missing_paths
221+
0x57207A20,2,0,0x57167A40,0,0=0x57207A20,2,0,0x57205190,3,0 ;include; missing_paths
222+
0x5720AA20,2,0,0x5716AA40,0,0=0x5720AA20,2,0,0x5720B190,0,1 ;include; missing_paths
223223
0x57201A20,2,0,0x57071A00,0,0=0x57201A20,2,0,0x57202200,3,0 ;include; missing_paths
224224
0x57201A20,0,0,0x57071A00,0,0=0x57201A20,0,0,0x57202200,1,1 ;include; missing_paths
225225
0x57204A20,2,0,0x57074A00,0,0=0x57204A20,2,0,0x57208205,1,0 ;include; missing_paths
@@ -231,8 +231,8 @@
231231
0x57201A20,0,0,0x57171A00,0,0=0x57201A20,0,0,0x57202210,1,1 ;include
232232
0x57204A20,2,0,0x57174A00,0,0=0x57204A20,2,0,0x57208215,1,0 ;include; missing_paths
233233
0x57204A20,2,0,0x57174A00,0,0=0x57204A20,2,0,0x57208295,1,0 ;include; conflicting-override; missing_paths
234-
0x57207A20,2,0,0x57177A40,0,0=0x57207A20,2,0,0x57205290,3,0 ;include; conflicting-override; missing_paths
235-
0x5720AA20,2,0,0x5717AA40,0,0=0x5720AA20,2,0,0x5720B290,0,1 ;include; conflicting-override; missing_paths
234+
0x57207A20,2,0,0x57177A40,0,0=0x57207A20,2,0,0x57205290,3,0 ;include; missing_paths
235+
0x5720AA20,2,0,0x5717AA40,0,0=0x5720AA20,2,0,0x5720B290,0,1 ;include; missing_paths
236236
0x57201A20,2,0,0x57081A00,0,0=0x57201A20,2,0,0x57202400,3,0 ;include
237237
0x57201A20,0,0,0x57081A00,0,0=0x57201A20,0,0,0x57202400,1,1 ;include
238238
0x57204A20,2,0,0x57084A00,0,0=0x57204A20,2,0,0x57208405,1,0 ;include; missing_paths
@@ -244,8 +244,8 @@
244244
0x57201A20,0,0,0x57181A00,0,0=0x57201A20,0,0,0x57202410,1,1 ;include
245245
0x57204A20,2,0,0x57184A00,0,0=0x57204A20,2,0,0x57208415,1,0 ;include; missing_paths
246246
0x57204A20,2,0,0x57184A00,0,0=0x57204A20,2,0,0x57208495,1,0 ;include; conflicting-override; missing_paths
247-
0x57207A20,2,0,0x57187A40,0,0=0x57207A20,2,0,0x57205490,3,0 ;include; conflicting-override; missing_paths
248-
0x5720AA20,2,0,0x5718AA40,0,0=0x5720AA20,2,0,0x5720B490,0,1 ;include; conflicting-override; missing_paths
247+
0x57207A20,2,0,0x57187A40,0,0=0x57207A20,2,0,0x57205490,3,0 ;include; missing_paths
248+
0x5720AA20,2,0,0x5718AA40,0,0=0x5720AA20,2,0,0x5720B490,0,1 ;include; missing_paths
249249
0x57201A20,2,0,0x57091A00,0,0=0x57201A20,2,0,0x57202500,3,0 ;include; missing_paths
250250
0x57201A20,0,0,0x57091A00,0,0=0x57201A20,0,0,0x57202500,1,1 ;include; missing_paths
251251
0x57204A20,2,0,0x57094A00,0,0=0x57204A20,2,0,0x57208505,1,0 ;include; missing_paths
@@ -257,8 +257,8 @@
257257
0x57201A20,0,0,0x57191A00,0,0=0x57201A20,0,0,0x57202510,1,1 ;include
258258
0x57204A20,2,0,0x57194A00,0,0=0x57204A20,2,0,0x57208515,1,0 ;include; missing_paths
259259
0x57204A20,2,0,0x57194A00,0,0=0x57204A20,2,0,0x57208595,1,0 ;include; conflicting-override; missing_paths
260-
0x57207A20,2,0,0x57197A40,0,0=0x57207A20,2,0,0x57205590,3,0 ;include; conflicting-override; missing_paths
261-
0x5720AA20,2,0,0x5719AA40,0,0=0x5720AA20,2,0,0x5720B590,0,1 ;include; conflicting-override; missing_paths
260+
0x57207A20,2,0,0x57197A40,0,0=0x57207A20,2,0,0x57205590,3,0 ;include; missing_paths
261+
0x5720AA20,2,0,0x5719AA40,0,0=0x5720AA20,2,0,0x5720B590,0,1 ;include; missing_paths
262262
0x57201A20,2,0,0x570A1A00,0,0=0x57201A20,2,0,0x57202600,3,0 ;include; missing_paths
263263
0x57201A20,0,0,0x570A1A00,0,0=0x57201A20,0,0,0x57202600,1,1 ;include; missing_paths
264264
0x57204A20,2,0,0x570A4A00,0,0=0x57204A20,2,0,0x57208605,1,0 ;include; missing_paths
@@ -270,8 +270,8 @@
270270
0x57201A20,0,0,0x571A1A00,0,0=0x57201A20,0,0,0x57202610,1,1 ;include; missing_paths
271271
0x57204A20,2,0,0x571A4A00,0,0=0x57204A20,2,0,0x57208615,1,0 ;include; missing_paths
272272
0x57204A20,2,0,0x571A4A00,0,0=0x57204A20,2,0,0x57208695,1,0 ;include; conflicting-override; missing_paths
273-
0x57207A20,2,0,0x571A7A40,0,0=0x57207A20,2,0,0x57205690,3,0 ;include; conflicting-override; missing_paths
274-
0x5720AA20,2,0,0x571AAA40,0,0=0x5720AA20,2,0,0x5720B690,0,1 ;include; conflicting-override; missing_paths
273+
0x57207A20,2,0,0x571A7A40,0,0=0x57207A20,2,0,0x57205690,3,0 ;include; missing_paths
274+
0x5720AA20,2,0,0x571AAA40,0,0=0x5720AA20,2,0,0x5720B690,0,1 ;include; missing_paths
275275
0x57201A20,2,0,0x57011A00,2,0=0x57201A20,2,0,0x57101B00,3,1 ;include
276276
0x57201A20,0,0,0x57011A00,2,0=0x57201A20,0,0,0x57101B00,1,0 ;include
277277
0x57204A20,2,0,0x57014A80,0,0=0x57204A20,2,0,0x57107B80,1,0 ;include; missing_paths

Controller/RUL2/07_RHW/Sec7c_RHWxRHW/Supplement_L2_RHW-2xMIS_Crossings.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
0x57107C00,2,0,0x57037A00,0,0=0x57107C00,2,0,0x57024D00,3,0 ;include; missing_paths
8484
0x57107C05,2,0,0x57037A00,0,0=0x57107C05,2,0,0x57024D80,3,0 ;include; missing_paths
8585
0x5710AC05,2,0,0x5703AA00,0,0=0x5710AC05,2,0,0x5702AD00,0,1 ;include; missing_paths
86-
0x5710AC00,2,0,0x5703AA00,0,0=0x5710AC00,2,0,0x5702AD80,0,1 ;include; conflicting-override; missing_paths
86+
0x5710AC00,2,0,0x5703AA00,0,0=0x5710AC00,2,0,0x5702AD80,0,1 ;include; missing_paths
8787
0x57101C00,2,0,0x57031A00,2,0=0x57101C00,2,0,0x57021D00,3,1 ;include; missing_paths
8888
0x57101C00,0,0,0x57031A00,2,0=0x57101C00,0,0,0x57021D00,1,0 ;include; missing_paths
8989
0x57104C05,2,0,0x57034A80,0,0=0x57104C05,2,0,0x57027D00,1,0 ;include; missing_paths

0 commit comments

Comments
 (0)