Skip to content

Commit bcd0a51

Browse files
zephyriszephyris
committed
Fix: Also replace normal gridline/terrain combo using landscape newgrf
Fixes #60
1 parent 4239dd6 commit bcd0a51

File tree

2 files changed

+58
-0
lines changed

2 files changed

+58
-0
lines changed

‎newgrf/nml/landscape/landscape_standard-gridline.pnml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
// Water gridlines //
2+
if (param_gridlines==0 || param_gridlines==1) {
3+
// 4061 flat water tile
4+
if (climate != CLIMATE_TOYLAND) {
5+
replace gridline_water_tile(4061, "../graphics/terrain/64/universal_watertiles_8bpp.png") { template_flattile_single(0, 0, 1) }
6+
#ez alternative_sprites(gridline_water_tile, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "../graphics/terrain/128/universal_watertiles_8bpp.png") { template_flattile_single(0, 0, 2) }
7+
#ez alternative_sprites(gridline_water_tile, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/terrain/256/universal_watertiles_8bpp.png") { template_flattile_single(0, 0, 4) }
8+
} else if (climate == CLIMATE_TOYLAND) {
9+
replace gridline_water_tile_toyland(4061, "../graphics/terrain/64/toyland_watertiles_8bpp.png") { template_flattile_single(0, 0, 1) }
10+
#ez alternative_sprites(gridline_water_tile_toyland, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "../graphics/terrain/128/toyland_watertiles_8bpp.png") { template_flattile_single(0, 0, 2) }
11+
#ez alternative_sprites(gridline_water_tile_toyland, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/terrain/256/toyland_watertiles_8bpp.png") { template_flattile_single(0, 0, 4) }
12+
}
13+
}
14+
15+
// Gridlines //
16+
template template_gridline_field_tiles(z) {
17+
template_groundtiles(0, 0, z)
18+
template_groundtiles(0, 49, z)
19+
template_groundtiles(0, 98, z)
20+
template_groundtiles(0, 147, z)
21+
template_groundtiles(0, 196, z)
22+
template_groundtiles(0, 245, z)
23+
template_groundtiles(0, 294, z)
24+
template_groundtiles(0, 343, z)
25+
template_groundtiles(0, 392, z)
26+
}
27+
if (param_gridlines==0 || param_gridlines==2) {
28+
//4126-4296 farm field tiles
29+
replace gridline_field_tiles(4126, "../graphics/terrain/64/pygen/farm_groundtiles_gridline_8bpp.png") { template_gridline_field_tiles(1) }
30+
#ez alternative_sprites(gridline_field_tiles, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "../graphics/terrain/128/pygen/farm_groundtiles_gridline_8bpp.png") { template_gridline_field_tiles(2) }
31+
#ez alternative_sprites(gridline_field_tiles, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/terrain/256/pygen/farm_groundtiles_gridline_8bpp.png") { template_gridline_field_tiles(4) }
32+
#32 alternative_sprites(gridline_field_tiles, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "../graphics/terrain/64/pygen/farm_groundtiles_gridline_bt32bpp.png") { template_gridline_field_tiles(1) }
33+
#32 #ez alternative_sprites(gridline_field_tiles, ZOOM_LEVEL_IN_2X, BIT_DEPTH_32BPP, "../graphics/terrain/128/pygen/farm_groundtiles_gridline_bt32bpp.png") { template_gridline_field_tiles(2) }
34+
#32 #ez alternative_sprites(gridline_field_tiles, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/terrain/256/pygen/farm_groundtiles_gridline_bt32bpp.png") { template_gridline_field_tiles(4) }
35+
36+
if (climate == CLIMATE_ARCTIC) {
37+
//4550-4568 full snow 4/4
38+
replace gridline_snow_tiles(4550, "../graphics/terrain/64/pygen/arctic_groundtiles_snow_gridline_8bpp.png") { template_groundtiles(0, 0, 1) }
39+
#ez alternative_sprites(gridline_snow_tiles, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "../graphics/terrain/128/pygen/arctic_groundtiles_snow_gridline_8bpp.png") { template_groundtiles(0, 0, 2) }
40+
#ez alternative_sprites(gridline_snow_tiles, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/terrain/256/pygen/arctic_groundtiles_snow_gridline_8bpp.png") { template_groundtiles(0, 0, 4) }
41+
#32 alternative_sprites(gridline_snow_tiles, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "../graphics/terrain/64/pygen/arctic_groundtiles_snow_gridline_bt32bpp.png") { template_groundtiles(0, 0, 1) }
42+
#32 #ez alternative_sprites(gridline_snow_tiles, ZOOM_LEVEL_IN_2X, BIT_DEPTH_32BPP, "../graphics/terrain/128/pygen/arctic_groundtiles_snow_gridline_bt32bpp.png") { template_groundtiles(0, 0, 2) }
43+
#32 #ez alternative_sprites(gridline_snow_tiles, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/terrain/256/pygen/arctic_groundtiles_snow_gridline_bt32bpp.png") { template_groundtiles(0, 0, 4) }
44+
} else if (climate == CLIMATE_TROPICAL) {
45+
//369-387 desert, 4/4
46+
replace gridline_desert_tiles(4550, "../graphics/terrain/64/pygen/tropical_groundtiles_desert_gridline_8bpp.png") { template_groundtiles(0, 0, 1) }
47+
#ez alternative_sprites(gridline_desert_tiles, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "../graphics/terrain/128/pygen/tropical_groundtiles_desert_gridline_8bpp.png") { template_groundtiles(0, 0, 2) }
48+
#ez alternative_sprites(gridline_desert_tiles, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/terrain/256/pygen/tropical_groundtiles_desert_gridline_8bpp.png") { template_groundtiles(0, 0, 4) }
49+
#32 alternative_sprites(gridline_desert_tiles, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "../graphics/terrain/64/pygen/tropical_groundtiles_desert_gridline_bt32bpp.png") { template_groundtiles(0, 0, 1) }
50+
#32 #ez alternative_sprites(gridline_desert_tiles, ZOOM_LEVEL_IN_2X, BIT_DEPTH_32BPP, "../graphics/terrain/128/pygen/tropical_groundtiles_desert_gridline_bt32bpp.png") { template_groundtiles(0, 0, 2) }
51+
#32 #ez alternative_sprites(gridline_desert_tiles, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/terrain/256/pygen/tropical_groundtiles_desert_gridline_bt32bpp.png") { template_groundtiles(0, 0, 4) }
52+
}
53+
}

‎newgrf/ogfx2_landscape.pnml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
#include "nml/landscape/landscape-header.pnml"
22
#include "../templates/zoom-sensitive.pnml"
3+
4+
//Parameter-controlled replacement, from baseset extra NewGRF
35
#include "../baseset/nml/extra/extra-param-foundations.pnml"
46
#include "../baseset/nml/extra/extra-param-terrain.pnml"
57
#include "../baseset/nml/extra/extra-plus-canals.pnml"
68
#include "../baseset/nml/extra/extra-plus-rivers.pnml"
79
//#include "../baseset/nml/extra/extra-param-trees.pnml"
10+
11+
//Standard gridlined replacements, extends baseset extra for complete landscape replacement
12+
#include "nml/landscape/landscape_standard-gridline.pnml"

0 commit comments

Comments
 (0)