diff --git a/homedecor/furniture.lua b/homedecor/furniture.lua index 7cff874e..49133208 100644 --- a/homedecor/furniture.lua +++ b/homedecor/furniture.lua @@ -234,7 +234,7 @@ for _, color in ipairs(bedcolors) do "homedecor_bed_bottom1.png", "homedecor_bed_"..color.."_side1.png", "homedecor_bed_"..color.."_side1.png^[transformFX", - "homedecor_bed_"..color.."_head1.png", + "homedecor_bed_head1.png", "homedecor_bed_"..color.."_head2.png" }, drawtype = "nodebox", @@ -247,17 +247,11 @@ for _, color in ipairs(bedcolors) do {-0.5, -0.5, 0.4375, -0.375, 0.5, 0.5}, -- NodeBox1 {0.375, -0.5, 0.4375, 0.5, 0.5, 0.5}, -- NodeBox2 {-0.5, 0.25, 0.4375, 0.5, 0.4375, 0.5}, -- NodeBox3 - {-0.5, 0, 0.4375, 0.5, 0.1875, 0.5}, -- NodeBox4 - {-0.5, -0.375, 0.4375, 0.5, -0.125, 0.5}, -- NodeBox5 - {-0.4375, -0.375, -0.5, -0.375, -0.125, 0.5}, -- NodeBox6 - {0.375, -0.375, -0.5, 0.4375, -0.125, 0.5}, -- NodeBox7 - {-0.375, -0.375, 0.25, 0.375, -0.3125, 0.375}, -- NodeBox8 - {-0.375, -0.375, 0.0625, 0.375, -0.3125, 0.1875}, -- NodeBox9 - {-0.375, -0.375, -0.125, 0.375, -0.3125, 0}, -- NodeBox10 - {-0.375, -0.375, -0.3125, 0.375, -0.3125, -0.1875}, -- NodeBox11 - {-0.375, -0.375, -0.5, 0.375, -0.3125, -0.375}, -- NodeBox12 - {-0.375, -0.3125, -0.5, 0.375, -0.0625, 0.4375}, -- NodeBox13 - {-0.3125, -0.125, 0.0625, 0.3125, 0.0625, 0.4375}, -- NodeBox14 + {-0.5, -0.0625, 0.4375, 0.5, 0.1875, 0.5}, -- NodeBox4 + {-0.5, -0.375, -0.5, 0.5, -0.125, 0.5}, -- NodeBox5 + {0.375, -0.375, -0.5, 0.4375, -0.125, 0.5}, -- NodeBox6 + {-0.4375, -0.3125, -0.5, 0.4375, -0.0625, 0.4375}, -- NodeBox7 + {-0.3125, -0.125, 0.0625, 0.3125, 0.0625, 0.4375}, -- NodeBox8 } }, selection_box = { @@ -288,14 +282,9 @@ for _, color in ipairs(bedcolors) do {0.375, -0.5, -0.5, 0.5, 0.1875, -0.4375}, -- NodeBox2 {-0.5, 0, -0.5, 0.5, 0.125, -0.4375}, -- NodeBox3 {-0.5, -0.375, -0.5, 0.5, -0.125, -0.4375}, -- NodeBox4 - {-0.4375, -0.375, -0.5, -0.375, -0.125, 0.5}, -- NodeBox5 + {-0.5, -0.375, -0.5, 0.5, -0.125, 0.5}, -- NodeBox5 {0.375, -0.375, -0.5, 0.4375, -0.125, 0.5}, -- NodeBox6 - {-0.375, -0.375, 0.3125, 0.375, -0.3125, 0.4375}, -- NodeBox7 - {-0.375, -0.375, 0.125, 0.375, -0.3125, 0.25}, -- NodeBox8 - {-0.375, -0.375, -0.0625, 0.375, -0.3125, 0.0625}, -- NodeBox9 - {-0.375, -0.375, -0.25, 0.375, -0.3125, -0.125}, -- NodeBox10 - {-0.375, -0.375, -0.4375, 0.375, -0.3125, -0.3125}, -- NodeBox11 - {-0.375, -0.3125, -0.4375, 0.375, -0.0625, 0.5}, -- NodeBox12 + {-0.4375, -0.3125, -0.4375, 0.4375, -0.0625, 0.5}, -- NodeBox7 } }, selection_box = { @@ -342,14 +331,9 @@ for _, color in ipairs(bedcolors) do {0.375, -0.5, -0.5, 0.5, 0.5, -0.4375}, -- NodeBox2 {-0.5, 0, -0.5, 0.5, 0.125, -0.4375}, -- NodeBox3 {-0.5, -0.375, -0.5, 0.5, -0.125, -0.4375}, -- NodeBox4 - {-0.4375, -0.375, -0.5, -0.375, -0.125, 0.5}, -- NodeBox5 + {-0.5, -0.375, -0.5, 0.5, -0.125, 0.5}, -- NodeBox5 {0.375, -0.375, -0.5, 0.4375, -0.125, 0.5}, -- NodeBox6 - {-0.375, -0.375, 0.3125, 0.375, -0.3125, 0.4375}, -- NodeBox7 - {-0.375, -0.375, 0.125, 0.375, -0.3125, 0.25}, -- NodeBox8 - {-0.375, -0.375, -0.0625, 0.375, -0.3125, 0.0625}, -- NodeBox9 - {-0.375, -0.375, -0.25, 0.375, -0.3125, -0.125}, -- NodeBox10 - {-0.375, -0.375, -0.4375, 0.375, -0.3125, -0.3125}, -- NodeBox11 - {-0.375, -0.3125, -0.4375, 0.375, -0.0625, 0.5}, -- NodeBox12 + {-0.4375, -0.3125, -0.4375, 0.4375, -0.0625, 0.5}, -- NodeBox7 } }, selection_box = { diff --git a/homedecor/textures/homedecor_bed_blue_head1.png b/homedecor/textures/homedecor_bed_blue_head1.png deleted file mode 100644 index 8670d6fb..00000000 Binary files a/homedecor/textures/homedecor_bed_blue_head1.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_blue_top1.png b/homedecor/textures/homedecor_bed_blue_top1.png index ace9d198..8a05d066 100644 Binary files a/homedecor/textures/homedecor_bed_blue_top1.png and b/homedecor/textures/homedecor_bed_blue_top1.png differ diff --git a/homedecor/textures/homedecor_bed_blue_top2.png b/homedecor/textures/homedecor_bed_blue_top2.png index 58fa9009..11d2249a 100644 Binary files a/homedecor/textures/homedecor_bed_blue_top2.png and b/homedecor/textures/homedecor_bed_blue_top2.png differ diff --git a/homedecor/textures/homedecor_bed_brown_head1.png b/homedecor/textures/homedecor_bed_brown_head1.png deleted file mode 100644 index 312208dd..00000000 Binary files a/homedecor/textures/homedecor_bed_brown_head1.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_brown_top1.png b/homedecor/textures/homedecor_bed_brown_top1.png index 9884dfd5..4eb45496 100644 Binary files a/homedecor/textures/homedecor_bed_brown_top1.png and b/homedecor/textures/homedecor_bed_brown_top1.png differ diff --git a/homedecor/textures/homedecor_bed_brown_top2.png b/homedecor/textures/homedecor_bed_brown_top2.png index d49babbb..c722b194 100644 Binary files a/homedecor/textures/homedecor_bed_brown_top2.png and b/homedecor/textures/homedecor_bed_brown_top2.png differ diff --git a/homedecor/textures/homedecor_bed_darkgrey_head1.png b/homedecor/textures/homedecor_bed_darkgrey_head1.png deleted file mode 100644 index 2bc02b2f..00000000 Binary files a/homedecor/textures/homedecor_bed_darkgrey_head1.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_darkgrey_top1.png b/homedecor/textures/homedecor_bed_darkgrey_top1.png index ca55c23c..543fe0fe 100644 Binary files a/homedecor/textures/homedecor_bed_darkgrey_top1.png and b/homedecor/textures/homedecor_bed_darkgrey_top1.png differ diff --git a/homedecor/textures/homedecor_bed_darkgrey_top2.png b/homedecor/textures/homedecor_bed_darkgrey_top2.png index f28f7f37..f259b263 100644 Binary files a/homedecor/textures/homedecor_bed_darkgrey_top2.png and b/homedecor/textures/homedecor_bed_darkgrey_top2.png differ diff --git a/homedecor/textures/homedecor_bed_green_head1.png b/homedecor/textures/homedecor_bed_green_head1.png deleted file mode 100644 index 1149855f..00000000 Binary files a/homedecor/textures/homedecor_bed_green_head1.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_green_top1.png b/homedecor/textures/homedecor_bed_green_top1.png index 5da84f1e..f19a5a7c 100644 Binary files a/homedecor/textures/homedecor_bed_green_top1.png and b/homedecor/textures/homedecor_bed_green_top1.png differ diff --git a/homedecor/textures/homedecor_bed_green_top2.png b/homedecor/textures/homedecor_bed_green_top2.png index 25b633af..a4a702dc 100644 Binary files a/homedecor/textures/homedecor_bed_green_top2.png and b/homedecor/textures/homedecor_bed_green_top2.png differ diff --git a/homedecor/textures/homedecor_bed_head1.png b/homedecor/textures/homedecor_bed_head1.png new file mode 100644 index 00000000..334aaa4e Binary files /dev/null and b/homedecor/textures/homedecor_bed_head1.png differ diff --git a/homedecor/textures/homedecor_bed_orange_head1.png b/homedecor/textures/homedecor_bed_orange_head1.png deleted file mode 100644 index d103fb65..00000000 Binary files a/homedecor/textures/homedecor_bed_orange_head1.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_orange_top1.png b/homedecor/textures/homedecor_bed_orange_top1.png index 49cfbe20..d2f18b1b 100644 Binary files a/homedecor/textures/homedecor_bed_orange_top1.png and b/homedecor/textures/homedecor_bed_orange_top1.png differ diff --git a/homedecor/textures/homedecor_bed_orange_top2.png b/homedecor/textures/homedecor_bed_orange_top2.png index 9db4d357..bc5e8a86 100644 Binary files a/homedecor/textures/homedecor_bed_orange_top2.png and b/homedecor/textures/homedecor_bed_orange_top2.png differ diff --git a/homedecor/textures/homedecor_bed_pink_head1.png b/homedecor/textures/homedecor_bed_pink_head1.png deleted file mode 100644 index 5bf9bd54..00000000 Binary files a/homedecor/textures/homedecor_bed_pink_head1.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_pink_top1.png b/homedecor/textures/homedecor_bed_pink_top1.png index 1553a369..5b4257c9 100644 Binary files a/homedecor/textures/homedecor_bed_pink_top1.png and b/homedecor/textures/homedecor_bed_pink_top1.png differ diff --git a/homedecor/textures/homedecor_bed_pink_top2.png b/homedecor/textures/homedecor_bed_pink_top2.png index d462864e..848e55c1 100644 Binary files a/homedecor/textures/homedecor_bed_pink_top2.png and b/homedecor/textures/homedecor_bed_pink_top2.png differ diff --git a/homedecor/textures/homedecor_bed_red_head1.png b/homedecor/textures/homedecor_bed_red_head1.png deleted file mode 100644 index fd0a2cad..00000000 Binary files a/homedecor/textures/homedecor_bed_red_head1.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_red_top1.png b/homedecor/textures/homedecor_bed_red_top1.png index bf6232a6..736e5745 100644 Binary files a/homedecor/textures/homedecor_bed_red_top1.png and b/homedecor/textures/homedecor_bed_red_top1.png differ diff --git a/homedecor/textures/homedecor_bed_red_top2.png b/homedecor/textures/homedecor_bed_red_top2.png index 980b5335..eb2bdc1c 100644 Binary files a/homedecor/textures/homedecor_bed_red_top2.png and b/homedecor/textures/homedecor_bed_red_top2.png differ diff --git a/homedecor/textures/homedecor_bed_violet_head1.png b/homedecor/textures/homedecor_bed_violet_head1.png deleted file mode 100644 index 9bd90a64..00000000 Binary files a/homedecor/textures/homedecor_bed_violet_head1.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_violet_top1.png b/homedecor/textures/homedecor_bed_violet_top1.png index 2900a94c..8057aac0 100644 Binary files a/homedecor/textures/homedecor_bed_violet_top1.png and b/homedecor/textures/homedecor_bed_violet_top1.png differ diff --git a/homedecor/textures/homedecor_bed_violet_top2.png b/homedecor/textures/homedecor_bed_violet_top2.png index 56ecf961..eb8f54c8 100644 Binary files a/homedecor/textures/homedecor_bed_violet_top2.png and b/homedecor/textures/homedecor_bed_violet_top2.png differ diff --git a/homedecor/textures/homedecor_bed_yellow_head1.png b/homedecor/textures/homedecor_bed_yellow_head1.png deleted file mode 100644 index 7f3837c0..00000000 Binary files a/homedecor/textures/homedecor_bed_yellow_head1.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_yellow_top1.png b/homedecor/textures/homedecor_bed_yellow_top1.png index c839f60f..939197f9 100644 Binary files a/homedecor/textures/homedecor_bed_yellow_top1.png and b/homedecor/textures/homedecor_bed_yellow_top1.png differ diff --git a/homedecor/textures/homedecor_bed_yellow_top2.png b/homedecor/textures/homedecor_bed_yellow_top2.png index 5e10dcf3..1b977079 100644 Binary files a/homedecor/textures/homedecor_bed_yellow_top2.png and b/homedecor/textures/homedecor_bed_yellow_top2.png differ