Add multiple liveries and code their different capacities

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

lang/english.lng

@@ -457,15 +457,20 @@ 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)
 STR_REFIT_LIVERY_Swissinternationalairlines         :{RED}(SWISS International Air Lines)
 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)
 

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)
 

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;
         }
 }

src/Aircraft/Airbus/A220/A220_100/A220_100_graphic.pnml

@@ -17,11 +17,18 @@ 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)
+}
 
 
 /*--------------------------------------------------------------------
 구매정보
 --------------------------------------------------------------------*/
 switch(FEAT_TRAINS, SELF, sw_A220_100_purchase, cargo_subtype) {
     set_A220_100_purchase;
-}
+}

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;
-}
+}
+
+switch (FEAT_AIRCRAFT, SELF, sw_A220_100_cargo_subtype_capacity, cargo_subtype)
+{
+   1: return 120; // default
+   2: return 125; // Swiss
+}

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;
         }
 }

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;
-}
+}

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;
-}
+}
+
+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
+}

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;
         }
 }

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;
-}
+}
+
+switch (FEAT_AIRCRAFT, SELF, sw_A318_100_cargo_subtype_capacity, cargo_subtype)
+{
+   1: return 107; // default
+   2: return 32; // BA
+}