Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions lang/english.lng
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@ STR_REFIT_LIVERY_Easyjet :(Easyjet)
STR_REFIT_LIVERY_TAP :(TAP)
STR_REFIT_LIVERY_Vueling :(Vueling)
STR_REFIT_LIVERY_Wizzair :(Wizz Air)
STR_REFIT_LIVERY_Ryanair :(Ryanair)

# Liveries (Oceania, Africa)

Expand Down
17 changes: 9 additions & 8 deletions src/Aircraft/Boeing/B737/B737_800/B737_800.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, B737_800, 7001){
aircraft_type: AIRCRAFT_TYPE_SMALL;
sprite_id: SPRITE_ID_NEW_AIRCRAFT;
variant_group: B737_100;

//spec
speed: 965km/h;

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

//Cargo
passenger_capacity: 189;
mail_capacity: 19;
acceleration: 27;
mail_capacity: 19;
acceleration: 27;
refittable_cargo_classes: NO_CARGO_CLASS;
non_refittable_cargo_classes: NO_CARGO_CLASS;
cargo_allow_refit: [PASS];
cargo_disallow_refit: [];

//Costs
refit_cost: 100;

//Flags
misc_flags: bitmask(AIRCRAFT_FLAG_2CC);
sound_effect: SOUND_TAKEOFF_JET;
}

graphics {
default: sw_B737_800;
purchase: sw_B737_800_purchase;
loading_speed: 25;
cost_factor: 234;
running_cost_factor: 120;
cargo_subtype_text: sw_Boeing_737_800_cargo_subtype_text;
passenger_capacity: sw_Boeing_737_800_cargo_subtype_capacity;
name: switch_B737800_name;
}
}
73 changes: 46 additions & 27 deletions src/Aircraft/Boeing/B737/B737_800/B737_800_switch.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,61 @@
Switch
--------------------------------------------------------------------*/
switch(FEAT_AIRCRAFT, SELF, sw_Boeing_737_800_cargo_subtype_text, cargo_subtype) {
1: return string(STR_REFIT_LIVERY_Boeing); // Manufacturer
2: return string(STR_REFIT_LIVERY_Jejuair); // Jeju Air
3: return string(STR_REFIT_LIVERY_Tway); // Tway
4: return string(STR_REFIT_LIVERY_Jinair); // Jin Air
5: return string(STR_REFIT_LIVERY_Koreanair); // Korean Air
6: return string(STR_REFIT_LIVERY_Flygangwon); // Fly Gangwon
7: return string(STR_REFIT_LIVERY_Eastar); // Easter
8: return string(STR_REFIT_LIVERY_Jejuair_old); // Jeju Air Old
9: return string(STR_REFIT_LIVERY_Japanairlines); // Japan Airlines
1: return string(STR_REFIT_LIVERY_Boeing); // Manufacturer
2: return string(STR_REFIT_LIVERY_Jejuair); // Jeju Air
3: return string(STR_REFIT_LIVERY_Tway); // Tway
4: return string(STR_REFIT_LIVERY_Jinair); // Jin Air
5: return string(STR_REFIT_LIVERY_Koreanair); // Korean Air
6: return string(STR_REFIT_LIVERY_Flygangwon); // Fly Gangwon
7: return string(STR_REFIT_LIVERY_Eastar); // Easter
8: return string(STR_REFIT_LIVERY_Jejuair_old); // Jeju Air Old
9: return string(STR_REFIT_LIVERY_Japanairlines); // Japan Airlines
10: return string(STR_REFIT_LIVERY_Chinaairlines); // China Airlines
11: return string(STR_REFIT_LIVERY_Skymarkairlines); // Skymark Airlines
11: return string(STR_REFIT_LIVERY_Skymarkairlines); // Skymark Airlines
12: return string(STR_REFIT_LIVERY_Chinasouthern); // China Southern Airlines
13: return string(STR_REFIT_LIVERY_Chinaeastern); // China Eastern Airlines
14: return string(STR_REFIT_LIVERY_Unitedairlines); // United Airlines
13: return string(STR_REFIT_LIVERY_Chinaeastern); // China Eastern Airlines
14: return string(STR_REFIT_LIVERY_Unitedairlines); // United Airlines
return string(STR_REFIT_LIVERY_Boeing);
}

