diff --git a/industryXtension/dev/builds/industryXTension_4_1.0.1.grf b/industryXtension/dev/builds/industryXTension_4_1.0.1.grf new file mode 100644 index 00000000..868238bb Binary files /dev/null and b/industryXtension/dev/builds/industryXTension_4_1.0.1.grf differ diff --git a/industryXtension/industryXtension.nml b/industryXtension/industryXtension.nml index bd591d1c..c37b8d60 100644 --- a/industryXtension/industryXtension.nml +++ b/industryXtension/industryXtension.nml @@ -10,13 +10,22 @@ grf { grfid: "RC!\04"; name: string(STR_GRF_NAME); desc: string(STR_GRF_DESC); - version: 3; + version: 4; min_compatible_version: 3; } // TABLES cargotable { // All cargo lables referenced in this file should be in here. - PASS, MAIL, COAL, FOOD, GOLD, GOOD, GRAI, IORE, LVST, OIL_, PAPR, STEL, VALU, WHEA, WOOD, CORE, DIAM, FRUT, MAIZ, RUBR, WATR + //Default cargos + PASS, MAIL, COAL, FOOD, GOLD, GOOD, GRAI, IORE, LVST, OIL_, PAPR, STEL, VALU, WHEA, WOOD, + //Tropical cargos + CORE, DIAM, FRUT, MAIZ, RUBR, WATR, + //ECS + AORE, BDMT, BRCK, CERA, CERE, CMNT, DYES, FERT, FICR, FISH, GLAS, LIME, OLSD, PETR, PLAS, POTA, RFPR,SAND, SULP, TOUR, VEHI, WDPR, WOOL, + //FIRS + BEER, CLAY, ENSP, FMSP, FRVG, GRVL, MILK, MNSP, PHOS, PORE, RCYC, SCMT, SGBT, SGCN, JAVA, COPR, SUGR, + //Nuclear stuff (huh?) + URAN, NWST } // CARGOS diff --git a/industryXtension/lang/english.lng b/industryXtension/lang/english.lng index 4710a302..4b1ff301 100644 --- a/industryXtension/lang/english.lng +++ b/industryXtension/lang/english.lng @@ -1,8 +1,8 @@ ##grflangid 0x01 # GRF data -STR_GRF_NAME :Industry XTension 1.0.0 -STR_GRF_VER :1.0.0 +STR_GRF_NAME :Industry XTension 1.0.1 +STR_GRF_VER :1.0.1 STR_GRF_DESC :{}Extends the industrial chain by adding the {BLUE}Industrial Plant{BLACK}, a new tertiary industry.{}Also tweaks some cargo parameters to make the game more enjoyable.{}{WHITE}Now in 2cc!{}{BLACK}Made by {ORANGE}Raul Cotar # Item strings diff --git a/shipXtensionGRF/.nmlcache/gfx/Cargobot.png.cache b/shipXtensionGRF/.nmlcache/gfx/Cargobot.png.cache new file mode 100644 index 00000000..bb1d75f3 Binary files /dev/null and b/shipXtensionGRF/.nmlcache/gfx/Cargobot.png.cache differ diff --git a/shipXtensionGRF/.nmlcache/gfx/Cargobot.png.cacheindex b/shipXtensionGRF/.nmlcache/gfx/Cargobot.png.cacheindex new file mode 100644 index 00000000..7f439309 --- /dev/null +++ b/shipXtensionGRF/.nmlcache/gfx/Cargobot.png.cacheindex @@ -0,0 +1 @@ +[{"info": 4, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [0, 180, 28, 89], "offset": 0, "pixel_stats": {"alpha": 0, "anim": 0, "total": 2492, "white": 0}, "size": 920}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [29, 180, 113, 71], "offset": 920, "pixel_stats": {"alpha": 0, "anim": 0, "total": 8023, "white": 0}, "size": 1231}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [143, 180, 138, 48], "offset": 2151, "pixel_stats": {"alpha": 0, "anim": 0, "total": 6624, "white": 0}, "size": 1041}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [282, 180, 113, 71], "offset": 3192, "pixel_stats": {"alpha": 0, "anim": 0, "total": 8023, "white": 0}, "size": 1115}, {"info": 4, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [396, 180, 28, 89], "offset": 4307, "pixel_stats": {"alpha": 0, "anim": 0, "total": 2492, "white": 0}, "size": 839}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [425, 180, 113, 71], "offset": 5146, "pixel_stats": {"alpha": 0, "anim": 1, "total": 8023, "white": 0}, "size": 1128}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [539, 180, 138, 48], "offset": 6274, "pixel_stats": {"alpha": 0, "anim": 0, "total": 6624, "white": 0}, "size": 1048}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [678, 180, 113, 71], "offset": 7322, "pixel_stats": {"alpha": 0, "anim": 0, "total": 8023, "white": 0}, "size": 1212}, {"info": 4, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [0, 270, 28, 89], "offset": 8534, "pixel_stats": {"alpha": 0, "anim": 52, "total": 2492, "white": 0}, "size": 977}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [29, 270, 113, 71], "offset": 9511, "pixel_stats": {"alpha": 0, "anim": 83, "total": 8023, "white": 0}, "size": 1297}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [143, 270, 138, 48], "offset": 10808, "pixel_stats": {"alpha": 0, "anim": 138, "total": 6624, "white": 0}, "size": 1125}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [282, 270, 113, 71], "offset": 11933, "pixel_stats": {"alpha": 0, "anim": 101, "total": 8023, "white": 0}, "size": 1191}, {"info": 4, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [396, 270, 28, 89], "offset": 13124, "pixel_stats": {"alpha": 0, "anim": 30, "total": 2492, "white": 0}, "size": 881}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [425, 270, 113, 71], "offset": 14005, "pixel_stats": {"alpha": 0, "anim": 101, "total": 8023, "white": 0}, "size": 1202}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [539, 270, 138, 48], "offset": 15207, "pixel_stats": {"alpha": 0, "anim": 138, "total": 6624, "white": 0}, "size": 1152}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [678, 270, 113, 71], "offset": 16359, "pixel_stats": {"alpha": 0, "anim": 88, "total": 8023, "white": 0}, "size": 1266}, {"info": 4, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [0, 0, 28, 89], "offset": 17625, "pixel_stats": {"alpha": 0, "anim": 0, "total": 2492, "white": 0}, "size": 946}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [29, 0, 113, 71], "offset": 18571, "pixel_stats": {"alpha": 0, "anim": 0, "total": 8023, "white": 0}, "size": 1317}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [143, 0, 138, 48], "offset": 19888, "pixel_stats": {"alpha": 0, "anim": 0, "total": 6624, "white": 0}, "size": 1176}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [282, 0, 113, 71], "offset": 21064, "pixel_stats": {"alpha": 0, "anim": 0, "total": 8023, "white": 0}, "size": 1175}, {"info": 4, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [396, 0, 28, 89], "offset": 22239, "pixel_stats": {"alpha": 0, "anim": 0, "total": 2492, "white": 0}, "size": 852}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [425, 0, 113, 71], "offset": 23091, "pixel_stats": {"alpha": 0, "anim": 1, "total": 8023, "white": 0}, "size": 1190}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [539, 0, 138, 48], "offset": 24281, "pixel_stats": {"alpha": 0, "anim": 0, "total": 6624, "white": 0}, "size": 1183}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [678, 0, 113, 71], "offset": 25464, "pixel_stats": {"alpha": 0, "anim": 0, "total": 8023, "white": 0}, "size": 1308}, {"info": 4, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [0, 90, 28, 89], "offset": 26772, "pixel_stats": {"alpha": 0, "anim": 0, "total": 2492, "white": 0}, "size": 983}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [29, 90, 113, 71], "offset": 27755, "pixel_stats": {"alpha": 0, "anim": 0, "total": 8023, "white": 0}, "size": 1335}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [143, 90, 138, 48], "offset": 29090, "pixel_stats": {"alpha": 0, "anim": 0, "total": 6624, "white": 0}, "size": 1163}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [282, 90, 113, 71], "offset": 30253, "pixel_stats": {"alpha": 0, "anim": 0, "total": 8023, "white": 0}, "size": 1189}, {"info": 4, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [396, 90, 28, 89], "offset": 31442, "pixel_stats": {"alpha": 0, "anim": 0, "total": 2492, "white": 0}, "size": 888}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [425, 90, 113, 71], "offset": 32330, "pixel_stats": {"alpha": 0, "anim": 1, "total": 8023, "white": 0}, "size": 1216}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [539, 90, 138, 48], "offset": 33546, "pixel_stats": {"alpha": 0, "anim": 0, "total": 6624, "white": 0}, "size": 1161}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [678, 90, 113, 71], "offset": 34707, "pixel_stats": {"alpha": 0, "anim": 0, "total": 8023, "white": 0}, "size": 1296}, {"info": 12, "mask_file": "gfx/Cargobot.png", "mask_pal": "DEFAULT", "mask_rect": [100, 400, 92, 32], "offset": 36003, "pixel_stats": {"alpha": 0, "anim": 0, "total": 2944, "white": 0}, "size": 666}] \ No newline at end of file diff --git a/shipXtensionGRF/.nmlcache/gfx/Supertanker.png.cache b/shipXtensionGRF/.nmlcache/gfx/Supertanker.png.cache new file mode 100644 index 00000000..efcfc29d Binary files /dev/null and b/shipXtensionGRF/.nmlcache/gfx/Supertanker.png.cache differ diff --git a/shipXtensionGRF/.nmlcache/gfx/Supertanker.png.cacheindex b/shipXtensionGRF/.nmlcache/gfx/Supertanker.png.cacheindex new file mode 100644 index 00000000..d74fb803 --- /dev/null +++ b/shipXtensionGRF/.nmlcache/gfx/Supertanker.png.cacheindex @@ -0,0 +1 @@ +[{"info": 4, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [0, 180, 28, 89], "offset": 0, "pixel_stats": {"alpha": 0, "anim": 0, "total": 2492, "white": 0}, "size": 1009}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [29, 180, 113, 71], "offset": 1009, "pixel_stats": {"alpha": 0, "anim": 0, "total": 8023, "white": 0}, "size": 1497}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [143, 180, 138, 48], "offset": 2506, "pixel_stats": {"alpha": 0, "anim": 0, "total": 6624, "white": 0}, "size": 1348}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [282, 180, 113, 71], "offset": 3854, "pixel_stats": {"alpha": 0, "anim": 0, "total": 8023, "white": 0}, "size": 1363}, {"info": 4, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [396, 180, 28, 89], "offset": 5217, "pixel_stats": {"alpha": 0, "anim": 30, "total": 2492, "white": 0}, "size": 960}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [425, 180, 113, 71], "offset": 6177, "pixel_stats": {"alpha": 0, "anim": 111, "total": 8023, "white": 0}, "size": 1435}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [539, 180, 138, 48], "offset": 7612, "pixel_stats": {"alpha": 0, "anim": 166, "total": 6624, "white": 0}, "size": 1390}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [678, 180, 113, 71], "offset": 9002, "pixel_stats": {"alpha": 0, "anim": 108, "total": 8023, "white": 0}, "size": 1514}, {"info": 4, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [0, 270, 28, 89], "offset": 10516, "pixel_stats": {"alpha": 0, "anim": 52, "total": 2492, "white": 0}, "size": 1063}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [29, 270, 113, 71], "offset": 11579, "pixel_stats": {"alpha": 0, "anim": 103, "total": 8023, "white": 0}, "size": 1550}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [143, 270, 138, 48], "offset": 13129, "pixel_stats": {"alpha": 0, "anim": 166, "total": 6624, "white": 0}, "size": 1434}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [282, 270, 113, 71], "offset": 14563, "pixel_stats": {"alpha": 0, "anim": 110, "total": 8023, "white": 0}, "size": 1433}, {"info": 4, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [396, 270, 28, 89], "offset": 15996, "pixel_stats": {"alpha": 0, "anim": 30, "total": 2492, "white": 0}, "size": 960}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [425, 270, 113, 71], "offset": 16956, "pixel_stats": {"alpha": 0, "anim": 111, "total": 8023, "white": 0}, "size": 1435}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [539, 270, 138, 48], "offset": 18391, "pixel_stats": {"alpha": 0, "anim": 166, "total": 6624, "white": 0}, "size": 1390}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [678, 270, 113, 71], "offset": 19781, "pixel_stats": {"alpha": 0, "anim": 108, "total": 8023, "white": 0}, "size": 1514}, {"info": 4, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [0, 90, 28, 89], "offset": 21295, "pixel_stats": {"alpha": 0, "anim": 0, "total": 2492, "white": 0}, "size": 1027}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [29, 90, 113, 71], "offset": 22322, "pixel_stats": {"alpha": 0, "anim": 0, "total": 8023, "white": 0}, "size": 1570}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [143, 90, 138, 48], "offset": 23892, "pixel_stats": {"alpha": 0, "anim": 0, "total": 6624, "white": 0}, "size": 1477}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [282, 90, 113, 71], "offset": 25369, "pixel_stats": {"alpha": 0, "anim": 0, "total": 8023, "white": 0}, "size": 1430}, {"info": 4, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [396, 90, 28, 89], "offset": 26799, "pixel_stats": {"alpha": 0, "anim": 0, "total": 2492, "white": 0}, "size": 968}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [425, 90, 113, 71], "offset": 27767, "pixel_stats": {"alpha": 0, "anim": 1, "total": 8023, "white": 0}, "size": 1441}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [539, 90, 138, 48], "offset": 29208, "pixel_stats": {"alpha": 0, "anim": 0, "total": 6624, "white": 0}, "size": 1445}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [678, 90, 113, 71], "offset": 30653, "pixel_stats": {"alpha": 0, "anim": 0, "total": 8023, "white": 0}, "size": 1545}, {"info": 12, "mask_file": "gfx/Supertanker.png", "mask_pal": "DEFAULT", "mask_rect": [100, 400, 92, 32], "offset": 32198, "pixel_stats": {"alpha": 0, "anim": 0, "total": 2944, "white": 0}, "size": 787}] \ No newline at end of file diff --git a/shipXtensionGRF/lang/english.lng b/shipXtensionGRF/lang/english.lng index f3abde2e..3962a2c9 100644 --- a/shipXtensionGRF/lang/english.lng +++ b/shipXtensionGRF/lang/english.lng @@ -1,8 +1,8 @@ ##grflangid 0x01 # GRF data -STR_GRF_NAME :Ship XTension 1.0.0 -STR_GRF_VER :1.0.0 +STR_GRF_NAME :Ship XTension 1.0.1 +STR_GRF_VER :1.0.1 STR_GRF_DESC :{}Extends the ship selection with the following:{}{BLUE}CSP Cargobot {BLACK}-> a large diesel freighter,{}{BLUE}ULCC Supertanker {BLACK}-> a large oil tanker,{}{BLACK}...and that's it for now.{}{WHITE}Now in 2cc!{}{BLACK}Made by {ORANGE}Raul Cotar # Veh names diff --git a/shipXtensionGRF/shipXTension_5_1.0.1.grf b/shipXtensionGRF/shipXTension_5_1.0.1.grf new file mode 100644 index 00000000..b7ac8f7c Binary files /dev/null and b/shipXtensionGRF/shipXTension_5_1.0.1.grf differ diff --git a/shipXtensionGRF/shipXtension.nml b/shipXtensionGRF/shipXtension.nml index d69e4f0b..22348cb9 100644 --- a/shipXtensionGRF/shipXtension.nml +++ b/shipXtensionGRF/shipXtension.nml @@ -10,27 +10,36 @@ grf { grfid: "RC!\03"; name: string(STR_GRF_NAME); desc: string(STR_GRF_DESC); - version: 4; + version: 5; min_compatible_version: 3; } // TABLES cargotable { // All cargo lables referenced in this file should be in here. - PASS, MAIL, COAL, FOOD, GOLD, GOOD, GRAI, IORE, LVST, OIL_, PAPR, STEL, VALU, WHEA, WOOD, CORE, DIAM, FRUT, MAIZ, RUBR, WATR + //Default cargos + PASS, MAIL, COAL, FOOD, GOLD, GOOD, GRAI, IORE, LVST, OIL_, PAPR, STEL, VALU, WHEA, WOOD, + //Tropical cargos + CORE, DIAM, FRUT, MAIZ, RUBR, WATR, + //ECS + AORE, BDMT, BRCK, CERA, CERE, CMNT, DYES, FERT, FICR, FISH, GLAS, LIME, OLSD, PETR, PLAS, POTA, RFPR,SAND, SULP, TOUR, VEHI, WDPR, WOOL, + //FIRS + BEER, CLAY, ENSP, FMSP, FRVG, GRVL, MILK, MNSP, PHOS, PORE, RCYC, SCMT, SGBT, SGCN, JAVA, COPR, SUGR, + //Nuclear stuff (huh?) + URAN, NWST } // TEMPLATES template tmpl_ship(x, y) { // For ship sprites. // Use y in steps of 90, and x=0. - //[left_x, upper_y, width, height, offset_x, offset_y] - [x, y, 28, 89, -14, -41] - [x+ 29, y, 113, 71, -47, -22] - [x+143, y, 138, 48, -65, -29] - [x+282, y, 113, 71, -21, -22] - [x+396, y, 28, 89, -14, -50] - [x+425, y, 113, 71, -75, -22] - [x+539, y, 138, 48, -65, -29] - [x+678, y, 113, 71, -20, -22] + //[left_x, upper_y, width, height, offset_x, offset_y, flags] + [x, y, 28, 89, -14, -41, ANIM] + [x+ 29, y, 113, 71, -47, -22, ANIM] + [x+143, y, 138, 48, -65, -29, ANIM] + [x+282, y, 113, 71, -21, -22, ANIM] + [x+396, y, 28, 89, -14, -50, ANIM] + [x+425, y, 113, 71, -75, -22, ANIM] + [x+539, y, 138, 48, -65, -29, ANIM] + [x+678, y, 113, 71, -20, -22, ANIM] // Offsets based on Santorini (ULCC) } template tmpl_ship_buy(x, y) { // Buy menu for both ships. @@ -84,7 +93,7 @@ item (FEAT_SHIPS, item_CSP) { // CSP sprite_id: SPRITE_ID_NEW_SHIP; visual_effect: visual_effect(VISUAL_EFFECT_DIESEL, 7); // arg 2 = offs - sound_effect: SOUND_SHIP_HORN; + sound_effect: SOUND_DEPARTURE_CARGO_SHIP; speed: 45 km/h; // =45, ~real-life max ocean_speed_fraction: 1; @@ -93,7 +102,7 @@ item (FEAT_SHIPS, item_CSP) { // CSP loading_speed: 12; // default 10 units / 10 tics default_cargo_type: GOOD; is_refittable: 1; // yes, yes it is - cargo_allow_refit: [GOOD, GRAI, COAL, IORE, STEL, WOOD]; + cargo_allow_refit: [GOOD, GRAI, COAL, IORE, STEL, WOOD, FOOD, PAPR, WHEA, FRUT, MAIZ, AORE, BRCK, CERE, CMNT, DYES, FERT, FISH, GLAS, PLAS, POTA, SAND, WOOL, CLAY, FMSP, GRVL, MNSP, RCYC, COPR, SUGR, ENSP]; refit_cost: 0; // for easy autorefit cargo_age_period: 444; // +1 age / 6 days, default 185 @@ -117,7 +126,7 @@ item (FEAT_SHIPS, item_ULCC) { // ULCC sprite_id: SPRITE_ID_NEW_SHIP; visual_effect: visual_effect(VISUAL_EFFECT_DIESEL, 7); // arg 2 = offs, max=7 - sound_effect: SOUND_SHIP_HORN; + sound_effect: SOUND_DEPARTURE_CARGO_SHIP; speed: 45 km/h; // =45, ~real-life max ocean_speed_fraction: 1; @@ -126,7 +135,7 @@ item (FEAT_SHIPS, item_ULCC) { // ULCC loading_speed: 12; // default 10 units / 10 tics default_cargo_type: OIL_; is_refittable: 1; // !nu apa :) - cargo_allow_refit: [OIL_, WATR]; + cargo_allow_refit: [OIL_, WATR, RUBR, BEER, MILK]; refit_cost: 0; // for easy autorefit cargo_age_period: 444; // +1 age / 6 days, default 185 diff --git a/trainXtensionGRF/.nmlcache/gfx/DoubleFreightCar.png.cache b/trainXtensionGRF/.nmlcache/gfx/DoubleFreightCar.png.cache new file mode 100644 index 00000000..0daf4595 Binary files /dev/null and b/trainXtensionGRF/.nmlcache/gfx/DoubleFreightCar.png.cache differ diff --git a/trainXtensionGRF/.nmlcache/gfx/DoubleFreightCar.png.cacheindex b/trainXtensionGRF/.nmlcache/gfx/DoubleFreightCar.png.cacheindex new file mode 100644 index 00000000..39ab3281 --- /dev/null +++ b/trainXtensionGRF/.nmlcache/gfx/DoubleFreightCar.png.cacheindex @@ -0,0 +1 @@ +[{"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [0, 60, 8, 30], "offset": 0, "pixel_stats": {"alpha": 0, "anim": 0, "total": 240, "white": 8}, "size": 145}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [9, 60, 22, 23], "offset": 145, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 44}, "size": 234}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [32, 60, 32, 18], "offset": 379, "pixel_stats": {"alpha": 0, "anim": 0, "total": 576, "white": 64}, "size": 279}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [65, 60, 22, 23], "offset": 658, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 44}, "size": 250}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [0, 29, 8, 30], "offset": 908, "pixel_stats": {"alpha": 0, "anim": 0, "total": 240, "white": 8}, "size": 149}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [9, 29, 22, 23], "offset": 1057, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 44}, "size": 234}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [32, 29, 32, 18], "offset": 1291, "pixel_stats": {"alpha": 0, "anim": 0, "total": 576, "white": 64}, "size": 279}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [65, 29, 22, 23], "offset": 1570, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 44}, "size": 250}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [0, 0, 8, 30], "offset": 1820, "pixel_stats": {"alpha": 0, "anim": 0, "total": 240, "white": 0}, "size": 104}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [9, 0, 22, 23], "offset": 1924, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 0}, "size": 158}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [32, 0, 32, 18], "offset": 2082, "pixel_stats": {"alpha": 0, "anim": 0, "total": 576, "white": 0}, "size": 176}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [65, 0, 22, 23], "offset": 2258, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 0}, "size": 159}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [0, 62, 8, 30], "offset": 2417, "pixel_stats": {"alpha": 0, "anim": 0, "total": 240, "white": 0}, "size": 145}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [9, 62, 22, 23], "offset": 2562, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 0}, "size": 232}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [32, 62, 32, 18], "offset": 2794, "pixel_stats": {"alpha": 0, "anim": 0, "total": 576, "white": 0}, "size": 300}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [65, 62, 22, 23], "offset": 3094, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 0}, "size": 251}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [0, 31, 8, 30], "offset": 3345, "pixel_stats": {"alpha": 0, "anim": 0, "total": 240, "white": 0}, "size": 149}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [9, 31, 22, 23], "offset": 3494, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 0}, "size": 232}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [32, 31, 32, 18], "offset": 3726, "pixel_stats": {"alpha": 0, "anim": 0, "total": 576, "white": 0}, "size": 300}, {"info": 4, "mask_file": "gfx/DoubleFreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [65, 31, 22, 23], "offset": 4026, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 0}, "size": 251}] \ No newline at end of file diff --git a/trainXtensionGRF/.nmlcache/gfx/FreightCar.png.cache b/trainXtensionGRF/.nmlcache/gfx/FreightCar.png.cache index 72a2fe9d..d8c7273f 100644 Binary files a/trainXtensionGRF/.nmlcache/gfx/FreightCar.png.cache and b/trainXtensionGRF/.nmlcache/gfx/FreightCar.png.cache differ diff --git a/trainXtensionGRF/.nmlcache/gfx/FreightCar.png.cacheindex b/trainXtensionGRF/.nmlcache/gfx/FreightCar.png.cacheindex index 8a5a5ca5..7c94b2a5 100644 --- a/trainXtensionGRF/.nmlcache/gfx/FreightCar.png.cacheindex +++ b/trainXtensionGRF/.nmlcache/gfx/FreightCar.png.cacheindex @@ -1 +1 @@ -[{"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [0, 50, 8, 24], "offset": 0, "pixel_stats": {"alpha": 0, "anim": 0, "total": 192, "white": 0}, "size": 120}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [9, 50, 22, 17], "offset": 120, "pixel_stats": {"alpha": 0, "anim": 0, "total": 374, "white": 0}, "size": 189}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [32, 50, 32, 12], "offset": 309, "pixel_stats": {"alpha": 0, "anim": 0, "total": 384, "white": 0}, "size": 206}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [65, 50, 22, 17], "offset": 515, "pixel_stats": {"alpha": 0, "anim": 0, "total": 374, "white": 0}, "size": 189}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [0, 25, 8, 24], "offset": 704, "pixel_stats": {"alpha": 0, "anim": 0, "total": 192, "white": 0}, "size": 120}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [9, 25, 22, 17], "offset": 824, "pixel_stats": {"alpha": 0, "anim": 0, "total": 374, "white": 0}, "size": 189}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [32, 25, 32, 12], "offset": 1013, "pixel_stats": {"alpha": 0, "anim": 0, "total": 384, "white": 0}, "size": 206}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [65, 25, 22, 17], "offset": 1219, "pixel_stats": {"alpha": 0, "anim": 0, "total": 374, "white": 0}, "size": 189}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [0, 0, 8, 24], "offset": 1408, "pixel_stats": {"alpha": 0, "anim": 0, "total": 192, "white": 0}, "size": 98}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [9, 0, 22, 17], "offset": 1506, "pixel_stats": {"alpha": 0, "anim": 0, "total": 374, "white": 0}, "size": 142}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [32, 0, 32, 12], "offset": 1648, "pixel_stats": {"alpha": 0, "anim": 0, "total": 384, "white": 0}, "size": 150}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [65, 0, 22, 17], "offset": 1798, "pixel_stats": {"alpha": 0, "anim": 0, "total": 374, "white": 0}, "size": 141}] \ No newline at end of file +[{"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [0, 60, 8, 30], "offset": 0, "pixel_stats": {"alpha": 0, "anim": 0, "total": 240, "white": 8}, "size": 128}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [9, 60, 22, 23], "offset": 128, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 44}, "size": 209}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [32, 60, 32, 18], "offset": 337, "pixel_stats": {"alpha": 0, "anim": 0, "total": 576, "white": 64}, "size": 214}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [65, 60, 22, 23], "offset": 551, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 44}, "size": 206}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [0, 29, 8, 30], "offset": 757, "pixel_stats": {"alpha": 0, "anim": 0, "total": 240, "white": 8}, "size": 128}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [9, 29, 22, 23], "offset": 885, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 44}, "size": 209}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [32, 29, 32, 18], "offset": 1094, "pixel_stats": {"alpha": 0, "anim": 0, "total": 576, "white": 64}, "size": 214}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [65, 29, 22, 23], "offset": 1308, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 44}, "size": 206}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [0, 0, 8, 30], "offset": 1514, "pixel_stats": {"alpha": 0, "anim": 0, "total": 240, "white": 0}, "size": 104}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [9, 0, 22, 23], "offset": 1618, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 0}, "size": 158}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [32, 0, 32, 18], "offset": 1776, "pixel_stats": {"alpha": 0, "anim": 0, "total": 576, "white": 0}, "size": 176}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [65, 0, 22, 23], "offset": 1952, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 0}, "size": 159}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [0, 62, 8, 30], "offset": 2111, "pixel_stats": {"alpha": 0, "anim": 0, "total": 240, "white": 0}, "size": 128}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [9, 62, 22, 23], "offset": 2239, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 0}, "size": 207}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [32, 62, 32, 18], "offset": 2446, "pixel_stats": {"alpha": 0, "anim": 0, "total": 576, "white": 0}, "size": 231}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [65, 62, 22, 23], "offset": 2677, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 0}, "size": 207}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [0, 31, 8, 30], "offset": 2884, "pixel_stats": {"alpha": 0, "anim": 0, "total": 240, "white": 0}, "size": 128}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [9, 31, 22, 23], "offset": 3012, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 0}, "size": 207}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [32, 31, 32, 18], "offset": 3219, "pixel_stats": {"alpha": 0, "anim": 0, "total": 576, "white": 0}, "size": 231}, {"info": 4, "mask_file": "gfx/FreightCar.png", "mask_pal": "DEFAULT", "mask_rect": [65, 31, 22, 23], "offset": 3450, "pixel_stats": {"alpha": 0, "anim": 0, "total": 506, "white": 0}, "size": 207}] \ No newline at end of file diff --git a/trainXtensionGRF/.nmlcache/gfx/HSRL/CatenaryPoles-HSRL.png.cache b/trainXtensionGRF/.nmlcache/gfx/HSRL/CatenaryPoles-HSRL.png.cache new file mode 100644 index 00000000..73eabd6f Binary files /dev/null and b/trainXtensionGRF/.nmlcache/gfx/HSRL/CatenaryPoles-HSRL.png.cache differ diff --git a/trainXtensionGRF/.nmlcache/gfx/HSRL/CatenaryPoles-HSRL.png.cacheindex b/trainXtensionGRF/.nmlcache/gfx/HSRL/CatenaryPoles-HSRL.png.cacheindex new file mode 100644 index 00000000..2f1f4172 --- /dev/null +++ b/trainXtensionGRF/.nmlcache/gfx/HSRL/CatenaryPoles-HSRL.png.cacheindex @@ -0,0 +1 @@ +[{"info": 4, "mask_file": "gfx/HSRL/CatenaryPoles-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [1, 1, 8, 22], "offset": 0, "pixel_stats": {"alpha": 0, "anim": 0, "total": 176, "white": 0}, "size": 80}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryPoles-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [17, 1, 8, 24], "offset": 80, "pixel_stats": {"alpha": 0, "anim": 0, "total": 192, "white": 0}, "size": 83}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryPoles-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [33, 1, 8, 22], "offset": 163, "pixel_stats": {"alpha": 0, "anim": 0, "total": 176, "white": 0}, "size": 76}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryPoles-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [49, 1, 8, 24], "offset": 239, "pixel_stats": {"alpha": 0, "anim": 0, "total": 192, "white": 0}, "size": 89}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryPoles-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [65, 1, 2, 28], "offset": 328, "pixel_stats": {"alpha": 0, "anim": 0, "total": 56, "white": 0}, "size": 42}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryPoles-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [81, 1, 2, 22], "offset": 370, "pixel_stats": {"alpha": 0, "anim": 0, "total": 44, "white": 0}, "size": 41}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryPoles-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [97, 1, 8, 22], "offset": 411, "pixel_stats": {"alpha": 0, "anim": 0, "total": 176, "white": 0}, "size": 69}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryPoles-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [113, 1, 8, 22], "offset": 480, "pixel_stats": {"alpha": 0, "anim": 0, "total": 176, "white": 0}, "size": 71}] \ No newline at end of file diff --git a/trainXtensionGRF/.nmlcache/gfx/HSRL/CatenaryWires-HSRL.png.cache b/trainXtensionGRF/.nmlcache/gfx/HSRL/CatenaryWires-HSRL.png.cache new file mode 100644 index 00000000..aebe2aeb Binary files /dev/null and b/trainXtensionGRF/.nmlcache/gfx/HSRL/CatenaryWires-HSRL.png.cache differ diff --git a/trainXtensionGRF/.nmlcache/gfx/HSRL/CatenaryWires-HSRL.png.cacheindex b/trainXtensionGRF/.nmlcache/gfx/HSRL/CatenaryWires-HSRL.png.cacheindex new file mode 100644 index 00000000..e7ce4e17 --- /dev/null +++ b/trainXtensionGRF/.nmlcache/gfx/HSRL/CatenaryWires-HSRL.png.cacheindex @@ -0,0 +1 @@ +[{"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [1, 1, 32, 22], "offset": 0, "pixel_stats": {"alpha": 0, "anim": 0, "total": 704, "white": 0}, "size": 164}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [49, 1, 32, 22], "offset": 164, "pixel_stats": {"alpha": 0, "anim": 0, "total": 704, "white": 0}, "size": 160}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [97, 1, 32, 7], "offset": 324, "pixel_stats": {"alpha": 0, "anim": 0, "total": 224, "white": 0}, "size": 98}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [145, 1, 1, 22], "offset": 422, "pixel_stats": {"alpha": 0, "anim": 0, "total": 22, "white": 0}, "size": 20}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [161, 1, 32, 30], "offset": 442, "pixel_stats": {"alpha": 0, "anim": 0, "total": 960, "white": 0}, "size": 209}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [209, 1, 32, 15], "offset": 651, "pixel_stats": {"alpha": 0, "anim": 0, "total": 480, "white": 0}, "size": 132}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [257, 1, 32, 15], "offset": 783, "pixel_stats": {"alpha": 0, "anim": 0, "total": 480, "white": 0}, "size": 135}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [305, 1, 32, 30], "offset": 918, "pixel_stats": {"alpha": 0, "anim": 0, "total": 960, "white": 0}, "size": 206}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [353, 1, 32, 19], "offset": 1124, "pixel_stats": {"alpha": 0, "anim": 0, "total": 608, "white": 0}, "size": 142}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [401, 1, 32, 19], "offset": 1266, "pixel_stats": {"alpha": 0, "anim": 0, "total": 608, "white": 0}, "size": 148}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [449, 1, 32, 7], "offset": 1414, "pixel_stats": {"alpha": 0, "anim": 0, "total": 224, "white": 0}, "size": 96}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [497, 1, 1, 19], "offset": 1510, "pixel_stats": {"alpha": 0, "anim": 0, "total": 19, "white": 0}, "size": 18}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [513, 1, 32, 27], "offset": 1528, "pixel_stats": {"alpha": 0, "anim": 0, "total": 864, "white": 0}, "size": 186}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [561, 1, 32, 12], "offset": 1714, "pixel_stats": {"alpha": 0, "anim": 0, "total": 384, "white": 0}, "size": 122}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [609, 1, 32, 12], "offset": 1836, "pixel_stats": {"alpha": 0, "anim": 0, "total": 384, "white": 0}, "size": 125}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [657, 1, 32, 27], "offset": 1961, "pixel_stats": {"alpha": 0, "anim": 0, "total": 864, "white": 0}, "size": 188}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [1, 49, 32, 22], "offset": 2149, "pixel_stats": {"alpha": 0, "anim": 0, "total": 704, "white": 0}, "size": 152}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [49, 49, 32, 22], "offset": 2301, "pixel_stats": {"alpha": 0, "anim": 0, "total": 704, "white": 0}, "size": 157}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [97, 49, 32, 7], "offset": 2458, "pixel_stats": {"alpha": 0, "anim": 0, "total": 224, "white": 0}, "size": 97}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [145, 49, 1, 22], "offset": 2555, "pixel_stats": {"alpha": 0, "anim": 0, "total": 22, "white": 0}, "size": 22}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [161, 49, 32, 20], "offset": 2577, "pixel_stats": {"alpha": 0, "anim": 0, "total": 640, "white": 0}, "size": 141}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [209, 49, 32, 15], "offset": 2718, "pixel_stats": {"alpha": 0, "anim": 0, "total": 480, "white": 0}, "size": 135}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [257, 49, 32, 15], "offset": 2853, "pixel_stats": {"alpha": 0, "anim": 0, "total": 480, "white": 0}, "size": 132}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [305, 49, 32, 30], "offset": 2985, "pixel_stats": {"alpha": 0, "anim": 0, "total": 960, "white": 0}, "size": 204}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [353, 49, 16, 11], "offset": 3189, "pixel_stats": {"alpha": 0, "anim": 0, "total": 176, "white": 0}, "size": 87}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [385, 49, 16, 14], "offset": 3276, "pixel_stats": {"alpha": 0, "anim": 0, "total": 224, "white": 0}, "size": 87}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [417, 49, 16, 14], "offset": 3363, "pixel_stats": {"alpha": 0, "anim": 0, "total": 224, "white": 0}, "size": 90}, {"info": 4, "mask_file": "gfx/HSRL/CatenaryWires-HSRL.png", "mask_pal": "DEFAULT", "mask_rect": [449, 49, 16, 11], "offset": 3453, "pixel_stats": {"alpha": 0, "anim": 0, "total": 176, "white": 0}, "size": 84}] \ No newline at end of file diff --git a/trainXtensionGRF/build.sh b/trainXtensionGRF/build.sh index 92e9eb0f..f17d2428 100755 --- a/trainXtensionGRF/build.sh +++ b/trainXtensionGRF/build.sh @@ -1,3 +1,3 @@ -gcc -xc -P -nostdinc -E src/trainXTension.pnml -D_VER_NR=32 -D_VER_COMP_NR=31 -o src/final.nml -../nml/nmlc -l lang --grf trainXTension.grf src/final.nml +gcc -xc -P -nostdinc -E src/trainXTension.pnml -D_VER_NR=33 -D_VER_COMP_NR=31 -o src/final.nml +../nml-jgrpp-git/nmlc -l lang --grf trainXTension.grf src/final.nml cp -i trainXTension.grf ~/.local/share/openttd-jgrpp/newgrf/ diff --git a/trainXtensionGRF/builds/Changelog.txt b/trainXtensionGRF/builds/Changelog.txt index 2dc34496..2c3c4c6d 100644 --- a/trainXtensionGRF/builds/Changelog.txt +++ b/trainXtensionGRF/builds/Changelog.txt @@ -16,3 +16,4 @@ Just realized freight wagon was broken. (didn't show empty sprite even when it w 1.3.7 Added increased capacity for freight wagon after 1972. 1.4.0 Added new rail type (broken) and removed changing freight capacity. 1.4.2 Fixed new rail type, speed limits and added a double-stack car (placeholder sprites). Project now uses a build script. +1.4.3 Made proper sprites for the double-stacker. Fixed other small sprite-related issues. Bug: no catenary in buy menu. diff --git a/trainXtensionGRF/builds/trainXTension_32_1.4.2.grf b/trainXtensionGRF/builds/trainXTension_33_1.4.3.grf similarity index 61% rename from trainXtensionGRF/builds/trainXTension_32_1.4.2.grf rename to trainXtensionGRF/builds/trainXTension_33_1.4.3.grf index bb93a30e..8b0a814a 100644 Binary files a/trainXtensionGRF/builds/trainXTension_32_1.4.2.grf and b/trainXtensionGRF/builds/trainXTension_33_1.4.3.grf differ diff --git a/trainXtensionGRF/gfx/DoubleFreightCar.png b/trainXtensionGRF/gfx/DoubleFreightCar.png index eaac13db..2e661087 100644 Binary files a/trainXtensionGRF/gfx/DoubleFreightCar.png and b/trainXtensionGRF/gfx/DoubleFreightCar.png differ diff --git a/trainXtensionGRF/gfx/FreightCar.png b/trainXtensionGRF/gfx/FreightCar.png index 5303518c..f4bd2aab 100644 Binary files a/trainXtensionGRF/gfx/FreightCar.png and b/trainXtensionGRF/gfx/FreightCar.png differ diff --git a/trainXtensionGRF/lang/english.lng b/trainXtensionGRF/lang/english.lng index bf124cb5..92594df2 100644 --- a/trainXtensionGRF/lang/english.lng +++ b/trainXtensionGRF/lang/english.lng @@ -3,8 +3,8 @@ # I didn't use custom tags (yet) 'cause they seem kinda useless... # GRF data -STR_GRF_NAME :Train XTension 1.4.2 -STR_GRF_VER :1.4.2 +STR_GRF_NAME :Train XTension 1.4.3 +STR_GRF_VER :1.4.3 STR_GRF_DESC :{}Extends the train selection with the following:{}{BLUE}EAR Iron Horse {BLACK}-> a fast steam engine,{}{BLUE}EAR GTHL {BLACK}-> a heavy hybrid freight engine,{}{BLUE}Intermodal Freight Car {BLACK}-> a nice goods wagon,{}{BLUE}HSRL {BLACK}-> a new high-speed rail type,{}{BLACK}...and that's it for now.{}{BLACK}Made by {ORANGE}Raul Cotar{}{WHITE}github.com/raulcotar/OTTD_newgrf{}{RED}Please load before any train sets! # Params diff --git a/trainXtensionGRF/sprites/DoubleFreightCar.aseprite b/trainXtensionGRF/sprites/DoubleFreightCar.aseprite index e5e4004f..858e7268 100644 Binary files a/trainXtensionGRF/sprites/DoubleFreightCar.aseprite and b/trainXtensionGRF/sprites/DoubleFreightCar.aseprite differ diff --git a/trainXtensionGRF/src/final.nml b/trainXtensionGRF/src/final.nml index e2bf1b17..187d8aa7 100644 --- a/trainXtensionGRF/src/final.nml +++ b/trainXtensionGRF/src/final.nml @@ -2,7 +2,7 @@ grf { grfid: "RC!\02"; name: string(STR_GRF_NAME); desc: string(STR_GRF_DESC); - version: 32; + version: 33; min_compatible_version: 31; param { param_use_2cc_cargo { @@ -60,13 +60,13 @@ template tmpl_engine_buy(x, y) { [x+120, y, 32, 12, -18, -7] } template tmpl_wagon(x, y) { - [x , y, 8, 24, -3, -12] - [x+ 9, y, 22, 17, -14, -9] - [x+ 32, y, 32, 12, -16, -8] - [x+ 65, y, 22, 17, -6, -9] + [x , y, 8, 30, -3, -18] + [x+ 9, y, 22, 23, -14, -15] + [x+ 32, y, 32, 18, -16, -14] + [x+ 65, y, 22, 23, -6, -15] } template tmpl_wagon_buy(x, y) { - [x+ 32, y, 32, 12, -16, -8] + [x+ 32, y, 32, 18, -16, -9] } template tmpl_overlay() { [ 1, 1, 63, 31, -31, 0] @@ -117,16 +117,16 @@ spriteset(spriteset_HSRL_underlay,"gfx/HSRL/Underlay-HSRL.png") {tmpl_underlay() spriteset(spriteset_HSRL_tunnel,"gfx/HSRL/Tunnel-HSRL.png") {tmpl_tunnel()} spriteset(spriteset_HSRL_bridges,"gfx/HSRL/Bridge-HSRL.png") {tmpl_bridge()} spriteset(spriteset_HSRL_levcrossclosed,"gfx/HSRL/LevelCrossing-HSRL.png") { - [ 1, 1, 64, 31, -31, 0] - [ 66, 1, 64, 31, -31, 0] - [148, 7, 14, 15, -11, -9] - [233, 8, 14, 15, -2, -10] - [148, 7, 14, 15, -13, -9] - [207, 7, 13, 13, -11, -10] - [175, 6, 13, 13, 0, -10] - [233, 8, 14, 15, 5, -11] - [175, 6, 13, 13, -2, -10] - [207, 7, 13, 13, -6, -12] + [ 1, 1, 64, 31, -31, 0, ANIM] + [ 66, 1, 64, 31, -31, 0, ANIM] + [148, 7, 14, 15, -11, -9, ANIM] + [233, 8, 14, 15, -2, -10, ANIM] + [148, 7, 14, 15, -13, -9, ANIM] + [207, 7, 13, 13, -11, -10, ANIM] + [175, 6, 13, 13, 0, -10, ANIM] + [233, 8, 14, 15, 5, -11, ANIM] + [175, 6, 13, 13, -2, -10, ANIM] + [207, 7, 13, 13, -6, -12, ANIM] } spriteset(spriteset_HSRL_levcrossopen,"gfx/HSRL/LevelCrossing-HSRL.png") { [ 1, 1, 64, 31, -31, 0] @@ -140,6 +140,46 @@ spriteset(spriteset_HSRL_levcrossopen,"gfx/HSRL/LevelCrossing-HSRL.png") { [175, 27, 5, 15, -2, -12] [215, 28, 5, 15, 2, -14] } +spriteset(spriteset_HSRL_catpol,"gfx/HSRL/CatenaryPoles-HSRL.png") { + [ 1, 1, 8, 22, -7, -20] + [ 17, 1, 8, 24, 0, -23] + [ 33, 1, 8, 22, 0, -20] + [ 49, 1, 8, 24, -7, -23] + [ 65, 1, 2, 28, 0, -21] + [ 81, 1, 2, 22, 0, -22] + [ 97, 1, 8, 22, 0, -23] + [ 113, 1, 8, 22, -7, -21] +} +spriteset(spriteset_HSRL_catwire,"gfx/HSRL/CatenaryWires-HSRL.png") { + [ 1, 1, 32, 22, -29, -8] + [ 49, 1, 32, 22, -1, -8] + [ 97, 1, 32, 7, -1, -8] + [ 145, 1, 1, 22, 0, -9] + [ 161, 1, 32, 30, -29, -8] + [ 209, 1, 32, 15, -1, 0] + [ 257, 1, 32, 15, -29, 1] + [ 305, 1, 32, 30, -1, -8] + [ 353, 1, 32, 19, -29, -5] + [ 401, 1, 32, 19, -1, -5] + [ 449, 1, 32, 7, -1, -8] + [ 497, 1, 1, 19, 0, -6] + [ 513, 1, 32, 27, -29, -5] + [ 561, 1, 32, 12, -1, 3] + [ 609, 1, 32, 12, -29, 3] + [ 657, 1, 32, 27, -1, -5] + [ 1, 49, 32, 22, -29, -8] + [ 49, 49, 32, 22, -1, -8] + [ 97, 49, 32, 7, -1, -8] + [ 145, 49, 1, 22, 0, -9] + [ 161, 49, 32, 20, -29, -8] + [ 209, 49, 32, 15, -1, 0] + [ 257, 49, 32, 15, -29, 0] + [ 305, 49, 32, 30, -1, -8] + [ 353, 49, 16, 11, -29, 2] + [ 385, 49, 16, 14, -1, -8] + [ 417, 49, 16, 14, -13, -8] + [ 449, 49, 16, 11, 15, 3] +} switch(FEAT_RAILTYPES,SELF,switch_HSRL_levcross,level_crossing_status) { LEVEL_CROSSING_CLOSED: spriteset_HSRL_levcrossclosed; spriteset_HSRL_levcrossopen; @@ -187,11 +227,11 @@ item(FEAT_RAILTYPES, item_HSRL) { construction_cost: 24; maintenance_cost: 24; station_graphics: RAILTYPE_STATION_NORMAL; - railtype_flags: bitmask(0); + railtype_flags: bitmask(RAILTYPE_FLAG_CATENARY); } if (param_enable_lvlcross == 0) { property { - railtype_flags: bitmask(RAILTYPE_FLAG_NO_LEVEL_CROSSING); + railtype_flags: bitmask(RAILTYPE_FLAG_NO_LEVEL_CROSSING, RAILTYPE_FLAG_CATENARY); } } if (param_enable_speed_limits == 1) { @@ -205,6 +245,8 @@ item(FEAT_RAILTYPES, item_HSRL) { tunnels: spriteset_HSRL_tunnel; level_crossings: switch_HSRL_levcross; bridge_surfaces: spriteset_HSRL_bridges; + catenary_wire: spriteset_HSRL_catwire; + catenary_pylons: spriteset_HSRL_catpol; } } spriteset (spriteset_engine_steam, "gfx/IronHorse.png") { tmpl_engine(0, 0) } @@ -286,9 +328,9 @@ item (FEAT_TRAINS, item_engine_heavy) { } } spriteset (spriteset_intermodal1_empty, "gfx/FreightCar.png") { tmpl_wagon(0, 0) } -spriteset (spriteset_intermodal1_cc1, "gfx/FreightCar.png") { tmpl_wagon(0, 25) } -spriteset (spriteset_intermodal1_cc2, "gfx/FreightCar.png") { tmpl_wagon(0, 50) } -spriteset (spriteset_intermodal1_buy, "gfx/FreightCar.png") { tmpl_wagon_buy(0, 25) } +spriteset (spriteset_intermodal1_cc1, "gfx/FreightCar.png") { tmpl_wagon(0, 31) } +spriteset (spriteset_intermodal1_cc2, "gfx/FreightCar.png") { tmpl_wagon(0, 62) } +spriteset (spriteset_intermodal1_buy, "gfx/FreightCar.png") { tmpl_wagon_buy(0, 31) } switch (FEAT_TRAINS, SELF, sw_intermodal1_cc, position_in_consist % 2 || !param_use_2cc_cargo) { 0: spriteset_intermodal1_cc2; spriteset_intermodal1_cc1; @@ -331,13 +373,13 @@ item (FEAT_TRAINS, item_wagon_intermodal1) { additional_text: return string(STR_INTERMODAL1_DESC); } } -spriteset (spriteset_intermodal2_empty, "gfx/FreightCar.png") { tmpl_wagon(0, 0) } -spriteset (spriteset_intermodal2_cc1, "gfx/FreightCar.png") { tmpl_wagon(0, 25) } -spriteset (spriteset_intermodal2_cc2, "gfx/FreightCar.png") { tmpl_wagon(0, 50) } -spriteset (spriteset_intermodal2_buy, "gfx/FreightCar.png") { tmpl_wagon_buy(0, 25) } +spriteset (spriteset_intermodal2_empty, "gfx/DoubleFreightCar.png") { tmpl_wagon(0, 0) } +spriteset (spriteset_intermodal2_cc1, "gfx/DoubleFreightCar.png") { tmpl_wagon(0, 31) } +spriteset (spriteset_intermodal2_cc2, "gfx/DoubleFreightCar.png") { tmpl_wagon(0, 62) } +spriteset (spriteset_intermodal2_buy, "gfx/DoubleFreightCar.png") { tmpl_wagon_buy(0, 31) } switch (FEAT_TRAINS, SELF, sw_intermodal2_cc, position_in_consist % 2 || !param_use_2cc_cargo) { - 0: spriteset_intermodal2_cc2; - spriteset_intermodal2_cc1; + 0: spriteset_intermodal2_cc1; + spriteset_intermodal2_cc2; } switch (FEAT_TRAINS, SELF, sw_intermodal2_gfx, (10 * cargo_count / cargo_capacity) >= 5) { 0: spriteset_intermodal2_empty; @@ -352,7 +394,7 @@ item (FEAT_TRAINS, item_wagon_intermodal2) { model_life: 100; vehicle_life: 30; track_type: RAIL; - cost_factor: 244; + cost_factor: 245; running_cost_base: RUNNING_COST_NONE; weight: 22 ton; speed: 160 km/h; diff --git a/trainXtensionGRF/src/header.pnml b/trainXtensionGRF/src/header.pnml index 59695987..b0c5280c 100644 --- a/trainXtensionGRF/src/header.pnml +++ b/trainXtensionGRF/src/header.pnml @@ -32,7 +32,7 @@ grf { } } } - + railtypetable { RAIL, ELRL, diff --git a/trainXtensionGRF/src/intermodal1.pnml b/trainXtensionGRF/src/intermodal1.pnml index 69a05074..55aa1abc 100644 --- a/trainXtensionGRF/src/intermodal1.pnml +++ b/trainXtensionGRF/src/intermodal1.pnml @@ -1,7 +1,7 @@ spriteset (spriteset_intermodal1_empty, "gfx/FreightCar.png") { tmpl_wagon(0, 0) } // for 'Freight wagon', empty -spriteset (spriteset_intermodal1_cc1, "gfx/FreightCar.png") { tmpl_wagon(0, 25) } // for 'Freight wagon', cc1 -spriteset (spriteset_intermodal1_cc2, "gfx/FreightCar.png") { tmpl_wagon(0, 50) } // for 'Freight wagon', cc2 -spriteset (spriteset_intermodal1_buy, "gfx/FreightCar.png") { tmpl_wagon_buy(0, 25) } // using cc1 +spriteset (spriteset_intermodal1_cc1, "gfx/FreightCar.png") { tmpl_wagon(0, 31) } // for 'Freight wagon', cc1 +spriteset (spriteset_intermodal1_cc2, "gfx/FreightCar.png") { tmpl_wagon(0, 62) } // for 'Freight wagon', cc2 +spriteset (spriteset_intermodal1_buy, "gfx/FreightCar.png") { tmpl_wagon_buy(0, 31) } // using cc1s switch (FEAT_TRAINS, SELF, sw_intermodal1_cc, position_in_consist % 2 || !param_use_2cc_cargo) { // freight sprite (pos decision) 0: spriteset_intermodal1_cc2; // positions start from 1 (loco=0) diff --git a/trainXtensionGRF/src/intermodal2.pnml b/trainXtensionGRF/src/intermodal2.pnml index 13b5406b..743821e5 100644 --- a/trainXtensionGRF/src/intermodal2.pnml +++ b/trainXtensionGRF/src/intermodal2.pnml @@ -1,11 +1,11 @@ -spriteset (spriteset_intermodal2_empty, "gfx/FreightCar.png") { tmpl_wagon(0, 0) } // for 'Freight wagon', empty -spriteset (spriteset_intermodal2_cc1, "gfx/FreightCar.png") { tmpl_wagon(0, 25) } // for 'Freight wagon', cc1 -spriteset (spriteset_intermodal2_cc2, "gfx/FreightCar.png") { tmpl_wagon(0, 50) } // for 'Freight wagon', cc2 -spriteset (spriteset_intermodal2_buy, "gfx/FreightCar.png") { tmpl_wagon_buy(0, 25) } // using cc1 +spriteset (spriteset_intermodal2_empty, "gfx/DoubleFreightCar.png") { tmpl_wagon(0, 0) } // for 'Freight wagon', empty +spriteset (spriteset_intermodal2_cc1, "gfx/DoubleFreightCar.png") { tmpl_wagon(0, 31) } // for 'Freight wagon', cc1 +spriteset (spriteset_intermodal2_cc2, "gfx/DoubleFreightCar.png") { tmpl_wagon(0, 62) } // for 'Freight wagon', cc2 +spriteset (spriteset_intermodal2_buy, "gfx/DoubleFreightCar.png") { tmpl_wagon_buy(0, 31) } // using cc1 switch (FEAT_TRAINS, SELF, sw_intermodal2_cc, position_in_consist % 2 || !param_use_2cc_cargo) { // freight sprite (pos decision) - 0: spriteset_intermodal2_cc2; // positions start from 1 (loco=0) - spriteset_intermodal2_cc1; // if even pos or no 2cc, see param + 0: spriteset_intermodal2_cc1; // positions start from 1 (loco=0) + spriteset_intermodal2_cc2; // odd position } switch (FEAT_TRAINS, SELF, sw_intermodal2_gfx, (10 * cargo_count / cargo_capacity) >= 5) { // freight sprite (load decision) 0: spriteset_intermodal2_empty; // empty @@ -21,7 +21,7 @@ item (FEAT_TRAINS, item_wagon_intermodal2) { model_life: 100; // ~2082 vehicle_life: 30; track_type: RAIL; - cost_factor: 244; + cost_factor: 245; running_cost_base: RUNNING_COST_NONE; weight: 22 ton; // use settings for weight mult diff --git a/trainXtensionGRF/src/rails.pnml b/trainXtensionGRF/src/rails.pnml index eef9e7a8..55d66b0c 100644 --- a/trainXtensionGRF/src/rails.pnml +++ b/trainXtensionGRF/src/rails.pnml @@ -2,18 +2,19 @@ spriteset(spriteset_HSRL_overlay,"gfx/HSRL/Overlay-HSRL.png") {tmpl_overlay()} spriteset(spriteset_HSRL_underlay,"gfx/HSRL/Underlay-HSRL.png") {tmpl_underlay()} spriteset(spriteset_HSRL_tunnel,"gfx/HSRL/Tunnel-HSRL.png") {tmpl_tunnel()} spriteset(spriteset_HSRL_bridges,"gfx/HSRL/Bridge-HSRL.png") {tmpl_bridge()} +//spriteset(spriteset_HSRL_buy,"grfx/HSRL/Overlay-HSRL.png") {} spriteset(spriteset_HSRL_levcrossclosed,"gfx/HSRL/LevelCrossing-HSRL.png") { - //left_x, upper_y, width, height, offset_x, offset_y - [ 1, 1, 64, 31, -31, 0] - [ 66, 1, 64, 31, -31, 0] - [148, 7, 14, 15, -11, -9] - [233, 8, 14, 15, -2, -10] - [148, 7, 14, 15, -13, -9] - [207, 7, 13, 13, -11, -10] - [175, 6, 13, 13, 0, -10] - [233, 8, 14, 15, 5, -11] - [175, 6, 13, 13, -2, -10] - [207, 7, 13, 13, -6, -12] + //left_x, upper_y, width, height, offset_x, offset_y, flags + [ 1, 1, 64, 31, -31, 0, ANIM] + [ 66, 1, 64, 31, -31, 0, ANIM] + [148, 7, 14, 15, -11, -9, ANIM] + [233, 8, 14, 15, -2, -10, ANIM] + [148, 7, 14, 15, -13, -9, ANIM] + [207, 7, 13, 13, -11, -10, ANIM] + [175, 6, 13, 13, 0, -10, ANIM] + [233, 8, 14, 15, 5, -11, ANIM] + [175, 6, 13, 13, -2, -10, ANIM] + [207, 7, 13, 13, -6, -12, ANIM] } spriteset(spriteset_HSRL_levcrossopen,"gfx/HSRL/LevelCrossing-HSRL.png") { //left_x, upper_y, width, height, offset_x, offset_y @@ -28,6 +29,50 @@ spriteset(spriteset_HSRL_levcrossopen,"gfx/HSRL/LevelCrossing-HSRL.png") { [175, 27, 5, 15, -2, -12] [215, 28, 5, 15, 2, -14] } +spriteset(spriteset_HSRL_catpol,"gfx/HSRL/CatenaryPoles-HSRL.png") { + //left_x, upper_y, width, height, offset_x, offset_y + //left_x, upper_y, width, height, offset_x, offset_y + [ 1, 1, 8, 22, -7, -20] + [ 17, 1, 8, 24, 0, -23] + [ 33, 1, 8, 22, 0, -20] + [ 49, 1, 8, 24, -7, -23] + [ 65, 1, 2, 28, 0, -21] + [ 81, 1, 2, 22, 0, -22] + [ 97, 1, 8, 22, 0, -23] + [ 113, 1, 8, 22, -7, -21] +} +spriteset(spriteset_HSRL_catwire,"gfx/HSRL/CatenaryWires-HSRL.png") { + //left_x, upper_y, width, height, offset_x, offset_y + //left_x, upper_y, width, height, offset_x, offset_y + [ 1, 1, 32, 22, -29, -8] + [ 49, 1, 32, 22, -1, -8] + [ 97, 1, 32, 7, -1, -8] + [ 145, 1, 1, 22, 0, -9] + [ 161, 1, 32, 30, -29, -8] + [ 209, 1, 32, 15, -1, 0] + [ 257, 1, 32, 15, -29, 1] + [ 305, 1, 32, 30, -1, -8] + [ 353, 1, 32, 19, -29, -5] + [ 401, 1, 32, 19, -1, -5] + [ 449, 1, 32, 7, -1, -8] + [ 497, 1, 1, 19, 0, -6] + [ 513, 1, 32, 27, -29, -5] + [ 561, 1, 32, 12, -1, 3] + [ 609, 1, 32, 12, -29, 3] + [ 657, 1, 32, 27, -1, -5] + [ 1, 49, 32, 22, -29, -8] + [ 49, 49, 32, 22, -1, -8] + [ 97, 49, 32, 7, -1, -8] + [ 145, 49, 1, 22, 0, -9] + [ 161, 49, 32, 20, -29, -8] + [ 209, 49, 32, 15, -1, 0] + [ 257, 49, 32, 15, -29, 0] + [ 305, 49, 32, 30, -1, -8] + [ 353, 49, 16, 11, -29, 2] + [ 385, 49, 16, 14, -1, -8] + [ 417, 49, 16, 14, -13, -8] + [ 449, 49, 16, 11, 15, 3] +} switch(FEAT_RAILTYPES,SELF,switch_HSRL_levcross,level_crossing_status) { LEVEL_CROSSING_CLOSED: spriteset_HSRL_levcrossclosed; @@ -82,11 +127,11 @@ item(FEAT_RAILTYPES, item_HSRL) { maintenance_cost: 24; station_graphics: RAILTYPE_STATION_NORMAL; - railtype_flags: bitmask(0); + railtype_flags: bitmask(RAILTYPE_FLAG_CATENARY); } if (param_enable_lvlcross == 0) { property { - railtype_flags: bitmask(RAILTYPE_FLAG_NO_LEVEL_CROSSING); + railtype_flags: bitmask(RAILTYPE_FLAG_NO_LEVEL_CROSSING, RAILTYPE_FLAG_CATENARY); } } if (param_enable_speed_limits == 1) { @@ -101,8 +146,9 @@ item(FEAT_RAILTYPES, item_HSRL) { tunnels: spriteset_HSRL_tunnel; level_crossings: switch_HSRL_levcross; bridge_surfaces: spriteset_HSRL_bridges; - //catenary_wire: spriteset_HSRL_catwire; - //catenary_pylons: spriteset_HSRL_catpol; + //purchase: spriteset_HSRL_buy; + catenary_wire: spriteset_HSRL_catwire; + catenary_pylons: spriteset_HSRL_catpol; //fences: switch_HSRL_fences; } } \ No newline at end of file diff --git a/trainXtensionGRF/src/templates.pnml b/trainXtensionGRF/src/templates.pnml index f3f9ae24..45b33956 100644 --- a/trainXtensionGRF/src/templates.pnml +++ b/trainXtensionGRF/src/templates.pnml @@ -18,14 +18,14 @@ template tmpl_engine_buy(x, y) { // For engine buy menu sprites. template tmpl_wagon(x, y) { // For 4-view wagons. // Same as for engine, but only 4 views and different offsets // y should be in steps of 25 - [x , y, 8, 24, -3, -12] - [x+ 9, y, 22, 17, -14, -9] - [x+ 32, y, 32, 12, -16, -8] - [x+ 65, y, 22, 17, -6, -9] + [x , y, 8, 30, -3, -18] + [x+ 9, y, 22, 23, -14, -15] + [x+ 32, y, 32, 18, -16, -14] + [x+ 65, y, 22, 23, -6, -15] } template tmpl_wagon_buy(x, y) { // For 4-view wagons buy menu. // 3rd spritefrom 'tmpl_wagon' - [x+ 32, y, 32, 12, -16, -8] + [x+ 32, y, 32, 18, -16, -9] } template tmpl_overlay() { //left_x, upper_y, width, height, offset_x, offset_y diff --git a/trainXtensionGRF/trainXTension.grf b/trainXtensionGRF/trainXTension.grf index bb93a30e..8b0a814a 100644 Binary files a/trainXtensionGRF/trainXTension.grf and b/trainXtensionGRF/trainXTension.grf differ