From 707fa5a97c0d56e18f16d56f7130ff6220a090a1 Mon Sep 17 00:00:00 2001
From: Sires <ranearodrigo1@gmail.com>
Date: Mon, 26 Aug 2019 19:52:41 +0200
Subject: [PATCH] Fix typos
---
technic/tools/mining_lasers.lua | 126 ++++++++++++++++++++++--------------------
1 files changed, 66 insertions(+), 60 deletions(-)
diff --git a/technic/tools/mining_lasers.lua b/technic/tools/mining_lasers.lua
index 5c8d1e4..ba5a726 100644
--- a/technic/tools/mining_lasers.lua
+++ b/technic/tools/mining_lasers.lua
@@ -4,113 +4,120 @@
{"2", 14, 200000, 2000},
{"3", 21, 650000, 3000},
}
+local allow_entire_discharging = true
local S = technic.getter
minetest.register_craft({
- output = 'technic:laser_mk1',
+ output = "technic:laser_mk1",
recipe = {
- {'default:diamond', 'technic:brass_ingot', 'default:obsidian_glass'},
- {'', 'technic:brass_ingot', 'technic:red_energy_crystal'},
- {'', '', 'default:copper_ingot'},
+ {"default:diamond", "basic_materials:brass_ingot", "default:obsidian_glass"},
+ {"", "basic_materials:brass_ingot", "technic:red_energy_crystal"},
+ {"", "", "default:copper_ingot"},
}
})
minetest.register_craft({
- output = 'technic:laser_mk2',
+ output = "technic:laser_mk2",
recipe = {
- {'default:diamond', 'technic:carbon_steel_ingot', 'technic:laser_mk1'},
- {'', 'technic:carbon_steel_ingot', 'technic:green_energy_crystal'},
- {'', '', 'default:copper_ingot'},
+ {"default:diamond", "technic:carbon_steel_ingot", "technic:laser_mk1"},
+ {"", "technic:carbon_steel_ingot", "technic:green_energy_crystal"},
+ {"", "", "default:copper_ingot"},
}
})
minetest.register_craft({
- output = 'technic:laser_mk3',
+ output = "technic:laser_mk3",
recipe = {
- {'default:diamond', 'technic:carbon_steel_ingot', 'technic:laser_mk2'},
- {'', 'technic:carbon_steel_ingot', 'technic:blue_energy_crystal'},
- {'', '', 'default:copper_ingot'},
+ {"default:diamond", "technic:carbon_steel_ingot", "technic:laser_mk2"},
+ {"", "technic:carbon_steel_ingot", "technic:blue_energy_crystal"},
+ {"", "", "default:copper_ingot"},
}
})
-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.liquidtype ~= "none" and def.buildable_to then
minetest.remove_node(pos)
minetest.add_particle({
pos = pos,
- vel = {x=0, y=2, z=0},
- acc = {x=0, y=-1, z=0},
- expirationtime = 1.5,
- size = 6+math.random()*2,
- texture = "smoke_puff.png^[transform"..math.random(0,7),
+ velocity = {x = 0, y = 1.5 + math.random(), z = 0},
+ acceleration = {x = 0, y = -1, z = 0},
+ 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")
+local keep_node = {air = true}
+local function can_keep_node(name)
+ if keep_node[name] ~= nil then
+ return keep_node[name]
+ end
+ keep_node[name] = minetest.get_item_group(name, "hot") ~= 0
+ return keep_node[name]
end
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 + (player:get_properties().eye_height or 1.625)
minetest.add_particle({
- pos = startpos,
- vel = dir,
- acc = mult_dir,
- expirationtime = range / 11,
+ pos = start_pos,
+ velocity = dir,
+ acceleration = vector.multiply(dir, 50),
+ expirationtime = (math.sqrt(1 + 100 * (range + 0.4)) - 1) / 50,
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(pos)
+ if node.name == "ignore"
+ or not minetest.registered_nodes[node.name] then
+ break
+ end
+ if not can_keep_node(node.name) then
+ laser_node(pos, node, player)
+ end
end
- minetest.sound_play(sound, {pos = playerpos, max_hear_distance = range})
end
-
for _, m in pairs(mining_lasers_list) do
technic.register_power_tool("technic:laser_mk"..m[1], m[3])
minetest.register_tool("technic:laser_mk"..m[1], {
description = S("Mining Laser Mk%d"):format(m[1]),
inventory_image = "technic_mining_laser_mk"..m[1]..".png",
+ range = 0,
stack_max = 1,
wear_represents = "technic_RE_charge",
on_refill = technic.refill_RE_charge,
on_use = function(itemstack, user)
local meta = minetest.deserialize(itemstack:get_metadata())
- if not meta or not meta.charge then
+ if not meta or not meta.charge or meta.charge == 0 then
return
end
- -- 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])
+ local range = m[2]
+ if meta.charge < m[4] then
+ if not allow_entire_discharging then
+ return
+ end
+ -- If charge is too low, give the laser a shorter range
+ range = range * meta.charge / m[4]
+ end
+ laser_shoot(user, range, "technic_laser_beam_mk" .. m[1] .. ".png",
+ "technic_laser_mk" .. m[1])
+ if not technic.creative_mode then
+ meta.charge = math.max(meta.charge - m[4], 0)
technic.set_RE_wear(itemstack, meta.charge, m[3])
itemstack:set_metadata(minetest.serialize(meta))
end
@@ -118,4 +125,3 @@
end,
})
end
-
--
Gitblit v1.8.0