Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/KoreanGRF/KoreanTrainSet
Browse files Browse the repository at this point in the history
  • Loading branch information
@telk5093
telk5093 committed May 5, 2024
2 parents 12f3bd5 + 43ae649 commit 0c6b7ec
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 107 deletions.
5 changes: 5 additions & 0 deletions docs/changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2.7.1+
-----
* 변경: KTX-이음 그래픽 및 템플릿 변경
* 변경: KTX-이음의 기관차 출력을 8800kW에서 6080kW로 변경

2.7.1
-----
* 추가: KTX-청룡 추가 [#469]
Expand Down
2 changes: 1 addition & 1 deletion docs/download_page/english.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
<td class="speed">260 km/h</td>
<td class="speed_designed">286 km/h</td>
<td class="capacity">76</td>
<td class="power">8800 kW</td>
<td class="power">6080 kW</td>
<td class="weight">60 t</td>
<td class="introduction">2019</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/download_page/english.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
<td class="speed">260 km/h</td>
<td class="speed_designed">286 km/h</td>
<td class="capacity">76</td>
<td class="power">8800 kW</td>
<td class="power">6080 kW</td>
<td class="weight">60 t</td>
<td class="introduction">2019</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/download_page/japanese.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
<td class="speed">260 km/h</td>
<td class="speed_designed">286 km/h</td>
<td class="capacity">76</td>
<td class="power">8800 kW</td>
<td class="power">6080 kW</td>
<td class="weight">60 t</td>
<td class="introduction">2019</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/download_page/japanese.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
<td class="speed">260 km/h</td>
<td class="speed_designed">286 km/h</td>
<td class="capacity">76</td>
<td class="power">8800 kW</td>
<td class="power">6080 kW</td>
<td class="weight">60 t</td>
<td class="introduction">2019</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/download_page/korean.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
<td class="speed">260 km/h</td>
<td class="speed_designed">286 km/h</td>
<td class="capacity">76</td>
<td class="power">8800 kW</td>
<td class="power">6080 kW</td>
<td class="weight">60 t</td>
<td class="introduction">2019</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/download_page/korean.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
<td class="speed">260 km/h</td>
<td class="speed_designed">286 km/h</td>
<td class="capacity">76</td>
<td class="power">8800 kW</td>
<td class="power">6080 kW</td>
<td class="weight">60 t</td>
<td class="introduction">2019</td>
</tr>
Expand Down
Binary file modified src/locomotive/KTX/EUM.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/locomotive/KTX/EUM_32bpp.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
110 changes: 10 additions & 100 deletions src/locomotive/KTX/EUM_graphic.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,129 +9,39 @@ spriteset(set_EUM_purchase, "./src/locomotive/KTX/EUM.png") {
tmpl_purchase_common_dualhead(0, 0)
}
spriteset(set_EUM_engineH, "./src/locomotive/KTX/EUM.png") {
[80+0, 0, 8, 22, -3, -11]
[80+20, 0, 21, 15, -15, -6]
[80+50, 0, 33, 12, -18, -8]
[80+90, 0, 21, 16, -6, -9]
[80+120, 0, 8, 22, -3, -11]
[80+140, 0, 21, 16, -15, -8]
[80+170, 0, 33, 12, -19, -8]
[80+210, 0, 21, 15, -6, -7]
tmpl_standard(80, 0)
}
spriteset(set_EUM_wagon_2, "./src/locomotive/KTX/EUM.png") {
[80+0, 30, 8, 22, -3, -11]
[80+20, 30, 21, 17, -15, -8]
[80+50, 30, 31, 12, -18, -8]
[80+90, 30, 21, 17, -6, -9]
[80+120, 30, 8, 22, -3, -11]
[80+140, 30, 21, 17, -15, -8]
[80+170, 30, 31, 12, -17, -8]
[80+210, 30, 21, 17, -6, -9]
tmpl_standard(80, 30)
}
spriteset(set_EUM_wagon_3, "./src/locomotive/KTX/EUM.png") {
[80+0, 60, 8, 22, -3, -11]
[80+20, 60, 21, 17, -15, -8]
[80+50, 60, 31, 12, -18, -8]
[80+90, 60, 21, 17, -6, -9]
[80+120, 60, 8, 22, -3, -11]
[80+140, 60, 21, 17, -15, -8]
[80+170, 60, 31, 12, -17, -8]
[80+210, 60, 21, 17, -6, -9]
tmpl_standard(80, 60)
}
spriteset(set_EUM_wagon_4, "./src/locomotive/KTX/EUM.png") {
[80+0, 90, 8, 22, -3, -11]
[80+20, 90, 21, 17, -15, -8]
[80+50, 90, 31, 13, -18, -9]
[80+90, 90, 21, 18, -6, -10]
[80+120, 90, 8, 22, -3, -12]
[80+140, 90, 21, 18, -15, -9]
[80+170, 90, 31, 13, -17, -9]
[80+210, 90, 21, 17, -6, -9]
tmpl_standard(80, 90)
}
spriteset(set_EUM_engineT, "./src/locomotive/KTX/EUM.png") {
[80+120, 120, 8, 22, -3, -11]
[80+140, 120, 21, 15, -15, -6]
[80+170, 120, 32, 12, -17, -8]
[80+210, 120, 21, 16, -6, -9]
[80+0, 120, 8, 22, -3, -11]
[80+20, 120, 21, 16, -15, -8]
[80+50, 120, 32, 12, -19, -8]
[80+90, 120, 21, 15, -6, -7]
}
spriteset(set_EUM_wagon_3_without_panto, "./src/locomotive/KTX/EUM.png") {
[80+0, 150, 8, 22, -3, -11]
[80+20, 150, 21, 17, -15, -8]
[80+50, 150, 31, 12, -18, -8]
[80+90, 150, 21, 17, -6, -9]
[80+120, 150, 8, 22, -3, -11]
[80+140, 150, 21, 17, -15, -8]
[80+170, 150, 31, 12, -17, -8]
[80+210, 150, 21, 17, -6, -9]
tmpl_standard(80, 120)
}

// Enhanced graphic using 32bpp
alternative_sprites(set_EUM_purchase, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "./src/locomotive/KTX/EUM_32bpp.png") {
tmpl_purchase_common_dualhead(0, 0)
}
alternative_sprites(set_EUM_engineH, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "./src/locomotive/KTX/EUM_32bpp.png") {
[80+0, 0, 8, 22, -3, -11]
[80+20, 0, 21, 15, -15, -6]
[80+50, 0, 33, 12, -18, -8]
[80+90, 0, 21, 16, -6, -9]
[80+120, 0, 8, 22, -3, -11]
[80+140, 0, 21, 16, -15, -8]
[80+170, 0, 33, 12, -19, -8]
[80+210, 0, 21, 15, -6, -7]
tmpl_standard(80, 0)
}
alternative_sprites(set_EUM_wagon_2, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "./src/locomotive/KTX/EUM_32bpp.png") {
[80+0, 30, 8, 22, -3, -11]
[80+20, 30, 21, 17, -15, -8]
[80+50, 30, 31, 12, -18, -8]
[80+90, 30, 21, 17, -6, -9]
[80+120, 30, 8, 22, -3, -11]
[80+140, 30, 21, 17, -15, -8]
[80+170, 30, 31, 12, -17, -8]
[80+210, 30, 21, 17, -6, -9]
tmpl_standard(80, 30)
}
alternative_sprites(set_EUM_wagon_3, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "./src/locomotive/KTX/EUM_32bpp.png") {
[80+0, 60, 8, 22, -3, -11]
[80+20, 60, 21, 17, -15, -8]
[80+50, 60, 31, 12, -18, -8]
[80+90, 60, 21, 17, -6, -9]
[80+120, 60, 8, 22, -3, -11]
[80+140, 60, 21, 17, -15, -8]
[80+170, 60, 31, 12, -17, -8]
[80+210, 60, 21, 17, -6, -9]
tmpl_standard(80, 60)
}
alternative_sprites(set_EUM_wagon_4, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "./src/locomotive/KTX/EUM_32bpp.png") {
[80+0, 90, 8, 22, -3, -11]
[80+20, 90, 21, 17, -15, -8]
[80+50, 90, 31, 13, -18, -9]
[80+90, 90, 21, 18, -6, -10]
[80+120, 90, 8, 22, -3, -12]
[80+140, 90, 21, 18, -15, -9]
[80+170, 90, 31, 13, -17, -9]
[80+210, 90, 21, 17, -6, -9]
tmpl_standard(80, 90)
}
alternative_sprites(set_EUM_engineT, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "./src/locomotive/KTX/EUM_32bpp.png") {
[80+120, 120, 8, 22, -3, -11]
[80+140, 120, 21, 15, -15, -6]
[80+170, 120, 32, 12, -17, -8]
[80+210, 120, 21, 16, -6, -9]
[80+0, 120, 8, 22, -3, -11]
[80+20, 120, 21, 16, -15, -8]
[80+50, 120, 32, 12, -19, -8]
[80+90, 120, 21, 15, -6, -7]
}
alternative_sprites(set_EUM_wagon_3_without_panto, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "./src/locomotive/KTX/EUM_32bpp.png") {
[80+0, 150, 8, 22, -3, -11]
[80+20, 150, 21, 17, -15, -8]
[80+50, 150, 31, 12, -18, -8]
[80+90, 150, 21, 17, -6, -9]
[80+120, 150, 8, 22, -3, -11]
[80+140, 150, 21, 17, -15, -8]
[80+170, 150, 31, 12, -17, -8]
[80+210, 150, 21, 17, -6, -9]
tmpl_standard(80, 120)
}

// Alias of purchase image
Expand Down
2 changes: 1 addition & 1 deletion src/spec.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
trainList['KTX1N'] = 305, 320, 20, 10, 0, 10, 13200, 68, (2004, 4, 1)
trainList['KTX2N'] = 305, 320, 20, 10, 0, 10, 8800, 68, (2009, 1, 1)
trainList['SRT'] = 305, 320, 20, 10, 0, 10, 8800, 68, (2015, 1, 1)
trainList['EUM'] = 260, 286, 20, 10, 76, 10, 8800, 60, (2019, 1, 1)
trainList['EUM'] = 260, 286, 20, 10, 76, 10, 6080, 60, (2019, 1, 1)
trainList['KTX3N'] = 319, 352, 20, 10, 76, 10, 9120, 55, (2022, 4, 1)
trainList['MAUM'] = 150, 165, 10, 5, 62, 10, 2000, 51, (2023, 9, 1)
trainList['KTX_wagon'] = 300, 300, None, 8, 58, 10, 0, 20, (2004, 1, 1)
Expand Down

0 comments on commit 0c6b7ec

Please sign in to comment.