switch(FEAT_AIRCRAFT, SELF, sw_B737_800, cargo_subtype) {
1: set_B737_800; // Manufacturer
2: set_B737_800_jeju; // Jeju Air
3: set_B737_800_tway; // Tway
4: set_B737_800_jin; // Jin Air
5: set_B737_800_korean; // Korean Air
6: set_B737_800_gangwon; // Fly Gangwon
7: set_B737_800_eastar; // Easter
8: set_B737_800_jeju_old; // Jeju Air Old
9: set_B737_800_Japanairlines; // Japan Airlines
10: set_B737_800_Chinaairlines; // China Airlines
11: set_B737_800_Skymarkairlines; // Skymark Airlines
12: set_B737_800_chinasouthern; // China Southern Airlines
13: set_B737_800_chinaeastern; // China Eastern Airlines
14: set_B737_800_united; // United Airlines
1: set_B737_800; // Manufacturer
2: set_B737_800_jeju; // Jeju Air
3: set_B737_800_tway; // Tway
4: set_B737_800_jin; // Jin Air
5: set_B737_800_korean; // Korean Air
6: set_B737_800_gangwon; // Fly Gangwon
7: set_B737_800_eastar; // Easter
8: set_B737_800_jeju_old; // Jeju Air Old
9: set_B737_800_Japanairlines; // Japan Airlines
10: set_B737_800_Chinaairlines; // China Airlines
11: set_B737_800_Skymarkairlines; // Skymark Airlines
12: set_B737_800_chinasouthern; // China Southern Airlines
13: set_B737_800_chinaeastern; // China Eastern Airlines
14: set_B737_800_united; // United Airlines
set_B737_800;
}

switch (FEAT_AIRCRAFT, SELF, switch_B737800_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) {
0: return string(STR_B737_FAMILY);
return CB_RESULT_NO_TEXT;
}
}

switch (FEAT_AIRCRAFT, SELF, sw_Boeing_737_800_cargo_subtype_capacity, cargo_subtype)
{
// Use https://seatmaps.com/es/aircraft/boeing-737-800/ as reference
1: return 189; // default
2: return 189; // Jeju Air
3: return 189; // Tway
4: return 189; // Jin Air
5: return 138; // Korean Air
6: return 180; // Fly Gangwon
7: return 189; // Easter
8: return 189; // Jeju Air Old
9: return 165; // Japan Airlines
10: return 174; // China Airlines
11: return 189; // Skymark Airlines
12: return 174; // China Southern Airlines
13: return 189; // China Eastern Airlines
14: return 166; // United Airlines
}
19 changes: 10 additions & 9 deletions src/Aircraft/Boeing/B737/B737_900/B737_900.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, B737_900, 7059){
aircraft_type: AIRCRAFT_TYPE_LARGE;
sprite_id: SPRITE_ID_NEW_AIRCRAFT;
variant_group: B737_100;

//spec
speed: 952km/h;

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

//Cargo
passenger_capacity: 180;
mail_capacity: 19;
acceleration: 27;
mail_capacity: 19;
acceleration: 27;
refittable_cargo_classes: NO_CARGO_CLASS;
non_refittable_cargo_classes: NO_CARGO_CLASS;
cargo_allow_refit: [PASS];
cargo_disallow_refit: [];

//Costs
refit_cost: 100;

//Flags
misc_flags: bitmask(AIRCRAFT_FLAG_2CC);
sound_effect: SOUND_TAKEOFF_JET;
}

