diff --git a/docs/SpriteIDs.xlsx b/docs/SpriteIDs.xlsx index e73a5e41..0d5f740f 100644 Binary files a/docs/SpriteIDs.xlsx and b/docs/SpriteIDs.xlsx differ diff --git a/gfx/Rolling Stock/Mk3/BRMk3DMB.png b/gfx/Archive/BRMk3DMB.png similarity index 100% rename from gfx/Rolling Stock/Mk3/BRMk3DMB.png rename to gfx/Archive/BRMk3DMB.png diff --git a/gfx/BR253.png b/gfx/BR253.png deleted file mode 100644 index c658674f..00000000 Binary files a/gfx/BR253.png and /dev/null differ diff --git a/gfx/Diesel/43.png b/gfx/Diesel/43.png new file mode 100644 index 00000000..c6691030 Binary files /dev/null and b/gfx/Diesel/43.png differ diff --git a/lang/english.lng b/lang/english.lng index fd589146..3a091cb4 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -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 @@ -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 diff --git a/src/sortpurchase.pnml b/src/sortpurchase.pnml index 4531bfe7..ad2beb19 100644 --- a/src/sortpurchase.pnml +++ b/src/sortpurchase.pnml @@ -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, @@ -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, @@ -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, diff --git a/src/templates_trains.pnml b/src/templates_trains.pnml index 3fe03472..6613db5c 100644 --- a/src/templates_trains.pnml +++ b/src/templates_trains.pnml @@ -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 diff --git a/src/trains/_spriteset/Diesel_Loco_Sprites/43.pnml b/src/trains/_spriteset/Diesel_Loco_Sprites/43.pnml new file mode 100644 index 00000000..1aec7c18 --- /dev/null +++ b/src/trains/_spriteset/Diesel_Loco_Sprites/43.pnml @@ -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; +} \ No newline at end of file diff --git a/src/trains/_spriteset/Diesel_MU_Sprites/BR253.pnml b/src/trains/_spriteset/Diesel_MU_Sprites/BR253.pnml deleted file mode 100644 index 5a41eaf5..00000000 --- a/src/trains/_spriteset/Diesel_MU_Sprites/BR253.pnml +++ /dev/null @@ -1,137 +0,0 @@ -spriteset(spriteset_BR253_Purchase, "gfx/BR253.png") { - template_mu_purchase(0, 0) -} - -spriteset(spriteset_BR253_BRBlue, "gfx/BR253.png") { - template_train32px_old(0, 13) -} - -spriteset(spriteset_BR253_InterCityExecutive, "gfx/BR253.png") { - template_train32px_old(0, 38) -} - -spriteset(spriteset_BR253_InterCitySwallow, "gfx/BR253.png") { - template_train32px_old(0, 63) -} - -spriteset(spriteset_BR253_MMLTealTang, "gfx/BR253.png") { - template_train32px_old(0, 88) -} - -spriteset(spriteset_BR253_MMLBlue, "gfx/BR253.png") { - template_train32px_old(0, 113) -} - -spriteset(spriteset_BR253_EMT, "gfx/BR253.png") { - template_train32px_old(0, 138) -} - -spriteset(spriteset_BR253_Virgin, "gfx/BR253.png") { - template_train32px_old(0, 163) -} - -spriteset(spriteset_BR253_FGW, "gfx/BR253.png") { - template_train32px_old(0, 263) -} - -spriteset(spriteset_BR253_GWRGreen, "gfx/BR253.png") { - template_train32px_old(0, 338) -} - -spriteset(spriteset_BR254_BRBlue, "gfx/BR253.png") { - template_train32px_old(0, 13) -} - -spriteset(spriteset_BR254_InterCityExecutive, "gfx/BR253.png") { - template_train32px_old(0, 38) -} - -spriteset(spriteset_BR254_InterCitySwallow, "gfx/BR253.png") { - template_train32px_old(0, 63) -} - -spriteset(spriteset_BR254_XC, "gfx/BR253.png") { - template_train32px_old(0, 188) -} - -spriteset(spriteset_BR254_GNER, "gfx/BR253.png") { - template_train32px_old(0, 288) -} - -spriteset(spriteset_BR254_NatEx, "gfx/BR253.png") { - template_train32px_old(0, 238) -} - -spriteset(spriteset_BR255_GC, "gfx/BR253.png") { - template_train32px_old(0, 213) -} - -spriteset(spriteset_BR255_GCLined, "gfx/BR253.png") { - template_train32px_old(0, 313) -} - -spriteset(spriteset_BR255_Inter7City, "gfx/BR253.png") { - template_train32px_old(0, 363) -} - -spriteset(spriteset_BR253_LNER, "gfx/BR253.png") { - template_train32px_old(0, 388) -} - -spriteset(spriteset_BR253_Pullman, "gfx/BR253.png") { - template_train32px_old(0, 413) -} - -switch(FEAT_TRAINS,SELF, sw_BR253,cargo_subtype){ - 0: spriteset_BR253_BRBlue; - 1: spriteset_BR253_InterCityExecutive; - 2: spriteset_BR253_InterCitySwallow; - 3: spriteset_BR253_MMLTealTang; - 4: spriteset_BR253_MMLBlue; - 5: spriteset_BR253_EMT; - 6: spriteset_BR253_Virgin; - 7: spriteset_BR253_FGW; - 8: spriteset_BR253_GWRGreen; - 9: spriteset_BR254_XC; - 10: spriteset_BR254_GNER; - 11: spriteset_BR254_NatEx; - 12: spriteset_BR255_GC; - 13: spriteset_BR255_GCLined; - 14: spriteset_BR255_Inter7City; - 15: spriteset_BR253_LNER; - 16: spriteset_BR253_Pullman; -} - -switch(FEAT_TRAINS,SELF,sw_BR253_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_BR253_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; -} \ No newline at end of file diff --git a/src/trains/_spriteset/Rolling Stock_Sprites/Mk3Spritesets.pnml b/src/trains/_spriteset/Rolling Stock_Sprites/Mk3Spritesets.pnml index 54bae3bd..28cce766 100644 --- a/src/trains/_spriteset/Rolling Stock_Sprites/Mk3Spritesets.pnml +++ b/src/trains/_spriteset/Rolling Stock_Sprites/Mk3Spritesets.pnml @@ -46,9 +46,7 @@ spriteset(spriteset_BRMk3TRUK_BRBlue, "gfx/Rolling Stock/Mk3/BRMk3TRUK.png") { template_train32px_old(0, 13) } -//spriteset(spriteset_BRMk3DMB_BRBlue, "gfx/Rolling Stock/Mk3/BRMk3DMB.png") { -// template_train32px_old(0, 13) -//} + spriteset(spriteset_BRMk3TF_InterCityExecutive, "gfx/Rolling Stock/Mk3/BRMk3TF.png") { template_train32px_old(0, 38) @@ -74,9 +72,7 @@ spriteset(spriteset_BRMk3TRUK_InterCityExecutive, "gfx/Rolling Stock/Mk3/BRMk3TR template_train32px_old(0, 38) } -//spriteset(spriteset_BRMk3DMB_InterCityExecutive, "gfx/Rolling Stock/Mk3/BRMk3DMB.png") { -// template_train32px_old(0, 38) -//} + spriteset(spriteset_BRMk3TF_InterCitySwallow, "gfx/Rolling Stock/Mk3/BRMk3TF.png") { template_train32px_old(0, 63) @@ -102,9 +98,7 @@ spriteset(spriteset_BRMk3TRUK_InterCitySwallow, "gfx/Rolling Stock/Mk3/BRMk3TRUK template_train32px_old(0, 63) } -//spriteset(spriteset_BRMk3DMB_InterCitySwallow, "gfx/Rolling Stock/Mk3/BRMk3DMB.png") { -// template_train32px_old(0, 63) -//} + spriteset(spriteset_BRMk3TF_MMLTealTang, "gfx/Rolling Stock/Mk3/BRMk3TF.png") { template_train32px_old(0, 88) @@ -130,9 +124,7 @@ spriteset(spriteset_BRMk3TRUK_MMLTealTang, "gfx/Rolling Stock/Mk3/BRMk3TRUK.png" template_train32px_old(0, 88) } -//spriteset(spriteset_BRMk3DMB_MMLTealTang, "gfx/Rolling Stock/Mk3/BRMk3DMB.png") { -// template_train32px_old(0, 88) -//} + spriteset(spriteset_BRMk3TF_MMLBlue, "gfx/Rolling Stock/Mk3/BRMk3TF.png") { template_train32px_old(0, 113) @@ -158,9 +150,7 @@ spriteset(spriteset_BRMk3TRUK_MMLBlue, "gfx/Rolling Stock/Mk3/BRMk3TRUK.png") { template_train32px_old(0, 113) } -//spriteset(spriteset_BRMk3DMB_MMLBlue, "gfx/Rolling Stock/Mk3/BRMk3DMB.png") { -// template_train32px_old(0, 113) -//} + spriteset(spriteset_BRMk3TF_EMT, "gfx/Rolling Stock/Mk3/BRMk3TF.png") { template_train32px_old(0, 138) @@ -186,9 +176,7 @@ spriteset(spriteset_BRMk3TRUK_EMT, "gfx/Rolling Stock/Mk3/BRMk3TRUK.png") { template_train32px_old(0, 138) } -//spriteset(spriteset_BRMk3DMB_EMT, "gfx/Rolling Stock/Mk3/BRMk3DMB.png") { -// template_train32px_old(0, 138) -//} + spriteset(spriteset_BRMk3TF_Virgin, "gfx/Rolling Stock/Mk3/BRMk3TF.png") { template_train32px_old(0, 163) @@ -214,9 +202,7 @@ spriteset(spriteset_BRMk3TRUK_Virgin, "gfx/Rolling Stock/Mk3/BRMk3TRUK.png") { template_train32px_old(0, 163) } -//spriteset(spriteset_BRMk3DMB_Virgin, "gfx/Rolling Stock/Mk3/BRMk3DMB.png") { -// template_train32px_old(0, 163) -//} + spriteset(spriteset_BRMk3TF_XC, "gfx/Rolling Stock/Mk3/BRMk3TF.png") { template_train32px_old(0, 188) @@ -242,9 +228,7 @@ spriteset(spriteset_BRMk3TRUK_XC, "gfx/Rolling Stock/Mk3/BRMk3TRUK.png") { template_train32px_old(0, 188) } -//spriteset(spriteset_BRMk3DMB_XC, "gfx/Rolling Stock/Mk3/BRMk3DMB.png") { -// template_train32px_old(0, 188) -//} + spriteset(spriteset_BRMk3TF_GC, "gfx/Rolling Stock/Mk3/BRMk3TF.png") { template_train32px_old(0, 213) @@ -270,9 +254,7 @@ spriteset(spriteset_BRMk3TRUK_GC, "gfx/Rolling Stock/Mk3/BRMk3TRUK.png") { template_train32px_old(0, 213) } -//spriteset(spriteset_BRMk3DMB_GC, "gfx/Rolling Stock/Mk3/BRMk3DMB.png") { -// template_train32px_old(0, 213) -//} + spriteset(spriteset_BRMk3TF_NatEx, "gfx/Rolling Stock/Mk3/BRMk3TF.png") { template_train32px_old(0, 238) @@ -298,9 +280,7 @@ spriteset(spriteset_BRMk3TRUK_NatEx, "gfx/Rolling Stock/Mk3/BRMk3TRUK.png") { template_train32px_old(0, 238) } -//spriteset(spriteset_BRMk3DMB_NatEx, "gfx/Rolling Stock/Mk3/BRMk3DMB.png") { -// template_train32px_old(0, 238) -//} + spriteset(spriteset_BRMk3TF_FGW, "gfx/Rolling Stock/Mk3/BRMk3TF.png") { template_train32px_old(0, 263) @@ -326,9 +306,7 @@ spriteset(spriteset_BRMk3TRUK_FGW, "gfx/Rolling Stock/Mk3/BRMk3TRUK.png") { template_train32px_old(0, 263) } -//spriteset(spriteset_BRMk3DMB_FGW, "gfx/Rolling Stock/Mk3/BRMk3DMB.png") { -// template_train32px_old(0, 263) -//} + spriteset(spriteset_BRMk3TF_GNER, "gfx/Rolling Stock/Mk3/BRMk3TF.png") { template_train32px_old(0, 288) @@ -354,9 +332,7 @@ spriteset(spriteset_BRMk3TRUK_GNER, "gfx/Rolling Stock/Mk3/BRMk3TRUK.png") { template_train32px_old(0, 288) } -//spriteset(spriteset_BRMk3DMB_GNER, "gfx/Rolling Stock/Mk3/BRMk3DMB.png") { -// template_train32px_old(0, 288) -//} + spriteset(spriteset_BRMk3TF_GCLined, "gfx/Rolling Stock/Mk3/BRMk3TF.png") { template_train32px_old(0, 313) @@ -382,9 +358,8 @@ spriteset(spriteset_BRMk3TRUK_GCLined, "gfx/Rolling Stock/Mk3/BRMk3TRUK.png") { template_train32px_old(0, 313) } -//{spriteset(spriteset_BRMk3DMB_GCLined, "gfx/Rolling Stock/Mk3/BRMk3DMB.png") { -// template_train32px_old(0, 313) -//} + + spriteset(spriteset_BRMk3TF_GWRGreen, "gfx/Rolling Stock/Mk3/BRMk3TF.png") { template_train32px_old(0, 338) @@ -433,9 +408,6 @@ spriteset(spriteset_BRMk3TRUB_Inter7City, "gfx/Rolling Stock/Mk3/BRMk3TRUB.png") spriteset(spriteset_BRMk3TRUK_Inter7City, "gfx/Rolling Stock/Mk3/BRMk3TRUK.png") { template_train32px_old(0, 363) } -spriteset(spriteset_BRMk3DMB_Inter7City, "gfx/Rolling Stock/Mk3/BRMk3DMB.png") { - template_train32px_old(0, 363) -} spriteset(spriteset_BRMk3TF_LNER, "gfx/Rolling Stock/Mk3/BRMk3TF.png") { template_train32px_old(0, 388) @@ -461,9 +433,7 @@ spriteset(spriteset_BRMk3TRUK_LNER, "gfx/Rolling Stock/Mk3/BRMk3TRUK.png") { template_train32px_old(0, 388) } -spriteset(spriteset_BRMk3DMB_LNER, "gfx/Rolling Stock/Mk3/BRMk3DMB.png") { - template_train32px_old(0, 388) -} + spriteset(spriteset_BRMk3TF_Pullman, "gfx/Rolling Stock/Mk3/BRMk3TF.png") { template_train32px_old(0, 413) @@ -489,6 +459,22 @@ spriteset(spriteset_BRMk3TRUK_Pullman, "gfx/Rolling Stock/Mk3/BRMk3TRUK.png") { template_train32px_old(0, 413) } -spriteset(spriteset_BRMk3DMB_Pullman, "gfx/Rolling Stock/Mk3/BRMk3DMB.png") { - template_train32px_old(0, 413) + +spriteset(spriteset_BRMk3TF_NetworkRail, "gfx/Rolling Stock/Mk3/BRMk3TF.png") { + template_train32px_old(0, 438) +} +spriteset(spriteset_BRMk3TS_NetworkRail, "gfx/Rolling Stock/Mk3/BRMk3TS.png") { + template_train32px_old(0, 438) +} +spriteset(spriteset_BRMk3TGS_NetworkRail, "gfx/Rolling Stock/Mk3/BRMk3TGS.png") { + template_train32px_old(0, 438) +} +spriteset(spriteset_BRMk3TRSB_NetworkRail, "gfx/Rolling Stock/Mk3/BRMk3TRSB.png") { + template_train32px_old(0, 438) +} +spriteset(spriteset_BRMk3TRUB_NetworkRail, "gfx/Rolling Stock/Mk3/BRMk3TRUB.png") { + template_train32px_old(0, 438) +} +spriteset(spriteset_BRMk3TRUK_NetworkRail, "gfx/Rolling Stock/Mk3/BRMk3TRUK.png") { + template_train32px_old(0, 438) } \ No newline at end of file diff --git a/src/trains/departmental/FlyingBanana.pnml b/src/trains/departmental/FlyingBanana.pnml new file mode 100644 index 00000000..eef77942 --- /dev/null +++ b/src/trains/departmental/FlyingBanana.pnml @@ -0,0 +1,91 @@ +spriteset(spriteset_FlyingBanana_Purchase, "gfx/Diesel/43.png") { + template_purchase(88, 0) +} + +switch (FEAT_TRAINS, SELF, sw_FlyingBanana_Forward, position_in_articulated_veh) +{ + 0: spriteset_BR43_NetworkRail; + 1: spriteset_BRMk3TRUK_NetworkRail; + 2: spriteset_BRMk3TGS_NetworkRail; + 3: spriteset_BRMk3TF_NetworkRail; + 4: spriteset_BRMk3TRUB_NetworkRail; + 5: spriteset_BRMk3TRSB_NetworkRail; + 6: spriteset_BR43_rear_NetworkRail; +} +switch (FEAT_TRAINS, SELF, sw_FlyingBanana_Backward, position_in_articulated_veh) +{ + 0: spriteset_BR43_NetworkRail; + 1: spriteset_BRMk3TRSB_NetworkRail; + 2: spriteset_BRMk3TRUB_NetworkRail; + 3: spriteset_BRMk3TF_NetworkRail; + 4: spriteset_BRMk3TGS_NetworkRail; + 5: spriteset_BRMk3TRUK_NetworkRail; + 6: spriteset_BR43_rear_NetworkRail; +} + +switch(FEAT_TRAINS, PARENT, sw_FlyingBanana, vehicle_is_reversed) +{ + 0: sw_FlyingBanana_Forward; + 1: sw_FlyingBanana_Backward; +} + +switch (FEAT_TRAINS, SELF, switch_articulated_FlyingBanana, extra_callback_info1) { + 1..6: return item_FlyingBanana; + return CB_RESULT_NO_MORE_ARTICULATED_PARTS; //stop adding vehicle parts +} + +switch(FEAT_TRAINS,SELF,sw_FlyingBanana_cargo_subtype_text,cargo_subtype){ + 0: return string(str_NetworkRail); + return CB_RESULT_NO_TEXT; +} + +item (FEAT_TRAINS, item_FlyingBanana, 687) { + property { + variant_group: header_Departmental; + name: string(STR_NAME_FlyingBanana); + climates_available: ALL_CLIMATES; + introduction_date: date(2003,1,1); + model_life: 25; + retire_early: 1; + vehicle_life: 60; + reliability_decay: 7; + refittable_cargo_classes: CC_PASSENGERS; + cargo_allow_refit: [GOOD]; + loading_speed: 14; + cost_factor: 1; + running_cost_factor: 1; + sprite_id: SPRITE_ID_NEW_TRAIN; + speed: 125 mph; + refit_cost: 0; + track_type: RAIL; + ai_special_flag: AI_FLAG_CARGO; + power: 4500 hp; + running_cost_base: RUNNING_COST_DIESEL; + dual_headed: 0; + default_cargo_type: PASS; + cargo_capacity: 44; + weight: 305 ton; + engine_class: ENGINE_CLASS_DIESEL; + tractive_effort_coefficient: 0.3; + air_drag_coefficient: 0.1; + length: 8; + effect_spawn_model_and_powered: EFFECT_SPAWN_MODEL_DIESEL; + extra_weight_per_wagon: 0; + bitmask_vehicle_info: 0; + cargo_age_period: 250; + } + graphics { + additional_text: return(string(str_purchase_loco_with_liveries,string(str_purchase_type_demu),string(str_FlyingBanana_usage),string(str_FlyingBanana_eos),string(str_FlyingBanana_liveries))); + can_attach_wagon: CB_RESULT_ATTACH_ALLOW; + cargo_subtype_text: sw_FlyingBanana_cargo_subtype_text; + articulated_part: switch_articulated_FlyingBanana; + default: sw_FlyingBanana; + purchase: spriteset_FlyingBanana_Purchase; + colour_mapping: return PALETTE_CC_FIRST; + create_effect: diesel_create_visual_effect; + sound_effect: sw_voyager_sound; + cargo_capacity: return(0); + cost_factor: return(GetAdjustedCost(1)); + running_cost_factor: return(GetAdjustedCost(1)); +} +} \ No newline at end of file diff --git a/src/trains/diesel_mu/APTE.pnml b/src/trains/diesel_mu/APTE.pnml index b48d6949..fc510ba9 100644 --- a/src/trains/diesel_mu/APTE.pnml +++ b/src/trains/diesel_mu/APTE.pnml @@ -82,7 +82,7 @@ item (FEAT_TRAINS, item_APTE, 568) { purchase: spriteset_APTE_Purchase; colour_mapping: return PALETTE_CC_FIRST; create_effect: diesel_create_visual_effect; - sound_effect: sw_BR253_sound_type; + sound_effect: sw_BR43_sound_type; cargo_capacity: return(0 * param_pax); cost_factor: return(GetAdjustedCost(90)); running_cost_factor: return(GetAdjustedCost(85)); @@ -130,7 +130,7 @@ item (FEAT_TRAINS, APTEb, 569) { default: sw_APTEb; colour_mapping: return PALETTE_CC_FIRST; create_effect: diesel_create_visual_effect; - sound_effect: sw_BR253_sound_type; + sound_effect: sw_BR43_sound_type; cargo_capacity: return(0 * param_pax); } } @@ -176,7 +176,7 @@ item (FEAT_TRAINS, APTEc, 570) { default: sw_APTEc; colour_mapping: return PALETTE_CC_FIRST; create_effect: diesel_create_visual_effect; - sound_effect: sw_BR253_sound_type; + sound_effect: sw_BR43_sound_type; cargo_capacity: return(75 * param_pax); } } \ No newline at end of file diff --git a/src/trains/diesel_mu/BR253.pnml b/src/trains/diesel_mu/IC125/43.pnml similarity index 76% rename from src/trains/diesel_mu/BR253.pnml rename to src/trains/diesel_mu/IC125/43.pnml index 42b65798..014db929 100644 --- a/src/trains/diesel_mu/BR253.pnml +++ b/src/trains/diesel_mu/IC125/43.pnml @@ -1,6 +1,6 @@ -item (FEAT_TRAINS, item_BR253, 12) { +item (FEAT_TRAINS, item_BR43, 12) { property { - name: string(STR_NAME_BR253); + name: string(STR_NAME_BR43); climates_available: ALL_CLIMATES; introduction_date: date(1975,4,21); model_life: 12; @@ -32,14 +32,14 @@ item (FEAT_TRAINS, item_BR253, 12) { bitmask_vehicle_info: 0; } graphics { - additional_text: return(string(str_purchase_loco_with_liveries,string(str_purchase_type_diesel),string(str_BR253_usage),string(str_BR253_eos),string(str_BR253_liveries))); + additional_text: return(string(str_purchase_loco_with_liveries,string(str_purchase_type_diesel),string(str_BR43_usage),string(str_BR43_eos),string(str_BR43_liveries))); can_attach_wagon: CB_RESULT_ATTACH_ALLOW; cargo_capacity: return 0; - cargo_subtype_text: sw_BR253_cargo_subtype_text; - default: sw_BR253; - purchase: spriteset_BR253_Purchase; + cargo_subtype_text: sw_BR43_cargo_subtype_text; + default: sw_BR43; + purchase: spriteset_BR43_Purchase; colour_mapping: return PALETTE_CC_FIRST; create_effect: diesel_create_visual_effect; - sound_effect: sw_BR253_sound_type; + sound_effect: sw_BR43_sound_type; } } \ No newline at end of file diff --git a/src/trains/diesel_mu/BR252.pnml b/src/trains/diesel_mu/IC125/BR252.pnml similarity index 100% rename from src/trains/diesel_mu/BR252.pnml rename to src/trains/diesel_mu/IC125/BR252.pnml diff --git a/src/trains/rolling_stock/BR/Mk3/BRMk33_TGS.pnml b/src/trains/rolling_stock/BR/Mk3/BRMk33_TGS.pnml index 241b2d39..d352bfca 100644 --- a/src/trains/rolling_stock/BR/Mk3/BRMk33_TGS.pnml +++ b/src/trains/rolling_stock/BR/Mk3/BRMk33_TGS.pnml @@ -1,4 +1,4 @@ -item (FEAT_TRAINS, item_253_BRMk3TGS, 15) { +item (FEAT_TRAINS, item_BRMk3TGS, 15) { property { variant_group: header_BRMk3; name: string(STR_NAME_BRMk3TGS); @@ -30,7 +30,7 @@ item (FEAT_TRAINS, item_253_BRMk3TGS, 15) { can_attach_wagon: CB_RESULT_ATTACH_ALLOW; default: sw_253_BRMk3TGS; colour_mapping: return PALETTE_CC_FIRST; - cargo_subtype_text: sw_BR253_cargo_subtype_text; + cargo_subtype_text: sw_BR43_cargo_subtype_text; purchase: spriteset_BRMk3TGS_purchase; speed: 200; cargo_capacity: return(59 * param_pax); diff --git a/src/trains/rolling_stock/BR/Mk3/BRMk3_TF.pnml b/src/trains/rolling_stock/BR/Mk3/BRMk3_TF.pnml index 9290d346..c08d4bfb 100644 --- a/src/trains/rolling_stock/BR/Mk3/BRMk3_TF.pnml +++ b/src/trains/rolling_stock/BR/Mk3/BRMk3_TF.pnml @@ -1,4 +1,4 @@ -item (FEAT_TRAINS, item_253_BRMk3TF, 13) { +item (FEAT_TRAINS, item_BRMk3TF, 13) { property { variant_group: header_BRMk3; name: string(STR_NAME_BRMk3TF); @@ -30,7 +30,7 @@ item (FEAT_TRAINS, item_253_BRMk3TF, 13) { can_attach_wagon: CB_RESULT_ATTACH_ALLOW; default: sw_253_BRMk3TF; colour_mapping: return PALETTE_CC_FIRST; - cargo_subtype_text: sw_BR253_cargo_subtype_text; + cargo_subtype_text: sw_BR43_cargo_subtype_text; purchase: spriteset_BRMk3TF_purchase; speed: 200; cargo_capacity: return(48 * param_pax); diff --git a/src/trains/rolling_stock/BR/Mk3/BRMk3_TRUB.pnml b/src/trains/rolling_stock/BR/Mk3/BRMk3_TRUB.pnml index 7598dcef..3c54abc6 100644 --- a/src/trains/rolling_stock/BR/Mk3/BRMk3_TRUB.pnml +++ b/src/trains/rolling_stock/BR/Mk3/BRMk3_TRUB.pnml @@ -1,4 +1,4 @@ -item (FEAT_TRAINS, item_253_BRMk3TRUB, 17) { +item (FEAT_TRAINS, item_BRMk3TRUB, 17) { property { variant_group: header_BRMk3; name: string(STR_NAME_BRMk3TRUB); @@ -30,7 +30,7 @@ item (FEAT_TRAINS, item_253_BRMk3TRUB, 17) { can_attach_wagon: CB_RESULT_ATTACH_ALLOW; default: sw_253_BRMk3TRUB; colour_mapping: return PALETTE_CC_FIRST; - cargo_subtype_text: sw_BR253_cargo_subtype_text; + cargo_subtype_text: sw_BR43_cargo_subtype_text; purchase: spriteset_BRMk3TRUB_purchase; speed: 200; cargo_capacity: return(34 * param_pax); diff --git a/src/trains/rolling_stock/BR/Mk3/BRMk3_TRUK.pnml b/src/trains/rolling_stock/BR/Mk3/BRMk3_TRUK.pnml index 070a8839..4c0033be 100644 --- a/src/trains/rolling_stock/BR/Mk3/BRMk3_TRUK.pnml +++ b/src/trains/rolling_stock/BR/Mk3/BRMk3_TRUK.pnml @@ -1,4 +1,4 @@ -item (FEAT_TRAINS, item_253_BRMk3TRUK, 18) { +item (FEAT_TRAINS, item_BRMk3TRUK, 18) { property { variant_group: header_BRMk3; name: string(STR_NAME_BRMk3TRUK); @@ -30,7 +30,7 @@ item (FEAT_TRAINS, item_253_BRMk3TRUK, 18) { can_attach_wagon: CB_RESULT_ATTACH_ALLOW; default: sw_253_BRMk3TRUK; colour_mapping: return PALETTE_CC_FIRST; - cargo_subtype_text: sw_BR253_cargo_subtype_text; + cargo_subtype_text: sw_BR43_cargo_subtype_text; purchase: spriteset_BRMk3TRUK_purchase; speed: 200; cargo_capacity: return(34 * param_pax); diff --git a/src/trains/rolling_stock/BR/Mk3/BRMk3_TS.pnml b/src/trains/rolling_stock/BR/Mk3/BRMk3_TS.pnml index 2a0492f2..25a4e507 100644 --- a/src/trains/rolling_stock/BR/Mk3/BRMk3_TS.pnml +++ b/src/trains/rolling_stock/BR/Mk3/BRMk3_TS.pnml @@ -1,4 +1,4 @@ -item (FEAT_TRAINS, item_253_BRMk3TS, 14) { +item (FEAT_TRAINS, item_BRMk3TS, 14) { property { variant_group: header_BRMk3; name: string(STR_NAME_BRMk3TS); @@ -30,7 +30,7 @@ item (FEAT_TRAINS, item_253_BRMk3TS, 14) { can_attach_wagon: CB_RESULT_ATTACH_ALLOW; default: sw_253_BRMk3TS; colour_mapping: return PALETTE_CC_FIRST; - cargo_subtype_text: sw_BR253_cargo_subtype_text; + cargo_subtype_text: sw_BR43_cargo_subtype_text; purchase: spriteset_BRMk3TS_purchase; speed: 200; cargo_capacity: return(72 * param_pax); diff --git a/src/trains/rolling_stock/BR/Mk3/BRMk3_TSRB.pnml b/src/trains/rolling_stock/BR/Mk3/BRMk3_TSRB.pnml index 698b40c1..568c0b73 100644 --- a/src/trains/rolling_stock/BR/Mk3/BRMk3_TSRB.pnml +++ b/src/trains/rolling_stock/BR/Mk3/BRMk3_TSRB.pnml @@ -1,4 +1,4 @@ -item (FEAT_TRAINS, item_253_BRMk3TRSB, 16) { +item (FEAT_TRAINS, item_BRMk3TRSB, 16) { property { variant_group: header_BRMk3; name: string(STR_NAME_BRMk3TRSB); @@ -30,7 +30,7 @@ item (FEAT_TRAINS, item_253_BRMk3TRSB, 16) { can_attach_wagon: CB_RESULT_ATTACH_ALLOW; default: sw_253_BRMk3TRSB; colour_mapping: return PALETTE_CC_FIRST; - cargo_subtype_text: sw_BR253_cargo_subtype_text; + cargo_subtype_text: sw_BR43_cargo_subtype_text; purchase: spriteset_BRMk3TRSB_purchase; speed: 200; cargo_capacity: return(34 * param_pax);