1
0
mirror of https://gitlab.com/rubenwardy/awards.git synced 2024-12-24 17:50:41 +01:00

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

View File

@ -1,5 +1,5 @@
-- AWARDS -- AWARDS
-- by Rubenwardy, CC-BY-SA -- by Rubenwardy, CC-BY-SA
------------------------------------------------------- -------------------------------------------------------
-- this is api function file -- this is api function file
------------------------------------------------------- -------------------------------------------------------

View File

@ -1,5 +1,5 @@
-- AWARDS -- AWARDS
-- by Rubenwardy, CC-BY-SA -- by Rubenwardy, CC-BY-SA
------------------------------------------------------- -------------------------------------------------------
-- this is the init file for the award mod -- this is the init file for the award mod
------------------------------------------------------- -------------------------------------------------------

View File

@ -1,14 +1,14 @@
-- AWARDS -- AWARDS
-- by Rubenwardy, CC-BY-SA -- by Rubenwardy, CC-BY-SA
------------------------------------------------------- -------------------------------------------------------
-- this is the trigger handler file for the awards mod -- this is the trigger handler file for the awards mod
------------------------------------------------------- -------------------------------------------------------
-- Function and table holders for Triggers -- Function and table holders for Triggers
awards.onDig={} awards.onDig = {}
awards.onPlace={} awards.onPlace = {}
awards.onTick={} awards.onTick = {}
awards.onDeath={} awards.onDeath = {}
-- Trigger Handles -- Trigger Handles
minetest.register_on_dignode(function(pos, oldnode, digger) minetest.register_on_dignode(function(pos, oldnode, digger)
@ -17,28 +17,26 @@ minetest.register_on_dignode(function(pos, oldnode, digger)
end end
local nodedug = string.split(oldnode.name, ":") local nodedug = string.split(oldnode.name, ":")
if #nodedug ~= 2 then if #nodedug ~= 2 then
print(oldnode.name.." is in wrong format!") minetest.log("error","Awards mod: "..oldnode.name.." is in wrong format!")
return return
end end
local mod=nodedug[1] local mod = nodedug[1]
local item=nodedug[2] local item = nodedug[2]
local playern = digger:get_player_name() local playern = digger:get_player_name()
if (not playern or not nodedug or not mod or not item) then if (not playern or not nodedug or not mod or not item) then
return return
end end
awards.assertPlayer(playern) awards.assertPlayer(playern)
awards.tbv(awards.players[playern].count, mod) 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 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 -- Run callbacks and triggers
local player=digger local player=digger
local data=awards.players[playern] local data=awards.players[playern]
for i=1,# awards.onDig do for i=1,# awards.onDig do
local res = nil local res = nil
if type(awards.onDig[i]) == "function" then if type(awards.onDig[i]) == "function" then
@ -74,7 +72,7 @@ minetest.register_on_placenode(function(pos,node,digger)
end end
local nodedug = string.split(node.name, ":") local nodedug = string.split(node.name, ":")
if #nodedug ~= 2 then if #nodedug ~= 2 then
print(oldnode.name.." is in wrong format!") minetest.log("error","Awards mod: "..node.name.." is in wrong format!")
return return
end end
local mod=nodedug[1] local mod=nodedug[1]
@ -86,12 +84,11 @@ minetest.register_on_placenode(function(pos,node,digger)
return return
end end
awards.assertPlayer(playern) awards.assertPlayer(playern)
awards.tbv(awards.players[playern].place, mod) 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 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 -- Run callbacks and triggers
local player = digger local player = digger
@ -104,7 +101,6 @@ minetest.register_on_placenode(function(pos,node,digger)
elseif type(awards.onPlace[i]) == "table" then elseif type(awards.onPlace[i]) == "table" then
-- Handle table trigger -- Handle table trigger
if not awards.onPlace[i].node or not awards.onPlace[i].target or not awards.onPlace[i].award then 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!") print("[ERROR] awards - onPlace trigger "..i.." is invalid!")
else else
-- run the table -- run the table
@ -135,7 +131,7 @@ minetest.register_on_dieplayer(function(player)
-- Increment counter -- Increment counter
awards.players[player:get_player_name()].deaths = awards.players[player:get_player_name()].deaths + 1 awards.players[player:get_player_name()].deaths = awards.players[player:get_player_name()].deaths + 1
-- Run callbacks and triggers -- Run callbacks and triggers
local data=awards.players[playern] local data=awards.players[playern]
@ -171,5 +167,5 @@ minetest.register_on_newplayer(function(player)
end) end)
minetest.register_on_shutdown(function() minetest.register_on_shutdown(function()
awards.save() awards.save()
end) end)