From 8e03d7ded6441b26e9d44102c0cd2ee39f9e90bc Mon Sep 17 00:00:00 2001
From: RealBadAngel <mk@realbadangel.pl>
Date: Sun, 30 Jun 2013 07:12:02 +0200
Subject: [PATCH] Sync with indev branch, bump version to 0.4.7
---
technic/mining_laser_mk1.lua | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/technic/mining_laser_mk1.lua b/technic/mining_laser_mk1.lua
index a206bb4..5bafb6c 100644
--- a/technic/mining_laser_mk1.lua
+++ b/technic/mining_laser_mk1.lua
@@ -1,4 +1,6 @@
laser_mk1_max_charge=40000
+register_power_tool ("technic:laser_mk1",laser_mk1_max_charge)
+
local laser_shoot = function(itemstack, player, pointed_thing)
local laser_straight_mode=0
local playerpos=player:getpos()
@@ -10,7 +12,7 @@
minetest.node_dig(pos,node,player)
end
laser_straight_mode=1
- end
+ end
direction_y=math.abs(math.floor(dir.y*100))
if direction_y>50 then entity_name="technic:laser_beam_entityV"
@@ -54,13 +56,16 @@
stack_max = 1,
on_use = function(itemstack, user, pointed_thing)
item=itemstack:to_table()
- if item["metadata"]=="" or item["metadata"]=="0" then return end
- local charge=tonumber((item["metadata"]))
+ local meta=get_item_meta(item["metadata"])
+ if meta==nil then return end --tool not charghed
+ if meta["charge"]==nil then return end
+ charge=meta["charge"]
if charge-400>0 then
laser_shoot(item, user, pointed_thing)
- charge =charge-400;
- item["metadata"]=tostring(charge)
- charge=set_RE_wear(item,charge,laser_mk1_max_charge)
+ charge =charge-400;
+ set_RE_wear(item,charge,laser_mk1_max_charge)
+ meta["charge"]=charge
+ item["metadata"]=set_item_meta(meta)
itemstack:replace(item)
end
return itemstack
@@ -70,7 +75,7 @@
minetest.register_craft({
output = 'technic:laser_mk1',
recipe = {
- {'technic:diamond', 'default:steel_ingot', 'technic:battery'},
+ {'default:diamond', 'default:steel_ingot', 'technic:battery'},
{'', 'default:steel_ingot', 'technic:battery'},
{'', '', 'moreores:copper_ingot'},
}
@@ -171,4 +176,4 @@
if node.name == "air" or node.name == "ignore" or node.name == "default:lava_source" or node.name == "default:lava_flowing" then return end
if node.name == "default:water_source" or node.name == "default:water_flowing" then minetest.env:remove_node(pos) return end
if player then minetest.node_dig(pos,node,player) end
-end
\ No newline at end of file
+end
--
Gitblit v1.8.0