diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..8efa3b3 Binary files /dev/null and b/.DS_Store differ diff --git a/Makefile b/Makefile index 693f094..1304666 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ endif # Disable default suffixes rule .SUFFIXES: -.PHONY: all build clean download_page doc generated bundle bundle_tar +.PHONY: all build clean download_page doc generated bundle bundle_tar install # File names DIR_NAME ?= $(shell echo "$(REPO_NAME) $(VERSION)" | xargs | sed s/\ /_/g) @@ -125,6 +125,13 @@ clean:: @echo "[CLEAN BUNDLE]" @-rm -rf $(shell echo "$(REPO_NAME)*" | xargs | sed s/\ /_/g) +# Install to OpenTTD newgrf directory +install: bundle_tar + @echo "[INSTALL] Copying $(DIR_NAME).tar to ~/Documents/OpenTTD/newgrf/AWAS.tar" + @mkdir -p ~/Documents/OpenTTD/newgrf + @cp generated/$(DIR_NAME).tar ~/Documents/OpenTTD/newgrf/AWAS.tar + @echo "[INSTALL] Complete" + # Clean clean:: @-rm -rf ./.nmlcache diff --git a/lang/english.lng b/lang/english.lng index 7268d83..56ca356 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -457,8 +457,8 @@ STR_REFIT_LIVERY_Klmroyaldutchairlines :(KLM Royal Dutch Airlines) STR_REFIT_LIVERY_Aeroflot :{DKBLUE}(AEROFLOT) STR_REFIT_LIVERY_Aeroflot_old1990 :{DKBLUE}(AEROFLOT / 1990s Livery) STR_REFIT_LIVERY_Aeroflot_old1980 :{DKBLUE}(AEROFLOT / Soviet Livery) -STR_REFIT_LIVERY_Iberiaairlines :{RED}(IVERIA) -STR_REFIT_LIVERY_Iberiaairlines_old1970 :{RED}(IVERIA / 1970~2014 Livery) +STR_REFIT_LIVERY_Iberiaairlines :{RED}(IBERIA) +STR_REFIT_LIVERY_Iberiaairlines_old1970 :{RED}(IBERIA / 1970~2014 Livery) STR_REFIT_LIVERY_Plusultra :(Plus Ultra) STR_REFIT_LIVERY_Evelop :(Evelop) STR_REFIT_LIVERY_Finnair :{DKBLUE}(FINNAIR) @@ -466,6 +466,11 @@ STR_REFIT_LIVERY_Swissinternationalairlines :{RED}(SWISS International A STR_REFIT_LIVERY_Scandinavianairlinessystem :(SAS Scandinavian Airlines System) STR_REFIT_LIVERY_Turkishairlines :{RED}(Turkish Airlines) STR_REFIT_LIVERY_Aerlingus :(Aer Lingus) +STR_REFIT_LIVERY_Aegean :(Aegean) +STR_REFIT_LIVERY_Easyjet :(Easyjet) +STR_REFIT_LIVERY_TAP :(TAP) +STR_REFIT_LIVERY_Vueling :(Vueling) +STR_REFIT_LIVERY_Wizzair :(Wizz Air) # Liveries (Oceania, Africa) diff --git a/lang/korean.lng b/lang/korean.lng index 32dd86f..73c4069 100644 --- a/lang/korean.lng +++ b/lang/korean.lng @@ -467,6 +467,11 @@ STR_REFIT_LIVERY_Swissinternationalairlines :(스위스 국제항공) STR_REFIT_LIVERY_Scandinavianairlinessystem :(스칸디나비아 항공) STR_REFIT_LIVERY_Turkishairlines :(터키항공) STR_REFIT_LIVERY_Aerlingus :(에어 링구스) +STR_REFIT_LIVERY_Aegean :(Aegean) +STR_REFIT_LIVERY_Easyjet :(Easyjet) +STR_REFIT_LIVERY_TAP :(TAP) +STR_REFIT_LIVERY_Vueling :(Vueling) +STR_REFIT_LIVERY_Wizzair :(Wizz Air) # Liveries (Oceania, Africa) diff --git a/src/Aircraft/Airbus/A220/A220_100/A220_100.pnml b/src/Aircraft/Airbus/A220/A220_100/A220_100.pnml index b95d90a..eb42367 100644 --- a/src/Aircraft/Airbus/A220/A220_100/A220_100.pnml +++ b/src/Aircraft/Airbus/A220/A220_100/A220_100.pnml @@ -17,40 +17,41 @@ item(FEAT_AIRCRAFT, A220_100, 7023){ introduction_date: date(2012, 1, 1); aircraft_type: AIRCRAFT_TYPE_SMALL; sprite_id: SPRITE_ID_NEW_AIRCRAFT; - + //spec speed: 829km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 25; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 110; - mail_capacity: 18; - acceleration: 27; + mail_capacity: 18; + 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_A220_100; purchase: sw_A220_100_purchase; loading_speed: 43; cost_factor: 198; running_cost_factor: 120; - cargo_subtype_text: sw_Airbus_A220_100_cargo_subtype_text; + cargo_subtype_text: sw_A220_100_cargo_subtype_text; + passenger_capacity: sw_A220_100_cargo_subtype_capacity; name: switch_A220100_name; } } diff --git a/src/Aircraft/Airbus/A220/A220_100/A220_100_graphic.pnml b/src/Aircraft/Airbus/A220/A220_100/A220_100_graphic.pnml index 20ddca8..8371a55 100644 --- a/src/Aircraft/Airbus/A220/A220_100/A220_100_graphic.pnml +++ b/src/Aircraft/Airbus/A220/A220_100/A220_100_graphic.pnml @@ -17,6 +17,13 @@ spriteset(set_A220_100_default, "src/Aircraft/Airbus/A220/A220_100/A220_100.png" tp_A220_100(0, 0) } +/*-------------------------------------------------------------------- +2. Swiss +--------------------------------------------------------------------*/ + +spriteset(set_A220_100_Swiss, "src/Aircraft/Airbus/A220/A220_100/Swiss.png"){ + tp_A220_100(0, 0) +} /*-------------------------------------------------------------------- @@ -24,4 +31,4 @@ spriteset(set_A220_100_default, "src/Aircraft/Airbus/A220/A220_100/A220_100.png" --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_A220_100_purchase, cargo_subtype) { set_A220_100_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Airbus/A220/A220_100/A220_100_switch.pnml b/src/Aircraft/Airbus/A220/A220_100/A220_100_switch.pnml index a0b6228..843c582 100644 --- a/src/Aircraft/Airbus/A220/A220_100/A220_100_switch.pnml +++ b/src/Aircraft/Airbus/A220/A220_100/A220_100_switch.pnml @@ -1,19 +1,25 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A220_100_cargo_subtype_text, cargo_subtype) { +switch(FEAT_AIRCRAFT, SELF, sw_A220_100_cargo_subtype_text, cargo_subtype) { 1: return string(STR_REFIT_LIVERY_Airbus); // 제조사 - 2: return string(STR_REFIT_LIVERY_Airbus); // 제조사 + 2: return string(STR_REFIT_LIVERY_Swissinternationalairlines); // Swiss return string(STR_REFIT_LIVERY_Airbus); } switch(FEAT_AIRCRAFT, SELF, sw_A220_100, cargo_subtype) { 1: set_A220_100_default; // 제조사 - 2: set_A220_100_default; + 2: set_A220_100_Swiss; // Swiss set_A220_100_default; } - switch (FEAT_AIRCRAFT, SELF, switch_A220100_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { +switch (FEAT_AIRCRAFT, SELF, switch_A220100_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_A220_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_A220_100_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 120; // default + 2: return 125; // Swiss +} diff --git a/src/Aircraft/Airbus/A220/A220_100/Swiss.png b/src/Aircraft/Airbus/A220/A220_100/Swiss.png new file mode 100644 index 0000000..2a92e04 Binary files /dev/null and b/src/Aircraft/Airbus/A220/A220_100/Swiss.png differ diff --git a/src/Aircraft/Airbus/A220/A220_300/A220_300.pnml b/src/Aircraft/Airbus/A220/A220_300/A220_300.pnml index 7da52d1..5d7b080 100644 --- a/src/Aircraft/Airbus/A220/A220_300/A220_300.pnml +++ b/src/Aircraft/Airbus/A220/A220_300/A220_300.pnml @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, A220_300, 7013){ aircraft_type: AIRCRAFT_TYPE_SMALL; sprite_id: SPRITE_ID_NEW_AIRCRAFT; variant_group: A220_100; - + //spec speed: 829km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 25; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 135; - mail_capacity: 18; - acceleration: 27; + mail_capacity: 18; + 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_A220_300; purchase: sw_A220_300_purchase; loading_speed: 43; cost_factor: 223; running_cost_factor: 120; - cargo_subtype_text: sw_Airbus_A220_300_cargo_subtype_text; + cargo_subtype_text: sw_A220_300_cargo_subtype_text; + passenger_capacity: sw_A220_300_cargo_subtype_capacity; name: switch_A220300_name; } } diff --git a/src/Aircraft/Airbus/A220/A220_300/A220_300_graphic.pnml b/src/Aircraft/Airbus/A220/A220_300/A220_300_graphic.pnml index f09f11f..215c21c 100644 --- a/src/Aircraft/Airbus/A220/A220_300/A220_300_graphic.pnml +++ b/src/Aircraft/Airbus/A220/A220_300/A220_300_graphic.pnml @@ -25,10 +25,25 @@ spriteset(set_A220_300_korean, "src/Aircraft/Airbus/A220/A220_300/Korean.png"){ tp_A220_300(0, 0) } +/*-------------------------------------------------------------------- +2. A220-300 Swiss +--------------------------------------------------------------------*/ + +spriteset(set_A220_300_swiss, "src/Aircraft/Airbus/A220/A220_300/Swiss.png"){ + tp_A220_300(0, 0) +} + +/*-------------------------------------------------------------------- +3. A220-300 Air France +--------------------------------------------------------------------*/ + +spriteset(set_A220_300_airfrance, "src/Aircraft/Airbus/A220/A220_300/AirFrance.png"){ + tp_A220_300(0, 0) +} /*-------------------------------------------------------------------- 구매정보 --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_A220_300_purchase, cargo_subtype) { set_A220_300_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Airbus/A220/A220_300/A220_300_switch.pnml b/src/Aircraft/Airbus/A220/A220_300/A220_300_switch.pnml index 16de23e..c24926a 100644 --- a/src/Aircraft/Airbus/A220/A220_300/A220_300_switch.pnml +++ b/src/Aircraft/Airbus/A220/A220_300/A220_300_switch.pnml @@ -1,19 +1,31 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A220_300_cargo_subtype_text, cargo_subtype) { - 1: return string(STR_REFIT_LIVERY_Airbus); // 제조사 - 2: return string(STR_REFIT_LIVERY_Koreanair); // 대한항공 +switch(FEAT_AIRCRAFT, SELF, sw_A220_300_cargo_subtype_text, cargo_subtype) { + 1: return string(STR_REFIT_LIVERY_Airbus); // 제조사 + 2: return string(STR_REFIT_LIVERY_Koreanair); // Korean Air + 3: return string(STR_REFIT_LIVERY_Swissinternationalairlines); // Swiss + 4: return string(STR_REFIT_LIVERY_Airfrance); // Air France return string(STR_REFIT_LIVERY_Airbus); } switch(FEAT_AIRCRAFT, SELF, sw_A220_300, cargo_subtype) { - 1: set_A220_300_default; // 제조사 - 2: set_A220_300_korean; // 대한항공 + 1: set_A220_300_default; // 제조사 + 2: set_A220_300_korean; // Korean Air + 3: set_A220_300_swiss; // Swiss + 4: set_A220_300_airfrance; // Air France set_A220_300_default; } switch (FEAT_AIRCRAFT, SELF, switch_A220300_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_A220_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_A220_300_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 130; // default + 2: return 140; // Korean Air + 3: return 145; // Swiss + 4: return 148; // Air France +} diff --git a/src/Aircraft/Airbus/A220/A220_300/AirFrance.png b/src/Aircraft/Airbus/A220/A220_300/AirFrance.png new file mode 100644 index 0000000..c759ec8 Binary files /dev/null and b/src/Aircraft/Airbus/A220/A220_300/AirFrance.png differ diff --git a/src/Aircraft/Airbus/A220/A220_300/Swiss.png b/src/Aircraft/Airbus/A220/A220_300/Swiss.png new file mode 100644 index 0000000..f32621e Binary files /dev/null and b/src/Aircraft/Airbus/A220/A220_300/Swiss.png differ diff --git a/src/Aircraft/Airbus/A320/.DS_Store b/src/Aircraft/Airbus/A320/.DS_Store new file mode 100644 index 0000000..33c83bf Binary files /dev/null and b/src/Aircraft/Airbus/A320/.DS_Store differ diff --git a/src/Aircraft/Airbus/A320/A318_100/A318_100.pnml b/src/Aircraft/Airbus/A320/A318_100/A318_100.pnml index dcb0381..fad057c 100644 --- a/src/Aircraft/Airbus/A320/A318_100/A318_100.pnml +++ b/src/Aircraft/Airbus/A320/A318_100/A318_100.pnml @@ -17,40 +17,41 @@ item(FEAT_AIRCRAFT, A318_100, 7015){ introduction_date: date(2003, 1, 1); aircraft_type: AIRCRAFT_TYPE_SMALL; sprite_id: SPRITE_ID_NEW_AIRCRAFT; - + //spec speed: 901km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 25; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 107; - mail_capacity: 12; - acceleration: 27; + mail_capacity: 12; + 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_A318_100; purchase: sw_A318_100_purchase; loading_speed: 43; cost_factor: 189; running_cost_factor: 120; - cargo_subtype_text: sw_Airbus_A318_100_cargo_subtype_text; - name: switch_A318100_name; + cargo_subtype_text: sw_A318_100_cargo_subtype_text; + name: switch_A318_100_name; + passenger_capacity: sw_A318_100_cargo_subtype_capacity; } } diff --git a/src/Aircraft/Airbus/A320/A318_100/A318_100_switch.pnml b/src/Aircraft/Airbus/A320/A318_100/A318_100_switch.pnml index 9c11505..3352f0b 100644 --- a/src/Aircraft/Airbus/A320/A318_100/A318_100_switch.pnml +++ b/src/Aircraft/Airbus/A320/A318_100/A318_100_switch.pnml @@ -1,19 +1,25 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A318_100_cargo_subtype_text, cargo_subtype) { - 1: return string(STR_REFIT_LIVERY_Airbus); // 제조사 - 2: return string(STR_REFIT_LIVERY_Britishairways); // 영국항공 +switch(FEAT_AIRCRAFT, SELF, sw_A318_100_cargo_subtype_text, cargo_subtype) { + 1: return string(STR_REFIT_LIVERY_Airbus); // Manufacturer + 2: return string(STR_REFIT_LIVERY_Britishairways); // BA return string(STR_REFIT_LIVERY_Airbus); } switch(FEAT_AIRCRAFT, SELF, sw_A318_100, cargo_subtype) { - 1: set_A318_100_default; // 제조사 - 2: set_A318_100_british; // 영국항공 + 1: set_A318_100_default; // Manfufacturer + 2: set_A318_100_british; // BA set_A318_100_default; } - switch (FEAT_AIRCRAFT, SELF, switch_A318100_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { +switch (FEAT_AIRCRAFT, SELF, switch_A318_100_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_A320_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_A318_100_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 107; // default + 2: return 32; // BA +} diff --git a/src/Aircraft/Airbus/A320/A319_100/A319_100.pnml b/src/Aircraft/Airbus/A320/A319_100/A319_100.pnml index 0604d5d..89cea69 100644 --- a/src/Aircraft/Airbus/A320/A319_100/A319_100.pnml +++ b/src/Aircraft/Airbus/A320/A319_100/A319_100.pnml @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, A319_100, 7016){ aircraft_type: AIRCRAFT_TYPE_SMALL; sprite_id: SPRITE_ID_NEW_AIRCRAFT; variant_group: A318_100; - + //spec speed: 901km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 25; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 124; - 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_A319_100; purchase: sw_A319_100_purchase; loading_speed: 43; cost_factor: 225; running_cost_factor: 120; - cargo_subtype_text: sw_Airbus_A319_100_cargo_subtype_text; + cargo_subtype_text: sw_airbus_A319_100_cargo_subtype_text; name: switch_A319100_name; + passenger_capacity: sw_airbus_A319_100_cargo_subtype_capacity; } } diff --git a/src/Aircraft/Airbus/A320/A319_100/A319_100_graphic.pnml b/src/Aircraft/Airbus/A320/A319_100/A319_100_graphic.pnml index 7260ada..091e920 100644 --- a/src/Aircraft/Airbus/A320/A319_100/A319_100_graphic.pnml +++ b/src/Aircraft/Airbus/A320/A319_100/A319_100_graphic.pnml @@ -25,10 +25,18 @@ spriteset(set_A319_100_iberia, "src/Aircraft/Airbus/A320/A319_100/Iberia.png"){ tp_A319_100(0, 0) } +/*-------------------------------------------------------------------- +3. Airbus A319-100 Lufthansa +--------------------------------------------------------------------*/ + +spriteset(set_A319_100_lufthansa, "src/Aircraft/Airbus/A320/A319_100/Lufthansa.png"){ + tp_A319_100(0, 0) +} + /*-------------------------------------------------------------------- Purchase info --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_A319_100_purchase, cargo_subtype) { set_A319_100_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Airbus/A320/A319_100/A319_100_switch.pnml b/src/Aircraft/Airbus/A320/A319_100/A319_100_switch.pnml index b7c4837..f542738 100644 --- a/src/Aircraft/Airbus/A320/A319_100/A319_100_switch.pnml +++ b/src/Aircraft/Airbus/A320/A319_100/A319_100_switch.pnml @@ -1,19 +1,28 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A319_100_cargo_subtype_text, cargo_subtype) { +switch(FEAT_AIRCRAFT, SELF, sw_airbus_A319_100_cargo_subtype_text, cargo_subtype) { 1: return string(STR_REFIT_LIVERY_Airbus); // Manufacturer 2: return string(STR_REFIT_LIVERY_Iberiaairlines); // Iberia + 3: return string(STR_REFIT_LIVERY_Lufthansa); // Lufthansa return string(STR_REFIT_LIVERY_Airbus); } switch(FEAT_AIRCRAFT, SELF, sw_A319_100, cargo_subtype) { 1: set_A319_100_default; // Manufacturer 2: set_A319_100_iberia; // Iberia + 3: set_A319_100_lufthansa; // Lufthansa set_A319_100_default; } - switch (FEAT_AIRCRAFT, SELF, switch_A319100_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { +switch (FEAT_AIRCRAFT, SELF, switch_A319100_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_A320_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_airbus_A319_100_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 124; // default + 2: return 141; // Iberia + 3: return 138; // Lufthansa +} diff --git a/src/Aircraft/Airbus/A320/A319_100/Lufthansa.png b/src/Aircraft/Airbus/A320/A319_100/Lufthansa.png new file mode 100644 index 0000000..cc593c5 Binary files /dev/null and b/src/Aircraft/Airbus/A320/A319_100/Lufthansa.png differ diff --git a/src/Aircraft/Airbus/A320/A320_200/A320_200.pnml b/src/Aircraft/Airbus/A320/A320_200/A320_200.pnml index 585a1f5..4bae08a 100644 --- a/src/Aircraft/Airbus/A320/A320_200/A320_200.pnml +++ b/src/Aircraft/Airbus/A320/A320_200/A320_200.pnml @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, A320_200, 7007){ aircraft_type: AIRCRAFT_TYPE_SMALL; sprite_id: SPRITE_ID_NEW_AIRCRAFT; variant_group: A318_100; - + //spec speed: 901km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 25; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 150; - mail_capacity: 18; - acceleration: 27; + mail_capacity: 18; + 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_A320_200; purchase: sw_A320_200_purchase; loading_speed: 43; cost_factor: 246; running_cost_factor: 120; - cargo_subtype_text: sw_Airbus_A320_200_cargo_subtype_text; - name: switch_A320200_name; + cargo_subtype_text: sw_A320_200_cargo_subtype_text; + passenger_capacity: sw_A320_200_cargo_subtype_capacity; + name: switch_A320_200_name; } } diff --git a/src/Aircraft/Airbus/A320/A320_200/A320_200_graphic.pnml b/src/Aircraft/Airbus/A320/A320_200/A320_200_graphic.pnml index d0a2e03..036cac6 100644 --- a/src/Aircraft/Airbus/A320/A320_200/A320_200_graphic.pnml +++ b/src/Aircraft/Airbus/A320/A320_200/A320_200_graphic.pnml @@ -21,7 +21,7 @@ spriteset(set_A320_200_default, "src/Aircraft/Airbus/A320/A320_200/A320_200.png" 2. Airbus A320-200 Asiana Airlines --------------------------------------------------------------------*/ -spriteset(set_A320_200_asiana, "src/Aircraft/Airbus/A320/A320_200/A320_200_asiana.png"){ +spriteset(set_A320_200_asiana, "src/Aircraft/Airbus/A320/A320_200/asiana.png"){ tp_A320_200(0, 0) } @@ -29,7 +29,7 @@ spriteset(set_A320_200_asiana, "src/Aircraft/Airbus/A320/A320_200/A320_200_asian 2. Airbus A320-200 Air Busan --------------------------------------------------------------------*/ -spriteset(set_A320_200_busan, "src/Aircraft/Airbus/A320/A320_200/A320_200_busan.png"){ +spriteset(set_A320_200_busan, "src/Aircraft/Airbus/A320/A320_200/busan.png"){ tp_A320_200(0, 0) } @@ -37,7 +37,7 @@ spriteset(set_A320_200_busan, "src/Aircraft/Airbus/A320/A320_200/A320_200_busan. 3. Airbus A320-200 AeroK --------------------------------------------------------------------*/ -spriteset(set_A320_200_aerok, "src/Aircraft/Airbus/A320/A320_200/A320_200_aerok.png"){ +spriteset(set_A320_200_aerok, "src/Aircraft/Airbus/A320/A320_200/aerok.png"){ tp_A320_200(0, 0) } @@ -45,7 +45,7 @@ spriteset(set_A320_200_aerok, "src/Aircraft/Airbus/A320/A320_200/A320_200_aerok. 4. Airbus A320-200 Peach Aviation --------------------------------------------------------------------*/ -spriteset(set_A320_200_peach, "src/Aircraft/Airbus/A320/A320_200/Peach.png"){ +spriteset(set_A320_200_peach, "src/Aircraft/Airbus/A320/A320_200/peach.png"){ tp_A320_200(0, 0) } @@ -53,7 +53,7 @@ spriteset(set_A320_200_peach, "src/Aircraft/Airbus/A320/A320_200/Peach.png"){ 5. Airbus A320-200 China Eastern --------------------------------------------------------------------*/ -spriteset(set_A320_200_chinaeastern, "src/Aircraft/Airbus/A320/A320_200/Chinaeastern.png"){ +spriteset(set_A320_200_chinaeastern, "src/Aircraft/Airbus/A320/A320_200/chinaeastern.png"){ tp_A320_200(0, 0) } @@ -61,14 +61,21 @@ spriteset(set_A320_200_chinaeastern, "src/Aircraft/Airbus/A320/A320_200/Chinaeas 7. Airbus A320-200 Iberia --------------------------------------------------------------------*/ -spriteset(set_A320_200_iberia, "src/Aircraft/Airbus/A320/A320_200/Iberia.png"){ +spriteset(set_A320_200_iberia, "src/Aircraft/Airbus/A320/A320_200/iberia.png"){ tp_A320_200(0, 0) } +/*-------------------------------------------------------------------- +7. Airbus A320-200 Lufthansa +--------------------------------------------------------------------*/ + +spriteset(set_A320_200_lufthansa, "src/Aircraft/Airbus/A320/A320_200/lufthansa.png"){ + tp_A320_200(0, 0) +} /*-------------------------------------------------------------------- Purchase info --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_A320_200_purchase, cargo_subtype) { set_A320_200_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Airbus/A320/A320_200/A320_200_switch.pnml b/src/Aircraft/Airbus/A320/A320_200/A320_200_switch.pnml index 9848b4e..1963e23 100644 --- a/src/Aircraft/Airbus/A320/A320_200/A320_200_switch.pnml +++ b/src/Aircraft/Airbus/A320/A320_200/A320_200_switch.pnml @@ -1,29 +1,43 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A320_200_cargo_subtype_text, cargo_subtype) { - 1: return string(STR_REFIT_LIVERY_Airbus); // 제조사 - 2: return string(STR_REFIT_LIVERY_Asiana); // Asiana Airlines - 3: return string(STR_REFIT_LIVERY_Airbusan); // Air Busan - 4: return string(STR_REFIT_LIVERY_Aerok); // Aero K +switch(FEAT_AIRCRAFT, SELF, sw_A320_200_cargo_subtype_text, cargo_subtype) { + 1: return string(STR_REFIT_LIVERY_Airbus); // Manufacturer + 2: return string(STR_REFIT_LIVERY_Asiana); // Asiana Airlines + 3: return string(STR_REFIT_LIVERY_Airbusan); // Air Busan + 4: return string(STR_REFIT_LIVERY_Aerok); // Aero K 5: return string(STR_REFIT_LIVERY_Peachaviation); // Peach Aviation - 6: return string(STR_REFIT_LIVERY_Chinaeastern); // China Eastern - 7: return string(STR_REFIT_LIVERY_Iberiaairlines); // Iberia + 6: return string(STR_REFIT_LIVERY_Chinaeastern); // China Eastern + 7: return string(STR_REFIT_LIVERY_Iberiaairlines); // Iberia + 8: return string(STR_REFIT_LIVERY_Lufthansa); // Lufthansa return string(STR_REFIT_LIVERY_Airbus); } switch(FEAT_AIRCRAFT, SELF, sw_A320_200, cargo_subtype) { - 1: set_A320_200_default; // 제조사 - 2: set_A320_200_asiana; // Asiana Airlines - 3: set_A320_200_busan; // Air Busan - 4: set_A320_200_aerok; // Aero K - 5: set_A320_200_peach; // Peach Aviation + 1: set_A320_200_default; // Manufacturer + 2: set_A320_200_asiana; // Asiana Airlines + 3: set_A320_200_busan; // Air Busan + 4: set_A320_200_aerok; // Aero K + 5: set_A320_200_peach; // Peach Aviation 6: set_A320_200_chinaeastern; // China Eastern - 7: set_A320_200_iberia; // Iberia + 7: set_A320_200_iberia; // Iberia + 8: set_A320_200_lufthansa; // Lufthansa set_A320_200_default; } - switch (FEAT_AIRCRAFT, SELF, switch_A320200_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { +switch (FEAT_AIRCRAFT, SELF, switch_A320_200_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_A320_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_A320_200_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 150; // default + 2: return 150; // Asiana Airlines + 3: return 180; // Air Busan + 4: return 180; // Aero K + 5: return 180; // Peach Aviation + 6: return 158; // China Eastern + 7: return 180; // Iberia + 8: return 180; // Lufthansa +} diff --git a/src/Aircraft/Airbus/A320/A320_200/A320_200_aerok.png b/src/Aircraft/Airbus/A320/A320_200/aerok.png similarity index 100% rename from src/Aircraft/Airbus/A320/A320_200/A320_200_aerok.png rename to src/Aircraft/Airbus/A320/A320_200/aerok.png diff --git a/src/Aircraft/Airbus/A320/A320_200/A320_200_asiana.png b/src/Aircraft/Airbus/A320/A320_200/asiana.png similarity index 100% rename from src/Aircraft/Airbus/A320/A320_200/A320_200_asiana.png rename to src/Aircraft/Airbus/A320/A320_200/asiana.png diff --git a/src/Aircraft/Airbus/A320/A320_200/A320_200_busan.png b/src/Aircraft/Airbus/A320/A320_200/busan.png similarity index 100% rename from src/Aircraft/Airbus/A320/A320_200/A320_200_busan.png rename to src/Aircraft/Airbus/A320/A320_200/busan.png diff --git a/src/Aircraft/Airbus/A320/A320_200/lufthansa.png b/src/Aircraft/Airbus/A320/A320_200/lufthansa.png new file mode 100644 index 0000000..119fd28 Binary files /dev/null and b/src/Aircraft/Airbus/A320/A320_200/lufthansa.png differ diff --git a/src/Aircraft/Airbus/A320/A320neo/A320neo.pnml b/src/Aircraft/Airbus/A320/A320neo/A320neo.pnml index 53e27cf..d5e2845 100644 --- a/src/Aircraft/Airbus/A320/A320neo/A320neo.pnml +++ b/src/Aircraft/Airbus/A320/A320neo/A320neo.pnml @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, A320neo, 7018){ aircraft_type: AIRCRAFT_TYPE_SMALL; sprite_id: SPRITE_ID_NEW_AIRCRAFT; variant_group: A318_100; - + //spec speed: 901km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 25; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 150; - mail_capacity: 18; - acceleration: 27; + mail_capacity: 18; + 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_A320neo; purchase: sw_A320neo_purchase; loading_speed: 43; cost_factor: 270; running_cost_factor: 120; - cargo_subtype_text: sw_Airbus_A320neo_cargo_subtype_text; + cargo_subtype_text: sw_A320neo_cargo_subtype_text; + passenger_capacity: sw_A320neo_cargo_subtype_capacity; name: switch_A320neo_name; } } diff --git a/src/Aircraft/Airbus/A320/A320neo/A320neo_graphic.pnml b/src/Aircraft/Airbus/A320/A320neo/A320neo_graphic.pnml index be6b29d..dbd3f33 100644 --- a/src/Aircraft/Airbus/A320/A320neo/A320neo_graphic.pnml +++ b/src/Aircraft/Airbus/A320/A320neo/A320neo_graphic.pnml @@ -25,10 +25,18 @@ spriteset(set_A320neo_iberia, "src/Aircraft/Airbus/A320/A320neo/Iberia.png"){ tp_A320_200(0, 0) } +/*-------------------------------------------------------------------- +2. Airbus A320neo Lufthansa +--------------------------------------------------------------------*/ + +spriteset(set_A320neo_lufthansa, "src/Aircraft/Airbus/A320/A320neo/Lufthansa.png"){ + tp_A320_200(0, 0) +} + /*-------------------------------------------------------------------- 구매정보 --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_A320neo_purchase, cargo_subtype) { set_A320neo_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Airbus/A320/A320neo/A320neo_switch.pnml b/src/Aircraft/Airbus/A320/A320neo/A320neo_switch.pnml index 62f6084..82c9639 100644 --- a/src/Aircraft/Airbus/A320/A320neo/A320neo_switch.pnml +++ b/src/Aircraft/Airbus/A320/A320neo/A320neo_switch.pnml @@ -1,19 +1,28 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A320neo_cargo_subtype_text, cargo_subtype) { - 1: return string(STR_REFIT_LIVERY_Airbus); // 제조사 - 2: return string(STR_REFIT_LIVERY_Iberiaairlines); // 이베리아항공 +switch(FEAT_AIRCRAFT, SELF, sw_A320neo_cargo_subtype_text, cargo_subtype) { + 1: return string(STR_REFIT_LIVERY_Airbus); // Manufacturer + 2: return string(STR_REFIT_LIVERY_Iberiaairlines); // Iberia + 3: return string(STR_REFIT_LIVERY_Lufthansa); // Lufthansa return string(STR_REFIT_LIVERY_Airbus); } switch(FEAT_AIRCRAFT, SELF, sw_A320neo, cargo_subtype) { - 1: set_A320neo_default; // 제조사 - 2: set_A320neo_iberia; // 이베리아항공 + 1: set_A320neo_default; // Manufacturer + 2: set_A320neo_iberia; // Iberia + 3: set_A320neo_lufthansa; // Lufthansa set_A320neo_default; } - switch (FEAT_AIRCRAFT, SELF, switch_A320neo_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { +switch (FEAT_AIRCRAFT, SELF, switch_A320neo_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_A320_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_A320neo_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 180; // Manufacturer + 2: return 186; // Iberia + 3: return 180; // Lufthansa +} diff --git a/src/Aircraft/Airbus/A320/A320neo/Lufthansa.png b/src/Aircraft/Airbus/A320/A320neo/Lufthansa.png new file mode 100644 index 0000000..2522cdb Binary files /dev/null and b/src/Aircraft/Airbus/A320/A320neo/Lufthansa.png differ diff --git a/src/Aircraft/Airbus/A320/A321LR/A321LR.pnml b/src/Aircraft/Airbus/A320/A321LR/A321LR.pnml index 691beba..ad08f07 100644 --- a/src/Aircraft/Airbus/A320/A321LR/A321LR.pnml +++ b/src/Aircraft/Airbus/A320/A321LR/A321LR.pnml @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, A321LR, 7022){ aircraft_type: AIRCRAFT_TYPE_SMALL; sprite_id: SPRITE_ID_NEW_AIRCRAFT; variant_group: A318_100; - + //spec speed: 901km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 30; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 206; - mail_capacity: 22; - acceleration: 80; + mail_capacity: 22; + acceleration: 80; 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_A321LR; purchase: sw_A321LR_purchase; loading_speed: 25; cost_factor: 316; running_cost_factor: 120; - cargo_subtype_text: sw_Airbus_A321LR_cargo_subtype_text; + cargo_subtype_text: sw_A321LR_cargo_subtype_text; + passenger_capacity: sw_A321LR_cargo_subtype_capacity; name: switch_A321LR_name; } } diff --git a/src/Aircraft/Airbus/A320/A321LR/A321LR_graphic.pnml b/src/Aircraft/Airbus/A320/A321LR/A321LR_graphic.pnml index a952e7e..ef922d3 100644 --- a/src/Aircraft/Airbus/A320/A321LR/A321LR_graphic.pnml +++ b/src/Aircraft/Airbus/A320/A321LR/A321LR_graphic.pnml @@ -29,10 +29,17 @@ alternative_sprites(set_A321LR_Airbusan, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "sr tp_A321_200(0, 0) } +/*-------------------------------------------------------------------- +3. Airbus A321LR TAP +--------------------------------------------------------------------*/ + +spriteset(set_A321LR_TAP, "src/Aircraft/Airbus/A320/A321neo/TAP.png"){ + tp_A321_200(0, 0) +} /*-------------------------------------------------------------------- 구매정보 --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_A321LR_purchase, cargo_subtype) { set_A321LR_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Airbus/A320/A321LR/A321LR_switch.pnml b/src/Aircraft/Airbus/A320/A321LR/A321LR_switch.pnml index adacdb7..c387038 100644 --- a/src/Aircraft/Airbus/A320/A321LR/A321LR_switch.pnml +++ b/src/Aircraft/Airbus/A320/A321LR/A321LR_switch.pnml @@ -1,19 +1,28 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A321LR_cargo_subtype_text, cargo_subtype) { - 1: return string(STR_REFIT_LIVERY_Airbus); // 제조사 - 2: return string(STR_REFIT_LIVERY_Airbusan); // 에어부산 +switch(FEAT_AIRCRAFT, SELF, sw_A321LR_cargo_subtype_text, cargo_subtype) { + 1: return string(STR_REFIT_LIVERY_Airbus); // Manufacturer + 2: return string(STR_REFIT_LIVERY_Airbusan); // air busan + 3: return string(STR_REFIT_LIVERY_TAP); // TAP return string(STR_REFIT_LIVERY_Airbus); } switch(FEAT_AIRCRAFT, SELF, sw_A321LR, cargo_subtype) { - 1: set_A321LR_default; // 제조사 - 2: set_A321LR_Airbusan; //에어부산 + 1: set_A321LR_default; // Manufacturer + 2: set_A321LR_Airbusan; //air busan + 3: set_A321LR_TAP; // TAP set_A321LR_default; } - switch (FEAT_AIRCRAFT, SELF, switch_A321LR_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { +switch (FEAT_AIRCRAFT, SELF, switch_A321LR_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_A320_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_A321LR_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 206; // default + 2: return 220; // air busan + 3: return 171; // TAP +} diff --git a/src/Aircraft/Airbus/A320/A321XLR/A321XLR.pnml b/src/Aircraft/Airbus/A320/A321XLR/A321XLR.pnml index 013bc75..82c2806 100644 --- a/src/Aircraft/Airbus/A320/A321XLR/A321XLR.pnml +++ b/src/Aircraft/Airbus/A320/A321XLR/A321XLR.pnml @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, A321XLR, 7131){ aircraft_type: AIRCRAFT_TYPE_SMALL; sprite_id: SPRITE_ID_NEW_AIRCRAFT; variant_group: A318_100; - + //spec speed: 901km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 30; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 220; - mail_capacity: 22; - acceleration: 80; + mail_capacity: 22; + acceleration: 80; 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_A321XLR; purchase: sw_A321XLR_purchase; loading_speed: 25; cost_factor: 289; running_cost_factor: 120; - cargo_subtype_text: sw_Airbus_A321XLR_cargo_subtype_text; + cargo_subtype_text: sw_A321XLR_cargo_subtype_text; + passenger_capacity: sw_A321XLR_cargo_subtype_capacity; name: switch_A321XLR_name; } } diff --git a/src/Aircraft/Airbus/A320/A321XLR/A321XLR_graphic.pnml b/src/Aircraft/Airbus/A320/A321XLR/A321XLR_graphic.pnml index 0dadc6e..c5c7576 100644 --- a/src/Aircraft/Airbus/A320/A321XLR/A321XLR_graphic.pnml +++ b/src/Aircraft/Airbus/A320/A321XLR/A321XLR_graphic.pnml @@ -17,9 +17,17 @@ spriteset(set_A321XLR_default, "src/Aircraft/Airbus/A320/A321XLR/A321XLR.png"){ tp_A321_200(0, 0) } +/*-------------------------------------------------------------------- +2. Airbus A321XLR Iberia +--------------------------------------------------------------------*/ + +spriteset(set_A321XLR_Iberia, "src/Aircraft/Airbus/A320/A321XLR/Iberia.png"){ + tp_A321_200(0, 0) +} + /*-------------------------------------------------------------------- purchase info --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_A321XLR_purchase, cargo_subtype) { set_A321XLR_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Airbus/A320/A321XLR/A321XLR_switch.pnml b/src/Aircraft/Airbus/A320/A321XLR/A321XLR_switch.pnml index 58f0309..72309f0 100644 --- a/src/Aircraft/Airbus/A320/A321XLR/A321XLR_switch.pnml +++ b/src/Aircraft/Airbus/A320/A321XLR/A321XLR_switch.pnml @@ -1,19 +1,25 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A321XLR_cargo_subtype_text, cargo_subtype) { - 1: return string(STR_REFIT_LIVERY_Airbus); // 제조사 - 2: return string(STR_REFIT_LIVERY_Airbus); // 아시아나항 +switch(FEAT_AIRCRAFT, SELF, sw_A321XLR_cargo_subtype_text, cargo_subtype) { + 1: return string(STR_REFIT_LIVERY_Airbus); // Manufacturer + 2: return string(STR_REFIT_LIVERY_Iberiaairlines); // Iberia return string(STR_REFIT_LIVERY_Airbus); } switch(FEAT_AIRCRAFT, SELF, sw_A321XLR, cargo_subtype) { - 1: set_A321XLR_default; // 제조사 - 2: set_A321XLR_default; // 아시아나항공 + 1: set_A321XLR_default; // Manufacturer + 2: set_A321XLR_Iberia; // Iberia set_A321XLR_default; } - switch (FEAT_AIRCRAFT, SELF, switch_A321XLR_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { +switch (FEAT_AIRCRAFT, SELF, switch_A321XLR_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_A320_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_A321XLR_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 180; // default + 2: return 182; // Iberia +} diff --git a/src/Aircraft/Airbus/A320/A321XLR/Iberia.png b/src/Aircraft/Airbus/A320/A321XLR/Iberia.png new file mode 100644 index 0000000..2d782f7 Binary files /dev/null and b/src/Aircraft/Airbus/A320/A321XLR/Iberia.png differ diff --git a/src/Aircraft/Airbus/A320/A321_200/A321_200.pnml b/src/Aircraft/Airbus/A320/A321_200/A321_200.pnml index 16a2cc4..67e7584 100644 --- a/src/Aircraft/Airbus/A320/A321_200/A321_200.pnml +++ b/src/Aircraft/Airbus/A320/A321_200/A321_200.pnml @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, A321_200, 7002){ aircraft_type: AIRCRAFT_TYPE_SMALL; sprite_id: SPRITE_ID_NEW_AIRCRAFT; variant_group: A318_100; - + //spec speed: 901km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 30; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 220; - mail_capacity: 22; - acceleration: 80; + mail_capacity: 22; + acceleration: 80; 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_A321_200; purchase: sw_A321_200_purchase; loading_speed: 25; cost_factor: 289; running_cost_factor: 120; - cargo_subtype_text: sw_Airbus_A321_200_cargo_subtype_text; - name: switch_A321200_name; + cargo_subtype_text: sw_A321_200_cargo_subtype_text; + passenger_capacity: sw_A321_200_cargo_subtype_capacity; + name: switch_A321_200_name; } } diff --git a/src/Aircraft/Airbus/A320/A321_200/A321_200_graphic.pnml b/src/Aircraft/Airbus/A320/A321_200/A321_200_graphic.pnml index c79b03b..043ba37 100644 --- a/src/Aircraft/Airbus/A320/A321_200/A321_200_graphic.pnml +++ b/src/Aircraft/Airbus/A320/A321_200/A321_200_graphic.pnml @@ -25,31 +25,31 @@ spriteset(set_A321_200_asiana, "src/Aircraft/Airbus/A320/A321_200/A321_200.png") tp_A321_200(0, 0) } -alternative_sprites(set_A321_200_asiana, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/Aircraft/Airbus/A320/A321_200/A321_200_Asiana.png"){ +alternative_sprites(set_A321_200_asiana, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/Aircraft/Airbus/A320/A321_200/Asiana.png"){ tp_A321_200(0, 0) } /*-------------------------------------------------------------------- -2. Airbus A321-200 Air seoul +3. Airbus A321-200 Air seoul --------------------------------------------------------------------*/ spriteset(set_A321_200_seoul, "src/Aircraft/Airbus/A320/A321_200/A321_200.png"){ tp_A321_200(0, 0) } -alternative_sprites(set_A321_200_seoul, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/Aircraft/Airbus/A320/A321_200/A321_200_Seoul.png"){ +alternative_sprites(set_A321_200_seoul, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/Aircraft/Airbus/A320/A321_200/Seoul.png"){ tp_A321_200(0, 0) } /*-------------------------------------------------------------------- -3. Airbus A321-200 Air busan +4. Airbus A321-200 Air busan --------------------------------------------------------------------*/ spriteset(set_A321_200_busan, "src/Aircraft/Airbus/A320/A321_200/A321_200.png"){ tp_A321_200(0, 0) } -alternative_sprites(set_A321_200_busan, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/Aircraft/Airbus/A320/A321_200/A321_200_Busan.png"){ +alternative_sprites(set_A321_200_busan, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/Aircraft/Airbus/A320/A321_200/Busan.png"){ tp_A321_200(0, 0) } @@ -73,10 +73,18 @@ alternative_sprites(set_A321_200_asiana_old, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, tp_A321_200(0, 0) } +/*-------------------------------------------------------------------- +7. Airbus A321-200 Lufthansa +--------------------------------------------------------------------*/ + +spriteset(set_A321_200_lufthansa, "src/Aircraft/Airbus/A320/A321_200/Lufthansa.png"){ + tp_A321_200(0, 0) +} + /*-------------------------------------------------------------------- Purchase Info --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_A321_200_purchase, cargo_subtype) { set_A321_200_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Airbus/A320/A321_200/A321_200_switch.pnml b/src/Aircraft/Airbus/A320/A321_200/A321_200_switch.pnml index 2380f16..b201292 100644 --- a/src/Aircraft/Airbus/A320/A321_200/A321_200_switch.pnml +++ b/src/Aircraft/Airbus/A320/A321_200/A321_200_switch.pnml @@ -1,13 +1,14 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A321_200_cargo_subtype_text, cargo_subtype) { +switch(FEAT_AIRCRAFT, SELF, sw_A321_200_cargo_subtype_text, cargo_subtype) { 1: return string(STR_REFIT_LIVERY_Airbus); // Manufacturer 2: return string(STR_REFIT_LIVERY_Asiana); // Asiana Airlines 3: return string(STR_REFIT_LIVERY_Airseoul); // Air Seoul 4: return string(STR_REFIT_LIVERY_Airbusan); // Air Busan 5: return string(STR_REFIT_LIVERY_Iberiaairlines); // Iberia Airlines 6: return string(STR_REFIT_LIVERY_Asiana_old); // Asiana Airlines old + 7: return string(STR_REFIT_LIVERY_Lufthansa); // Lufthansa return string(STR_REFIT_LIVERY_Airbus); } @@ -18,10 +19,22 @@ switch(FEAT_AIRCRAFT, SELF, sw_A321_200, cargo_subtype) { 4: set_A321_200_busan; // Air Busan 5: set_A321_200_iberia; // Iberia 6: set_A321_200_asiana_old; // Asiana Airlines old + 7: set_A321_200_lufthansa; // Lufthansa set_A321_200_default; } - switch (FEAT_AIRCRAFT, SELF, switch_A321200_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { +switch (FEAT_AIRCRAFT, SELF, switch_A321_200_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_A320_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_A321_200_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 185; // default + 2: return 195; // Asiana Airlines + 3: return 220; // Air Seoul + 4: return 220; // Air Busan + 5: return 220; // Iberia + 6: return 195; // Asiana Airlines old + 7: return 200; // Lufthansa +} diff --git a/src/Aircraft/Airbus/A320/A321_200/A321_200_Asiana.png b/src/Aircraft/Airbus/A320/A321_200/Asiana.png similarity index 100% rename from src/Aircraft/Airbus/A320/A321_200/A321_200_Asiana.png rename to src/Aircraft/Airbus/A320/A321_200/Asiana.png diff --git a/src/Aircraft/Airbus/A320/A321_200/A321_200_Busan.png b/src/Aircraft/Airbus/A320/A321_200/Busan.png similarity index 100% rename from src/Aircraft/Airbus/A320/A321_200/A321_200_Busan.png rename to src/Aircraft/Airbus/A320/A321_200/Busan.png diff --git a/src/Aircraft/Airbus/A320/A321_200/Lufthansa.png b/src/Aircraft/Airbus/A320/A321_200/Lufthansa.png new file mode 100644 index 0000000..eb171b1 Binary files /dev/null and b/src/Aircraft/Airbus/A320/A321_200/Lufthansa.png differ diff --git a/src/Aircraft/Airbus/A320/A321_200/A321_200_Seoul.png b/src/Aircraft/Airbus/A320/A321_200/Seoul.png similarity index 100% rename from src/Aircraft/Airbus/A320/A321_200/A321_200_Seoul.png rename to src/Aircraft/Airbus/A320/A321_200/Seoul.png diff --git a/src/Aircraft/Airbus/A320/A321neo/A321neo_graphic.pnml b/src/Aircraft/Airbus/A320/A321neo/A321neo_graphic.pnml index ea475c9..120a7ea 100644 --- a/src/Aircraft/Airbus/A320/A321neo/A321neo_graphic.pnml +++ b/src/Aircraft/Airbus/A320/A321neo/A321neo_graphic.pnml @@ -65,11 +65,89 @@ spriteset(set_A321neo_Americanairlines, "src/Aircraft/Airbus/A320/A321neo/Americ tp_A321_200(0, 0) } +/*-------------------------------------------------------------------- +7. Airbus A321neo Aegean +--------------------------------------------------------------------*/ + +spriteset(set_A321neo_Aegean, "src/Aircraft/Airbus/A320/A321neo/Aegean.png"){ + tp_A321_200(0, 0) +} + +/*-------------------------------------------------------------------- +8. Airbus A321neo British Airways +--------------------------------------------------------------------*/ + +spriteset(set_A321neo_Britishairways, "src/Aircraft/Airbus/A320/A321neo/Britishairways.png"){ + tp_A321_200(0, 0) +} + +/*-------------------------------------------------------------------- +9. Airbus A321neo Easyjet +--------------------------------------------------------------------*/ + +spriteset(set_A321neo_Easyjet, "src/Aircraft/Airbus/A320/A321neo/Easyjet.png"){ + tp_A321_200(0, 0) +} + +/*-------------------------------------------------------------------- +10. Airbus A321neo KLM +--------------------------------------------------------------------*/ +spriteset(set_A321neo_KLM, "src/Aircraft/Airbus/A320/A321neo/KLM.png"){ + tp_A321_200(0, 0) +} + +/*-------------------------------------------------------------------- +11. Airbus A321neo Lufthansa +--------------------------------------------------------------------*/ + +spriteset(set_A321neo_Lufthansa, "src/Aircraft/Airbus/A320/A321neo/Lufthansa.png"){ + tp_A321_200(0, 0) +} + +/*-------------------------------------------------------------------- +12. Airbus A321neo Swiss +--------------------------------------------------------------------*/ + +spriteset(set_A321neo_Swiss, "src/Aircraft/Airbus/A320/A321neo/Swiss.png"){ + tp_A321_200(0, 0) +} + +/*-------------------------------------------------------------------- +13. Airbus A321neo TAP +--------------------------------------------------------------------*/ + +spriteset(set_A321neo_TAP, "src/Aircraft/Airbus/A320/A321neo/TAP.png"){ + tp_A321_200(0, 0) +} + +/*-------------------------------------------------------------------- +14. Airbus A321neo Vueling +--------------------------------------------------------------------*/ + +spriteset(set_A321neo_Vueling, "src/Aircraft/Airbus/A320/A321neo/Vueling.png"){ + tp_A321_200(0, 0) +} + +/*-------------------------------------------------------------------- +15. Airbus A321neo Wizz Air +--------------------------------------------------------------------*/ + +spriteset(set_A321neo_Wizzair, "src/Aircraft/Airbus/A320/A321neo/Wizzair.png"){ + tp_A321_200(0, 0) +} + +/*-------------------------------------------------------------------- +16. Airbus A321neo Iberia +--------------------------------------------------------------------*/ + +spriteset(set_A321neo_Iberia, "src/Aircraft/Airbus/A320/A321neo/Iberia.png"){ + tp_A321_200(0, 0) +} /*-------------------------------------------------------------------- Purchase Info --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_A321neo_purchase, cargo_subtype) { set_A321neo_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Airbus/A320/A321neo/A321neo_switch.pnml b/src/Aircraft/Airbus/A320/A321neo/A321neo_switch.pnml index 45949ab..eaa2151 100644 --- a/src/Aircraft/Airbus/A320/A321neo/A321neo_switch.pnml +++ b/src/Aircraft/Airbus/A320/A321neo/A321neo_switch.pnml @@ -2,26 +2,66 @@ 스위치 --------------------------------------------------------------------*/ switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A321neo_cargo_subtype_text, cargo_subtype) { - 1: return string(STR_REFIT_LIVERY_Airbus); // Boeing - 2: return string(STR_REFIT_LIVERY_Koreanair); // Korean Air - 3: return string(STR_REFIT_LIVERY_Asiana); // Asiana Airlines - 4: return string(STR_REFIT_LIVERY_Airbusan); // Air Busan - 5: return string(STR_REFIT_LIVERY_Koreanair_new); // Korean Air new - 6: return string(STR_REFIT_LIVERY_Americanairlines); // American Airlines + 1: return string(STR_REFIT_LIVERY_Airbus); // default + 2: return string(STR_REFIT_LIVERY_Koreanair); // Korean Air + 3: return string(STR_REFIT_LIVERY_Asiana); // Asiana Airlines + 4: return string(STR_REFIT_LIVERY_Airbusan); // Air Busan + 5: return string(STR_REFIT_LIVERY_Koreanair_new); // Korean Air new + 6: return string(STR_REFIT_LIVERY_Americanairlines); // American Airlines + 7: return string(STR_REFIT_LIVERY_Aegean); // Aegean + 8: return string(STR_REFIT_LIVERY_Britishairways); // British Airways + 9: return string(STR_REFIT_LIVERY_Easyjet); // Easyjet + 10: return string(STR_REFIT_LIVERY_Klmroyaldutchairlines); // KLM + 11: return string(STR_REFIT_LIVERY_Lufthansa); // Lufthansa + 12: return string(STR_REFIT_LIVERY_Swissinternationalairlines); // Swiss + 13: return string(STR_REFIT_LIVERY_TAP); // TAP + 14: return string(STR_REFIT_LIVERY_Vueling); // Vueling + 15: return string(STR_REFIT_LIVERY_Wizzair); // Wizz Air + 16: return string(STR_REFIT_LIVERY_Iberiaairlines); // Iberia return string(STR_REFIT_LIVERY_Airbus); } switch(FEAT_AIRCRAFT, SELF, sw_A321neo, cargo_subtype) { - 1: set_A321neo_default; // Boeing - 2: set_A321neo_Koreanair; // Korean Air - 3: set_A321neo_Asianaairlines; // Asiana Airlines - 4: set_A321neo_Airbusan; // Air Busan - 5: set_A321neo_Koreanair25; // Korean Air new - 6: set_A321neo_Americanairlines; // American Airlines + 1: set_A321neo_default; // default + 2: set_A321neo_Koreanair; // Korean Air + 3: set_A321neo_Asianaairlines; // Asiana Airlines + 4: set_A321neo_Airbusan; // Air Busan + 5: set_A321neo_Koreanair25; // Korean Air new + 6: set_A321neo_Americanairlines; // American Airlines + 7: set_A321neo_Aegean; // Aegean + 8: set_A321neo_Britishairways; // British Airways + 9: set_A321neo_Easyjet; // Easyjet + 10: set_A321neo_KLM; // KLM + 11: set_A321neo_Lufthansa; // Lufthansa + 12: set_A321neo_Swiss; // Swiss + 13: set_A321neo_TAP; // TAP + 14: set_A321neo_Vueling; // Vueling + 15: set_A321neo_Wizzair; // Wizz Air + 16: set_A321neo_Iberia; // Iberia set_A321neo_default; } - switch (FEAT_AIRCRAFT, SELF, switch_A321neo_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { +switch (FEAT_AIRCRAFT, SELF, switch_A321neo_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_A320_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_Airbus_A321neo_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 206; // default + 2: return 182; // Korean Air + 3: return 180; // Asiana Airlines + 4: return 232; // Air Busan + 5: return 182; // Korean Air new + 6: return 196; // American Airlines + 7: return 220; // Aegean + 8: return 220; // British Airways + 9: return 235; // Easyjet + 10: return 227; // KLM + 11: return 215; // Lufthansa + 12: return 215; // Swiss + 13: return 221; // TAP + 14: return 236; // Vueling + 15: return 239; // Wizz Air + 16: return 232; // Iberia +} diff --git a/src/Aircraft/Airbus/A320/A321neo/Aegean.png b/src/Aircraft/Airbus/A320/A321neo/Aegean.png new file mode 100644 index 0000000..292b112 Binary files /dev/null and b/src/Aircraft/Airbus/A320/A321neo/Aegean.png differ diff --git a/src/Aircraft/Airbus/A320/A321neo/Britishairways.png b/src/Aircraft/Airbus/A320/A321neo/Britishairways.png new file mode 100644 index 0000000..376ee3d Binary files /dev/null and b/src/Aircraft/Airbus/A320/A321neo/Britishairways.png differ diff --git a/src/Aircraft/Airbus/A320/A321neo/Easyjet.png b/src/Aircraft/Airbus/A320/A321neo/Easyjet.png new file mode 100644 index 0000000..bb6ec0c Binary files /dev/null and b/src/Aircraft/Airbus/A320/A321neo/Easyjet.png differ diff --git a/src/Aircraft/Airbus/A320/A321neo/Iberia.png b/src/Aircraft/Airbus/A320/A321neo/Iberia.png new file mode 100644 index 0000000..2d782f7 Binary files /dev/null and b/src/Aircraft/Airbus/A320/A321neo/Iberia.png differ diff --git a/src/Aircraft/Airbus/A320/A321neo/KLM.png b/src/Aircraft/Airbus/A320/A321neo/KLM.png new file mode 100644 index 0000000..98ff7f7 Binary files /dev/null and b/src/Aircraft/Airbus/A320/A321neo/KLM.png differ diff --git a/src/Aircraft/Airbus/A320/A321neo/Lufthansa.png b/src/Aircraft/Airbus/A320/A321neo/Lufthansa.png new file mode 100644 index 0000000..56988b5 Binary files /dev/null and b/src/Aircraft/Airbus/A320/A321neo/Lufthansa.png differ diff --git a/src/Aircraft/Airbus/A320/A321neo/Swiss.png b/src/Aircraft/Airbus/A320/A321neo/Swiss.png new file mode 100644 index 0000000..83a88a1 Binary files /dev/null and b/src/Aircraft/Airbus/A320/A321neo/Swiss.png differ diff --git a/src/Aircraft/Airbus/A320/A321neo/TAP.png b/src/Aircraft/Airbus/A320/A321neo/TAP.png new file mode 100644 index 0000000..38fa968 Binary files /dev/null and b/src/Aircraft/Airbus/A320/A321neo/TAP.png differ diff --git a/src/Aircraft/Airbus/A320/A321neo/Vueling.png b/src/Aircraft/Airbus/A320/A321neo/Vueling.png new file mode 100644 index 0000000..31faea8 Binary files /dev/null and b/src/Aircraft/Airbus/A320/A321neo/Vueling.png differ diff --git a/src/Aircraft/Airbus/A320/A321neo/Wizzair.png b/src/Aircraft/Airbus/A320/A321neo/Wizzair.png new file mode 100644 index 0000000..6372914 Binary files /dev/null and b/src/Aircraft/Airbus/A320/A321neo/Wizzair.png differ diff --git a/src/Aircraft/Airbus/A330/A330_300/A330_300.pnml b/src/Aircraft/Airbus/A330/A330_300/A330_300.pnml index 50bbb03..a1dc743 100644 --- a/src/Aircraft/Airbus/A330/A330_300/A330_300.pnml +++ b/src/Aircraft/Airbus/A330/A330_300/A330_300.pnml @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, A330_300, 7005){ 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: 335; - mail_capacity: 34; - acceleration: 27; + mail_capacity: 34; + 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_300; purchase: sw_A330_300_purchase; loading_speed: 43; cost_factor: 644; running_cost_factor: 120; - cargo_subtype_text: sw_Airbus_A330_300_cargo_subtype_text; + cargo_subtype_text: sw_A330_300_cargo_subtype_text; + passenger_capacity: sw_A330_300_cargo_subtype_capacity; name: switch_A330300_name; } } diff --git a/src/Aircraft/Airbus/A330/A330_300/A330_300_graphic.pnml b/src/Aircraft/Airbus/A330/A330_300/A330_300_graphic.pnml index 604dd42..341f8a6 100644 --- a/src/Aircraft/Airbus/A330/A330_300/A330_300_graphic.pnml +++ b/src/Aircraft/Airbus/A330/A330_300/A330_300_graphic.pnml @@ -21,7 +21,7 @@ spriteset(set_A330_300_default, "src/Aircraft/Airbus/A330/A330_300/A330_300.png" 2. Airbus A330-300 Korean Air old --------------------------------------------------------------------*/ -spriteset(set_A330_300_korean, "src/Aircraft/Airbus/A330/A330_300/A330_300_Korean.png"){ +spriteset(set_A330_300_korean, "src/Aircraft/Airbus/A330/A330_300/Korean.png"){ tp_A330_300(0, 0) } @@ -29,7 +29,7 @@ spriteset(set_A330_300_korean, "src/Aircraft/Airbus/A330/A330_300/A330_300_Korea 2. Airbus A330-300 Asiana Airlines --------------------------------------------------------------------*/ -spriteset(set_A330_300_asiana, "src/Aircraft/Airbus/A330/A330_300/A330_300_Asiana.png"){ +spriteset(set_A330_300_asiana, "src/Aircraft/Airbus/A330/A330_300/Asiana.png"){ tp_A330_300(0, 0) } @@ -41,21 +41,29 @@ spriteset(set_A330_300_tway, "src/Aircraft/Airbus/A330/A330_300/A330_300.png"){ tp_A330_300(0, 0) } -alternative_sprites(set_A330_300_tway, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/Aircraft/Airbus/A330/A330_300/A330_300_Tway.png"){ +alternative_sprites(set_A330_300_tway, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src/Aircraft/Airbus/A330/A330_300/Tway.png"){ tp_A330_300(0, 0) } /*-------------------------------------------------------------------- -4. Airbus A330-300 Korean Air +4. Airbus A330-300 Korean Air --------------------------------------------------------------------*/ spriteset(set_A330_300_korean25, "src/Aircraft/Airbus/A330/A330_300/korean25.png"){ tp_A330_300(0, 0) } +/*-------------------------------------------------------------------- +5. Airbus A330-300 Lufthansa +--------------------------------------------------------------------*/ + +spriteset(set_A330_300_lufthansa, "src/Aircraft/Airbus/A330/A330_300/lufthansa.png"){ + tp_A330_300(0, 0) +} + /*-------------------------------------------------------------------- 구매정보 --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_A330_300_purchase, cargo_subtype) { set_A330_300_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Airbus/A330/A330_300/A330_300_switch.pnml b/src/Aircraft/Airbus/A330/A330_300/A330_300_switch.pnml index b02ae0d..6e02089 100644 --- a/src/Aircraft/Airbus/A330/A330_300/A330_300_switch.pnml +++ b/src/Aircraft/Airbus/A330/A330_300/A330_300_switch.pnml @@ -1,12 +1,13 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A330_300_cargo_subtype_text, cargo_subtype) { +switch(FEAT_AIRCRAFT, SELF, sw_A330_300_cargo_subtype_text, cargo_subtype) { 1: return string(STR_REFIT_LIVERY_Airbus); // Manufacturer 2: return string(STR_REFIT_LIVERY_Koreanair); // Korean Air Old 3: return string(STR_REFIT_LIVERY_Asiana); // Asiana Airlines 4: return string(STR_REFIT_LIVERY_Tway); // Tway 5: return string(STR_REFIT_LIVERY_Koreanair_new); // Korean Air + 6: return string(STR_REFIT_LIVERY_Lufthansa); // Lufthansa return string(STR_REFIT_LIVERY_Airbus); } @@ -16,10 +17,21 @@ switch(FEAT_AIRCRAFT, SELF, sw_A330_300, cargo_subtype) { 3: set_A330_300_asiana; // Asiana Airlines 4: set_A330_300_tway; // Tway 5: set_A330_300_korean25; // Korean Air + 6: set_A330_300_lufthansa; // Lufthansa set_A330_300_default; } switch (FEAT_AIRCRAFT, SELF, switch_A330300_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_300_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 277; // default + 2: return 272; // Korean Air Old + 3: return 298; // Asiana Airlines + 4: return 347; // Tway + 5: return 276; // Korean Air + 6: return 255; // Lufthansa +} diff --git a/src/Aircraft/Airbus/A330/A330_300/A330_300_Asiana.png b/src/Aircraft/Airbus/A330/A330_300/Asiana.png similarity index 100% rename from src/Aircraft/Airbus/A330/A330_300/A330_300_Asiana.png rename to src/Aircraft/Airbus/A330/A330_300/Asiana.png diff --git a/src/Aircraft/Airbus/A330/A330_300/Lufthansa.png b/src/Aircraft/Airbus/A330/A330_300/Lufthansa.png new file mode 100644 index 0000000..4234a27 Binary files /dev/null and b/src/Aircraft/Airbus/A330/A330_300/Lufthansa.png differ diff --git a/src/Aircraft/Airbus/A330/A330_300/A330_300_Tway.png b/src/Aircraft/Airbus/A330/A330_300/Tway.png similarity index 100% rename from src/Aircraft/Airbus/A330/A330_300/A330_300_Tway.png rename to src/Aircraft/Airbus/A330/A330_300/Tway.png diff --git a/src/Aircraft/Airbus/A330/A330_300/A330_300_korean.png b/src/Aircraft/Airbus/A330/A330_300/korean.png similarity index 100% rename from src/Aircraft/Airbus/A330/A330_300/A330_300_korean.png rename to src/Aircraft/Airbus/A330/A330_300/korean.png diff --git a/src/Aircraft/Airbus/A340/A340_300/A340_300.pnml b/src/Aircraft/Airbus/A340/A340_300/A340_300.pnml index 21a8d0d..40abc1a 100644 --- a/src/Aircraft/Airbus/A340/A340_300/A340_300.pnml +++ b/src/Aircraft/Airbus/A340/A340_300/A340_300.pnml @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, A340_300, 7032){ aircraft_type: AIRCRAFT_TYPE_LARGE; sprite_id: SPRITE_ID_NEW_AIRCRAFT; variant_group: A340_200; - + //spec speed: 902km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 25; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 295; - mail_capacity: 38; - acceleration: 27; + mail_capacity: 38; + 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_A340_300; purchase: sw_A340_300_purchase; loading_speed: 43; cost_factor: 581; running_cost_factor: 120; - cargo_subtype_text: sw_Airbus_A340_300_cargo_subtype_text; + cargo_subtype_text: sw_A340_300_cargo_subtype_text; + passenger_capacity: sw_A340_300_cargo_subtype_capacity; name: switch_A340300_name; } } diff --git a/src/Aircraft/Airbus/A340/A340_300/A340_300_graphic.pnml b/src/Aircraft/Airbus/A340/A340_300/A340_300_graphic.pnml index 48d059b..50b2fbb 100644 --- a/src/Aircraft/Airbus/A340/A340_300/A340_300_graphic.pnml +++ b/src/Aircraft/Airbus/A340/A340_300/A340_300_graphic.pnml @@ -17,9 +17,17 @@ spriteset(set_A340_300_default, "src/Aircraft/Airbus/A340/A340_300/A340_300.png" tp_A340_300(0, 0) } +/*-------------------------------------------------------------------- +2. Lufthansa +--------------------------------------------------------------------*/ + +spriteset(set_A340_300_lufthansa, "src/Aircraft/Airbus/A340/A340_300/Lufthansa.png"){ + tp_A340_300(0, 0) +} + /*-------------------------------------------------------------------- 구매정보 --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_A340_300_purchase, cargo_subtype) { set_A340_300_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Airbus/A340/A340_300/A340_300_switch.pnml b/src/Aircraft/Airbus/A340/A340_300/A340_300_switch.pnml index c13e694..aa1e4b6 100644 --- a/src/Aircraft/Airbus/A340/A340_300/A340_300_switch.pnml +++ b/src/Aircraft/Airbus/A340/A340_300/A340_300_switch.pnml @@ -1,19 +1,25 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A340_300_cargo_subtype_text, cargo_subtype) { +switch(FEAT_AIRCRAFT, SELF, sw_A340_300_cargo_subtype_text, cargo_subtype) { 1: return string(STR_REFIT_LIVERY_Airbus); // 제조사 - 2: return string(STR_REFIT_LIVERY_Airbus); // 아시아나항공 + 2: return string(STR_REFIT_LIVERY_Lufthansa); // Lufthansa return string(STR_REFIT_LIVERY_Airbus); } switch(FEAT_AIRCRAFT, SELF, sw_A340_300, cargo_subtype) { 1: set_A340_300_default; // 제조사 - 2: set_A340_300_default; // 아시아나항공 + 2: set_A340_300_lufthansa; // Lufthansa set_A340_300_default; } switch (FEAT_AIRCRAFT, SELF, switch_A340300_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_A340_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_A340_300_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 275; // default + 2: return 279; // Lufthansa +} diff --git a/src/Aircraft/Airbus/A340/A340_300/Lufthansa.png b/src/Aircraft/Airbus/A340/A340_300/Lufthansa.png new file mode 100644 index 0000000..23cdf24 Binary files /dev/null and b/src/Aircraft/Airbus/A340/A340_300/Lufthansa.png differ diff --git a/src/Aircraft/Airbus/A340/A340_600/A340_600.pnml b/src/Aircraft/Airbus/A340/A340_600/A340_600.pnml index b29c57c..bae9ce9 100644 --- a/src/Aircraft/Airbus/A340/A340_600/A340_600.pnml +++ b/src/Aircraft/Airbus/A340/A340_600/A340_600.pnml @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, A340_600, 7030){ aircraft_type: AIRCRAFT_TYPE_LARGE; sprite_id: SPRITE_ID_NEW_AIRCRAFT; variant_group: A340_200; - + //spec speed: 902km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 25; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 380; - mail_capacity: 44; - acceleration: 27; + mail_capacity: 44; + 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_A340_600; purchase: sw_A340_600_purchase; loading_speed: 43; cost_factor: 672; running_cost_factor: 120; - cargo_subtype_text: sw_Airbus_A340_600_cargo_subtype_text; + cargo_subtype_text: sw_A340_600_cargo_subtype_text; + passenger_capacity: sw_A340_600_cargo_subtype_capacity; name: switch_A340600_name; } } diff --git a/src/Aircraft/Airbus/A340/A340_600/A340_600_graphic.pnml b/src/Aircraft/Airbus/A340/A340_600/A340_600_graphic.pnml index 1686a2b..170629e 100644 --- a/src/Aircraft/Airbus/A340/A340_600/A340_600_graphic.pnml +++ b/src/Aircraft/Airbus/A340/A340_600/A340_600_graphic.pnml @@ -113,9 +113,17 @@ spriteset(set_A340_600_virgin, "src/Aircraft/Airbus/A340/A340_600/Virgin.png"){ tp_A340_600(0, 0) } +/*-------------------------------------------------------------------- +14. Lufthansa +--------------------------------------------------------------------*/ + +spriteset(set_A340_600_lufthansanew, "src/Aircraft/Airbus/A340/A340_600/Lufthansa_new.png"){ + tp_A340_600(0, 0) +} + /*-------------------------------------------------------------------- 구매정보 --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_A340_600_purchase, cargo_subtype) { set_A340_600_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Airbus/A340/A340_600/A340_600_switch.pnml b/src/Aircraft/Airbus/A340/A340_600/A340_600_switch.pnml index 6d329b9..185bafa 100644 --- a/src/Aircraft/Airbus/A340/A340_600/A340_600_switch.pnml +++ b/src/Aircraft/Airbus/A340/A340_600/A340_600_switch.pnml @@ -1,41 +1,61 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A340_600_cargo_subtype_text, cargo_subtype) { - 1: return string(STR_REFIT_LIVERY_Airbus); // Manufacturer - 2: return string(STR_REFIT_LIVERY_Chinaeastern_old); // China Eastern - 3: return string(STR_REFIT_LIVERY_Conviasa); // Conviasa - 4: return string(STR_REFIT_LIVERY_Etihadairways_old2003); // Etihad - 5: return string(STR_REFIT_LIVERY_Hainanairlines); // Hainan - 6: return string(STR_REFIT_LIVERY_Iberiaairlines); // Iberia - 7: return string(STR_REFIT_LIVERY_Iberiaairlines_old1970); // Iberia (old) - 8: return string(STR_REFIT_LIVERY_Lufthansa); // Lufthansa - 9: return string(STR_REFIT_LIVERY_Plusultra); // Plus Ultra - 10: return string(STR_REFIT_LIVERY_Qatarairways); // Qatar Airways - 11: return string(STR_REFIT_LIVERY_Southafrican); // South African - 12: return string(STR_REFIT_LIVERY_Thaiairways); // Thai - 13: return string(STR_REFIT_LIVERY_Virginatlantic); // Virgin Atlantic +switch(FEAT_AIRCRAFT, SELF, sw_A340_600_cargo_subtype_text, cargo_subtype) { + 1: return string(STR_REFIT_LIVERY_Airbus); // Manufacturer + 2: return string(STR_REFIT_LIVERY_Chinaeastern_old); // China Eastern + 3: return string(STR_REFIT_LIVERY_Conviasa); // Conviasa + 4: return string(STR_REFIT_LIVERY_Etihadairways_old2003); // Etihad + 5: return string(STR_REFIT_LIVERY_Hainanairlines); // Hainan + 6: return string(STR_REFIT_LIVERY_Iberiaairlines); // Iberia + 7: return string(STR_REFIT_LIVERY_Iberiaairlines_old1970); // Iberia (old) + 8: return string(STR_REFIT_LIVERY_Lufthansa_old1989); // Lufthansa + 9: return string(STR_REFIT_LIVERY_Plusultra); // Plus Ultra + 10: return string(STR_REFIT_LIVERY_Qatarairways); // Qatar Airways + 11: return string(STR_REFIT_LIVERY_Southafrican); // South African + 12: return string(STR_REFIT_LIVERY_Thaiairways); // Thai + 13: return string(STR_REFIT_LIVERY_Virginatlantic); // Virgin Atlantic + 14: return string(STR_REFIT_LIVERY_Lufthansa); // Lufthansa New return string(STR_REFIT_LIVERY_Airbus); } switch(FEAT_AIRCRAFT, SELF, sw_A340_600, cargo_subtype) { - 1: set_A340_600_default; // Manufacturer - 2: set_A340_600_chinaeastern; // China Eastern - 3: set_A340_600_conviasa; // Conviasa - 4: set_A340_600_etihad; // Etihad - 5: set_A340_600_hainan; // Hainan - 6: set_A340_600_iberia; // Iberia - 7: set_A340_600_iberiaold; // Iberia (old) - 8: set_A340_600_lufthansa; // Lufthansa - 9: set_A340_600_plusultra; // Plus Ultra - 10: set_A340_600_qatar; // Qatar Airways + 1: set_A340_600_default; // Manufacturer + 2: set_A340_600_chinaeastern; // China Eastern + 3: set_A340_600_conviasa; // Conviasa + 4: set_A340_600_etihad; // Etihad + 5: set_A340_600_hainan; // Hainan + 6: set_A340_600_iberia; // Iberia + 7: set_A340_600_iberiaold; // Iberia (old) + 8: set_A340_600_lufthansa; // Lufthansa + 9: set_A340_600_plusultra; // Plus Ultra + 10: set_A340_600_qatar; // Qatar Airways 11: set_A340_600_southafrican; // South African - 12: set_A340_600_thai; // Thai - 13: set_A340_600_virgin; // Virgin Atlantic + 12: set_A340_600_thai; // Thai + 13: set_A340_600_virgin; // Virgin Atlantic + 14: set_A340_600_lufthansanew; // Lufthansa New set_A340_600_default; } switch (FEAT_AIRCRAFT, SELF, switch_A340600_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_A340_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_A340_600_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 320; // default + 2: return 317; // China Eastern + 3: return 318; // Conviasa + 4: return 319; // Etihad + 5: return 323; // Hainan + 6: return 319; // Iberia (new) + 7: return 319; // Iberia (old) + 8: return 281; // Lufthansa (old) + 9: return 318; // Plus Ultra + 10: return 318; // Qatar Airways + 11: return 321; // South African + 12: return 319; // Thai + 13: return 322; // Virgin Atlantic + 14: return 297; // Lufthansa (New) +} diff --git a/src/Aircraft/Airbus/A340/A340_600/Lufthansa_new.png b/src/Aircraft/Airbus/A340/A340_600/Lufthansa_new.png new file mode 100644 index 0000000..57023a3 Binary files /dev/null and b/src/Aircraft/Airbus/A340/A340_600/Lufthansa_new.png differ diff --git a/src/Aircraft/Airbus/A380/A380_800/A380_800.pnml b/src/Aircraft/Airbus/A380/A380_800/A380_800.pnml index 3c3c3a2..061a227 100644 --- a/src/Aircraft/Airbus/A380/A380_800/A380_800.pnml +++ b/src/Aircraft/Airbus/A380/A380_800/A380_800.pnml @@ -17,40 +17,41 @@ item(FEAT_AIRCRAFT, A380_800, 7010){ introduction_date: date(2005, 1, 1); aircraft_type: AIRCRAFT_TYPE_LARGE; sprite_id: SPRITE_ID_NEW_AIRCRAFT; - + //spec speed: 1016km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 25; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 652; - mail_capacity: 69; - acceleration: 27; + mail_capacity: 69; + 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_A380_800; purchase: sw_A380_800_purchase; loading_speed: 43; cost_factor: 1087; running_cost_factor: 120; - cargo_subtype_text: sw_Airbus_A380_800_cargo_subtype_text; + cargo_subtype_text: sw_A380_800_cargo_subtype_text; + passenger_capacity: sw_A380_800_cargo_subtype_capacity; name: switch_A380_name; } } diff --git a/src/Aircraft/Airbus/A380/A380_800/A380_800_graphic.pnml b/src/Aircraft/Airbus/A380/A380_800/A380_800_graphic.pnml index a662551..b34821e 100644 --- a/src/Aircraft/Airbus/A380/A380_800/A380_800_graphic.pnml +++ b/src/Aircraft/Airbus/A380/A380_800/A380_800_graphic.pnml @@ -105,9 +105,17 @@ spriteset(set_A380_800_Chinasouthern, "src/Aircraft/Airbus/A380/A380_800/Chinaso tp_A380_800(0, 0) } +/*-------------------------------------------------------------------- +13. Airbus A380-800 Lufthansa (New) +--------------------------------------------------------------------*/ + +spriteset(set_A380_800_Lufthansanew, "src/Aircraft/Airbus/A380/A380_800/Lufthansanew.png"){ + tp_A380_800(0, 0) +} + /*-------------------------------------------------------------------- 구매정보 --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_A380_800_purchase, cargo_subtype) { set_A380_800_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Airbus/A380/A380_800/A380_800_switch.pnml b/src/Aircraft/Airbus/A380/A380_800/A380_800_switch.pnml index 93496ae..fdb39fc 100644 --- a/src/Aircraft/Airbus/A380/A380_800/A380_800_switch.pnml +++ b/src/Aircraft/Airbus/A380/A380_800/A380_800_switch.pnml @@ -1,7 +1,7 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A380_800_cargo_subtype_text, cargo_subtype) { +switch(FEAT_AIRCRAFT, SELF, sw_A380_800_cargo_subtype_text, cargo_subtype) { 1: return string(STR_REFIT_LIVERY_Airbus); // Manufacturer 2: return string(STR_REFIT_LIVERY_Emiratesairlines); // Emirates 3: return string(STR_REFIT_LIVERY_Singaporeairlines); // Singapore Airlines @@ -14,6 +14,7 @@ switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A380_800_cargo_subtype_text, cargo_subtype 10: return string(STR_REFIT_LIVERY_Malaysiaairlines); // Malaysia Airlines 11: return string(STR_REFIT_LIVERY_Thaiairways); // Thai Airways 12: return string(STR_REFIT_LIVERY_Chinasouthern); // China Southern Airlines + 13: return string(STR_REFIT_LIVERY_Lufthansa); // Lufthansa (New) return string(STR_REFIT_LIVERY_Airbus); } @@ -30,10 +31,28 @@ switch(FEAT_AIRCRAFT, SELF, sw_A380_800, cargo_subtype) { 10: set_A380_800_Malaysia; // Malaysia Airlines 11: set_A380_800_Thai; // Thai Airways 12: set_A380_800_Chinasouthern; // China Southern Airlines + 13: set_A380_800_Lufthansanew; // Lufthansa (New) set_A380_800_default; } switch (FEAT_AIRCRAFT, SELF, switch_A380_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_A380_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_A380_800_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 555; // default + 2: return 517; // Emirates + 3: return 471; // Singapore + 4: return 509; // Lufthansa + 5: return 469; // British Airways + 6: return 485; // Qantas + 7: return 516; // Air France + 8: return 407; // Korean Air + 9: return 495; // Asiana Airlines + 10: return 494; // Malaysia Airlines + 11: return 507; // Thai Airways + 12: return 524; // China Southern Airlines + 13: return 509; // Lufthansa (New) +} diff --git a/src/Aircraft/Airbus/A380/A380_800/Lufthansanew.png b/src/Aircraft/Airbus/A380/A380_800/Lufthansanew.png new file mode 100644 index 0000000..f500412 Binary files /dev/null and b/src/Aircraft/Airbus/A380/A380_800/Lufthansanew.png differ diff --git a/src/Aircraft/Boeing/B747/B747_8I/B747_8I.pnml b/src/Aircraft/Boeing/B747/B747_8I/B747_8I.pnml index 2fc5b65..8bc5ada 100644 --- a/src/Aircraft/Boeing/B747/B747_8I/B747_8I.pnml +++ b/src/Aircraft/Boeing/B747/B747_8I/B747_8I.pnml @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, B747_8I, 7051){ aircraft_type: AIRCRAFT_TYPE_LARGE; sprite_id: SPRITE_ID_NEW_AIRCRAFT; variant_group: B747_100; - + //spec speed: 952km/h; - + //Model model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 30; retire_early: 0; reliability_decay: 0; - + //Cargo passenger_capacity: 467; - mail_capacity: 54; - acceleration: 27; + mail_capacity: 54; + 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_B747_8I; purchase: sw_B747_8I_purchase; loading_speed: 26; cost_factor: 857; running_cost_factor: 120; - cargo_subtype_text: sw_Boeing_747_8I_cargo_subtype_text; + cargo_subtype_text: sw_747_8I_cargo_subtype_text; + passenger_capacity: sw_747_8I_cargo_subtype_capacity; name: switch_B7478I_name; } } diff --git a/src/Aircraft/Boeing/B747/B747_8I/B747_8I_graphic.pnml b/src/Aircraft/Boeing/B747/B747_8I/B747_8I_graphic.pnml index 6f0cfc3..13b2caf 100644 --- a/src/Aircraft/Boeing/B747/B747_8I/B747_8I_graphic.pnml +++ b/src/Aircraft/Boeing/B747/B747_8I/B747_8I_graphic.pnml @@ -10,7 +10,7 @@ spriteset(set_B747_8I_purchase, "src/Aircraft/Boeing/B747/B747_8I/B747_8I.png"){ } /*-------------------------------------------------------------------- -1. Boeing 777-200 Manufacturer +1. Manufacturer --------------------------------------------------------------------*/ spriteset(set_B747_8I, "src/Aircraft/Boeing/B747/B747_8I/B747_8I.png"){ @@ -18,7 +18,7 @@ spriteset(set_B747_8I, "src/Aircraft/Boeing/B747/B747_8I/B747_8I.png"){ } /*-------------------------------------------------------------------- -2. Boeing 777-200 Korean Air Old +2. Korean Air Old --------------------------------------------------------------------*/ spriteset(set_B747_8I_korean, "src/Aircraft/Boeing/B747/B747_8I/Korean.png"){ @@ -26,16 +26,24 @@ spriteset(set_B747_8I_korean, "src/Aircraft/Boeing/B747/B747_8I/Korean.png"){ } /*-------------------------------------------------------------------- -3. Boeing 777-200 Korean Air +3. Korean Air --------------------------------------------------------------------*/ spriteset(set_B747_8I_korean25, "src/Aircraft/Boeing/B747/B747_8I/korean25.png"){ tp_B747_8I(0, 0) } +/*-------------------------------------------------------------------- +4. Lufthansa +--------------------------------------------------------------------*/ + +spriteset(set_B747_8I_lufthansa, "src/Aircraft/Boeing/B747/B747_8I/Lufthansa.png"){ + tp_B747_8I(0, 0) +} + /*-------------------------------------------------------------------- Purchase info --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_B747_8I_purchase, cargo_subtype) { set_B747_8I_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Boeing/B747/B747_8I/B747_8I_switch.pnml b/src/Aircraft/Boeing/B747/B747_8I/B747_8I_switch.pnml index 2098c4c..72899e9 100644 --- a/src/Aircraft/Boeing/B747/B747_8I/B747_8I_switch.pnml +++ b/src/Aircraft/Boeing/B747/B747_8I/B747_8I_switch.pnml @@ -1,21 +1,31 @@ /*-------------------------------------------------------------------- Switch --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Boeing_747_8I_cargo_subtype_text, cargo_subtype) { +switch(FEAT_AIRCRAFT, SELF, sw_747_8I_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_Lufthansa); // Lufthansa return string(STR_REFIT_LIVERY_Boeing); } switch(FEAT_AIRCRAFT, SELF, sw_B747_8I, cargo_subtype) { 1: set_B747_8I; // Manufacturer 2: set_B747_8I_korean; // Korean Air Old - 3: set_B747_8I_korean25; // Korean Air + 3: set_B747_8I_korean25; // Korean Air + 4: set_B747_8I_lufthansa; // Lufthansa set_B747_8I; } switch (FEAT_AIRCRAFT, SELF, switch_B7478I_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { 0: return string(STR_B747_FAMILY); return CB_RESULT_NO_TEXT; -} \ No newline at end of file +} + +switch (FEAT_AIRCRAFT, SELF, sw_747_8I_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 350; // default + 2: return 368; // Korean Air old + 3: return 368; // Korean Air + 4: return 364; // Lufthansa +} diff --git a/src/Aircraft/Boeing/B747/B747_8I/Lufthansa.png b/src/Aircraft/Boeing/B747/B747_8I/Lufthansa.png new file mode 100644 index 0000000..dd5799d Binary files /dev/null and b/src/Aircraft/Boeing/B747/B747_8I/Lufthansa.png differ diff --git a/src/Aircraft/Boeing/B787/B787_9/B787_9.pnml b/src/Aircraft/Boeing/B787/B787_9/B787_9.pnml index d7597db..deffd93 100644 --- a/src/Aircraft/Boeing/B787/B787_9/B787_9.pnml +++ b/src/Aircraft/Boeing/B787/B787_9/B787_9.pnml @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, B787_9, 7006){ 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: 280; - mail_capacity: 36; - acceleration: 27; + mail_capacity: 36; + 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_9; purchase: sw_B787_9_purchase; loading_speed: 26; cost_factor: 660; running_cost_factor: 120; - cargo_subtype_text: sw_Boeing_787_9_cargo_subtype_text; + cargo_subtype_text: sw_787_9_cargo_subtype_text; + passenger_capacity: sw_787_9_cargo_subtype_capacity; name: switch_B7879_name; } } diff --git a/src/Aircraft/Boeing/B787/B787_9/B787_9_graphic.pnml b/src/Aircraft/Boeing/B787/B787_9/B787_9_graphic.pnml index 6922a57..601580d 100644 --- a/src/Aircraft/Boeing/B787/B787_9/B787_9_graphic.pnml +++ b/src/Aircraft/Boeing/B787/B787_9/B787_9_graphic.pnml @@ -29,7 +29,7 @@ spriteset(set_B787_9_eurowhitecc, "src/Aircraft/Boeing/B787/B787_9/eurowhitecc.p 3. Boeing 787-9 Korean Air old --------------------------------------------------------------------*/ -spriteset(set_B787_9_korean, "src/Aircraft/Boeing/B787/B787_9/B787_9_Korean.png"){ +spriteset(set_B787_9_korean, "src/Aircraft/Boeing/B787/B787_9/Korean.png"){ tp_B787_9(0, 0) } @@ -37,7 +37,7 @@ spriteset(set_B787_9_korean, "src/Aircraft/Boeing/B787/B787_9/B787_9_Korean.png" 4. Boeing 787-9 Air Premia --------------------------------------------------------------------*/ -spriteset(set_B787_9_premia, "src/Aircraft/Boeing/B787/B787_9/B787_9_premia.png"){ +spriteset(set_B787_9_premia, "src/Aircraft/Boeing/B787/B787_9/Premia.png"){ tp_B787_9(0, 0) } @@ -65,9 +65,17 @@ spriteset(set_B787_9_united, "src/Aircraft/Boeing/B787/B787_9/United.png"){ tp_B787_9(0, 0) } +/*-------------------------------------------------------------------- +8. Boeing 787-9 Lufthansa +--------------------------------------------------------------------*/ + +spriteset(set_B787_9_lufthansa, "src/Aircraft/Boeing/B787/B787_9/Lufthansa.png"){ + tp_B787_9(0, 0) +} + /*-------------------------------------------------------------------- purchase info --------------------------------------------------------------------*/ switch(FEAT_TRAINS, SELF, sw_B787_9_purchase, cargo_subtype) { set_B787_9_purchase; -} \ No newline at end of file +} diff --git a/src/Aircraft/Boeing/B787/B787_9/B787_9_switch.pnml b/src/Aircraft/Boeing/B787/B787_9/B787_9_switch.pnml index b553cd9..2908f17 100644 --- a/src/Aircraft/Boeing/B787/B787_9/B787_9_switch.pnml +++ b/src/Aircraft/Boeing/B787/B787_9/B787_9_switch.pnml @@ -1,29 +1,43 @@ /*-------------------------------------------------------------------- 스위치 --------------------------------------------------------------------*/ -switch(FEAT_AIRCRAFT, SELF, sw_Boeing_787_9_cargo_subtype_text, cargo_subtype) { - 1: return string(STR_REFIT_LIVERY_Boeing); // Manufacturer - 2: return string(STR_REFIT_LIVERY_CC_a); // Eurowhite Company Color - 3: return string(STR_REFIT_LIVERY_Koreanair); // KOREAN AIR old - 4: return string(STR_REFIT_LIVERY_Airpremia); // AIR PREMIA - 5: return string(STR_REFIT_LIVERY_Allnipponairways); // ANA - 6: return string(STR_REFIT_LIVERY_Koreanair_new); // KOREAN AIR - 7: return string(STR_REFIT_LIVERY_Unitedairlines); // United Airlines +switch(FEAT_AIRCRAFT, SELF, sw_787_9_cargo_subtype_text, cargo_subtype) { + 1: return string(STR_REFIT_LIVERY_Boeing); // Manufacturer + 2: return string(STR_REFIT_LIVERY_CC_a); // Eurowhite Company Color + 3: return string(STR_REFIT_LIVERY_Koreanair); // KOREAN AIR old + 4: return string(STR_REFIT_LIVERY_Airpremia); // AIR PREMIA + 5: return string(STR_REFIT_LIVERY_Allnipponairways); // ANA + 6: return string(STR_REFIT_LIVERY_Koreanair_new); // KOREAN AIR + 7: return string(STR_REFIT_LIVERY_Unitedairlines); // United Airlines + 8: return string(STR_REFIT_LIVERY_Lufthansa); // Lufthansa return string(STR_REFIT_LIVERY_Boeing); } switch(FEAT_AIRCRAFT, SELF, sw_B787_9, cargo_subtype) { - 1: set_B787_9; // Manufacturer - 2: set_B787_9_eurowhitecc; // Euro White Company Color - 3: set_B787_9_korean; // Korean Air Old - 4: set_B787_9_premia; // Air Premia - 5: set_B787_9_ana; // ANA - 6: set_B787_9_korean25; // Korean Air - 7: set_B787_9_united; // United Airlines + 1: set_B787_9; // Manufacturer + 2: set_B787_9_eurowhitecc; // Euro White Company Color + 3: set_B787_9_korean; // Korean Air Old + 4: set_B787_9_premia; // Air Premia + 5: set_B787_9_ana; // ANA + 6: set_B787_9_korean25; // Korean Air + 7: set_B787_9_united; // United Airlines + 8: set_B787_9_lufthansa; // Lufthansa set_B787_9; } switch (FEAT_AIRCRAFT, SELF, switch_B7879_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_9_cargo_subtype_capacity, cargo_subtype) +{ + 1: return 290; // default + 2: return 290; // Euro White Company Color + 3: return 269; // Korean Air old + 4: return 344; // Air Premia + 5: return 395; // ANA + 6: return 278; // Korean Air + 7: return 257; // United Airlines + 8: return 294; // Lufthansa +} diff --git a/src/Aircraft/Boeing/B787/B787_9/B787_9_korean.png b/src/Aircraft/Boeing/B787/B787_9/Korean.png similarity index 100% rename from src/Aircraft/Boeing/B787/B787_9/B787_9_korean.png rename to src/Aircraft/Boeing/B787/B787_9/Korean.png diff --git a/src/Aircraft/Boeing/B787/B787_9/Lufthansa.png b/src/Aircraft/Boeing/B787/B787_9/Lufthansa.png new file mode 100644 index 0000000..6eb1f1f Binary files /dev/null and b/src/Aircraft/Boeing/B787/B787_9/Lufthansa.png differ diff --git a/src/Aircraft/Boeing/B787/B787_9/B787_9_premia.png b/src/Aircraft/Boeing/B787/B787_9/Premia.png similarity index 100% rename from src/Aircraft/Boeing/B787/B787_9/B787_9_premia.png rename to src/Aircraft/Boeing/B787/B787_9/Premia.png