Futuray-pgm
/
voxelands
forked from oerkki/voxelands
1
1
Fork 0
Code Pull Requests Activity

Overlay water and lava onto buckets to reduce textures, ditto for the redundant gate textures

This commit is contained in:
sdzen 2016-02-12 17:49:17 -05:00
parent 36b29f8b80
commit 3e04d6987d
13 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/textures/bucket_lava.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 481 B

BIN
data/textures/bucket_water.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 521 B

BIN
data/textures/gate_steel.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 622 B

BIN
data/textures/gate_wood.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 677 B

BIN
data/textures/tool_steelbucket.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 254 B

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
data/textures/tool_steelbucket_lava.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 295 B

BIN
data/textures/tool_steelbucket_water.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 296 B

BIN
data/textures/tool_tinbucket.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 240 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
data/textures/tool_tinbucket_water.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 274 B

BIN
data/textures/tool_woodbucket.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 443 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
data/textures/tool_woodbucket_water.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 390 B

4
src/content_mapnode_door.cpp
View File

@ -1437,7 +1437,7 @@ void content_mapnode_door(bool repeat)
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = wgettext("Wood Gate");
f->setAllTextures("gate_wood.png");
f->setAllTextures("wood.png");
f->rotate_tile_with_nodebox = true;
f->setInventoryTexture("gate_wood_inv.png");
f->wield_nodebox = false;
@ -1462,7 +1462,7 @@ void content_mapnode_door(bool repeat)
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = wgettext("Steel Gate");
f->setAllTextures("gate_steel.png");
f->setAllTextures("steel.png");
f->rotate_tile_with_nodebox = true;
f->setInventoryTexture("gate_steel_inv.png");
f->wield_nodebox = false;

8
src/content_toolitem.cpp
View File

@ -513,7 +513,7 @@ void content_toolitem_init()
i = CONTENT_TOOLITEM_WBUCKET_WATER;
f = &g_content_toolitem_features[i];
f->content = i;
f->texture = "tool_woodbucket_water.png";
f->texture = "tool_woodbucket.png^bucket_water.png";
f->name = "WBucket_water";
f->description = wgettext("Wooden Bucket of Water");
f->type = TT_SPECIAL;
@ -524,7 +524,7 @@ void content_toolitem_init()
i = CONTENT_TOOLITEM_TINBUCKET_WATER;
f = &g_content_toolitem_features[i];
f->content = i;
f->texture = "tool_tinbucket_water.png";
f->texture = "tool_tinbucket.png^bucket_water.png";
f->name = "TinBucket_water";
f->description = wgettext("Tin Bucket of Water");
f->type = TT_SPECIAL;
@ -550,7 +550,7 @@ void content_toolitem_init()
i = CONTENT_TOOLITEM_STEELBUCKET_WATER;
f = &g_content_toolitem_features[i];
f->content = i;
f->texture = "tool_steelbucket_water.png";
f->texture = "tool_steelbucket.png^bucket_water.png";
f->name = "SteelBucket_water";
f->description = wgettext("Steel Bucket of Water");
f->type = TT_SPECIAL;
@ -561,7 +561,7 @@ void content_toolitem_init()
i = CONTENT_TOOLITEM_STEELBUCKET_LAVA;
f = &g_content_toolitem_features[i];
f->content = i;
f->texture = "tool_steelbucket_lava.png";
f->texture = "tool_steelbucket.png^bucket_lava.png";
f->name = "SteelBucket_lava";
f->description = wgettext("Steel Bucket of Lava");
f->onplace_node = CONTENT_LAVASOURCE;