Skip to content

Commit

Permalink
Add: Hyundai County
Browse files Browse the repository at this point in the history
Closes #17
  • Loading branch information
telk5093 committed Mar 8, 2024
1 parent 9454fc0 commit e3bd0a7
Show file tree
Hide file tree
Showing 15 changed files with 347 additions and 6 deletions.
3 changes: 2 additions & 1 deletion docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
0.5.0
0.6.0
-----
* 추가: 현대 카운티 [#17]
* 수정: 수퍼 에어로시티 → 뉴 수퍼 에어로시티 F/L로 이름 변경 [#21]
* 변경: 주 branch명을 master에서 main으로 변경

Expand Down
10 changes: 6 additions & 4 deletions ko_bus_set.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ grf {
7: string(STR_PARAM_OPT_FACTOR_BY_16);
8: string(STR_PARAM_OPT_FACTOR_BY_32);
9: string(STR_PARAM_OPT_FACTOR_BY_64);
10: string(STR_PARAM_OPT_FACTOR_BY_128);
10: string(STR_PARAM_OPT_FACTOR_BY_128);
};
}
}
Expand All @@ -71,9 +71,9 @@ grf {
7: string(STR_PARAM_OPT_FACTOR_BY_4);
8: string(STR_PARAM_OPT_FACTOR_BY_8);
9: string(STR_PARAM_OPT_FACTOR_BY_16);
10: string(STR_PARAM_OPT_FACTOR_BY_32);
11: string(STR_PARAM_OPT_FACTOR_BY_64);
12: string(STR_PARAM_OPT_FACTOR_BY_128);
10: string(STR_PARAM_OPT_FACTOR_BY_32);
11: string(STR_PARAM_OPT_FACTOR_BY_64);
12: string(STR_PARAM_OPT_FACTOR_BY_128);
};
}
}
Expand Down Expand Up @@ -165,6 +165,8 @@ sw_loading_speed_factor = 1 << max(0, min(coeff_loading_speed, 3));
// Items
#include "./src/hyundai/super_aerocity_low_floor/item.pnml"
#include "./src/hyundai/universe/item.pnml"
#include "./src/hyundai/COUNTY_LONG/item.pnml"
#include "./src/hyundai/COUNTY_XLONG/item.pnml"
#include "./src/daewoo/NEW_BS110_LF/item.pnml"
#include "./src/legacy/item.pnml"

