Fix: All

CoconutKR · Aug 1, 2024 · 0db2f7a · 0db2f7a
1 parent b3d82b7
commit 0db2f7a
Show file tree

Hide file tree

Showing 39 changed files with 403 additions and 16 deletions.
diff --git a/lang/english.lng b/lang/english.lng
@@ -69,6 +69,7 @@ STR_B747_SP_NAME                                    :[AWAS] Boeing 747SP
 STR_B747_300_NAME                                   :[AWAS] Boeing 747-300
 STR_B747_300M_NAME                                  :[AWAS] Boeing 747-300M
 STR_B747_300SF_NAME                                 :[AWAS] Boeing 747-300SF
+STR_B747_300SR_NAME                                 :[AWAS] Boeing 747-300SR
 STR_B747_400_NAME                                   :[AWAS] Boeing 747-400
 STR_B747_400M_NAME                                  :[AWAS] Boeing 747-400M
 STR_B747_400D_NAME                                  :[AWAS] Boeing 747-400D

diff --git a/lang/korean.lng b/lang/korean.lng
@@ -70,6 +70,7 @@ STR_B747_SP_NAME                                    :[AWAS] 보잉 747SP
 STR_B747_300_NAME                                   :[AWAS] 보잉 747-300
 STR_B747_300M_NAME                                  :[AWAS] 보잉 747-300M
 STR_B747_300SF_NAME                                 :[AWAS] 보잉 747-300SF
+STR_B747_300SR_NAME                                 :[AWAS] 보잉 747-300SR
 STR_B747_400_NAME                                   :[AWAS] 보잉 747-400
 STR_B747_400M_NAME                                  :[AWAS] 보잉 747-400M
 STR_B747_400D_NAME                                  :[AWAS] 보잉 747-400D

