Skip to content

Commit 3c9d71e

Browse files
Ferkparamat
Ferk
authored and
paramat
committedOct 25, 2016
Make flammable: Flowers, grasses and several crafitems
·
5.8.00.4.15
1 parent fbac9be commit 3c9d71e

File tree

8 files changed

+35
-22
lines changed

8 files changed

+35
-22
lines changed
 

Diff for: ‎mods/boats/init.lua

+1
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ minetest.register_craftitem("boats:boat", {
221221
wield_image = "boats_wield.png",
222222
wield_scale = {x = 2, y = 2, z = 1},
223223
liquids_pointable = true,
224+
groups = {flammable = 2},
224225

225226
on_place = function(itemstack, placer, pointed_thing)
226227
if pointed_thing.type ~= "node" then

Diff for: ‎mods/default/craftitems.lua

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
minetest.register_craftitem("default:stick", {
44
description = "Stick",
55
inventory_image = "default_stick.png",
6-
groups = {stick = 1},
6+
groups = {stick = 1, flammable = 2},
77
})
88

99
minetest.register_craftitem("default:paper", {
1010
description = "Paper",
1111
inventory_image = "default_paper.png",
12+
groups = {flammable = 3},
1213
})
1314

1415
local lpp = 14 -- Lines per book's page
@@ -132,14 +133,14 @@ end)
132133
minetest.register_craftitem("default:book", {
133134
description = "Book",
134135
inventory_image = "default_book.png",
135-
groups = {book = 1},
136+
groups = {book = 1, flammable = 3},
136137
on_use = book_on_use,
137138
})
138139

139140
minetest.register_craftitem("default:book_written", {
140141
description = "Book With Text",
141142
inventory_image = "default_book_written.png",
142-
groups = {book = 1, not_in_creative_inventory = 1},
143+
groups = {book = 1, not_in_creative_inventory = 1, flammable = 3},
143144
stack_max = 1,
144145
on_use = book_on_use,
145146
})
@@ -176,7 +177,7 @@ end)
176177
minetest.register_craftitem("default:coal_lump", {
177178
description = "Coal Lump",
178179
inventory_image = "default_coal_lump.png",
179-
groups = {coal = 1}
180+
groups = {coal = 1, flammable = 1}
180181
})
181182

