minenux
/
minetest-game-adventuretest
1
0
Fork 0
Code Issues 5 Pull Requests 3 Releases Wiki Activity

Remove references to minetest.env, Add adventuretest.is_night function.

BadToad2000/master
Brandon 2016-07-11 21:35:03 -05:00
parent 6be7059a43
commit c2d83855f9
18 changed files with 86 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mods/adventuretest/functions.lua
View File

@ -124,3 +124,12 @@ function hunger_join_player(player)
hud.change_item(player, "hunger", {number = lvl, max = 20})
end)
end
function adventuretest.is_night()
local t = minetest.get_timeofday()
if t > 0.8 or t < 4 then
return true
else
return false
end
end

4
mods/bones/init.lua
View File

@ -85,14 +85,14 @@ minetest.register_node("bones:bones", {
return
end
local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)
local name = player:get_player_name()
if name ~= meta:get_string("owner") then
return
end
local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)
local bones_inv = meta:get_inventory()
if ( bones_inv == nil ) then
return

4
mods/item_drop/init.lua
View File

@ -4,7 +4,7 @@ function itemdrop_globalstep(player,name,dtime)
pos.y = pos.y+0.5
local inv = player:get_inventory()
for _,object in pairs(minetest.env:get_objects_inside_radius(pos, 1)) do
for _,object in pairs(minetest.get_objects_inside_radius(pos, 1)) do
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
inv:add_item("main", ItemStack(object:get_luaentity().itemstring))
@ -20,7 +20,7 @@ function itemdrop_globalstep(player,name,dtime)
end
end
for _,object in pairs(minetest.env:get_objects_inside_radius(pos, 2)) do
for _,object in pairs(minetest.get_objects_inside_radius(pos, 2)) do
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
if object:get_luaentity().collect then
if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then

6
mods/magic/magicmissle.lua
View File

