Skip to content

Commit

Permalink
Reworked a bunch of IC125 stuff, added Flying Banana
Browse files Browse the repository at this point in the history
  • Loading branch information
audigex committed Aug 8, 2024
1 parent 6d42044 commit 9ff93b3
Show file tree
Hide file tree
Showing 20 changed files with 402 additions and 228 deletions.
Binary file modified docs/SpriteIDs.xlsx
Binary file not shown.
File renamed without changes
Binary file removed gfx/BR253.png
Binary file not shown.
Binary file added gfx/Diesel/43.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 19 additions & 14 deletions lang/english.lng
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,11 @@ str_MPV_Geometry :Track Geometry (Covered)
str_MPV_GeometryOpen :Track Geometry (Open)
str_MPV_Leaf :Leaf Removal

STR_NAME_FlyingBanana :Network Rail "Flying Banana" New Measurement Train
str_FlyingBanana_usage :Track Measurement
str_FlyingBanana_eos :---
str_FlyingBanana_liveries :Network Rail Yellow

STR_NAME_StephensonPlanet :Stephenson's 2-2-0 "Planet"
str_StephensonPlanet_usage :Mixed Traffic
str_StephensonPlanet_eos :1830
Expand Down Expand Up @@ -806,20 +811,20 @@ str_BR252_usage :Express Passenger
str_BR252_eos :---
str_BR252_liveries :BR Blue

STR_NAME_BR253 :BR Class 43 "HST"
str_BR253_usage :Express Passenger
str_BR253_eos :---
str_BR253_liveries :BR Blue, InterCity Executive, InterCity Swallow, Midland Mainline (Teal & Tangerine), Midland Mainline (Blue), East Midlands Trains, Virgin Trains, First Great Western

STR_NAME_BR254 :BR Class 254 "Eastern"
str_BR254_usage :Express Passenger
str_BR254_eos :---
str_BR254_liveries :BR Blue, InterCity Executive, InterCity Swallow, Cross Country, Great North Eastern Railway, National Express

STR_NAME_BR255 :BR Class 255 "Challenger"
str_BR255_usage :Express Passenger
str_BR255_eos :---
str_BR255_liveries :Cross Country, Grand Central, Grand Central Lined
STR_NAME_BR43 :BR Class 43 "HST"
str_BR43_usage :Express Passenger
str_BR43_eos :---
str_BR43_liveries :BR Blue, InterCity Executive, InterCity Swallow, Midland Mainline (Teal & Tangerine), Midland Mainline (Blue), East Midlands Trains, Virgin Trains, First Great Western

# STR_NAME_BR43 :BR Class 254 "Eastern"
# str_BR43_usage :Express Passenger
# str_BR43_eos :---
# str_BR43_liveries :BR Blue, InterCity Executive, InterCity Swallow, Cross Country, Great North Eastern Railway, National Express
#
# STR_NAME_BR43 :BR Class 255 "Challenger"
# str_BR43_usage :Express Passenger
# str_BR43_eos :---
# str_BR43_liveries :Cross Country, Grand Central, Grand Central Lined

