업데이트

CoconutKR · Sep 12, 2022 · cb251c2 · cb251c2
1 parent 2eb7929
commit cb251c2
Show file tree

Hide file tree

Showing 23 changed files with 287 additions and 5 deletions.
diff --git a/Korean_Airliners_Set.pnml b/Korean_Airliners_Set.pnml
@@ -8,7 +8,7 @@ grf {
 	grfid: "KARS";
 	name: string(STR_GRF_NAME_WITH_VER);
 	desc: string(STR_GRF_DESC);
-	version: 20220911;
+	version: 20220912;
 	min_compatible_version: 20220812;
 }
 

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,8 +1,18 @@
-2022.09.11
+2022.09.12
 -----
+일부 항공기 가격 변경됨
+
 * 항공기 추가 <맥도넬 더글라스 DC-9-30>
 * 도색 추가 <맥도넬 더글라스 DC-9-30> 대한항공 도장
 
+* 항공기 추가 <보잉 747-400>
+* 도색 추가 <보잉 747-400> 대한항공 도장
+* 도색 추가 <보잉 747-400> 아시아나항공 도장
+
+* 항공기 추가 <에어버스 A380-800>
+* 도색 추가 <에어버스 A380-800> 대한항공 도장
+* 도색 추가 <에어버스 A380-800> 아시아나항공 도장
+
 2022.08.11
 -----
 * 항공기 추가 <보잉 787-9>

diff --git a/lang/english.lng b/lang/english.lng
@@ -10,9 +10,11 @@ STR_B737_800_NAME                                   :[KAS] Boeing 737-800
 STR_B737_800BCF_NAME                                :[KAS] Boeing 737-800 BCF
 STR_B777_200ER_NAME                                 :[KAS] Boeing 777-200ER
 STR_B787_9_NAME                                     :[KAS] Boeing 787-9 Dreamliner
+STR_B747_400_NAME                                   :[KAS] Boeing 747-400
 STR_A320_200_NAME                                   :[KAS] Airbus A320-200
 STR_A321_200_NAME                                   :[KAS] Airbus A321-200
 STR_A330_300_NAME                                   :[KAS] Airbus A330-300
+STR_A380_800_NAME                                   :[KAS] Airbus A380-800
 STR_ATR_72_500_NAME                                 :[KAS] ATR 72-500
 STR_DC_9_30_NAME                                    :[KAS] McDonnell Douglas DC-9-30
 
@@ -53,6 +55,12 @@ STR_REFIT_LIVERY_ATR_72_500_hiair_p                 :(Hi Air - Pink Livery)
 STR_REFIT_LIVERY_ATR_72_500_hiair_g                 :(Hi Air - Green Livery)
 STR_REFIT_LIVERY_DC_9_30_default                    :(Manufacturers)
 STR_REFIT_LIVERY_DC_9_30_korean                     :(KOREAN AIR)
+STR_REFIT_LIVERY_Airbus_A380_800_default            :(Manufacturers)
+STR_REFIT_LIVERY_Airbus_A380_800_korean             :(KOREAN AIR)
+STR_REFIT_LIVERY_Airbus_A380_800_asiana             :(ASIANA AIRLINES)
+STR_REFIT_LIVERY_Boeing_747_400_default             :(Manufacturers)
+STR_REFIT_LIVERY_Boeing_747_400_korean              :(KOREAN AIR)
+STR_REFIT_LIVERY_Boeing_747_400_asiana              :(ASIANA AIRLINES)
 
 # Errors
 STR_ERROR_NO_ATTACH                                 :You can't attach this car here
diff --git a/lang/korean.lng b/lang/korean.lng
@@ -10,9 +10,11 @@ STR_B737_800_NAME                                   :[KAS] 보잉 737-800
 STR_B737_800BCF_NAME                                :[KAS] 보잉 737-800 BCF
 STR_B777_200ER_NAME                                 :[KAS] 보잉 777-200ER
 STR_B787_9_NAME                                     :[KAS] 보잉 787-9 드림라이너