182183
minetest.register_craftitem("default:iron_lump", {

Diff for: ‎mods/default/nodes.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@ minetest.register_node("default:junglegrass", {
11031103
sunlight_propagates = true,
11041104
walkable = false,
11051105
buildable_to = true,
1106-
groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1},
1106+
groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1, flammable = 1},
11071107
sounds = default.node_sound_leaves_defaults(),
11081108
selection_box = {
11091109
type = "fixed",
@@ -1124,7 +1124,7 @@ minetest.register_node("default:grass_1", {
11241124
sunlight_propagates = true,
11251125
walkable = false,
11261126
buildable_to = true,
1127-
groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1},
1127+
groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1, flammable = 1},
11281128
sounds = default.node_sound_leaves_defaults(),
11291129
selection_box = {
11301130
type = "fixed",
@@ -1154,7 +1154,7 @@ for i = 2, 5 do
11541154
buildable_to = true,
11551155
drop = "default:grass_1",
11561156
groups = {snappy = 3, flora = 1, attached_node = 1,
1157-
not_in_creative_inventory = 1, grass = 1},
1157+
not_in_creative_inventory = 1, grass = 1, flammable = 1},
11581158
sounds = default.node_sound_leaves_defaults(),
11591159
selection_box = {
11601160
type = "fixed",

Diff for: ‎mods/default/tools.lua

+5-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ minetest.register_tool("default:pick_wood", {
3232
},
3333
damage_groups = {fleshy=2},
3434
},
35+
groups = {flammable = 2},
3536
})
3637
minetest.register_tool("default:pick_stone", {
3738
description = "Stone Pickaxe",
@@ -110,6 +111,7 @@ minetest.register_tool("default:shovel_wood", {
110111
},
111112
damage_groups = {fleshy=2},
112113
},
114+
groups = {flammable = 2},
113115
})
114116
minetest.register_tool("default:shovel_stone", {
115117
description = "Stone Shovel",
@@ -192,6 +194,7 @@ minetest.register_tool("default:axe_wood", {
192194
},
193195
damage_groups = {fleshy=2},
194196
},
197+
groups = {flammable = 2},
195198
})
196199
minetest.register_tool("default:axe_stone", {
197200
description = "Stone Axe",
@@ -268,7 +271,8 @@ minetest.register_tool("default:sword_wood", {
268271
snappy={times={[2]=1.6, [3]=0.40}, uses=10, maxlevel=1},
269272
},
270273
damage_groups = {fleshy=2},
271-
}
274+
},
275+
groups = {flammable = 2},
272276
})
273277
minetest.register_tool("default:sword_stone", {
274278
description = "Stone Sword",

Diff for: ‎mods/farming/api.lua

+4-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ farming.register_hoe = function(name, def)
9292
inventory_image = def.inventory_image,
9393
on_use = function(itemstack, user, pointed_thing)
9494
return farming.hoe_on_use(itemstack, user, pointed_thing, def.max_uses)
95-
end
95+
end,
96+
groups = def.groups,
9697
})
9798
-- Register its recipe
9899
if def.material == nil then
@@ -269,7 +270,7 @@ farming.register_plant = function(name, def)
269270

270271
-- Register seed
271272
local lbm_nodes = {mname .. ":seed_" .. pname}
272-
local g = {seed = 1, snappy = 3, attached_node = 1}
273+
local g = {seed = 1, snappy = 3, attached_node = 1, flammable = 2}
273274
for k, v in pairs(def.fertility) do
274275
g[v] = 1
275276
end
@@ -307,6 +308,7 @@ farming.register_plant = function(name, def)
307308
minetest.register_craftitem(":" .. mname .. ":" .. pname, {
308309
description = pname:gsub("^%l", string.upper),
309310
inventory_image = mname .. "_" .. pname .. ".png",
311+
groups = {flammable = 2},
310312
})
311313

312314
-- Register growing steps

Diff for: ‎mods/farming/hoes.lua

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ farming.register_hoe(":farming:hoe_wood", {
22
description = "Wooden Hoe",
33
inventory_image = "farming_tool_woodhoe.png",
44
max_uses = 30,
5-
material = "group:wood"
5+
material = "group:wood",
6+
groups = {flammable = 2},
67
})
78

89
farming.register_hoe(":farming:hoe_stone", {

Diff for: ‎mods/farming/init.lua

+6-2
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,20 @@ farming.register_plant("farming:wheat", {
1414
steps = 8,
1515
minlight = 13,
1616
maxlight = default.LIGHT_MAX,
17-
fertility = {"grassland"}
17+
fertility = {"grassland"},
18+
groups = {flammable = 4},
1819
})
1920
minetest.register_craftitem("farming:flour", {
2021
description = "Flour",
2122
inventory_image = "farming_flour.png",
23+
groups = {flammable = 1},
2224
})
2325

2426
minetest.register_craftitem("farming:bread", {
2527
description = "Bread",
2628
inventory_image = "farming_bread.png",
2729
on_use = minetest.item_eat(5),
30+
groups = {flammable = 2},
2831
})
2932

3033
minetest.register_craft({
@@ -47,7 +50,8 @@ farming.register_plant("farming:cotton", {
4750
steps = 8,
4851
minlight = 13,
4952
maxlight = default.LIGHT_MAX,
50-
fertility = {"grassland", "desert"}
53+
fertility = {"grassland", "desert"},
54+
groups = {flammable = 4},
5155
})
5256

5357
minetest.register_alias("farming:string", "farming:cotton")

Diff for: ‎mods/flowers/init.lua

+9-9
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ local function add_simple_flower(name, desc, box, f_groups)
5757
end
5858

5959
flowers.datas = {
60-
{"rose", "Rose", {-0.15, -0.5, -0.15, 0.15, 0.3, 0.15}, {color_red = 1}},
61-
{"tulip", "Orange Tulip", {-0.15, -0.5, -0.15, 0.15, 0.2, 0.15}, {color_orange = 1}},
62-
{"dandelion_yellow", "Yellow Dandelion", {-0.15, -0.5, -0.15, 0.15, 0.2, 0.15}, {color_yellow = 1}},
63-
{"geranium", "Blue Geranium", {-0.15, -0.5, -0.15, 0.15, 0.2, 0.15}, {color_blue = 1}},
64-
{"viola", "Viola", {-0.5, -0.5, -0.5, 0.5, -0.2, 0.5}, {color_violet = 1}},
65-
{"dandelion_white", "White dandelion", {-0.5, -0.5, -0.5, 0.5, -0.2, 0.5}, {color_white = 1}}
60+
{"rose", "Rose", {-0.15, -0.5, -0.15, 0.15, 0.3, 0.15}, {color_red = 1, flammable = 1}},
61+
{"tulip", "Orange Tulip", {-0.15, -0.5, -0.15, 0.15, 0.2, 0.15}, {color_orange = 1, flammable = 1}},
62+
{"dandelion_yellow", "Yellow Dandelion", {-0.15, -0.5, -0.15, 0.15, 0.2, 0.15}, {color_yellow = 1, flammable = 1}},
63+
{"geranium", "Blue Geranium", {-0.15, -0.5, -0.15, 0.15, 0.2, 0.15}, {color_blue = 1, flammable = 1}},
64+
{"viola", "Viola", {-0.5, -0.5, -0.5, 0.5, -0.2, 0.5}, {color_violet = 1, flammable = 1}},
65+
{"dandelion_white", "White dandelion", {-0.5, -0.5, -0.5, 0.5, -0.2, 0.5}, {color_white = 1, flammable = 1}}
6666
}
6767

6868
for _,item in pairs(flowers.datas) do
@@ -136,7 +136,7 @@ minetest.register_node("flowers:mushroom_red", {
136136
sunlight_propagates = true,
137137
walkable = false,
138138
buildable_to = true,
139-
groups = {snappy = 3, attached_node = 1},
139+
groups = {snappy = 3, attached_node = 1, flammable = 1},
140140
sounds = default.node_sound_leaves_defaults(),
141141
on_use = minetest.item_eat(-5),
142142
selection_box = {
@@ -155,7 +155,7 @@ minetest.register_node("flowers:mushroom_brown", {
155155
sunlight_propagates = true,
156156
walkable = false,
157157
buildable_to = true,
158-
groups = {snappy = 3, attached_node = 1},
158+
groups = {snappy = 3, attached_node = 1, flammable = 1},
159159
sounds = default.node_sound_leaves_defaults(),
160160
on_use = minetest.item_eat(1),
161161
selection_box = {
@@ -229,7 +229,7 @@ minetest.register_node("flowers:waterlily", {
229229
buildable_to = true,
230230
sunlight_propagates = true,
231231
floodable = true,
232-
groups = {snappy = 3, flower = 1},
232+
groups = {snappy = 3, flower = 1, flammable = 1},
233233
sounds = default.node_sound_leaves_defaults(),
234234
node_placement_prediction = "",
235235
node_box = {

0 commit comments

Comments
 (0)
Please sign in to comment.