Skip to content

Commit

Permalink
Another 66 livery and coded up the drawn liveries
Browse files Browse the repository at this point in the history
  • Loading branch information
@audigex
audigex committed Aug 18, 2024
1 parent 3e78b3c commit 3296207
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 2 deletions.
Binary file modified gfx/Diesel/66.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.
13 changes: 11 additions & 2 deletions lang/english.lng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1513,6 +1513,7 @@ STR_NAME_EWSDVT :EWS Company Train (Driving Van Trailer)

str_AGA : (Abellio Greater Anglia)
str_AGAAltLights : (Abellio Greater Anglia - Alternative Lights)
str_AggregateIndustries : (Aggregate Industries)
str_AlphaWales : (Alphaline Wales and Borders)
str_AlphaWessex : (Alphaline Wessex)
str_AngliaFestival : (Anglia - Norwich & Norfolk Festival Ad.)
Expand All @@ -1529,6 +1530,7 @@ str_ArrivaWales : (Arriva Trains Wales)
str_ArrivaWalesMail : (Arriva Trains Wales - Western Mail)
str_AvantiWestCoast : (Avanti West Coast)
str_BangerBlue_Stripe : (Banger Blue with White Stripe)
str_Biffa : (Biffa)
str_BlackpoolTransport : (Blackpool Transport)
str_BoltonCorporation : (BoltonCorporation)
str_BP : (BP)
Expand Down Expand Up @@ -1586,6 +1588,7 @@ str_Corus : (Corus)
str_Crimson : (BR - Crimson Lake)
str_DBSchenker : (DB Schenker)
str_DBSCompany : (DBSchenker - Company Train)
str_DBSteel : (DB - Steel on Steel)
str_DeptGrey : (Departmental Grey)
str_DLRRed : (Docklands Light Railway - Red)
str_DRS : (DRS)
Expand Down Expand Up @@ -1639,11 +1642,15 @@ str_GatExUn : (Gatwick Express - Unbranded)
str_GBRf : (GBRf)
str_GBRf2 : (GBRf - 2nd Version Lights)
str_GBRf3 : (GBRf - 3rd Version Lights)
str_GBRfBar : (GBRf - Barbie)
str_GBRfTfL : (GBRf - London Underground 150 Years)
str_GBRfHB : (GBRf - "Harry Beck")
str_GBRfBlue : (GBRf - Blue)
str_GBRfBlack : (GBRf - Black)
str_GBRfMSC : (GBRf - MSC)
str_GBRf2ToneGrey : (GBRf - 2 Tone Grey)
str_GBRfBarbie : (GBRf - Barbie)
str_GBRfHS2 : (GBRf - HS2)
str_GBRfEveningStar : (GBRf - Evening Star)
str_GERBlue : (GER - Blue)
str_GERBlack : (GER - Black)
str_GMPTE : (GMPTE)
Expand Down Expand Up @@ -1671,6 +1678,7 @@ str_GWRPride : (GWR - Pride)
str_GWRGreenUn : (GWR - Green Unbranded)
str_HansonHall : (Hanson & Hall)
str_HarryNeedle : (Harry Needle Railroad)
str_Heidelberg : (Heidelberg)
str_Hitachi : (Hitachi)
str_HitachiWhite : (Hitachi - White)
str_HeathrowExpressPurple : (Heathrow Express - Grey and Purple)
Expand Down Expand Up @@ -1710,10 +1718,11 @@ str_LU_86Green : (London Underground - Green (Experimental))
str_LU_86Blue : (London Underground - Blue (Experimental))
str_LU_86Red : (London Underground - Red (Experimental))
str_MainlineFreight : (Mainline Freight)
str_MaritimeIntermodal : (Maritime Intermodal)
str_MerseyRail : (MerseyRail)
str_MerseyRailGoodComs : (MerseyRail - Good Communications)
str_MerseyRailOld : (MerseyRail - Old)
str_MetrolinkYellow : (Manchester Metrolink - Yellow)
str_MetrolinkYellow : (Manchester Metrolink - Yellow)
str_Maersk : (Maersk)
str_MaerskEyeCandy : (Maersk - Always show container)
str_MMLBlue : (Midland Mainline - Blue)
Expand Down
90 changes: 90 additions & 0 deletions src/trains/diesel_loco/66.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,66 @@ spriteset(spriteset_BR66_FreightlinerOrange, "gfx/Diesel/66.png") {
template_train32px(0, 221)
}