+STR_B747_400_NAME                                   :[KAS] 보잉 747-400
 STR_A320_200_NAME                                   :[KAS] 에어버스 A320-200
 STR_A321_200_NAME                                   :[KAS] 에어버스 A321-200
 STR_A330_300_NAME                                   :[KAS] 에어버스 A330-300
+STR_A380_800_NAME                                   :[KAS] 에어버스 A380-800
 STR_ATR_72_500_NAME                                 :[KAS] ATR 72-500
 STR_DC_9_30_NAME                                    :[KAS] 맥도넬 더글라스 DC-9-30
 
@@ -53,6 +55,12 @@ STR_REFIT_LIVERY_ATR_72_500_hiair_p                 :(하이에어 - 분홍)
 STR_REFIT_LIVERY_ATR_72_500_hiair_g                 :(하이에어 - 초록)
 STR_REFIT_LIVERY_DC_9_30_default                    :(제조사)
 STR_REFIT_LIVERY_DC_9_30_korean                     :(대한항공)
+STR_REFIT_LIVERY_Airbus_A380_800_default            :(제조사)
+STR_REFIT_LIVERY_Airbus_A380_800_korean             :(대한항공)
+STR_REFIT_LIVERY_Airbus_A380_800_asiana             :(아시아나항공)
+STR_REFIT_LIVERY_Boeing_747_400_default             :(제조사)
+STR_REFIT_LIVERY_Boeing_747_400_korean              :(대한항공)
+STR_REFIT_LIVERY_Boeing_747_400_asiana              :(아시아나항공)
 
 # Errors
 STR_ERROR_NO_ATTACH                                 :여기에 이 차량을 붙일 수 없습니다
diff --git a/src/Aircraft/ATR/ATR_72_500/ATR_72_500.pnml b/src/Aircraft/ATR/ATR_72_500/ATR_72_500.pnml
@@ -47,7 +47,7 @@ item(FEAT_AIRCRAFT, ATR_72_500, 7008){
         default:                        sw_ATR_72_500;
         purchase:                       sw_ATR_72_500_purchase;
         loading_speed:                  43;
-        cost_factor:                    830;
+        cost_factor:                    55;
         running_cost_factor:            120;
         cargo_subtype_text:             sw_ATR_72_500_cargo_subtype_text;
         }

diff --git a/src/Aircraft/Airbus/A320_200/A320_200.pnml b/src/Aircraft/Airbus/A320_200/A320_200.pnml
@@ -47,7 +47,7 @@ item(FEAT_AIRCRAFT, A320_200, 7007){
         default:                        sw_A320_200;
         purchase:                       sw_A320_200_purchase;
         loading_speed:                  43;
-        cost_factor:                    830;
+        cost_factor:                    276;
         running_cost_factor:            120;
         cargo_subtype_text:             sw_Airbus_A320_200_cargo_subtype_text;
         }

