MT-CTF/ctf_pvp_engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove depreciated minetest.env namespace

Browse Source
This commit is contained in:
rubenwardy 2015-07-14 12:15:05 +01:00
parent ca9699d3eb
commit ef9f5d9aac
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mods/capturetheflag/ctf_flag/flag_func.lua
View File

@ -58,7 +58,7 @@ local function do_capture(attname, flag, returned)
ctf_flag.delete(team, vector.new(flag)) ctf_flag.delete(team, vector.new(flag))
ctf_flag.add(attacker.team, vector.new(flag)) ctf_flag.add(attacker.team, vector.new(flag))
else else
minetest.env:set_node(pos,{name="air"}) minetest.set_node(pos,{name="air"})
ctf_flag.delete(team,pos) ctf_flag.delete(team,pos)
end end
@ -179,7 +179,7 @@ ctf_flag = {
end end
end, end,
on_construct = function(pos) on_construct = function(pos)
local meta = minetest.env:get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("infotext", "Unowned flag") meta:set_string("infotext", "Unowned flag")
end, end,
after_place_node = function(pos, placer) after_place_node = function(pos, placer)
@ -187,7 +187,7 @@ ctf_flag = {
return return
end end
local meta = minetest.env:get_meta(pos) local meta = minetest.get_meta(pos)
if not meta then if not meta then
return return
@ -200,12 +200,12 @@ ctf_flag = {
-- add flag -- add flag
ctf_flag.add(team, pos) ctf_flag.add(team, pos)
if ctf.teams[team].spawn and minetest.env:get_node(ctf.teams[team].spawn).name == "ctf_flag:flag" then if ctf.teams[team].spawn and minetest.get_node(ctf.teams[team].spawn).name == "ctf_flag:flag" then
if not ctf.setting("flag.allow_multiple") then if not ctf.setting("flag.allow_multiple") then
-- send message -- send message
minetest.chat_send_all(team.."'s flag has been moved") minetest.chat_send_all(team.."'s flag has been moved")
minetest.env:set_node(ctf.team(team).spawn,{name="air"}) minetest.set_node(ctf.team(team).spawn,{name="air"})
minetest.env:set_node({ minetest.set_node({
x=ctf.team(team).spawn.x, x=ctf.team(team).spawn.x,
y=ctf.team(team).spawn.y+1, y=ctf.team(team).spawn.y+1,
z=ctf.team(team).spawn.z z=ctf.team(team).spawn.z
@ -229,14 +229,14 @@ ctf_flag = {
ctf.needs_save = true ctf.needs_save = true
end end
minetest.env:set_node(pos2, {name="ctf_flag:flag_top_"..ctf.team(team).data.color}) minetest.set_node(pos2, {name="ctf_flag:flag_top_"..ctf.team(team).data.color})
local meta2 = minetest.env:get_meta(pos2) local meta2 = minetest.get_meta(pos2)
meta2:set_string("infotext", team.."'s flag") meta2:set_string("infotext", team.."'s flag")
else else
minetest.chat_send_player(placer:get_player_name(), "You are not part of a team!") minetest.chat_send_player(placer:get_player_name(), "You are not part of a team!")
minetest.env:set_node(pos,{name="air"}) minetest.set_node(pos,{name="air"})
end end
end end
} }

4
mods/capturetheflag/ctf_flag/gui.lua
View File

@ -173,9 +173,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
ctf_flag.delete(team,pos) ctf_flag.delete(team,pos)
minetest.env:set_node(pos,{name="air"}) minetest.set_node(pos,{name="air"})
pos.y=pos.y+1 pos.y=pos.y+1
minetest.env:set_node(pos,{name="air"}) minetest.set_node(pos,{name="air"})
return true return true
end end

14
mods/capturetheflag/ctf_flag/init.lua
View File

@ -264,7 +264,7 @@ minetest.register_abm({
chance = 1, chance = 1,
action = function(pos) action = function(pos)
local top = {x=pos.x,y=pos.y+1,z=pos.z} local top = {x=pos.x,y=pos.y+1,z=pos.z}
local flagmeta = minetest.env:get_meta(pos) local flagmeta = minetest.get_meta(pos)
if not flagmeta then if not flagmeta then
return return
@ -273,11 +273,11 @@ minetest.register_abm({
local flag_team_data = ctf_flag.get(pos) local flag_team_data = ctf_flag.get(pos)
if not flag_team_data or not ctf.team(flag_team_data.team)then if not flag_team_data or not ctf.team(flag_team_data.team)then
ctf.log("flag", "Flag does not exist! Deleting nodes. "..dump(pos)) ctf.log("flag", "Flag does not exist! Deleting nodes. "..dump(pos))
minetest.env:set_node(pos,{name="air"}) minetest.set_node(pos,{name="air"})
minetest.env:set_node(top,{name="air"}) minetest.set_node(top,{name="air"})
return return
end end
local topmeta = minetest.env:get_meta(top) local topmeta = minetest.get_meta(top)
local flag_name = flag_team_data.name local flag_name = flag_team_data.name
if flag_name and flag_name ~= "" then if flag_name and flag_name ~= "" then
flagmeta:set_string("infotext", flag_name.." - "..flag_team_data.team) flagmeta:set_string("infotext", flag_name.." - "..flag_team_data.team)
@ -291,12 +291,12 @@ minetest.register_abm({
end end
if flag_team_data.claimed then if flag_team_data.claimed then
minetest.env:set_node(top,{name="ctf_flag:flag_captured_top"}) minetest.set_node(top,{name="ctf_flag:flag_captured_top"})
else else
minetest.env:set_node(top,{name="ctf_flag:flag_top_"..ctf.team(flag_team_data.team).data.color}) minetest.set_node(top,{name="ctf_flag:flag_top_"..ctf.team(flag_team_data.team).data.color})
end end
topmeta = minetest.env:get_meta(top) topmeta = minetest.get_meta(top)
if flag_name and flag_name ~= "" then if flag_name and flag_name ~= "" then
topmeta:set_string("infotext", flag_name.." - "..flag_team_data.team) topmeta:set_string("infotext", flag_name.." - "..flag_team_data.team)
else else

18
mods/capturetheflag/ctf_turret/init.lua
View File

@ -30,18 +30,18 @@ if ctf.setting("turrets") then
}, },
groups = {cracky=3, stone=1}, groups = {cracky=3, stone=1},
on_construct = function(pos) on_construct = function(pos)
local meta = minetest.env:get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("infotext", "Unowned turret") meta:set_string("infotext", "Unowned turret")
end, end,
after_place_node = function(pos, placer) after_place_node = function(pos, placer)
local meta = minetest.env:get_meta(pos) local meta = minetest.get_meta(pos)
if meta and ctf.players and ctf.player(placer:get_player_name()) and ctf.player(placer:get_player_name()).team then if meta and ctf.players and ctf.player(placer:get_player_name()) and ctf.player(placer:get_player_name()).team then
local team = ctf.player(placer:get_player_name()).team local team = ctf.player(placer:get_player_name()).team
meta:set_string("team", team) meta:set_string("team", team)
meta:set_string("infotext", "Owned by "..team) meta:set_string("infotext", "Owned by "..team)
else else
minetest.env:set_node(pos,{name="air"}) minetest.set_node(pos,{name="air"})
end end
end end
}) })
@ -51,7 +51,7 @@ if ctf.setting("turrets") then
interval = 0.25, interval = 0.25,
chance = 4, chance = 4,
action = function(pos, node) action = function(pos, node)
local meta = minetest.env:get_meta(pos) local meta = minetest.get_meta(pos)
if not meta then if not meta then
return return
end end
@ -72,7 +72,7 @@ if ctf.setting("turrets") then
return return
end end
local objects = minetest.env:get_objects_inside_radius(pos, 15) local objects = minetest.get_objects_inside_radius(pos, 15)
for _,obj in ipairs(objects) do for _,obj in ipairs(objects) do
if ( if (
obj:is_player() and obj:is_player() and
@ -89,7 +89,7 @@ if ctf.setting("turrets") then
} }
-- Create bullet entity -- Create bullet entity
local bullet=minetest.env:add_entity({x=pos.x,y=pos.y+0.5,z=pos.z}, "ctf_turret:arrow_entity") local bullet=minetest.add_entity({x=pos.x,y=pos.y+0.5,z=pos.z}, "ctf_turret:arrow_entity")
-- Set velocity -- Set velocity
bullet:setvelocity({x=calc.x * ARROW_VELOCITY,y=calc.y * ARROW_VELOCITY,z=calc.z * ARROW_VELOCITY}) bullet:setvelocity({x=calc.x * ARROW_VELOCITY,y=calc.y * ARROW_VELOCITY,z=calc.z * ARROW_VELOCITY})
@ -117,7 +117,7 @@ if ctf.setting("turrets") then
end end
if self.timer > 0.2 then if self.timer > 0.2 then
local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 1.5) local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 1.5)
for k, obj in pairs(objs) do for k, obj in pairs(objs) do
if obj:is_player() then if obj:is_player() then
obj:set_hp(obj:get_hp() - ARROW_DAMAGE) obj:set_hp(obj:get_hp() - ARROW_DAMAGE)
@ -126,9 +126,9 @@ if ctf.setting("turrets") then
end end
end end
local node = minetest.env:get_node(pos) local node = minetest.get_node(pos)
if node.name ~= "air" and node.name ~= "ctf_turret:turret" then if node.name ~= "air" and node.name ~= "ctf_turret:turret" then
--minetest.env:add_item(self.lastpos, "throwing:arrow") --minetest.add_item(self.lastpos, "throwing:arrow")
self.object:remove() self.object:remove()
end end
end end