spriteset(spriteset_BR66_DRS, "gfx/Diesel/66.png") {
template_train32px(0, 247)
}

spriteset(spriteset_BR66_MaritimeIntermodal, "gfx/Diesel/66.png") {
template_train32px(0, 273)
}

spriteset(spriteset_BR66_Hanson, "gfx/Diesel/66.png") {
template_train32px(0, 299)
}

spriteset(spriteset_BR66_AggregateIndustries, "gfx/Diesel/66.png") {
template_train32px(0, 325)
}

spriteset(spriteset_BR66_GBRfMSC, "gfx/Diesel/66.png") {
template_train32px(0, 377)
}

spriteset(spriteset_BR66_GBRfEveningStar, "gfx/Diesel/66.png") {
template_train32px(0, 403)
}

spriteset(spriteset_BR66_GBRfTfL, "gfx/Diesel/66.png") {
template_train32px(0, 429)
}

spriteset(spriteset_BR66_Heidelberg, "gfx/Diesel/66.png") {
template_train32px(0, 455)
}

spriteset(spriteset_BR66_Biffa, "gfx/Diesel/66.png") {
template_train32px(0, 481)
}

spriteset(spriteset_BR66_GBRfFirstBarbie, "gfx/Diesel/66.png") {
template_train32px(0, 507)
}

spriteset(spriteset_BR66_ONE, "gfx/Diesel/66.png") {
template_train32px(0, 533)
}

spriteset(spriteset_BR66_GBRfHS2, "gfx/Diesel/66.png") {
template_train32px(0, 559)
}

spriteset(spriteset_BR66_GBRf2ToneGrey, "gfx/Diesel/66.png") {
template_train32px(0, 585)
}

spriteset(spriteset_BR66_FreightlinerShanks, "gfx/Diesel/66.png") {
template_train32px(0, 611)
}

spriteset(spriteset_BR66_DBSteel, "gfx/Diesel/66.png") {
template_train32px(0, 637)
}

switch(FEAT_TRAINS,SELF, sw_BR66,cargo_subtype){
0: spriteset_BR66_FL;
1: spriteset_BR66_FL2;
Expand All @@ -48,6 +108,21 @@ switch(FEAT_TRAINS,SELF, sw_BR66,cargo_subtype){
6: spriteset_BR66_Colas;
7: spriteset_BR66_FastLine;
8: spriteset_BR66_FreightlinerOrange;
9: spriteset_BR66_DRS;
10: spriteset_BR66_MaritimeIntermodal;
11: spriteset_BR66_Hanson;
12: spriteset_BR66_AggregateIndustries;
13: spriteset_BR66_GBRfMSC;
14: spriteset_BR66_GBRfEveningStar;
15: spriteset_BR66_GBRfTfL;
16: spriteset_BR66_Heidelberg;
17: spriteset_BR66_Biffa;
18: spriteset_BR66_GBRfFirstBarbie;
19: spriteset_BR66_ONE;
20: spriteset_BR66_GBRfHS2;
21: spriteset_BR66_GBRf2ToneGrey;
22: spriteset_BR66_FreightlinerShanks;
23: spriteset_BR66_DBSteel;
spriteset_BR66_FL; // Default because we removed some livery variants, avoids a breaking change
}

Expand All @@ -61,6 +136,21 @@ switch(FEAT_TRAINS,SELF,sw_BR66_cargo_subtype_text,cargo_subtype){
6: return string(str_ColasRail);
7: return string(str_FastLine);
8: return string(str_FreightlinerOrange);
9: return string(str_DRS);
10: return string(str_MaritimeIntermodal);
11: return string(str_HansonHall);
12: return string(str_AggregateIndustries);
13: return string(str_GBRfMSC);
14: return string(str_GBRfEveningStar);
15: return string(str_GBRfTfL);
16: return string(str_Heidelberg);
17: return string(str_Biffa);
18: return string(str_GBRfBarbie);
19: return string(str_ONE);
20: return string(str_GBRfHS2);
21: return string(str_GBRf2ToneGrey);
22: return string(str_FreightlinerSH);
23: return string(str_DBSteel);
return CB_RESULT_NO_TEXT;
}

Expand Down

0 comments on commit 3296207

Please sign in to comment.