diff --git a/src/Aircraft/Airbus/A380_800/A380_800.png b/src/Aircraft/Airbus/A380_800/A380_800.png
diff --git a/src/Aircraft/Airbus/A380_800/A380_800.pnml b/src/Aircraft/Airbus/A380_800/A380_800.pnml
@@ -0,0 +1,54 @@
+/*--------------------------------------------------------------------
+A321-200
+--------------------------------------------------------------------*/
+// Graphics
+#include "A380_800_graphic.pnml"
+
+// Switch
+#include "A380_800_switch.pnml"
+
+/*--------------------------------------------------------------------
+항공기정보
+--------------------------------------------------------------------*/
+item(FEAT_AIRCRAFT, A380_800, 7010){
+    property {
+        name:                           string(STR_A380_800_NAME);
+        climates_available:             ALL_CLIMATES;
+        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; 
+        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);
+        }
+
+    graphics {
+        default:                        sw_A380_800;
+        purchase:                       sw_A380_800_purchase;
+        loading_speed:                  43;
+        cost_factor:                    1400;
+        running_cost_factor:            120;
+        cargo_subtype_text:             sw_Airbus_A380_800_cargo_subtype_text;
+        }
+}
diff --git a/src/Aircraft/Airbus/A380_800/A380_800_asiana.png b/src/Aircraft/Airbus/A380_800/A380_800_asiana.png
diff --git a/src/Aircraft/Airbus/A380_800/A380_800_graphic.pnml b/src/Aircraft/Airbus/A380_800/A380_800_graphic.pnml
@@ -0,0 +1,41 @@
+/*--------------------------------------------------------------------
+Graphics
+--------------------------------------------------------------------*/
+
+/*--------------------------------------------------------------------
+구매정보
+--------------------------------------------------------------------*/
+spriteset(set_A380_800_purchase, "src\Aircraft\Airbus\A380_800\A380_800.png"){
+    tmpl_A380_800_purchase(0, 0)
+}
+
+/*--------------------------------------------------------------------
+1. 에어버스 A380-800 제조사
+--------------------------------------------------------------------*/
+
+spriteset(set_A380_800_default, "src\Aircraft\Airbus\A380_800\A380_800.png"){
+    tp_A380_800(0, 0)
+}
+
+/*--------------------------------------------------------------------
+2. 에어버스 A380-800 대한항공
+--------------------------------------------------------------------*/
+
+spriteset(set_A380_800_korean, "src\Aircraft\Airbus\A380_800\A380_800_Korean.png"){
+    tp_A380_800(0, 0)
+}
+
+/*--------------------------------------------------------------------
+2. 에어버스 A380-800 아시아나항공
+--------------------------------------------------------------------*/
+
+spriteset(set_A380_800_asiana, "src\Aircraft\Airbus\A380_800\A380_800_Asiana.png"){
+    tp_A380_800(0, 0)
+}
+
+/*--------------------------------------------------------------------
+구매정보
+--------------------------------------------------------------------*/
+switch(FEAT_TRAINS, SELF, sw_A380_800_purchase, cargo_subtype) {
+    set_A380_800_purchase;
+}
diff --git a/src/Aircraft/Airbus/A380_800/A380_800_korean.png b/src/Aircraft/Airbus/A380_800/A380_800_korean.png
diff --git a/src/Aircraft/Airbus/A380_800/A380_800_switch.pnml b/src/Aircraft/Airbus/A380_800/A380_800_switch.pnml
@@ -0,0 +1,16 @@
+/*--------------------------------------------------------------------
+스위치
+--------------------------------------------------------------------*/
+switch(FEAT_AIRCRAFT, SELF, sw_Airbus_A380_800_cargo_subtype_text, cargo_subtype) {
+    1: return string(STR_REFIT_LIVERY_Airbus_A380_800_default);   // 제조사
+    2: return string(STR_REFIT_LIVERY_Airbus_A380_800_korean);     // 대한항공
+    3: return string(STR_REFIT_LIVERY_Airbus_A380_800_asiana);     // 아시아나항공
+    return string(STR_REFIT_LIVERY_Airbus_A380_800_default);
+}
+
+switch(FEAT_AIRCRAFT, SELF, sw_A380_800, cargo_subtype) {
+    1: set_A380_800_default;        // 제조사
+    2: set_A380_800_korean;   // 대한항공
+    3: set_A380_800_asiana;   // 아시아나항공
+    set_A380_800_default;
+}
diff --git a/src/Aircraft/Boeing/B747_400/B747_400.png b/src/Aircraft/Boeing/B747_400/B747_400.png
diff --git a/src/Aircraft/Boeing/B747_400/B747_400.pnml b/src/Aircraft/Boeing/B747_400/B747_400.pnml
@@ -0,0 +1,54 @@
+/*--------------------------------------------------------------------
+B737-800
+--------------------------------------------------------------------*/
+// Graphics
+#include "B747_400_graphic.pnml"
+
+// Switch
+#include "B747_400_switch.pnml"
+
+/*--------------------------------------------------------------------
+항공기정보
+--------------------------------------------------------------------*/
+item(FEAT_AIRCRAFT, B747_400, 7011){
+    property {
+        name:                           string(STR_B747_400_NAME);
+        climates_available:             ALL_CLIMATES;
+        introduction_date:              date(1986, 1, 1);
+        aircraft_type:                  AIRCRAFT_TYPE_LARGE;
+        sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
+
+        //spec
+        speed:                          990km/h;
+
+        //Model
+        model_life:                     VEHICLE_NEVER_EXPIRES;
+        vehicle_life:                   30;
+        retire_early:                   0;
+        reliability_decay:              0;
+
+        //Cargo
+        passenger_capacity:             416;
+        mail_capacity:                  52;    
+        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);
+        }
+
+    graphics {
+        default:                        sw_B747_400;
+        purchase:                       sw_B747_400_purchase;
+        loading_speed:                  26;
+        cost_factor:                    1150;
+        running_cost_factor:            120;
+        cargo_subtype_text:             sw_Boeing_747_400_cargo_subtype_text;
+        }
+}
diff --git a/src/Aircraft/Boeing/B747_400/B747_400_asiana.png b/src/Aircraft/Boeing/B747_400/B747_400_asiana.png
diff --git a/src/Aircraft/Boeing/B747_400/B747_400_graphic.pnml b/src/Aircraft/Boeing/B747_400/B747_400_graphic.pnml
@@ -0,0 +1,41 @@
+/*--------------------------------------------------------------------
+Graphics
+--------------------------------------------------------------------*/
+
+/*--------------------------------------------------------------------
+구매정보
+--------------------------------------------------------------------*/
+spriteset(set_B747_400_purchase, "src\Aircraft\Boeing\B747_400\B747_400.png"){
+    tmpl_B747_400_purchase(0, 0)
+}
+
+/*--------------------------------------------------------------------
+1. 보잉 747-400 제조사
+--------------------------------------------------------------------*/
+
+spriteset(set_B747_400, "src\Aircraft\Boeing\B747_400\B747_400.png"){
+    tp_B747_400(0, 0)
+}
+
+/*--------------------------------------------------------------------
+2. 보잉 747-400 대한항공
+--------------------------------------------------------------------*/
+
+spriteset(set_B747_400_korean, "src\Aircraft\Boeing\B747_400\B747_400_Korean.png"){
+    tp_B747_400(0, 0)
+}
+
+/*--------------------------------------------------------------------
+3. 보잉 747-400 아시아나항공
+--------------------------------------------------------------------*/
+
+spriteset(set_B747_400_asiana, "src\Aircraft\Boeing\B747_400\B747_400_asiana.png"){
+    tp_B747_400(0, 0)
+}
+
+/*--------------------------------------------------------------------
+구매정보
+--------------------------------------------------------------------*/
+switch(FEAT_TRAINS, SELF, sw_B747_400_purchase, cargo_subtype) {
+    set_B747_400_purchase;
+}
diff --git a/src/Aircraft/Boeing/B747_400/B747_400_korean.png b/src/Aircraft/Boeing/B747_400/B747_400_korean.png
diff --git a/src/Aircraft/Boeing/B747_400/B747_400_switch.pnml b/src/Aircraft/Boeing/B747_400/B747_400_switch.pnml
@@ -0,0 +1,16 @@
+/*--------------------------------------------------------------------
+스위치
+--------------------------------------------------------------------*/
+switch(FEAT_AIRCRAFT, SELF, sw_Boeing_747_400_cargo_subtype_text, cargo_subtype) {
+    1: return string(STR_REFIT_LIVERY_Boeing_747_400_default);   // 제조사
+    2: return string(STR_REFIT_LIVERY_Boeing_747_400_korean);      // 대한항공
+    3: return string(STR_REFIT_LIVERY_Boeing_747_400_asiana);      // 아시아나항공
+    return string(STR_REFIT_LIVERY_Boeing_747_400_default);
+}
+
+switch(FEAT_AIRCRAFT, SELF, sw_B747_400, cargo_subtype) {
+    1: set_B747_400;        // 제조사
+    2: set_B747_400_korean;   // 대한항공
+    3: set_B747_400_asiana;   // 아시아나항공
+    set_B747_400;
+}
diff --git a/src/Aircraft/McDonnellDouglas/DC_9_30/DC_9_30.pnml b/src/Aircraft/McDonnellDouglas/DC_9_30/DC_9_30.pnml
@@ -47,7 +47,7 @@ item(FEAT_AIRCRAFT, DC_9_30, 7009){
         default:                        sw_DC_9_30;
         purchase:                       sw_DC_9_30_purchase;
         loading_speed:                  43;
-        cost_factor:                    830;
+        cost_factor:                    138;
         running_cost_factor:            120;
         cargo_subtype_text:             sw_DC_9_30_cargo_subtype_text;
         }

