From 10307f23a78b33af50dc4a5f3d1baafb4ee4b0d9 Mon Sep 17 00:00:00 2001
From: Maciej 'agaran' Pijanka <agaran@pld-linux.org>
Date: Thu, 16 Mar 2017 00:00:22 +0100
Subject: [PATCH] Do not run converters twice.
---
technic/tools/mining_lasers.lua | 82 +++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 43 deletions(-)
diff --git a/technic/tools/mining_lasers.lua b/technic/tools/mining_lasers.lua
index 5c8d1e4..ef1eecb 100644
--- a/technic/tools/mining_lasers.lua
+++ b/technic/tools/mining_lasers.lua
@@ -32,64 +32,58 @@
}
})
-local function table_icontains(t, v)
- for i = 1,#t do
- if v == t[i] then
- return true
- end
- end
- return false
-end
-
-local function laser_node(pos, player)
- local node = minetest.get_node(pos)
- if table_icontains({"air", "ignore", "default:lava_source", "default:lava_flowing"}, node.name) then
- return
- end
- local pname = player:get_player_name()
- if minetest.is_protected(pos, pname) then
- minetest.record_protection_violation(pos, pname)
- return
- end
- if table_icontains({"default:water_flowing", "default:water_source"}, node.name) then
+local function laser_node(pos, node, player)
+ local def = minetest.registered_nodes[node.name]
+ if def and def.liquidtype ~= "none" then
minetest.remove_node(pos)
minetest.add_particle({
pos = pos,
- vel = {x=0, y=2, z=0},
- acc = {x=0, y=-1, z=0},
+ velocity = {x=0, y=2, z=0},
+ acceleration = {x=0, y=-1, z=0},
expirationtime = 1.5,
- size = 6+math.random()*2,
- texture = "smoke_puff.png^[transform"..math.random(0,7),
+ size = 6 + math.random() * 2,
+ texture = "smoke_puff.png^[transform" .. math.random(0, 7),
})
return
end
- if player then
- minetest.node_dig(pos, node, player)
- end
+ minetest.node_dig(pos, node, player)
end
-if not vector.line then
- dofile(technic.modpath.."/tools/vector_line.lua")
-end
-
+local no_destroy = {
+ ["air"] = true,
+ ["default:lava_source"] = true,
+ ["default:lava_flowing"] = true,
+}
local function laser_shoot(player, range, particle_texture, sound)
- local playerpos = player:getpos()
+ local player_pos = player:getpos()
+ local player_name = player:get_player_name()
local dir = player:get_look_dir()
- local startpos = {x = playerpos.x, y = playerpos.y + 1.625, z = playerpos.z}
- local mult_dir = vector.multiply(dir, 50)
+ local start_pos = vector.new(player_pos)
+ -- Adjust to head height
+ start_pos.y = start_pos.y + 1.6
minetest.add_particle({
pos = startpos,
- vel = dir,
- acc = mult_dir,
+ velocity = dir,
+ acceleration = vector.multiply(dir, 50),
expirationtime = range / 11,
size = 1,
- texture = particle_texture.."^[transform"..math.random(0,7),
+ texture = particle_texture .. "^[transform" .. math.random(0, 7),
})
- for _,pos in ipairs(vector.line(vector.round(startpos), dir, range)) do
- laser_node(pos, player)
+ minetest.sound_play(sound, {pos = player_pos, max_hear_distance = range})
+ for pos in technic.trace_node_ray_fat(start_pos, dir, range) do
+ if minetest.is_protected(pos, player_name) then
+ minetest.record_protection_violation(pos, player_name)
+ break
+ end
+ local node = minetest.get_node_or_nil(pos)
+ if not node then
+ break
+ end
+ if not no_destroy[node.name] then
+ laser_node(pos, node, player)
+ end
end
- minetest.sound_play(sound, {pos = playerpos, max_hear_distance = range})
end
@@ -109,10 +103,12 @@
-- If there's enough charge left, fire the laser
if meta.charge >= m[4] then
- meta.charge = meta.charge - m[4]
laser_shoot(user, m[2], "technic_laser_beam_mk"..m[1]..".png", "technic_laser_mk"..m[1])
- technic.set_RE_wear(itemstack, meta.charge, m[3])
- itemstack:set_metadata(minetest.serialize(meta))
+ if not technic.creative_mode then
+ meta.charge = meta.charge - m[4]
+ technic.set_RE_wear(itemstack, meta.charge, m[3])
+ itemstack:set_metadata(minetest.serialize(meta))
+ end
end
return itemstack
end,
--
Gitblit v1.8.0