Skip to content

Commit 47c7b0b

Browse files
committedAug 7, 2015
Mushrooms: Rename spore nodes. Single ABM for mushroom growing
Code re-arranged and clarified
1 parent 0a3bf5b commit 47c7b0b

File tree

3 files changed

+84
-70
lines changed

3 files changed

+84
-70
lines changed
 

Diff for: ‎mods/flowers/init.lua

+84-70
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,29 @@
11
-- Minetest 0.4 mod: default
22
-- See README.txt for licensing and other information.
33

4+
45
-- Namespace for functions
6+
57
flowers = {}
68

79

810
-- Map Generation
11+
912
dofile(minetest.get_modpath("flowers") .. "/mapgen.lua")
1013

1114

15+
--
16+
-- Flowers
17+
--
18+
1219
-- Aliases for original flowers mod
13-
minetest.register_alias("flowers:flower_dandelion_white", "flowers:dandelion_white")
14-
minetest.register_alias("flowers:flower_dandelion_yellow", "flowers:dandelion_yellow")
15-
minetest.register_alias("flowers:flower_geranium", "flowers:geranium")
20+
1621
minetest.register_alias("flowers:flower_rose", "flowers:rose")
1722
minetest.register_alias("flowers:flower_tulip", "flowers:tulip")
23+
minetest.register_alias("flowers:flower_dandelion_yellow", "flowers:dandelion_yellow")
24+
minetest.register_alias("flowers:flower_geranium", "flowers:geranium")
1825
minetest.register_alias("flowers:flower_viola", "flowers:viola")
26+
minetest.register_alias("flowers:flower_dandelion_white", "flowers:dandelion_white")
1927

2028

2129
-- Flower registration
@@ -61,7 +69,58 @@ for _,item in pairs(flowers.datas) do
6169
end
6270

6371

72+
-- Flower spread
73+
74+
minetest.register_abm({
75+
nodenames = {"group:flora"},
76+
neighbors = {"default:dirt_with_grass", "default:desert_sand"},
77+
interval = 50,
78+
chance = 25,
79+
action = function(pos, node)
80+
pos.y = pos.y - 1
81+
local under = minetest.get_node(pos)
82+
pos.y = pos.y + 1
83+
if under.name == "default:desert_sand" then
84+
minetest.set_node(pos, {name = "default:dry_shrub"})
85+
elseif under.name ~= "default:dirt_with_grass" then
86+
return
87+
end
88+
89+
local light = minetest.get_node_light(pos)
90+
if not light or light < 13 then
91+
return
92+
end
93+
94+
local pos0 = {x = pos.x - 4, y = pos.y - 4, z = pos.z - 4}
95+
local pos1 = {x = pos.x + 4, y = pos.y + 4, z = pos.z + 4}
96+
if #minetest.find_nodes_in_area(pos0, pos1, "group:flora_block") > 0 then
97+
return
98+
end
99+
100+
local flowers = minetest.find_nodes_in_area(pos0, pos1, "group:flora")
101+
if #flowers > 3 then
102+
return
103+
end
104+
105+
local seedling = minetest.find_nodes_in_area(pos0, pos1, "default:dirt_with_grass")
106+
if #seedling > 0 then
107+
seedling = seedling[math.random(#seedling)]
108+
seedling.y = seedling.y + 1
109+
light = minetest.get_node_light(seedling)
110+
if not light or light < 13 then
111+
return
112+
end
113+
if minetest.get_node(seedling).name == "air" then
114+
minetest.set_node(seedling, {name = node.name})
115+
end
116+
end
117+
end,
118+
})
119+
120+
121+
--
64122
-- Mushrooms
123+
--
65124

66125
local mushrooms_datas = {
67126
{"brown", 2},
@@ -87,9 +146,9 @@ for _, m in pairs(mushrooms_datas) do
87146
groups = {snappy = 3, flammable = 3, attached_node = 1},
88147
drop = {
89148
items = {
90-
{items = {"flowers:spores_" .. name}, rarity = 2,},
91-
{items = {"flowers:spores_" .. name}, rarity = 2,},
92-
{items = {"flowers:spores_" .. name}, rarity = 2,},
149+
{items = {"flowers:mushroom_spores_" .. name}, rarity = 2,},
150+
{items = {"flowers:mushroom_spores_" .. name}, rarity = 2,},
151+
{items = {"flowers:mushroom_spores_" .. name}, rarity = 2,},
93152
{items = {"flowers:mushroom_" .. name},},
94153
},
95154
},
@@ -101,15 +160,15 @@ for _, m in pairs(mushrooms_datas) do
101160
}
102161
})
103162

