Changed wood textures, fixed duplicate code

2013-05-14 13:53:38 -04:00 · 2013-05-14 13:53:38 -04:00 · 453782ae99
parent c4ebf28ab7
commit 453782ae99
29 changed files with 6 additions and 5 deletions
--- a/init.lua
+++ b/init.lua
@ -19,7 +19,7 @@ for i in ipairs(beds_list) do
 	minetest.register_node("beds:bed_bottom_"..colour, {
 		description = beddesc,
 		drawtype = "nodebox",
-		tiles = {"beds_bed_top_bottom_"..colour..".png", "default_wood.png",  "beds_bed_side_"..colour..".png",  "beds_bed_side_"..colour..".png",  "beds_bed_side_"..colour..".png",  "beds_bed_side_"..colour..".png"},
+		tiles = {"beds_bed_top_bottom_"..colour..".png", "beds_bed_bottom.png",  "beds_bed_side_"..colour..".png",  "beds_bed_side_"..colour..".png",  "beds_bed_side_"..colour..".png",  "beds_bed_side_"..colour..".png"},
 		paramtype = "light",
 		paramtype2 = "facedir",
 		stack_max = 1,
@ -120,7 +120,7 @@ for i in ipairs(beds_list) do
 	
 	minetest.register_node("beds:bed_top_"..colour, {
 		drawtype = "nodebox",
-		tiles = {"beds_bed_top_top_"..colour..".png", "default_wood.png",  "beds_bed_side_top_r_"..colour..".png",  "beds_bed_side_top_l_"..colour..".png",  "default_wood.png",  "beds_bed_side_"..colour..".png"},
+		tiles = {"beds_bed_top_top_"..colour..".png", "beds_bed_bottom.png",  "beds_bed_side_top_r_"..colour..".png",  "beds_bed_side_top_l_"..colour..".png",  "beds_bed_side_white.png",  "beds_bed_side_"..colour..".png"},
 		paramtype = "light",
 		paramtype2 = "facedir",
 		groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3},
@ -145,9 +145,6 @@ for i in ipairs(beds_list) do
 		},
 	})
 	
-	minetest.register_alias("beds:bed_bottom", "beds:bed_bottom_blue")
-	minetest.register_alias("beds:bed_top", "beds:bed_top_blue")
-	minetest.register_alias("beds:bed", "beds:bed_bottom_blue")
 	minetest.register_alias("beds:bed_"..colour, "beds:bed_bottom_"..colour)
 	
 	minetest.register_craft({
@ -195,6 +192,10 @@ for i in ipairs(beds_list) do
 	})
 end

+minetest.register_alias("beds:bed_bottom", "beds:bed_bottom_blue")
+minetest.register_alias("beds:bed_top", "beds:bed_top_blue")
+minetest.register_alias("beds:bed", "beds:bed_bottom_blue")
+
 beds_player_spawns = {}
 local file = io.open(minetest.get_worldpath().."/beds_player_spawns", "r")
 if file then
--- a/textures/beds_bed_bottom.png
+++ b/textures/beds_bed_bottom.png
--- a/textures/beds_bed_side_black.png
+++ b/textures/beds_bed_side_black.png
--- a/textures/beds_bed_side_blue.png
+++ b/textures/beds_bed_side_blue.png
--- a/textures/beds_bed_side_green.png
+++ b/textures/beds_bed_side_green.png
--- a/textures/beds_bed_side_grey.png
+++ b/textures/beds_bed_side_grey.png
--- a/textures/beds_bed_side_orange.png
+++ b/textures/beds_bed_side_orange.png
--- a/textures/beds_bed_side_red.png
+++ b/textures/beds_bed_side_red.png
--- a/textures/beds_bed_side_top_l_black.png
+++ b/textures/beds_bed_side_top_l_black.png
--- a/textures/beds_bed_side_top_l_blue.png
+++ b/textures/beds_bed_side_top_l_blue.png
--- a/textures/beds_bed_side_top_l_green.png
+++ b/textures/beds_bed_side_top_l_green.png
--- a/textures/beds_bed_side_top_l_grey.png
+++ b/textures/beds_bed_side_top_l_grey.png
--- a/textures/beds_bed_side_top_l_orange.png
+++ b/textures/beds_bed_side_top_l_orange.png
--- a/textures/beds_bed_side_top_l_red.png
+++ b/textures/beds_bed_side_top_l_red.png
--- a/textures/beds_bed_side_top_l_violet.png
+++ b/textures/beds_bed_side_top_l_violet.png
--- a/textures/beds_bed_side_top_l_white.png
+++ b/textures/beds_bed_side_top_l_white.png
--- a/textures/beds_bed_side_top_l_yellow.png
+++ b/textures/beds_bed_side_top_l_yellow.png
--- a/textures/beds_bed_side_top_r_black.png
+++ b/textures/beds_bed_side_top_r_black.png
--- a/textures/beds_bed_side_top_r_blue.png
+++ b/textures/beds_bed_side_top_r_blue.png
--- a/textures/beds_bed_side_top_r_green.png
+++ b/textures/beds_bed_side_top_r_green.png
--- a/textures/beds_bed_side_top_r_grey.png
+++ b/textures/beds_bed_side_top_r_grey.png
--- a/textures/beds_bed_side_top_r_orange.png
+++ b/textures/beds_bed_side_top_r_orange.png
--- a/textures/beds_bed_side_top_r_red.png
+++ b/textures/beds_bed_side_top_r_red.png
--- a/textures/beds_bed_side_top_r_violet.png
+++ b/textures/beds_bed_side_top_r_violet.png
--- a/textures/beds_bed_side_top_r_white.png
+++ b/textures/beds_bed_side_top_r_white.png
--- a/textures/beds_bed_side_top_r_yellow.png
+++ b/textures/beds_bed_side_top_r_yellow.png
--- a/textures/beds_bed_side_violet.png
+++ b/textures/beds_bed_side_violet.png
--- a/textures/beds_bed_side_white.png
+++ b/textures/beds_bed_side_white.png
--- a/textures/beds_bed_side_yellow.png
+++ b/textures/beds_bed_side_yellow.png