From aa6dbf37f533e8a245293579cbdc9604b096093b Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Sun, 13 Jul 2014 18:49:40 -0400
Subject: [PATCH] change speaker and speaker-based recipes now, you must craft
 a speaker driver (the actual speaker itself) first, then use it to craft the
 "small" and "large" speakers, alarm clock, etc.

---
 homedecor/crafts.lua                          |  43 +++++++++++-------
 .../textures/homedecor_speaker_driver.png     | Bin 0 -> 268 bytes
 2 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 homedecor/textures/homedecor_speaker_driver.png

diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua
index 04cd843e..1cc98167 100644
--- a/homedecor/crafts.lua
+++ b/homedecor/crafts.lua
@@ -88,6 +88,11 @@ minetest.register_craftitem("homedecor:steel_wire", {
 	inventory_image = "homedecor_steel_wire.png"
 })
 
+minetest.register_craftitem("homedecor:speaker_driver", {
+	description = S("Speaker driver"),
+	inventory_image = "homedecor_speaker_driver.png"
+})
+
 -- alternate craftitem for silicon if mesecons isn't installed.
 
 if ( minetest.get_modpath("mesecons") ) == nil then
@@ -873,42 +878,48 @@ minetest.register_craft({
        	burntime = 30,
 })
 
--- =====================================
--- Speakers require copper from moreores
+-- Speakers
 
 minetest.register_craft( {
-        output = "homedecor:speaker",
+        output = "homedecor:speaker_driver 2",
       		recipe = {
-		{ "group:wood", "wool:black", "group:wood" },
-		{ "group:wood", "homedecor:copper_wire", "group:wood" },
-		{ "group:wood", "wool:black", "group:wood" },
+		{ "", "default:steel_ingot", "" },
+		{ "default:paper", "homedecor:copper_wire", "default:iron_lump" },
+		{ "", "default:steel_ingot", "" },
 	},
 })
 
 minetest.register_craft( {
         output = "homedecor:speaker_small",
       		recipe = {
-		{ "group:wood", "wool:black", "group:wood" },
-		{ "group:wood", "homedecor:copper_wire", "group:wood" },
+		{ "wool:black", "homedecor:speaker_driver", "group:wood" },
+	},
+})
+
+minetest.register_craft( {
+        output = "homedecor:speaker",
+      		recipe = {
+		{ "wool:black", "homedecor:speaker_driver", "group:wood" },
+		{ "wool:black", "homedecor:speaker_driver", "group:wood" },
+		{ "wool:black", "group:wood", "group:wood" },
 	},
 })
 
 -- cotton version
 
 minetest.register_craft( {
-        output = "homedecor:speaker",
+        output = "homedecor:speaker_small",
       		recipe = {
-		{ "group:wood", "cotton:black", "group:wood" },
-		{ "group:wood", "default:copper_ingot", "group:wood" },
-		{ "group:wood", "cotton:black", "group:wood" },
+		{ "cotton:black", "homedecor:speaker_driver", "group:wood" },
 	},
 })
 
 minetest.register_craft( {
-        output = "homedecor:speaker_small",
+        output = "homedecor:speaker",
       		recipe = {
-		{ "group:wood", "cotton:black", "group:wood" },
-		{ "group:wood", "default:copper_ingot", "group:wood" },
+		{ "cotton:black", "homedecor:speaker_driver", "group:wood" },
+		{ "cotton:black", "homedecor:speaker_driver", "group:wood" },
+		{ "cotton:black", "group:wood", "group:wood" },
 	},
 })
 
@@ -1916,7 +1927,7 @@ minetest.register_craft({
 minetest.register_craft({
     output = "homedecor:alarm_clock",
     recipe = {
-		{ "homedecor:plastic_sheeting", "homedecor:speaker_small", "homedecor:plastic_sheeting" },
+		{ "homedecor:plastic_sheeting", "homedecor:speaker_driver", "homedecor:plastic_sheeting" },
 		{ "homedecor:plastic_sheeting", "homedecor:digital_clock", "homedecor:plastic_sheeting" },
 		{ "homedecor:plastic_sheeting", "homedecor:power_crystal", "homedecor:plastic_sheeting" },
     },
diff --git a/homedecor/textures/homedecor_speaker_driver.png b/homedecor/textures/homedecor_speaker_driver.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2e257f754d6ff473178922893e03d1e1604a2a8
GIT binary patch
literal 268
zcmV+n0rUQeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002fNkl<ZILoz@
z!HtA43`HMki^$1WI-m_2pcA@5G!lsu6o5G5lg~7ey$mBW6Bw;VYbjD>DewE+4tyC!
zE?L)g0x&aFwYUS6xyNRPnGr$&NPhwVs4A)ofQZ~e%AEQUu8K=YnN!c*0ot}recz{#
z7LJH9dK(PGz&y`*NO@I$jFD~IXqv{`U|rXf$j_DfIF9W5j)&g%V49}FD|KCmnXxR(
z2~t(nHSMuLr{i<ECcXhg<oQ5E(hKx{jITCA2)_L6N@tsRjLq#r@o%5$>-YsvvU{ti
S;jBjh0000<MNUMnLSTZmQ*%%N

literal 0
HcmV?d00001