Formatting and code style

This commit is contained in:
rubenwardy 2014-05-02 18:48:32 +01:00
parent 8c20ca2f3c
commit 8180ab6755
3 changed files with 20 additions and 24 deletions

@ -5,10 +5,10 @@
-------------------------------------------------------
-- Function and table holders for Triggers
awards.onDig={}
awards.onPlace={}
awards.onTick={}
awards.onDeath={}
awards.onDig = {}
awards.onPlace = {}
awards.onTick = {}
awards.onDeath = {}
-- Trigger Handles
minetest.register_on_dignode(function(pos, oldnode, digger)
@ -17,11 +17,11 @@ minetest.register_on_dignode(function(pos, oldnode, digger)
end
local nodedug = string.split(oldnode.name, ":")
if #nodedug ~= 2 then
print(oldnode.name.." is in wrong format!")
minetest.log("error","Awards mod: "..oldnode.name.." is in wrong format!")
return
end
local mod=nodedug[1]
local item=nodedug[2]
local mod = nodedug[1]
local item = nodedug[2]
local playern = digger:get_player_name()
if (not playern or not nodedug or not mod or not item) then
@ -29,16 +29,14 @@ minetest.register_on_dignode(function(pos, oldnode, digger)
end
awards.assertPlayer(playern)
awards.tbv(awards.players[playern].count, mod)
awards.tbv(awards.players[playern].count[mod], item, 0 )
awards.tbv(awards.players[playern].count[mod], item, 0)
-- Increment counder
-- Increment counter
awards.players[playern].count[mod][item]=awards.players[playern].count[mod][item]+1
print(" - "..mod..":"..item.." 's count is now "..(awards.players[playern].count[mod][item]))
-- Run callbacks and triggers
local player=digger
local data=awards.players[playern]
for i=1,# awards.onDig do
local res = nil
if type(awards.onDig[i]) == "function" then
@ -74,7 +72,7 @@ minetest.register_on_placenode(function(pos,node,digger)
end
local nodedug = string.split(node.name, ":")
if #nodedug ~= 2 then
print(oldnode.name.." is in wrong format!")
minetest.log("error","Awards mod: "..node.name.." is in wrong format!")
return
end
local mod=nodedug[1]
@ -87,11 +85,10 @@ minetest.register_on_placenode(function(pos,node,digger)
end
awards.assertPlayer(playern)
awards.tbv(awards.players[playern].place, mod)
awards.tbv(awards.players[playern].place[mod], item, 0 )
awards.tbv(awards.players[playern].place[mod], item, 0)
-- Increment counder
-- Increment counter
awards.players[playern].place[mod][item] = awards.players[playern].place[mod][item]+1
print(" - "..mod..":"..item.." 's place count is now "..(awards.players[playern].place[mod][item]))
-- Run callbacks and triggers
local player = digger
@ -104,7 +101,6 @@ minetest.register_on_placenode(function(pos,node,digger)
elseif type(awards.onPlace[i]) == "table" then
-- Handle table trigger
if not awards.onPlace[i].node or not awards.onPlace[i].target or not awards.onPlace[i].award then
-- table running failed!
print("[ERROR] awards - onPlace trigger "..i.." is invalid!")
else
-- run the table