From 3205562996c0282c9feec573d9e6f39ccd1e5cc8 Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Sun, 26 Jan 2020 17:12:27 +0100
Subject: [PATCH] Add different torch textures top vs bottom

---
 mods/default/textures/default_torch_bottom.png | Bin 0 -> 216 bytes
 mods/default/textures/default_torch_ends.png   | Bin 216 -> 121 bytes
 mods/default/textures/default_torch_ends.xcf   | Bin 1365 -> 0 bytes
 mods/default/torch.lua                         |   8 ++++----
 4 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 mods/default/textures/default_torch_bottom.png
 delete mode 100644 mods/default/textures/default_torch_ends.xcf

diff --git a/mods/default/textures/default_torch_bottom.png b/mods/default/textures/default_torch_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..a002cfe46d793059c114dc4f050f119de128f0a0
GIT binary patch
literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY{r~@eLqkJaTH4H+GoS4*
z2C{(+Aa_%(`^;?HhDc+JiBltiin&XI{DK*Ps)1|}kdLl*15(kRE{-7;jIN!HoDB*h
zF8l?JmpNq|qZ|&HdCXc6o7G$=y(M*?nC$V#h3#TO%61MX6C4=lTn;sgIk+j)adM=$
z$1b(5p1J?Nf4ugq?C-AG-##};3c2py9aD7d82jnzB6~jEG^_+!=jrO_vd$@?2>^oB
BQ3U`1

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_torch_ends.png b/mods/default/textures/default_torch_ends.png
index a002cfe46d793059c114dc4f050f119de128f0a0..8131d57739fa65451ea3aaae06a2b33aa2f1c1d8 100644
GIT binary patch
delta 103
zcmcb?SUEu=k%NhWfnmbL3^O3bRubeF45Wb|ZyEbUAf@N&;uuoFn0$bR*MlKgY<HW9
z!Gfi1Et6mH8pt|Cuw3r`;d0`l!>-90d~MEAObiuGg)fVySN#N;;OXk;vd$@?2>_`n
BAMOAE

delta 199
zcmb=t!8k#po`so#f#L1lM?pYJF~BFp_5c6>4Gj%xX=yWO&V07N7{~@PfZR>B?lZG(
z8zPM@CQgk6D&{T;@(X4Fss^$_Kt8(K4M;_Mx;TbZFuHa&ayBT4xbPP=Ugnf>jB+?&
z<}qtQY*urf^p@0lVzS2{7q*KDDcd<ZoJ??FoO3zUDCXd%OvlNQ-X6Qux_ajR`~LCT
qud=_pW`FzKASvX!dv{FHv19C~r;F_QaMQ37WS^(2pUXO@geCwupisg9

diff --git a/mods/default/textures/default_torch_ends.xcf b/mods/default/textures/default_torch_ends.xcf
deleted file mode 100644
index fd71c9c535ce2f0f0d5a29edb13c281786b764fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1365
zcmb_ayKdVs6g4T!apML}pHl}d1)RY}jLcfv!RSz+YevTw6+wOkrivy70&wosl|a9t
zLw-PiqoF_GS_#CSD^re=I$H=F^4xpwC3!@J(e%ta9|=!Hlc0gIZ$bPyz!;{NK>Neb
z<}U*HE1(IqfH#&?-D}hju<nJ}wl|tjr@<^i+#vDA$3-wqg0c54N>07Or_WzV*)L0@
z=`aj>;UXGS4%MvDmC3~<@Z@|FjSqIaA{@;p^M%(fm);^g8G48B56iKI^sRJ&){`x*
zmF_)EsP$Z)4M))|^!n9VNM3A9+FbAJEK0m+HaZO?_0NTnL9)3Zb^o7QXYRJrcd&!~
zt{B$pedvp}#bP)OygtdCCJcHKdKv??EvMQimSbtWt?}I&@6`Cy8sDq&XW+DNHFiMg
zJQ~$+;jBZNxv;#tH){F!yE*=YV%IpTW3H7@+O$lO8D_Z3wJ{mdJTsXwiYsKZHI^#V
zs+755$gNbCQOvTxMro4Da;9B0F?B5{<Ek4`391mvfwr>MEpUpP>W@%VyqT}AG%iwZ
zccT$Fnwdf?hGJLexUg9VTo+1ni1s+}d$!Vzt(0h<n$&L0Q`iEQDy6$ahAqS^m8KN4
z^wDiyUdC}{D@NeNx3=Q^7@D;e7soM&Xl;StvnAnW{aTV}E{&{gNhrWlNwNhQwh*tB
zloT`h=(Yv}->+=>2ps>`mY*L%v$p)=$mbBPEpWHtm`)Avz*&i%2Uf>WO})o$`~#9h
B-yr}1

diff --git a/mods/default/torch.lua b/mods/default/torch.lua
index ca8afbb..ae35476 100644
--- a/mods/default/torch.lua
+++ b/mods/default/torch.lua
@@ -117,7 +117,7 @@ local function register_torch(subname, description, tiles, overlay_tiles, overla
 
 end
 
-local tiles_base = {"default_torch_ends.png","default_torch_ends.png","default_torch_base.png"}
+local tiles_base = {"default_torch_ends.png","default_torch_bottom.png","default_torch_base.png"}
 local overlay_tiles_weak = {
     {
         name = "default_torch_weak_ends_overlay.png",
@@ -184,9 +184,9 @@ local overlayR90_normal = {
     },
 }
 
-register_torch("torch_dead", S("Dead Torch"), {"default_torch_ends.png","default_torch_ends.png","default_torch_base.png"}, nil, nil, "default_torch_dead_inventory.png")
-register_torch("torch_weak", S("Weak Torch"), {"default_torch_ends.png","default_torch_ends.png","default_torch_base.png"}, overlay_tiles_weak, overlayR90_weak, "default_torch_weak_inventory.png", default.LIGHT_MAX-4)
-register_torch("torch", S("Torch"), {"default_torch_ends.png","default_torch_ends.png","default_torch_base.png"}, overlay_tiles_normal, overlayR90_normal, "default_torch_inventory.png", default.LIGHT_MAX-1)
+register_torch("torch_dead", S("Dead Torch"), {"default_torch_ends.png","default_torch_bottom.png","default_torch_base.png"}, nil, nil, "default_torch_dead_inventory.png")
+register_torch("torch_weak", S("Weak Torch"), {"default_torch_ends.png","default_torch_bottom.png","default_torch_base.png"}, overlay_tiles_weak, overlayR90_weak, "default_torch_weak_inventory.png", default.LIGHT_MAX-4)
+register_torch("torch", S("Torch"), {"default_torch_ends.png","default_torch_bottom.png","default_torch_base.png"}, overlay_tiles_normal, overlayR90_normal, "default_torch_inventory.png", default.LIGHT_MAX-1)
 
 minetest.register_lbm({
 	label = "Upgrade wall torches",