104-
-- Register spores
163+
-- Register mushroom spores
105164

106-
minetest.register_node("flowers:spores_" .. name, {
165+
minetest.register_node("flowers:mushroom_spores_" .. name, {
107166
description = string.sub(string.upper(name), 0, 1) ..
108167
string.sub(name, 2) .. " Mushroom Spores",
109168
drawtype = "signlike",
110-
tiles = {"flowers_spores_" .. name .. ".png"},
111-
inventory_image = "flowers_spores_" .. name .. ".png",
112-
wield_image = "flowers_spores_" .. name .. ".png",
169+
tiles = {"flowers_mushroom_spores_" .. name .. ".png"},
170+
inventory_image = "flowers_mushroom_spores_" .. name .. ".png",
171+
wield_image = "flowers_mushroom_spores_" .. name .. ".png",
113172
paramtype = "light",
114173
paramtype2 = "wallmounted",
115174
sunlight_propagates = true,
@@ -120,73 +179,28 @@ for _, m in pairs(mushrooms_datas) do
120179
},
121180
groups = {dig_immediate = 3, attached_node = 1},
122181
})
123-
124-
-- Register growth ABMs
125-
126-
minetest.register_abm({
127-
nodenames = {"flowers:spores_" .. name},
128-
interval = 14,
129-
chance = 25,
130-
action = function(pos, node)
131-
local node_under = minetest.get_node_or_nil({x = pos.x,
132-
y = pos.y - 1, z = pos.z})
133-
if not node_under then
134-
return
135-
end
136-
if minetest.get_item_group(node_under.name, "soil") ~= 0 and
137-
minetest.get_node_light(pos, nil) <= 13 then
138-
minetest.set_node({x = pos.x, y = pos.y, z = pos.z},
139-
{name = "flowers:mushroom_" .. name})
140-
end
141-
end
142-
})
143182
end
144183

145184

146-
-- Flower spread
185+
-- Register growing ABM
147186

148187
minetest.register_abm({
149-
nodenames = {"group:flora"},
150-
neighbors = {"default:dirt_with_grass", "default:desert_sand"},
151-
interval = 50,
152-
chance = 25,
188+
nodenames = {"flowers:mushroom_spores_brown", "flowers:mushroom_spores_red"},
189+
interval = 11,
190+
chance = 50,
153191
action = function(pos, node)
154-
pos.y = pos.y - 1
155-
local under = minetest.get_node(pos)
156-
pos.y = pos.y + 1
157-
if under.name == "default:desert_sand" then
158-
minetest.set_node(pos, {name = "default:dry_shrub"})
159-
elseif under.name ~= "default:dirt_with_grass" then
192+
local node_under = minetest.get_node_or_nil({x = pos.x,
193+
y = pos.y - 1, z = pos.z})
194+
if not node_under then
160195
return
161196
end
162-
163-
local light = minetest.get_node_light(pos)
164-
if not light or light < 13 then
165-
return
166-
end
167-
168-
local pos0 = {x = pos.x - 4, y = pos.y - 4, z = pos.z - 4}
169-
local pos1 = {x = pos.x + 4, y = pos.y + 4, z = pos.z + 4}
170-
if #minetest.find_nodes_in_area(pos0, pos1, "group:flora_block") > 0 then
171-
return
172-
end
173-
174-
local flowers = minetest.find_nodes_in_area(pos0, pos1, "group:flora")
175-
if #flowers > 3 then
176-
return
177-
end
178-
179-
local seedling = minetest.find_nodes_in_area(pos0, pos1, "default:dirt_with_grass")
180-
if #seedling > 0 then
181-
seedling = seedling[math.random(#seedling)]
182-
seedling.y = seedling.y + 1
183-
light = minetest.get_node_light(seedling)
184-
if not light or light < 13 then
185-
return
186-
end
187-
if minetest.get_node(seedling).name == "air" then
188-
minetest.set_node(seedling, {name = node.name})
197+
if minetest.get_item_group(node_under.name, "soil") ~= 0 and
198+
minetest.get_node_light(pos, nil) <= 13 then
199+
if node.name == "flowers:mushroom_spores_brown" then
200+
minetest.set_node(pos, {name = "flowers:mushroom_brown"})
201+
else
202+
minetest.set_node(pos, {name = "flowers:mushroom_red"})
189203
end
190204
end
191-
end,
205+
end
192206
})

0 commit comments

Comments
 (0)
Please sign in to comment.