Add A350 liveries

src/Aircraft/Airbus/A350/A350_1000/A350_1000.pnml

@@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, A350_1000, 7029){
         aircraft_type:                  AIRCRAFT_TYPE_LARGE;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
         variant_group:                  A350_900;
-                
+
         //spec
         speed:                          945km/h;
-        
+
         //Model
         model_life:                     VEHICLE_NEVER_EXPIRES;
         vehicle_life:                   25;
         retire_early:                   0;
         reliability_decay:              0;
-        
+
         //Cargo
         passenger_capacity:             356;
-        mail_capacity:                  40;    
-        acceleration:                   27; 
+        mail_capacity:                  40;
+        acceleration:                   27;
         refittable_cargo_classes:       NO_CARGO_CLASS;
         non_refittable_cargo_classes:   NO_CARGO_CLASS;
         cargo_allow_refit:              [PASS];
         cargo_disallow_refit:           [];
-        
+
         //Costs
         refit_cost:                     100;
-        
+
         //Flags
         misc_flags:                  	bitmask(AIRCRAFT_FLAG_2CC);
         sound_effect:                   SOUND_TAKEOFF_JET;
         }
-        
+
     graphics {
         default:                        sw_A350_1000;
         purchase:                       sw_A350_1000_purchase;
         loading_speed:                  43;
         cost_factor:                    894;
         running_cost_factor:            120;
-        cargo_subtype_text:             sw_Airbus_A350_1000_cargo_subtype_text;
-        name:                           switch_A3501000_name;
+        cargo_subtype_text:             sw_A350_1000_cargo_subtype_text;
+        passenger_capacity:             sw_A350_1000_cargo_subtype_capacity;
+        name:                           switch_A350_1000_name;
         }
 }

src/Aircraft/Airbus/A350/A350_1000/A350_1000_graphic.pnml

@@ -10,17 +10,50 @@ spriteset(set_A350_1000_purchase, "src/Aircraft/Airbus/A350/A350_1000/A350_1000.
 }
 
 /*--------------------------------------------------------------------
-1. 에어버스 A220-300 제조사
+1. A350-1000 제조사
 --------------------------------------------------------------------*/
-
 spriteset(set_A350_1000_default, "src/Aircraft/Airbus/A350/A350_1000/A350_1000.png"){
     tp_A350_1000(0, 0)
 }
 
+/*--------------------------------------------------------------------
+2. A350-1000 BA
+--------------------------------------------------------------------*/
+spriteset(set_A350_1000_ba, "src/Aircraft/Airbus/A350/A350_1000/BA.png"){
+    tp_A350_1000(0, 0)
+}
+
+/*--------------------------------------------------------------------
+3. A350-1000 Cathay Pacific
+--------------------------------------------------------------------*/
+spriteset(set_A350_1000_cathay_pacific, "src/Aircraft/Airbus/A350/A350_1000/Cathaypacific.png"){
+    tp_A350_1000(0, 0)
+}
+
+/*--------------------------------------------------------------------
+4. A350-1000 Japan Airlines
+--------------------------------------------------------------------*/
+spriteset(set_A350_1000_japan_airlines, "src/Aircraft/Airbus/A350/A350_1000/Japanairlines.png"){
+    tp_A350_1000(0, 0)
+}
+
+/*--------------------------------------------------------------------
+5. A350-1000 Qatar
+--------------------------------------------------------------------*/
+spriteset(set_A350_1000_qatar, "src/Aircraft/Airbus/A350/A350_1000/Qatar.png"){
+    tp_A350_1000(0, 0)
+}
+
+/*--------------------------------------------------------------------
+6. A350-1000 Virgin Atlantic
+--------------------------------------------------------------------*/
+spriteset(set_A350_1000_virgin, "src/Aircraft/Airbus/A350/A350_1000/Virgin.png"){
+    tp_A350_1000(0, 0)
+}
 
 /*--------------------------------------------------------------------
 구매정보
 --------------------------------------------------------------------*/
 switch(FEAT_TRAINS, SELF, sw_A350_1000_purchase, cargo_subtype) {
     set_A350_1000_purchase;
-}
+}

