From 7630b5097fdd64b7e83ed42111a79fe91fe53f50 Mon Sep 17 00:00:00 2001 From: BlockMen Date: Fri, 8 Aug 2014 03:30:40 +0200 Subject: [PATCH] Add beds --- mods/beds/Changelog.txt | 6 + mods/beds/README.txt | 35 ++++ mods/beds/depends.txt | 2 + mods/beds/init.lua | 196 ++++++++++++++++++ mods/beds/nodes.lua | 115 ++++++++++ mods/beds/spawns.lua | 66 ++++++ mods/beds/textures/beds_bed.png | Bin 0 -> 540 bytes mods/beds/textures/beds_bed_side_bottom.png | Bin 0 -> 561 bytes mods/beds/textures/beds_bed_side_bottom_r.png | Bin 0 -> 537 bytes mods/beds/textures/beds_bed_side_top.png | Bin 0 -> 611 bytes mods/beds/textures/beds_bed_side_top_r.png | Bin 0 -> 596 bytes mods/beds/textures/beds_bed_top_bottom.png | Bin 0 -> 495 bytes mods/beds/textures/beds_bed_top_top.png | Bin 0 -> 556 bytes mods/beds/textures/beds_transparent.png | Bin 0 -> 143 bytes 14 files changed, 420 insertions(+) create mode 100644 mods/beds/Changelog.txt create mode 100644 mods/beds/README.txt create mode 100644 mods/beds/depends.txt create mode 100644 mods/beds/init.lua create mode 100644 mods/beds/nodes.lua create mode 100644 mods/beds/spawns.lua create mode 100644 mods/beds/textures/beds_bed.png create mode 100644 mods/beds/textures/beds_bed_side_bottom.png create mode 100644 mods/beds/textures/beds_bed_side_bottom_r.png create mode 100644 mods/beds/textures/beds_bed_side_top.png create mode 100644 mods/beds/textures/beds_bed_side_top_r.png create mode 100644 mods/beds/textures/beds_bed_top_bottom.png create mode 100644 mods/beds/textures/beds_bed_top_top.png create mode 100644 mods/beds/textures/beds_transparent.png diff --git a/mods/beds/Changelog.txt b/mods/beds/Changelog.txt new file mode 100644 index 0000000..db18b2b --- /dev/null +++ b/mods/beds/Changelog.txt @@ -0,0 +1,6 @@ +1.0.1 beta +---------- +- Add backwards compatibility with PilzAdam's beds mod +- Fix placement +- Fix small bugs +- Prevent possible crash \ No newline at end of file diff --git a/mods/beds/README.txt b/mods/beds/README.txt new file mode 100644 index 0000000..bc0d99a --- /dev/null +++ b/mods/beds/README.txt @@ -0,0 +1,35 @@ +Minetest mod "Beds" +=================== +by BlockMen (c) 2014 + +Version: 1.0.1 Beta + +About +~~~~~ +This mod a bed to Minetest which helps to skip the night. To sleep rightclick the bed, if playing +in singleplayer mode the night gets skipped imideatly. If playing on server you get shown how many other +players are in bed too. If all players are sleeping the night gets skipped aswell. + +Another feature is a controled respawning. If you have slept in bed (not just lying in it) your respawn point +is set to the beds location. If dying you will respawn there. + + +To craft a bed you need 3 wood and 3 wool and place it in following shape: + +wool wool wool +wood wood wood + +Notice: You can use any color of wood or wool, mixing different is also possible. + + +License of source code, textures: WTFPL +--------------------------------------- +(c) Copyright BlockMen (2014) + + + +This program is free software. It comes without any warranty, to +the extent permitted by applicable law. You can redistribute it +and/or modify it under the terms of the Do What The Fuck You Want +To Public License, Version 2, as published by Sam Hocevar. See +http://sam.zoy.org/wtfpl/COPYING for more details. diff --git a/mods/beds/depends.txt b/mods/beds/depends.txt new file mode 100644 index 0000000..be420a3 --- /dev/null +++ b/mods/beds/depends.txt @@ -0,0 +1,2 @@ +default +wool \ No newline at end of file diff --git a/mods/beds/init.lua b/mods/beds/init.lua new file mode 100644 index 0000000..99dfb70 --- /dev/null +++ b/mods/beds/init.lua @@ -0,0 +1,196 @@ +beds = {} +beds.player = {} +beds.pos = {} +beds.spawn = {} + +local form = "size[8,15;true]".. + "bgcolor[#080808BB; true]".. + "button_exit[2,12;4,0.75;leave;Leave Bed]" +local player_in_bed = 0 + + +-- help functions + +local function get_look_yaw(pos) + local n = minetest.get_node(pos) + if n.param2 == 1 then + return 7.9, n.param2 + elseif n.param2 == 3 then + return 4.75, n.param2 + elseif n.param2 == 0 then + return 3.15, n.param2 + else + return 6.28, n.param2 + end +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 true +end + +local function lay_down(player, pos, bed_pos, state) + 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 + 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_yaw(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, 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} + 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 = "" + + if finished then + form_n = form .. + "label[2.7,11; Good morning.]" + else + form_n = form .. + "label[2.2,11;"..tostring(player_in_bed).." of "..tostring(ges).." players are in bed]" + end + + for name,_ in pairs(beds.player) do + minetest.show_formspec(name, "beds_form", form_n) + end +end + + +-- public functions + +function beds.kick_players() + for name,_ in pairs(beds.player) do + local player = minetest.get_player_by_name(name) + lay_down(player, nil, nil, false) + end +end + +function beds.skip_night() + minetest.set_timeofday(0.23) + beds.set_spawns() +end + +function beds.on_rightclick(pos, 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 + 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) + else + lay_down(player, nil, nil, false) + end + + update_formspecs(false) + + -- skip the night and let all stand up + if check_in_beds() then + minetest.after(2, function() + beds.skip_night() + update_formspecs(true) + beds.kick_players() + end) + end +end + + +-- callbacks + +minetest.register_on_joinplayer(function(player) + beds.read_spawns() +end) + +minetest.register_on_respawnplayer(function(player) + local name = player:get_player_name() + local pos = beds.spawn[name] or nil + if pos then + player:setpos(pos) + return true + end +end) + +minetest.register_on_leaveplayer(function(player) + local name = player:get_player_name() + lay_down(player, nil, nil, false) + beds.player[name] = nil + if check_in_beds() then + minetest.after(2, function() + beds.skip_night() + update_formspecs(true) + beds.kick_players() + end) + end +end) + +minetest.register_on_player_receive_fields(function(player, formname, fields) + if formname ~= "beds_form" then + return + end + if fields.quit or fields.leave then + lay_down(player, nil, nil, false) + update_formspecs(false) + end +end) + + +-- nodes and respawn function +dofile(minetest.get_modpath("beds").."/nodes.lua") +dofile(minetest.get_modpath("beds").."/spawns.lua") diff --git a/mods/beds/nodes.lua b/mods/beds/nodes.lua new file mode 100644 index 0000000..c445ea0 --- /dev/null +++ b/mods/beds/nodes.lua @@ -0,0 +1,115 @@ +-- help functions + +local function remove_top(pos) + local n = minetest.get_node_or_nil(pos) + if not n then return end + local dir = minetest.facedir_to_dir(n.param2) + local p = {x=pos.x+dir.x,y=pos.y,z=pos.z+dir.z} + local n2 = minetest.get_node(p) + if minetest.get_item_group(n2.name, "bed") == 2 and n.param2 == n2.param2 then + minetest.remove_node(p) + end +end + +local function add_top(pos) + local n = minetest.get_node_or_nil(pos) + if not n or not n.param2 then + minetest.remove_node(pos) + return true + end + local dir = minetest.facedir_to_dir(n.param2) + local p = {x=pos.x+dir.x,y=pos.y,z=pos.z+dir.z} + local n2 = minetest.get_node_or_nil(p) + local def = minetest.registered_items[n2.name] or nil + if not n2 or not def or not def.buildable_to then + minetest.remove_node(pos) + return true + end + minetest.set_node(p, {name="beds:bed_top", param2 = n.param2}) + return false +end + + +-- register nodes + +minetest.register_node("beds:bed_bottom", { + description = "Bed", + inventory_image = "beds_bed.png", + wield_image = "beds_bed.png", + drawtype = "nodebox", + tiles = {"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"}, + paramtype = "light", + paramtype2 = "facedir", + stack_max = 1, + groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,bed=1}, + sounds = default.node_sound_wood_defaults(), + node_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5}, + }, + selection_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5}, + + }, + after_place_node = function(pos, placer, itemstack) + return add_top(pos) + end, + on_destruct = function(pos) + remove_top(pos) + end, + on_rightclick = function(pos, node, clicker) + beds.on_rightclick(pos, clicker) + end, +}) + +minetest.register_node("beds:bed_top", { + drawtype = "nodebox", + tiles = {"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"}, + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,bed=2}, + sounds = default.node_sound_wood_defaults(), + node_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5}, + }, + selection_box = { + type = "fixed", + fixed = {0, 0, 0, 0, 0, 0}, + }, +}) + +minetest.register_alias("beds:bed", "beds:bed_bottom") + + +-- register recipe + +minetest.register_craft({ + output = "beds:bed", + recipe = { + {"group:wool", "group:wool", "group:wool"}, + {"group:wood", "group:wood", "group:wood"} + } +}) + +-- aliases for PA's beds mod +minetest.register_alias("beds:bed_bottom_red", "beds:bed_bottom") +minetest.register_alias("beds:bed_bottom_orange", "beds:bed_bottom") +minetest.register_alias("beds:bed_bottom_yellow", "beds:bed_bottom") +minetest.register_alias("beds:bed_bottom_green", "beds:bed_bottom") +minetest.register_alias("beds:bed_bottom_blue", "beds:bed_bottom") +minetest.register_alias("beds:bed_bottom_violet", "beds:bed_bottom") +minetest.register_alias("beds:bed_bottom_black", "beds:bed_bottom") +minetest.register_alias("beds:bed_bottom_grey", "beds:bed_bottom") +minetest.register_alias("beds:bed_bottom_white", "beds:bed_bottom") + +minetest.register_alias("beds:bed_top_red", "beds:bed_top") +minetest.register_alias("beds:bed_top_orange", "beds:bed_top") +minetest.register_alias("beds:bed_top_yellow", "beds:bed_top") +minetest.register_alias("beds:bed_top_green", "beds:bed_top") +minetest.register_alias("beds:bed_top_blue", "beds:bed_top") +minetest.register_alias("beds:bed_top_violet", "beds:bed_top") +minetest.register_alias("beds:bed_top_black", "beds:bed_top") +minetest.register_alias("beds:bed_top_grey", "beds:bed_top") +minetest.register_alias("beds:bed_top_white", "beds:bed_top") diff --git a/mods/beds/spawns.lua b/mods/beds/spawns.lua new file mode 100644 index 0000000..63f55fa --- /dev/null +++ b/mods/beds/spawns.lua @@ -0,0 +1,66 @@ +local world_path = minetest.get_worldpath() +local org_file = world_path .. "/beds_spawns" +local file = world_path .. "/beds_spawns" +local bkwd = false +local writing = true + +-- check for PA's beds mod spawns +local cf = io.open(world_path .. "/beds_player_spawns", "r") +if cf ~= nil then + io.close(cf) + file = world_path .. "/beds_player_spawns" + bkwd = true +end +writing = false + + +function beds.read_spawns() + while writing do + -- wait until spawns are safed + end + local spawns = beds.spawn + local input = io.open(file, "r") + if input and not bkwd then + repeat + local x = input:read("*n") + if x == nil then + break + end + local y = input:read("*n") + local z = input:read("*n") + local name = input:read("*l") + spawns[name:sub(2)] = {x = x, y = y, z = z} + until input:read(0) == nil + io.close(input) + elseif input and bkwd then + beds.spawn = minetest.deserialize(input:read("*all")) + input:close() + beds.save_spawns() + os.rename(file, file .. ".backup") + file = org_file + else + spawns = {} + end +end + +function beds.save_spawns() + if not beds.spawn then + return + end + writing = true + 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") + end + io.close(output) + writing = false +end + +function beds.set_spawns() + for name,_ in pairs(beds.player) do + local player = minetest.get_player_by_name(name) + local p = player:getpos() + beds.spawn[name] = p + end + beds.save_spawns() +end \ No newline at end of file diff --git a/mods/beds/textures/beds_bed.png b/mods/beds/textures/beds_bed.png new file mode 100644 index 0000000000000000000000000000000000000000..5c0054c6cf9a42d248601d8c527c0a0da2bf92f6 GIT binary patch literal 540 zcmV+%0^|LOP)nsVZn?U zRen}?snu%uzK`$weEC}8{fCb<81o`bsxqz0iW$phJP~0|mB%7{+uml^`^D<&8V??3 z4**lDdD@I@F30%z1Q!R+;__xph)`DLxfvx@=2R)EGOJ42 zj6xkWBtlYz+}Id>kwYYUJ8{c_07d6mFk?}bry|U&GFP9bWJba{lFo5KgiGg+5)Fq) z#=A(L=?c1)Y=U(&UYhMEmdz-caZ7}>2npv%#g7n=bTE?YCUyGQ!4?+p^)Y!P#=I)8 z%y?!-(TqXoxGX~QCFhksW7of2iKF`48%Hv&C1qr@%i-#cdniwGZ^`AYRf9$zS7e) e^$$S1zwtN1Qq}5$b^0~{00004JgSaUyQK~PuL z2xmguTH8|hOPTY1$I{GNi6aUxgf0w51pS5IE?Px5-PmOp->bvfMwKS|{!x#=!={ZMNgsuoZ z=QvPh!x$RYvS}@CRVpHwx^rxeE;K_S0ulB^=&Ryei*GG`RrW*(L}-RWbXD1Mj=FO{ zfSPl(RaqBd+c}ydbX2KXOU+t3sx(Kl_0h+*pTOsL8T_2b>!Qb?JjZTsmgDL?ZwgmA zEY32hMDbTV_KOh?OCJ8J$8j~r(eoQTNKRk|+eu#LBjgt+DWs>!r=}<-r^qKKDc>3= zdwYy*e40Wk%+tgK*@X)n)zb8jp5=2j~;%9NoM}ZIKbV;t&aZ({#D?u z_q5E|7GXz(rgL=6NK{EwIq;sI8Hor7-qQ*KPRuw`B~`_3h;V4eruXc4&j;t|o6%LJ zBf@?VaAwA_DkrL>-g9O~DneHkx2?*aDjhR+gMdtg6A?a{k$O+ZdwRpUD?(3%jtC#k zXa~V{U`v%lGv14^ugb0ni5XkobD&B~gw%|tb8HWH(&5`~urts3#$$So9O+t~L1UII zD$uXz=*QEXzk5U$>{TCd-h9I6&4;8>fz!Bv`|cSZH@+gh)4y)k=jkytO!#y|Hnxh}z=k>xE)zZDcS`H^!4kvlJaF<{902*{fSad;kbZBpK099;dVPqgvd2@7S bZF4LjNp52<$sIm+00000NkvXXu0mjfQ>pbb literal 0 HcmV?d00001 diff --git a/mods/beds/textures/beds_bed_side_top.png b/mods/beds/textures/beds_bed_side_top.png new file mode 100644 index 0000000000000000000000000000000000000000..b2807c5fa275087fd66be04e6f76e53b6e36797c GIT binary patch literal 611 zcmV-p0-XJcP)H1JHG{o<1xeL3G{ZoM zCXVA!uh(fb1f5QYv$Hc=trm{saDIMHr_(_+n^dbcDkn9HB@L-m(y;6@cDX{eT0@8y zr>CbhgrLz7wA*bQr;QK-Aq354lWMJos_7`X0@BxS-`P7jq;Pc1aZ%+^$#Ha4MAuDp z!$Q?`R8>beObpXP$>ljv6!L{*_78JNyPK0_;y%_Q{bc1EWMv;2*~{CQmqetW?23}PGRk2gymGLO8ZLD7w!op}bi^0ppLT;x0T|@$I z;z1YjF&B~1ZdN0Mq~sy)kGYX{)3-=OJlqSonH|6OS2LkrWdr>Eo{d64K_= zASrp6>5(py4?S!rCfG?%v6Gx)Yc<5e?dxo86Ef?|C|o<;=v$`fvfxgxZ>Zj6KntfnN`yHPynLQoy-uxGr*?9}(eW`qs#WrZBH7)2w3G-7B0N`$ z8C@qS!n_EMQcMN{925^J`xUA`>y%1m{K^pr#Y4PYflr^e(B?!)h_I*>PYi=+BFq{F zNu`MEI{Uc-`9hKJC7(SnhnFj`lig!?&tvP$SG1M!4qiqtDMYc&(U(MT-RL?qZk%xWTLwK6`? zN;K5K=s+9MzVl32jf@5xSexnR^<*!RU<+C#e38F3WVJD5wXvDLi8I{Ao$Ke&Qg%D1 z+~E#37W&D!gJj%6))N*FZ(U+N(Z|L@7}2bnaV8HDJOC7U?3D1dvS0AV^Zu83clQb}!Ob_gUJL>oK5e zwXaoAdq{t~m#R+Q$CziSV7$r#K*5#-b_lGA0oaqeR_*q+YELdzYjUaDlD9D)_O)tD zZex7eQ~KRq0rCHmBr!abfF!>d42GquR{JPkUiD9VkskJ0TJ77R?#QcVz%Tcm04Hg{ zo+J?z1PX=()R3O9C$s9_eUiTH+p)fCPp-#vX|rb_(qUsjO9xd+1p+546d*O!FT12i zGNk)U%QD86OzCb<=~(|vrZf#37?3PAGz7Nf3_bv)BiW$d#yILf?OAnCkbZXW(mfef z_e52Hk~%mAhK80l=)_W_NRI^R({AY`1zP$C%r-WvXBHb10000QbVXQnL3MO!Z*l-t lY-M3&AX9mBbY*RGEFej4V=l=ZK6U^A002ovPDHLkV1jl<*RTKp literal 0 HcmV?d00001 diff --git a/mods/beds/textures/beds_bed_top_top.png b/mods/beds/textures/beds_bed_top_top.png new file mode 100644 index 0000000000000000000000000000000000000000..e877c808afa166a782c29eef02c051c540db186d GIT binary patch literal 556 zcmV+{0@MA8P)RudT=q5w$>%R$qs7bDXOa89&$XHW03F!LPELS8*iy8J z)?(C%*0^S7O42=ZkVj@Gm;FSpsxDpE+55PztF>_D)4mhf#!!#|1Q4)IfFC8TN05{x zk|bM;F}j9yR_)Sd|KGI77%OwzMrQWj*UD|%0V)9l1^}dO+rVjqgh3L3Z2%<7sads2 z4|_&WB~~zP_AoE7!a>{rRzM;wU)Msn;qnPRg-SE$k)sk{dT*T zalE}(`Tgyvs^d7?0tyh2WCCfE405hjRaL&-@1m|bLyFe^0N<1_(B0*u2BR0prEv; zi(^Q|oa7(>|JyUG&QLnLn5{?3AnQPa5d*`~wSVP9epPk@l}VMjMwB>~mSp4?F@)x% kCZ;F^R~DC~<`(NHc;+SRos_jJ1FB;1boFyt=akR{04v}rR{#J2 literal 0 HcmV?d00001