Skip to content

Commit

Permalink
Add: Daegu Metropolitan Railroad
Browse files Browse the repository at this point in the history
Closes #415
  • Loading branch information
telk5093 committed Aug 16, 2024
1 parent 4bd0a2c commit 776e2be
Show file tree
Hide file tree
Showing 18 changed files with 286 additions and 61 deletions.
1 change: 1 addition & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* 추가: 3x00호대 디젤 기관차 [#198]
* 추가: 4x00호대 디젤 기관차 [#198]
* 추가: 수도권 4호선 5차 도입분 도색 [#382]
* 추가: 대구권 광역철도 [#415]
* 변경: KTX-이음 그래픽 및 템플릿 변경
* 변경: KTX-이음의 기관차 출력을 8800kW에서 6080kW로 변경
* 변경: 4x00호대 디젤 기관차의 이름을 4400호대로 변경
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 20 additions & 10 deletions docs/download_page/english.html
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,26 @@
<td class="weight">31 t</td>
<td class="introduction">2005</td>
</tr>
<tr data-veh_id="DAEGU_METRO_3">
<td class="refit"><div><img src="./_static/DAEGU_METRO_3.png" alt="Daegu Line 3"></div></td>
<td class="name">Daegu Line 3</td>
<td class="speed">80 km/h</td>
<td class="speed_designed">80 km/h</td>
<td class="capacity">100</td>
<td class="power">500 kW</td>
<td class="weight">20 t</td>
<td class="introduction">2015</td>
</tr>
<tr data-veh_id="DAEGU_METROPOLITAN">
<td class="refit"><div><img src="./_static/DAEGU_METROPOLITAN_392K_2023.png" alt="Daegu Metropolitan Railroad"></div></td>
<td class="name">Daegu Metropolitan Railroad</td>
<td class="speed">100 km/h</td>
<td class="speed_designed">110 km/h</td>
<td class="capacity">100</td>
<td class="power">2000 kW</td>
<td class="weight">57 t</td>
<td class="introduction">2024</td>
</tr>
<tr data-veh_id="DAEJEON_METRO_1">
<td class="refit"><div><img src="./_static/DAEJEON_METRO_1K.png" alt="Daejeon Line 1"></div></td>
<td class="name">Daejeon Line 1</td>
Expand Down Expand Up @@ -599,16 +619,6 @@
<td class="weight">23 t</td>
<td class="introduction">2011</td>
</tr>
<tr data-veh_id="DAEGU_METRO_3">
<td class="refit"><div><img src="./_static/DAEGU_METRO_3.png" alt="Daegu Line 3"></div></td>
<td class="name">Daegu Line 3</td>
<td class="speed">80 km/h</td>
<td class="speed_designed">80 km/h</td>
<td class="capacity">100</td>
<td class="power">500 kW</td>
<td class="weight">20 t</td>
<td class="introduction">2015</td>
</tr>
<tr data-veh_id="GTX_A">
<td class="refit"><div><img src="./_static/SG_A000_1.png" alt="GTX-A"></div></td>
<td class="name">GTX-A</td>
Expand Down
30 changes: 20 additions & 10 deletions docs/download_page/english.md
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,26 @@
<td class="weight">31 t</td>
<td class="introduction">2005</td>
</tr>
<tr data-veh_id="DAEGU_METRO_3">
<td class="refit"><div><img src="./_static/DAEGU_METRO_3.png" alt="Daegu Line 3"></div></td>
<td class="name">Daegu Line 3</td>
<td class="speed">80 km/h</td>
<td class="speed_designed">80 km/h</td>
<td class="capacity">100</td>
<td class="power">500 kW</td>
<td class="weight">20 t</td>
<td class="introduction">2015</td>
</tr>
<tr data-veh_id="DAEGU_METROPOLITAN">
<td class="refit"><div><img src="./_static/DAEGU_METROPOLITAN_392K_2023.png" alt="Daegu Metropolitan Railroad"></div></td>
<td class="name">Daegu Metropolitan Railroad</td>
<td class="speed">100 km/h</td>
<td class="speed_designed">110 km/h</td>
<td class="capacity">100</td>
<td class="power">2000 kW</td>
<td class="weight">57 t</td>
<td class="introduction">2024</td>
</tr>
<tr data-veh_id="DAEJEON_METRO_1">
<td class="refit"><div><img src="./_static/DAEJEON_METRO_1K.png" alt="Daejeon Line 1"></div></td>
<td class="name">Daejeon Line 1</td>
Expand Down Expand Up @@ -599,16 +619,6 @@
<td class="weight">23 t</td>
<td class="introduction">2011</td>
</tr>
<tr data-veh_id="DAEGU_METRO_3">
<td class="refit"><div><img src="./_static/DAEGU_METRO_3.png" alt="Daegu Line 3"></div></td>
<td class="name">Daegu Line 3</td>
<td class="speed">80 km/h</td>
<td class="speed_designed">80 km/h</td>
<td class="capacity">100</td>
<td class="power">500 kW</td>
<td class="weight">20 t</td>
<td class="introduction">2015</td>
</tr>
<tr data-veh_id="GTX_A">
<td class="refit"><div><img src="./_static/SG_A000_1.png" alt="GTX-A"></div></td>
<td class="name">GTX-A</td>
Expand Down
30 changes: 20 additions & 10 deletions docs/download_page/japanese.html
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,26 @@
<td class="weight">31 t</td>
<td class="introduction">2005</td>
</tr>
<tr data-veh_id="DAEGU_METRO_3">
<td class="refit"><div><img src="./_static/DAEGU_METRO_3.png" alt="大邱3号線"></div></td>
<td class="name">大邱3号線</td>
<td class="speed">80 km/h</td>
<td class="speed_designed">80 km/h</td>
<td class="capacity">100</td>
<td class="power">500 kW</td>
<td class="weight">20 t</td>
<td class="introduction">2015</td>
</tr>
<tr data-veh_id="DAEGU_METROPOLITAN">
<td class="refit"><div><img src="./_static/DAEGU_METROPOLITAN_392K_2023.png" alt="大邱圈広域鉄道"></div></td>
<td class="name">大邱圈広域鉄道</td>
<td class="speed">100 km/h</td>
<td class="speed_designed">110 km/h</td>
<td class="capacity">100</td>
<td class="power">2000 kW</td>
<td class="weight">57 t</td>
<td class="introduction">2024</td>
</tr>
<tr data-veh_id="DAEJEON_METRO_1">
<td class="refit"><div><img src="./_static/DAEJEON_METRO_1K.png" alt="大田1号線"></div></td>
<td class="name">大田1号線</td>
Expand Down Expand Up @@ -599,16 +619,6 @@
<td class="weight">23 t</td>
<td class="introduction">2011</td>
</tr>
<tr data-veh_id="DAEGU_METRO_3">
<td class="refit"><div><img src="./_static/DAEGU_METRO_3.png" alt="大邱3号線"></div></td>
<td class="name">大邱3号線</td>
<td class="speed">80 km/h</td>
<td class="speed_designed">80 km/h</td>
<td class="capacity">100</td>
<td class="power">500 kW</td>
<td class="weight">20 t</td>
<td class="introduction">2015</td>
</tr>
<tr data-veh_id="GTX_A">
<td class="refit"><div><img src="./_static/SG_A000_1.png" alt="GTX-A"></div></td>
<td class="name">GTX-A</td>
Expand Down
30 changes: 20 additions & 10 deletions docs/download_page/japanese.md
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,26 @@
<td class="weight">31 t</td>
<td class="introduction">2005</td>
</tr>
<tr data-veh_id="DAEGU_METRO_3">
<td class="refit"><div><img src="./_static/DAEGU_METRO_3.png" alt="大邱3号線"></div></td>
<td class="name">大邱3号線</td>
<td class="speed">80 km/h</td>
<td class="speed_designed">80 km/h</td>
<td class="capacity">100</td>
<td class="power">500 kW</td>
<td class="weight">20 t</td>
<td class="introduction">2015</td>
</tr>
<tr data-veh_id="DAEGU_METROPOLITAN">
<td class="refit"><div><img src="./_static/DAEGU_METROPOLITAN_392K_2023.png" alt="大邱圈広域鉄道"></div></td>
<td class="name">大邱圈広域鉄道</td>
<td class="speed">100 km/h</td>
<td class="speed_designed">110 km/h</td>
<td class="capacity">100</td>
<td class="power">2000 kW</td>
<td class="weight">57 t</td>
<td class="introduction">2024</td>
</tr>
<tr data-veh_id="DAEJEON_METRO_1">
<td class="refit"><div><img src="./_static/DAEJEON_METRO_1K.png" alt="大田1号線"></div></td>
<td class="name">大田1号線</td>
Expand Down Expand Up @@ -599,16 +619,6 @@
<td class="weight">23 t</td>
<td class="introduction">2011</td>
</tr>
<tr data-veh_id="DAEGU_METRO_3">
<td class="refit"><div><img src="./_static/DAEGU_METRO_3.png" alt="大邱3号線"></div></td>
<td class="name">大邱3号線</td>
<td class="speed">80 km/h</td>
<td class="speed_designed">80 km/h</td>
<td class="capacity">100</td>
<td class="power">500 kW</td>
<td class="weight">20 t</td>
<td class="introduction">2015</td>
</tr>
<tr data-veh_id="GTX_A">
<td class="refit"><div><img src="./_static/SG_A000_1.png" alt="GTX-A"></div></td>
<td class="name">GTX-A</td>
Expand Down
30 changes: 20 additions & 10 deletions docs/download_page/korean.html
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,26 @@
<td class="weight">31 t</td>
<td class="introduction">2005</td>
</tr>
<tr data-veh_id="DAEGU_METRO_3">
<td class="refit"><div><img src="./_static/DAEGU_METRO_3.png" alt="대구 3호선"></div></td>
<td class="name">대구 3호선</td>
<td class="speed">80 km/h</td>
<td class="speed_designed">80 km/h</td>
<td class="capacity">100</td>
<td class="power">500 kW</td>
<td class="weight">20 t</td>
<td class="introduction">2015</td>
</tr>
<tr data-veh_id="DAEGU_METROPOLITAN">
<td class="refit"><div><img src="./_static/DAEGU_METROPOLITAN_392K_2023.png" alt="대구권 광역철도"></div></td>
<td class="name">대구권 광역철도</td>
<td class="speed">100 km/h</td>
<td class="speed_designed">110 km/h</td>
<td class="capacity">100</td>
<td class="power">2000 kW</td>
<td class="weight">57 t</td>
<td class="introduction">2024</td>
</tr>
<tr data-veh_id="DAEJEON_METRO_1">
<td class="refit"><div><img src="./_static/DAEJEON_METRO_1K.png" alt="대전 1호선"></div></td>
<td class="name">대전 1호선</td>
Expand Down Expand Up @@ -599,16 +619,6 @@
<td class="weight">23 t</td>
<td class="introduction">2011</td>
</tr>
<tr data-veh_id="DAEGU_METRO_3">
<td class="refit"><div><img src="./_static/DAEGU_METRO_3.png" alt="대구 3호선"></div></td>
<td class="name">대구 3호선</td>
<td class="speed">80 km/h</td>
<td class="speed_designed">80 km/h</td>
<td class="capacity">100</td>
<td class="power">500 kW</td>
<td class="weight">20 t</td>
<td class="introduction">2015</td>
</tr>
<tr data-veh_id="GTX_A">
<td class="refit"><div><img src="./_static/SG_A000_1.png" alt="GTX-A"></div></td>
<td class="name">GTX-A</td>
Expand Down
30 changes: 20 additions & 10 deletions docs/download_page/korean.md
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,26 @@
<td class="weight">31 t</td>
<td class="introduction">2005</td>
</tr>
<tr data-veh_id="DAEGU_METRO_3">
<td class="refit"><div><img src="./_static/DAEGU_METRO_3.png" alt="대구 3호선"></div></td>
<td class="name">대구 3호선</td>
<td class="speed">80 km/h</td>
<td class="speed_designed">80 km/h</td>
<td class="capacity">100</td>
<td class="power">500 kW</td>
<td class="weight">20 t</td>
<td class="introduction">2015</td>
</tr>
<tr data-veh_id="DAEGU_METROPOLITAN">
<td class="refit"><div><img src="./_static/DAEGU_METROPOLITAN_392K_2023.png" alt="대구권 광역철도"></div></td>
<td class="name">대구권 광역철도</td>
<td class="speed">100 km/h</td>
<td class="speed_designed">110 km/h</td>
<td class="capacity">100</td>
<td class="power">2000 kW</td>
<td class="weight">57 t</td>
<td class="introduction">2024</td>
</tr>
<tr data-veh_id="DAEJEON_METRO_1">
<td class="refit"><div><img src="./_static/DAEJEON_METRO_1K.png" alt="대전 1호선"></div></td>
<td class="name">대전 1호선</td>
Expand Down Expand Up @@ -599,16 +619,6 @@
<td class="weight">23 t</td>
<td class="introduction">2011</td>
</tr>
<tr data-veh_id="DAEGU_METRO_3">
<td class="refit"><div><img src="./_static/DAEGU_METRO_3.png" alt="대구 3호선"></div></td>
<td class="name">대구 3호선</td>
<td class="speed">80 km/h</td>
<td class="speed_designed">80 km/h</td>
<td class="capacity">100</td>
<td class="power">500 kW</td>
<td class="weight">20 t</td>
<td class="introduction">2015</td>
</tr>
<tr data-veh_id="GTX_A">
<td class="refit"><div><img src="./_static/SG_A000_1.png" alt="GTX-A"></div></td>
<td class="name">GTX-A</td>
Expand Down
1 change: 1 addition & 0 deletions lang/english.lng
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ STR_YONGIN_EVERLINE_NAME :Yongin Everline
STR_DAEGU_METRO_1_NAME :Daegu Line 1
STR_DAEGU_METRO_2_NAME :Daegu Line 2
STR_DAEGU_METRO_3_NAME :Daegu Line 3
STR_DAEGU_METROPOLITAN_NAME :Daegu Metropolitan Railroad
STR_DAEJEON_METRO_1_NAME :Daejeon Line 1
STR_GWANGJU_METRO_1_NAME :Gwangju Line 1
STR_UISINSEOL_NAME :Ui-Sinseol Line
Expand Down
1 change: 1 addition & 0 deletions lang/japanese.lng
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ STR_YONGIN_EVERLINE_NAME :龍仁エバーラ
STR_DAEGU_METRO_1_NAME :大邱1号線
STR_DAEGU_METRO_2_NAME :大邱2号線
STR_DAEGU_METRO_3_NAME :大邱3号線
STR_DAEGU_METROPOLITAN_NAME :大邱圈広域鉄道
STR_DAEJEON_METRO_1_NAME :大田1号線
STR_GWANGJU_METRO_1_NAME :光州1号線
STR_UISINSEOL_NAME :牛耳新設線
Expand Down
1 change: 1 addition & 0 deletions lang/korean.lng
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ STR_YONGIN_EVERLINE_NAME :용인 에버라인
STR_DAEGU_METRO_1_NAME :대구 1호선
STR_DAEGU_METRO_2_NAME :대구 2호선
STR_DAEGU_METRO_3_NAME :대구 3호선
STR_DAEGU_METROPOLITAN_NAME :대구권 광역철도
STR_DAEJEON_METRO_1_NAME :대전 1호선
STR_GWANGJU_METRO_1_NAME :광주 1호선
STR_UISINSEOL_NAME :우이신설선
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 91 additions & 0 deletions src/metro/daegu_metropolitan/daegu_metropolitan.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
/*------------------------------------------------------------------------------
한국 열차 세트(Korean Train Set)
* Official download site : https://telk.kr/ottd/newgrf/ko_train_set
* Github repository : https://github.com/KoreanGRF/KoreanTrainSet
------------------------------------------------------------------------------*/
/**
* DAEGU_METROPOLITAN
*/
SPEED_METRO(DAEGU_METROPOLITAN)
COST(DAEGU_METROPOLITAN)
RUNNING(DAEGU_METROPOLITAN)
CAPACITY(DAEGU_METROPOLITAN)
CAPACITY_PURCHASE(DAEGU_METROPOLITAN)
LOADING(DAEGU_METROPOLITAN)

// Graphics
#include "daegu_metropolitan_graphic.pnml"

// Switch
#include "daegu_metropolitan_switch.pnml"

// Item
item(FEAT_TRAINS, ko_train_DAEGU_METROPOLITAN, 5738) {
property {
// Common properties
name: string(STR_DAEGU_METROPOLITAN_NAME);
climates_available: ALL_CLIMATES;
introduction_date: var_DAEGU_METROPOLITAN_INTRODUCTION;
track_type: ELRL;
engine_class: ENGINE_CLASS_ELECTRIC;
sprite_id: SPRITE_ID_NEW_TRAIN;
dual_headed: 1;
variant_group: ko_train_METROPOLITAN;

// Spec
power: POWER_IN_KW(var_DAEGU_METROPOLITAN_POWER);
weight: var_DAEGU_METROPOLITAN_WEIGHT;
tractive_effort_coefficient: 0.25;
air_drag_coefficient: 0.01;

// Model
model_life: VEHICLE_NEVER_EXPIRES;
vehicle_life: 30;
retire_early: 0;
reliability_decay: 0;

// Cargo
cargo_capacity: 1;
refittable_cargo_classes: NO_CARGO_CLASS;
non_refittable_cargo_classes: NO_CARGO_CLASS;
cargo_allow_refit: [PASS];
cargo_disallow_refit: [];

// Costs
refit_cost: 0;
running_cost_base: RUNNING_COST_ELECTRIC;

// Flags
ai_special_flag: AI_FLAG_PASSENGER;
misc_flags: bitmask(TRAIN_FLAG_MU, TRAIN_FLAG_AUTOREFIT);
bitmask_vehicle_info: 0;
}
graphics {
default: sw_DAEGU_METROPOLITAN_engine;
purchase: sw_DAEGU_METROPOLITAN_purchase;

speed: sw_DAEGU_METROPOLITAN_speed;
cost_factor: sw_DAEGU_METROPOLITAN_cost;
running_cost_factor: sw_DAEGU_METROPOLITAN_runningcost;
cargo_capacity: sw_DAEGU_METROPOLITAN_capacity;
purchase_cargo_capacity: sw_DAEGU_METROPOLITAN_purchase_capacity;
loading_speed: sw_DAEGU_METROPOLITAN_loadingspeed;

can_attach_wagon: sw_METRO_attach_global;
additional_text: string(STR_REFIT_ADDITIONAL_UNABLE);
}
livery_override(ko_train_PASSWG) {
default: sw_DAEGU_METROPOLITAN_wagon;
cargo_capacity: sw_METRO_wagon_capacity;
loading_speed: sw_DAEGU_METROPOLITAN_loadingspeed;
running_cost_factor: sw_PASSENGER_WAGON_runningcost;
}
livery_override(ko_train_PASSWGP) {
default: sw_DAEGU_METROPOLITAN_wagon;
cargo_capacity: sw_METRO_wagon_capacity;
loading_speed: sw_DAEGU_METROPOLITAN_loadingspeed;
running_cost_factor: sw_PASSENGER_WAGON_P_runningcost;
power: POWER_IN_KW(var_METRO_wagon_POWER);
}
}
// End of "DAEGU_METROPOLITAN"
Loading

0 comments on commit 776e2be

Please sign in to comment.