Skip to content

Neocrimson #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Yaro-1337 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Neocrimson #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51e92ea
Neocrimosn start
Yaro-1337 May 6, 2025
f6a12e1
Фикс СТ
Yaro-1337 May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const stepLength = 1;

const wagonLength = 19.16;
const wagonCount = 5;
const wagonCount = 4;

const interval = 90;
const interval = 3600/44;

const trainHalf = wagonLength * wagonCount / 2;

Expand Down
106 changes: 63 additions & 43 deletions data/neocrimson/1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,23 @@ lines['neocrimson']['1'] = [
{ x: 1010.5 - 6.5, name: '33', limit: 60 },
{ x: 1048 + 6, name: '35', limit: 60 },
{ x: 1098 + 6, name: '37', limit: 40, /*vks: 'min'*/ },
{ x: 1154, name: '37а', limit: 0 },
{ x: 1179, name: '39', limit: 0 },
{ x: 1179 - 12.5, name: '39', limit: 0 },
{ x: 1179 + 40 - 6 + 3.5, name: '41', limit: 0 },
{ x: 1179 + 40 - 6 + 50 - 12.5 + 12.5, name: '43', limit: 0 },
{ x: 1179 + 40 - 6 + 90 - 2.5 + 12.5, name: '45', limit: 0 },
{ x: 1179 + 40 - 6 + 90 + 60, name: '45а', limit: 0 },
],
signals: [
{ joint: '19', name: 'БР-21', lenses: 'WYYGRw', autostop: 1, guard: 35, y: '21а', yg: 'NEXT_y', g: 'NEXT_yg' },
{ joint: '19', name: 'БР-21', lenses: 'BWYYGRw', autostop: 1, guard: 35, y: '21а', yg: 'NEXT_y', g: 'NEXT_yg' },
{ joint: '21', name: '23', lenses: 'YYGR', autostop: 1, guard: 70, y: '23', yg: 'NEXT_y', g: 'NEXT_yg' },
{ joint: '21а', name: '25', lenses: 'YYGR', autostop: 1, guard: 80, y: '25а', yg: 'NEXT_y', g: 'NEXT_yg' },
{ joint: '23', name: '27', lenses: 'YYGR', autostop: 1, guard: 80, y: '27', yg: 'NEXT_y', g: 'NEXT_yg' },
{ joint: '25', name: '29', lenses: 'YYGR', autostop: 1, guard: 70, y: '29', yg: 'NEXT_y', g: 'NEXT_yg' },
{ joint: '25а', name: '31', lenses: 'YYGR', autostop: 1, guard: 65, y: '31', yg: 'NEXT_y', g: 'NEXT_yg' },
{ joint: '27', name: '33', lenses: 'YYGR', autostop: 1, guard: 60, y: '33', yg: 'NEXT_y', g: 'NEXT_g' },
{ joint: '29', name: '35', lenses: 'YYGR', autostop: 1, guard: 60, y: '35', g: 'NEXT_yg' },
{ joint: '31', name: 'ПН-37', lenses: 'YYGRw', autostop: 1, guard: 60, yg: '37а', shift: 13 },
{ joint: '37', name: 'ПН-39', lenses: 'x', autostop: 1, guard: 35 },
{ joint: '31', name: 'ПН-37', lenses: 'BYYGRw', autostop: 1, guard: 60, yg: '37', shift: 13 },
{ joint: '37', name: 'ПН-39', lenses: 'x', autostop: 1, guard: 35, shift: 13 },
{ joint: '43', name: '41', lenses: 'x', autostop: 1 },
{ joint: '45', name: '43', lenses: 'x', autostop: 1 },
{ joint: '45а', name: '45', lenses: 'x', autostop: 1 },
Expand Down Expand Up @@ -92,37 +91,58 @@ lines['neocrimson']['1'] = [
},
joints: [
{ x: 50, name: '37', limit: 60 },
{ x: 50 + 50, name: '37а', limit: 60, later: { 40: 2 } },
{ x: 50 + 50 + 25, name: '39', limit: 60, later: { 40: 1 } },
{ x: 120 + 40 + 2.5, name: '39а', limit: 60 },
{ x: 697.5 - 25 - 25 - 62.5 - 62.5 - 75 - 75 - 62.5 - 50 - 50, name: '39б', limit: 60 },
{ x: 697.5 - 25 - 25 - 62.5 - 62.5 - 75 - 75 - 62.5 - 50, name: '39в', limit: 60 },
{ x: 697.5 - 25 - 25 - 62.5 - 62.5 - 75 - 75 - 62.5, name: '39г', limit: 60 },
{ x: 697.5 - 25 - 25 - 62.5 - 62.5 - 75 - 75, name: '39д', limit: 60 },
{ x: 697.5 - 25 - 25 - 62.5 - 62.5 - 75, name: '41', limit: 60 },
{ x: 697.5 - 25 - 25 - 62.5 - 62.5, name: '43', limit: 60 },
{ x: 697.5 - 25 - 25 - 62.5, name: '45', limit: 60 },
{ x: 697.5 - 25 - 25, name: '47', limit: 60 },
{ x: 697.5 - 25, name: '47с', limit: 60, vks: 'min' },
{ x: 697.5, name: '49', limit: 60 },
{ x: 710, name: '49с', limit: 40, vks: 'min' },
{ x: 680 + 55, name: '51', limit: 40 },
{ x: 785 - 12.5, name: '53', limit: 0, },
{ x: 680 + 155, name: '55', limit: 0, },
{ x: 935 - 25, name: '55а', limit: 0 },
{ x: 1010 + 25, name: '49а', limit: 0 },
{ x: 50 + 50 + 12.5, name: '39', limit: 60, later: { 40: 1 } },
{ x: 120 + 52.5 + 2.5, name: '39а', limit: 60 },
{ x: 680 - 50 - 62.5 - 87.5 - 87.5 - 75 - 75, name: '39б', limit: 60 },
{ x: 680 - 50 - 62.5 - 87.5 - 87.5 - 75, name: '39в', limit: 60 },
{ x: 680 - 50 - 62.5 - 87.5 - 87.5, name: '39г', limit: 60 },
{ x: 680 - 50 - 62.5 - 87.5, name: '45', limit: 60 },
{ x: 680 - 50 - 62.5, name: '45а', limit: 60 },
{ x: 680 - 25 - 37.5, name: '47', limit: 60 },
{ x: 680 - 25, name: '49', limit: 60 },
{ x: 680 + 12.5, name: '51с', limit: 60, vks: 'min' },
{ x: 680 + 50, name: '53', limit: 40 },
{ x: 680 + 50 + 62.5, name: '55', limit: 0 },
{ x: 680 + 50 + 62.5 + 75, name: '55а', limit: 0 },
{ x: 680 + 50 + 62.5 + 75 + 77.5, name: '55б', limit: 0 },
{ x: 680 + 50 + 62.5 + 75 + 77.5 + 125, name: '55в', limit: 0 },
// { x: 697.5 - 25 - 25 - 62.5 - 62.5 - 75 - 75 - 62.5 - 50 - 50, name: '39б', limit: 60 },
// { x: 697.5 - 25 - 25 - 62.5 - 62.5 - 75 - 75 - 62.5 - 50, name: '39в', limit: 60 },
// { x: 697.5 - 25 - 25 - 62.5 - 62.5 - 75 - 75 - 62.5, name: '39г', limit: 60 },
// { x: 697.5 - 25 - 25 - 62.5 - 62.5 - 75 - 75, name: '39д', limit: 60 },
// { x: 697.5 - 25 - 25 - 62.5 - 62.5 - 75, name: '41', limit: 60 },
// { x: 697.5 - 25 - 25 - 62.5 - 62.5, name: '43', limit: 60 },
// { x: 697.5 - 25 - 25 - 62.5, name: '45', limit: 60 },
// { x: 697.5 - 25 - 25, name: '47', limit: 60 },
// { x: 697.5 - 25, name: '47с', limit: 60, vks: 'min' },
// { x: 697.5, name: '49', limit: 60 },
// { x: 710, name: '49с', limit: 40, vks: 'min' },
// { x: 680 + 55, name: '51', limit: 40 },
// { x: 785 - 12.5, name: '53', limit: 0, },
// { x: 680 + 155, name: '55', limit: 0, },
// { x: 935 - 25, name: '55а', limit: 0 },
// { x: 1010 + 25, name: '49а', limit: 0 },
],
signals: [
{ joint: '37', name: 'ПН-39', lenses: 'WYY-GR-w', autostop: 3, guard: 35, y: '39д', yg: 'NEXT_y', g: 'NEXT_yg' },
{ joint: '39б', name: '41', lenses: 'YYGR', autostop: 1, guard: 60, y: '41', yg: 'NEXT_y', g: 'NEXT_yg' },
{ joint: '39в', name: '43', lenses: 'YYGR', autostop: 1, guard: 60, y: '43', yg: 'NEXT_y', g: 'NEXT_yg' },
{ joint: '39г', name: '45', lenses: 'YYGR', autostop: 1, guard: 60, y: '45', yg: 'NEXT_y', g: 'NEXT_yg' },
{ joint: '39д', name: '47', lenses: 'YYGR', autostop: 1, guard: 60, y: '47с', yg: 'NEXT_y', g: 'NEXT_yg', shift: 13 },
{ joint: '41', name: '49', lenses: 'YYGR', autostop: 1, guard: 60, y: '49с', yg: 'NEXT_y', g: 'NEXT_g' },
{ joint: '43', name: '51', lenses: 'YYGR', autostop: 1, guard: 60, y: '51', g: 'NEXT_yg' },
{ joint: '45', name: '53', lenses: 'YYGR', autostop: 1, guard: 60, yg: '53', left: true },
{ joint: '51', name: '55', lenses: 'x', autostop: 3, guard: 35 },
{ joint: '55а', name: '57', lenses: 'x', left: true },
{ joint: '37', name: 'ПН-39', lenses: 'BWYYGRw', autostop: 1, guard: 60, y: '39г', g: 'NEXT_y' },
// { joint: '39а', name: '41', lenses: 'YYGR', autostop: 1, guard: 60, y: '41', g: 'NEXT_y' },
{ joint: '39б', name: '45', lenses: 'YYGR', autostop: 1, guard: 60, y: '45а', g: 'NEXT_y' },
{ joint: '39в', name: '47', lenses: 'YYGR', autostop: 1, guard: 60, y: '47', yg: 'NEXT_y', g: 'NEXT_yg' },
{ joint: '39г', name: '49', lenses: 'YYGR', autostop: 1, guard: 60, y: '49', yg: 'NEXT_y', g: 'NEXT_g', shift: 16 },
{ joint: '45', name: '51', lenses: 'YYGR', autostop: 1, guard: 60, y: '51с', g: 'NEXT_yg', shift: 18 },
{ joint: '45а', name: '53', lenses: 'YYGR', autostop: 1, guard: 60, yg: '53', shift: 18 },
{ joint: '53', name: '55', lenses: 'x', autostop: 3, guard: 35 },
{ joint: '55б', name: '57', lenses: 'x', autostop: 3, guard: 0, left: true },
// { joint: '37', name: 'ПН-39', lenses: 'WYY-GR-w', autostop: 3, guard: 35, y: '39д', yg: 'NEXT_y', g: 'NEXT_yg' },
// { joint: '39б', name: '41', lenses: 'YYGR', autostop: 1, guard: 60, y: '41', yg: 'NEXT_y', g: 'NEXT_yg' },
// { joint: '39в', name: '43', lenses: 'YYGR', autostop: 1, guard: 60, y: '43', yg: 'NEXT_y', g: 'NEXT_yg' },
// { joint: '39г', name: '45', lenses: 'YYGR', autostop: 1, guard: 60, y: '45', yg: 'NEXT_y', g: 'NEXT_yg' },
// { joint: '39д', name: '47', lenses: 'YYGR', autostop: 1, guard: 60, y: '47с', yg: 'NEXT_y', g: 'NEXT_yg', shift: 13 },
// { joint: '41', name: '49', lenses: 'YYGR', autostop: 1, guard: 60, y: '49с', yg: 'NEXT_y', g: 'NEXT_g' },
// { joint: '43', name: '51', lenses: 'YYGR', autostop: 1, guard: 60, y: '51', g: 'NEXT_yg' },
// { joint: '45', name: '53', lenses: 'YYGR', autostop: 1, guard: 60, yg: '53', left: true },
// { joint: '51', name: '55', lenses: 'x', autostop: 3, guard: 35 },
// { joint: '55а', name: '57', lenses: 'x', left: true },
],
},
{
Expand Down Expand Up @@ -158,11 +178,11 @@ lines['neocrimson']['1'] = [
1140: 'T',
},
joints: [
{ x: 80, name: '53', limit: 70 },
{ x: 80 + 37.5, name: '53а', limit: 70, later: { 40: 1 } },
{ x: 80 + 37.5 + 62.5, name: '55', limit: 70 },
{ x: 80 + 37.5 + 62.5 + 75, name: '55а', limit: 80 },
{ x: 80 + 37.5 + 62.5 + 75 + 125, name: '55б', limit: 80, later: {} },
{ x: 40, name: '53', limit: 70 },
{ x: 40 + 62.5, name: '55', limit: 70, later: { 40: 1 } },
{ x: 40 + 62.5 + 75, name: '55а', limit: 70 },
{ x: 80 + 37.5 + 62.5 + 75, name: '55б', limit: 80 },
{ x: 80 + 37.5 + 62.5 + 75 + 125, name: '55в', limit: 80, later: {} },
{ x: 530 - 25, name: '57', limit: 80, later: { 80: 3 } },
{ x: 530 - 25 + 125, name: '57а', limit: 80, later: { 70: 2 } },
{ x: 914.5 - 125 - 25, name: '59', limit: 80, later: { 60: 1 } },
Expand All @@ -180,8 +200,8 @@ lines['neocrimson']['1'] = [
{ x: 1502 + 12.5 + 122, name: '71в', limit: 0 },
],
signals: [
{ joint: '53', name: '55', lenses: 'YYGR', autostop: 3, guard: 35, y: '55б', g: 'NEXT_y' },
{ joint: '55а', name: '57', lenses: 'YYGR', autostop: 3, guard: 80, y: '57а', g: 'NEXT_y', left: true },
{ joint: '53', name: '55', lenses: 'YYGR', autostop: 3, guard: 35, y: '55в', g: 'NEXT_y' },
{ joint: '55б', name: '57', lenses: 'YYGR', autostop: 3, guard: 80, y: '57а', g: 'NEXT_y', left: true },
{ joint: '57', name: '59', lenses: 'YYGR', autostop: 3, guard: 80, y: '59б', g: 'NEXT_y' },
{ joint: '59', name: '61', lenses: 'YYGR', autostop: 1, guard: 80, y: '61', yg: 'NEXT_y', g: 'NEXT_yg' },
{ joint: '59а', name: '63', lenses: 'YYGR', autostop: 1, guard: 70, y: '63', yg: 'NEXT_y', g: 'NEXT_g' },
Expand Down Expand Up @@ -386,8 +406,8 @@ lines['neocrimson']['1'] = [
{ x: 1702 - 75 - 75, name: '115', limit: 80, later: { 60: 1 } },
{ x: 1702 - 75, name: '115а', limit: 70 },
{ x: 1702, name: '117', limit: 70 },
{ x: 1764.5 - 12.5, name: '119', limit: 60 },
{ x: 1764.5 - 12.5 + 25, name: '121', limit: 60 },
{ x: 1764.5 - 12.5 , name: '119', limit: 60 },
{ x: 1764.5 - 12.5 + 25 + 12.5, name: '121', limit: 60 },
{ x: 1784 + 43, name: '123', limit: 60 },
{ x: 1877, name: '125', limit: 0 },
{ x: 1877 + 75 + 12.5, name: '125а', limit: 0 },
Expand Down
8 changes: 4 additions & 4 deletions data/neocrimson/2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,11 @@ lines['neocrimson']['2'] = [
{ x: 62.5 + 50 + 75 + 50, name: '60б', limit: 60 },
{ x: 1292 - 150 - 175 - 87.5 - 275 - 250 + 100, name: '60в', limit: 80, later: { 70: 1, 80: 3 } },
{ x: 1292 - 150 - 175 - 87.5 - 275 - 250 + 100 + 175 + 12.5, name: '60г', limit: 80, later: { 70: 2 } },
{ x: 1292 - 150 - 175 - 87.5 - 100 + 25 + 12.5, name: '58', limit: 70, later: { 60: 1 } },
{ x: 1292 - 150 - 175 - 87.5 - 100 + 25 + 12.5, name: '58', limit: 80, later: { 60: 1 } },
{ x: 1292 - 150 - 175 - 25, name: '58а', limit: 80, later: { 80: 1 } },
{ x: 1292 - 150 - 100, name: '56', limit: 80, later: { 70: 1 } },
{ x: 1292 - 150, name: '54', limit: 70 },
{ x: 1292 - 62.5 - 12.5, name: '52', limit: 70 },
{ x: 1292 - 62.5, name: '52', limit: 70 },
{ x: 1292 - 25, name: '50', limit: 60 },
{ x: 1292 + 50, name: '48', limit: 40 },
{ x: 1292 + 50 + 50, name: '46', limit: 0 },
Expand All @@ -255,7 +255,7 @@ lines['neocrimson']['2'] = [
{ joint: '58а', name: '54', lenses: 'YY-GR', autostop: 1, guard: 75, y: '54', yg: 'NEXT_y', g: 'NEXT_yg' },
{ joint: '56', name: '52', lenses: 'YY-GR', autostop: 1, guard: 70, y: '52', yg: 'NEXT_y', g: 'NEXT_g' },
{ joint: '54', name: '50', lenses: 'YY-GR', autostop: 1, guard: 60, y: '50', g: 'NEXT_yg' },
{ joint: '52', name: '48', lenses: 'YY-GR', autostop: 1, guard: 60, yg: '48' },
{ joint: '52', name: '48', lenses: 'YY-GR', autostop: 1, guard: 60, yg: '48', shift: 13 },
{ joint: '48', name: '46', lenses: 'x', autostop: 3, guard: 35 },
],
},
Expand Down Expand Up @@ -296,7 +296,7 @@ lines['neocrimson']['2'] = [
{ x: 723 - 12.5 - 37.5 - 37.5 - 75, name: '44', limit: 60 },
{ x: 723 - 12.5 - 37.5 - 37.5, name: '42', limit: 60 },
{ x: 723 - 12.5 - 37.5, name: '40', limit: 60 },
{ x: 723 - 12.5 - 37.5 + 25, name: '38', limit: 60 },
{ x: 723 - 12.5 - 37.5 + 37.5, name: '38', limit: 60 },
{ x: 723 - 12.5 - 37.5 + 25 + 50, name: '36', limit: 60 },
{ x: 723 + 62.5 - 12.5 + 12.5, name: '36а', limit: 40 },
{ x: 723 + 62.5 + 62.5 - 25, name: '34', limit: 0 },
Expand Down