STR_NAME_BR302 :BR Class 302 "AM-2" (4-car)
str_BR302_usage :Commuter Passenger
Expand Down
17 changes: 9 additions & 8 deletions src/sortpurchase.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ sort(FEAT_TRAINS, [
item_BR33_1,
item_BR37,
item_BR252, //Actually Class 41, which is why it's here
item_BR253, //Actually Class 43, which is why it's here
item_BR43, //Actually Class 43, which is why it's here
item_BR47,
item_BR48,
item_BR50,
Expand Down Expand Up @@ -236,8 +236,9 @@ header_Flirt,
item_BR805_5car,
item_BR807_7car,
item_BR810_5car,
item_MPV_Single,
header_Departmental,
item_FlyingBanana,
item_MPV_Single,
item_MPV_DualTrack,
item_MPV_DualFreight,
header_LU_Subsurface,
Expand Down Expand Up @@ -299,12 +300,12 @@ header_BRMk2,
item_BRMk2_Buffet,
header_BRMk3,
item_BRMk3DVT,
item_253_BRMk3TF,
item_253_BRMk3TS,
item_253_BRMk3TGS,
item_253_BRMk3TRSB,
item_253_BRMk3TRUB,
item_253_BRMk3TRUK,
item_BRMk3TF,
item_BRMk3TS,
item_BRMk3TGS,
item_BRMk3TRSB,
item_BRMk3TRUB,
item_BRMk3TRUK,
item_BRMk3Sleeper,
header_BRMk4,
item_BRMk4DVT,
Expand Down
11 changes: 11 additions & 0 deletions src/templates_trains.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,17 @@ template template_train32px(x,y){
[ x+121, y, 33, 13, -15, -9, NOANIM] //w
[ x+155, y, 22, 19, -5, -11, NOANIM] //nw
}
template template_train32px_reversed(x,y){
//left_x, upper_y, width, height, offset_x, offset_y
[ x+89, y, 8, 25, -3, -19, NOANIM] //s as n
[ x+98, y, 22, 19, -13, -12, NOANIM] //sw as ne
[ x+121, y, 33, 13, -15, -9, NOANIM] //w as e
[ x+155, y, 22, 19, -5, -11, NOANIM] //nw as se
[ x, y, 8, 25, -3, -12, NOANIM] //n as s
[ x+9, y, 22, 19, -13, -12, NOANIM] //ne as sw
[ x+32, y, 33, 13, -20, -9, NOANIM] //e as w
[ x+66, y, 22, 19, -5, -11, NOANIM] //se as nw
}

//////////////////////////////////////////////////////////////////////////////
// THE NEXT FOUR TEMPLATES ARE LEGACY 28 AND 32PX, AND AN ANIMATED AND REVESED TEMPLATE FOR 32PX
Expand Down
217 changes: 217 additions & 0 deletions src/trains/_spriteset/Diesel_Loco_Sprites/43.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
spriteset(spriteset_BR43_Purchase, "gfx/Diesel/43.png") {
template_mu_purchase(0, 0)
}

spriteset(spriteset_BR43_BRBlue, "gfx/Diesel/43.png") {
template_train32px(0, 13)
}
spriteset(spriteset_BR43_rear_reversed_BRBlue, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 13)
}

spriteset(spriteset_BR43_InterCityExecutive, "gfx/Diesel/43.png") {
template_train32px(0, 39)
}
spriteset(spriteset_BR43_rear_reversed_InterCityExecutive, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 39)
}

spriteset(spriteset_BR43_InterCitySwallow, "gfx/Diesel/43.png") {
template_train32px(0, 65)
}
spriteset(spriteset_BR43_rear_reversed_InterCitySwallow, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 65)
}

spriteset(spriteset_BR43_MMLTealTang, "gfx/Diesel/43.png") {
template_train32px(0, 91)
}
spriteset(spriteset_BR43_rear_reversed_MMLTealTang, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 91)
}

spriteset(spriteset_BR43_MMLBlue, "gfx/Diesel/43.png") {
template_train32px(0, 117)
}
spriteset(spriteset_BR43_rear_reversed_MMLBlue, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 117)
}

spriteset(spriteset_BR43_EMT, "gfx/Diesel/43.png") {
template_train32px(0, 143)
}
spriteset(spriteset_BR43_rear_reversed_EMT, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 143)
}

spriteset(spriteset_BR43_Virgin, "gfx/Diesel/43.png") {
template_train32px(0, 169)
}
spriteset(spriteset_BR43_rear_reversed_Virgin, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 169)
}

spriteset(spriteset_BR43_XC, "gfx/Diesel/43.png") {
template_train32px(0, 195)
}
spriteset(spriteset_BR43_rear_reversed_XC, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 195)
}

spriteset(spriteset_BR43_GC, "gfx/Diesel/43.png") {
template_train32px(0, 221)
}
spriteset(spriteset_BR43_rear_reversed_GC, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 221)
}

spriteset(spriteset_BR43_NatEx, "gfx/Diesel/43.png") {
template_train32px(0, 247)
}
spriteset(spriteset_BR43_rear_reversed_NatEx, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 247)
}

spriteset(spriteset_BR43_FGW, "gfx/Diesel/43.png") {
template_train32px(0, 273)
}
spriteset(spriteset_BR43_rear_reversed_FGW, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 273)
}

spriteset(spriteset_BR43_GNER, "gfx/Diesel/43.png") {
template_train32px(0, 299)
}
spriteset(spriteset_BR43_rear_reversed_GNER, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 299)
}

spriteset(spriteset_BR43_GCLined, "gfx/Diesel/43.png") {
template_train32px(0, 325)
}
spriteset(spriteset_BR43_rear_reversed_GCLined, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 325)
}

spriteset(spriteset_BR43_GWRGreen, "gfx/Diesel/43.png") {
template_train32px(0, 351)
}
spriteset(spriteset_BR43_rear_reversed_GWRGreen, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 351)
}