graphics {
default: sw_B737_900;
purchase: sw_B737_900_purchase;
loading_speed: 26;
cost_factor: 890;
running_cost_factor: 120;
cargo_subtype_text: sw_Boeing_737_900_cargo_subtype_text;
passenger_capacity: sw_Boeing_737_900_cargo_subtype_capacity;
name: switch_B737900_name;
}
}
}
9 changes: 8 additions & 1 deletion src/Aircraft/Boeing/B737/B737_900/B737_900_switch.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,11 @@ switch(FEAT_AIRCRAFT, SELF, sw_B737_900, cargo_subtype) {
switch (FEAT_AIRCRAFT, SELF, switch_B737900_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) {
0: return string(STR_B737_FAMILY);
return CB_RESULT_NO_TEXT;
}
}

switch (FEAT_AIRCRAFT, SELF, sw_Boeing_737_900_cargo_subtype_capacity, cargo_subtype)
{
// Use https://seatmaps.com/es/aircraft/boeing-737-900/ as reference
1: return 180; // Manufacturer
2: return 188; // Korean Air
}
19 changes: 10 additions & 9 deletions src/Aircraft/Boeing/B737/B737_900ER/B737_900ER.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, B737_900ER, 7058){
aircraft_type: AIRCRAFT_TYPE_LARGE;
sprite_id: SPRITE_ID_NEW_AIRCRAFT;
variant_group: B737_100;

//spec
speed: 952km/h;

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

//Cargo
passenger_capacity: 180;
mail_capacity: 22;
acceleration: 27;
mail_capacity: 22;
acceleration: 27;
refittable_cargo_classes: NO_CARGO_CLASS;
non_refittable_cargo_classes: NO_CARGO_CLASS;
cargo_allow_refit: [PASS];
cargo_disallow_refit: [];

//Costs
refit_cost: 100;

//Flags
misc_flags: bitmask(AIRCRAFT_FLAG_2CC);
sound_effect: SOUND_TAKEOFF_JET;
}

graphics {
default: sw_B737_900ER;
purchase: sw_B737_900ER_purchase;
loading_speed: 26;
cost_factor: 249;
running_cost_factor: 120;
cargo_subtype_text: sw_Boeing_737_900ER_cargo_subtype_text;
passenger_capacity: sw_Boeing_737_900ER_cargo_subtype_capacity;
name: switch_B737900ER_name;
}
}
}
10 changes: 9 additions & 1 deletion src/Aircraft/Boeing/B737/B737_900ER/B737_900ER_switch.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,12 @@ switch(FEAT_AIRCRAFT, SELF, sw_B737_900ER, cargo_subtype) {
switch (FEAT_AIRCRAFT, SELF, switch_B737900ER_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) {
0: return string(STR_B737_FAMILY);
return CB_RESULT_NO_TEXT;
}
}

switch (FEAT_AIRCRAFT, SELF, sw_Boeing_737_900ER_cargo_subtype_capacity, cargo_subtype)
{
// Use https://seatmaps.com/es/aircraft/boeing-737-900/ as reference
1: return 180; // Manufacturer
2: return 173; // Korean Air Old
3: return 173; // Korean Air 2025
}
23 changes: 12 additions & 11 deletions src/Aircraft/Boeing/B737/B737_MAX_200/B737_MAX_200.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, B737_MAX_200, 7057){
aircraft_type: AIRCRAFT_TYPE_LARGE;
sprite_id: SPRITE_ID_NEW_AIRCRAFT;
variant_group: B737_100;

//spec
speed: 952km/h;

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

//Cargo
passenger_capacity: 197;
mail_capacity: 19;
acceleration: 27;
mail_capacity: 19;
acceleration: 27;
refittable_cargo_classes: NO_CARGO_CLASS;
non_refittable_cargo_classes: NO_CARGO_CLASS;
cargo_allow_refit: [PASS];
cargo_disallow_refit: [];

//Costs
refit_cost: 100;

//Flags
misc_flags: bitmask(AIRCRAFT_FLAG_2CC);
sound_effect: SOUND_TAKEOFF_JET;
}

