From dc86ef4ecba68033cdcf35388e9058d86a2bc031 Mon Sep 17 00:00:00 2001
From: HybridDog <adresse_test@t-online.de>
Date: Fri, 23 Jan 2015 22:33:58 +0100
Subject: [PATCH] Preparation for coloured arrows

---
 crossbow.lua                         |  11 ++++++++---
 textures/shooter_arrow_inv.png       | Bin 262 -> 234 bytes
 textures/shooter_arrow_uv.png        | Bin 497 -> 290 bytes
 textures/shooter_crossbow_loaded.png | Bin 537 -> 389 bytes
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/crossbow.lua b/crossbow.lua
index 39dc149..5a884d8 100644
--- a/crossbow.lua
+++ b/crossbow.lua
@@ -47,9 +47,14 @@ local function stop_arrow(object, pos, stuck)
 	object:setacceleration(acceleration)
 end
 
+-- name is the overlay texture name, colour is used to select the wool texture
+local function get_texture(name, colour)
+	return "shooter_"..name..".png^wool_"..colour..".png^shooter_"..name..".png^[makealpha:255,126,126"
+end
+
 minetest.register_craftitem("shooter:arrow", {
 	description = "Arrow",
-	inventory_image = "shooter_arrow_inv.png",
+	inventory_image = get_texture("arrow_inv", "white"),
 })
 
 minetest.register_entity("shooter:arrow_entity", {
@@ -58,7 +63,7 @@ minetest.register_entity("shooter:arrow_entity", {
 	mesh = "shooter_arrow.b3d",
 	visual_size = {x=1, y=1},
 	textures = {
-		"shooter_arrow_uv.png",
+		get_texture("arrow_uv", "white"),
 	},
 	timer = 0,
 	lifetime = SHOOTER_ARROW_LIFETIME,
@@ -161,7 +166,7 @@ minetest.register_entity("shooter:arrow_entity", {
 
 minetest.register_tool("shooter:crossbow_loaded", {
 	description = "Crossbow",
-	inventory_image = "shooter_crossbow_loaded.png",
+	inventory_image = get_texture("crossbow_loaded", "white"),
 	groups = {not_in_creative_inventory=1},
 	on_use = function(itemstack, user, pointed_thing)
 		minetest.sound_play("shooter_click", {object=user})
diff --git a/textures/shooter_arrow_inv.png b/textures/shooter_arrow_inv.png
index 7727c5fe82a2d6a81826da07001065a1fe484c61..65da4405f93fccdd2d9dd9e51dafca7d880a7509 100644
GIT binary patch
delta 206
zcmV;<05SiD0_p*fB!96<L_t(I%cau24Z<)GhT+!{b>tq}EMU=~OaT=v!3egJL8!9>
zEoBt?h$+%gp`!uu6G+Z*rRC?-$^MLZFZ?l+n9HUt*FXaxA}Jx%NlbuvUo9827I4Ox
z4j?LEwcjzdXY$Ne_p>AxA5Rw!n=OC?Fq%jFfKhKSghvC$@JC>P27e9E;(n2eVt)Hy
zmuI#b!>=1WVW83AN5C5vkyP7{1fYjQsG|bJ`}P;CZsO2f0X17<pWO@&2><{907*qo
IM6N<$f}P1*0ssI2

delta 234
zcmaFG*v2$LrJk`k$lZxy-8q?;3=9lxN#5=*4F5rJ!QSPQfg+p*9+AZi4BWyX%*Zfn
zjs#GUy~NYkmHi%<n23ztuQhX&fkJJbE{-7<r}tjk$a}~@q~+me^#Xof=LJ3!9V3*2
zFYJ$85p!XlOPj}Ztz98*(*!KGsm5i#{=J&{Uvg!d+9V}S&#bPV>zji(7;1FwT1CIV
z{8smQ>krHPialcD$t(;z#OD0pDHp>t<-_>{f`3d4MC#|LOq?<^b4Sarg-<Mcmq>=6
h-@^TTV%nWz>j=Z%cT5`;d4Nu0@O1TaS?83{1OQ73TBZO1

diff --git a/textures/shooter_arrow_uv.png b/textures/shooter_arrow_uv.png
index 57017c84c1df2808d54b6f8083a53a3dde9fecc3..0225e43dff69d9dd29c8b3d25540ccb7bda42b83 100644
GIT binary patch
delta 262
zcmV+h0r~#%1EK<uB!B5iL_t(I%gs_TPQySDobd-jfrKMPqQUt9G!arBK$nVqf-g*z
zdjpS1=aL=?x#0zI>*5+D@`9lt7o8#jw%jny?5#Ajb9+Zi#t0M`iGO0i5X#iZ>vJ%K
z>bxd^tJPu_>!vFKz*1xgrKR|rk?je|Lt!b_O;=iqe~HsnOMflNgQd1$2=k+Go)Y{t
z*;1PwrvN}pPGSI9EoS?^3#^-NNdT3l{V_>zF+*5ddZi^}yS>9^^M2w1pzYhd@$_)n
z%i#It<NCCNF$umu5_yyJpeq1)%p3RB#jcO=t^Hi*&$za<OFSgO7l(~?oS%zKuK)l5
M07*qoM6N<$f;Y^4rT_o{

delta 471
zcmV;|0Vw{W0`UWoB!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru-U=2IGY~AEuV4TG0dYx0K~y-)rBXdl0znXcqqKN_
z6=<|Dnmb}=42`*hc*erQ$Z29jft?<nb_NS5h#~eUwF%dlD1T6s@C*0>?h&bwK!N7q
z4~zvlB8ujSFWKy5H}mGrn<4$|2*2TFE{LUib?B{GZvp^<n?V48Z&cDa@GYz?4iohL
zPT<{xe(){;02AiE0RV9C?Wx}20D#kR;B*}Lr~P<a4S~ufP`QN6<qaCI4UiB5k|c4r
z+a&;yB#8|@M1P~I-#%105!1+xnVG27YO$e*kSp}fil<GwPh~ltHffX}R4$>Ie`Z;h
zQLEKJ%#3!s&4ECG^sQy&3RTYv5;2WP2*HY?kZs$nC<>W-^Pb#4yn5nrI7}pj004GB
zu1|J6kMJUs2MHlKVp&v-Mmb_x<TW{`X>3#~M9l0eAW#6T$}^rwPE*;zCc5$&05;Yp
z*$aWHs{N^aSFoN;(pal(Sr-0-A1%y2-to8|(AO3|j?X={kg;t5z$b+7ntL1rIYa;e
N002ovPDHLkV1i$L$q)bl

diff --git a/textures/shooter_crossbow_loaded.png b/textures/shooter_crossbow_loaded.png
index bd46531b5b143d1d7c2049a744be7dd47b98e49b..77dc04aa1105c47b536491ae32ad5ca8a30f3886 100644
GIT binary patch
delta 363
zcmV-x0hIok1cd{TBYy!*Nkl<ZILoDyF-yZx6otQpQsZDrK%{1A6uSrx#>E!iQg9J}
zK^I4%(y?p*K*vgdLh0nxIZL28wSt4-U<*PiokCnnmpDj5U;9!O&vfs5-1E*o=V?(C
zU1*vX@(nj?HhZj~+-<M6461dh*MK76-d`1Z52f3Up}d(*>VIJGl*PxhM4|!3(uwsp
z4Hn#-A21w;(h$Jo^&J2e-^UX|y2}9WpjxNgZPOpk6OwhQY0%@Hr@;c-H0Y1!xJS8-
z-Bqsx=m1Wqh3n*gBvC4ei&?N_QfvH~L|;Epk)+87(49^T+cdV4sQyC|V_|<cvQ0zj
zdd2qvus&Zov}AUa>15J|06ZaZIxPU~z(`kce0C`fsp5;1ngvTqg+8e@cz=1q6GCZ}
zCq$ykwhZ!SR`NrSP1}Z;csLF>NOXRQIGN!%l-AIqW;5a+_yTP{o>b)b>#zU-002ov
JPDHLkV1i2)tMUK<

delta 512
zcmV+b0{{Jm1DOPnBYyw^b5ch_0Itp)=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L
z01FcU01FcV0GgZ_00007bV*G`2i^(@6D}DV=v#CE00EgvL_t(I%cYXRN?Sn`hQAX+
z$Xzttl#5LRay8hEAXMo>yPJh{<E9UgCn)*^-S`XzAE0>vH-Fu@nq4c5q(T?HK{13v
zPzm*77YS}o7v|cz*ThZ#)y$dszd3Wx5mnV*uLpp0j&{2(c-mU2tH1wtev><wBuUgc
z$MNTn?0z~D=Nt$7dk>~YSb4adK3iq->of-`103w{F-#}0`%b(4+nfpD@Z?I2F#uZ3
zfKI2QNs_R&Qh(Pt3iQKvti`maW{fepxDO$Y0-Xi%&Dr{q;waGfZ(is;$WyPEv&Ch4
z$6z!TK$~HeFW;}(SziFq>f&o*j!MPAU^JFtIw6B>EY|?kT00X`ilacAVKrB<A|#uK
zSv4s817eK9S_?pHZBqbkEkgazPhKw9==M()kePtY?0FZ<S}SoBC_pp4&r($p`Nxnr
z3beJhiEk?OUoU<f3!ocIH7?UTzMlP-3?gw90O+&>kK{qvSzlmyGs!_pgVC7czkE$=
zA^_d~EzNqBMp)tPtLOTpao)gX9czRYIXt=Izx5Y@8N$AvX3VVs0000<MNUMnLSTaU
CN8^hC