Skip to content

Commit

Permalink
Use only red and white wool for beds
Browse files Browse the repository at this point in the history
  • Loading branch information
@BlockMen
BlockMen committed Feb 24, 2015
1 parent edb02e9 commit ea7b04a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 27 deletions.
21 changes: 2 additions & 19 deletions mods/beds/beds.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ beds.register_bed("beds:fancy_bed", {
},
selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
recipe = {
{"group:wool", "group:wool", "group:stick"},
{"wool:red", "wool:white", "group:stick"},
{"group:wood", "group:wood", "group:wood"},
},
})
Expand Down Expand Up @@ -76,29 +76,12 @@ beds.register_bed("beds:bed", {
},
selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
recipe = {
{"group:wool", "group:wool", "group:wool"},
{"wool:red", "wool:red", "wool:white"},
{"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")
16 changes: 8 additions & 8 deletions mods/beds/spawns.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ function beds.read_spawns()
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}
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
Expand Down

1 comment on commit ea7b04a

@p5yg3n
Copy link
Contributor

@p5yg3n p5yg3n commented on ea7b04a Feb 24, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe lines 24 - 32 of README.txt should be fixed to match this change.

Please sign in to comment.