graphics {
default: sw_B737_MAX_200;
default: sw_737_MAX_200;
purchase: sw_B737_MAX_200_purchase;
loading_speed: 26;
cost_factor: 890;
running_cost_factor: 120;
cargo_subtype_text: sw_Boeing_737_MAX_200_cargo_subtype_text;
name: switch_B737MAX200_name;
cargo_subtype_text: sw_737_MAX_200_cargo_subtype_text;
passenger_capacity: sw_737_MAX_200_cargo_subtype_capacity;
name: switch_737_MAX_200_name;
}
}
12 changes: 10 additions & 2 deletions src/Aircraft/Boeing/B737/B737_MAX_200/B737_MAX_200_graphic.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,24 @@ spriteset(set_B737_MAX_200_purchase, "src/Aircraft/Boeing/B737/B737_MAX_200/B737
}

/*--------------------------------------------------------------------
1. 보잉 737 MAX 200 제조사
1. 보잉 737 MAX 200 Boeing
--------------------------------------------------------------------*/

spriteset(set_B737_MAX_200, "src/Aircraft/Boeing/B737/B737_MAX_200/B737_MAX_200.png"){
tp_B737_MAX_8(0, 0)
}

/*--------------------------------------------------------------------
2. 보잉 737 MAX 200 Ryanair
--------------------------------------------------------------------*/

spriteset(set_B737_MAX_200_ryanair, "src/Aircraft/Boeing/B737/B737_MAX_200/Ryanair.png"){
tp_B737_MAX_8(0, 0)
}

/*--------------------------------------------------------------------
구매정보
--------------------------------------------------------------------*/
switch(FEAT_TRAINS, SELF, sw_B737_MAX_200_purchase, cargo_subtype) {
set_B737_MAX_200_purchase;
}
}
23 changes: 15 additions & 8 deletions src/Aircraft/Boeing/B737/B737_MAX_200/B737_MAX_200_switch.pnml
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
/*--------------------------------------------------------------------
스위치
--------------------------------------------------------------------*/
switch(FEAT_AIRCRAFT, SELF, sw_Boeing_737_MAX_200_cargo_subtype_text, cargo_subtype) {
1: return string(STR_REFIT_LIVERY_Boeing); // 제조사
2: return string(STR_REFIT_LIVERY_Boeing); // 대한항공
switch(FEAT_AIRCRAFT, SELF, sw_737_MAX_200_cargo_subtype_text, cargo_subtype) {
1: return string(STR_REFIT_LIVERY_Boeing); // Manufacturer
2: return string(STR_REFIT_LIVERY_Ryanair); // Ryanair
return string(STR_REFIT_LIVERY_Boeing);
}

switch(FEAT_AIRCRAFT, SELF, sw_B737_MAX_200, cargo_subtype) {
1: set_B737_MAX_200; // 제조사
2: set_B737_MAX_200; // 대한항공
switch(FEAT_AIRCRAFT, SELF, sw_737_MAX_200, cargo_subtype) {
1: set_B737_MAX_200; // Manufacturer
2: set_B737_MAX_200_ryanair; // Ryanair
set_B737_MAX_200;
}

switch (FEAT_AIRCRAFT, SELF, switch_B737MAX200_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) {
switch (FEAT_AIRCRAFT, SELF, switch_737_MAX_200_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) {
0: return string(STR_B737_FAMILY);
return CB_RESULT_NO_TEXT;
}
}

switch (FEAT_AIRCRAFT, SELF, sw_737_MAX_200_cargo_subtype_capacity, cargo_subtype)
{
// Use https://seatmaps.com/es/aircraft/boeing-737-max-8/ as reference
1: return 197; // default
2: return 197; // Ryanair
}
Binary file added src/Aircraft/Boeing/B737/B737_MAX_200/Ryanair.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading