From 45bc0b245ffec79d3a1656bd6dc9f4ebc498a746 Mon Sep 17 00:00:00 2001 From: paramat Date: Tue, 8 Mar 2016 03:14:29 +0000 Subject: [PATCH] Beds: Fix code style issues --- mods/beds/api.lua | 5 +- mods/beds/beds.lua | 112 ++++++++++++++++++++-------------------- mods/beds/functions.lua | 33 ++++++------ mods/beds/init.lua | 17 +++--- mods/beds/spawns.lua | 2 +- 5 files changed, 86 insertions(+), 83 deletions(-) diff --git a/mods/beds/api.lua b/mods/beds/api.lua index 6b72814d..0c27c4e3 100644 --- a/mods/beds/api.lua +++ b/mods/beds/api.lua @@ -19,6 +19,7 @@ function beds.register_bed(name, def) type = "fixed", fixed = def.selectionbox, }, + after_place_node = function(pos, placer, itemstack) local n = minetest.get_node_or_nil(pos) if not n or not n.param2 then @@ -36,6 +37,7 @@ function beds.register_bed(name, def) minetest.set_node(p, {name = n.name:gsub("%_bottom", "_top"), param2 = n.param2}) return false end, + on_destruct = function(pos) local n = minetest.get_node_or_nil(pos) if not n then return end @@ -46,9 +48,11 @@ function beds.register_bed(name, def) minetest.remove_node(p) end end, + on_rightclick = function(pos, node, clicker) beds.on_rightclick(pos, clicker) end, + on_rotate = function(pos, node, user, mode, new_param2) local dir = minetest.facedir_to_dir(node.param2) local p = vector.add(pos, dir) @@ -99,7 +103,6 @@ function beds.register_bed(name, def) minetest.register_alias(name, name .. "_bottom") - -- register recipe minetest.register_craft({ output = name, recipe = def.recipe diff --git a/mods/beds/beds.lua b/mods/beds/beds.lua index 43bf98ed..5f31f136 100644 --- a/mods/beds/beds.lua +++ b/mods/beds/beds.lua @@ -1,44 +1,45 @@ --- fancy shaped bed +-- Fancy shaped bed + beds.register_bed("beds:fancy_bed", { description = "Fancy Bed", inventory_image = "beds_bed_fancy.png", wield_image = "beds_bed_fancy.png", tiles = { - bottom = { - "beds_bed_top1.png", - "default_wood.png", - "beds_bed_side1.png", - "beds_bed_side1.png^[transformFX", - "default_wood.png", - "beds_bed_foot.png", - }, - top = { - "beds_bed_top2.png", - "default_wood.png", - "beds_bed_side2.png", - "beds_bed_side2.png^[transformFX", - "beds_bed_head.png", - "default_wood.png", - } + bottom = { + "beds_bed_top1.png", + "default_wood.png", + "beds_bed_side1.png", + "beds_bed_side1.png^[transformFX", + "default_wood.png", + "beds_bed_foot.png", + }, + top = { + "beds_bed_top2.png", + "default_wood.png", + "beds_bed_side2.png", + "beds_bed_side2.png^[transformFX", + "beds_bed_head.png", + "default_wood.png", + } }, nodebox = { - bottom = { - {-0.5, -0.5, -0.5, -0.375, -0.065, -0.4375}, - {0.375, -0.5, -0.5, 0.5, -0.065, -0.4375}, - {-0.5, -0.375, -0.5, 0.5, -0.125, -0.4375}, - {-0.5, -0.375, -0.5, -0.4375, -0.125, 0.5}, - {0.4375, -0.375, -0.5, 0.5, -0.125, 0.5}, - {-0.4375, -0.3125, -0.4375, 0.4375, -0.0625, 0.5}, - }, - top = { - {-0.5, -0.5, 0.4375, -0.375, 0.1875, 0.5}, - {0.375, -0.5, 0.4375, 0.5, 0.1875, 0.5}, - {-0.5, 0, 0.4375, 0.5, 0.125, 0.5}, - {-0.5, -0.375, 0.4375, 0.5, -0.125, 0.5}, - {-0.5, -0.375, -0.5, -0.4375, -0.125, 0.5}, - {0.4375, -0.375, -0.5, 0.5, -0.125, 0.5}, - {-0.4375, -0.3125, -0.5, 0.4375, -0.0625, 0.4375}, - } + bottom = { + {-0.5, -0.5, -0.5, -0.375, -0.065, -0.4375}, + {0.375, -0.5, -0.5, 0.5, -0.065, -0.4375}, + {-0.5, -0.375, -0.5, 0.5, -0.125, -0.4375}, + {-0.5, -0.375, -0.5, -0.4375, -0.125, 0.5}, + {0.4375, -0.375, -0.5, 0.5, -0.125, 0.5}, + {-0.4375, -0.3125, -0.4375, 0.4375, -0.0625, 0.5}, + }, + top = { + {-0.5, -0.5, 0.4375, -0.375, 0.1875, 0.5}, + {0.375, -0.5, 0.4375, 0.5, 0.1875, 0.5}, + {-0.5, 0, 0.4375, 0.5, 0.125, 0.5}, + {-0.5, -0.375, 0.4375, 0.5, -0.125, 0.5}, + {-0.5, -0.375, -0.5, -0.4375, -0.125, 0.5}, + {0.4375, -0.375, -0.5, 0.5, -0.125, 0.5}, + {-0.4375, -0.3125, -0.5, 0.4375, -0.0625, 0.4375}, + } }, selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5}, recipe = { @@ -48,41 +49,42 @@ beds.register_bed("beds:fancy_bed", { }, }) --- simple shaped bed +-- Simple shaped bed + beds.register_bed("beds:bed", { description = "Simple Bed", inventory_image = "beds_bed.png", wield_image = "beds_bed.png", tiles = { - bottom = { - "beds_bed_top_bottom.png^[transformR90", - "default_wood.png", - "beds_bed_side_bottom_r.png", - "beds_bed_side_bottom_r.png^[transformfx", - "beds_transparent.png", - "beds_bed_side_bottom.png" - }, - top = { - "beds_bed_top_top.png^[transformR90", - "default_wood.png", - "beds_bed_side_top_r.png", - "beds_bed_side_top_r.png^[transformfx", - "beds_bed_side_top.png", - "beds_transparent.png", - } + bottom = { + "beds_bed_top_bottom.png^[transformR90", + "default_wood.png", + "beds_bed_side_bottom_r.png", + "beds_bed_side_bottom_r.png^[transformfx", + "beds_transparent.png", + "beds_bed_side_bottom.png" + }, + top = { + "beds_bed_top_top.png^[transformR90", + "default_wood.png", + "beds_bed_side_top_r.png", + "beds_bed_side_top_r.png^[transformfx", + "beds_bed_side_top.png", + "beds_transparent.png", + } }, nodebox = { - bottom = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5}, - top = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5}, + bottom = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5}, + top = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5}, }, selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5}, recipe = { {"wool:red", "wool:red", "wool:white"}, {"group:wood", "group:wood", "group:wood"} }, - }) --- aliases for PA's beds mod +-- Aliases for PilzAdam's beds mod + minetest.register_alias("beds:bed_bottom_red", "beds:bed_bottom") minetest.register_alias("beds:bed_top_red", "beds:bed_top") diff --git a/mods/beds/functions.lua b/mods/beds/functions.lua index 5b2f5406..afc8e15a 100644 --- a/mods/beds/functions.lua +++ b/mods/beds/functions.lua @@ -6,15 +6,14 @@ if enable_respawn == nil then enable_respawn = true end - --- helper functions +-- Helper functions local function get_look_yaw(pos) local n = minetest.get_node(pos) if n.param2 == 1 then - return pi/2, n.param2 + return pi / 2, n.param2 elseif n.param2 == 3 then - return -pi/2, n.param2 + return -pi / 2, n.param2 elseif n.param2 == 0 then return pi, n.param2 else @@ -70,8 +69,8 @@ local function lay_down(player, pos, bed_pos, state, skip) end -- physics, eye_offset, etc - player:set_eye_offset({x=0,y=0,z=0}, {x=0,y=0,z=0}) - player:set_look_yaw(math.random(1, 180)/100) + player:set_eye_offset({x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0}) + player:set_look_yaw(math.random(1, 180) / 100) default.player_attached[name] = false player:set_physics_override(1, 1, 1) hud_flags.wielditem = true @@ -84,11 +83,11 @@ local function lay_down(player, pos, bed_pos, state, skip) player_in_bed = player_in_bed + 1 -- physics, eye_offset, etc - player:set_eye_offset({x=0,y=-13,z=0}, {x=0,y=0,z=0}) + player:set_eye_offset({x = 0, y = -13, z = 0}, {x = 0, y = 0, z = 0}) local yaw, param2 = get_look_yaw(bed_pos) player:set_look_yaw(yaw) local dir = minetest.facedir_to_dir(param2) - local p = {x=bed_pos.x+dir.x/2,y=bed_pos.y,z=bed_pos.z+dir.z/2} + local p = {x = bed_pos.x + dir.x / 2, y = bed_pos.y, z = bed_pos.z + dir.z / 2} player:set_physics_override(0, 0, 0) player:setpos(p) default.player_attached[name] = true @@ -102,17 +101,15 @@ end local function update_formspecs(finished) local ges = #minetest.get_connected_players() local form_n = "" - local is_majority = (ges/2) < player_in_bed + local is_majority = (ges / 2) < player_in_bed if finished then - form_n = beds.formspec .. - "label[2.7,11; Good morning.]" + form_n = beds.formspec .. "label[2.7,11; Good morning.]" else - form_n = beds.formspec .. - "label[2.2,11;"..tostring(player_in_bed).." of "..tostring(ges).." players are in bed]" + form_n = beds.formspec .. "label[2.2,11;" .. tostring(player_in_bed) .. + " of " .. tostring(ges) .. " players are in bed]" if is_majority and is_night_skip_enabled() then - form_n = form_n .. - "button_exit[2,8;4,0.75;force;Force night skip]" + form_n = form_n .. "button_exit[2,8;4,0.75;force;Force night skip]" end end @@ -122,10 +119,10 @@ local function update_formspecs(finished) end --- public functions +-- Public functions function beds.kick_players() - for name,_ in pairs(beds.player) do + for name, _ in pairs(beds.player) do local player = minetest.get_player_by_name(name) lay_down(player, nil, nil, false) end @@ -175,7 +172,7 @@ function beds.on_rightclick(pos, player) end --- callbacks +-- Callbacks minetest.register_on_joinplayer(function(player) beds.read_spawns() diff --git a/mods/beds/init.lua b/mods/beds/init.lua index 09982c24..8b258901 100644 --- a/mods/beds/init.lua +++ b/mods/beds/init.lua @@ -3,14 +3,15 @@ beds.player = {} beds.pos = {} beds.spawn = {} -beds.formspec = "size[8,15;true]".. - "bgcolor[#080808BB; true]".. - "button_exit[2,12;4,0.75;leave;Leave Bed]" +beds.formspec = "size[8,15;true]" .. + "bgcolor[#080808BB; true]" .. + "button_exit[2,12;4,0.75;leave;Leave Bed]" local modpath = minetest.get_modpath("beds") --- load files -dofile(modpath.."/functions.lua") -dofile(modpath.."/api.lua") -dofile(modpath.."/beds.lua") -dofile(modpath.."/spawns.lua") +-- Load files + +dofile(modpath .. "/functions.lua") +dofile(modpath .. "/api.lua") +dofile(modpath .. "/beds.lua") +dofile(modpath .. "/spawns.lua") diff --git a/mods/beds/spawns.lua b/mods/beds/spawns.lua index 6e087f82..14ec75bf 100644 --- a/mods/beds/spawns.lua +++ b/mods/beds/spawns.lua @@ -43,7 +43,7 @@ function beds.save_spawns() end local output = io.open(org_file, "w") for i, v in pairs(beds.spawn) do - output:write(v.x.." "..v.y.." "..v.z.." "..i.."\n") + output:write(v.x .. " " .. v.y .. " " .. v.z .. " " .. i .. "\n") end io.close(output) end