Skip to content

Commit

Permalink
stricter luacheck / cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
@BuckarooBanzay
BuckarooBanzay committed Jan 15, 2021
1 parent f379075 commit 0a1b7dc
Show file tree
Hide file tree
Showing 12 changed files with 704 additions and 765 deletions.
4 changes: 1 addition & 3 deletions .luacheckrc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
unused_args = false

globals = {
"travelnet"
}
Expand All @@ -10,5 +8,5 @@ read_globals = {
"vector",

-- Deps
"creative", "locks", "mesecon",
"creative", "mesecon",
}
2 changes: 1 addition & 1 deletion add_target.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ travelnet.add_target = function( station_name, network_name, pos, player_name, m

-- lua doesn't allow efficient counting here
local anz = 0;
for k,v in pairs( travelnet.targets[ owner_name ][ network_name ] ) do
for k in pairs( travelnet.targets[ owner_name ][ network_name ] ) do

if( k == station_name ) then
travelnet.show_message( pos, player_name, S("Error"),
Expand Down
18 changes: 7 additions & 11 deletions config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,17 @@ end
-- function always return true;
-- if the function returns false, players with the travelnet_attach priv
-- can still add stations to that network

travelnet.allow_attach = function( player_name, owner_name, network_name )
return false;
-- params: player_name, owner_name, network_name
travelnet.allow_attach = function()
return false;
end


-- if this returns true, a player named player_name can remove a travelnet station
-- from network_name (owned by owner_name) even though he is neither the owner nor
-- has the travelnet_remove priv
travelnet.allow_dig = function( player_name, owner_name, network_name, pos )
-- params: player_name, owner_name, network_name, pos
travelnet.allow_dig = function()
return false;
end

Expand All @@ -94,13 +95,8 @@ end
-- if this function returns true, the player will be transfered to the target station;
-- you can use this code to i.e. charge the player money for the transfer or to limit
-- usage of stations to players in the same fraction on PvP servers
travelnet.allow_travel = function( player_name, owner_name, network_name, station_name_start, station_name_target )

--minetest.chat_send_player( player_name, "Player "..tostring( player_name ).." tries to use station "..
-- tostring( station_name_start )..
-- " on network "..tostring( network_name ).." owned by "..tostring( owner_name ).." in order to travel to "..
-- tostring( station_name_target )..".");

-- params: player_name, owner_name, network_name, station_name_start, station_name_target
travelnet.allow_travel = function()
return true;
end

Expand Down
32 changes: 16 additions & 16 deletions doors.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ travelnet.register_door = function( node_base_name, def_tiles, material )
minetest.register_node( node_base_name.."_open", {
description = S("elevator door (open)"),
drawtype = "nodebox",
-- top, bottom, side1, side2, inner, outer
-- top, bottom, side1, side2, inner, outer
tiles = def_tiles,
paramtype = "light",
paramtype2 = "facedir",
is_ground_content = true,
-- only the closed variant is in creative inventory
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,not_in_creative_inventory=1},
-- larger than one node but slightly smaller than a half node so
-- that wallmounted torches pose no problem
-- larger than one node but slightly smaller than a half node so
-- that wallmounted torches pose no problem
node_box = {
type = "fixed",
fixed = {
Expand All @@ -32,9 +32,9 @@ travelnet.register_door = function( node_base_name, def_tiles, material )
},
},
drop = node_base_name.."_closed",
on_rightclick = function(pos, node, puncher)
minetest.add_node(pos, {name = node_base_name.."_closed", param2 = node.param2})
end,
on_rightclick = function(pos, node)
minetest.add_node(pos, {name = node_base_name.."_closed", param2 = node.param2})
end,
})

minetest.register_node(node_base_name.."_closed", {
Expand All @@ -59,19 +59,19 @@ travelnet.register_door = function( node_base_name, def_tiles, material )
{-0.5, -0.5, 0.4, 0.5, 1.5, 0.5},
},
},
on_rightclick = function(pos, node, puncher)
minetest.add_node(pos, {name = node_base_name.."_open", param2 = node.param2})
end,
on_rightclick = function(pos, node)
minetest.add_node(pos, {name = node_base_name.."_open", param2 = node.param2})
end,
})

