From 0d33ff5b0b9ad6b21c0af4b0300b5e09acbbbcd7 Mon Sep 17 00:00:00 2001
From: Duane <duane@duanerobertson.com>
Date: Fri, 8 Jul 2016 10:12:20 -0500
Subject: [PATCH] Simplify floor bomb recipes.

---
 spec_bomb.lua                 |  48 ++++++++++++++++++----------------
 textures/fun_caves_shield.png | Bin 754 -> 807 bytes
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/spec_bomb.lua b/spec_bomb.lua
index 96abcc4..5b808e2 100644
--- a/spec_bomb.lua
+++ b/spec_bomb.lua
@@ -106,7 +106,7 @@ end
 
 
 -- Floor bombs
-local nodes = {{'default:sandstone', 'default:sandstone'}, {'default:wood', 'default:wood'},}
+local nodes = {{'default:sandstone', 'default:sandstone_block'}, {'default:wood', 'fun_caves:wood_block'},}
 for _, node in pairs(nodes) do
 	local node_name = node[1]
 	local comp = node[2] or node_name
@@ -117,32 +117,34 @@ for _, node in pairs(nodes) do
 	local _, d_name = node_name:match('(.*:)(.*)')
 	local d_name_u = d_name:gsub("(%l)(%w*)", function(a,b) return string.upper(a)..b end)
 
-	for i = 1, 5 do
-		local newnode = fun_caves.clone_node(node_name)
-		newnode.description = d_name_u.." Floor Bomb Mk "..i
-		newnode.inventory_image = '[inventorycube{'..node_texture..'{'..node_texture..'{'..node_texture..'^fun_caves_expand.png'
-		newnode.on_punch = function(pos, node, puncher, pointed_thing)
-			minetest.after(5, function()
-				floor(pos, 20 * i, node_name, puncher)
-				minetest.set_node(pos, {name = node_name})
-			end)
-		end
-		minetest.register_node("fun_caves:"..d_name..'_floor_bomb_'..i, newnode)
+	local newnode = fun_caves.clone_node(node_name)
+	newnode.description = d_name_u.." Floor Bomb"
+	newnode.inventory_image = '[inventorycube{'..node_texture..'{'..node_texture..'{'..node_texture..'^fun_caves_expand.png'
+	newnode.on_punch = function(pos, node, puncher, pointed_thing)
+		minetest.after(5, function()
+			floor(pos, 100, node_name, puncher)
+			minetest.set_node(pos, {name = node_name})
+		end)
+	end
+	minetest.register_node("fun_caves:"..d_name..'_floor_bomb', newnode)
 
