Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lang/english.lng
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@ STR_REFIT_LIVERY_Singaporeairlinescargo_old1987 :{DKBLUE}(SINGAPORE AIRLINES
STR_REFIT_LIVERY_Singaporeairlinescargo_old1972 :{DKBLUE}(SINGAPORE AIRLINES CARGO / 1972~1987 Livery)
STR_REFIT_LIVERY_Garudaindonesia :(Garuda Indonesia)
STR_REFIT_LIVERY_Airindia :(AIR INDIA)
STR_REFIT_LIVERY_PIA :(PIA)

# Liveries (Middle East)

Expand All @@ -431,7 +432,9 @@ STR_REFIT_LIVERY_Americanairlines_old1968 :{SILVER}(American Airlines
STR_REFIT_LIVERY_Americanairlines_old1964 :{SILVER}(American Airlines / 1964~1968 Livery)
STR_REFIT_LIVERY_Americanairlines_old1934 :{SILVER}(American Airlines / 1934~1964 Livery)
STR_REFIT_LIVERY_Aircanada :(AIR CANADA)
STR_REFIT_LIVERY_Aircanada_retro :(AIR CANADA (retro))
STR_REFIT_LIVERY_Aeromexico :(AEROMEXICO)
STR_REFIT_LIVERY_Westjet :(Westjet)

# Liveries (South America)

Expand Down Expand Up @@ -472,6 +475,7 @@ STR_REFIT_LIVERY_TAP :(TAP)
STR_REFIT_LIVERY_Vueling :(Vueling)
STR_REFIT_LIVERY_Wizzair :(Wizz Air)
STR_REFIT_LIVERY_Ryanair :(Ryanair)
STR_REFIT_LIVERY_Sabena :(Sabena)

# Liveries (Oceania, Africa)

Expand Down
3 changes: 3 additions & 0 deletions lang/korean.lng
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ STR_REFIT_LIVERY_Singaporeairlinescargo_old1987 :(싱가포르항공 카고
STR_REFIT_LIVERY_Singaporeairlinescargo_old1972 :(싱가포르항공 카고 / 1972~1987년 도장)
STR_REFIT_LIVERY_Garudaindonesia :(가루다 인도네시아)
STR_REFIT_LIVERY_Airindia :(에어 인디아)
STR_REFIT_LIVERY_PIA :(PIA)

# Liveries (Middle East)

Expand All @@ -432,7 +433,9 @@ STR_REFIT_LIVERY_Americanairlines_old1968 :(아메리칸 항공 / 1968
STR_REFIT_LIVERY_Americanairlines_old1964 :(아메리칸 항공 / 1964~1968년 도장)
STR_REFIT_LIVERY_Americanairlines_old1934 :(아메리칸 항공 / 1934~1964년 도장)
STR_REFIT_LIVERY_Aircanada :(에어캐나다)
STR_REFIT_LIVERY_Aircanada_retro :(에어캐나다 (retro))
STR_REFIT_LIVERY_Aeromexico :(아에로멕시코)
STR_REFIT_LIVERY_Westjet :(Westjet)

# Liveries (South America)

Expand Down
16 changes: 16 additions & 0 deletions src/Aircraft/Airbus/A220/A220_300/A220_300_graphic.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,22 @@ spriteset(set_A220_300_airfrance, "src/Aircraft/Airbus/A220/A220_300/AirFrance.p
tp_A220_300(0, 0)
}

/*--------------------------------------------------------------------
4. A220-300 Air Canada
--------------------------------------------------------------------*/

spriteset(set_A220_300_aircanada, "src/Aircraft/Airbus/A220/A220_300/AirCanada.png"){
tp_A220_300(0, 0)
}

/*--------------------------------------------------------------------
4. A220-300 Air Canada (Retro)
--------------------------------------------------------------------*/

spriteset(set_A220_300_aircanada_retro, "src/Aircraft/Airbus/A220/A220_300/AirCanadaRetro.png"){
tp_A220_300(0, 0)
}

/*--------------------------------------------------------------------
구매정보
--------------------------------------------------------------------*/
Expand Down
15 changes: 11 additions & 4 deletions src/Aircraft/Airbus/A220/A220_300/A220_300_switch.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,19 @@ switch(FEAT_AIRCRAFT, SELF, sw_A220_300_cargo_subtype_text, cargo_subtype) {
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
5: return string(STR_REFIT_LIVERY_Aircanada); // Air Canada
6: return string(STR_REFIT_LIVERY_Aircanada_retro); // Air Canada (Retro)

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; // Korean Air
3: set_A220_300_swiss; // Swiss
4: set_A220_300_airfrance; // Air France
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
5: set_A220_300_aircanada; // Air Canada
6: set_A220_300_aircanada_retro; // Air Canada (Retro)
set_A220_300_default;
}

Expand All @@ -28,4 +33,6 @@ switch (FEAT_AIRCRAFT, SELF, sw_A220_300_cargo_subtype_capacity, cargo_subtype)
2: return 140; // Korean Air
3: return 145; // Swiss
4: return 148; // Air France
5: return 137; // Air Canada
6: return 137; // Air Canada (Retro)
}
Binary file added src/Aircraft/Airbus/A220/A220_300/AirCanada.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 10 additions & 9 deletions src/Aircraft/Boeing/B747/B747_300/B747_300.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, B747_300, 7094){
aircraft_type: AIRCRAFT_TYPE_LARGE;
sprite_id: SPRITE_ID_NEW_AIRCRAFT;
variant_group: B747_100;

//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;
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_TAKEOFF_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;
passenger_capacity: sw_B747_300_cargo_subtype_capacity;
name: switch_B747300_name;
}
}
}
17 changes: 15 additions & 2 deletions src/Aircraft/Boeing/B747/B747_300/B747_300_graphic.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,27 @@ spriteset(set_B747_300_purchase, "src/Aircraft/Boeing/B747/B747_300/B747_300.png
/*--------------------------------------------------------------------
1. Boeing 747-300 Manufacturer
--------------------------------------------------------------------*/

spriteset(set_B747_300, "src/Aircraft/Boeing/B747/B747_300/B747_300.png"){
tp_B747_100(0, 0)
}

/*--------------------------------------------------------------------
2. Boeing 747-300 Sabena
--------------------------------------------------------------------*/
spriteset(set_B747_300_Sabena, "src/Aircraft/Boeing/B747/B747_300/Sabena.png"){
tp_B747_100(0, 0)
}

/*--------------------------------------------------------------------
3. Boeing 747-300 PIA
--------------------------------------------------------------------*/
spriteset(set_B747_300_PIA, "src/Aircraft/Boeing/B747/B747_300/PIA.png"){
tp_B747_100(0, 0)
}

/*--------------------------------------------------------------------
구매정보
--------------------------------------------------------------------*/
switch(FEAT_TRAINS, SELF, sw_B747_300_purchase, cargo_subtype) {
set_B747_300_purchase;
}
}
19 changes: 14 additions & 5 deletions src/Aircraft/Boeing/B747/B747_300/B747_300_switch.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,27 @@
스위치
--------------------------------------------------------------------*/
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); // 대한항공
1: return string(STR_REFIT_LIVERY_Boeing); // Manufacturer
2: return string(STR_REFIT_LIVERY_Sabena); // Sabena
3: return string(STR_REFIT_LIVERY_PIA); // PIA
return string(STR_REFIT_LIVERY_Boeing);
}