diff --git a/src/Aircraft/Airbus/A320/A318_100/A318_100.pnml b/src/Aircraft/Airbus/A320/A318_100/A318_100.pnml
@@ -17,7 +17,6 @@ item(FEAT_AIRCRAFT, A318_100, 7015){
         introduction_date:              date(2003, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_SMALL;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-        variant_group:                  A320_100;
 
         //spec
         speed:                          901km/h;

diff --git a/src/Aircraft/Airbus/A320/A319_100/A319_100.pnml b/src/Aircraft/Airbus/A320/A319_100/A319_100.pnml
@@ -17,7 +17,7 @@ item(FEAT_AIRCRAFT, A319_100, 7016){
         introduction_date:              date(1996, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_SMALL;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-        variant_group:                  A320_100;
+        variant_group:                  A318_100;
 
         //spec
         speed:                          901km/h;

diff --git a/src/Aircraft/Airbus/A320/A319neo/A319neo.pnml b/src/Aircraft/Airbus/A320/A319neo/A319neo.pnml
@@ -17,7 +17,7 @@ item(FEAT_AIRCRAFT, A319neo, 7017){
         introduction_date:              date(2021, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_SMALL;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-        variant_group:                  A320_100;
+        variant_group:                  A318_100;
 
         //spec
         speed:                          901km/h;

diff --git a/src/Aircraft/Airbus/A320/A320_100/A320_100.pnml b/src/Aircraft/Airbus/A320/A320_100/A320_100.pnml
@@ -17,6 +17,7 @@ item(FEAT_AIRCRAFT, A320_100, 7020){
         introduction_date:              date(1988, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_SMALL;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
+        variant_group:                  A318_100;
 
         //spec
         speed:                          901km/h;

diff --git a/src/Aircraft/Airbus/A320/A320_200/A320_200.pnml b/src/Aircraft/Airbus/A320/A320_200/A320_200.pnml
@@ -17,7 +17,7 @@ item(FEAT_AIRCRAFT, A320_200, 7007){
         introduction_date:              date(1987, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_SMALL;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-        variant_group:                  A320_100;
+        variant_group:                  A318_100;
 
         //spec
         speed:                          901km/h;

diff --git a/src/Aircraft/Airbus/A320/A320neo/A320neo.pnml b/src/Aircraft/Airbus/A320/A320neo/A320neo.pnml
@@ -17,7 +17,7 @@ item(FEAT_AIRCRAFT, A320neo, 7018){
         introduction_date:              date(2014, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_SMALL;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-        variant_group:                  A320_100;
+        variant_group:                  A318_100;
 
         //spec
         speed:                          901km/h;

diff --git a/src/Aircraft/Airbus/A320/A321LR/A321LR.pnml b/src/Aircraft/Airbus/A320/A321LR/A321LR.pnml
@@ -17,7 +17,7 @@ item(FEAT_AIRCRAFT, A321LR, 7022){
         introduction_date:              date(2018, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_SMALL;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-        variant_group:                  A320_100;
+        variant_group:                  A318_100;
 
         //spec
         speed:                          901km/h;

diff --git a/src/Aircraft/Airbus/A320/A321_100/A321_100.pnml b/src/Aircraft/Airbus/A320/A321_100/A321_100.pnml
@@ -17,7 +17,7 @@ item(FEAT_AIRCRAFT, A321_100, 7021){
         introduction_date:              date(1994, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_SMALL;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-        variant_group:                  A320_100;
+        variant_group:                  A318_100;
 
         //spec
         speed:                          901km/h;

diff --git a/src/Aircraft/Airbus/A320/A321_200/A321_200.pnml b/src/Aircraft/Airbus/A320/A321_200/A321_200.pnml
@@ -17,7 +17,7 @@ item(FEAT_AIRCRAFT, A321_200, 7002){
         introduction_date:              date(1994, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_SMALL;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-        variant_group:                  A320_100;
+        variant_group:                  A318_100;
 
         //spec
         speed:                          901km/h;

diff --git a/src/Aircraft/Airbus/A320/A321neo/A321neo.pnml b/src/Aircraft/Airbus/A320/A321neo/A321neo.pnml
@@ -17,7 +17,7 @@ item(FEAT_AIRCRAFT, A321neo, 7019){
         introduction_date:              date(2016, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_SMALL;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-        variant_group:                  A320_100;
+        variant_group:                  A318_100;
 
         //spec
         speed:                          901km/h;

diff --git a/src/Aircraft/Airbus/A330/A330_200/A330_200.pnml b/src/Aircraft/Airbus/A330/A330_200/A330_200.pnml
@@ -17,7 +17,6 @@ item(FEAT_AIRCRAFT, A330_200, 7024){
         introduction_date:              date(1992, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_LARGE;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-        variant_group:                  A330_300;
 
         //spec
         speed:                          913km/h;

diff --git a/src/Aircraft/Airbus/A330/A330_200F/A330_200F.pnml b/src/Aircraft/Airbus/A330/A330_200F/A330_200F.pnml
@@ -17,7 +17,7 @@ item(FEAT_AIRCRAFT, A330_200F, 7025){
         introduction_date:              date(1992, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_LARGE;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-        variant_group:                  A330_300;
+        variant_group:                  A330_200;
 
         //spec
         speed:                          913km/h;

diff --git a/src/Aircraft/Airbus/A330/A330_300/A330_300.pnml b/src/Aircraft/Airbus/A330/A330_300/A330_300.pnml
@@ -17,6 +17,7 @@ item(FEAT_AIRCRAFT, A330_300, 7005){
         introduction_date:              date(1994, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_LARGE;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
+        variant_group:                  A330_200;
 
         //spec
         speed:                          913km/h;

diff --git a/src/Aircraft/Airbus/A330/A330_800/A330_800.pnml b/src/Aircraft/Airbus/A330/A330_800/A330_800.pnml
@@ -17,7 +17,7 @@ item(FEAT_AIRCRAFT, A330_800, 7026){
         introduction_date:              date(2018, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_LARGE;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-        variant_group:                  A330_300;
+        variant_group:                  A330_200;
 
         //spec
         speed:                          913km/h;

diff --git a/src/Aircraft/Airbus/A330/A330_900/A330_900.pnml b/src/Aircraft/Airbus/A330/A330_900/A330_900.pnml
@@ -17,7 +17,7 @@ item(FEAT_AIRCRAFT, A330_900, 7027){
         introduction_date:              date(2018, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_LARGE;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-        variant_group:                  A330_300;
+        variant_group:                  A330_200;
 
         //spec
         speed:                          913km/h;

diff --git a/src/Aircraft/Airbus/A340/A340_200/A340_200.pnml b/src/Aircraft/Airbus/A340/A340_200/A340_200.pnml
@@ -17,7 +17,6 @@ item(FEAT_AIRCRAFT, A340_200, 7033){
         introduction_date:              date(1992, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_LARGE;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-        variant_group:                  A340_300;
 
         //spec
         speed:                          902km/h;

diff --git a/src/Aircraft/Airbus/A340/A340_300/A340_300.pnml b/src/Aircraft/Airbus/A340/A340_300/A340_300.pnml
@@ -17,6 +17,7 @@ item(FEAT_AIRCRAFT, A340_300, 7032){
         introduction_date:              date(1992, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_LARGE;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
+        variant_group:                  A340_200;
 
         //spec
         speed:                          902km/h;

diff --git a/src/Aircraft/Airbus/A340/A340_500/A340_500.pnml b/src/Aircraft/Airbus/A340/A340_500/A340_500.pnml
@@ -17,7 +17,7 @@ item(FEAT_AIRCRAFT, A340_500, 7031){
         introduction_date:              date(2002, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_LARGE;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-        variant_group:                  A340_300;
+        variant_group:                  A340_200;
 
         //spec
         speed:                          902km/h;

diff --git a/src/Aircraft/Airbus/A340/A340_600/A340_600.pnml b/src/Aircraft/Airbus/A340/A340_600/A340_600.pnml
@@ -17,7 +17,7 @@ item(FEAT_AIRCRAFT, A340_600, 7030){
         introduction_date:              date(2002, 1, 1);
         aircraft_type:                  AIRCRAFT_TYPE_LARGE;
         sprite_id:                      SPRITE_ID_NEW_AIRCRAFT;
-        variant_group:                  A340_300;
+        variant_group:                  A340_200;
 
         //spec
         speed:                          902km/h;

diff --git a/src/Aircraft/Boeing/B747/B747_300/B747_300.png b/src/Aircraft/Boeing/B747/B747_300/B747_300.png
diff --git a/src/Aircraft/Boeing/B747/B747_300/B747_300.pnml b/src/Aircraft/Boeing/B747/B747_300/B747_300.pnml
@@ -0,0 +1,55 @@
+/*--------------------------------------------------------------------
+B747-300
+--------------------------------------------------------------------*/
+// Graphics
+#include "B747_300_graphic.pnml"
+
+// Switch
+#include "B747_300_switch.pnml"
+
+/*--------------------------------------------------------------------
+Aircraft info
+--------------------------------------------------------------------*/
+item(FEAT_AIRCRAFT, B747_300, 7094){
+    property {
+        name:                           string(STR_B747_300_NAME);
+        climates_available:             ALL_CLIMATES;
+        introduction_date:              date(1981, 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:             412;
+        mail_capacity:                  50;    
+        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_JET;
+        }
+
+    graphics {
+        default:                        sw_B747_300;
+        purchase:                       sw_B747_300_purchase;
+        loading_speed:                  26;
+        cost_factor:                    1150;
+        running_cost_factor:            120;
+        cargo_subtype_text:             sw_Boeing_747_300_cargo_subtype_text;
+        }
+}
diff --git a/src/Aircraft/Boeing/B747/B747_300/B747_300_graphic.pnml b/src/Aircraft/Boeing/B747/B747_300/B747_300_graphic.pnml
@@ -0,0 +1,25 @@
+/*--------------------------------------------------------------------
+Graphics
+--------------------------------------------------------------------*/
+
+/*--------------------------------------------------------------------
+구매정보
+--------------------------------------------------------------------*/
+spriteset(set_B747_300_purchase, "src\Aircraft\Boeing\B747\B747_300\B747_300.png"){
+    tmpl_B747_100_purchase(0, 0)
+}
+
+/*--------------------------------------------------------------------
+1. Boeing 747-300 Manufacturer
+--------------------------------------------------------------------*/
+
+spriteset(set_B747_300, "src\Aircraft\Boeing\B747\B747_300\B747_300.png"){
+    tp_B747_100(0, 0)
+}
+
+/*--------------------------------------------------------------------
+구매정보
+--------------------------------------------------------------------*/
+switch(FEAT_TRAINS, SELF, sw_B747_300_purchase, cargo_subtype) {
+    set_B747_300_purchase;
+}
diff --git a/src/Aircraft/Boeing/B747/B747_300/B747_300_switch.pnml b/src/Aircraft/Boeing/B747/B747_300/B747_300_switch.pnml
@@ -0,0 +1,14 @@
+/*--------------------------------------------------------------------
+스위치
+--------------------------------------------------------------------*/
+switch(FEAT_AIRCRAFT, SELF, sw_Boeing_747_300_cargo_subtype_text, cargo_subtype) {
+    1: return string(STR_REFIT_LIVERY_Boeing);   // 제조사
+    2: return string(STR_REFIT_LIVERY_Boeing);      // 대한항공
+    return string(STR_REFIT_LIVERY_Boeing);
+}
+
+switch(FEAT_AIRCRAFT, SELF, sw_B747_300, cargo_subtype) {
+    1: set_B747_300;        // 제조사
+    2: set_B747_300;   // 대한항공
+    set_B747_300;
+}
diff --git a/src/Aircraft/Boeing/B747/B747_300M/B747_300M.png b/src/Aircraft/Boeing/B747/B747_300M/B747_300M.png
diff --git a/src/Aircraft/Boeing/B747/B747_300M/B747_300M.pnml b/src/Aircraft/Boeing/B747/B747_300M/B747_300M.pnml
@@ -0,0 +1,55 @@
+/*--------------------------------------------------------------------
+B747-300M
+--------------------------------------------------------------------*/
+// Graphics
+#include "B747_300M_graphic.pnml"
+
+// Switch
+#include "B747_300M_switch.pnml"
+
+/*--------------------------------------------------------------------
+Aircraft info
+--------------------------------------------------------------------*/
+item(FEAT_AIRCRAFT, B747_300M, 7095){
+    property {
+        name:                           string(STR_B747_300M_NAME);
+        climates_available:             ALL_CLIMATES;
+        introduction_date:              date(1981, 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:             245;
+        mail_capacity:                  200;    
+        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_JET;
+        }
+
+    graphics {
+        default:                        sw_B747_300M;
+        purchase:                       sw_B747_300M_purchase;
+        loading_speed:                  26;
+        cost_factor:                    1150;
+        running_cost_factor:            120;
+        cargo_subtype_text:             sw_Boeing_747_300M_cargo_subtype_text;
+        }
+}
diff --git a/src/Aircraft/Boeing/B747/B747_300M/B747_300M_graphic.pnml b/src/Aircraft/Boeing/B747/B747_300M/B747_300M_graphic.pnml
@@ -0,0 +1,25 @@
+/*--------------------------------------------------------------------
+Graphics
+--------------------------------------------------------------------*/
+
+/*--------------------------------------------------------------------
+구매정보
+--------------------------------------------------------------------*/
+spriteset(set_B747_300M_purchase, "src\Aircraft\Boeing\B747\B747_300M\B747_300M.png"){
+    tmpl_B747_100_purchase(0, 0)
+}
+
+/*--------------------------------------------------------------------
+1. Boeing 747-300M Manufacturer
+--------------------------------------------------------------------*/
+
+spriteset(set_B747_300M, "src\Aircraft\Boeing\B747\B747_300M\B747_300M.png"){
+    tp_B747_100(0, 0)
+}
+
+/*--------------------------------------------------------------------
+구매정보
+--------------------------------------------------------------------*/
+switch(FEAT_TRAINS, SELF, sw_B747_300M_purchase, cargo_subtype) {
+    set_B747_300M_purchase;
+}
diff --git a/src/Aircraft/Boeing/B747/B747_300M/B747_300M_switch.pnml b/src/Aircraft/Boeing/B747/B747_300M/B747_300M_switch.pnml
@@ -0,0 +1,14 @@
+/*--------------------------------------------------------------------
+스위치
+--------------------------------------------------------------------*/
+switch(FEAT_AIRCRAFT, SELF, sw_Boeing_747_300M_cargo_subtype_text, cargo_subtype) {
+    1: return string(STR_REFIT_LIVERY_Boeing);   // 제조사
+    2: return string(STR_REFIT_LIVERY_Boeing);      // 대한항공
+    return string(STR_REFIT_LIVERY_Boeing);
+}
+
+switch(FEAT_AIRCRAFT, SELF, sw_B747_300M, cargo_subtype) {
+    1: set_B747_300M;        // 제조사
+    2: set_B747_300M;   // 대한항공
+    set_B747_300M;
+}
diff --git a/src/Aircraft/Boeing/B747/B747_300SF/B747_300SF.png b/src/Aircraft/Boeing/B747/B747_300SF/B747_300SF.png