From 4eaf265e658366c8893398dc132c44b5ebed6b02 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Fri, 29 Sep 2017 01:03:05 -0400
Subject: [PATCH] allow sleeping in beds!
fixed by using some code from mt_game, with changes
---
homedecor/bedroom.lua | 26 +--
homedecor/handlers/init.lua | 2 +
homedecor/handlers/mt_game_beds_functions.lua | 170 ++++++++++++++++++
3 files changed, 181 insertions(+), 17 deletions(-)
create mode 100644 homedecor/handlers/mt_game_beds_functions.lua
diff --git a/homedecor/bedroom.lua b/homedecor/bedroom.lua
index 94f886da..71dcdc06 100644
--- a/homedecor/bedroom.lua
+++ b/homedecor/bedroom.lua
@@ -67,9 +67,7 @@ homedecor.register("bed_regular", {
homedecor.bed_expansion(pos, clicker, itemstack, pointed_thing, true)
return itemstack
else
--- if minetest.get_modpath("beds") then
--- beds.on_rightclick(pos, clicker)
--- end
+ homedecor.beds_on_rightclick(pos, node, clicker)
return itemstack
end
end
@@ -98,13 +96,10 @@ homedecor.register("bed_extended", {
unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
homedecor.unextend_bed(pos)
end,
--- on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
--- local itemname = itemstack:get_name()
--- if minetest.get_modpath("beds") then
--- beds.on_rightclick(pos, clicker)
--- end
--- return itemstack
--- end,
+ on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+ homedecor.beds_on_rightclick(pos, node, clicker)
+ return itemstack
+ end,
drop = "homedecor:bed_regular"
})
@@ -139,13 +134,10 @@ homedecor.register("bed_kingsize", {
inv:add_item("main", "homedecor:bed_regular 2")
end
end,
--- on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
--- local itemname = itemstack:get_name()
--- if minetest.get_modpath("beds") then
--- beds.on_rightclick(pos, clicker)
--- end
--- return itemstack
--- end
+ on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+ homedecor.beds_on_rightclick(pos, node, clicker)
+ return itemstack
+ end
})
for _, w in pairs({ N_("mahogany"), N_("oak") }) do
diff --git a/homedecor/handlers/init.lua b/homedecor/handlers/init.lua
index 12003ca2..05c27f46 100644
--- a/homedecor/handlers/init.lua
+++ b/homedecor/handlers/init.lua
@@ -19,4 +19,6 @@ dofile(handlerpath.."registration.lua")
-- some nodes have particle spawners
dofile(handlerpath.."water_particles.lua")
+
+dofile(handlerpath.."mt_game_beds_functions.lua")
dofile(handlerpath.."sit.lua")
diff --git a/homedecor/handlers/mt_game_beds_functions.lua b/homedecor/handlers/mt_game_beds_functions.lua
new file mode 100644
index 00000000..eafad93f
--- /dev/null
+++ b/homedecor/handlers/mt_game_beds_functions.lua
@@ -0,0 +1,170 @@
+-- This file is a partial copy of functions.lua from minetest_game's beds mod
+-- with changes needed for homedecor's beds.
+
+local pi = math.pi
+local player_in_bed = 0
+local is_sp = minetest.is_singleplayer()
+local enable_respawn = minetest.settings:get_bool("enable_bed_respawn")
+if enable_respawn == nil then
+ enable_respawn = true
+end
+
+-- Helper functions
+
+local function get_look_yaw(pos)
+ local n = minetest.get_node(pos)
+ local fdir = n.param2 % 4
+ if fdir == 0 then
+ return pi / 2, fdir
+ elseif fdir == 1 then
+ return -pi / 2, fdir
+ elseif fdir == 3 then
+ return pi, fdir
+ else
+ return 0, fdir
+ end
+end
+
+local function is_night_skip_enabled()
+ local enable_night_skip = minetest.settings:get_bool("enable_bed_night_skip")
+ if enable_night_skip == nil then
+ enable_night_skip = true
+ end
+ return enable_night_skip
+end
+
+local function check_in_beds(players)
+ local in_bed = beds.player
+ if not players then
+ players = minetest.get_connected_players()
+ end
+
+ for n, player in ipairs(players) do
+ local name = player:get_player_name()
+ if not in_bed[name] then
+ return false
+ end
+ end
+
+ return #players > 0
+end
+
+local function lay_down(player, pos, bed_pos, state, skip)
+ local name = player:get_player_name()
+ local hud_flags = player:hud_get_flags()
+
+ if not player or not name then
+ return
+ end
+
+ -- stand up
+ if state ~= nil and not state then
+ local p = beds.pos[name] or nil
+ if beds.player[name] ~= nil then
+ beds.player[name] = nil
+ player_in_bed = player_in_bed - 1
+ end
+ -- skip here to prevent sending player specific changes (used for leaving players)
+ if skip then
+ return
+ end
+ if p then
+ player:setpos(p)
+ end
+
+ -- physics, eye_offset, etc
+ player:set_eye_offset({x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0})
+ player:set_look_horizontal(math.random(1, 180) / 100)
+ default.player_attached[name] = false
+ player:set_physics_override(1, 1, 1)
+ hud_flags.wielditem = true
+ default.player_set_animation(player, "stand" , 30)
+
+ -- lay down
+ else
+ beds.player[name] = 1
+ beds.pos[name] = pos
+ 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})
+ local yaw, fdir = get_look_yaw(bed_pos)
+ player:set_look_horizontal(yaw)
+ local offsets = {
+ [0] = {0.5, 0},
+ [1] = {-0.5, 0},
+ [2] = {0, -0.5},
+ [3] = {0, 0.5}
+ }
+ local p = {x = bed_pos.x + offsets[fdir][1], y = bed_pos.y, z = bed_pos.z + offsets[fdir][2]}
+ player:set_physics_override(0, 0, 0)
+ player:setpos(p)
+ default.player_attached[name] = true
+ hud_flags.wielditem = false
+ default.player_set_animation(player, "lay" , 0)
+ end
+
+ player:hud_set_flags(hud_flags)
+end
+
+local function update_formspecs(finished)
+ local ges = #minetest.get_connected_players()
+ local form_n
+ local is_majority = (ges / 2) < player_in_bed
+
+ if finished then
+ 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]"
+ if is_majority and is_night_skip_enabled() then
+ form_n = form_n .. "button_exit[2,8;4,0.75;force;Force night skip]"
+ end
+ end
+
+ for name,_ in pairs(beds.player) do
+ minetest.show_formspec(name, "beds_form", form_n)
+ end
+end
+
+
+-- Public functions
+
+function homedecor.beds_on_rightclick(pos, node, player)
+ local name = player:get_player_name()
+ local ppos = player:getpos()
+ local tod = minetest.get_timeofday()
+
+ if tod > 0.2 and tod < 0.805 then
+ if beds.player[name] then
+ lay_down(player, nil, nil, false)
+ end
+ minetest.chat_send_player(name, "You can only sleep at night.")
+ return
+ end
+
+ -- move to bed
+ if not beds.player[name] then
+ lay_down(player, ppos, pos)
+ beds.set_spawns() -- save respawn positions when entering bed
+ else
+ lay_down(player, nil, nil, false)
+ end
+
+ if not is_sp then
+ update_formspecs(false)
+ end
+
+ -- skip the night and let all players stand up
+ if check_in_beds() then
+ minetest.after(2, function()
+ if not is_sp then
+ update_formspecs(is_night_skip_enabled())
+ end
+ if is_night_skip_enabled() then
+ beds.skip_night()
+ beds.kick_players()
+ end
+ end)
+ end
+end
--
GitLab