Skip to content

Commit

Permalink
BR168 - Added Networker Cab variant
Browse files Browse the repository at this point in the history
  • Loading branch information
@audigex
audigex committed Aug 19, 2021
1 parent 21ebc95 commit 7f654c9
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 20 deletions.
Binary file modified gfx/BR168.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 5 additions & 2 deletions lang/english.lng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1092,8 +1092,11 @@ str_Caledonian : (Caledonian Sleeper)
str_Central : (Central Trains)
str_CentralAnglia : (Central/Anglia Hybrid)
str_Centro : (Centro)
str_Chiltern : (Chiltern Railways)
str_ChilternBlue : (Chiltern Railways - Blue)
str_Chiltern : (Chiltern Railways)
str_ChilternTurboBlue : (Chiltern - Blue, Turbostar Cab)
str_ChilternNetworkBlue : (Chiltern - Blue, Networker Cab)
str_ChilternTurboGrey : (Chiltern - Grey, Turbostar Cab)
str_ChilternNetworkGrey : (Chiltern - Grey, Networker Cab)
str_CivilDutch : (Civil Engineers 'Dutch')
str_ColasRail : (Colas Rail)
str_Connex : (Connex)
Expand Down
40 changes: 30 additions & 10 deletions src/trains/dmu/BR168_2car.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,47 @@ spriteset(spriteset_BR168_Purchase, "gfx/BR168.png") {
template_purchase(0, 0)
}

spriteset(spriteset_BR168a_ChilternBlue, "gfx/BR168.png") {
spriteset(spriteset_BR168a_ChilternTurboBlue, "gfx/BR168.png") {
template_train32px(0, 13)
}
spriteset(spriteset_BR168b_ChilternBlue, "gfx/BR168.png") {
spriteset(spriteset_BR168b_ChilternTurboBlue, "gfx/BR168.png") {
template_train32px(0, 63)
}

spriteset(spriteset_BR168a_ChilternGrey, "gfx/BR168.png") {
spriteset(spriteset_BR168a_ChilternNetworkBlue, "gfx/BR168.png") {
template_train32px(0, 88)
}
spriteset(spriteset_BR168b_ChilternGrey, "gfx/BR168.png") {
spriteset(spriteset_BR168b_ChilternNetworkBlue, "gfx/BR168.png") {
template_train32px(0, 138)
}

spriteset(spriteset_BR168a_ChilternTurboGrey, "gfx/BR168.png") {
template_train32px(0, 163)
}
spriteset(spriteset_BR168b_ChilternTurboGrey, "gfx/BR168.png") {
template_train32px(0, 213)
}

spriteset(spriteset_BR168a_ChilternNetworkGrey, "gfx/BR168.png") {
template_train32px(0, 238)
}
spriteset(spriteset_BR168b_ChilternNetworkGrey, "gfx/BR168.png") {
template_train32px(0, 288)
}


switch(FEAT_TRAINS,SELF, sw_BR168a,cargo_subtype){
0: spriteset_BR168a_ChilternBlue;
1: spriteset_BR168a_ChilternGrey;
0: spriteset_BR168a_ChilternTurboBlue;
1: spriteset_BR168a_ChilternNetworkBlue;
2: spriteset_BR168a_ChilternTurboGrey;
3: spriteset_BR168a_ChilternNetworkGrey;
}

switch(FEAT_TRAINS,SELF, sw_BR168b,cargo_subtype){
0: spriteset_BR168b_ChilternBlue;
1: spriteset_BR168b_ChilternGrey;
0: spriteset_BR168b_ChilternTurboBlue;
1: spriteset_BR168b_ChilternNetworkBlue;
2: spriteset_BR168b_ChilternTurboGrey;
3: spriteset_BR168b_ChilternNetworkGrey;
}

switch (FEAT_TRAINS, SELF, switch_articulated_BR168_2car, extra_callback_info1) {
Expand All @@ -33,8 +51,10 @@ switch (FEAT_TRAINS, SELF, switch_articulated_BR168_2car, extra_callback_info1)
}

switch(FEAT_TRAINS,SELF,sw_BR168_cargo_subtype_text,cargo_subtype){
0: return string(str_ChilternBlue);
1: return string(str_Chiltern);
0: return string(str_ChilternTurboBlue);
1: return string(str_ChilternNetworkBlue);
2: return string(str_ChilternTurboGrey);
3: return string(str_ChilternNetworkGrey);
return CB_RESULT_NO_TEXT;
}

Expand Down
23 changes: 17 additions & 6 deletions src/trains/dmu/BR168_3car.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,25 @@ spriteset(spriteset_BR168_3_Purchase, "gfx/BR168.png") {
template_purchase(0, 0)
}

spriteset(spriteset_BR168c_ChilternBlue, "gfx/BR168.png") {
spriteset(spriteset_BR168c_ChilternTurboBlue, "gfx/BR168.png") {
template_train32px(0, 38)
}
spriteset(spriteset_BR168c_ChilternGrey, "gfx/BR168.png") {
spriteset(spriteset_BR168c_ChilternNetworkBlue, "gfx/BR168.png") {
template_train32px(0, 113)
}

spriteset(spriteset_BR168c_ChilternTurboGrey, "gfx/BR168.png") {
template_train32px(0, 188)
}
spriteset(spriteset_BR168c_ChilternNetworkGrey, "gfx/BR168.png") {
template_train32px(0, 263)
}

switch(FEAT_TRAINS,SELF, sw_BR168c,cargo_subtype){
0: spriteset_BR168c_ChilternBlue;
1: spriteset_BR168c_ChilternGrey;
0: spriteset_BR168c_ChilternTurboBlue;
1: spriteset_BR168c_ChilternNetworkBlue;
2: spriteset_BR168c_ChilternTurboGrey;
3: spriteset_BR168c_ChilternNetworkGrey;
}

switch (FEAT_TRAINS, SELF, switch_articulated_BR168_3car, extra_callback_info1) {
Expand All @@ -21,8 +30,10 @@ switch (FEAT_TRAINS, SELF, switch_articulated_BR168_3car, extra_callback_info1)
}

switch(FEAT_TRAINS,SELF,sw_BR168_3_cargo_subtype_text,cargo_subtype){
0: return string(str_ChilternBlue);
1: return string(str_Chiltern);
0: return string(str_ChilternTurboBlue);
1: return string(str_ChilternNetworkBlue);
2: return string(str_ChilternTurboGrey);
3: return string(str_ChilternNetworkGrey);
return CB_RESULT_NO_TEXT;
}

Expand Down
6 changes: 4 additions & 2 deletions src/trains/dmu/BR168_4car.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ switch (FEAT_TRAINS, SELF, switch_articulated_BR168_4car, extra_callback_info1)
}

switch(FEAT_TRAINS,SELF,sw_BR168_4_cargo_subtype_text,cargo_subtype){
0: return string(str_ChilternBlue);
1: return string(str_Chiltern);
0: return string(str_ChilternTurboBlue);
1: return string(str_ChilternNetworkBlue);
2: return string(str_ChilternTurboGrey);
3: return string(str_ChilternNetworkGrey);
return CB_RESULT_NO_TEXT;
}

Expand Down

0 comments on commit 7f654c9

Please sign in to comment.