diff --git a/src/Aircraft/Airbus/A330/A330_900/A330_900.pnml b/src/Aircraft/Airbus/A330/A330_900/A330_900.pnml index a60d663..bd16c77 100644 --- a/src/Aircraft/Airbus/A330/A330_900/A330_900.pnml +++ b/src/Aircraft/Airbus/A330/A330_900/A330_900.pnml @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, A330_900, 7027){ aircraft_type: AIRCRAFT_TYPE_LARGE; sprite_id: SPRITE_ID_NEW_AIRCRAFT; variant_group: A330_200; - + //spec speed: 913km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 25; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 460; - mail_capacity: 29; - acceleration: 27; + mail_capacity: 29; + 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_A330_900; purchase: sw_A330_900_purchase; loading_speed: 43; cost_factor: 723; running_cost_factor: 120; - cargo_subtype_text: sw_Airbus_A330_900_cargo_subtype_text; - name: switch_A330900_name; + cargo_subtype_text: sw_A330_900_cargo_subtype_text; + passenger_capacity: sw_A330_900_cargo_subtype_capacity; + name: switch_A330_900_name; } } diff --git a/src/Aircraft/Airbus/A330/A330_900/A330_900_graphic.pnml b/src/Aircraft/Airbus/A330/A330_900/A330_900_graphic.pnml index cdbd246..8a95a43 100644 --- a/src/Aircraft/Airbus/A330/A330_900/A330_900_graphic.pnml +++ b/src/Aircraft/Airbus/A330/A330_900/A330_900_graphic.pnml @@ -17,9 +17,33 @@ spriteset(set_A330_900_default, "src/Aircraft/Airbus/A330/A330_900/A330_900.png" tp_A330_300(0, 0) } +/*-------------------------------------------------------------------- +2. A330-900 TAP +--------------------------------------------------------------------*/ + +spriteset(set_A330_900_tap, "src/Aircraft/Airbus/A330/A330_900/TAP.png"){ + tp_A330_300(0, 0) +} + +/*-------------------------------------------------------------------- +3. A330-900 Delta +--------------------------------------------------------------------*/ + +spriteset(set_A330_900_delta, "src/Aircraft/Airbus/A330/A330_900/Delta.png"){ + tp_A330_300(0, 0) +} + +/*-------------------------------------------------------------------- +4. A330-900 Virgin +--------------------------------------------------------------------*/ + +spriteset(set_A330_900_virgin, "src/Aircraft/Airbus/A330/A330_900/Virgin.png"){ + tp_A330_300(0, 0) +} + /*-------------------------------------------------------------------- 구매정보 --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_A330_900_purchase, cargo_subtype) { set_A330_900_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Airbus/A330/A330_900/A330_900_switch.pnml b/src/Aircraft/Airbus/A330/A330_900/A330_900_switch.pnml index 107761b..81bc1a1 100644 --- a/src/Aircraft/Airbus/A330/A330_900/A330_900_switch.pnml +++ b/src/Aircraft/Airbus/A330/A330_900/A330_900_switch.pnml @@ -1,19 +1,31 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A330_900_cargo_subtype_text, cargo_subtype) { - 1: return string(STR_REFIT_LIVERY_Airbus); // 제조사 - 2: return string(STR_REFIT_LIVERY_Airbus); // 대한항공 +switch(FEAT_AIRCRAFT, SELF, sw_A330_900_cargo_subtype_text, cargo_subtype) { + 1: return string(STR_REFIT_LIVERY_Airbus); // Manufacturer + 2: return string(STR_REFIT_LIVERY_TAP); // TAP + 3: return string(STR_REFIT_LIVERY_Deltaairlines); // Delta + 4: return string(STR_REFIT_LIVERY_Virginatlantic); // Virgin return string(STR_REFIT_LIVERY_Airbus); } switch(FEAT_AIRCRAFT, SELF, sw_A330_900, cargo_subtype) { - 1: set_A330_900_default; // 제조사 - 2: set_A330_900_default; // 제조사 + 1: set_A330_900_default; // Manufacturer + 2: set_A330_900_tap; // TAP + 3: set_A330_900_delta; // Delta + 4: set_A330_900_virgin; // Virgin set_A330_900_default; } -switch (FEAT_AIRCRAFT, SELF, switch_A330900_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { +switch (FEAT_AIRCRAFT, SELF, switch_A330_900_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_A330_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_A330_900_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 440; // default + 2: return 298; // TAP + 3: return 281; // Delta + 4: return 262; // Virgin +} diff --git a/src/Aircraft/Airbus/A330/A330_900/Delta.png b/src/Aircraft/Airbus/A330/A330_900/Delta.png new file mode 100644 index 0000000..faedcba Binary files /dev/null and b/src/Aircraft/Airbus/A330/A330_900/Delta.png differ diff --git a/src/Aircraft/Airbus/A330/A330_900/TAP.png b/src/Aircraft/Airbus/A330/A330_900/TAP.png new file mode 100644 index 0000000..7c122fb Binary files /dev/null and b/src/Aircraft/Airbus/A330/A330_900/TAP.png differ diff --git a/src/Aircraft/Airbus/A330/A330_900/Virgin.png b/src/Aircraft/Airbus/A330/A330_900/Virgin.png new file mode 100644 index 0000000..50a726a Binary files /dev/null and b/src/Aircraft/Airbus/A330/A330_900/Virgin.png differ