@ -13,7 +13,7 @@ local MAGICMISSLE_ENTITY={
MAGICMISSLE_ENTITY.on_step = function(self, dtime)
self.timer=self.timer+dtime
local pos = self.object:getpos()
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)
--if self.timer>0.2 then
if self.player ~= nil then
@ -21,7 +21,7 @@ MAGICMISSLE_ENTITY.on_step = function(self, dtime)
else
hitter = self.object
end
local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
for k, obj in pairs(objs) do
if obj:get_luaentity() ~= nil then
if obj:get_luaentity().name ~= "magic:magicmissle" and obj:get_luaentity().name ~= "__builtin:item" then
@ -135,7 +135,7 @@ local magicmissle_spell = {
pd.set(name,"mana",p_mana)
minetest.sound_play("magic_magicmissle_cast",{object=user})
local playerpos = user:getpos()
local obj = minetest.env:add_entity({x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, "magic:magicmissle")
local obj = minetest.add_entity({x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, "magic:magicmissle")
local dir = user:get_look_dir()
obj:setvelocity({x=dir.x*19, y=dir.y*19, z=dir.z*19})
obj:setacceleration({x=dir.x*-3, y=-1, z=dir.z*-3})

2
mods/mg_villages/fill_chest.lua
View File

@ -149,7 +149,7 @@ mg_villages.fill_chest_random = function( pos, pr, building_nr, building_typ )
local building_data = mg_villages.BUILDINGS[ building_nr.btype ];
local meta = minetest.env:get_meta( pos );
local meta = minetest.get_meta( pos );
local inv = meta:get_inventory();
local count = 0;

2
mods/mobs/animals/rat.lua
View File

@ -37,7 +37,7 @@ minetest.register_craftitem("mobs:rat", {
on_place = function(itemstack, placer, pointed_thing)
if pointed_thing.above then
minetest.env:add_entity(pointed_thing.above, "mobs:rat")
minetest.add_entity(pointed_thing.above, "mobs:rat")
itemstack:take_item()
end
return itemstack

12
mods/mobs/monsters/dungeonmaster.lua
View File

@ -69,11 +69,11 @@ mobs:register_arrow("mobs:fireball", {
for dy=-1,1 do
for dz=-1,1 do
local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
local n = minetest.env:get_node(pos).name
local n = minetest.get_node(pos).name
if minetest.registered_nodes[n].groups.flammable or math.random(1, 100) <= 30 then
minetest.env:set_node(p, {name="fire:basic_flame"})
minetest.set_node(p, {name="fire:basic_flame"})
else
--minetest.env:remove_node(p)
--minetest.remove_node(p)
end
end
end
@ -84,11 +84,11 @@ mobs:register_arrow("mobs:fireball", {
for dy=-2,1 do
for dz=-1,1 do
local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
local n = minetest.env:get_node(pos).name
local n = minetest.get_node(pos).name
if minetest.registered_nodes[n].groups.flammable or math.random(1, 100) <= 30 then
minetest.env:set_node(p, {name="fire:basic_flame"})
minetest.set_node(p, {name="fire:basic_flame"})
else
--minetest.env:remove_node(p)
--minetest.remove_node(p)
end
end
end

5
mods/mobs/step.lua
View File

@ -1,9 +1,4 @@
function mobs.on_step(self,dtime)
if self.type == "monster" and minetest.setting_getbool("only_peaceful_mobs") then
self.object:remove()
return
end
if self.lifetimer ~= false then
self.lifetimer = self.lifetimer - dtime
if self.lifetimer <= 0 and not self.tamed and self.type ~= "npc" then

10
mods/money2/lockedsign.lua
View File

@ -20,12 +20,12 @@
minetest.register_on_punchnode(function(pos, node, puncher)
local bottom_pos = {x=pos.x, y=pos.y - 1, z=pos.z}
local bottom_node = minetest.env:get_node(bottom_pos)
local bottom_node = minetest.get_node(bottom_pos)
if (node.name == "locked_sign:sign_wall_locked") and (bottom_node.name == "default:chest_locked") and
minetest.env:get_meta(pos):get_string("owner") == minetest.env:get_meta(bottom_pos):get_string("owner") then
local sign_text = minetest.env:get_meta(pos):get_string("text")
minetest.get_meta(pos):get_string("owner") == minetest.get_meta(bottom_pos):get_string("owner") then
local sign_text = minetest.get_meta(pos):get_string("text")
local shop_name, shop_type, nodename, amount, cost = string.match(sign_text, "([^ ]+) ([^ ]+) ([^ ]+) ([^ ]+) ([^ ]+)")
local owner_name = minetest.env:get_meta(pos):get_string("owner")
local owner_name = minetest.get_meta(pos):get_string("owner")
local puncher_name = puncher:get_player_name()
if (shop_type ~= "B") and (shop_type ~= "S") or (not minetest.registered_items[nodename]) or (not tonumber(amount)) or
(not tonumber(cost)) then
@ -40,7 +40,7 @@ minetest.register_on_punchnode(function(pos, node, puncher)
end
local chest_inv = minetest.env:get_meta({x=pos.x, y=pos.y - 1, z = pos.z}):get_inventory()
local chest_inv = minetest.get_meta({x=pos.x, y=pos.y - 1, z = pos.z}):get_inventory()
local puncher_inv = puncher:get_inventory()
--BUY
if shop_type == "B" then

4
mods/sethome/init.lua
View File

@ -46,7 +46,7 @@ minetest.register_chatcommand("home", {
end
local last_moved = pd.get_number(pname,"last_moved")
local homepos = pd.get(pname,"homepos")
local player = minetest.env:get_player_by_name(name)
local player = minetest.get_player_by_name(name)
if player == nil then
-- just a check to prevent server death
return false
@ -92,7 +92,7 @@ minetest.register_chatcommand("sethome", {
pname = name
end
local player = minetest.env:get_player_by_name(name)
local player = minetest.get_player_by_name(name)
local pos = player:getpos()
pd.set(pname,"homepos",pos)
minetest.chat_send_player(name, "Home set!")

6
mods/throwing/arrow.lua
View File

@ -46,7 +46,7 @@ local THROWING_ARROW_ENTITY={
THROWING_ARROW_ENTITY.on_step = function(self, dtime)
self.timer=self.timer+dtime
local pos = self.object:getpos()
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)
local hitter
local damage = 0
@ -56,7 +56,7 @@ THROWING_ARROW_ENTITY.on_step = function(self, dtime)
else
hitter = self.object
end
local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
for k, obj in pairs(objs) do
if obj:get_luaentity() ~= nil then
if obj:get_luaentity().name ~= "throwing:arrow_entity" and obj:get_luaentity().name ~= "__builtin:item" then
@ -93,7 +93,7 @@ THROWING_ARROW_ENTITY.on_step = function(self, dtime)
if self.lastpos.x~=nil then
if ( minetest.registered_nodes[node.name].walkable == true or minetest.registered_nodes[node.name].walkable == nil ) and ( node.name ~= "air" and node.name ~= "default:water_source" and node.name ~= "default:water_flowing" ) then
minetest.sound_play("throwing_arrow_hit_wall",{object=self.object})
minetest.env:add_item(self.lastpos, 'throwing:arrow')
minetest.add_item(self.lastpos, 'throwing:arrow')
self.object:remove()
end
end

10
mods/throwing/build_arrow.lua
View File

@ -43,21 +43,21 @@ local THROWING_ARROW_ENTITY={
THROWING_ARROW_ENTITY.on_step = function(self, dtime)
self.timer=self.timer+dtime
local pos = self.object:getpos()
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)
if self.timer>0.2 then
local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 1)
local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 1)
for k, obj in pairs(objs) do
if obj:get_luaentity() ~= nil then
if obj:get_luaentity().name ~= "throwing:arrow_build_entity" and obj:get_luaentity().name ~= "__builtin:item" then
if self.node ~= "" then
minetest.env:set_node(self.lastpos, {name=self.node})
minetest.set_node(self.lastpos, {name=self.node})
end
self.object:remove()
end
else
if self.node ~= "" then
minetest.env:set_node(self.lastpos, {name=self.node})
minetest.set_node(self.lastpos, {name=self.node})
end
self.object:remove()
end
@ -67,7 +67,7 @@ THROWING_ARROW_ENTITY.on_step = function(self, dtime)
if self.lastpos.x~=nil then
if node.name ~= "air" then
if self.node ~= "" then
minetest.env:set_node(self.lastpos, {name=self.node})
minetest.set_node(self.lastpos, {name=self.node})
end
self.object:remove()
end

16
mods/throwing/dig_arrow.lua
View File

@ -42,20 +42,20 @@ local THROWING_ARROW_ENTITY={
THROWING_ARROW_ENTITY.on_step = function(self, dtime)
self.timer=self.timer+dtime
local pos = self.object:getpos()
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)
if self.timer>0.2 then
local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 1)
local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 1)
for k, obj in pairs(objs) do
if obj:get_luaentity() ~= nil then
if obj:get_luaentity().name ~= "throwing:arrow_dig_entity" and obj:get_luaentity().name ~= "__builtin:item" then
minetest.env:add_item(pos, 'throwing:arrow_dig')
minetest.env:remove_node(pos)
minetest.add_item(pos, 'throwing:arrow_dig')
minetest.remove_node(pos)
self.object:remove()
end
else
minetest.env:add_item(pos, 'throwing:arrow_dig')
minetest.env:remove_node(pos)
minetest.add_item(pos, 'throwing:arrow_dig')
minetest.remove_node(pos)
self.object:remove()
end
end
@ -63,8 +63,8 @@ THROWING_ARROW_ENTITY.on_step = function(self, dtime)
if self.lastpos.x~=nil then
if node.name ~= "air" then
minetest.env:add_item(self.lastpos, 'throwing:arrow_dig')
minetest.env:remove_node(pos)
minetest.add_item(self.lastpos, 'throwing:arrow_dig')
minetest.remove_node(pos)
self.object:remove()
end
end

16
mods/throwing/fire_arrow.lua
View File

@ -42,10 +42,10 @@ local THROWING_ARROW_ENTITY={
THROWING_ARROW_ENTITY.on_step = function(self, dtime)
self.timer=self.timer+dtime
local pos = self.object:getpos()
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)
if self.timer>0.2 then
local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
for k, obj in pairs(objs) do
if obj:get_luaentity() ~= nil then
if obj:get_luaentity().name ~= "throwing:arrow_fire_entity" and obj:get_luaentity().name ~= "__builtin:item" then
@ -69,15 +69,15 @@ THROWING_ARROW_ENTITY.on_step = function(self, dtime)
if self.lastpos.x~=nil then
if node.name ~= "air" and node.name ~= "throwing:light" then
minetest.env:set_node(self.lastpos, {name="fire:basic_flame"})
minetest.set_node(self.lastpos, {name="fire:basic_flame"})
self.object:remove()
end
if math.floor(self.lastpos.x+0.5) ~= math.floor(pos.x+0.5) or math.floor(self.lastpos.y+0.5) ~= math.floor(pos.y+0.5) or math.floor(self.lastpos.z+0.5) ~= math.floor(pos.z+0.5) then
if minetest.env:get_node(self.lastpos).name == "throwing:light" then
minetest.env:remove_node(self.lastpos)
if minetest.get_node(self.lastpos).name == "throwing:light" then
minetest.remove_node(self.lastpos)
end
if minetest.env:get_node(pos).name == "air" then
minetest.env:set_node(pos, {name="throwing:light"})
if minetest.get_node(pos).name == "air" then
minetest.set_node(pos, {name="throwing:light"})
end
end
end
@ -116,6 +116,6 @@ minetest.register_abm({
interval = 10,
chance = 1,
action = function(pos, node)
minetest.env:remove_node(pos)
minetest.remove_node(pos)
end
})

2
mods/throwing/init.lua
View File

@ -17,7 +17,7 @@ local throwing_shoot_arrow = function(itemstack, player)
local weapon_def = weapon:get_definition()
local playerpos = player:getpos()
local obj = minetest.env:add_entity({x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, arrow[2])
local obj = minetest.add_entity({x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, arrow[2])
local dir = player:get_look_dir()
obj:setvelocity({x=dir.x*19, y=dir.y*19, z=dir.z*19})
obj:setacceleration({x=dir.x*-3, y=weapon_def.drop_rate, z=dir.z*-3})

4
mods/throwing/teleport_arrow.lua
View File

@ -43,10 +43,10 @@ local THROWING_ARROW_ENTITY={
THROWING_ARROW_ENTITY.on_step = function(self, dtime)
self.timer=self.timer+dtime
local pos = self.object:getpos()
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)
if self.timer>0.2 then
local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
for k, obj in pairs(objs) do
if obj:get_luaentity() ~= nil then
if obj:get_luaentity().name ~= "throwing:arrow_teleport_entity" and obj:get_luaentity().name ~= "__builtin:item" then

22
mods/vendor/vendor/mese_vendor.lua vendored
View File

@ -8,8 +8,8 @@ to specific rooms only for example.
-- New defined for the mesecon part
vendor.mese_formspec = function(pos, player)
local meta = minetest.env:get_meta(pos)
local node = minetest.env:get_node(pos)
local meta = minetest.get_meta(pos)
local node = minetest.get_node(pos)
local description = minetest.registered_nodes[node.name].description;
local buysell = "sell"
@ -34,9 +34,9 @@ vendor.mese_on_receive_fields = function(pos, formname, fields, sender)
return
end
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)
local description = minetest.registered_nodes[node.name].description;
local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)
local owner = meta:get_string("owner")
if sender:get_player_name() ~= owner then
minetest.chat_send_player(sender:get_player_name(), "vendor: Cannot configure machine. The " .. description .. " belongs to " .. owner ..".")
@ -73,8 +73,8 @@ vendor.mese_on_receive_fields = function(pos, formname, fields, sender)
end
vendor.mese_refresh = function(pos, err)
local meta = minetest.env:get_meta(pos)
local node = minetest.env:get_node_or_nil(pos)
local meta = minetest.get_meta(pos)
local node = minetest.get_node_or_nil(pos)
if ( node == nil ) then
return
end
@ -107,8 +107,8 @@ vendor.mese_refresh = function(pos, err)
end
vendor.mese_on_punch = function(pos, node, player)
local meta = minetest.env:get_meta(pos)
local node = minetest.env:get_node_or_nil(pos)
local meta = minetest.get_meta(pos)
local node = minetest.get_node_or_nil(pos)
if ( node == nil ) then
return
end
@ -177,7 +177,7 @@ vendor.mese_on_punch = function(pos, node, player)
end
vendor.signal_vendor_turnoff = function (pos)
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)
if node.name=='vendor:signal_vendor_on' then --has not been dug
mesecon:swap_node(pos, 'vendor:signal_vendor_off')
local rules = mesecon.rules.buttonlike_get(node)
@ -195,12 +195,12 @@ minetest.register_node( 'vendor:signal_vendor_off', {
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
after_place_node = function( pos, placer )
--print( 'Placed a new signal vendor')
local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)
meta:set_int("cost", 0)
meta:set_int("limit", 0)
meta:set_string("owner", placer:get_player_name() or "")
meta:set_string("formspec", vendor.mese_formspec(pos, placer))
local description = minetest.registered_nodes[minetest.env:get_node(pos).name].description
local description = minetest.registered_nodes[minetest.get_node(pos).name].description
vendor.disable(pos, "New " .. description)
end,
can_dig = vendor.can_dig,

34
mods/vendor/vendor/vendor.lua vendored
View File

@ -35,9 +35,9 @@ vendor.traversable_node_types = {
}
vendor.formspec = function(pos, player)
local meta = minetest.env:get_meta(pos)
local meta = minetest.env:get_meta(pos)
local node = minetest.env:get_node(pos)
local meta = minetest.get_meta(pos)
local meta = minetest.get_meta(pos)
local node = minetest.get_node(pos)
local description = minetest.registered_nodes[node.name].description;
local buysell = "sell"
if ( node.name == "vendor:depositor" ) then
@ -64,7 +64,7 @@ vendor.formspec = function(pos, player)
end
vendor.after_place_node = function(pos, placer)
local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)
meta:set_string("itemtype", "")
meta:set_int("number", 0)
meta:set_int("cost", 0)
@ -72,12 +72,12 @@ vendor.after_place_node = function(pos, placer)
meta:set_string("owner", placer:get_player_name() or "")
meta:set_string("shop","")
meta:set_string("formspec", vendor.formspec(pos, placer))
local description = minetest.registered_nodes[minetest.env:get_node(pos).name].description;
local description = minetest.registered_nodes[minetest.get_node(pos).name].description;
vendor.disable(pos, "New " .. description)
end
vendor.can_dig = function(pos,player)
local meta = minetest.env:get_meta(pos);
local meta = minetest.get_meta(pos);
local owner = meta:get_string("owner")
local name = player:get_player_name()
if name == owner then
@ -92,9 +92,9 @@ vendor.on_receive_fields = function(pos, formname, fields, sender)
return
end
local node = minetest.env:get_node(pos)
local node = minetest.get_node(pos)
local description = minetest.registered_nodes[node.name].description;
local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)
local owner = meta:get_string("owner")
if sender:get_player_name() ~= owner then
minetest.chat_send_player(sender:get_player_name(), "vendor: Cannot configure machine. The " .. description .. " belongs to " .. owner ..".")
@ -163,9 +163,9 @@ end
vendor.disable = function(pos, desc)
vendor.sound_deactivate(pos)
local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)
local owner = meta:get_string("owner")
local description = minetest.registered_nodes[minetest.env:get_node(pos).name].description;
local description = minetest.registered_nodes[minetest.get_node(pos).name].description;
if ( desc == nil ) then
desc = "Disabled " .. description
end
@ -174,8 +174,8 @@ vendor.disable = function(pos, desc)
end
vendor.refresh = function(pos, err)
local meta = minetest.env:get_meta(pos)
local node = minetest.env:get_node_or_nil(pos)
local meta = minetest.get_meta(pos)
local node = minetest.get_node_or_nil(pos)
if ( node == nil ) then
return
end
@ -244,8 +244,8 @@ vendor.sound_vend = function(pos)
end
vendor.on_punch = function(pos, node, player)
local meta = minetest.env:get_meta(pos)
local node = minetest.env:get_node_or_nil(pos)
local meta = minetest.get_meta(pos)
local node = minetest.get_node_or_nil(pos)
if ( node == nil ) then
return
end
@ -398,7 +398,7 @@ end
vendor.is_traversable = function(pos)
local node = minetest.env:get_node_or_nil(pos)
local node = minetest.get_node_or_nil(pos)
if ( node == nil ) then
return false
end
@ -467,7 +467,7 @@ end
vendor.find_chest_inv = function(owner, pos, dx, dy, dz, nodename, amount, removing)
pos = {x=pos.x + dx, y=pos.y + dy, z=pos.z + dz}
local node = minetest.env:get_node_or_nil(pos)
local node = minetest.get_node_or_nil(pos)
if ( node == nil ) then
return nil
end
@ -485,7 +485,7 @@ vendor.find_chest_inv = function(owner, pos, dx, dy, dz, nodename, amount, remov
or node.name == "technic:silver_chest"
or node.name == "technic:silver_locked_chest"
) then
local meta = minetest.env:get_meta(pos)
local meta = minetest.get_meta(pos)
if ( string.find(node.name,"_locked") ~= nil and owner ~= meta:get_string("owner") ) then
return nil
end