B777-200ER 추가

CoconutKR · Apr 24, 2022 · 9717e07 · 9717e07
1 parent 42c0b15
commit 9717e07
Show file tree

Hide file tree

Showing 15 changed files with 114 additions and 137 deletions.
diff --git a/lang/english.lng b/lang/english.lng
@@ -4,9 +4,11 @@
 STR_GRF_NAME                                        :Korean Airliners Set
 STR_GRF_NAME_WITH_VER                               :Korean Airliners Set {VERSION}
 STR_GRF_DESC                                        :{BLACK}Korean Airliners Set adds Airliners of korea. This NewGRF has been modified based on the World Airliners Set.{}Most graphics originally from PikkaBirds AV8 Set or WAS.{}(Updated: {RECENT_UPDATED}){}{SILVER}+ Author: GBLINER
+
 # Aircraft name
 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_A321_200_NAME                                   :[KAS] Airbus A321-200
 STR_A330_300_NAME                                   :[KAS] Airbus A330-300
 
@@ -30,6 +32,10 @@ STR_REFIT_LIVERY_Airbus_A330_300_default            :(Manufacturers)
 STR_REFIT_LIVERY_Airbus_A330_300_korean             :(KOREAN AIR)
 STR_REFIT_LIVERY_Airbus_A330_300_asiana             :(ASIANA AIRLINES)
 STR_REFIT_LIVERY_Airbus_A330_300_tway               :(T'way Air)
+STR_REFIT_LIVERY_Boeing_777_200ER_default           :(Manufacturers)
+STR_REFIT_LIVERY_Boeing_777_200ER_korean            :(KOREAN AIR)
+STR_REFIT_LIVERY_Boeing_777_200ER_asiana            :(ASIANA AIRLINES)
+STR_REFIT_LIVERY_Boeing_777_200ER_jin               :(JIN AIR)
 
 # Errors
 STR_ERROR_NO_ATTACH                                 :You can't attach this car here
diff --git a/lang/korean.lng b/lang/korean.lng
@@ -8,6 +8,7 @@ STR_GRF_DESC                                        :{BLACK}한국 항공기 세
 # Aircraft name
 STR_B737_800_NAME                                   :[KAS] 보잉 737-800
 STR_B737_800BCF_NAME                                :[KAS] 보잉 737-800 BCF
+STR_B777_200ER_NAME                                 :[KAS] 보잉 777-200ER
 STR_A321_200_NAME                                   :[KAS] 에어버스 A321-200
 STR_A330_300_NAME                                   :[KAS] 에어버스 A330-300
 
@@ -31,6 +32,10 @@ STR_REFIT_LIVERY_Airbus_A330_300_default            :(제조사)
 STR_REFIT_LIVERY_Airbus_A330_300_korean             :(대한항공)
 STR_REFIT_LIVERY_Airbus_A330_300_asiana             :(아시아나항공)
 STR_REFIT_LIVERY_Airbus_A330_300_tway               :(티웨이항공)
+STR_REFIT_LIVERY_Boeing_777_200ER_default           :(제조사)
+STR_REFIT_LIVERY_Boeing_777_200ER_korean            :(대한항공)
+STR_REFIT_LIVERY_Boeing_777_200ER_asiana            :(아시아나항공)
+STR_REFIT_LIVERY_Boeing_777_200ER_jin               :(진에어)
 
 # Errors
 STR_ERROR_NO_ATTACH                                 :여기에 이 차량을 붙일 수 없습니다
diff --git a/src/Aircraft/Airbus/A330_300/A330_300.pnml b/src/Aircraft/Airbus/A330_300/A330_300.pnml
@@ -12,7 +12,7 @@ A321-200
 --------------------------------------------------------------------*/
 item(FEAT_AIRCRAFT, A330_300){
     property {
-        name:                           string(STR_A330_300_NAME, 7004);
+        name:                           string(STR_A330_300_NAME, 7005);
         climates_available:             ALL_CLIMATES;
         introduction_date:              date(1994, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_LARGE;

diff --git a/src/Aircraft/Boeing/B777-200ER/B777_200ER_graphic.pnml b/src/Aircraft/Boeing/B777-200ER/B777_200ER_graphic.pnml
diff --git a/src/Aircraft/Boeing/B777-200ER/B777_200ER_switch.pnml b/src/Aircraft/Boeing/B777-200ER/B777_200ER_switch.pnml
diff --git a/...Aircraft/Boeing/B777-200ER/B777_200ER.png → ...Aircraft/Boeing/B777_200ER/B777_200ER.png b/...Aircraft/Boeing/B777-200ER/B777_200ER.png → ...Aircraft/Boeing/B777_200ER/B777_200ER.png
diff --git a/...ircraft/Boeing/B777-200ER/B777_200ER.pnml → ...ircraft/Boeing/B777_200ER/B777_200ER.pnml b/...ircraft/Boeing/B777-200ER/B777_200ER.pnml → ...ircraft/Boeing/B777_200ER/B777_200ER.pnml
@@ -2,24 +2,24 @@
 B737-800
 --------------------------------------------------------------------*/
 // Graphics
-#include "B737_800_graphic.pnml"
+#include "B777_200ER_graphic.pnml"
 
 // Switch
-#include "B737_800_switch.pnml"
+#include "B777_200ER_switch.pnml"
 
 /*--------------------------------------------------------------------
 항공기정보
 --------------------------------------------------------------------*/
-item(FEAT_AIRCRAFT, B737_800){
+item(FEAT_AIRCRAFT, B777_200ER){
     property {
-        name:                           string(STR_B737_800_NAME, 7001);
+        name:                           string(STR_B777_200ER_NAME, 7004);
         climates_available:             ALL_CLIMATES;
-        introduction_date:              date(1998, 1, 1);
-        aircraft_type:                  AIRCRAFT_TYPE_SMALL;
+        introduction_date:              date(1997, 1, 1);
+        aircraft_type:                  AIRCRAFT_TYPE_LARGE;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
 
         //spec
-        speed:                          965km/h;
+        speed:                          939km/h;
 
         //Model
         model_life:                     VEHICLE_NEVER_EXPIRES;
@@ -28,8 +28,8 @@ item(FEAT_AIRCRAFT, B737_800){
         reliability_decay:              0;
 
         //Cargo
-        passenger_capacity:             189;
-        mail_capacity:                  19;    
+        passenger_capacity:             400;
+        mail_capacity:                  40;    
         acceleration:                   27; 
         refittable_cargo_classes:       NO_CARGO_CLASS;
         non_refittable_cargo_classes:   NO_CARGO_CLASS;
@@ -44,11 +44,11 @@ item(FEAT_AIRCRAFT, B737_800){
         }
 
     graphics {
-        default:                        sw_B737_800;
-        purchase:                       sw_B737_800_purchase;
-        loading_speed:                  25;
-        cost_factor:                    300;
+        default:                        sw_B777_200ER;
+        purchase:                       sw_B777_200ER_purchase;
+        loading_speed:                  26;
+        cost_factor:                    890;
         running_cost_factor:            1000;
-        cargo_subtype_text:             sw_Boeing_737_800_cargo_subtype_text;
+        cargo_subtype_text:             sw_Boeing_777_200ER_cargo_subtype_text;
         }
 }
diff --git a/...t/Boeing/B777-200ER/B777_200ER_Asiana.png → ...t/Boeing/B777_200ER/B777_200ER_Asiana.png b/...t/Boeing/B777-200ER/B777_200ER_Asiana.png → ...t/Boeing/B777_200ER/B777_200ER_Asiana.png
diff --git a/...raft/Boeing/B777-200ER/B777_200ER_Jin.png → ...raft/Boeing/B777_200ER/B777_200ER_Jin.png b/...raft/Boeing/B777-200ER/B777_200ER_Jin.png → ...raft/Boeing/B777_200ER/B777_200ER_Jin.png
diff --git a/...t/Boeing/B777-200ER/B777_200ER_Korean.png → ...t/Boeing/B777_200ER/B777_200ER_Korean.png b/...t/Boeing/B777-200ER/B777_200ER_Korean.png → ...t/Boeing/B777_200ER/B777_200ER_Korean.png
diff --git a/src/Aircraft/Boeing/B777_200ER/B777_200ER_graphic.pnml b/src/Aircraft/Boeing/B777_200ER/B777_200ER_graphic.pnml
@@ -0,0 +1,53 @@
+/*--------------------------------------------------------------------
+Graphics
+--------------------------------------------------------------------*/
+
+/*--------------------------------------------------------------------
+구매정보
+--------------------------------------------------------------------*/
+spriteset(set_B777_200ER_purchase, "src\Aircraft\Boeing\B777_200ER\B777_200ER.png"){
+    tmpl_B777_200ER_purchase(0, 0)
+}
+
+/*--------------------------------------------------------------------
+1. 보잉 777-200ER 제조사
+--------------------------------------------------------------------*/
+
+spriteset(set_B777_200ER, "src\Aircraft\Boeing\B777_200ER\B777_200ER.png"){
+    tp_B777_200ER(0, 0)
+}
+
+/*--------------------------------------------------------------------
+2. 보잉 777-200ER 대한항공
+--------------------------------------------------------------------*/
+
+spriteset(set_B777_200ER_korean, "src\Aircraft\Boeing\B777_200ER\B777_200ER_Korean.png"){
+    tp_B777_200ER(0, 0)
+}
+
+/*--------------------------------------------------------------------
+3. 보잉 777-200ER 아시아나항공
+--------------------------------------------------------------------*/
+
+spriteset(set_B777_200ER_asiana, "src\Aircraft\Boeing\B777_200ER\B777_200ER_Asiana.png"){
+    tp_B777_200ER(0, 0)
+}
+
+/*--------------------------------------------------------------------
+4. 보잉 777-200ER 진에어
+--------------------------------------------------------------------*/
+
+spriteset(set_B777_200ER_jin, "src\Aircraft\Boeing\B777_200ER\B777_200ER.png"){
+    tp_B777_200ER(0, 0)
+}
+
+alternative_sprites(set_B777_200ER_jin, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src\Aircraft\Boeing\B777_200ER\B777_200ER_Jin.png"){
+    tp_B777_200ER(0, 0)
+}
+
+/*--------------------------------------------------------------------
+구매정보
+--------------------------------------------------------------------*/
+switch(FEAT_TRAINS, SELF, sw_B777_200ER_purchase, cargo_subtype) {
+    set_B777_200ER_purchase;
+}
diff --git a/src/Aircraft/Boeing/B777_200ER/B777_200ER_switch.pnml b/src/Aircraft/Boeing/B777_200ER/B777_200ER_switch.pnml
@@ -0,0 +1,18 @@
+/*--------------------------------------------------------------------
+스위치
+--------------------------------------------------------------------*/
+switch(FEAT_AIRCRAFT, SELF, sw_Boeing_777_200ER_cargo_subtype_text, cargo_subtype) {
+    1: return string(STR_REFIT_LIVERY_Boeing_777_200ER_default);   // 제조사
+    2: return string(STR_REFIT_LIVERY_Boeing_777_200ER_korean);      // 대한항공
+    3: return string(STR_REFIT_LIVERY_Boeing_777_200ER_asiana);      // 아시아나항공
+    4: return string(STR_REFIT_LIVERY_Boeing_777_200ER_jin);       // 진에어
+    return string(STR_REFIT_LIVERY_Boeing_777_200ER_default);
+}
+
+switch(FEAT_AIRCRAFT, SELF, sw_B777_200ER, cargo_subtype) {
+    1: set_B777_200ER;        // 제조사
+    2: set_B777_200ER_korean;   // 대한항공
+    3: set_B777_200ER_asiana;   // 아시아나항공
+    4: set_B777_200ER_jin;    // 진에어
+    set_B777_200ER;
+}
diff --git a/src/Aircraft_list.pnml b/src/Aircraft_list.pnml
@@ -2,7 +2,8 @@
 
 #include "Aircraft/Boeing/B737_800/B737_800.pnml"          //7001
 #include "Aircraft/Boeing/B737_800BCF/B737_800BCF.pnml"    //7003
+#include "Aircraft/Boeing/B777_200ER/B777_200ER.pnml"      //7004
 #include "Aircraft/Airbus/A321_200/A321_200.pnml"          //7002
-#include "Aircraft/Airbus/A330_300/A330_300.pnml"          //7004
+#include "Aircraft/Airbus/A330_300/A330_300.pnml"          //7005
 
 // Sorting
diff --git a/src/template/Aircraft_template.pnml b/src/template/Aircraft_template.pnml
@@ -32,4 +32,15 @@ template tp_A330_300(x, y) {
     [x+349,   y,    59,    40,    -30,  -20]
     [x+414,   y,    69,    34,    -35,  -17]
     [x+489,   y,    59,    30,    -30,  -15]
+}
+
+template tp_B777_200ER(x, y) {
+    [x,       y,    58,    29,    -29,  -15]
+    [x+64,    y,    51,    26,    -26,  -13]
+    [x+119,   y,    62,    29,    -31,  -15]
+    [x+189,   y,    51,    37,    -26,  -19]
+    [x+244,   y,    58,    41,    -29,  -21]
+    [x+309,   y,    51,    37,    -26,  -19]
+    [x+364,   y,    62,    29,    -31,  -15]
+    [x+429,   y,    51,    26,    -26,  -13]
 }
diff --git a/src/template/purchase.pnml b/src/template/purchase.pnml
@@ -20,4 +20,8 @@ template tmpl_A321_200_purchase(x, y) {
 
 template tmpl_A330_300_purchase(x, y) {
     tmpl_purchase_detail(x+414, y, 69, 34, -35, -17)
+}
+
+template tmpl_B777_200ER_purchase(x, y) {
+    tmpl_purchase_detail(x+364, y, 62, 29, -31, -15)
 }