diff --git a/src/Aircraft_list.pnml b/src/Aircraft_list.pnml
@@ -9,6 +9,8 @@
 #include "Aircraft/Airbus/A320_200/A320_200.pnml"          //7007
 #include "Aircraft/ATR/ATR_72_500/ATR_72_500.pnml"         //7008
 #include "Aircraft/McDonnellDouglas/DC_9_30/DC_9_30.pnml"  //7009
+#include "Aircraft/Airbus/A380_800/A380_800.pnml"          //7010
+#include "Aircraft/Boeing/B747_400/B747_400.pnml"          //7011
 
 // Sorting
 #include "sort.pnml"
diff --git a/src/sort.pnml b/src/sort.pnml
@@ -7,9 +7,11 @@ B737_800,           //7001
 B737_800BCF,        //7003
 B777_200ER,         //7004
 B787_9,             //7006
+B747_400,           //7011
 A320_200,           //7007
 A321_200,           //7002
 A330_300,           //7005
+A380_800,           //7010
 ATR_72_500,         //7008
 DC_9_30,            //7009
 

diff --git a/src/template/Aircraft_template.pnml b/src/template/Aircraft_template.pnml
@@ -87,4 +87,26 @@ template tp_DC_9_30(x, y) {
     [x+220,	  y,    37,    29,    -19,	-15]
     [x+260,   y,    46,    20,    -24,	-10]
     [x+310,	  y,    37,    17,    -20,	-9]
+}  
+
+template tp_A380_800(x, y) {                              
+    [x,       y,    74,    32,    -37,  -16]
+    [x+80,	  y,    64,    31,    -32,	-16]
+    [x+160,	  y,    69,    39,    -35,	-20]
+    [x+240,   y,    64,    43,    -32,	-22]
+    [x+320,   y,    74,    52,    -37,	-26]
+    [x+410,	  y,    64,    43,    -32,	-22]
+    [x+490,   y,    69,    39,    -35,	-20]
+    [x+570,	  y,    64,    31,    -32,	-16]
+}  
+
+template tp_B747_400(x, y) {                              
+    [x,       y,    66,    32,    -33,  -16]
+    [x+73,	  y,    60,    32,    -30,	-16]
+    [x+138,	  y,    69,    34,    -35,	-17]
+    [x+213,   y,    58,    42,    -29,	-21]
+    [x+278,   y,    64,    43,    -32,	-22]
+    [x+348,	  y,    58,    42,    -29,	-17]
+    [x+413,   y,    69,    34,    -35,	-17]
+    [x+488,	  y,    60,    32,    -30,	-16]
 }