diff --git a/lang/english.lng b/lang/english.lng index 56ca356..ddbe7b9 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -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) diff --git a/src/Aircraft/Boeing/B737/B737_800/B737_800.pnml b/src/Aircraft/Boeing/B737/B737_800/B737_800.pnml index 03af687..f20c055 100644 --- a/src/Aircraft/Boeing/B737/B737_800/B737_800.pnml +++ b/src/Aircraft/Boeing/B737/B737_800/B737_800.pnml @@ -18,33 +18,33 @@ 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; @@ -52,6 +52,7 @@ item(FEAT_AIRCRAFT, B737_800, 7001){ 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; } } diff --git a/src/Aircraft/Boeing/B737/B737_800/B737_800_switch.pnml b/src/Aircraft/Boeing/B737/B737_800/B737_800_switch.pnml index 7359e62..7e98e31 100644 --- a/src/Aircraft/Boeing/B737/B737_800/B737_800_switch.pnml +++ b/src/Aircraft/Boeing/B737/B737_800/B737_800_switch.pnml @@ -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; -} \ No newline at end of file +} + +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 +} diff --git a/src/Aircraft/Boeing/B737/B737_900/B737_900.pnml b/src/Aircraft/Boeing/B737/B737_900/B737_900.pnml index 930e6b7..701776c 100644 --- a/src/Aircraft/Boeing/B737/B737_900/B737_900.pnml +++ b/src/Aircraft/Boeing/B737/B737_900/B737_900.pnml @@ -18,33 +18,33 @@ 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; @@ -52,6 +52,7 @@ item(FEAT_AIRCRAFT, B737_900, 7059){ 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; - } + } } diff --git a/src/Aircraft/Boeing/B737/B737_900/B737_900_switch.pnml b/src/Aircraft/Boeing/B737/B737_900/B737_900_switch.pnml index c08f593..c880406 100644 --- a/src/Aircraft/Boeing/B737/B737_900/B737_900_switch.pnml +++ b/src/Aircraft/Boeing/B737/B737_900/B737_900_switch.pnml @@ -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; -} \ No newline at end of file +} + +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 +} diff --git a/src/Aircraft/Boeing/B737/B737_900ER/B737_900ER.pnml b/src/Aircraft/Boeing/B737/B737_900ER/B737_900ER.pnml index df13563..612605b 100644 --- a/src/Aircraft/Boeing/B737/B737_900ER/B737_900ER.pnml +++ b/src/Aircraft/Boeing/B737/B737_900ER/B737_900ER.pnml @@ -18,33 +18,33 @@ 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; @@ -52,6 +52,7 @@ item(FEAT_AIRCRAFT, B737_900ER, 7058){ 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; - } + } } diff --git a/src/Aircraft/Boeing/B737/B737_900ER/B737_900ER_switch.pnml b/src/Aircraft/Boeing/B737/B737_900ER/B737_900ER_switch.pnml index 2e7a406..0911d2c 100644 --- a/src/Aircraft/Boeing/B737/B737_900ER/B737_900ER_switch.pnml +++ b/src/Aircraft/Boeing/B737/B737_900ER/B737_900ER_switch.pnml @@ -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; -} \ No newline at end of file +} + +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 +} diff --git a/src/Aircraft/Boeing/B737/B737_MAX_200/B737_MAX_200.pnml b/src/Aircraft/Boeing/B737/B737_MAX_200/B737_MAX_200.pnml index c996b11..aa4fa21 100644 --- a/src/Aircraft/Boeing/B737/B737_MAX_200/B737_MAX_200.pnml +++ b/src/Aircraft/Boeing/B737/B737_MAX_200/B737_MAX_200.pnml @@ -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; } } diff --git a/src/Aircraft/Boeing/B737/B737_MAX_200/B737_MAX_200_graphic.pnml b/src/Aircraft/Boeing/B737/B737_MAX_200/B737_MAX_200_graphic.pnml index 5a0c1ce..ad664c4 100644 --- a/src/Aircraft/Boeing/B737/B737_MAX_200/B737_MAX_200_graphic.pnml +++ b/src/Aircraft/Boeing/B737/B737_MAX_200/B737_MAX_200_graphic.pnml @@ -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; -} \ No newline at end of file +} diff --git a/src/Aircraft/Boeing/B737/B737_MAX_200/B737_MAX_200_switch.pnml b/src/Aircraft/Boeing/B737/B737_MAX_200/B737_MAX_200_switch.pnml index 5e230a1..68eccd2 100644 --- a/src/Aircraft/Boeing/B737/B737_MAX_200/B737_MAX_200_switch.pnml +++ b/src/Aircraft/Boeing/B737/B737_MAX_200/B737_MAX_200_switch.pnml @@ -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; -} \ No newline at end of file +} + +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 +} diff --git a/src/Aircraft/Boeing/B737/B737_MAX_200/Ryanair.png b/src/Aircraft/Boeing/B737/B737_MAX_200/Ryanair.png new file mode 100644 index 0000000..759d25f Binary files /dev/null and b/src/Aircraft/Boeing/B737/B737_MAX_200/Ryanair.png differ diff --git a/src/Aircraft/Boeing/B737/B737_MAX_8/B737_MAX_8.pnml b/src/Aircraft/Boeing/B737/B737_MAX_8/B737_MAX_8.pnml index de0b868..9b32a7b 100644 --- a/src/Aircraft/Boeing/B737/B737_MAX_8/B737_MAX_8.pnml +++ b/src/Aircraft/Boeing/B737/B737_MAX_8/B737_MAX_8.pnml @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, B737_MAX_8, 7053){ 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: 178; - mail_capacity: 16; - acceleration: 27; + mail_capacity: 16; + 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_8; + default: sw_737_MAX_8; purchase: sw_B737_MAX_8_purchase; loading_speed: 26; cost_factor: 890; running_cost_factor: 120; - cargo_subtype_text: sw_Boeing_737_MAX_8_cargo_subtype_text; - name: switch_B737MAX8_name; + cargo_subtype_text: sw_737_MAX_8_cargo_subtype_text; + passenger_capacity: sw_737_MAX_8_cargo_subtype_capacity; + name: switch_737_MAX_8_name; } } diff --git a/src/Aircraft/Boeing/B737/B737_MAX_8/B737_MAX_8_graphic.pnml b/src/Aircraft/Boeing/B737/B737_MAX_8/B737_MAX_8_graphic.pnml index b7a4746..c8887a3 100644 --- a/src/Aircraft/Boeing/B737/B737_MAX_8/B737_MAX_8_graphic.pnml +++ b/src/Aircraft/Boeing/B737/B737_MAX_8/B737_MAX_8_graphic.pnml @@ -34,7 +34,7 @@ spriteset(set_B737_MAX_8_jeju, "src/Aircraft/Boeing/B737/B737_MAX_8/Jejuair.png" } /*-------------------------------------------------------------------- -4. Boeing 737 MAX 8 Korean Air +4. Boeing 737 MAX 8 Korean Air --------------------------------------------------------------------*/ spriteset(set_B737_MAX_8_korean25, "src/Aircraft/Boeing/B737/B737_MAX_8/korean25.png"){ @@ -46,4 +46,4 @@ purchase Info --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_B737_MAX_8_purchase, cargo_subtype) { set_B737_MAX_8_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Boeing/B737/B737_MAX_8/B737_MAX_8_switch.pnml b/src/Aircraft/Boeing/B737/B737_MAX_8/B737_MAX_8_switch.pnml index 316f869..39224cc 100644 --- a/src/Aircraft/Boeing/B737/B737_MAX_8/B737_MAX_8_switch.pnml +++ b/src/Aircraft/Boeing/B737/B737_MAX_8/B737_MAX_8_switch.pnml @@ -1,7 +1,7 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Boeing_737_MAX_8_cargo_subtype_text, cargo_subtype) { +switch(FEAT_AIRCRAFT, SELF, sw_737_MAX_8_cargo_subtype_text, cargo_subtype) { 1: return string(STR_REFIT_LIVERY_Boeing); // Boeing 2: return string(STR_REFIT_LIVERY_Koreanair); // korean air 3: return string(STR_REFIT_LIVERY_Jejuair); // jeju air @@ -9,7 +9,7 @@ switch(FEAT_AIRCRAFT, SELF, sw_Boeing_737_MAX_8_cargo_subtype_text, cargo_subtyp return string(STR_REFIT_LIVERY_Boeing); } -switch(FEAT_AIRCRAFT, SELF, sw_B737_MAX_8, cargo_subtype) { +switch(FEAT_AIRCRAFT, SELF, sw_737_MAX_8, cargo_subtype) { 1: set_B737_MAX_8; // Boeing 2: set_B737_MAX_8_korean; // korean air old 3: set_B737_MAX_8_jeju; // jeju air @@ -17,7 +17,16 @@ switch(FEAT_AIRCRAFT, SELF, sw_B737_MAX_8, cargo_subtype) { set_B737_MAX_8; } -switch (FEAT_AIRCRAFT, SELF, switch_B737MAX8_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { +switch (FEAT_AIRCRAFT, SELF, switch_737_MAX_8_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; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_737_MAX_8_cargo_subtype_capacity, cargo_subtype) +{ + // Use https://seatmaps.com/es/aircraft/boeing-737-max-8/ as reference + 1: return 178; // default + 2: return 146; // Korean Air old + 3: return 189; // Jeju Air + 4: return 158; // Korean Air new +} diff --git a/src/Aircraft/Boeing/B777/B777_200/B777_200_switch.pnml b/src/Aircraft/Boeing/B777/B777_200/B777_200_switch.pnml index e63672a..c5c4485 100644 --- a/src/Aircraft/Boeing/B777/B777_200/B777_200_switch.pnml +++ b/src/Aircraft/Boeing/B777/B777_200/B777_200_switch.pnml @@ -16,4 +16,4 @@ switch(FEAT_AIRCRAFT, SELF, sw_B777_200, cargo_subtype) { switch (FEAT_AIRCRAFT, SELF, switch_B777200_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_B777_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} diff --git a/src/Aircraft/Boeing/B777/B777_200ER/B777_200ER.pnml b/src/Aircraft/Boeing/B777/B777_200ER/B777_200ER.pnml index 2515f70..4f401f4 100644 --- a/src/Aircraft/Boeing/B777/B777_200ER/B777_200ER.pnml +++ b/src/Aircraft/Boeing/B777/B777_200ER/B777_200ER.pnml @@ -18,33 +18,33 @@ item(FEAT_AIRCRAFT, B777_200ER, 7004){ aircraft_type: AIRCRAFT_TYPE_LARGE; sprite_id: SPRITE_ID_NEW_AIRCRAFT; variant_group: B777_200; - + //spec speed: 939km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 30; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 400; - mail_capacity: 40; - acceleration: 27; + mail_capacity: 40; + 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_B777_200ER; purchase: sw_B777_200ER_purchase; @@ -52,6 +52,7 @@ item(FEAT_AIRCRAFT, B777_200ER, 7004){ cost_factor: 638; running_cost_factor: 120; cargo_subtype_text: sw_Boeing_777_200ER_cargo_subtype_text; + passenger_capacity: sw_Boeing_777_200ER_cargo_subtype_capacity; name: switch_B777200ER_name; - } + } } diff --git a/src/Aircraft/Boeing/B777/B777_200ER/B777_200ER_switch.pnml b/src/Aircraft/Boeing/B777/B777_200ER/B777_200ER_switch.pnml index 8d3d081..78f36da 100644 --- a/src/Aircraft/Boeing/B777/B777_200ER/B777_200ER_switch.pnml +++ b/src/Aircraft/Boeing/B777/B777_200ER/B777_200ER_switch.pnml @@ -22,4 +22,14 @@ switch(FEAT_AIRCRAFT, SELF, sw_B777_200ER, cargo_subtype) { switch (FEAT_AIRCRAFT, SELF, switch_B777200ER_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_B777_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_Boeing_777_200ER_cargo_subtype_capacity, cargo_subtype) +{ + // Use https://seatmaps.com/es/aircraft/boeing-777-200er/ as reference + 1: return 317; // Manufacturer + 2: return 261; // Korean Air + 3: return 302; // Asiana Airlines + 4: return 393; // Jin Air + 5: return 362; // United Airlines +} diff --git a/src/Aircraft/Boeing/B777/B777_300/B777_300.pnml b/src/Aircraft/Boeing/B777/B777_300/B777_300.pnml index c9aa564..1d4109e 100644 --- a/src/Aircraft/Boeing/B777/B777_300/B777_300.pnml +++ b/src/Aircraft/Boeing/B777/B777_300/B777_300.pnml @@ -18,33 +18,33 @@ item(FEAT_AIRCRAFT, B777_300, 7046){ aircraft_type: AIRCRAFT_TYPE_LARGE; sprite_id: SPRITE_ID_NEW_AIRCRAFT; variant_group: B777_200; - + //spec speed: 952km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 30; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 451; - mail_capacity: 45; - acceleration: 27; + mail_capacity: 45; + 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_B777_300; purchase: sw_B777_300_purchase; @@ -52,6 +52,7 @@ item(FEAT_AIRCRAFT, B777_300, 7046){ cost_factor: 890; running_cost_factor: 120; cargo_subtype_text: sw_Boeing_777_300_cargo_subtype_text; + passenger_capacity: sw_Boeing_777_300_cargo_subtype_capacity; name: switch_B777300_name; - } + } } diff --git a/src/Aircraft/Boeing/B777/B777_300/B777_300_switch.pnml b/src/Aircraft/Boeing/B777/B777_300/B777_300_switch.pnml index 3553d5d..20eb2ae 100644 --- a/src/Aircraft/Boeing/B777/B777_300/B777_300_switch.pnml +++ b/src/Aircraft/Boeing/B777/B777_300/B777_300_switch.pnml @@ -16,4 +16,11 @@ switch(FEAT_AIRCRAFT, SELF, sw_B777_300, cargo_subtype) { switch (FEAT_AIRCRAFT, SELF, switch_B777300_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_B777_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_Boeing_777_300_cargo_subtype_capacity, cargo_subtype) +{ + // Use https://seatmaps.com/es/aircraft/boeing-777-300/ as reference + 1: return 396; // Manufacturer + 2: return 338; // Korean Air +} diff --git a/src/Aircraft/Boeing/B777/B777_300ER/B777_300ER.pnml b/src/Aircraft/Boeing/B777/B777_300ER/B777_300ER.pnml index 9a7aa92..419d5a1 100644 --- a/src/Aircraft/Boeing/B777/B777_300ER/B777_300ER.pnml +++ b/src/Aircraft/Boeing/B777/B777_300ER/B777_300ER.pnml @@ -18,33 +18,33 @@ item(FEAT_AIRCRAFT, B777_300ER, 7012){ aircraft_type: AIRCRAFT_TYPE_LARGE; sprite_id: SPRITE_ID_NEW_AIRCRAFT; variant_group: B777_200; - + //spec speed: 952km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 30; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 386; - mail_capacity: 45; - acceleration: 27; + mail_capacity: 45; + 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_B777_300ER; purchase: sw_B777_300ER_purchase; @@ -52,6 +52,7 @@ item(FEAT_AIRCRAFT, B777_300ER, 7012){ cost_factor: 781; running_cost_factor: 120; cargo_subtype_text: sw_Boeing_777_300ER_cargo_subtype_text; + passenger_capacity: sw_Boeing_777_300ER_cargo_subtype_capacity; name: switch_B777300ER_name; - } + } } diff --git a/src/Aircraft/Boeing/B777/B777_300ER/B777_300ER_switch.pnml b/src/Aircraft/Boeing/B777/B777_300ER/B777_300ER_switch.pnml index 26cedac..4fbea11 100644 --- a/src/Aircraft/Boeing/B777/B777_300ER/B777_300ER_switch.pnml +++ b/src/Aircraft/Boeing/B777/B777_300ER/B777_300ER_switch.pnml @@ -2,48 +2,70 @@ 스위치 --------------------------------------------------------------------*/ switch(FEAT_AIRCRAFT, SELF, sw_Boeing_777_300ER_cargo_subtype_text, cargo_subtype) { - 1: return string(STR_REFIT_LIVERY_Boeing); // Boeing - 2: return string(STR_REFIT_LIVERY_Emiratesairlines); // Emirates - 3: return string(STR_REFIT_LIVERY_Qatarairways); // Qatar Airways - 4: return string(STR_REFIT_LIVERY_Airfrance); // Air France - 5: return string(STR_REFIT_LIVERY_Cathaypacific); // Cathay Pacific - 6: return string(STR_REFIT_LIVERY_Saudiarabianairlines); // Saudia - 7: return string(STR_REFIT_LIVERY_Turkishairlines); // Turkish Airlines - 8: return string(STR_REFIT_LIVERY_Airchina); // Air China - 9: return string(STR_REFIT_LIVERY_Koreanair_new); // Korean Air - 10: return string(STR_REFIT_LIVERY_Koreanair); // Korean Air old - 11: return string(STR_REFIT_LIVERY_Aeroflot); // Aeroflot - 12: return string(STR_REFIT_LIVERY_Singaporeairlines); // Singapore Ainlines - 13: return string(STR_REFIT_LIVERY_Americanairlines); // American Airlines - 14: return string(STR_REFIT_LIVERY_Britishairways); // British Airways - 15: return string(STR_REFIT_LIVERY_Allnipponairways); // ANA + 1: return string(STR_REFIT_LIVERY_Boeing); // Boeing + 2: return string(STR_REFIT_LIVERY_Emiratesairlines); // Emirates + 3: return string(STR_REFIT_LIVERY_Qatarairways); // Qatar Airways + 4: return string(STR_REFIT_LIVERY_Airfrance); // Air France + 5: return string(STR_REFIT_LIVERY_Cathaypacific); // Cathay Pacific + 6: return string(STR_REFIT_LIVERY_Saudiarabianairlines); // Saudia + 7: return string(STR_REFIT_LIVERY_Turkishairlines); // Turkish Airlines + 8: return string(STR_REFIT_LIVERY_Airchina); // Air China + 9: return string(STR_REFIT_LIVERY_Koreanair_new); // Korean Air + 10: return string(STR_REFIT_LIVERY_Koreanair); // Korean Air old + 11: return string(STR_REFIT_LIVERY_Aeroflot); // Aeroflot + 12: return string(STR_REFIT_LIVERY_Singaporeairlines); // Singapore Ainlines + 13: return string(STR_REFIT_LIVERY_Americanairlines); // American Airlines + 14: return string(STR_REFIT_LIVERY_Britishairways); // British Airways + 15: return string(STR_REFIT_LIVERY_Allnipponairways); // ANA 16: return string(STR_REFIT_LIVERY_Japanairlines); // Japan Airlines - 17: return string(STR_REFIT_LIVERY_Unitedairlines); // Airlines + 17: return string(STR_REFIT_LIVERY_Unitedairlines); // Airlines return string(STR_REFIT_LIVERY_Boeing); } switch(FEAT_AIRCRAFT, SELF, sw_B777_300ER, cargo_subtype) { - 1: set_B777_300ER; // Boeing - 2: set_B777_300ER_Emirates; // Emirates - 3: set_B777_300ER_Qatarairways; // Qatar Airways - 4: set_B777_300ER_Airfrance; // Air France - 5: set_B777_300ER_Cathaypacific; // Cathay Pacific - 6: set_B777_300ER_Saudia; // Saudia - 7: set_B777_300ER_Turkishairlines; // Turkish Airlines - 8: set_B777_300ER_airchina; // Air China - 9: set_B777_300ER_korean25; // Korean Air - 10: set_B777_300ER_korean; // Korean Air Old - 11: set_B777_300ER_aeroflot; // Aeroflot - 12: set_B777_300ER_singapore; // Singapore Airlines - 13: set_B777_300ER_american; // American Airlines - 14: set_B777_300ER_british; // British Airways - 15: set_B777_300ER_ana; // ANA - 16: set_B777_300ER_Japanairlines; // Japan Airlines - 17: set_B777_300ER_united; // United Airlines + 1: set_B777_300ER; // Boeing + 2: set_B777_300ER_Emirates; // Emirates + 3: set_B777_300ER_Qatarairways; // Qatar Airways + 4: set_B777_300ER_Airfrance; // Air France + 5: set_B777_300ER_Cathaypacific; // Cathay Pacific + 6: set_B777_300ER_Saudia; // Saudia + 7: set_B777_300ER_Turkishairlines; // Turkish Airlines + 8: set_B777_300ER_airchina; // Air China + 9: set_B777_300ER_korean25; // Korean Air + 10: set_B777_300ER_korean; // Korean Air Old + 11: set_B777_300ER_aeroflot; // Aeroflot + 12: set_B777_300ER_singapore; // Singapore Airlines + 13: set_B777_300ER_american; // American Airlines + 14: set_B777_300ER_british; // British Airways + 15: set_B777_300ER_ana; // ANA + 16: set_B777_300ER_Japanairlines; // Japan Airlines + 17: set_B777_300ER_united; // United Airlines set_B777_300ER; } switch (FEAT_AIRCRAFT, SELF, switch_B777300ER_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_B777_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_Boeing_777_300ER_cargo_subtype_capacity, cargo_subtype) +{ + // Use https://seatmaps.com/es/aircraft/boeing-777-300er/ as reference + 1: return 365; // Boeing + 2: return 328; // Emirates + 3: return 339; // Qatar Airways + 4: return 312; // Air France + 5: return 361; // Cathay Pacific + 6: return 405; // Saudia + 7: return 400; // Turkish Airlines + 8: return 392; // Air China + 9: return 328; // Korean Air new + 10: return 277; // Korean Air old + 11: return 427; // Aeroflot + 12: return 264; // Singapore Airlines + 13: return 330; // American Airlines + 14: return 254; // British Airways + 15: return 212; // ANA + 16: return 244; // Japan Airlines + 17: return 350; // United Airlines +}