Expand Down
5 changes: 5 additions & 0 deletions lang/english.lng
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ STR_LEGACY_BUS_GYEONGGI_GREEN_NAME :Legacy Gyeonggi Bus (
STR_LEGACY_BUS_GYEONGGI_RED_NAME :Legacy Gyeonggi Bus (Red)
STR_LEGACY_BUS_GYEONGGI_YELLOW_NAME :Legacy Gyeonggi Bus (Yellow)
STR_LEGACY_BUS_GYEONGGI_BLUE_NAME :Legacy Gyeonggi Bus (Blue)
STR_HYUNDAI_COUNTY_LONG_NAME :Hyundai County (Long axis)
STR_HYUNDAI_COUNTY_XLONG_NAME :Hyundai County (Super-long axis)

# Refit (region)
STR_REFIT_LIVERY_CHEONAN : (Cheonan)
Expand Down Expand Up @@ -67,6 +69,9 @@ STR_REFIT_LIVERY_ROKAF : (Republic of Korea A
STR_REFIT_LIVERY_POLICE : (Police)
STR_REFIT_LIVERY_MINISTRY_OF_JUSTICE : (Ministry of Justice)

# Refit (Hyundai County)
STR_REFIT_LIVERY_HYUNDAI_COUNTY_ECRUBEIGE : (Ecru Beige)

# Refit (legacy)
STR_REFIT_LEGACY_LOWER : (Normal)
STR_REFIT_LEGACY_NORMAL : (Low floor)
Expand Down
5 changes: 5 additions & 0 deletions lang/korean.lng
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ STR_LEGACY_BUS_GYEONGGI_GREEN_NAME :구 경기도 G-BUS (
STR_LEGACY_BUS_GYEONGGI_RED_NAME :구 경기도 G-BUS (적)
STR_LEGACY_BUS_GYEONGGI_YELLOW_NAME :구 경기도 G-BUS (황)
STR_LEGACY_BUS_GYEONGGI_BLUE_NAME :구 경기도 G-BUS (청)
STR_HYUNDAI_COUNTY_LONG_NAME :현대 카운티 (장축)
STR_HYUNDAI_COUNTY_XLONG_NAME :현대 카운티 (초장축)

# Refit (region)
STR_REFIT_LIVERY_CHEONAN : (천안)
Expand Down Expand Up @@ -67,6 +69,9 @@ STR_REFIT_LIVERY_ROKAF : (공군)
STR_REFIT_LIVERY_POLICE : (경찰청)
STR_REFIT_LIVERY_MINISTRY_OF_JUSTICE : (법무부)

# Refit (Hyundai County)
STR_REFIT_LIVERY_HYUNDAI_COUNTY_ECRUBEIGE : (에크루베이지)

# Refit (legacy)
STR_REFIT_LEGACY_LOWER : (일반)
STR_REFIT_LEGACY_NORMAL : (저상)
Expand Down
Binary file added src/hyundai/COUNTY_LONG/COUNTY_LONG.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions src/hyundai/COUNTY_LONG/graphic.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*------------------------------------------------------------------------------
* 한국 버스 세트(Korean Bus Set)
* https://github.com/KoreanGRF/KoreanBusSet
------------------------------------------------------------------------------*/

// Seoul
spriteset(set_HYUNDAI_COUNTY_LONG_SEOUL_purchase, "./src/hyundai/COUNTY_LONG/COUNTY_LONG.png") {
tmpl_purchase_detail(0, 0, 31, 13, -14, -6)
}
spriteset(set_HYUNDAI_COUNTY_LONG_SEOUL, "./src/hyundai/COUNTY_LONG/COUNTY_LONG.png") {
tmpl_HYUNDAI_COUNTY(60, 0)
}

// Gyeonggi
spriteset(set_HYUNDAI_COUNTY_LONG_GYEONGGI_purchase, "./src/hyundai/COUNTY_LONG/COUNTY_LONG.png") {
tmpl_purchase_detail(0, 30, 31, 13, -14, -6)
}
spriteset(set_HYUNDAI_COUNTY_LONG_GYEONGGI, "./src/hyundai/COUNTY_LONG/COUNTY_LONG.png") {
tmpl_HYUNDAI_COUNTY(60, 30)
}

// Erud Beige
spriteset(set_HYUNDAI_COUNTY_LONG_ERUDBEIGE_purchase, "./src/hyundai/COUNTY_LONG/COUNTY_LONG.png") {
tmpl_purchase_detail(0, 90, 31, 13, -14, -6)
}
spriteset(set_HYUNDAI_COUNTY_LONG_ERUDBEIGE, "./src/hyundai/COUNTY_LONG/COUNTY_LONG.png") {
tmpl_HYUNDAI_COUNTY(60, 60)
}

switch(FEAT_ROADVEHS, SELF, sw_HYUNDAI_COUNTY_LONG_purchase, 1) {
set_HYUNDAI_COUNTY_LONG_SEOUL_purchase;
}
70 changes: 70 additions & 0 deletions src/hyundai/COUNTY_LONG/item.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/*------------------------------------------------------------------------------
* 한국 버스 세트(Korean Bus Set)
* https://github.com/KoreanGRF/KoreanBusSet
------------------------------------------------------------------------------*/
/**
* Hyundai County
*/
SPEED(HYUNDAI_COUNTY_LONG)
COST(HYUNDAI_COUNTY_LONG)
RUNNING(HYUNDAI_COUNTY_LONG)
CAPACITY(HYUNDAI_COUNTY_LONG)
LOADING(HYUNDAI_COUNTY_LONG)

// Graphic
#include "graphic.pnml"

// Switch
#include "switch.pnml"

// Hyundai low floor
item(FEAT_ROADVEHS, ko_bus_HYUNDAI_COUNTY_LONG, 5030) {
property {
// Common properties
name: string(STR_HYUNDAI_COUNTY_LONG_NAME);
climates_available: ALL_CLIMATES;
introduction_date: var_HYUNDAI_COUNTY_LONG_INTRODUCTION;
road_type: ROAD;
sprite_id: SPRITE_ID_NEW_ROADVEH;

// Spec
power: 125 kW;
weight: 5 ton;

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

// Cargo
cargo_capacity: 15;
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_ROADVEH;

// Flags
misc_flags: bitmask(ROADVEH_FLAG_AUTOREFIT);
sound_effect: SOUND_BUS_START_PULL_AWAY;
}
graphics {
default: sw_HYUNDAI_COUNTY_LONG_engine;
purchase: sw_HYUNDAI_COUNTY_LONG_purchase;

speed: sw_HYUNDAI_COUNTY_LONG_speed;
cost_factor: sw_HYUNDAI_COUNTY_LONG_cost;
running_cost_factor: sw_HYUNDAI_COUNTY_LONG_runningcost;
cargo_capacity: sw_HYUNDAI_COUNTY_LONG_capacity;
loading_speed: sw_HYUNDAI_COUNTY_LONG_loadingspeed;

cargo_subtype_text: sw_HYUNDAI_COUNTY_LONG_cargo_subtype_text;

// Company colours remapping
colour_mapping: sw_HYUNDAI_COUNTY_LONG_recolour;
}
}
59 changes: 59 additions & 0 deletions src/hyundai/COUNTY_LONG/switch.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*------------------------------------------------------------------------------
* 한국 버스 세트(Korean Bus Set)
* https://github.com/KoreanGRF/KoreanBusSet
------------------------------------------------------------------------------*/

// Cargo subtype
switch(FEAT_ROADVEHS, SELF, sw_HYUNDAI_COUNTY_LONG_cargo_subtype_text, cargo_subtype) {
// 1: // DEFAULT
2: return string(STR_REFIT_LIVERY_SEOUL_DARK_BLUE);
3: return string(STR_REFIT_LIVERY_SEOUL_YELLOW);
4: return string(STR_REFIT_LIVERY_SEOUL_RED);
5: return string(STR_REFIT_LIVERY_SEOUL_GREEN);
6: return string(STR_REFIT_LIVERY_SEOUL_BLUE);
// Gyeonggi
10: return string(STR_REFIT_LIVERY_GYEONGGI_COMPANY_COLOUR);
11: return string(STR_REFIT_LIVERY_GYEONGGI_DARK_BLUE);
12: return string(STR_REFIT_LIVERY_GYEONGGI_PALE_GREEN);
13: return string(STR_REFIT_LIVERY_GYEONGGI_PINK);
14: return string(STR_REFIT_LIVERY_GYEONGGI_YELLOW);
15: return string(STR_REFIT_LIVERY_GYEONGGI_RED);
16: return string(STR_REFIT_LIVERY_GYEONGGI_LIGHT_BLUE);
17: return string(STR_REFIT_LIVERY_GYEONGGI_GREEN);
18: return string(STR_REFIT_LIVERY_GYEONGGI_BLUE);
// Other
20: return string(STR_REFIT_LIVERY_HYUNDAI_COUNTY_ECRUBEIGE);
return string(STR_REFIT_LIVERY_SEOUL_COMPANY_COLOUR);
}

// Colour remapping
switch(FEAT_ROADVEHS, SELF, sw_HYUNDAI_COUNTY_LONG_recolour, cargo_subtype) {
// 1: // DEFAULT
// Seoul
2: palette_1cc(COLOUR_DARK_BLUE);
3: palette_1cc(COLOUR_YELLOW);
4: palette_1cc(COLOUR_RED);
5: palette_1cc(COLOUR_GREEN);
6: palette_1cc(COLOUR_BLUE);
// Gyeonggi
// 10: // GYEONGGI_COMPANY_COLOUR
11: palette_1cc(COLOUR_DARK_BLUE);
12: palette_1cc(COLOUR_PALE_GREEN);
13: palette_1cc(COLOUR_PINK);
14: palette_1cc(COLOUR_YELLOW);
15: palette_1cc(COLOUR_RED);
16: palette_1cc(COLOUR_LIGHT_BLUE);
17: palette_1cc(COLOUR_GREEN);
18: palette_1cc(COLOUR_BLUE);
return CB_RESULT_COLOUR_MAPPING_ADD_CC;
}

// Engine
switch(FEAT_ROADVEHS, SELF, sw_HYUNDAI_COUNTY_LONG_engine, cargo_subtype) {
1..9: set_HYUNDAI_COUNTY_LONG_SEOUL;
10..19: set_HYUNDAI_COUNTY_LONG_GYEONGGI;
// Other
20: set_HYUNDAI_COUNTY_LONG_ERUDBEIGE;
return set_HYUNDAI_COUNTY_LONG_SEOUL;
}

Binary file added src/hyundai/COUNTY_XLONG/COUNTY_XLONG.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions src/hyundai/COUNTY_XLONG/graphic.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*------------------------------------------------------------------------------
* 한국 버스 세트(Korean Bus Set)
* https://github.com/KoreanGRF/KoreanBusSet
------------------------------------------------------------------------------*/

// Seoul
spriteset(set_HYUNDAI_COUNTY_XLONG_SEOUL_purchase, "./src/hyundai/COUNTY_XLONG/COUNTY_XLONG.png") {
tmpl_purchase_detail(0, 0, 31, 13, -14, -6)
}
spriteset(set_HYUNDAI_COUNTY_XLONG_SEOUL, "./src/hyundai/COUNTY_XLONG/COUNTY_XLONG.png") {
tmpl_HYUNDAI_COUNTY(60, 0)
}

// Gyeonggi
spriteset(set_HYUNDAI_COUNTY_XLONG_GYEONGGI_purchase, "./src/hyundai/COUNTY_XLONG/COUNTY_XLONG.png") {
tmpl_purchase_detail(0, 30, 31, 13, -14, -6)
}
spriteset(set_HYUNDAI_COUNTY_XLONG_GYEONGGI, "./src/hyundai/COUNTY_XLONG/COUNTY_XLONG.png") {
tmpl_HYUNDAI_COUNTY(60, 30)
}

// Erud Beige
spriteset(set_HYUNDAI_COUNTY_XLONG_ERUDBEIGE_purchase, "./src/hyundai/COUNTY_XLONG/COUNTY_XLONG.png") {
tmpl_purchase_detail(0, 90, 31, 13, -14, -6)
}
spriteset(set_HYUNDAI_COUNTY_XLONG_ERUDBEIGE, "./src/hyundai/COUNTY_XLONG/COUNTY_XLONG.png") {
tmpl_HYUNDAI_COUNTY(60, 60)
}

switch(FEAT_ROADVEHS, SELF, sw_HYUNDAI_COUNTY_XLONG_purchase, 1) {
set_HYUNDAI_COUNTY_XLONG_SEOUL_purchase;
}
70 changes: 70 additions & 0 deletions src/hyundai/COUNTY_XLONG/item.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/*------------------------------------------------------------------------------
* 한국 버스 세트(Korean Bus Set)
* https://github.com/KoreanGRF/KoreanBusSet
------------------------------------------------------------------------------*/
/**
* Hyundai County
*/
SPEED(HYUNDAI_COUNTY_XLONG)
COST(HYUNDAI_COUNTY_XLONG)
RUNNING(HYUNDAI_COUNTY_XLONG)
CAPACITY(HYUNDAI_COUNTY_XLONG)
LOADING(HYUNDAI_COUNTY_XLONG)

// Graphic
#include "graphic.pnml"

// Switch
#include "switch.pnml"

// Hyundai low floor
item(FEAT_ROADVEHS, ko_bus_HYUNDAI_COUNTY_XLONG, 5031) {
property {
// Common properties
name: string(STR_HYUNDAI_COUNTY_XLONG_NAME);
climates_available: ALL_CLIMATES;
introduction_date: var_HYUNDAI_COUNTY_XLONG_INTRODUCTION;
road_type: ROAD;
sprite_id: SPRITE_ID_NEW_ROADVEH;

// Spec
power: 125 kW;
weight: 5 ton;

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

// Cargo
cargo_capacity: 15;
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_ROADVEH;

// Flags
misc_flags: bitmask(ROADVEH_FLAG_AUTOREFIT);
sound_effect: SOUND_BUS_START_PULL_AWAY;
}
graphics {
default: sw_HYUNDAI_COUNTY_XLONG_engine;
purchase: sw_HYUNDAI_COUNTY_XLONG_purchase;

speed: sw_HYUNDAI_COUNTY_XLONG_speed;
cost_factor: sw_HYUNDAI_COUNTY_XLONG_cost;
running_cost_factor: sw_HYUNDAI_COUNTY_XLONG_runningcost;
cargo_capacity: sw_HYUNDAI_COUNTY_XLONG_capacity;
loading_speed: sw_HYUNDAI_COUNTY_XLONG_loadingspeed;

cargo_subtype_text: sw_HYUNDAI_COUNTY_XLONG_cargo_subtype_text;

// Company colours remapping
colour_mapping: sw_HYUNDAI_COUNTY_XLONG_recolour;
}
}
Loading

0 comments on commit e3bd0a7

Please sign in to comment.