DC-9-30

CoconutKR · Sep 11, 2022 · 1aa345f · 1aa345f
1 parent de4a2ed
commit 1aa345f
Show file tree

Hide file tree

Showing 13 changed files with 131 additions and 2 deletions.
diff --git a/Korean_Airliners_Set.pnml b/Korean_Airliners_Set.pnml
@@ -8,8 +8,8 @@ grf {
 	grfid: "KARS";
 	name: string(STR_GRF_NAME_WITH_VER);
 	desc: string(STR_GRF_DESC);
-	version: 20220812;
-	min_compatible_version: 3;
+	version: 20220911;
+	min_compatible_version: 20220812;
 }
 
 // 화물테이블

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,3 +1,8 @@
+2022.09.11
+-----
+* 항공기 추가 <맥도넬 더글라스 DC-9-30>
+* 도색 추가 <맥도넬 더글라스 DC-9-30> 대한항공 도장
+
 2022.08.11
 -----
 * 항공기 추가 <보잉 787-9>

diff --git a/lang/english.lng b/lang/english.lng
@@ -14,6 +14,7 @@ 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_ATR_72_500_NAME                                 :[KAS] ATR 72-500
+STR_DC_9_30_NAME                                    :[KAS] McDonnell Douglas DC-9-30
 
 # Parameters
 
@@ -50,6 +51,8 @@ STR_REFIT_LIVERY_ATR_72_500_default                 :(Manufacturers)
 STR_REFIT_LIVERY_ATR_72_500_hiair_b                 :(Hi Air - Blue Livery)
 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)
 
 # Errors
 STR_ERROR_NO_ATTACH                                 :You can't attach this car here
diff --git a/lang/korean.lng b/lang/korean.lng
@@ -14,6 +14,7 @@ STR_A320_200_NAME                                   :[KAS] 에어버스 A320-200
 STR_A321_200_NAME                                   :[KAS] 에어버스 A321-200
 STR_A330_300_NAME                                   :[KAS] 에어버스 A330-300
 STR_ATR_72_500_NAME                                 :[KAS] ATR 72-500
+STR_DC_9_30_NAME                                    :[KAS] 맥도넬 더글라스 DC-9-30
 
 # Parameters
 
@@ -50,6 +51,8 @@ STR_REFIT_LIVERY_ATR_72_500_default                 :(제조사)
 STR_REFIT_LIVERY_ATR_72_500_hiair_b                 :(하이에어 - 파랑)
 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                     :(대한항공)
 
 # Errors
 STR_ERROR_NO_ATTACH                                 :여기에 이 차량을 붙일 수 없습니다
