diff --git a/src/Aircraft/Boeing/.DS_Store b/src/Aircraft/Boeing/.DS_Store new file mode 100644 index 0000000..f25f263 Binary files /dev/null and b/src/Aircraft/Boeing/.DS_Store differ diff --git a/src/Aircraft/Boeing/B787/.DS_Store b/src/Aircraft/Boeing/B787/.DS_Store new file mode 100644 index 0000000..5e8bd7d Binary files /dev/null and b/src/Aircraft/Boeing/B787/.DS_Store differ diff --git a/src/Aircraft/Boeing/B787/B787_10/ANA.png b/src/Aircraft/Boeing/B787/B787_10/ANA.png new file mode 100644 index 0000000..f5aac26 Binary files /dev/null and b/src/Aircraft/Boeing/B787/B787_10/ANA.png differ diff --git a/src/Aircraft/Boeing/B787/B787_10/B787_10.pnml b/src/Aircraft/Boeing/B787/B787_10/B787_10.pnml index a39b280..f8d1a91 100644 --- a/src/Aircraft/Boeing/B787/B787_10/B787_10.pnml +++ b/src/Aircraft/Boeing/B787/B787_10/B787_10.pnml @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, B787_10, 7045){ aircraft_type: AIRCRAFT_TYPE_LARGE; sprite_id: SPRITE_ID_NEW_AIRCRAFT; variant_group: B787_8; - + //spec speed: 939km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 30; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 330; - mail_capacity: 41; - acceleration: 27; + mail_capacity: 41; + 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_B787_10; purchase: sw_B787_10_purchase; loading_speed: 26; cost_factor: 763; running_cost_factor: 120; - cargo_subtype_text: sw_Boeing_787_10_cargo_subtype_text; - name: switch_B78710_name; + cargo_subtype_text: sw_787_10_cargo_subtype_text; + passenger_capacity: sw_787_10_cargo_subtype_capacity; + name: switch_B787_10_name; } } diff --git a/src/Aircraft/Boeing/B787/B787_10/B787_10_graphic.pnml b/src/Aircraft/Boeing/B787/B787_10/B787_10_graphic.pnml index c18f9f5..9ad454d 100644 --- a/src/Aircraft/Boeing/B787/B787_10/B787_10_graphic.pnml +++ b/src/Aircraft/Boeing/B787/B787_10/B787_10_graphic.pnml @@ -41,10 +41,33 @@ spriteset(set_B787_10_united, "src/Aircraft/Boeing/B787/B787_10/United.png"){ tp_B787_10(0, 0) } +/*-------------------------------------------------------------------- +4. Boeing 787-10 ANA +--------------------------------------------------------------------*/ + +spriteset(set_B787_10_ana, "src/Aircraft/Boeing/B787/B787_10/ANA.png"){ + tp_B787_10(0, 0) +} + +/*-------------------------------------------------------------------- +5. Boeing 787-10 BA +--------------------------------------------------------------------*/ + +spriteset(set_B787_10_ba, "src/Aircraft/Boeing/B787/B787_10/Britishairways.png"){ + tp_B787_10(0, 0) +} + +/*-------------------------------------------------------------------- +6. Boeing 787-10 KLM +--------------------------------------------------------------------*/ + +spriteset(set_B787_10_klm, "src/Aircraft/Boeing/B787/B787_10/KLM.png"){ + tp_B787_10(0, 0) +} /*-------------------------------------------------------------------- Purchase info --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_B787_10_purchase, cargo_subtype) { set_B787_10_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Boeing/B787/B787_10/B787_10_switch.pnml b/src/Aircraft/Boeing/B787/B787_10/B787_10_switch.pnml index 109e065..08358fe 100644 --- a/src/Aircraft/Boeing/B787/B787_10/B787_10_switch.pnml +++ b/src/Aircraft/Boeing/B787/B787_10/B787_10_switch.pnml @@ -1,23 +1,41 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Boeing_787_10_cargo_subtype_text, cargo_subtype) { - 1: return string(STR_REFIT_LIVERY_Boeing); // Manufacturer - 2: return string(STR_REFIT_LIVERY_Koreanair); // Korean Air old - 3: return string(STR_REFIT_LIVERY_Koreanair_new); // Korean Air - 4: return string(STR_REFIT_LIVERY_Unitedairlines); // United Airlines +switch(FEAT_AIRCRAFT, SELF, sw_787_10_cargo_subtype_text, cargo_subtype) { + 1: return string(STR_REFIT_LIVERY_Boeing); // Manufacturer + 2: return string(STR_REFIT_LIVERY_Koreanair); // Korean Air old + 3: return string(STR_REFIT_LIVERY_Koreanair_new); // Korean Air + 4: return string(STR_REFIT_LIVERY_Unitedairlines); // United Airlines + 5: return string(STR_REFIT_LIVERY_Allnipponairways); // ANA + 6: return string(STR_REFIT_LIVERY_Britishairways); // British Airways + 7: return string(STR_REFIT_LIVERY_Klmroyaldutchairlines); // KLM return string(STR_REFIT_LIVERY_Boeing); } switch(FEAT_AIRCRAFT, SELF, sw_B787_10, cargo_subtype) { - 1: set_B787_10; // Manufacturer - 2: set_B787_10_korean; // Korean Air old + 1: set_B787_10; // Manufacturer + 2: set_B787_10_korean; // Korean Air old 3: set_B787_10_korean25; // Korean Air - 4: set_B787_10_united; // United Airlines + 4: set_B787_10_united; // United Airlines + 5: set_B787_10_ana; // ANA + 6: set_B787_10_ba; // British Airways + 7: set_B787_10_klm; // KLM set_B787_10; } -switch (FEAT_AIRCRAFT, SELF, switch_B78710_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { +switch (FEAT_AIRCRAFT, SELF, switch_B787_10_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_B787_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_787_10_cargo_subtype_capacity, cargo_subtype) +{ + // Use https://seatmaps.com/es/aircraft/boeing-787-10/ as reference + 1: return 318; // default + 2: return 325; // Korean Air old + 3: return 325; // Korean Air + 4: return 318; // United Airlines + 5: return 429; // ANA + 6: return 256; // British Airways + 7: return 318; // KLM +} diff --git a/src/Aircraft/Boeing/B787/B787_10/KLM.png b/src/Aircraft/Boeing/B787/B787_10/KLM.png new file mode 100644 index 0000000..458cef3 Binary files /dev/null and b/src/Aircraft/Boeing/B787/B787_10/KLM.png differ diff --git a/src/Aircraft/Boeing/B787/B787_10/britishairways.png b/src/Aircraft/Boeing/B787/B787_10/britishairways.png new file mode 100644 index 0000000..db5bb4c Binary files /dev/null and b/src/Aircraft/Boeing/B787/B787_10/britishairways.png differ diff --git a/src/Aircraft/Boeing/B787/B787_8/B787_8.pnml b/src/Aircraft/Boeing/B787/B787_8/B787_8.pnml index 1c037f2..2a02dae 100644 --- a/src/Aircraft/Boeing/B787/B787_8/B787_8.pnml +++ b/src/Aircraft/Boeing/B787/B787_8/B787_8.pnml @@ -17,40 +17,41 @@ item(FEAT_AIRCRAFT, B787_8, 7044){ introduction_date: date(2011, 1, 1); aircraft_type: AIRCRAFT_TYPE_LARGE; sprite_id: SPRITE_ID_NEW_AIRCRAFT; - + //spec speed: 939km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 30; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 242; - mail_capacity: 31; - acceleration: 27; + mail_capacity: 31; + 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_B787_8; purchase: sw_B787_8_purchase; loading_speed: 26; cost_factor: 560; running_cost_factor: 120; - cargo_subtype_text: sw_Boeing_787_8_cargo_subtype_text; - name: switch_B7878_name; + cargo_subtype_text: sw_787_8_cargo_subtype_text; + passenger_capacity: sw_787_8_cargo_subtype_capacity; + name: switch_B787_8_name; } } diff --git a/src/Aircraft/Boeing/B787/B787_8/B787_8_switch.pnml b/src/Aircraft/Boeing/B787/B787_8/B787_8_switch.pnml index c1f8e64..06f147e 100644 --- a/src/Aircraft/Boeing/B787/B787_8/B787_8_switch.pnml +++ b/src/Aircraft/Boeing/B787/B787_8/B787_8_switch.pnml @@ -1,25 +1,34 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Boeing_787_8_cargo_subtype_text, cargo_subtype) { - 1: return string(STR_REFIT_LIVERY_Boeing); // Boeing - 2: return string(STR_REFIT_LIVERY_Zipairtokyo); // ZIPAIR +switch(FEAT_AIRCRAFT, SELF, sw_787_8_cargo_subtype_text, cargo_subtype) { + 1: return string(STR_REFIT_LIVERY_Boeing); // Boeing + 2: return string(STR_REFIT_LIVERY_Zipairtokyo); // ZIPAIR 3: return string(STR_REFIT_LIVERY_Allnipponairways); // ANA - 4: return string(STR_REFIT_LIVERY_Airjapan); // Air Japan - 5: return string(STR_REFIT_LIVERY_Unitedairlines); // United Airlines + 4: return string(STR_REFIT_LIVERY_Airjapan); // Air Japan + 5: return string(STR_REFIT_LIVERY_Unitedairlines); // United Airlines return string(STR_REFIT_LIVERY_Boeing); } switch(FEAT_AIRCRAFT, SELF, sw_B787_8, cargo_subtype) { - 1: set_B787_8; // Manufacturer - 2: set_B787_8_zip; // ZIPAIR - 3: set_B787_8_ana; // ANA - 4: set_B787_8_airjapan; // Air Japan - 5: set_B787_8_united; // United Airlines + 1: set_B787_8; // Manufacturer + 2: set_B787_8_zip; // ZIPAIR + 3: set_B787_8_ana; // ANA + 4: set_B787_8_airjapan; // Air Japan + 5: set_B787_8_united; // United Airlines set_B787_8; } -switch (FEAT_AIRCRAFT, SELF, switch_B7878_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { +switch (FEAT_AIRCRAFT, SELF, switch_B787_8_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_B787_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_787_8_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 242; // Boeing + 2: return 293; // ZIPAIR + 3: return 184; // ANA + 4: return 324; // Air Japan + 5: return 243; // United Airlines +}