switch(FEAT_AIRCRAFT, SELF, sw_B747_300, cargo_subtype) {
1: set_B747_300; // 제조사
2: set_B747_300; // 대한항공
1: set_B747_300; // Manufacturer
2: set_B747_300_Sabena; // Sabena
3: set_B747_300_PIA; // PIA
set_B747_300;
}

switch (FEAT_AIRCRAFT, SELF, switch_B747300_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) {
0: return string(STR_B747_FAMILY);
return CB_RESULT_NO_TEXT;
}
}

switch (FEAT_AIRCRAFT, SELF, sw_B747_300_cargo_subtype_capacity, cargo_subtype)
{
1: return 366; // default
2: return 385; // Sabena
3: return 503; // PIA
}
Binary file added src/Aircraft/Boeing/B747/B747_300/PIA.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Aircraft/Boeing/B747/B747_300/Sabena.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 11 additions & 10 deletions src/Aircraft/Boeing/B767/B767_300ER/B767_300ER.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -18,40 +18,41 @@ item(FEAT_AIRCRAFT, B767_300ER, 7068){
aircraft_type: AIRCRAFT_TYPE_LARGE;
sprite_id: SPRITE_ID_NEW_AIRCRAFT;
variant_group: B767_200;

//spec
speed: 939km/h;

//Model
model_life: VEHICLE_NEVER_EXPIRES;
vehicle_life: 30;
retire_early: 0;
reliability_decay: 0;

//Cargo
passenger_capacity: 218;
mail_capacity: 27;
acceleration: 27;
mail_capacity: 27;
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_B767_300ER;
purchase: sw_B767_300ER_purchase;
loading_speed: 26;
cost_factor: 890;
running_cost_factor: 120;
cargo_subtype_text: sw_Boeing_767_300ER_cargo_subtype_text;
cargo_subtype_text: sw_B767_300ER_cargo_subtype_text;
passenger_capacity: sw_B767_300ER_cargo_subtype_capacity;
name: switch_B767300ER_name;
}
}
}
11 changes: 8 additions & 3 deletions src/Aircraft/Boeing/B767/B767_300ER/B767_300ER_graphic.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,22 @@ spriteset(set_B767_300ER_purchase, "src/Aircraft/Boeing/B767/B767_300ER/B767_300
}