src/Aircraft/Airbus/A350/A350_1000/A350_1000_switch.pnml

@@ -1,19 +1,37 @@
 /*--------------------------------------------------------------------
 스위치
 --------------------------------------------------------------------*/
-switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A350_1000_cargo_subtype_text, cargo_subtype) {
-    1: return string(STR_REFIT_LIVERY_Airbus);   // 제조사
-    2: return string(STR_REFIT_LIVERY_Airbus);     // 아시아나항공
+switch(FEAT_AIRCRAFT, SELF, sw_A350_1000_cargo_subtype_text, cargo_subtype) {
+    1: return string(STR_REFIT_LIVERY_Airbus);           // Manufacturer
+    2: return string(STR_REFIT_LIVERY_Britishairways);   // BA
+    3: return string(STR_REFIT_LIVERY_Cathaypacific);    // Cathay Pacific
+    4: return string(STR_REFIT_LIVERY_Japanairlines);    // Japan Airlines
+    5: return string(STR_REFIT_LIVERY_Qatarairways);     // Qatar
+    6: return string(STR_REFIT_LIVERY_Virginatlantic);   // Virgin Atlantic
     return string(STR_REFIT_LIVERY_Airbus);
 }
 
 switch(FEAT_AIRCRAFT, SELF, sw_A350_1000, cargo_subtype) {
-    1: set_A350_1000_default;        // 제조사
-    2: set_A350_1000_default;   // 아시아나항공
+    1: set_A350_1000_default;           // Manufacturer
+    2: set_A350_1000_ba;                // British Airways
+    3: set_A350_1000_cathay_pacific;    // Cathay Pacific
+    4: set_A350_1000_japan_airlines;    // Japan Airlines
+    5: set_A350_1000_qatar;             // Qatar
+    6: set_A350_1000_virgin;            // Virgin Atlantic
     set_A350_1000_default;
 }
 
-switch (FEAT_AIRCRAFT, SELF, switch_A3501000_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) {
+switch (FEAT_AIRCRAFT, SELF, switch_A350_1000_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) {
     0: return string(STR_A350_FAMILY);
     return CB_RESULT_NO_TEXT;
-}
+}
+
+switch (FEAT_AIRCRAFT, SELF, sw_A350_1000_cargo_subtype_capacity, cargo_subtype)
+{
+    1: return 325;   // default
+    2: return 331;   // British Airways
+    3: return 334;   // Cathay Pacific
+    4: return 239;   // Japan Airlines
+    5: return 395;   // Qatar
+    6: return 397;   // Virgin Atlantic
+}

src/Aircraft/Airbus/A350/A350_900/A350_900.pnml

@@ -17,40 +17,41 @@ item(FEAT_AIRCRAFT, A350_900, 7014){
         introduction_date:              date(2014, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_LARGE;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-                
+
         //spec
         speed:                          945km/h;
-        
+
         //Model
         model_life:                     VEHICLE_NEVER_EXPIRES;
         vehicle_life:                   25;
         retire_early:                   0;
         reliability_decay:              0;
-        
+
         //Cargo
         passenger_capacity:             315;
-        mail_capacity:                  32;    
-        acceleration:                   27; 
+        mail_capacity:                  32;
+        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_A350_900;
         purchase:                       sw_A350_900_purchase;
         loading_speed:                  43;
         cost_factor:                    774;
         running_cost_factor:            120;
-        cargo_subtype_text:             sw_Airbus_A350_900_cargo_subtype_text;
-        name:                           switch_A350_name;
+        cargo_subtype_text:             sw_A350_900_cargo_subtype_text;
+        passenger_capacity:             sw_A350_900_cargo_subtype_capacity;
+        name:                           switch_A350_900_name;
         }
 }

src/Aircraft/Airbus/A350/A350_900/A350_900_switch.pnml

@@ -1,45 +1,64 @@
 /*--------------------------------------------------------------------
 스위치
 --------------------------------------------------------------------*/
-switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A350_900_cargo_subtype_text, cargo_subtype) {
-    1: return string(STR_REFIT_LIVERY_Airbus);   // Airbus
-    2: return string(STR_REFIT_LIVERY_Asiana);     // Asiana Airlines
-    3: return string(STR_REFIT_LIVERY_Japanairlines);     // Japan Airlines
-    4: return string(STR_REFIT_LIVERY_Singaporeairlines);     // Singapore Airlines
-    5: return string(STR_REFIT_LIVERY_Airfrance);     // Air France
-    6: return string(STR_REFIT_LIVERY_Airchina);     // Air China
-    7: return string(STR_REFIT_LIVERY_Cathaypacific);     // Cathay Pacific
-    8: return string(STR_REFIT_LIVERY_Chinaeastern);     // China Eastern
-    9: return string(STR_REFIT_LIVERY_Finnair);     // Finnair
+switch(FEAT_AIRCRAFT, SELF, sw_A350_900_cargo_subtype_text, cargo_subtype) {
+    1: return string(STR_REFIT_LIVERY_Airbus);              // Airbus
+    2: return string(STR_REFIT_LIVERY_Asiana);              // Asiana Airlines
+    3: return string(STR_REFIT_LIVERY_Japanairlines);       // Japan Airlines
+    4: return string(STR_REFIT_LIVERY_Singaporeairlines);   // Singapore Airlines
+    5: return string(STR_REFIT_LIVERY_Airfrance);           // Air France
+    6: return string(STR_REFIT_LIVERY_Airchina);            // Air China
+    7: return string(STR_REFIT_LIVERY_Cathaypacific);       // Cathay Pacific
+    8: return string(STR_REFIT_LIVERY_Chinaeastern);        // China Eastern
+    9: return string(STR_REFIT_LIVERY_Finnair);             // Finnair
     10: return string(STR_REFIT_LIVERY_Iberiaairlines);     // Iberia
-    11: return string(STR_REFIT_LIVERY_Deltaairlines);     // Delta Air Lines
-    12: return string(STR_REFIT_LIVERY_Lufthansa);     // Lufthansa
-    13: return string(STR_REFIT_LIVERY_Qatarairways);     // Qatar Airways
-    14: return string(STR_REFIT_LIVERY_Evelop);     // evelop
-    15: return string(STR_REFIT_LIVERY_Fijiairways);     // Fiji airways
+    11: return string(STR_REFIT_LIVERY_Deltaairlines);      // Delta Air Lines
+    12: return string(STR_REFIT_LIVERY_Lufthansa);          // Lufthansa
+    13: return string(STR_REFIT_LIVERY_Qatarairways);       // Qatar Airways
+    14: return string(STR_REFIT_LIVERY_Evelop);             // evelop
+    15: return string(STR_REFIT_LIVERY_Fijiairways);        // Fiji airways
     return string(STR_REFIT_LIVERY_Airbus);
 }
 
 switch(FEAT_AIRCRAFT, SELF, sw_A350_900, cargo_subtype) {
-    1: set_A350_900_default;        // Airbus
-    2: set_A350_900_asiana;   // Asiana Airlines
-    3: set_A350_900_Japanairlines;   // Japan Airlines
+    1: set_A350_900_default;             // Airbus
+    2: set_A350_900_asiana;              // Asiana Airlines
+    3: set_A350_900_Japanairlines;       // Japan Airlines
     4: set_A350_900_Singaporeairlines;   // Singapore Airlines
-    5: set_A350_900_Airfrance;   // Air France
-    6: set_A350_900_Airchina;   // Air China
-    7: set_A350_900_Cathaypacific;   // Cathay Pacific
-    8: set_A350_900_Chinaeastern;   // China Eastern
-    9: set_A350_900_Finnair;   // Finnair
-    10: set_A350_900_Iberia;   // Iberia
-    11: set_A350_900_Delta;   // Delta Air Lines
-    12: set_A350_900_Lufthansa;   // Lufthansa
-    13: set_A350_900_Qatarairways;   // Qatar Airways
-    14: set_A350_900_Evelop;   // Evelop
-    15: set_A350_900_Fiji;   // Fiji Airways
+    5: set_A350_900_Airfrance;           // Air France
+    6: set_A350_900_Airchina;            // Air China
+    7: set_A350_900_Cathaypacific;       // Cathay Pacific
+    8: set_A350_900_Chinaeastern;        // China Eastern
+    9: set_A350_900_Finnair;             // Finnair
+    10: set_A350_900_Iberia;             // Iberia
+    11: set_A350_900_Delta;              // Delta Air Lines
+    12: set_A350_900_Lufthansa;          // Lufthansa
+    13: set_A350_900_Qatarairways;       // Qatar Airways
+    14: set_A350_900_Evelop;             // Evelop
+    15: set_A350_900_Fiji;               // Fiji Airways
     set_A350_900_default;
 }
 
-switch (FEAT_AIRCRAFT, SELF, switch_A350_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) {
+switch (FEAT_AIRCRAFT, SELF, switch_A350_900_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) {
     0: return string(STR_A350_FAMILY);
     return CB_RESULT_NO_TEXT;
-}
+}
+
+switch (FEAT_AIRCRAFT, SELF, sw_A350_900_cargo_subtype_capacity, cargo_subtype)
+{
+    1: return 300;   // Airbus
+    2: return 311;   // Asiana Airlines
+    3: return 391;   // Japan Airlines
+    4: return 303;   // Singapore Airlines
+    5: return 324;   // Air France
+    6: return 312;   // Air China
+    7: return 280;   // Cathay Pacific
+    8: return 288;   // China Eastern
+    9: return 321;   // Finnair
+    10: return 352;  // Iberia
+    11: return 339;  // Delta Air Lines
+    12: return 318;  // Lufthansa
+    13: return 283;  // Qatar Airways
+    14: return 432;  // Evelop
+    15: return 334;  // Fiji Airways
+}

src/Aircraft/Airbus/A350/A350_900ULR/A350_900ULR.pnml

@@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, A350_900ULR, 7028){
         aircraft_type:                  AIRCRAFT_TYPE_LARGE;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
         variant_group:                  A350_900;
-                
+
         //spec
         speed:                          945km/h;
-        
+
         //Model
         model_life:                     VEHICLE_NEVER_EXPIRES;
         vehicle_life:                   25;
         retire_early:                   0;
         reliability_decay:              0;
-        
+
         //Cargo
         passenger_capacity:             173;
-        mail_capacity:                  32;    
-        acceleration:                   27; 
+        mail_capacity:                  32;
+        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_A350_900ULR;
         purchase:                       sw_A350_900ULR_purchase;
         loading_speed:                  43;
         cost_factor:                    774;
         running_cost_factor:            120;
-        cargo_subtype_text:             sw_Airbus_A350_900ULR_cargo_subtype_text;
-        name:                           switch_A350900ULR_name;
+        cargo_subtype_text:             sw_A350_900ULR_cargo_subtype_text;
+        passenger_capacity:             sw_A350_900ULR_cargo_subtype_capacity;
+        name:                           switch_A350_900ULR_name;
         }
 }

src/Aircraft/Airbus/A350/A350_900ULR/A350_900ULR_graphic.pnml

@@ -17,10 +17,17 @@ spriteset(set_A350_900ULR_default, "src/Aircraft/Airbus/A350/A350_900ULR/A350_90
     tp_A350_900(0, 0)
 }
 
+/*--------------------------------------------------------------------
+2. Airbus A350-900ULR Singapore Airlines
+--------------------------------------------------------------------*/
+
+spriteset(set_A350_900ULR_Singaporeairlines, "src/Aircraft/Airbus/A350/A350_900/Singaporeairlines.png"){
+    tp_A350_900(0, 0)
+}
 
 /*--------------------------------------------------------------------
 구매정보
 --------------------------------------------------------------------*/
 switch(FEAT_TRAINS, SELF, sw_A350_900ULR_purchase, cargo_subtype) {
     set_A350_900ULR_purchase;
-}
+}