mirror of
https://github.com/minetest/minetest_game.git
synced 2025-07-11 02:20:22 +02:00
Merge branch 'master' of https://github.com/minetest/minetest_game into playerapi_redo
This commit is contained in:
@ -155,7 +155,8 @@ function beds.register_bed(name, def)
|
||||
paramtype2 = "facedir",
|
||||
is_ground_content = false,
|
||||
pointable = false,
|
||||
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2},
|
||||
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2,
|
||||
not_in_creative_inventory = 1},
|
||||
sounds = def.sounds or default.node_sound_wood_defaults(),
|
||||
drop = name .. "_bottom",
|
||||
node_box = {
|
||||
|
@ -73,7 +73,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
|
||||
|
||||
player:set_look_horizontal(math.random(1, 180) / 100)
|
||||
player_api.player_attached[name] = false
|
||||
--player:set_physics_override(1, 1, 1)
|
||||
player:set_physics_override({speed = 1, jump = 1, gravity = 1})
|
||||
hud_flags.wielditem = true
|
||||
player_api.set_animation(player, "stand" , 30)
|
||||
|
||||
@ -89,7 +89,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
|
||||
end
|
||||
|
||||
-- Check if player is moving
|
||||
if vector.length(player:get_player_velocity()) > 0.001 then
|
||||
if vector.length(player:get_velocity()) > 0.001 then
|
||||
minetest.chat_send_player(name, S("You have to stop moving before going to bed!"))
|
||||
return false
|
||||
end
|
||||
@ -108,7 +108,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
|
||||
y = bed_pos.y + 0.07,
|
||||
z = bed_pos.z + dir.z / 2
|
||||
}
|
||||
--player:set_physics_override(0, 0, 0)
|
||||
player:set_physics_override({speed = 0, jump = 0, gravity = 0})
|
||||
player:set_pos(p)
|
||||
player_api.player_attached[name] = true
|
||||
hud_flags.wielditem = false
|
||||
@ -280,4 +280,3 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
|
8
mods/beds/locale/beds.sk.tr
Normal file
8
mods/beds/locale/beds.sk.tr
Normal file
@ -0,0 +1,8 @@
|
||||
# textdomain: beds
|
||||
Leave Bed=Opusti posteľ
|
||||
Good morning.=Dobré ráno.
|
||||
@1 of @2 players are in bed=@1 z @2 hráčov sú v posteli
|
||||
Force night skip=Nútene preskočiť noc
|
||||
You can only sleep at night.=Môžeš spať len v noci.
|
||||
Fancy Bed=Pekná posteľ
|
||||
Simple Bed=Jednoduchá posteľ
|
Reference in New Issue
Block a user