spriteset(spriteset_BR43_Inter7City, "gfx/Diesel/43.png") {
template_train32px(0, 377)
}
spriteset(spriteset_BR43_rear_reversed_Inter7City, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 377)
}

spriteset(spriteset_BR43_LNER, "gfx/Diesel/43.png") {
template_train32px(0, 403)
}
spriteset(spriteset_BR43_rear_reversed_LNER, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 403)
}

spriteset(spriteset_BR43_Pullman, "gfx/Diesel/43.png") {
template_train32px(0, 429)
}
spriteset(spriteset_BR43_rear_Pullman, "gfx/Diesel/43.png") {
template_train32px(200, 429)
}
spriteset(spriteset_BR43_rear_reversed_Pullman, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 429)
}

spriteset(spriteset_BR43_NetworkRail, "gfx/Diesel/43.png") {
template_train32px(0, 455)
}
spriteset(spriteset_BR43_rear_NetworkRail, "gfx/Diesel/43.png") {
template_train32px(200, 455)
}
spriteset(spriteset_BR43_rear_reversed_NetworkRail, "gfx/Diesel/43.png") {
template_train32px_reversed(200, 455)
}

switch(FEAT_TRAINS,SELF, sw_BR43_front,cargo_subtype){
0: spriteset_BR43_BRBlue;
1: spriteset_BR43_InterCityExecutive;
2: spriteset_BR43_InterCitySwallow;
3: spriteset_BR43_MMLTealTang;
4: spriteset_BR43_MMLBlue;
5: spriteset_BR43_EMT;
6: spriteset_BR43_Virgin;
7: spriteset_BR43_FGW;
8: spriteset_BR43_GWRGreen;
9: spriteset_BR43_XC;
10: spriteset_BR43_GNER;
11: spriteset_BR43_NatEx;
12: spriteset_BR43_GC;
13: spriteset_BR43_GCLined;
14: spriteset_BR43_Inter7City;
15: spriteset_BR43_LNER;
16: spriteset_BR43_Pullman;
// Network Rail handled separately
}

switch(FEAT_TRAINS,SELF, sw_BR43_rear,cargo_subtype){
0: spriteset_BR43_rear_reversed_BRBlue;
1: spriteset_BR43_rear_reversed_InterCityExecutive;
2: spriteset_BR43_rear_reversed_InterCitySwallow;
3: spriteset_BR43_rear_reversed_MMLTealTang;
4: spriteset_BR43_rear_reversed_MMLBlue;
5: spriteset_BR43_rear_reversed_EMT;
6: spriteset_BR43_rear_reversed_Virgin;
7: spriteset_BR43_rear_reversed_FGW;
8: spriteset_BR43_rear_reversed_GWRGreen;
9: spriteset_BR43_rear_reversed_XC;
10: spriteset_BR43_rear_reversed_GNER;
11: spriteset_BR43_rear_reversed_NatEx;
12: spriteset_BR43_rear_reversed_GC;
13: spriteset_BR43_rear_reversed_GCLined;
14: spriteset_BR43_rear_reversed_Inter7City;
15: spriteset_BR43_rear_reversed_LNER;
16: spriteset_BR43_rear_reversed_Pullman;
// Network Rail handled separately
}

switch(FEAT_TRAINS, SELF, sw_BR43, position_in_consist)
{
0: sw_BR43_front;
sw_BR43_rear;
}

switch(FEAT_TRAINS,SELF,sw_BR43_cargo_subtype_text,cargo_subtype){
0: return string(str_BRBlue);
1: return string(str_InterCityExecutive);
2: return string(str_InterCitySwallow);
3: return string(str_MMLTealTang);
4: return string(str_MMLBlue);
5: return string(str_EMT);
6: return string(str_Virgin);
7: return string(str_FGW);
8: return string(str_GWRGreen);
9: return string(str_XC);
10: return string(str_GNER);
11: return string(str_NatEx);
12: return string(str_GC);
13: return string(str_GCLined);
14: return string(str_Inter7City);
15: return string(str_VirginECLNER);
16: return string(str_Pullman);
return CB_RESULT_NO_TEXT;
}

switch(FEAT_TRAINS,SELF,sw_BR43_sound_type,cargo_subtype){
0: return sw_hst_sound;
1: return sw_hst_sound;
2: return sw_hst_sound;
3: return sw_hst_sound;
4: return sw_hst_sound;
5: return sw_hst_sound;
6: return sw_hst_sound;
7: return sw_mtu_sound;
8: return sw_mtu_sound;
return sw_hst_sound;
}
Loading

0 comments on commit 9ff93b3

Please sign in to comment.