From 09b0f2de24b831b64c9897a47a7834a657fb74ab Mon Sep 17 00:00:00 2001 From: Capricornus Date: Tue, 4 Jul 2017 17:47:20 +0200 Subject: [PATCH] change - fuel values --- src/content_burntimes.h | 157 ++++++++++++++++++++++++++++ src/content_craftitem.cpp | 17 +-- src/content_mapnode.cpp | 63 +++++------ src/content_mapnode_door.cpp | 55 +++++----- src/content_mapnode_farm.cpp | 25 ++--- src/content_mapnode_furniture.cpp | 167 +++++++++++++++--------------- src/content_mapnode_plants.cpp | 89 ++++++++-------- src/content_mapnode_sign.cpp | 37 +++---- src/content_mapnode_slab.cpp | 13 +-- src/content_mapnode_special.cpp | 21 ++-- src/content_mapnode_stair.cpp | 37 +++---- src/content_toolitem.cpp | 3 +- 12 files changed, 426 insertions(+), 258 deletions(-) create mode 100644 src/content_burntimes.h diff --git a/src/content_burntimes.h b/src/content_burntimes.h new file mode 100644 index 0000000..844a58b --- /dev/null +++ b/src/content_burntimes.h @@ -0,0 +1,157 @@ +/************************************************************************ +* Minetest-c55 +* Copyright (C) 2010-2011 celeron55, Perttu Ahola +* +* content_burntimes.h +* voxelands - 3d voxel world sandbox game +* Copyright (C) Lisa 'darkrose' Milne 2014 +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +* See the GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see +* +* License updated from GPLv2 or later to GPLv3 or later by Lisa Milne +* for Voxelands. +************************************************************************/ + +#define BT_DEFAULT 1.0 +/* Burning Time DEFAULT */ +/* 1.0 == one item cooked */ + +#define BT_BED 30.75 /* 3 wood + 3 cotton */ +/* Beds' heads and feet */ + +#define BT_BOOKSHELF 5.0 /* half a wood */ +/* Book shelves */ + +#define BT_BUSH 0.1 /* 10 for an item */ +/* Fern, jungle grass, etc. */ + +#define BT_CAMP_BED 0.5 /* 2 hay */ +/* Camp bed's head and foot */ + +#define BT_CAMP_FIRE 1.0 /* 1 item */ +/* Camp fire */ + +#define BT_CARPET 0.015625 /* 1/16th of a cotton */ +/* Carpets */ + +#define BT_CACTUS 0.1 /* 10 for an item */ +/* Cactus' trunk */ + +#define BT_CHAIR 2.5 /* 1/4th of a wood */ +/* Wooden chairs */ + +#define BT_CLOCK 3.0 /* something less than half a wood */ +/* Wall clock */ + +#define BT_COAL 10.0 /* 10 items */ +/* Coal and charcoal lumps */ + +#define BT_COAL_BLOCK 99.0 /* 1 stack */ +/* Coal and charcoal blocks */ + +#define BT_COLUMN 8.0 /* about 1 wood */ +/* Wooden columns */ + +#define BT_COUCH 0.75 /* 3 cotton */ +/* Couches and armchairs */ + +#define BT_COTTON 0.25 /* 4 for an item */ +/* Cotton */ + +#define BT_DOOR 1.25 /* 2 hatches */ +/* Wooden right and left doors, windowed or not */ + +#define BT_DOOR_GLASS 1.50 /* somehow better than wooden door */ +/* Glass right and left doors */ + +#define BT_FENCE 3.333333 /* about 1/3rd of a wood */ +/* Fences, gates, etc. */ + +#define BT_FLOWER 0.003906 /* 1/4th of a carpet*/ +/* Blossoms, flowers, etc. */ + +#define BT_FRUIT 0.08 /* slightly worse than a cactus */ +/* Apples, cactus fruit, etc. */ + +#define BT_GRASS 0.003906 /* 1/4th of a carpet*/ +/* Wild grass, flower stem, etc.*/ + +#define BT_HATCH 0.625 /* 1/16th of a wood */ +/* Hatches, windowed or not */ + +#define BT_HAY 0.25 /* 4 for an item */ +/* Hay */ + +#define BT_LADDER 0.15625 /* 1/4th of a hatch */ +/* Wooden ladders */ + +#define BT_LAVA 99.0 /* 1 stack */ +/* Lava and lava source */ + +#define BT_LAVA_BUCKET 99.0 /* 1 stack */ +/* Lava bucket*/ + +#define BT_LEAF 0.003906 /* 1/4th of a carpet*/ +/* Tree leaves */ + +#define BT_PAINTING 0.625 /* 1/16th of a wood */ +/* Paintings and painting canvas */ + +#define BT_PLANK 0.1 /* 10 for an item */ +/* Planks */ + +#define BT_SAPLING 0.05 /* 20 for an item */ +/* Tree saplings */ + +#define BT_SCAFFOLDING 3.333333 /* 1/3rd of a wood */ +/* Scaffoldings */ + +#define BT_SEED 0.003125 /* 1/4th of a stick */ +/* Vegetable's seeds */ + +#define BT_SIGN 0.625 /* 1/16th of a wood */ +/* Wooden signs, lockable or not */ + +#define BT_SLAB 5.0 /* half a wood */ +/* Wooden slabs */ + +#define BT_SPONGE 0.2 /* 5 for an item */ +/* Sponges */ + +#define BT_STAIR 5.0 /* half a wood */ +/* Wooden stairs */ + +#define BT_STICK 0.05 /* half a plank or 20 for an item */ +/* Sticks */ + +#define BT_TABLE 2.5 /* 1/4th of a wood */ +/* Tables */ + +#define BT_TILE 0.625 /* 1/16th of a wood */ +/* Wood tile */ + +#define BT_TORCH 0.0125 /* 1/4th of a stick */ +/* Torches */ + +#define BT_TREE 99.0 /* one stack */ +/* Tree trunks */ + +#define BT_TRELLIS 0.625 /* 1/16th of a wood */ +/* Trellises */ + +#define BT_WOOD 10.0 /* 10 items */ +/* Wood, jungle wood, etc. */ + +#define BT_YOUNG_TREE 1.111111 /* 1/9th of a wood */ +/* Young tree trunks */ diff --git a/src/content_craftitem.cpp b/src/content_craftitem.cpp index a95e594..504f768 100644 --- a/src/content_craftitem.cpp +++ b/src/content_craftitem.cpp @@ -30,6 +30,7 @@ #include "content_list.h" #include "intl.h" #include "player.h" +#include "content_burntimes.h" struct CraftItemFeatures g_content_craftitem_features[4096]; @@ -106,7 +107,7 @@ void content_craftitem_init() f->texture = "lump_of_charcoal.png"; f->name = "lump_of_charcoal"; f->description = gettext("Charcoal Lump"); - f->fuel_time = 40; + f->fuel_time = BT_COAL; content_list_add("creative",i,1,0); i = CONTENT_CRAFTITEM_COAL; @@ -115,7 +116,7 @@ void content_craftitem_init() f->texture = "lump_of_coal.png"; f->name = "lump_of_coal"; f->description = gettext("Coal Lump"); - f->fuel_time = 40; + f->fuel_time = BT_COAL; content_list_add("creative",i,1,0); i = CONTENT_CRAFTITEM_IRON; @@ -438,7 +439,7 @@ void content_craftitem_init() f->texture = "stick.png"; f->name = "Stick"; f->description = gettext("Stick"); - f->fuel_time = 30/16; + f->fuel_time = BT_STICK; crafting::set1To2Recipe(CONTENT_CRAFTITEM_PINE_PLANK,CONTENT_CRAFTITEM_STICK); crafting::set1To2Recipe(CONTENT_CRAFTITEM_WOOD_PLANK,CONTENT_CRAFTITEM_STICK); crafting::set1To2Recipe(CONTENT_CRAFTITEM_JUNGLE_PLANK,CONTENT_CRAFTITEM_STICK); @@ -456,7 +457,7 @@ void content_craftitem_init() f->texture = "pine_plank.png"; f->name = "pine_plank"; f->description = gettext("Pine Plank"); - f->fuel_time = 30/16; + f->fuel_time = BT_PLANK; crafting::set1To4Recipe(CONTENT_WOOD_PINE,CONTENT_CRAFTITEM_PINE_PLANK); crafting::set1To2Recipe(CONTENT_YOUNG_CONIFER_TREE,CONTENT_CRAFTITEM_PINE_PLANK); content_list_add("craftguide",i,1,0); @@ -468,7 +469,7 @@ void content_craftitem_init() f->texture = "applewood_plank.png"; f->name = "applewood_plank"; f->description = gettext("Apple Wood Plank"); - f->fuel_time = 30/16; + f->fuel_time = BT_PLANK; crafting::set1To4Recipe(CONTENT_APPLEWOOD,CONTENT_CRAFTITEM_APPLE_PLANK); crafting::set1To2Recipe(CONTENT_YOUNG_APPLE_TREE,CONTENT_CRAFTITEM_APPLE_PLANK); content_list_add("craftguide",i,1,0); @@ -480,7 +481,7 @@ void content_craftitem_init() f->texture = "wood_plank.png"; f->name = "wood_plank"; f->description = gettext("Wood Plank"); - f->fuel_time = 30/16; + f->fuel_time = BT_PLANK; crafting::set1To4Recipe(CONTENT_WOOD,CONTENT_CRAFTITEM_WOOD_PLANK); crafting::set1To2Recipe(CONTENT_YOUNG_TREE,CONTENT_CRAFTITEM_WOOD_PLANK); crafting::set1To2Recipe(CONTENT_YOUNG_APPLE_TREE,CONTENT_CRAFTITEM_WOOD_PLANK); @@ -493,7 +494,7 @@ void content_craftitem_init() f->texture = "jungle_plank.png"; f->name = "jungle_plank"; f->description = gettext("Jungle Wood Plank"); - f->fuel_time = 30/16; + f->fuel_time = BT_PLANK; crafting::set1To4Recipe(CONTENT_JUNGLEWOOD,CONTENT_CRAFTITEM_JUNGLE_PLANK); crafting::set1To2Recipe(CONTENT_YOUNG_JUNGLETREE,CONTENT_CRAFTITEM_JUNGLE_PLANK); content_list_add("craftguide",i,1,0); @@ -534,7 +535,7 @@ void content_craftitem_init() f->sound_use = "use-eat"; f->hunger_effect = 10; f->health_effect = 5; - f->fuel_time = 30/16; + f->fuel_time = BT_FLOWER; content_list_add("creative",i,1,0); i = CONTENT_CRAFTITEM_CACTUS_FRUIT; diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp index 485e5f0..6b1d06f 100644 --- a/src/content_mapnode.cpp +++ b/src/content_mapnode.cpp @@ -40,6 +40,7 @@ #include "tile.h" #endif #include "intl.h" +#include "content_burntimes.h" #define WATER_ALPHA 160 @@ -319,7 +320,7 @@ void content_mapnode_init(bool repeat) f->draw_type = CDT_CUBELIKE; f->is_ground_content = true; f->flammable = 2; // can be set on fire - f->fuel_time = 400; + f->fuel_time = BT_COAL_BLOCK; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->type = CMT_STONE; f->dig_time = 1.0; @@ -336,7 +337,7 @@ void content_mapnode_init(bool repeat) f->draw_type = CDT_CUBELIKE; f->is_ground_content = true; f->flammable = 2; // can be set on fire - f->fuel_time = 400; + f->fuel_time = BT_COAL_BLOCK; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->type = CMT_STONE; f->dig_time = 1.0; @@ -1333,7 +1334,7 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/4; + f->fuel_time = BT_WOOD; f->type = CMT_WOOD; f->dig_time = 0.75; crafting::set1To4Recipe(CONTENT_TREE,CONTENT_WOOD); @@ -1359,7 +1360,7 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/4; + f->fuel_time = BT_WOOD; f->type = CMT_WOOD; f->dig_time = 0.75; crafting::set1To4Recipe(CONTENT_TREE,CONTENT_WOOD); @@ -1385,7 +1386,7 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/4; + f->fuel_time = BT_WOOD; f->type = CMT_WOOD; f->dig_time = 0.75; crafting::set1To4Recipe(CONTENT_JUNGLETREE,CONTENT_JUNGLEWOOD); @@ -1410,7 +1411,7 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_WOOD; f->type = CMT_WOOD; f->dig_time = 0.5; crafting::set1To4Recipe(CONTENT_CONIFER_TREE,CONTENT_WOOD_PINE); @@ -1435,7 +1436,7 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SPONGE; f->type = CMT_DIRT; f->dig_time = 1.0; f->pressure_type = CST_CRUSHABLE; @@ -1465,7 +1466,7 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; - f->fuel_time = 20; + f->fuel_time = BT_HAY; f->type = CMT_PLANT; f->dig_time = 0.6; f->pressure_type = CST_CRUSHABLE; @@ -1821,7 +1822,7 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COTTON; f->type = CMT_DIRT; f->dig_time = 1.0; f->pressure_type = CST_DROPABLE; @@ -1852,7 +1853,7 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COTTON; f->type = CMT_DIRT; f->dig_time = 1.0; f->pressure_type = CST_DROPABLE; @@ -1869,7 +1870,7 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COTTON; f->type = CMT_DIRT; f->dig_time = 1.0; f->pressure_type = CST_DROPABLE; @@ -1886,7 +1887,7 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COTTON; f->type = CMT_DIRT; f->dig_time = 1.0; f->pressure_type = CST_DROPABLE; @@ -1903,7 +1904,7 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COTTON; f->type = CMT_DIRT; f->dig_time = 1.0; f->pressure_type = CST_DROPABLE; @@ -1920,7 +1921,7 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COTTON; f->type = CMT_DIRT; f->dig_time = 1.0; f->pressure_type = CST_DROPABLE; @@ -1937,7 +1938,7 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COTTON; f->type = CMT_DIRT; f->dig_time = 1.0; f->pressure_type = CST_DROPABLE; @@ -1954,7 +1955,7 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COTTON; f->type = CMT_DIRT; f->dig_time = 1.0; f->pressure_type = CST_DROPABLE; @@ -1975,7 +1976,7 @@ void content_mapnode_init(bool repeat) content_nodebox_carpet(f); f->setInventoryTextureNodeBox(i,"cotton.png", "cotton.png", "cotton.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 5; + f->fuel_time = BT_CARPET; f->type = CMT_DIRT; f->dig_time = 1.0; f->pressure_type = CST_CRUSHABLE; @@ -1997,7 +1998,7 @@ void content_mapnode_init(bool repeat) content_nodebox_carpet(f); f->setInventoryTextureNodeBox(i,"cotton_blue.png", "cotton_blue.png", "cotton_blue.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 5; + f->fuel_time = BT_CARPET; f->type = CMT_DIRT; f->dig_time = 1.0; f->pressure_type = CST_CRUSHABLE; @@ -2020,7 +2021,7 @@ void content_mapnode_init(bool repeat) content_nodebox_carpet(f); f->setInventoryTextureNodeBox(i,"cotton_green.png", "cotton_green.png", "cotton_green.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 5; + f->fuel_time = BT_CARPET; f->type = CMT_DIRT; f->dig_time = 1.0; f->pressure_type = CST_CRUSHABLE; @@ -2043,7 +2044,7 @@ void content_mapnode_init(bool repeat) content_nodebox_carpet(f); f->setInventoryTextureNodeBox(i,"cotton_orange.png", "cotton_orange.png", "cotton_orange.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 5; + f->fuel_time = BT_CARPET; f->type = CMT_DIRT; f->dig_time = 1.0; f->pressure_type = CST_CRUSHABLE; @@ -2066,7 +2067,7 @@ void content_mapnode_init(bool repeat) content_nodebox_carpet(f); f->setInventoryTextureNodeBox(i,"cotton_purple.png", "cotton_purple.png", "cotton_purple.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 5; + f->fuel_time = BT_CARPET; f->type = CMT_DIRT; f->dig_time = 1.0; f->pressure_type = CST_CRUSHABLE; @@ -2089,7 +2090,7 @@ void content_mapnode_init(bool repeat) content_nodebox_carpet(f); f->setInventoryTextureNodeBox(i,"cotton_red.png", "cotton_red.png", "cotton_red.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 5; + f->fuel_time = BT_CARPET; f->type = CMT_DIRT; f->dig_time = 1.0; f->pressure_type = CST_CRUSHABLE; @@ -2112,7 +2113,7 @@ void content_mapnode_init(bool repeat) content_nodebox_carpet(f); f->setInventoryTextureNodeBox(i,"cotton_yellow.png", "cotton_yellow.png", "cotton_yellow.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 5; + f->fuel_time = BT_CARPET; f->type = CMT_DIRT; f->dig_time = 1.0; f->suffocation_per_second = 0; @@ -2135,7 +2136,7 @@ void content_mapnode_init(bool repeat) content_nodebox_carpet(f); f->setInventoryTextureNodeBox(i,"cotton_black.png", "cotton_black.png", "cotton_black.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 5; + f->fuel_time = BT_CARPET; f->type = CMT_DIRT; f->dig_time = 1.0; f->pressure_type = CST_CRUSHABLE; @@ -2252,7 +2253,7 @@ void content_mapnode_init(bool repeat) f->diggable = false; f->buildable_to = true; f->flammable = 2; // can be set on fire - f->fuel_time = 100; + f->fuel_time = BT_LAVA; f->pressure_type = CST_CRUSHABLE; f->liquid_type = LIQUID_FLOWING; f->liquid_alternative_flowing = CONTENT_LAVA; @@ -2281,7 +2282,7 @@ void content_mapnode_init(bool repeat) //f->diggable = false; f->buildable_to = true; f->flammable = 2; // can be set on fire - f->fuel_time = 100; + f->fuel_time = BT_LAVA; f->liquid_type = LIQUID_SOURCE; f->dug_item = std::string("_lava"); // won't resolve to an item, but will work when added to a bucket tool name f->liquid_alternative_flowing = CONTENT_LAVA; @@ -2512,7 +2513,7 @@ void content_mapnode_init(bool repeat) content_nodebox_carpet(f); f->setInventoryTextureNodeBox(i,"wood_tile.png", "wood_tile.png", "wood_tile.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 5; + f->fuel_time = BT_TILE; f->type = CMT_WOOD; f->dig_time = 0.5; f->pressure_type = CST_CRUSHABLE; @@ -2824,7 +2825,7 @@ void content_mapnode_init(bool repeat) f->onpunch_replace_respects_borderstone = true; f->flammable = 1; // can be replaced by fire if the node under // it is set on fire - f->fuel_time = 30/4; + f->fuel_time = BT_COLUMN; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 1"; crafting::setCol3Recipe(CONTENT_APPLEWOOD,CONTENT_APPLEWOOD_COLUMN_SQUARE); content_list_add("cooking",i,1,0); @@ -2885,7 +2886,7 @@ void content_mapnode_init(bool repeat) f->onpunch_replace_respects_borderstone = true; f->flammable = 1; // can be replaced by fire if the node under // it is set on fire - f->fuel_time = 30/4; + f->fuel_time = BT_COLUMN; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 1"; crafting::setCol3Recipe(CONTENT_WOOD,CONTENT_WOOD_COLUMN_SQUARE); content_list_add("cooking",i,1,0); @@ -2946,7 +2947,7 @@ void content_mapnode_init(bool repeat) f->onpunch_replace_respects_borderstone = true; f->flammable = 1; // can be replaced by fire if the node under // it is set on fire - f->fuel_time = 30/4; + f->fuel_time = BT_COLUMN; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 1"; crafting::setCol3Recipe(CONTENT_JUNGLEWOOD,CONTENT_JUNGLEWOOD_COLUMN_SQUARE); content_list_add("cooking",i,1,0); @@ -3007,7 +3008,7 @@ void content_mapnode_init(bool repeat) f->onpunch_replace_respects_borderstone = true; f->flammable = 1; // can be replaced by fire if the node under // it is set on fire - f->fuel_time = 30/4; + f->fuel_time = BT_COLUMN; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 1"; crafting::setCol3Recipe(CONTENT_WOOD_PINE,CONTENT_WOOD_PINE_COLUMN_SQUARE); content_list_add("cooking",i,1,0); diff --git a/src/content_mapnode_door.cpp b/src/content_mapnode_door.cpp index 6450058..0ee4fa0 100644 --- a/src/content_mapnode_door.cpp +++ b/src/content_mapnode_door.cpp @@ -25,6 +25,7 @@ #include "content_craft.h" #include "content_nodemeta.h" #include "intl.h" +#include "content_burntimes.h" void content_mapnode_door(bool repeat) { @@ -52,7 +53,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_DOOR_LB_OPEN; f->sound_punch = "env-dooropen"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_DOOR; content_nodebox_door(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -79,7 +80,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_DOOR_LT_OPEN; f->sound_punch = "env-dooropen"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_DOOR; content_nodebox_door(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -230,7 +231,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_W_DOOR_LB_OPEN; f->sound_punch = "env-dooropen"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_DOOR; content_nodebox_door(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -258,7 +259,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_W_DOOR_LT_OPEN; f->sound_punch = "env-dooropen"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_DOOR; content_nodebox_doorw(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -352,7 +353,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_DOOR_RB_OPEN; f->sound_punch = "env-dooropen"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_DOOR; content_nodebox_door(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -379,7 +380,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_DOOR_RT_OPEN; f->sound_punch = "env-dooropen"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_DOOR; content_nodebox_door(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -410,7 +411,7 @@ void content_mapnode_door(bool repeat) f->onact_also_affects = v3s16(0,1,0); f->onpunch_replace_node = CONTENT_GLASS_DOOR_RB_OPEN; f->sound_punch = "env-dooropen"; - f->fuel_time = 30; + f->fuel_time = BT_DOOR_GLASS; content_nodebox_door(f); f->type = CMT_GLASS; f->dig_time = 0.15; @@ -440,7 +441,7 @@ void content_mapnode_door(bool repeat) f->onact_also_affects = v3s16(0,-1,0); f->onpunch_replace_node = CONTENT_GLASS_DOOR_RT_OPEN; f->sound_punch = "env-dooropen"; - f->fuel_time = 30; + f->fuel_time = BT_DOOR_GLASS; content_nodebox_door(f); f->type = CMT_GLASS; f->dig_time = 0.15; @@ -526,7 +527,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_W_DOOR_RB_OPEN; f->sound_punch = "env-dooropen"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_DOOR; content_nodebox_door(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -554,7 +555,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_W_DOOR_RT_OPEN; f->sound_punch = "env-dooropen"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_DOOR; content_nodebox_doorw(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -644,7 +645,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_DOOR_LB; f->sound_punch = "env-doorclose"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_DOOR; content_nodebox_doorol(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -669,7 +670,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_DOOR_LT; f->sound_punch = "env-doorclose"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_DOOR; content_nodebox_doorol(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -697,7 +698,7 @@ void content_mapnode_door(bool repeat) f->onact_also_affects = v3s16(0,1,0); f->onpunch_replace_node = CONTENT_GLASS_DOOR_LB; f->sound_punch = "env-doorclose"; - f->fuel_time = 30; + f->fuel_time = BT_DOOR_GLASS; content_nodebox_doorol(f); f->type = CMT_WOOD; f->dig_time = 0.15; @@ -724,7 +725,7 @@ void content_mapnode_door(bool repeat) f->onact_also_affects = v3s16(0,-1,0); f->onpunch_replace_node = CONTENT_GLASS_DOOR_LT; f->sound_punch = "env-doorclose"; - f->fuel_time = 30; + f->fuel_time = BT_DOOR_GLASS; content_nodebox_doorol(f); f->type = CMT_WOOD; f->dig_time = 0.15; @@ -803,7 +804,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_W_DOOR_LB; f->sound_punch = "env-doorclose"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_DOOR; content_nodebox_doorol(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -828,7 +829,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_W_DOOR_LT; f->sound_punch = "env-doorclose"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_DOOR; content_nodebox_doorwol(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -910,7 +911,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_DOOR_RB; f->sound_punch = "env-doorclose"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_DOOR; content_nodebox_dooror(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -937,7 +938,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_DOOR_RT; f->sound_punch = "env-doorclose"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_DOOR; content_nodebox_dooror(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -967,7 +968,7 @@ void content_mapnode_door(bool repeat) f->onact_also_affects = v3s16(0,1,0); f->onpunch_replace_node = CONTENT_GLASS_DOOR_RB; f->sound_punch = "env-doorclose"; - f->fuel_time = 30; + f->fuel_time = BT_DOOR_GLASS; content_nodebox_dooror(f); f->type = CMT_GLASS; f->dig_time = 0.15; @@ -1080,7 +1081,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_W_DOOR_RB; f->sound_punch = "env-doorclose"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_DOOR; content_nodebox_dooror(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -1107,7 +1108,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_W_DOOR_RT; f->sound_punch = "env-doorclose"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_DOOR; content_nodebox_doorwor(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -1187,7 +1188,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_HATCH_OPEN; f->sound_punch = "env-dooropen"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_HATCH; content_nodebox_hatch(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -1242,7 +1243,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_W_HATCH_OPEN; f->sound_punch = "env-dooropen"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_HATCH; content_nodebox_hatchw(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -1298,7 +1299,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_GATE_OPEN; f->sound_punch = "env-dooropen"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_FENCE; content_nodebox_gate(f); f->setInventoryTextureNodeBox(i,"wood.png","wood.png","wood.png"); f->type = CMT_WOOD; @@ -1363,7 +1364,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_HATCH; f->sound_punch = "env-doorclose"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_HATCH; content_nodebox_hatcho(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -1418,7 +1419,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_W_HATCH; f->sound_punch = "env-doorclose"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_HATCH; content_nodebox_hatchwo(f); f->type = CMT_WOOD; f->dig_time = 0.75; @@ -1471,7 +1472,7 @@ void content_mapnode_door(bool repeat) f->onpunch_replace_node = CONTENT_WOOD_GATE; f->sound_punch = "env-doorclose"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_FENCE; content_nodebox_gateo(f); f->type = CMT_WOOD; f->dig_time = 0.75; diff --git a/src/content_mapnode_farm.cpp b/src/content_mapnode_farm.cpp index 5d3c8e8..c5c00b6 100644 --- a/src/content_mapnode_farm.cpp +++ b/src/content_mapnode_farm.cpp @@ -26,6 +26,7 @@ #include "content_craftitem.h" #include "content_nodemeta.h" #include "intl.h" +#include "content_burntimes.h" void content_mapnode_farm(bool repeat) { @@ -73,7 +74,7 @@ void content_mapnode_farm(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/4; + f->fuel_time = BT_TRELLIS; f->type = CMT_WOOD; f->dig_time = 0.75; f->pressure_type = CST_CRUSHABLE; @@ -99,7 +100,7 @@ void content_mapnode_farm(bool repeat) f->type = CMT_PLANT; f->dig_time = 0.4; f->pressure_type = CST_CRUSHABLE; - f->fuel_time = 2; + f->fuel_time = BT_SEED; f->suffocation_per_second = 0; content_list_add("creative",i,1,0); @@ -119,7 +120,7 @@ void content_mapnode_farm(bool repeat) f->type = CMT_PLANT; f->dig_time = 0.4; f->pressure_type = CST_CRUSHABLE; - f->fuel_time = 2; + f->fuel_time = BT_SEED; f->suffocation_per_second = 0; crafting::set1To1Recipe(CONTENT_CRAFTITEM_MELONSLICE,CONTENT_SEEDS_MELON); content_list_add("craftguide",i,1,0); @@ -141,7 +142,7 @@ void content_mapnode_farm(bool repeat) f->type = CMT_PLANT; f->dig_time = 0.4; f->pressure_type = CST_CRUSHABLE; - f->fuel_time = 2; + f->fuel_time = BT_SEED; f->suffocation_per_second = 0; crafting::set1To1Recipe(CONTENT_CRAFTITEM_PUMPKINSLICE,CONTENT_SEEDS_PUMPKIN); content_list_add("craftguide",i,1,0); @@ -163,7 +164,7 @@ void content_mapnode_farm(bool repeat) f->type = CMT_PLANT; f->dig_time = 0.4; f->pressure_type = CST_CRUSHABLE; - f->fuel_time = 2; + f->fuel_time = BT_SEED; f->suffocation_per_second = 0; crafting::set1To2Recipe(CONTENT_CRAFTITEM_POTATO,CONTENT_SEEDS_POTATO); content_list_add("craftguide",i,1,0); @@ -185,7 +186,7 @@ void content_mapnode_farm(bool repeat) f->type = CMT_PLANT; f->dig_time = 0.4; f->pressure_type = CST_CRUSHABLE; - f->fuel_time = 2; + f->fuel_time = BT_SEED; f->suffocation_per_second = 0; crafting::set1To2Recipe(CONTENT_CRAFTITEM_CARROT,CONTENT_SEEDS_CARROT); content_list_add("craftguide",i,1,0); @@ -207,7 +208,7 @@ void content_mapnode_farm(bool repeat) f->type = CMT_PLANT; f->dig_time = 0.4; f->pressure_type = CST_CRUSHABLE; - f->fuel_time = 2; + f->fuel_time = BT_SEED; f->suffocation_per_second = 0; crafting::set1To2Recipe(CONTENT_CRAFTITEM_BEETROOT,CONTENT_SEEDS_BEETROOT); content_list_add("craftguide",i,1,0); @@ -229,7 +230,7 @@ void content_mapnode_farm(bool repeat) f->type = CMT_PLANT; f->dig_time = 0.4; f->pressure_type = CST_CRUSHABLE; - f->fuel_time = 2; + f->fuel_time = BT_SEED; f->suffocation_per_second = 0; crafting::set1To2Recipe(CONTENT_CRAFTITEM_GRAPE,CONTENT_SEEDS_GRAPE); content_list_add("craftguide",i,1,0); @@ -251,7 +252,7 @@ void content_mapnode_farm(bool repeat) f->type = CMT_PLANT; f->dig_time = 0.4; f->pressure_type = CST_CRUSHABLE; - f->fuel_time = 2; + f->fuel_time = BT_SEED; f->suffocation_per_second = 0; content_list_add("creative",i,1,0); @@ -458,7 +459,7 @@ void content_mapnode_farm(bool repeat) f->ondig_replace_node = CONTENT_TRELLIS; f->plantgrowth_max_height = 5; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/4; + f->fuel_time = BT_TRELLIS; f->type = CMT_WOOD; f->type = CMT_PLANT; f->dig_time = 0.4; @@ -477,7 +478,7 @@ void content_mapnode_farm(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ") + itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/4; + f->fuel_time = BT_TRELLIS; f->type = CMT_WOOD; f->dig_time = 0.3; f->pressure_type = CST_CRUSHABLE; @@ -497,7 +498,7 @@ void content_mapnode_farm(bool repeat) f->dug_item = std::string("MaterialItem2 ") + itos(CONTENT_DEAD_VINE)+" 1"; f->ondig_replace_node = CONTENT_TRELLIS; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/4; + f->fuel_time = BT_TRELLIS; f->type = CMT_PLANT; f->dig_time = 0.4; f->pressure_type = CST_CRUSHABLE; diff --git a/src/content_mapnode_furniture.cpp b/src/content_mapnode_furniture.cpp index 66afc90..5fbd276 100644 --- a/src/content_mapnode_furniture.cpp +++ b/src/content_mapnode_furniture.cpp @@ -25,6 +25,7 @@ #include "content_craft.h" #include "content_nodemeta.h" #include "intl.h" +#include "content_burntimes.h" void content_mapnode_furniture(bool repeat) { @@ -44,7 +45,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_BOOKSHELF)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/4; + f->fuel_time = BT_BOOKSHELF; f->type = CMT_WOOD; f->dig_time = 0.75; content_nodebox_bookshelf(f); @@ -77,7 +78,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/4; + f->fuel_time = BT_BOOKSHELF; f->type = CMT_WOOD; f->dig_time = 0.75; content_nodebox_bookshelf(f); @@ -110,7 +111,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/4; + f->fuel_time = BT_BOOKSHELF; f->type = CMT_WOOD; f->dig_time = 0.75; content_nodebox_bookshelf(f); @@ -143,7 +144,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/4; + f->fuel_time = BT_BOOKSHELF; f->type = CMT_WOOD; f->dig_time = 0.75; content_nodebox_bookshelf(f); @@ -173,7 +174,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_ENDL; @@ -192,7 +193,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_ENDR; @@ -211,7 +212,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_INNER; @@ -230,7 +231,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_OUTER; @@ -249,7 +250,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_CHAIR; @@ -268,7 +269,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_CENTRE; @@ -297,7 +298,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_BLUE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_ENDL_BLUE; @@ -316,7 +317,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_BLUE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_ENDR_BLUE; @@ -335,7 +336,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_BLUE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_INNER_BLUE; @@ -354,7 +355,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_BLUE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_OUTER_BLUE; @@ -373,7 +374,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_BLUE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_CHAIR_BLUE; @@ -392,7 +393,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_BLUE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_CENTRE_BLUE; @@ -415,7 +416,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_GREEN)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_ENDL_GREEN; @@ -434,7 +435,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_GREEN)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_ENDR_GREEN; @@ -453,7 +454,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_GREEN)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_INNER_GREEN; @@ -472,7 +473,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_GREEN)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_OUTER_GREEN; @@ -491,7 +492,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_GREEN)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_CHAIR_GREEN; @@ -510,7 +511,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_GREEN)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_CENTRE_GREEN; @@ -533,7 +534,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_ORANGE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_ENDL_ORANGE; @@ -552,7 +553,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_ORANGE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_ENDR_ORANGE; @@ -571,7 +572,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_ORANGE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_INNER_ORANGE; @@ -590,7 +591,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_ORANGE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_OUTER_ORANGE; @@ -609,7 +610,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_ORANGE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_CHAIR_ORANGE; @@ -628,7 +629,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_ORANGE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_CENTRE_ORANGE; @@ -651,7 +652,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_PURPLE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_ENDL_PURPLE; @@ -670,7 +671,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_PURPLE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_ENDR_PURPLE; @@ -689,7 +690,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_PURPLE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_INNER_PURPLE; @@ -708,7 +709,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_PURPLE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_OUTER_PURPLE; @@ -727,7 +728,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_PURPLE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_CHAIR_PURPLE; @@ -746,7 +747,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_PURPLE)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_CENTRE_PURPLE; @@ -769,7 +770,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_RED)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_ENDL_RED; @@ -788,7 +789,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_RED)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_ENDR_RED; @@ -807,7 +808,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_RED)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_INNER_RED; @@ -826,7 +827,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_RED)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_OUTER_RED; @@ -845,7 +846,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_RED)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_CHAIR_RED; @@ -864,7 +865,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_RED)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_CENTRE_RED; @@ -887,7 +888,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_YELLOW)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_ENDL_YELLOW; @@ -906,7 +907,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_YELLOW)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_ENDR_YELLOW; @@ -925,7 +926,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_YELLOW)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_INNER_YELLOW; @@ -944,7 +945,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_YELLOW)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_OUTER_YELLOW; @@ -963,7 +964,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_YELLOW)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_CHAIR_YELLOW; @@ -982,7 +983,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_YELLOW)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_CENTRE_YELLOW; @@ -1005,7 +1006,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_BLACK)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_ENDL_BLACK; @@ -1024,7 +1025,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_BLACK)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_ENDR_BLACK; @@ -1043,7 +1044,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_BLACK)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_INNER_BLACK; @@ -1062,7 +1063,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_BLACK)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_OUTER_BLACK; @@ -1081,7 +1082,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_BLACK)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_CHAIR_BLACK; @@ -1100,7 +1101,7 @@ void content_mapnode_furniture(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COUCH_CHAIR_BLACK)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_COUCH; f->type = CMT_DIRT; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_COUCH_CENTRE_BLACK; @@ -1126,7 +1127,7 @@ void content_mapnode_furniture(bool repeat) f->rotate_tile_with_nodebox = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_CHAIR; content_nodebox_chair(f); f->onpunch_replace_node = CONTENT_CHAIR_CENTRE; f->onpunch_replace_respects_borderstone = true; @@ -1159,7 +1160,7 @@ void content_mapnode_furniture(bool repeat) f->rotate_tile_with_nodebox = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CHAIR)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_CHAIR; content_nodebox_chair_centre(f); f->onpunch_replace_node = CONTENT_CHAIR_ENDL; f->onpunch_replace_respects_borderstone = true; @@ -1182,7 +1183,7 @@ void content_mapnode_furniture(bool repeat) f->rotate_tile_with_nodebox = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CHAIR)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_CHAIR; content_nodebox_chair_endl(f); f->onpunch_replace_node = CONTENT_CHAIR_ENDR; f->onpunch_replace_respects_borderstone = true; @@ -1205,7 +1206,7 @@ void content_mapnode_furniture(bool repeat) f->rotate_tile_with_nodebox = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CHAIR)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_CHAIR; content_nodebox_chair_endr(f); f->onpunch_replace_node = CONTENT_CHAIR_INNER; f->onpunch_replace_respects_borderstone = true; @@ -1228,7 +1229,7 @@ void content_mapnode_furniture(bool repeat) f->rotate_tile_with_nodebox = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CHAIR)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_CHAIR; content_nodebox_chair_inner(f); f->onpunch_replace_node = CONTENT_CHAIR_OUTER; f->onpunch_replace_respects_borderstone = true; @@ -1251,7 +1252,7 @@ void content_mapnode_furniture(bool repeat) f->rotate_tile_with_nodebox = true; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CHAIR)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_CHAIR; content_nodebox_chair_outer(f); f->onpunch_replace_node = CONTENT_CHAIR; f->onpunch_replace_respects_borderstone = true; @@ -1273,7 +1274,7 @@ void content_mapnode_furniture(bool repeat) f->air_equivalent = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_TABLE; content_nodebox_table(f); f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png"); f->type = CMT_WOOD; @@ -1309,7 +1310,7 @@ void content_mapnode_furniture(bool repeat) f->sunlight_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BED; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->onact_also_affects = v3s16(0,0,1); content_nodebox_bed_head(f); @@ -1341,7 +1342,7 @@ void content_mapnode_furniture(bool repeat) f->sunlight_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BED; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_BED_HEAD)+" 1"; f->onact_also_affects = v3s16(0,0,-1); content_nodebox_bed_foot(f); @@ -1368,7 +1369,7 @@ void content_mapnode_furniture(bool repeat) f->sunlight_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BED; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->onact_also_affects = v3s16(0,0,1); content_nodebox_bed_head(f); @@ -1400,7 +1401,7 @@ void content_mapnode_furniture(bool repeat) f->sunlight_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BED; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_BED_BLUE_HEAD)+" 1"; f->onact_also_affects = v3s16(0,0,-1); content_nodebox_bed_foot(f); @@ -1427,7 +1428,7 @@ void content_mapnode_furniture(bool repeat) f->sunlight_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BED; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->onact_also_affects = v3s16(0,0,1); content_nodebox_bed_head(f); @@ -1459,7 +1460,7 @@ void content_mapnode_furniture(bool repeat) f->sunlight_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BED; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_BED_GREEN_HEAD)+" 1"; f->onact_also_affects = v3s16(0,0,-1); content_nodebox_bed_foot(f); @@ -1486,7 +1487,7 @@ void content_mapnode_furniture(bool repeat) f->sunlight_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BED; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->onact_also_affects = v3s16(0,0,1); content_nodebox_bed_head(f); @@ -1518,7 +1519,7 @@ void content_mapnode_furniture(bool repeat) f->sunlight_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BED; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_BED_ORANGE_HEAD)+" 1"; f->onact_also_affects = v3s16(0,0,-1); content_nodebox_bed_foot(f); @@ -1545,7 +1546,7 @@ void content_mapnode_furniture(bool repeat) f->sunlight_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BED; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->onact_also_affects = v3s16(0,0,1); content_nodebox_bed_head(f); @@ -1577,7 +1578,7 @@ void content_mapnode_furniture(bool repeat) f->sunlight_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BED; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_BED_PURPLE_HEAD)+" 1"; f->onact_also_affects = v3s16(0,0,-1); content_nodebox_bed_foot(f); @@ -1604,7 +1605,7 @@ void content_mapnode_furniture(bool repeat) f->sunlight_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BED; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->onact_also_affects = v3s16(0,0,1); content_nodebox_bed_head(f); @@ -1636,7 +1637,7 @@ void content_mapnode_furniture(bool repeat) f->sunlight_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BED; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_BED_RED_HEAD)+" 1"; f->onact_also_affects = v3s16(0,0,-1); content_nodebox_bed_foot(f); @@ -1663,7 +1664,7 @@ void content_mapnode_furniture(bool repeat) f->sunlight_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BED; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->onact_also_affects = v3s16(0,0,1); content_nodebox_bed_head(f); @@ -1695,7 +1696,7 @@ void content_mapnode_furniture(bool repeat) f->sunlight_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BED; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_BED_YELLOW_HEAD)+" 1"; f->onact_also_affects = v3s16(0,0,-1); content_nodebox_bed_foot(f); @@ -1722,7 +1723,7 @@ void content_mapnode_furniture(bool repeat) f->sunlight_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BED; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->onact_also_affects = v3s16(0,0,1); content_nodebox_bed_head(f); @@ -1754,7 +1755,7 @@ void content_mapnode_furniture(bool repeat) f->sunlight_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BED; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_BED_BLACK_HEAD)+" 1"; f->onact_also_affects = v3s16(0,0,-1); content_nodebox_bed_foot(f); @@ -1776,7 +1777,7 @@ void content_mapnode_furniture(bool repeat) f->light_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_CAMP_BED; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->onact_also_affects = v3s16(0,0,1); content_nodebox_slab(f); @@ -1810,7 +1811,7 @@ void content_mapnode_furniture(bool repeat) f->light_propagates = true; f->rotate_tile_with_nodebox = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_CAMP_BED; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_BED_CAMP_HEAD)+" 1"; f->onact_also_affects = v3s16(0,0,-1); content_nodebox_slab(f); @@ -1835,7 +1836,7 @@ void content_mapnode_furniture(bool repeat) f->walkable = false; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_PAINTING; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_PAINTING_WHITE)+" 1"; f->type = CMT_WOOD; content_nodebox_painting(f); @@ -1869,7 +1870,7 @@ void content_mapnode_furniture(bool repeat) f->walkable = false; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_PAINTING; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_PAINTING_RED)+" 1"; f->type = CMT_WOOD; content_nodebox_painting(f); @@ -1903,7 +1904,7 @@ void content_mapnode_furniture(bool repeat) f->walkable = false; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_PAINTING; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_PAINTING_GREEN)+" 1"; f->type = CMT_WOOD; content_nodebox_painting(f); @@ -1937,7 +1938,7 @@ void content_mapnode_furniture(bool repeat) f->walkable = false; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_PAINTING; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_PAINTING_BLUE)+" 1"; f->type = CMT_WOOD; content_nodebox_painting(f); @@ -1971,7 +1972,7 @@ void content_mapnode_furniture(bool repeat) f->walkable = false; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_PAINTING; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_PAINTING_CANVAS)+" 1"; f->type = CMT_WOOD; content_nodebox_painting(f); @@ -2007,7 +2008,7 @@ void content_mapnode_furniture(bool repeat) f->walkable = false; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_CLOCK; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->type = CMT_WOOD; f->dig_time = 0.1; diff --git a/src/content_mapnode_plants.cpp b/src/content_mapnode_plants.cpp index a2039ab..41fd437 100644 --- a/src/content_mapnode_plants.cpp +++ b/src/content_mapnode_plants.cpp @@ -28,6 +28,7 @@ #include "content_craft.h" #include "content_nodemeta.h" #include "intl.h" +#include "content_burntimes.h" void content_mapnode_plants(bool repeat) { @@ -48,7 +49,7 @@ void content_mapnode_plants(bool repeat) f->flammable = 2; // can be set on fire f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CHARCOAL)+" 1"; - f->fuel_time = 30; + f->fuel_time = BT_TREE; f->type = CMT_TREE; f->dig_time = 1.0; f->ondig_special_drop = CONTENT_WOOD; @@ -70,7 +71,7 @@ void content_mapnode_plants(bool repeat) f->flammable = 2; // can be set on fire f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CHARCOAL)+" 1"; - f->fuel_time = 30; + f->fuel_time = BT_TREE; f->type = CMT_TREE; f->dig_time = 1.0; f->ondig_special_drop = CONTENT_WOOD; @@ -92,7 +93,7 @@ void content_mapnode_plants(bool repeat) f->flammable = 2; // can be set on fire f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CHARCOAL)+" 1"; - f->fuel_time = 30; + f->fuel_time = BT_TREE; f->type = CMT_TREE; f->dig_time = 1.0; f->ondig_special_drop = CONTENT_JUNGLEWOOD; @@ -113,7 +114,7 @@ void content_mapnode_plants(bool repeat) f->flammable = 2; // can be set on fire f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CHARCOAL)+" 1"; - f->fuel_time = 25; + f->fuel_time = BT_TREE; f->type = CMT_TREE; f->dig_time = 0.8; f->ondig_special_drop = CONTENT_WOOD_PINE; @@ -136,7 +137,7 @@ void content_mapnode_plants(bool repeat) f->flammable = 1; // can be replaced by fire if the node under it is set on fire f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_LEAVES; - f->fuel_time = 20; + f->fuel_time = BT_YOUNG_TREE; f->type = CMT_TREE; f->dig_time = 1.0; f->suffocation_per_second = 0; @@ -156,7 +157,7 @@ void content_mapnode_plants(bool repeat) f->flammable = 1; // can be replaced by fire if the node under it is set on fire f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_JUNGLELEAVES; - f->fuel_time = 20; + f->fuel_time = BT_YOUNG_TREE; f->type = CMT_TREE; f->dig_time = 1.0; f->suffocation_per_second = 0; @@ -176,7 +177,7 @@ void content_mapnode_plants(bool repeat) f->flammable = 1; // can be replaced by fire if the node under it is set on fire f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_APPLE_LEAVES; - f->fuel_time = 20; + f->fuel_time = BT_YOUNG_TREE; f->type = CMT_TREE; f->dig_time = 1.0; f->suffocation_per_second = 0; @@ -196,7 +197,7 @@ void content_mapnode_plants(bool repeat) f->flammable = 1; // can be replaced by fire if the node under it is set on fire f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_CONIFER_LEAVES; - f->fuel_time = 20; + f->fuel_time = BT_YOUNG_TREE; f->type = CMT_TREE; f->dig_time = 1.0; f->suffocation_per_second = 0; @@ -216,7 +217,7 @@ void content_mapnode_plants(bool repeat) f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->walkable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BUSH; f->type = CMT_PLANT; f->dig_time = 0.20; f->pressure_type = CST_CRUSHABLE; @@ -237,7 +238,7 @@ void content_mapnode_plants(bool repeat) f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->walkable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BUSH; f->type = CMT_PLANT; f->dig_time = 0.20; f->pressure_type = CST_CRUSHABLE; @@ -259,7 +260,7 @@ void content_mapnode_plants(bool repeat) f->setAllTextureFlags(0); #endif f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_LEAF; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1"; f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAPLING)+" 1"; f->extra_dug_item_rarity = 20; @@ -291,7 +292,7 @@ void content_mapnode_plants(bool repeat) f->setAllTextureFlags(0); #endif f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_LEAF; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1"; f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAPLING)+" 1"; f->extra_dug_item_rarity = 20; @@ -323,7 +324,7 @@ void content_mapnode_plants(bool repeat) f->setAllTextureFlags(0); #endif f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_LEAF; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 1"; f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAPLING)+" 1"; f->extra_dug_item_rarity = 20; @@ -355,7 +356,7 @@ void content_mapnode_plants(bool repeat) f->setAllTextureFlags(0); #endif f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_LEAF; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 1"; f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAPLING)+" 1"; f->extra_dug_item_rarity = 20; @@ -388,7 +389,7 @@ void content_mapnode_plants(bool repeat) f->setAllTextureFlags(0); #endif f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_LEAF; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1"; f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_APPLE_SAPLING)+" 1"; f->extra_dug_item_rarity = 20; @@ -420,7 +421,7 @@ void content_mapnode_plants(bool repeat) f->setAllTextureFlags(0); #endif f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_LEAF; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1"; f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_JUNGLESAPLING)+" 1"; f->extra_dug_item_rarity = 20; @@ -452,7 +453,7 @@ void content_mapnode_plants(bool repeat) f->setAllTextureFlags(0); #endif f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_LEAF; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1"; f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CONIFER_SAPLING)+" 1"; f->extra_dug_item_rarity = 20; @@ -484,7 +485,7 @@ void content_mapnode_plants(bool repeat) #endif f->setInventoryTextureCube("leaves.png", "leaves.png", "leaves.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_LEAF; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->type = CMT_PLANT; @@ -509,7 +510,7 @@ void content_mapnode_plants(bool repeat) #endif f->setInventoryTextureCube("leaves_autumn.png", "leaves_autumn.png", "leaves_autumn.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_LEAF; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->type = CMT_PLANT; @@ -534,7 +535,7 @@ void content_mapnode_plants(bool repeat) #endif f->setInventoryTextureCube("leaves_winter.png", "leaves_winter.png", "leaves_winter.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_LEAF; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->type = CMT_PLANT; @@ -559,7 +560,7 @@ void content_mapnode_plants(bool repeat) #endif f->setInventoryTextureCube("apple_leaves.png", "apple_leaves.png", "apple_leaves.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_LEAF; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->type = CMT_PLANT; @@ -584,7 +585,7 @@ void content_mapnode_plants(bool repeat) #endif f->setInventoryTextureCube("jungleleaves.png", "jungleleaves.png", "jungleleaves.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_LEAF; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->type = CMT_PLANT; @@ -609,7 +610,7 @@ void content_mapnode_plants(bool repeat) #endif f->setInventoryTextureCube("conifer_leaves.png", "conifer_leaves.png", "conifer_leaves.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_LEAF; f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->type = CMT_PLANT; @@ -679,7 +680,7 @@ void content_mapnode_plants(bool repeat) f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->walkable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_FLOWER; f->type = CMT_PLANT; f->dig_time = 0.20; f->pressure_type = CST_CRUSHABLE; @@ -699,7 +700,7 @@ void content_mapnode_plants(bool repeat) f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CACTUS_BLOSSOM)+" 1"; f->walkable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_FLOWER; f->type = CMT_PLANT; f->dig_time = 0.20; f->pressure_type = CST_CRUSHABLE; @@ -720,7 +721,7 @@ void content_mapnode_plants(bool repeat) f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CACTUS_FRUIT)+" 1"; f->walkable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_FRUIT; f->type = CMT_PLANT; f->dig_time = 0.20; f->pressure_type = CST_CRUSHABLE; @@ -739,7 +740,7 @@ void content_mapnode_plants(bool repeat) f->sunlight_propagates = true; f->damage_per_second = 10; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/4; + f->fuel_time = BT_CACTUS; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->extra_dug_item = std::string("CraftItem2 ") + itos (CONTENT_CRAFTITEM_MUSH) + " 1"; f->extra_dug_item_rarity = 10; @@ -805,7 +806,7 @@ void content_mapnode_plants(bool repeat) f->plantgrowth_max_height = 5; f->walkable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BUSH; f->type = CMT_PLANT; f->dig_time = 0.25; f->pressure_type = CST_CRUSHABLE; @@ -825,7 +826,7 @@ void content_mapnode_plants(bool repeat) f->air_equivalent = false; f->walkable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SAPLING; f->type = CMT_WOOD; f->dig_time = 0.1; f->pressure_type = CST_CRUSHABLE; @@ -846,7 +847,7 @@ void content_mapnode_plants(bool repeat) f->air_equivalent = false; f->walkable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SAPLING; f->type = CMT_WOOD; f->dig_time = 0.1; f->pressure_type = CST_CRUSHABLE; @@ -867,7 +868,7 @@ void content_mapnode_plants(bool repeat) f->air_equivalent = false; f->walkable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SAPLING; f->type = CMT_WOOD; f->dig_time = 0.1; f->pressure_type = CST_CRUSHABLE; @@ -888,7 +889,7 @@ void content_mapnode_plants(bool repeat) f->air_equivalent = false; f->walkable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SAPLING; f->type = CMT_WOOD; f->dig_time = 0.1; f->pressure_type = CST_CRUSHABLE; @@ -909,7 +910,7 @@ void content_mapnode_plants(bool repeat) f->walkable = false; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_FRUIT; f->dug_item = std::string("CraftItem2 ") +itos(CONTENT_CRAFTITEM_APPLE)+" 1"; f->ondig_replace_node = CONTENT_APPLE_LEAVES; f->ondig_replace_node_requires = CONTENT_APPLE_TREE; @@ -935,7 +936,7 @@ void content_mapnode_plants(bool repeat) f->walkable = false; f->material_pointable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_GRASS; //f->pointable = false; f->buildable_to = true; f->type = CMT_PLANT; @@ -958,7 +959,7 @@ void content_mapnode_plants(bool repeat) f->walkable = false; f->material_pointable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_GRASS; f->buildable_to = true; f->type = CMT_PLANT; f->dig_time = 0.15; @@ -980,7 +981,7 @@ void content_mapnode_plants(bool repeat) f->walkable = false; f->material_pointable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_GRASS; f->buildable_to = true; f->type = CMT_PLANT; f->dig_time = 0.10; @@ -1002,7 +1003,7 @@ void content_mapnode_plants(bool repeat) f->walkable = false; f->material_pointable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_GRASS; f->buildable_to = true; f->type = CMT_PLANT; f->dig_time = 0.10; @@ -1024,7 +1025,7 @@ void content_mapnode_plants(bool repeat) f->walkable = false; f->material_pointable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_GRASS; f->buildable_to = true; f->type = CMT_PLANT; f->dig_time = 0.10; @@ -1047,7 +1048,7 @@ void content_mapnode_plants(bool repeat) f->walkable = false; f->material_pointable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_GRASS; f->buildable_to = true; f->type = CMT_PLANT; f->dig_time = 0.10; @@ -1070,7 +1071,7 @@ void content_mapnode_plants(bool repeat) f->walkable = false; f->material_pointable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_GRASS; f->buildable_to = true; f->type = CMT_PLANT; f->dig_time = 0.10; @@ -1112,7 +1113,7 @@ void content_mapnode_plants(bool repeat) f->plantgrowth_large_gives_small = true; f->walkable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BUSH; f->buildable_to = true; f->type = CMT_PLANT; f->dig_time = 0.15; @@ -1154,7 +1155,7 @@ void content_mapnode_plants(bool repeat) f->plantgrowth_large_dug_node = CONTENT_BEANS_COFFEE; f->walkable = false; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/32; + f->fuel_time = BT_BUSH; f->buildable_to = true; f->type = CMT_PLANT; f->dig_time = 0.15; @@ -1180,7 +1181,7 @@ void content_mapnode_plants(bool repeat) f->setAllMetaTextureFlags(0); #endif f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_BUSH; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->type = CMT_PLANT; f->dig_time = 0.15; @@ -1210,7 +1211,7 @@ void content_mapnode_plants(bool repeat) f->setAllMetaTextureFlags(0); #endif f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_BUSH; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->type = CMT_PLANT; f->dig_time = 0.15; diff --git a/src/content_mapnode_sign.cpp b/src/content_mapnode_sign.cpp index 8b8f0cc..4aeae80 100644 --- a/src/content_mapnode_sign.cpp +++ b/src/content_mapnode_sign.cpp @@ -26,6 +26,7 @@ #include "content_nodemeta.h" #include "player.h" #include "intl.h" +#include "content_burntimes.h" void content_mapnode_sign(bool repeat) { @@ -45,7 +46,7 @@ void content_mapnode_sign(bool repeat) f->param2_type = CPT_FACEDIR_SIMPLE; f->draw_type = CDT_NODEBOX; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new SignNodeMetadata("Some sign"); @@ -75,7 +76,7 @@ void content_mapnode_sign(bool repeat) f->walkable = false; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SIGN)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new SignNodeMetadata("Some sign"); @@ -100,7 +101,7 @@ void content_mapnode_sign(bool repeat) f->param2_type = CPT_FACEDIR_SIMPLE; f->draw_type = CDT_NODEBOX; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SIGN)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new SignNodeMetadata("Some sign"); @@ -125,7 +126,7 @@ void content_mapnode_sign(bool repeat) f->param2_type = CPT_FACEDIR_SIMPLE; f->draw_type = CDT_NODEBOX; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new SignNodeMetadata("Some sign"); @@ -154,7 +155,7 @@ void content_mapnode_sign(bool repeat) f->walkable = false; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SIGN_APPLE)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new SignNodeMetadata("Some sign"); @@ -178,7 +179,7 @@ void content_mapnode_sign(bool repeat) f->param2_type = CPT_FACEDIR_SIMPLE; f->draw_type = CDT_NODEBOX; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SIGN_APPLE)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new SignNodeMetadata("Some sign"); @@ -202,7 +203,7 @@ void content_mapnode_sign(bool repeat) f->param2_type = CPT_FACEDIR_SIMPLE; f->draw_type = CDT_NODEBOX; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new SignNodeMetadata("Some sign"); @@ -231,7 +232,7 @@ void content_mapnode_sign(bool repeat) f->walkable = false; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SIGN_JUNGLE)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new SignNodeMetadata("Some sign"); @@ -255,7 +256,7 @@ void content_mapnode_sign(bool repeat) f->param2_type = CPT_FACEDIR_SIMPLE; f->draw_type = CDT_NODEBOX; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SIGN_JUNGLE)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new SignNodeMetadata("Some sign"); @@ -279,7 +280,7 @@ void content_mapnode_sign(bool repeat) f->param2_type = CPT_FACEDIR_SIMPLE; f->draw_type = CDT_NODEBOX; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new SignNodeMetadata("Some sign"); @@ -308,7 +309,7 @@ void content_mapnode_sign(bool repeat) f->walkable = false; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SIGN_PINE)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new SignNodeMetadata("Some sign"); @@ -332,7 +333,7 @@ void content_mapnode_sign(bool repeat) f->param2_type = CPT_FACEDIR_SIMPLE; f->draw_type = CDT_NODEBOX; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SIGN_PINE)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new SignNodeMetadata("Some sign"); @@ -356,7 +357,7 @@ void content_mapnode_sign(bool repeat) f->param2_type = CPT_FACEDIR_SIMPLE; f->draw_type = CDT_NODEBOX; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new SignNodeMetadata("Some sign"); @@ -385,7 +386,7 @@ void content_mapnode_sign(bool repeat) f->walkable = false; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SIGN_STEEL)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new SignNodeMetadata("Some sign"); @@ -409,7 +410,7 @@ void content_mapnode_sign(bool repeat) f->param2_type = CPT_FACEDIR_SIMPLE; f->draw_type = CDT_NODEBOX; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SIGN_STEEL)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new SignNodeMetadata("Some sign"); @@ -437,7 +438,7 @@ void content_mapnode_sign(bool repeat) f->walkable = false; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_LOCKABLE_SIGN)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new LockingSignNodeMetadata("Some sign"); @@ -463,7 +464,7 @@ void content_mapnode_sign(bool repeat) f->param2_type = CPT_FACEDIR_SIMPLE; f->draw_type = CDT_NODEBOX; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new LockingSignNodeMetadata("Some sign"); @@ -493,7 +494,7 @@ void content_mapnode_sign(bool repeat) f->param2_type = CPT_FACEDIR_SIMPLE; f->draw_type = CDT_NODEBOX; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 1; + f->fuel_time = BT_SIGN; f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_LOCKABLE_SIGN)+" 1"; if(f->initial_metadata == NULL) f->initial_metadata = new LockingSignNodeMetadata("Some sign"); diff --git a/src/content_mapnode_slab.cpp b/src/content_mapnode_slab.cpp index c86a6ec..5fd2038 100644 --- a/src/content_mapnode_slab.cpp +++ b/src/content_mapnode_slab.cpp @@ -25,6 +25,7 @@ #include "content_craft.h" #include "content_nodemeta.h" #include "intl.h" +#include "content_burntimes.h" void content_mapnode_slab(bool repeat) { @@ -114,7 +115,7 @@ void content_mapnode_slab(bool repeat) content_nodebox_slab(f); f->setInventoryTextureNodeBox(i,"applewood.png", "applewood.png", "applewood.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_SLAB; f->type = CMT_WOOD; f->dig_time = 0.75; f->suffocation_per_second = 0; @@ -133,7 +134,7 @@ void content_mapnode_slab(bool repeat) content_nodebox_slab(f); f->setInventoryTextureNodeBox(i,"wood.png", "wood.png", "wood.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_SLAB; f->type = CMT_WOOD; f->dig_time = 0.75; f->suffocation_per_second = 0; @@ -152,7 +153,7 @@ void content_mapnode_slab(bool repeat) content_nodebox_slab(f); f->setInventoryTextureNodeBox(i,"junglewood.png", "junglewood.png", "junglewood.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_SLAB; f->type = CMT_WOOD; f->dig_time = 1.0; f->suffocation_per_second = 0; @@ -490,7 +491,7 @@ void content_mapnode_slab(bool repeat) content_nodebox_slabud(f); f->setInventoryTextureNodeBox(i,"applewood.png", "applewood.png", "applewood.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_SLAB; f->type = CMT_WOOD; f->dig_time = 0.75; f->suffocation_per_second = 0; @@ -505,7 +506,7 @@ void content_mapnode_slab(bool repeat) content_nodebox_slabud(f); f->setInventoryTextureNodeBox(i,"wood.png", "wood.png", "wood.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_SLAB; f->type = CMT_WOOD; f->dig_time = 0.75; f->suffocation_per_second = 0; @@ -520,7 +521,7 @@ void content_mapnode_slab(bool repeat) content_nodebox_slabud(f); f->setInventoryTextureNodeBox(i,"junglewood.png", "junglewood.png", "junglewood.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_SLAB; f->type = CMT_WOOD; f->dig_time = 1.0; f->suffocation_per_second = 0; diff --git a/src/content_mapnode_special.cpp b/src/content_mapnode_special.cpp index c27d8e4..ff72c38 100644 --- a/src/content_mapnode_special.cpp +++ b/src/content_mapnode_special.cpp @@ -26,6 +26,7 @@ #include "content_nodemeta.h" #include "player.h" #include "intl.h" +#include "content_burntimes.h" void content_mapnode_special(bool repeat) { @@ -45,7 +46,7 @@ void content_mapnode_special(bool repeat) f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->air_equivalent = true; // grass grows underneath f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_FENCE; f->special_alternate_node = CONTENT_WOOD; f->type = CMT_WOOD; f->dig_time = 0.75; @@ -98,7 +99,7 @@ void content_mapnode_special(bool repeat) f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->air_equivalent = true; // grass grows underneath f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_FENCE; f->special_alternate_node = CONTENT_JUNGLEWOOD; f->type = CMT_WOOD; f->dig_time = 0.75; @@ -124,7 +125,7 @@ void content_mapnode_special(bool repeat) f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->air_equivalent = true; // grass grows underneath f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_FENCE; f->special_alternate_node = CONTENT_WOOD_PINE; f->type = CMT_WOOD; f->dig_time = 0.75; @@ -150,7 +151,7 @@ void content_mapnode_special(bool repeat) f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->air_equivalent = true; // grass grows underneath f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 15; + f->fuel_time = BT_FENCE; f->special_alternate_node = CONTENT_APPLEWOOD; f->type = CMT_WOOD; f->dig_time = 0.75; @@ -512,7 +513,7 @@ void content_mapnode_special(bool repeat) f->climbable = true; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_LADDER; f->type = CMT_WOOD; f->dig_time = 0.5; f->pressure_type = CST_CRUSHABLE; @@ -571,7 +572,7 @@ void content_mapnode_special(bool repeat) f->climbable = true; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_LADDER; f->type = CMT_WOOD; f->dig_time = 0.5; f->pressure_type = CST_CRUSHABLE; @@ -605,7 +606,7 @@ void content_mapnode_special(bool repeat) f->climbable = true; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30/16; + f->fuel_time = BT_LADDER; f->type = CMT_WOOD; f->dig_time = 0.5; f->pressure_type = CST_CRUSHABLE; @@ -1066,7 +1067,7 @@ void content_mapnode_special(bool repeat) f->walkable = false; f->air_equivalent = true; f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 0.5; + f->fuel_time = BT_TORCH; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->light_source = LIGHT_MAX-1; f->type = CMT_WOOD; @@ -1484,7 +1485,7 @@ void content_mapnode_special(bool repeat) f->light_propagates = true; f->sunlight_propagates = true; f->walkable = false; - f->fuel_time = 1.0; + f->fuel_time = BT_CAMP_FIRE; f->light_source = LIGHT_MAX-3; f->damage_per_second = 40; f->setAllTextures("campfire_stones.png"); @@ -2222,7 +2223,7 @@ void content_mapnode_special(bool repeat) f->draw_type = CDT_NODEBOX; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->flammable = 1; - f->fuel_time = 30/4; + f->fuel_time = BT_SCAFFOLDING; f->dig_time = 0.75; f->is_ground_content = true; f->light_propagates = true; diff --git a/src/content_mapnode_stair.cpp b/src/content_mapnode_stair.cpp index c212598..133ec89 100644 --- a/src/content_mapnode_stair.cpp +++ b/src/content_mapnode_stair.cpp @@ -25,6 +25,7 @@ #include "content_craft.h" #include "content_nodemeta.h" #include "intl.h" +#include "content_burntimes.h" void content_mapnode_stair(bool repeat) { @@ -116,7 +117,7 @@ void content_mapnode_stair(bool repeat) content_nodebox_stair(f); f->setInventoryTextureNodeBox(i,"applewood.png", "applewood.png", "applewood.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 0.75; f->onpunch_replace_node = CONTENT_APPLEWOOD_STAIR_CORNER; @@ -136,7 +137,7 @@ void content_mapnode_stair(bool repeat) content_nodebox_stair(f); f->setInventoryTextureNodeBox(i,"wood.png", "wood.png", "wood.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 0.75; f->onpunch_replace_node = CONTENT_WOOD_STAIR_CORNER; @@ -156,7 +157,7 @@ void content_mapnode_stair(bool repeat) content_nodebox_stair(f); f->setInventoryTextureNodeBox(i,"junglewood.png", "junglewood.png", "junglewood.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_JUNGLE_STAIR_CORNER; @@ -295,7 +296,7 @@ void content_mapnode_stair(bool repeat) content_nodebox_stairud(f); f->setInventoryTextureNodeBox(i,"applewood.png", "applewood.png", "applewood.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 0.75; f->onpunch_replace_node = CONTENT_APPLEWOOD_STAIR_CORNER_UD; @@ -312,7 +313,7 @@ void content_mapnode_stair(bool repeat) content_nodebox_stairud(f); f->setInventoryTextureNodeBox(i,"wood.png", "wood.png", "wood.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 0.75; f->onpunch_replace_node = CONTENT_WOOD_STAIR_CORNER_UD; @@ -329,7 +330,7 @@ void content_mapnode_stair(bool repeat) content_nodebox_stairud(f); f->setInventoryTextureNodeBox(i,"junglewood.png", "junglewood.png", "junglewood.png"); f->flammable = 1; // can be replaced by fire if the node under it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_JUNGLE_STAIR_CORNER_UD; @@ -458,7 +459,7 @@ void content_mapnode_stair(bool repeat) f->setInventoryTextureNodeBox(i,"applewood.png","applewood.png","applewood.png"); f->flammable = 1; // can be replaced by fire if the node under // it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 0.75; f->onpunch_replace_node = CONTENT_APPLEWOOD_INNER_STAIR_CORNER; @@ -475,7 +476,7 @@ void content_mapnode_stair(bool repeat) f->setInventoryTextureNodeBox(i,"wood.png","wood.png","wood.png"); f->flammable = 1; // can be replaced by fire if the node under // it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 0.75; f->onpunch_replace_node = CONTENT_WOOD_INNER_STAIR_CORNER; @@ -493,7 +494,7 @@ void content_mapnode_stair(bool repeat) f->setInventoryTextureNodeBox(i,"junglewood.png","junglewood.png","junglewood.png"); f->flammable = 1; // can be replaced by fire if the node under // it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_JUNGLE_INNER_STAIR_CORNER; @@ -616,7 +617,7 @@ void content_mapnode_stair(bool repeat) f->setInventoryTextureNodeBox(i,"applewood.png","applewood.png","applewood.png"); f->flammable = 1; // can be replaced by fire if the node under // it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 0.75; f->onpunch_replace_node = CONTENT_APPLEWOOD_INNER_STAIR_CORNER_UD; @@ -633,7 +634,7 @@ void content_mapnode_stair(bool repeat) f->setInventoryTextureNodeBox(i,"wood.png","wood.png","wood.png"); f->flammable = 1; // can be replaced by fire if the node under // it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 0.75; f->onpunch_replace_node = CONTENT_WOOD_INNER_STAIR_CORNER_UD; @@ -651,7 +652,7 @@ void content_mapnode_stair(bool repeat) f->setInventoryTextureNodeBox(i,"junglewood.png","junglewood.png","junglewood.png"); f->flammable = 1; // can be replaced by fire if the node under // it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_JUNGLE_INNER_STAIR_CORNER_UD; @@ -771,7 +772,7 @@ void content_mapnode_stair(bool repeat) f->setInventoryTextureNodeBox(i,"applewood.png","applewood.png","applewood.png"); f->flammable = 1; // can be replaced by fire if the node under // it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 0.75; f->onpunch_replace_node = CONTENT_APPLEWOOD_STAIR; @@ -788,7 +789,7 @@ void content_mapnode_stair(bool repeat) f->setInventoryTextureNodeBox(i,"wood.png","wood.png","wood.png"); f->flammable = 1; // can be replaced by fire if the node under // it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 0.75; f->onpunch_replace_node = CONTENT_WOOD_STAIR; @@ -805,7 +806,7 @@ void content_mapnode_stair(bool repeat) f->setInventoryTextureNodeBox(i,"junglewood.png","junglewood.png","junglewood.png"); f->flammable = 1; // can be replaced by fire if the node under // it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_JUNGLE_STAIR; @@ -930,7 +931,7 @@ void content_mapnode_stair(bool repeat) f->setInventoryTextureNodeBox(i,"applewood.png","applewood.png","applewood.png"); f->flammable = 1; // can be replaced by fire if the node under // it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 0.75; f->onpunch_replace_node = CONTENT_APPLEWOOD_STAIR_UD; @@ -947,7 +948,7 @@ void content_mapnode_stair(bool repeat) f->setInventoryTextureNodeBox(i,"wood.png","wood.png","wood.png"); f->flammable = 1; // can be replaced by fire if the node under // it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 0.75; f->onpunch_replace_node = CONTENT_WOOD_STAIR_UD; @@ -965,7 +966,7 @@ void content_mapnode_stair(bool repeat) f->setInventoryTextureNodeBox(i,"junglewood.png","junglewood.png","junglewood.png"); f->flammable = 1; // can be replaced by fire if the node under // it is set on fire - f->fuel_time = 30; + f->fuel_time = BT_STAIR; f->type = CMT_WOOD; f->dig_time = 1.0; f->onpunch_replace_node = CONTENT_JUNGLE_STAIR_UD; diff --git a/src/content_toolitem.cpp b/src/content_toolitem.cpp index cfff995..4d6c69a 100644 --- a/src/content_toolitem.cpp +++ b/src/content_toolitem.cpp @@ -29,6 +29,7 @@ #include "intl.h" #include "enchantment.h" #include "auth.h" +#include "content_burntimes.h" std::map g_content_toolitem_features; @@ -924,7 +925,7 @@ void content_toolitem_init() f->description = gettext("Steel Bucket of Lava"); f->onplace_node = CONTENT_LAVASOURCE; f->onplace_replace_item = CONTENT_TOOLITEM_STEELBUCKET; - f->fuel_time = 80; + f->fuel_time = BT_LAVA_BUCKET; f->type = TT_SPECIAL; content_list_add("creative",i,1,0);