diff --git a/grf/alpine/alpine.py b/grf/alpine/alpine.py index 3f1bf958d9..cedb7308e0 100644 --- a/grf/alpine/alpine.py +++ b/grf/alpine/alpine.py @@ -227,31 +227,65 @@ def tmpl_tree_narrow(func, **kw): func(240, 0, 35, 80, xofs=-19, yofs=-73, **kw) +def tmpl_tree_wide(func, **kw): + func( 0, 0, 45, 80, xofs=-24, yofs=-73, **kw) + func( 50, 0, 45, 80, xofs=-24, yofs=-73, **kw) + func(100, 0, 45, 80, xofs=-24, yofs=-73, **kw) + func(150, 0, 45, 80, xofs=-24, yofs=-73, **kw) + func(200, 0, 45, 80, xofs=-24, yofs=-73, **kw) + func(250, 0, 45, 80, xofs=-24, yofs=-73, **kw) + func(300, 0, 45, 80, xofs=-24, yofs=-73, **kw) + + TREES = [ - (1709, 'tree_01_conifer.gimp.png'), - (1765, 'tree_01_snow_conifer.gimp.png'), - (1744, 'tree_04_conifer.gimp.png'), - (1800, 'tree_04_snow_conifer.gimp.png'), - (1751, 'tree_05_conifer.gimp.png'), - (1807, 'tree_05_snow_conifer.gimp.png'), - (1716, 'tree_06_leaf.gimp.png'), - (1772, 'tree_06_snow_leaf.gimp.png'), - (1723, 'tree_07_leaf.gimp.png'), - (1779, 'tree_07_snow_leaf.gimp.png'), - (1730, 'tree_08_conifer.gimp.png'), - (1786, 'tree_08_snow_conifer.gimp.png'), - (1737, 'tree_09_conifer.gimp.png'), - (1793, 'tree_09_snow_conifer.gimp.png'), - (1758, 'tree_10_leaf.gimp.png'), - (1814, 'tree_10_snow_leaf.gimp.png'), + (1576, 'temperate/tree_wide_01_leaf.gimp.png', True), + (1583, 'temperate/tree_wide_02_leaf.gimp.png', True), + (1590, 'temperate/tree_wide_03_conifer.gimp.png', True), + (1597, 'arctic/tree_01_conifer.gimp.png', False), + (1604, 'temperate/tree_wide_05_leaf.gimp.png', True), + (1611, 'arctic/tree_08_conifer.gimp.png', False), + (1618, 'temperate/tree_wide_07_leaf.gimp.png', True), + (1625, 'arctic/tree_06_leaf.gimp.png', False), + (1632, 'arctic/tree_07_leaf.gimp.png', False), + (1639, 'arctic/tree_10_leaf.gimp.png', False), + (1646, 'temperate/tree_wide_11_leaf.gimp.png', True), + (1653, 'temperate/tree_wide_12_leaf.gimp.png', True), + (1660, 'temperate/tree_wide_13_leaf.gimp.png', True), + (1667, 'arctic/tree_09_conifer.gimp.png', False), + (1674, 'temperate/tree_wide_15_leaf.gimp.png', True), + (1681, 'temperate/tree_wide_16_leaf.gimp.png', True), + (1688, 'temperate/tree_wide_17_leaf.gimp.png', True), + (1695, 'temperate/tree_wide_18_leaf.gimp.png', True), + (1702, 'temperate/tree_wide_19_leaf.gimp.png', True), + + # Arctic trees with snow + (1709, 'tree_01_conifer.gimp.png', False), + (1716, 'tree_06_leaf.gimp.png', False), + (1723, 'tree_07_leaf.gimp.png', False), + (1730, 'tree_08_conifer.gimp.png', False), + (1737, 'tree_09_conifer.gimp.png', False), + (1744, 'tree_04_conifer.gimp.png', False), + (1751, 'tree_05_conifer.gimp.png', False), + (1758, 'tree_10_leaf.gimp.png', False), + (1765, 'tree_01_snow_conifer.gimp.png', False), + (1772, 'tree_06_snow_leaf.gimp.png', False), + (1779, 'tree_07_snow_leaf.gimp.png', False), + (1786, 'tree_08_snow_conifer.gimp.png', False), + (1793, 'tree_09_snow_conifer.gimp.png', False), + (1800, 'tree_04_snow_conifer.gimp.png', False), + (1807, 'tree_05_snow_conifer.gimp.png', False), + (1814, 'tree_10_snow_leaf.gimp.png', False), ] -for sprite_id, file in TREES: +for sprite_id, file, is_wide in TREES: gen.add_sprite(grf.ReplaceSprites([(sprite_id, 7)])) png = grf.ImageFile('gfx/trees/' + file) sprite = lambda *args, **kw: gen.add_sprite(grf.FileSprite(png, *args, **kw)) - tmpl_tree_narrow(sprite) + if is_wide: + tmpl_tree_wide(sprite) + else: + tmpl_tree_narrow(sprite) # Tile slope to sprite offset diff --git a/grf/alpine/gen_tree_sprites.py b/grf/alpine/gen_tree_sprites.py index c06ffa7080..8ff2d27894 100644 --- a/grf/alpine/gen_tree_sprites.py +++ b/grf/alpine/gen_tree_sprites.py @@ -5,7 +5,8 @@ import numpy as np import grf -SOURCE_DIR = "/home/pavels/Projects/cmclient/local/ogfx-landscape-1.1.2-source/src/gfx" +# SOURCE_DIR = "/home/pavels/Projects/cmclient/local/ogfx-landscape-1.1.2-source/src/gfx" +SOURCE_DIR = "gfx/trees_ogfx" class TreeImageFile(grf.ImageFile): def get_image(self): diff --git a/grf/alpine/gfx/trees/arctic/tree_01_conifer.gimp.png b/grf/alpine/gfx/trees/arctic/tree_01_conifer.gimp.png new file mode 100644 index 0000000000..4b361f2566 Binary files /dev/null and b/grf/alpine/gfx/trees/arctic/tree_01_conifer.gimp.png differ diff --git a/grf/alpine/gfx/trees/arctic/tree_01_snow_conifer.gimp.png b/grf/alpine/gfx/trees/arctic/tree_01_snow_conifer.gimp.png new file mode 100644 index 0000000000..6032869d0b Binary files /dev/null and b/grf/alpine/gfx/trees/arctic/tree_01_snow_conifer.gimp.png differ diff --git a/grf/alpine/gfx/trees/arctic/tree_04_conifer.gimp.png b/grf/alpine/gfx/trees/arctic/tree_04_conifer.gimp.png new file mode 100644 index 0000000000..cea0023c4e Binary files /dev/null and b/grf/alpine/gfx/trees/arctic/tree_04_conifer.gimp.png differ diff --git a/grf/alpine/gfx/trees/arctic/tree_04_snow_conifer.gimp.png b/grf/alpine/gfx/trees/arctic/tree_04_snow_conifer.gimp.png new file mode 100644 index 0000000000..566e46f41d Binary files /dev/null and b/grf/alpine/gfx/trees/arctic/tree_04_snow_conifer.gimp.png differ diff --git a/grf/alpine/gfx/trees/arctic/tree_05_conifer.gimp.png b/grf/alpine/gfx/trees/arctic/tree_05_conifer.gimp.png new file mode 100644 index 0000000000..99466af1c7 Binary files /dev/null and b/grf/alpine/gfx/trees/arctic/tree_05_conifer.gimp.png differ diff --git a/grf/alpine/gfx/trees/arctic/tree_05_snow_conifer.gimp.png b/grf/alpine/gfx/trees/arctic/tree_05_snow_conifer.gimp.png new file mode 100644 index 0000000000..829b81953d Binary files /dev/null and b/grf/alpine/gfx/trees/arctic/tree_05_snow_conifer.gimp.png differ diff --git a/grf/alpine/gfx/trees/arctic/tree_06_leaf.gimp.png b/grf/alpine/gfx/trees/arctic/tree_06_leaf.gimp.png new file mode 100644 index 0000000000..52a15e9c26 Binary files /dev/null and b/grf/alpine/gfx/trees/arctic/tree_06_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/arctic/tree_06_snow_leaf.gimp.png b/grf/alpine/gfx/trees/arctic/tree_06_snow_leaf.gimp.png new file mode 100644 index 0000000000..f89db80eb1 Binary files /dev/null and b/grf/alpine/gfx/trees/arctic/tree_06_snow_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/arctic/tree_07_leaf.gimp.png b/grf/alpine/gfx/trees/arctic/tree_07_leaf.gimp.png new file mode 100644 index 0000000000..8494aee92f Binary files /dev/null and b/grf/alpine/gfx/trees/arctic/tree_07_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/arctic/tree_07_snow_leaf.gimp.png b/grf/alpine/gfx/trees/arctic/tree_07_snow_leaf.gimp.png new file mode 100644 index 0000000000..cdd32950af Binary files /dev/null and b/grf/alpine/gfx/trees/arctic/tree_07_snow_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/arctic/tree_08_conifer.gimp.png b/grf/alpine/gfx/trees/arctic/tree_08_conifer.gimp.png new file mode 100644 index 0000000000..d30d1eb637 Binary files /dev/null and b/grf/alpine/gfx/trees/arctic/tree_08_conifer.gimp.png differ diff --git a/grf/alpine/gfx/trees/arctic/tree_08_snow_conifer.gimp.png b/grf/alpine/gfx/trees/arctic/tree_08_snow_conifer.gimp.png new file mode 100644 index 0000000000..d71215e71c Binary files /dev/null and b/grf/alpine/gfx/trees/arctic/tree_08_snow_conifer.gimp.png differ diff --git a/grf/alpine/gfx/trees/arctic/tree_09_conifer.gimp.png b/grf/alpine/gfx/trees/arctic/tree_09_conifer.gimp.png new file mode 100644 index 0000000000..b984e2347a Binary files /dev/null and b/grf/alpine/gfx/trees/arctic/tree_09_conifer.gimp.png differ diff --git a/grf/alpine/gfx/trees/arctic/tree_09_snow_conifer.gimp.png b/grf/alpine/gfx/trees/arctic/tree_09_snow_conifer.gimp.png new file mode 100644 index 0000000000..142635ec57 Binary files /dev/null and b/grf/alpine/gfx/trees/arctic/tree_09_snow_conifer.gimp.png differ diff --git a/grf/alpine/gfx/trees/arctic/tree_10_leaf.gimp.png b/grf/alpine/gfx/trees/arctic/tree_10_leaf.gimp.png new file mode 100644 index 0000000000..5ce9a9384a Binary files /dev/null and b/grf/alpine/gfx/trees/arctic/tree_10_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/arctic/tree_10_snow_leaf.gimp.png b/grf/alpine/gfx/trees/arctic/tree_10_snow_leaf.gimp.png new file mode 100644 index 0000000000..09d6b915b8 Binary files /dev/null and b/grf/alpine/gfx/trees/arctic/tree_10_snow_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/temperate/tree_wide_01_leaf.gimp.png b/grf/alpine/gfx/trees/temperate/tree_wide_01_leaf.gimp.png new file mode 100644 index 0000000000..60a1502f9c Binary files /dev/null and b/grf/alpine/gfx/trees/temperate/tree_wide_01_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/temperate/tree_wide_02_leaf.gimp.png b/grf/alpine/gfx/trees/temperate/tree_wide_02_leaf.gimp.png new file mode 100644 index 0000000000..1adb5b83ea Binary files /dev/null and b/grf/alpine/gfx/trees/temperate/tree_wide_02_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/temperate/tree_wide_03_conifer.gimp.png b/grf/alpine/gfx/trees/temperate/tree_wide_03_conifer.gimp.png new file mode 100644 index 0000000000..43d02079c9 Binary files /dev/null and b/grf/alpine/gfx/trees/temperate/tree_wide_03_conifer.gimp.png differ diff --git a/grf/alpine/gfx/trees/temperate/tree_wide_05_leaf.gimp.png b/grf/alpine/gfx/trees/temperate/tree_wide_05_leaf.gimp.png new file mode 100644 index 0000000000..67cbe87063 Binary files /dev/null and b/grf/alpine/gfx/trees/temperate/tree_wide_05_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/temperate/tree_wide_07_leaf.gimp.png b/grf/alpine/gfx/trees/temperate/tree_wide_07_leaf.gimp.png new file mode 100644 index 0000000000..5e4deb19d7 Binary files /dev/null and b/grf/alpine/gfx/trees/temperate/tree_wide_07_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/temperate/tree_wide_11_leaf.gimp.png b/grf/alpine/gfx/trees/temperate/tree_wide_11_leaf.gimp.png new file mode 100644 index 0000000000..3462f1ce05 Binary files /dev/null and b/grf/alpine/gfx/trees/temperate/tree_wide_11_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/temperate/tree_wide_12_leaf.gimp.png b/grf/alpine/gfx/trees/temperate/tree_wide_12_leaf.gimp.png new file mode 100644 index 0000000000..af75ade90c Binary files /dev/null and b/grf/alpine/gfx/trees/temperate/tree_wide_12_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/temperate/tree_wide_13_leaf.gimp.png b/grf/alpine/gfx/trees/temperate/tree_wide_13_leaf.gimp.png new file mode 100644 index 0000000000..88874acc9a Binary files /dev/null and b/grf/alpine/gfx/trees/temperate/tree_wide_13_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/temperate/tree_wide_15_leaf.gimp.png b/grf/alpine/gfx/trees/temperate/tree_wide_15_leaf.gimp.png new file mode 100644 index 0000000000..3d6b755d3b Binary files /dev/null and b/grf/alpine/gfx/trees/temperate/tree_wide_15_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/temperate/tree_wide_16_leaf.gimp.png b/grf/alpine/gfx/trees/temperate/tree_wide_16_leaf.gimp.png new file mode 100644 index 0000000000..3193bae164 Binary files /dev/null and b/grf/alpine/gfx/trees/temperate/tree_wide_16_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/temperate/tree_wide_17_leaf.gimp.png b/grf/alpine/gfx/trees/temperate/tree_wide_17_leaf.gimp.png new file mode 100644 index 0000000000..7b56295225 Binary files /dev/null and b/grf/alpine/gfx/trees/temperate/tree_wide_17_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/temperate/tree_wide_18_leaf.gimp.png b/grf/alpine/gfx/trees/temperate/tree_wide_18_leaf.gimp.png new file mode 100644 index 0000000000..b7da95211c Binary files /dev/null and b/grf/alpine/gfx/trees/temperate/tree_wide_18_leaf.gimp.png differ diff --git a/grf/alpine/gfx/trees/temperate/tree_wide_19_leaf.gimp.png b/grf/alpine/gfx/trees/temperate/tree_wide_19_leaf.gimp.png new file mode 100644 index 0000000000..d0e8730e59 Binary files /dev/null and b/grf/alpine/gfx/trees/temperate/tree_wide_19_leaf.gimp.png differ