From 1cb1cfe21867147d4167010738c0e38b71b6732d Mon Sep 17 00:00:00 2001 From: Capricorno Date: Mon, 15 Aug 2016 22:25:15 +0000 Subject: [PATCH 1/4] Removed missing textures' links. --- src/content_mapnode_stair.cpp | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/src/content_mapnode_stair.cpp b/src/content_mapnode_stair.cpp index eed5dc3..2d31f28 100644 --- a/src/content_mapnode_stair.cpp +++ b/src/content_mapnode_stair.cpp @@ -468,19 +468,14 @@ void content_mapnode_stair(bool repeat) f = &content_features(i); f->param_type = CPT_FACEDIR_SIMPLE; f->rotate_tile_with_nodebox = true; - f->setTexture(0,"brick_stair_corner_top.png"); - f->setTexture(1,"brick_bottom.png"); - f->setTexture(2,"brick_stair_corner_front_2.png"); - f->setTexture(3,"brick_stair_corner_front_3.png"); - f->setTexture(4,"brick_stair_corner_front_4.png"); - f->setTexture(5,"brick_stair_corner_front_5.png"); + f->setAllTextures("brick.png"); f->draw_type = CDT_NODEBOX; f->is_ground_content = true; f->dug_item = std::string("CraftItem clay_brick 24"); content_nodebox_stair_corner(f); - f->setInventoryTextureNodeBox(i,"brick_stair_corner_top.png", - "brick_stair_corner_front_5.png", - "brick_stair_corner_front_2.png"); + f->setInventoryTextureNodeBox(i,"brick.png", + "brick.png", + "brick.png"); f->type = CMT_STONE; f->hardness = 1.0; f->onpunch_replace_node = CONTENT_BRICK_INNER_STAIR_CORNER; @@ -638,19 +633,14 @@ void content_mapnode_stair(bool repeat) f = &content_features(i); f->param_type = CPT_FACEDIR_SIMPLE; f->rotate_tile_with_nodebox = true; - f->setTexture(0,"brick_bottom.png"); - f->setTexture(1,"brick_stair_ud_corner_top.png"); - f->setTexture(2,"brick_stair_ud_corner_front_2.png"); - f->setTexture(3,"brick_stair_ud_corner_front_3.png"); - f->setTexture(4,"brick_stair_ud_corner_front_4.png"); - f->setTexture(5,"brick_stair_ud_corner_front_5.png"); + f->setAllTextures("brick.png"); f->draw_type = CDT_NODEBOX; f->is_ground_content = true; f->dug_item = std::string("CraftItem clay_brick 24"); content_nodebox_stair_cornerud(f); - f->setInventoryTextureNodeBox(i,"brick_stair_corner_top.png", - "brick_stair_ud_corner_front_5.png", - "brick_stair_ud_corner_front_2.png"); + f->setInventoryTextureNodeBox(i,"brick.png", + "brick.png", + "brick.png"); f->type = CMT_STONE; f->hardness = 1.0; f->onpunch_replace_node = CONTENT_BRICK_INNER_STAIR_CORNER_UD; From e0eaad366776cc468b1d49cd3131305b883fb9fe Mon Sep 17 00:00:00 2001 From: Capricorno Date: Wed, 24 Aug 2016 23:10:29 +0000 Subject: [PATCH 2/4] Fix for the wrong drop quantity. --- src/content_mapnode_stair.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/content_mapnode_stair.cpp b/src/content_mapnode_stair.cpp index eed5dc3..e74bcea 100644 --- a/src/content_mapnode_stair.cpp +++ b/src/content_mapnode_stair.cpp @@ -646,7 +646,7 @@ void content_mapnode_stair(bool repeat) f->setTexture(5,"brick_stair_ud_corner_front_5.png"); f->draw_type = CDT_NODEBOX; f->is_ground_content = true; - f->dug_item = std::string("CraftItem clay_brick 24"); + f->dug_item = std::string("CraftItem clay_brick 4"); content_nodebox_stair_cornerud(f); f->setInventoryTextureNodeBox(i,"brick_stair_corner_top.png", "brick_stair_ud_corner_front_5.png", @@ -663,7 +663,7 @@ void content_mapnode_stair(bool repeat) f->draw_type = CDT_NODEBOX; f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+ - itos(CONTENT_SAND)+ " 24"; + itos(CONTENT_SAND)+ " 4"; content_nodebox_stair_cornerud(f); f->setInventoryTextureNodeBox(i,"sandstone.png", "sandstone.png", From e03a4a0d0ffdb1a125092702f341a2576667668c Mon Sep 17 00:00:00 2001 From: Capricorno Date: Wed, 24 Aug 2016 23:14:55 +0000 Subject: [PATCH 3/4] Lowered fireball's lifetime. --- src/content_mob.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content_mob.cpp b/src/content_mob.cpp index 7e4b788..f701819 100644 --- a/src/content_mob.cpp +++ b/src/content_mob.cpp @@ -450,7 +450,7 @@ void content_mob_init() f->description = wgettext("Fireball"); f->level = MOB_DESTRUCTIVE; f->setTexture("mob_fireball.png"); - f->lifetime = 20.0; + f->lifetime = 10.0; f->punch_action = MPA_IGNORE; f->motion = MM_CONSTANT; f->motion_type = MMT_FLY; From b8ef0053a0e29f5998115483a16530b610f1e839 Mon Sep 17 00:00:00 2001 From: Capricorno Date: Wed, 24 Aug 2016 23:24:07 +0000 Subject: [PATCH 4/4] Readded brick bottom's texture. --- src/content_mapnode_stair.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/content_mapnode_stair.cpp b/src/content_mapnode_stair.cpp index 2d31f28..67ffcf0 100644 --- a/src/content_mapnode_stair.cpp +++ b/src/content_mapnode_stair.cpp @@ -469,6 +469,7 @@ void content_mapnode_stair(bool repeat) f->param_type = CPT_FACEDIR_SIMPLE; f->rotate_tile_with_nodebox = true; f->setAllTextures("brick.png"); + f->setTexture(1,"brick_bottom.png"); f->draw_type = CDT_NODEBOX; f->is_ground_content = true; f->dug_item = std::string("CraftItem clay_brick 24"); @@ -634,6 +635,7 @@ void content_mapnode_stair(bool repeat) f->param_type = CPT_FACEDIR_SIMPLE; f->rotate_tile_with_nodebox = true; f->setAllTextures("brick.png"); + f->setTexture(1,"brick_bottom.png"); f->draw_type = CDT_NODEBOX; f->is_ground_content = true; f->dug_item = std::string("CraftItem clay_brick 24");