diff --git a/src/Aircraft/McDonnellDouglas/DC_9_30/DC_9_30.png b/src/Aircraft/McDonnellDouglas/DC_9_30/DC_9_30.png
diff --git a/src/Aircraft/McDonnellDouglas/DC_9_30/DC_9_30.pnml b/src/Aircraft/McDonnellDouglas/DC_9_30/DC_9_30.pnml
@@ -0,0 +1,54 @@
+/*--------------------------------------------------------------------
+A321-200
+--------------------------------------------------------------------*/
+// Graphics
+#include "DC_9_30_graphic.pnml"
+
+// Switch
+#include "DC_9_30_switch.pnml"
+
+/*--------------------------------------------------------------------
+항공기정보
+--------------------------------------------------------------------*/
+item(FEAT_AIRCRAFT, DC_9_30, 7009){
+    property {
+        name:                           string(STR_DC_9_30_NAME);
+        climates_available:             ALL_CLIMATES;
+        introduction_date:              date(1965, 1, 1);
+        aircraft_type:                  AIRCRAFT_TYPE_SMALL;
+        sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
+
+        //spec
+        speed:                          913km/h;
+
+        //Model
+        model_life:                     VEHICLE_NEVER_EXPIRES;
+        vehicle_life:                   25;
+        retire_early:                   0;
+        reliability_decay:              0;
+
+        //Cargo
+        passenger_capacity:             115;
+        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);
+        }
+
+    graphics {
+        default:                        sw_DC_9_30;
+        purchase:                       sw_DC_9_30_purchase;
+        loading_speed:                  43;
+        cost_factor:                    830;
+        running_cost_factor:            120;
+        cargo_subtype_text:             sw_DC_9_30_cargo_subtype_text;
+        }
+}
diff --git a/src/Aircraft/McDonnellDouglas/DC_9_30/DC_9_30_graphic.pnml b/src/Aircraft/McDonnellDouglas/DC_9_30/DC_9_30_graphic.pnml
@@ -0,0 +1,33 @@
+/*--------------------------------------------------------------------
+Graphics
+--------------------------------------------------------------------*/
+
+/*--------------------------------------------------------------------
+구매정보
+--------------------------------------------------------------------*/
+spriteset(set_DC_9_30_purchase, "src\Aircraft\McDonnellDouglas\DC_9_30\DC_9_30.png"){
+    tmpl_DC_9_30_purchase(0, 0)
+}
+
+/*--------------------------------------------------------------------
+1. DC-9-30 제조사
+--------------------------------------------------------------------*/
+
+spriteset(set_DC_9_30_default, "src\Aircraft\McDonnellDouglas\DC_9_30\DC_9_30.png"){
+    tp_DC_9_30(0, 0)
+}
+
+/*--------------------------------------------------------------------
+2. DC-9-30 대한항공
+--------------------------------------------------------------------*/
+
+spriteset(set_DC_9_30_korean, "src\Aircraft\McDonnellDouglas\DC_9_30\DC_9_30_korean.png"){
+    tp_DC_9_30(0, 0)
+}
+
+/*--------------------------------------------------------------------
+구매정보
+--------------------------------------------------------------------*/
+switch(FEAT_TRAINS, SELF, sw_DC_9_30_purchase, cargo_subtype) {
+    set_DC_9_30_purchase;
+}
diff --git a/src/Aircraft/McDonnellDouglas/DC_9_30/DC_9_30_korean.png b/src/Aircraft/McDonnellDouglas/DC_9_30/DC_9_30_korean.png
diff --git a/src/Aircraft/McDonnellDouglas/DC_9_30/DC_9_30_switch.pnml b/src/Aircraft/McDonnellDouglas/DC_9_30/DC_9_30_switch.pnml
@@ -0,0 +1,14 @@
+/*--------------------------------------------------------------------
+스위치
+--------------------------------------------------------------------*/
+switch(FEAT_AIRCRAFT, SELF, sw_DC_9_30_cargo_subtype_text, cargo_subtype) {
+    1: return string(STR_REFIT_LIVERY_DC_9_30_default);   // 제조사
+    2: return string(STR_REFIT_LIVERY_DC_9_30_korean);     // 대한항공
+    return string(STR_REFIT_LIVERY_DC_9_30_default);
+}
+
+switch(FEAT_AIRCRAFT, SELF, sw_DC_9_30, cargo_subtype) {
+    1: set_DC_9_30_default;        // 제조사
+    2: set_DC_9_30_korean;        // 대한항공
+    set_DC_9_30_default;
+}
diff --git a/src/Aircraft_list.pnml b/src/Aircraft_list.pnml
@@ -8,6 +8,7 @@
 #include "Aircraft/Boeing/B787_9/B787_9.pnml"              //7006
 #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
 
 // Sorting
 #include "sort.pnml"
diff --git a/src/sort.pnml b/src/sort.pnml
@@ -11,5 +11,6 @@ A320_200,           //7007
 A321_200,           //7002
 A330_300,           //7005
 ATR_72_500,         //7008
+DC_9_30,            //7009
 
     ]);
diff --git a/src/template/Aircraft_template.pnml b/src/template/Aircraft_template.pnml
@@ -76,4 +76,15 @@ template tp_ATR_72_500(x, y) {
     [x+239,	  y,    41,    29,    -21,	-15]
     [x+282,   y,    50,    23,    -25,	-12]
     [x+335,	  y,    40,    20,    -20,	-10]
+}  
+
+template tp_DC_9_30(x, y) {                              
+    [x,       y,    34,    19,    -17,  -10]
+    [x+40,	  y,    38,    17,    -20,	-9]
+    [x+85,	  y,    46,    20,    -24,	-10]
+    [x+135,   y,    37,    28,    -19,	-14]
+    [x+180,   y,    33,    32,    -17,	-16]
+    [x+220,	  y,    37,    29,    -19,	-15]
+    [x+260,   y,    46,    20,    -24,	-10]
+    [x+310,	  y,    37,    17,    -20,	-9]
 }  
diff --git a/src/template/purchase.pnml b/src/template/purchase.pnml
@@ -36,4 +36,8 @@ template tmpl_A320_200_purchase(x, y) {
 
 template tmpl_ATR_72_500_purchase(x, y) {
     tmpl_purchase_detail(x+282, y, 50, 23, -25,	-12)
+}
+
+template tmpl_DC_9_30_purchase(x, y) {
+    tmpl_purchase_detail(x+260, y, 46, 20, -24,	-10)
 }