-- add a craft receipe for the door
minetest.register_craft({
output = node_base_name.."_closed",
recipe = {
{material, '', material },
output = node_base_name.."_closed",
recipe = {
{material, '', material },
{material, '', material },
{material, '', material }
}
}
})


Expand All @@ -95,7 +95,7 @@ end
-- actually register the doors
-- (but only if the materials for them exist)
if(minetest.get_modpath("default")) then
travelnet.register_door( "travelnet:elevator_door_steel", {"default_stone.png"}, "default:steel_ingot");
travelnet.register_door( "travelnet:elevator_door_glass", {"travelnet_elevator_door_glass.png"}, "default:glass");
travelnet.register_door( "travelnet:elevator_door_tin", {"default_clay.png"}, "default:tin_ingot");
travelnet.register_door( "travelnet:elevator_door_steel", {"default_stone.png"}, "default:steel_ingot");
travelnet.register_door( "travelnet:elevator_door_glass", {"travelnet_elevator_door_glass.png"}, "default:glass");
travelnet.register_door( "travelnet:elevator_door_tin", {"default_clay.png"}, "default:tin_ingot");
end
134 changes: 61 additions & 73 deletions elevator.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,78 +121,66 @@ minetest.register_node("travelnet:elevator", {
elevator = 1
},

light_source = 10,

after_place_node = function(pos, placer, itemstack)
local meta = minetest.get_meta(pos);
meta:set_string("infotext", S("Elevator (unconfigured)"));
meta:set_string("station_name", "");
meta:set_string("station_network","");
meta:set_string("owner", placer:get_player_name() );
-- request initial data
meta:set_string("formspec",
"size[12,10]"..
"field[0.3,5.6;6,0.7;station_name;"..S("Name of this station:")..";]"..
-- "field[0.3,6.6;6,0.7;station_network;Assign to Network:;]"..
-- "field[0.3,7.6;6,0.7;owner_name;(optional) owned by:;]"..
"button_exit[6.3,6.2;1.7,0.7;station_set;"..S("Store").."]" );

local top_pos = {x=pos.x, y=pos.y+1, z=pos.z}
minetest.set_node(top_pos, {name="travelnet:hidden_top"})
travelnet.show_nearest_elevator( pos, placer:get_player_name(), minetest.dir_to_facedir(placer:get_look_dir()));
end,

on_receive_fields = travelnet.on_receive_fields,
on_punch = function(pos, node, puncher)
travelnet.update_formspec(pos, puncher:get_player_name())
end,

can_dig = function( pos, player )
return travelnet.can_dig( pos, player, 'elevator' )
end,

after_dig_node = function(pos, oldnode, oldmetadata, digger)
travelnet.remove_box( pos, oldnode, oldmetadata, digger )
end,

-- TNT and overenthusiastic DMs do not destroy elevators either
on_blast = function(pos, intensity)
end,

-- taken from VanessaEs homedecor fridge
on_place = function(itemstack, placer, pointed_thing)
local pos = pointed_thing.above;
local node = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z});
local def = minetest.registered_nodes[node.name]
-- leftover top nodes can be removed by placing a new elevator underneath
if (not def or not def.buildable_to) and node.name ~= "travelnet:hidden_top" then
minetest.chat_send_player(
placer:get_player_name(),
S('Not enough vertical space to place the travelnet box!')
)
return;
end
return minetest.item_place(itemstack, placer, pointed_thing);
end,

on_destruct = function(pos)
pos = {x=pos.x, y=pos.y+1, z=pos.z}
minetest.remove_node(pos)
end
light_source = 10,

