fixed many bugs

This commit is contained in:
Zsolt Bartha 2014-05-06 12:07:07 -06:00
parent ffae1c78fb
commit a4bbbd50e9

View file

@ -11,11 +11,11 @@ minetest.register_globalstep(function(dtime)
if player_pos[player:get_player_name()].x ~= player_pos_previous[player:get_player_name()].x if player_pos[player:get_player_name()].x ~= player_pos_previous[player:get_player_name()].x
or player_pos[player:get_player_name()].y < player_pos_previous[player:get_player_name()].y or player_pos[player:get_player_name()].y < player_pos_previous[player:get_player_name()].y
or player_pos[player:get_player_name()].z ~= player_pos_previous[player:get_player_name()].z then or player_pos[player:get_player_name()].z ~= player_pos_previous[player:get_player_name()].z then
if n_ground == "moonrealm:dust" then if n_ground == "mapgen:dust" then
if math.random() < 0.5 then if math.random() < 0.5 then
minetest.add_node(p_groundpl,{name="moonrealm:dustprint1"}) minetest.add_node(p_groundpl,{name="mapgen:dustprint1"})
else else
minetest.add_node(p_groundpl,{name="moonrealm:dustprint2"}) minetest.add_node(p_groundpl,{name="mapgen:dustprint2"})
end end
end end
end end
@ -26,7 +26,7 @@ minetest.register_globalstep(function(dtime)
} }
end end
if math.random() < 0.1 then if math.random() < 0.1 then
if player:get_inventory():contains_item("main", "moonrealm:spacesuit") if player:get_inventory():contains_item("main", "mapgen:spacesuit")
and player:get_breath() < 10 then and player:get_breath() < 10 then
player:set_breath(10) player:set_breath(10)
end end
@ -51,13 +51,13 @@ function moonrealm_appletree(pos)
local z = pos.z local z = pos.z
for j = -2, -1 do for j = -2, -1 do
local nodename = minetest.get_node({x=x,y=y+j,z=z}).name local nodename = minetest.get_node({x=x,y=y+j,z=z}).name
if nodename ~= "moonrealm:soil" then if nodename ~= "mapgen:soil" then
return return
end end
end end
for j = 1, 5 do for j = 1, 5 do
local nodename = minetest.get_node({x=x,y=y+j,z=z}).name local nodename = minetest.get_node({x=x,y=y+j,z=z}).name
if nodename ~= "moonrealm:air" then if nodename ~= "mapgen:air" then
return return
end end
end end
@ -70,10 +70,10 @@ function moonrealm_appletree(pos)
if math.random(13) == 2 then if math.random(13) == 2 then
minetest.add_node({x=pos.x+i,y=pos.y+j+1,z=pos.z+k},{name="default:apple"}) minetest.add_node({x=pos.x+i,y=pos.y+j+1,z=pos.z+k},{name="default:apple"})
else else
minetest.add_node({x=pos.x+i,y=pos.y+j+1,z=pos.z+k},{name="moonrealm:leaves"}) minetest.add_node({x=pos.x+i,y=pos.y+j+1,z=pos.z+k},{name="mapgen:leaves"})
end end
else else
minetest.add_node({x=x+i,y=y+j+1,z=z+k},{name="moonrealm:air"}) minetest.add_node({x=x+i,y=y+j+1,z=z+k},{name="mapgen:air"})
minetest.get_meta({x=x+i,y=y+j+1,z=z+k}):set_int("spread", 16) minetest.get_meta({x=x+i,y=y+j+1,z=z+k}):set_int("spread", 16)
end end
end end
@ -95,16 +95,16 @@ minetest.register_on_dignode(function(pos, oldnode, digger)
for k = -1,1 do for k = -1,1 do
if not (i == 0 and j == 0 and k == 0) then if not (i == 0 and j == 0 and k == 0) then
local nodename = minetest.get_node({x=x+i,y=y+j,z=z+k}).name local nodename = minetest.get_node({x=x+i,y=y+j,z=z+k}).name
if nodename == "moonrealm:air" then if nodename == "mapgen:air" then
local spread = minetest.get_meta({x=x+i,y=y+j,z=z+k}):get_int("spread") local spread = minetest.get_meta({x=x+i,y=y+j,z=z+k}):get_int("spread")
if spread > 0 then if spread > 0 then
minetest.add_node({x=x,y=y,z=z},{name="moonrealm:air"}) minetest.add_node({x=x,y=y,z=z},{name="mapgen:air"})
minetest.get_meta(pos):set_int("spread", (spread - 1)) minetest.get_meta(pos):set_int("spread", (spread - 1))
print ("[moonrealm] MR air flows into hole "..(spread - 1)) print ("[moonrealm] MR air flows into hole "..(spread - 1))
return return
end end
elseif nodename == "moonrealm:vacuum" then elseif nodename == "mapgen:vacuum" then
minetest.add_node({x=x,y=y,z=z},{name="moonrealm:vacuum"}) minetest.add_node({x=x,y=y,z=z},{name="mapgen:vacuum"})
print ("[moonrealm] Vacuum flows into hole") print ("[moonrealm] Vacuum flows into hole")
return return
end end
@ -118,8 +118,8 @@ end)
-- Air spreads -- Air spreads
minetest.register_abm({ minetest.register_abm({
nodenames = {"moonrealm:air"}, nodenames = {"mapgen:air"},
neighbors = {"moonrealm:vacuum", "air"}, neighbors = {"mapgen:vacuum", "air"},
interval = 11, interval = 11,
chance = 9, chance = 9,
action = function(pos, node, active_object_count, active_object_count_wider) action = function(pos, node, active_object_count, active_object_count_wider)
@ -135,9 +135,9 @@ minetest.register_abm({
for k = -1,1 do for k = -1,1 do
if not (i == 0 and j == 0 and k == 0) then if not (i == 0 and j == 0 and k == 0) then
local nodename = minetest.get_node({x=x+i,y=y+j,z=z+k}).name local nodename = minetest.get_node({x=x+i,y=y+j,z=z+k}).name
if nodename == "moonrealm:vacuum" if nodename == "mapgen:vacuum"
or nodename == "air" then or nodename == "air" then
minetest.add_node({x=x+i,y=y+j,z=z+k},{name="moonrealm:air"}) minetest.add_node({x=x+i,y=y+j,z=z+k},{name="mapgen:air"})
minetest.get_meta({x=x+i,y=y+j,z=z+k}):set_int("spread", (spread - 1)) minetest.get_meta({x=x+i,y=y+j,z=z+k}):set_int("spread", (spread - 1))
print ("[moonrealm] MR air spreads "..(spread - 1)) print ("[moonrealm] MR air spreads "..(spread - 1))
end end
@ -151,8 +151,8 @@ minetest.register_abm({
-- Hydroponic saturation -- Hydroponic saturation
minetest.register_abm({ minetest.register_abm({
nodenames = {"moonrealm:hlsource", "moonrealm:hlflowing"}, nodenames = {"mapgen:hlsource", "mapgen:hlflowing"},
neighbors = {"moonrealm:dust", "moonrealm:dustprint1", "moonrealm:dustprint2"}, neighbors = {"mapgen:dust", "mapgen:dustprint1", "mapgen:dustprint2"},
interval = 29, interval = 29,
chance = 9, chance = 9,
action = function(pos, node, active_object_count, active_object_count_wider) action = function(pos, node, active_object_count, active_object_count_wider)
@ -164,10 +164,10 @@ minetest.register_abm({
for k = -2,2 do for k = -2,2 do
if not (i == 0 and j == 0 and k == 0) then if not (i == 0 and j == 0 and k == 0) then
local nodename = minetest.get_node({x=x+i,y=y+j,z=z+k}).name local nodename = minetest.get_node({x=x+i,y=y+j,z=z+k}).name
if nodename == "moonrealm:dust" if nodename == "mapgen:dust"
or nodename == "moonrealm:dustprint1" or nodename == "mapgen:dustprint1"
or nodename == "moonrealm:dustprint2" then or nodename == "mapgen:dustprint2" then
minetest.add_node({x=x+i,y=y+j,z=z+k},{name="moonrealm:soil"}) minetest.add_node({x=x+i,y=y+j,z=z+k},{name="mapgen:soil"})
print ("[moonrealm] Hydroponic liquid saturates") print ("[moonrealm] Hydroponic liquid saturates")
end end
end end
@ -180,7 +180,7 @@ minetest.register_abm({
-- Soil drying -- Soil drying
minetest.register_abm({ minetest.register_abm({
nodenames = {"moonrealm:soil"}, nodenames = {"mapgen:soil"},
interval = 31, interval = 31,
chance = 27, chance = 27,
action = function(pos, node) action = function(pos, node)
@ -192,14 +192,14 @@ minetest.register_abm({
for k = -2, 2 do for k = -2, 2 do
if not (i == 0 and j == 0 and k == 0) then if not (i == 0 and j == 0 and k == 0) then
local nodename = minetest.get_node({x=x+i,y=y+j,z=z+k}).name local nodename = minetest.get_node({x=x+i,y=y+j,z=z+k}).name
if nodename == "moonrealm:hlsource" or nodename == "moonrealm:hlflowing" then if nodename == "mapgen:hlsource" or nodename == "mapgen:hlflowing" then
return return
end end
end end
end end
end end
end end
minetest.add_node(pos,{name="moonrealm:dust"}) minetest.add_node(pos,{name="mapgen:dust"})
print ("[moonrealm] Moon soil dries") print ("[moonrealm] Moon soil dries")
end, end,
}) })
@ -207,7 +207,7 @@ minetest.register_abm({
-- Space appletree from sapling -- Space appletree from sapling
minetest.register_abm({ minetest.register_abm({
nodenames = {"moonrealm:sapling"}, nodenames = {"mapgen:sapling"},
interval = 57, interval = 57,
chance = 3, chance = 3,
action = function(pos, node, active_object_count, active_object_count_wider) action = function(pos, node, active_object_count, active_object_count_wider)