/*--------------------------------------------------------------------
1. 보잉 787-9 제조사
1. 767-300ER Manfacturer Livery
--------------------------------------------------------------------*/

spriteset(set_B767_300ER, "src/Aircraft/Boeing/B767/B767_300ER/B767_300ER.png"){
tp_B767_300(0, 0)
}

/*--------------------------------------------------------------------
2. 767-300ER Westjet
--------------------------------------------------------------------*/
spriteset(set_B767_300ER_Westjet, "src/Aircraft/Boeing/B767/B767_300ER/Westjet.png"){
tp_B767_300(0, 0)
}

/*--------------------------------------------------------------------
구매정보
--------------------------------------------------------------------*/
switch(FEAT_TRAINS, SELF, sw_B767_300ER_purchase, cargo_subtype) {
set_B767_300ER_purchase;
}
}
19 changes: 13 additions & 6 deletions src/Aircraft/Boeing/B767/B767_300ER/B767_300ER_switch.pnml
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
/*--------------------------------------------------------------------
스위치
--------------------------------------------------------------------*/
switch(FEAT_AIRCRAFT, SELF, sw_Boeing_767_300ER_cargo_subtype_text, cargo_subtype) {
1: return string(STR_REFIT_LIVERY_Boeing); // 제조사
2: return string(STR_REFIT_LIVERY_Boeing); // 대한항공
switch(FEAT_AIRCRAFT, SELF, sw_B767_300ER_cargo_subtype_text, cargo_subtype) {
1: return string(STR_REFIT_LIVERY_Boeing); // Manufacturer
2: return string(STR_REFIT_LIVERY_Westjet); // Westjet
return string(STR_REFIT_LIVERY_Boeing);
}

switch(FEAT_AIRCRAFT, SELF, sw_B767_300ER, cargo_subtype) {
1: set_B767_300ER; // 제조사
2: set_B767_300ER; // 대한항공
1: set_B767_300ER; // Manufacturer
2: set_B767_300ER_Westjet; // Westjet
set_B767_300ER;
}

switch (FEAT_AIRCRAFT, SELF, switch_B767300ER_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) {
0: return string(STR_B767_FAMILY);
return CB_RESULT_NO_TEXT;
}
}

switch (FEAT_AIRCRAFT, SELF, sw_B767_300ER_cargo_subtype_capacity, cargo_subtype)
{
// Use https://seatmaps.com/es/aircraft/boeing-767-300er/ as reference
1: return 218; // default
2: return 262; // Westjet
}
Binary file added src/Aircraft/Boeing/B767/B767_300ER/Westjet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Aircraft/Boeing/B777/B777_300ER/Aircanada.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion src/Aircraft/Boeing/B777/B777_300ER/B777_300ER_graphic.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,16 @@ spriteset(set_B777_300ER_united, "src/Aircraft/Boeing/B777/B777_300ER/united.png
tp_B777_300(0, 0)
}

/*--------------------------------------------------------------------
18. Boeing 777-300ER Air Canada
--------------------------------------------------------------------*/
spriteset(set_B777_300ER_aircanada, "src/Aircraft/Boeing/B777/B777_300ER/AirCanada.png"){
tp_B777_300(0, 0)
}

/*--------------------------------------------------------------------
구매정보
--------------------------------------------------------------------*/
switch(FEAT_TRAINS, SELF, sw_B777_300ER_purchase, cargo_subtype) {
set_B777_300ER_purchase;
}
}
3 changes: 3 additions & 0 deletions src/Aircraft/Boeing/B777/B777_300ER/B777_300ER_switch.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ switch(FEAT_AIRCRAFT, SELF, sw_Boeing_777_300ER_cargo_subtype_text, cargo_subtyp
15: return string(STR_REFIT_LIVERY_Allnipponairways); // ANA
16: return string(STR_REFIT_LIVERY_Japanairlines); // Japan Airlines
17: return string(STR_REFIT_LIVERY_Unitedairlines); // Airlines
18: return string(STR_REFIT_LIVERY_Aircanada); // Air Canada
return string(STR_REFIT_LIVERY_Boeing);
}

Expand All @@ -40,6 +41,7 @@ switch(FEAT_AIRCRAFT, SELF, sw_B777_300ER, cargo_subtype) {
15: set_B777_300ER_ana; // ANA
16: set_B777_300ER_Japanairlines; // Japan Airlines
17: set_B777_300ER_united; // United Airlines
18: set_B777_300ER_aircanada; // Air Canada
set_B777_300ER;
}

Expand Down Expand Up @@ -68,4 +70,5 @@ switch (FEAT_AIRCRAFT, SELF, sw_Boeing_777_300ER_cargo_subtype_capacity, cargo_s
15: return 212; // ANA
16: return 244; // Japan Airlines
17: return 350; // United Airlines
18: return 450; // Air Canada
}