after_place_node = function(pos, placer)
local meta = minetest.get_meta(pos);
meta:set_string("infotext", S("Elevator (unconfigured)"));
meta:set_string("station_name", "");
meta:set_string("station_network","");
meta:set_string("owner", placer:get_player_name() );
-- request initial data
meta:set_string("formspec",
"size[12,10]"..
"field[0.3,5.6;6,0.7;station_name;"..S("Name of this station:")..";]"..
"button_exit[6.3,6.2;1.7,0.7;station_set;"..S("Store").."]"
);

local top_pos = {x=pos.x, y=pos.y+1, z=pos.z}
minetest.set_node(top_pos, {name="travelnet:hidden_top"})
travelnet.show_nearest_elevator( pos, placer:get_player_name(), minetest.dir_to_facedir(placer:get_look_dir()));
end,

on_receive_fields = travelnet.on_receive_fields,
on_punch = function(pos, _, puncher)
travelnet.update_formspec(pos, puncher:get_player_name())
end,

can_dig = function( pos, player )
return travelnet.can_dig( pos, player, 'elevator' )
end,

after_dig_node = function(pos, oldnode, oldmetadata, digger)
travelnet.remove_box( pos, oldnode, oldmetadata, digger )
end,

-- TNT and overenthusiastic DMs do not destroy elevators either
on_blast = function()
end,

-- taken from VanessaEs homedecor fridge
on_place = function(itemstack, placer, pointed_thing)
local pos = pointed_thing.above;
local node = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z});
local def = minetest.registered_nodes[node.name]
-- leftover top nodes can be removed by placing a new elevator underneath
if (not def or not def.buildable_to) and node.name ~= "travelnet:hidden_top" then
minetest.chat_send_player(
placer:get_player_name(),
S('Not enough vertical space to place the travelnet box!')
)
return;
end
return minetest.item_place(itemstack, placer, pointed_thing);
end,

on_destruct = function(pos)
pos = {x=pos.x, y=pos.y+1, z=pos.z}
minetest.remove_node(pos)
end
})

--if( minetest.get_modpath("technic") ~= nil ) then
-- minetest.register_craft({
-- output = "travelnet:elevator",
-- recipe = {
-- {"default:steel_ingot", "technic:motor", "default:steel_ingot", },
-- {"default:steel_ingot", "technic:control_logic_unit", "default:steel_ingot", },
-- {"default:steel_ingot", "moreores:copper_ingot", "default:steel_ingot", }
-- }
-- })
--else
minetest.register_craft({
output = "travelnet:elevator",
recipe = travelnet.elevator_recipe,
})
--end
minetest.register_craft({
output = "travelnet:elevator",
recipe = travelnet.elevator_recipe,
})
4 changes: 0 additions & 4 deletions formspecs.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ travelnet.form_input_handler = function( player, formname, fields)
return
end

if( locks and (fields.locks_config or fields.locks_authorize)) then
return locks:lock_handle_input( pos, formname, fields, player )
end
-- back button leads back to the main menu
if( fields.back and fields.back ~= "" ) then
return travelnet.show_current_formspec( pos,
Expand Down Expand Up @@ -80,7 +77,6 @@ travelnet.reset_formspec = function( meta )
"label[0.3,3.1;"..S("You can have more than one network. If unsure, use \"@1\"", tostring(station_network)) .. ".]"..
"field[0.3,4.4;9,0.9;owner;"..S("Owned by:")..";]"..
"label[0.3,4.7;"..S("Unless you know what you are doing, leave this empty.").."]"..
"button_exit[1.3,5.3;1.7,0.7;station_help_setup;"..S("Help").."]"..
"button_exit[3.8,5.3;1.7,0.7;station_set;"..S("Save").."]"..
"button_exit[6.3,5.3;1.7,0.7;station_exit;"..S("Exit").."]");
end
Loading

0 comments on commit 0a1b7dc

Please sign in to comment.