-		if i > 1 then
-			minetest.register_craft({
-				output = "fun_caves:"..d_name..'_floor_bomb_'..i,
-				recipe = {
-					{comp, comp, comp},
-					{comp, "fun_caves:"..d_name..'_floor_bomb_'..(i-1), comp},
-					{comp, comp, comp}
-				}
-			})
-		end
+	if not minetest.registered_items[comp] then
+		newnode = fun_caves.clone_node(node_name)
+		newnode.description = newnode.description .. ' Block'
+		minetest.register_node(comp, newnode)
+
+		minetest.register_craft({
+			output = comp,
+			recipe = {
+				{node_name, node_name, node_name},
+				{node_name, node_name, node_name},
+				{node_name, node_name, node_name}
+			}
+		})
 	end
 
 	minetest.register_craft({
-		output = "fun_caves:"..d_name..'_floor_bomb_1',
+		output = "fun_caves:"..d_name..'_floor_bomb',
 		recipe = {
 			{comp, comp, comp},
 			{comp, "tnt:gunpowder", comp},
diff --git a/textures/fun_caves_shield.png b/textures/fun_caves_shield.png
index d804d2a3b8fe386635aa0f1288b99066b53e5904..aa765b7786aa36dc3635498de62efd1e420ec6e2 100644
GIT binary patch
delta 770
zcmV+d1O5E+1*ZlfiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZy-e**&|
zQ4i^(0008CNkl<ZILm#Ly-yrh6vfYd@6Ffl?6P183URC;0g9oZAgPd}D2h-l%W{+a
z0hXdPN$Jj=OSi79lqp<B`2*s@2q8P*1;rp^@fFrc3@p1l`!TaK^X6Swpd@SgRJXY2
zr+bcc3GY#>(NvrD3eEbPkF+U;e<zLXf$jR~+|1SN|GRWCJYRk?<qu6)T-S_}EPmy>
zg`X{@%LI*HBs*cV{y1!$u5_a0geW?@dHe1j0H_N<stbRFt@><MD#3Lk7y}*|{VZ3O
z$62=T50(9UO3Hgy`y63Ae+gjWKY*N7`TRV@knytNkul-tTf#&QX=IEve-i9e7IJbT
zBc!ofop|KJCoaQqS^{}cf-OQK$sQwLuA+!PA>B_X?YCqcb*;FcA<uby06?r22w+Hn
zbHJH~>HA3IYf#P@*Z`Sk^phCO+P?5zMo=Q_8B-`Kv(H5&B(VhTOaf349D$N5xZ7dI
zBq<8c1^^i<HA|!)NoSZRf67lusUE^s2TTfOcLT%a0KN1!xRpS&^LhXP;l8w0w2-G6
zH==8h#YMP<128%0$qD4~7B~wG^A#y6TOa5^5Po+(8+|>R*V7y5@(dhGU~?Cl^*Oru
z8oB%wCQku2YXg9xLT9<?<_)QYB;m2bF_e7-&)oo<9;74?IZ|?Sf6ubh>HuK=%R60Z
zU%BslELnKEf3}Kt`USfABBJ0Kgs@pBZ6w<J?c48u+!^cufM1z?qWgzG7<2NCJAR90
zxj-O^l9i#|JfbX#mK&IP^l#7Q1v_sJF+DXJ7RnPpxdnfZbU<u0Gbg!@10=oXZtPtD
z<@=?%#<P_*@xCWSSgrPt0D#(YICFgTx>`Rw;PcZ%-hZ?HS9SYj9spjf{cYhxIz0^p
z00bcq2XEJZJ+5s(+}Uq^3;?gTcNG9stCt<(9b&9bW7Mu_TmS$707*qoM6N<$g2?Ax
A4*&oF

delta 717
zcmV;;0y6!l2J!_ViBL{Q4GJ0x0000DNk~Le0000C0000G2nGNE03u<Y2azE&e*q&O
zpJ!Em0007iNkl<ZD9=sOJ5Ll*7>Duyd(N5b&MwPMBPx+Zh(bYuRzzcrF($^?=r=Gn
z`VH(XZK;f<g{AQWs0oA+6<CczfFL3(3BzS~XLo02=XPEz6QBB5K7{{jHJa+%ag`>$
zZ*#dW2M3MpxoLap)Wo^$pP^3+e{U{&edATz)<Yyq*KON<VyL`A$Pq@e6Eu%s293kT
zPLv!FMMt#o@!gt~)}&i5!?sK)!{vdY3tAZthpio%_96<y81426f_7_F6|5>JCjt7j
zll2b_3$IucI%-HQW2BK_t2$GV6=@;0(dxtl0-TmX4wPVnkVrCz$&*Vcf8jl(eU{Q*
zOU6;xh<h1|f=>(LT!8?F1h@dKap<0hG#-VrhQS)haz-zS!JL~)i7eFGEh)XjB_t$q
z8@V+GKtXT>N^0P4hZ$p}$UjmUs&zx8r=-=-Bb5)NREVI}0h2<-{)+yJk1)LlZY9Xs
z+E5Vos;Q!xBF(rFjY5`Ye_^}7z+@qmBPilEaOP{~K`AL)5rXj6c1-m0q2f5bhAvOQ
zq68*)kr|iJ#SIklJamx)td~Wf+gT{tMMEkfNjR*q4`uGbvA=?K2q_6fmXzH5X_#qE
zOkcg<mFD0x&tb{J$$LjjXs1`uEoKq<^AN)1JZU4zo!7VSJla$Mf8bRo-{igBhgu)p
zv`^n<S#b#@Q8qHPn|qWc(Lw_ga{wSVw{|gpaVT&rBady@`$@S^taD~giahp_gw5^P
zy8QIP?WxB6;<5k$)a$<m0Mz$`iT%Be+VRmZJ~`awovoEGwe^E(0QkK8-T41(93J`t
z0Q`Xa{XZ+O_Ur2}BQ|$hX8_>G`nCdqTCIk^KnhEo%}0#c00000NkvXXu0mjfeQ`;i