From 9aa2c2252ad6d801e2401d2e7b2a7a9ab0a2a6a1 Mon Sep 17 00:00:00 2001 From: Alejandro Aguilera Date: Fri, 23 Sep 2011 11:08:46 +0200 Subject: [PATCH] Added netherbrick stairs. --- overviewer_core/chunk.py | 2 +- overviewer_core/textures.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/overviewer_core/chunk.py b/overviewer_core/chunk.py index 943cd90..6cf552c 100644 --- a/overviewer_core/chunk.py +++ b/overviewer_core/chunk.py @@ -130,7 +130,7 @@ transparent_blocks = set([ 0, 6, 8, 9, 18, 20, 26, 27, 28, 29, 30, 31, 32, 33 34, 37, 38, 39, 40, 44, 50, 51, 52, 53, 55, 59, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 74, 75, 76, 77, 78, 79, 81, 83, 85, 90, 92, 93, 94, 96, 101, 102, 104, 105, - 106, 107, 108, 109, 113]) + 106, 107, 108, 109, 113, 114]) # This set holds block ids that are solid blocks solid_blocks = set([1, 2, 3, 4, 5, 7, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 7b438d0..8e18cd4 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -940,7 +940,7 @@ def generate_special_texture(blockID, data): return generate_texture_tuple(img, blockID) - if blockID in (53,67, 108, 109): # wooden, stone brick, and cobblestone stairs. + if blockID in (53,67, 108, 109, 114): # wooden, stone brick, cobblestone and netherbrick stairs. if blockID == 53: # wooden texture = terrain_images[4] @@ -950,6 +950,8 @@ def generate_special_texture(blockID, data): texture = terrain_images[7] elif blockID == 109: # stone brick stairs texture = terrain_images[54] + elif blockID == 114: # netherbrick stairs + texture = terrain_images[224] side = texture.copy() half_block_u = texture.copy() # up, down, left, right @@ -2338,7 +2340,7 @@ special_blocks = set([ 2, 6, 9, 17, 18, 20, 26, 23, 27, 28, 29, 31, 33, 34, 35, 43, 44, 50, 51, 53, 54, 55, 58, 59, 61, 62, 63, 64, 65, 66, 67, 68, 70, 71, 72, 75, 76, 79, 85, 86, 90, 91, 92, 93, 94, 96, 98, 99, 100, 101, 102, - 104, 105, 106, 107, 108, 109, 113]) + 104, 105, 106, 107, 108, 109, 113, 114]) # this is a map of special blockIDs to a list of all # possible values for ancillary data that it might have. @@ -2407,6 +2409,7 @@ special_map[107] = range(8) # fence gates, orientation + open bit special_map[108] = range(4) # red stairs, orientation special_map[109] = range(4) # stonebrick stairs, orientation special_map[113] = range(16) # netherbrick fence, uses pseudo data +special_map[114] = range(4) # netherbrick stairs, orientation # placeholders that are generated in generate() bgcolor = None