From d18cc27c96b07368566f2da16b281a2fc1f6820b Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Sat, 31 Aug 2019 12:27:33 +0200
Subject: [PATCH] Fix texturing of wall torches

---
 .../textures/default_torch_overlayR90.png     | Bin 0 -> 991 bytes
 .../textures/default_torch_overlayR90.xcf     | Bin 0 -> 2232 bytes
 .../default_torch_weak_overlayR90.png         | Bin 0 -> 2114 bytes
 .../default_torch_weak_overlayR90.xcf         | Bin 0 -> 2429 bytes
 mods/default/torch.lua                        | 316 +++++++++---------
 5 files changed, 163 insertions(+), 153 deletions(-)
 create mode 100644 mods/default/textures/default_torch_overlayR90.png
 create mode 100644 mods/default/textures/default_torch_overlayR90.xcf
 create mode 100644 mods/default/textures/default_torch_weak_overlayR90.png
 create mode 100644 mods/default/textures/default_torch_weak_overlayR90.xcf

diff --git a/mods/default/textures/default_torch_overlayR90.png b/mods/default/textures/default_torch_overlayR90.png
new file mode 100644
index 0000000000000000000000000000000000000000..059fffc0357f41a2777f429f78adb6bb75d23fbe
GIT binary patch
literal 991
zcmV<510ei~P)<h;3K|Lk000e1NJLTq000mG001Be1^@s68;SVL0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iTg6gZ9PA(>7_d575EXIMDionYs1;guFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|;_9U6A|?JWDYS_3;J6>}?mh0_0scmXsb<$WplX(p
zP9}tGZdK@cMG!*>A%bCvnfjb4rr<fg?&0I>U7TlmpZjw}l)T9RpFljzbi*RvAfDc|
zbk6(4QC5-^;&b9LgDyz?$aUG}H_k<e{X8>jWYY7*QDULk!Ey()lA#h$5yuo&qkMnX
zWrgz=XSGset$XqphV$CWGS_JiB8f#TL4*JqHIz|-g*dGmDJIgipYZSxIDU~_GP%lN
z<XAuzDkR4b{s+IiH4BpyZc;b_bidg4#|Y4~3pDGt{e5iP%@ZK-3|wh#f3*S3e3D*o
zYq2AscN@64Zfo)$aJd8YKk1SoIZ}Y8zfb_)&*+<SK;JD8T624A?c?+T$WT|Q8{ps&
z7%fuvy2rbNoxS~grq$mMS}}5+oh9zZ00006VoOIv00000008+zyMF)x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru;|L!L4<VvxM#BIA02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{00Fm2L_t(Y$JLdwYTQ5&hQAedBQOVsBkb13<{CBXQ=Ho9
z4X)2)+^NnJ<Z8dc)pvz^HEM)I>K)91i3x1uVpGW4Q*7xhV}i+4T6X5&nfYcA95H{B
zdw-MrV?Jsq@P*^&O|Ng%t2*G^XD6>YyhZF|OdTUIri{@PhJ;3C@MetvNB3Xt!B`T}
z*x*4j|8$wgkWj1D3avF%*E}TPBm-bMFFio9OVx5-`eK(VfZuGm+{cuUGmJ4$89W68
zSZhOYSE#-Fq+<Zm)4D0aT8rE}CKcR?!x%&RTGy8I(w~_!oaNr3wI(vgz*P<q)Z5g%
z-^DIfXXFRPs~izQdGFsfNYQ&I@npSTBO=6l3%sQ8yrfufnN%Rt3~Mcsh`{ZJN%c2{
zzD8PW4~N@LgV9=xK9Bh^bpU}vH-q+kk=EQv<EPJ?hDXL2WSVigkHcjj!eW;yC)t5i
zvS=pp<0%wHfwh*lzV5Je_n{>K1PbBLl%Cd50ZGiy((-*F{&^1ozFyDNMcV9u-ftmU
zG$lMFgk>7qg>Ut*5FGYFgh*?RlPt_Z*VgqH)t2BS!$}rMm5(z3{s4z<<62|($W8zN
N002ovPDHLkV1mT8!&v|T

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_torch_overlayR90.xcf b/mods/default/textures/default_torch_overlayR90.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..024e482c2573e1020edb75c03873a62814d1e00a
GIT binary patch
literal 2232
zcmd6n&yL$R5XMDHc9Y!%O`Eo-0#*M38z3&S@i7nzw1=Pv0=*S`biAS?XuS?B7fnu?
zvrf4Z=u`9&bjTy*C3+~ZsJp3G7W)lFdA(cb(o+dg91dqVpD6w`$)?ZZ=VKk~>?94)
z?x4qPpnZTY1Ri(MZ+!PE`jtEEkI*CZJ@ik!&2b+i{xQbe6Kp#e&!*G#bb)!miywYJ
zPe+UNIQ}JDJdGd!pnl|)J1#Vvjwb0~GS80LhiDNT6pI%pX<W=svg3Pu2YND|oy_L(
zfg1+%$&*q1;F|}o?Jy4g(mkX;*^%0<$L}^c^?C7ZG|o;Z@nKgB&KJ9!-Z%L9G+V^k
z>G)|{aQ;l|B3*0*a`wMnt><bgpM!7Ww;<>}>Sh?bZ^Wm1L(fOkG=9j-k{@V&bpAXR
z{d2azB|H&}&VJ6j>1_<b7hCqHTQ+}Qj^`GmclQ34eQV3Uy=A`-o9lJ$Js4g7*IV{i
zY+Gv^j9+@2b$3@RgzcNeIk?unKlYQaulnR0p4VhdDM?sK=Y`QkrYv=2|0G=+Lz+xM
z6xy@0C=D52C9*c88dLhrt_+p%NX~}GrR$zuBAG~=0&AhYpt3MVQez5<P{GLt$u(*?
zPmN8mF3h^r2&l>GQW{ILv=muc3iAhQyVAy5BG&m5Uk2K9&Z|Oto1=DajE<^v6wY(f
zN4cc1IzwW91T{H&g~;0EUO7aNte_koO-H%Wy=sZvBhop)Ygk=i$gz#hLqtM2>OuG#
z71+UNhgFfUAxKtlsp86pSbJ1SBl0D0z=chPLTiZhx|0NXO47wJfpD2v9jS)2O#UW4
zOok|~&XQr043V59L`sDu644$xJ0y|?M-!rSPc1cqNh61IFNl+I<jD|6t^`6Gf8?zP
zhl^#IG!U-Vq)-_F&_R)k5<YHM)hI<M(8}%y!tUb+?gt^du!BHi?AblcZ^6Fr<`VbQ
z-gIHL4Xk}Bm@x+;Uq%MXgLugP{~Lg;@xKDt{Z#n1hWv79ydQS}*ysN}H}C8J#FO6{
zK!%F^&E7>|WY0GM;=2R4s{n?eYPkUrAGZa#V^G=^*%rdO1^POK0vm|ZItrT-2sa&q
z0t7RHf8kDe1W}z4gr|jyaJSz9AmiBa2jK|3%3lbomK**mP=r6vC4#bAfgR5v<9v-l
z0f#WwLD(?AtByd(b_B9)PhjW(#NBRzB7e1a(HE)n4SbO8SlfaxbVT7t<KR<32&ymn
zlWIk(1+Z>ez7C+k1}%UV?Ane#hz5Nu+0%#PV)}ZZ4OHzpsu(~4*h0)3d&wMQcpobr
MlKa6L{Plx>0I?aT3IG5A

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_torch_weak_overlayR90.png b/mods/default/textures/default_torch_weak_overlayR90.png
new file mode 100644
index 0000000000000000000000000000000000000000..22889ccdb3ddaebd1c8155902261bb69ff830ca2
GIT binary patch
literal 2114
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

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_torch_weak_overlayR90.xcf b/mods/default/textures/default_torch_weak_overlayR90.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..14248a41aa0f1d6594938371eb1b8eb203a4a7df
GIT binary patch
literal 2429
zcmd5+JCEB&5GI#;oX<AmIFBMo0Okdp0W0uDHDSOhj1&aYrj&JBS>WkphzeqNTeC{a
z1=6NT86s_dLYn&*hGQ5)5(KBm<olN79c3|1sw_0S-^|X;&WQW%crtwwJ{{^%PfkZ3
z#w|!lfbk~8_c6T%Ie740>jw((+mIIIHsswB)9)SlKg4=-jI_PsY&spCEueecy#2*|
zG+2yI!fz*w$Kk^-<FB}L%ehXbgYl?0o=;9_gSYP;rHf~$qcEMFPEPI|9_jILb~>Af
zM{eoO$Bzc#z0dBs(EyIitvd*P)DT+jhyM;3`ZRqq7*5W{;c;~qjL({krLFhP*<=w;
z&W4XiDdT5ar=!JXfsEca6_(vl{txBwfA+lg_mzf~--yD0^+3-D(^2?2px1%$vk2rv
z;`;_Od?2*b|5}N$cpug9`!#%6!(k0yui+ate6xn%0Ooldtg#E>*&LrjD*Oqth-|Tb
zTw>N;U9AAP9O|bMRDC0d`gPZ)exvT2tu=v&QS!I3#%M@a*2Y>L*scUtQkD5~k%{1^
zvRA3mse!-FFlRbb<|UC4<L1mQ2QZ*i^PV94A%K$e%ELKO(GFeCS(X-uq{1`THnS*T
zli5sJA2n?>klAYFS|J?87!Mo2TfjUwIZk2y$=60&xsMi-L<flvMI=a2f<+rP&n+Sm
zw=554xYbsf7epp^MdiqZoCrjwZEjlmw#eFr&V(vQV+sl#kUKxGB8&Er=CU#D16ylw
zGS25I%B~WdB+}0R6bocowac~932OOELq$)RYhA{%i4n{$qdw}1*<}>zAVN{t2_oq$
z;EO1ZBSc28`bNVM=SP?$9idAi6T2$o$Qa~AATn)Z(~8+8a2LXaDrT2Z=zyx@^D46F
z5@}xRGK%^*8Rz#!`W?WwtLwtDV3%g2Bb4D9L_09D!M2A2JUPVuzV5`AyIuf&E1rT$
z6}thfKGZgL0<0VHgbZ$?_c85?69%0~qyG!dS<`=|dDRnAbgCz=M)S^(Opa07I=@iy
z%}ZWyjjxCwZxCdU=Yg!r!A6!ZU8EzPkqjgh#Dj<+@&~xrg^oKS%N?TQ^FDv=j+8{l
z`%uxm1!CecX<)kGZK^Rq7xZEMdpsu-E1vr~UNAJ$#PcOt1$uJ^&sDwwV(^NThmK1N
zA=7DvZm)bu_2mxL^Zf=(s`Ggu)h`^?k?4;Exhl5vjoKwUpOvd8O*>{blbv*|$nM8$
zQm&EgOY#dG=M1u|*tLq_6?qT6;3w(Ml+f*!5Ba{_;d{K_YRPxL5#&2_Y@!&&tsLX|
onCudsuL_#%I3APj<gqV3NArT$H-PUt-O>J<dl1&3y0pE206}ety#N3J

literal 0
HcmV?d00001

diff --git a/mods/default/torch.lua b/mods/default/torch.lua
index 392e8df..c796b98 100644
--- a/mods/default/torch.lua
+++ b/mods/default/torch.lua
@@ -2,159 +2,169 @@ local S = minetest.get_translator("default")
 
 -- Torches
 
-minetest.register_node(
-   "default:torch_dead",
-   {
-      description = S("Dead Torch"),
-      drawtype = "nodebox",
-      tiles = {
-	 "default_torch_ends.png",
-	 "default_torch_ends.png",
-	 "default_torch_base.png",
-      },
-      inventory_image = "default_torch_dead_inventory.png",
-      wield_image = "default_torch_dead_inventory.png",
-      paramtype = "light",
-      paramtype2 = "wallmounted",
-      sunlight_propagates = true,
-      walkable = false,
-      floodable = true,
-      node_box = {
-	 type = "wallmounted",
-	 wall_top = {-2/16, 0, -2/16, 2/16, 0.5, 2/16},
-	 wall_bottom = {-2/16, -0.5, -2/16, 2/16, 0, 2/16},
-	 wall_side = {-0.5, -8/16, -2/16, -0.5+4/16, 0, 2/16},
-      },
-      groups = {choppy = 2, dig_immediate = 3, attached_node = 1},
-      is_ground_content = false,
-      sounds = default.node_sound_defaults(),
-})
 
-minetest.register_node(
-   "default:torch_weak",
-   {
-      description = S("Weak Torch"),
-      drawtype = "nodebox",
-      tiles = {
-	 {
-	    name = "default_torch_ends.png",
-	 },
-	 {
-	    name = "default_torch_ends.png",
-	 },
-	 {
-	    name = "default_torch_base.png",
-	 },
-      },
-      overlay_tiles = {
-	 {
-	    name = "default_torch_weak_ends_overlay.png",
-	    animation = {
-	       type = "vertical_frames",
-	       aspect_w = 16,
-	       aspect_h = 16,
-	       length = 1.0,
-	    },
-	 },
-	 {
-	    name = "default_torch_weak_ends_overlay.png",
-	    animation = {
-	       type = "vertical_frames",
-	       aspect_w = 16,
-	       aspect_h = 16,
-	       length = 1.0,
-	    },
-	 },
-	 {
-	    name = "default_torch_weak_overlay.png",
-	    animation = {
-	       type = "vertical_frames",
-	       aspect_w = 16,
-	       aspect_h = 16,
-	       length = 1.0,
-	    },
-	 },
-      },
-      inventory_image = "default_torch_weak_inventory.png",
-      wield_image = "default_torch_weak_inventory.png",
-      paramtype = "light",
-      paramtype2 = "wallmounted",
-      sunlight_propagates = true,
-      walkable = false,
-      floodable = true,
-      light_source = default.LIGHT_MAX-4,
-      node_box = {
-	 type = "wallmounted",
-	 wall_top = {-2/16, 0, -2/16, 2/16, 0.5, 2/16},
-	 wall_bottom = {-2/16, -0.5, -2/16, 2/16, 0, 2/16},
-	 wall_side = {-0.5, -8/16, -2/16, -0.5+4/16, 0, 2/16},
-      },
-      groups = {choppy = 2, dig_immediate = 3, attached_node = 1},
-      is_ground_content = false,
-      sounds = default.node_sound_defaults(),
-})
 
-minetest.register_node(
-   "default:torch",
-   {
-      description = S("Torch"),
-      drawtype = "nodebox",
-      tiles = {
-	 {
-	    name = "default_torch_ends.png",
-	 },
-	 {
-	    name = "default_torch_ends.png",
-	 },
-	 {
-	    name = "default_torch_base.png",
-	 },
-      },
-      overlay_tiles = {
-	 {
-	    name = "default_torch_ends_overlay.png",
-	    animation = {
-	       type = "vertical_frames",
-	       aspect_w = 16,
-	       aspect_h = 16,
-	       length = 1.0,
-	    },
-	 },
-	 {
-	    name = "default_torch_ends_overlay.png",
-	    animation = {
-	       type = "vertical_frames",
-	       aspect_w = 16,
-	       aspect_h = 16,
-	       length = 1.0,
-	    },
-	 },
-	 {
-	    name = "default_torch_overlay.png",
-	    animation = {
-	       type = "vertical_frames",
-	       aspect_w = 16,
-	       aspect_h = 16,
-	       length = 1.0,
-	    },
-	 },
-      },
-      inventory_image = "default_torch_inventory.png",
-      wield_image = "default_torch_inventory.png",
-      paramtype = "light",
-      paramtype2 = "wallmounted",
-      sunlight_propagates = true,
-      walkable = false,
-      floodable = true,
-      light_source = default.LIGHT_MAX-1,
-      node_box = {
-	 type = "wallmounted",
-	 wall_top = {-2/16, 0, -2/16, 2/16, 0.5, 2/16},
-	 wall_bottom = {-2/16, -0.5, -2/16, 2/16, 0, 2/16},
-	 wall_side = {-0.5, -8/16, -2/16, -0.5+4/16, 0, 2/16},
-      },
-      groups = {choppy = 2, dig_immediate = 3, attached_node = 1},
-      is_ground_content = false,
-      sounds = default.node_sound_defaults(),
-})
+local function register_torch(subname, description, tiles, overlay_tiles, overlay_side_R90, inv_image, light)
+   minetest.register_node(
+      "default:"..subname,
+      {
+         description = description,
+         drawtype = "nodebox",
+         tiles = tiles,
+         overlay_tiles = overlay_tiles,
+         inventory_image = inv_image,
+         wield_image = inv_image,
+         paramtype = "light",
+         paramtype2 = "wallmounted",
+         light_source = light,
+         sunlight_propagates = true,
+         walkable = false,
+         floodable = true,
+         node_placement_prediction = "",
+         node_box = {
+	    type = "wallmounted",
+	    wall_top = {-2/16, 0, -2/16, 2/16, 0.5, 2/16},
+	    wall_bottom = {-2/16, -0.5, -2/16, 2/16, 0, 2/16},
+	    wall_side = {-0.5, -8/16, -2/16, -0.5+4/16, 0, 2/16},
+         },
+         groups = {choppy = 2, dig_immediate = 3, attached_node = 1},
+         is_ground_content = false,
+         sounds = default.node_sound_defaults(),
+         on_construct = function(pos)
+             local node = minetest.get_node(pos)
+             local dir = minetest.wallmounted_to_dir(node.param2)
+             if dir.x ~= 0 or dir.z ~= 0 then
+                 minetest.set_node(pos, {name="default:"..subname.."_wall", param2 = node.param2})
+             end
+         end,
+   })
+   local copy, copy_o
+   for i=1,6 do
+      if tiles[i] ~= nil then
+          copy = tiles[i]
+      else
+          tiles[i] = copy
+      end
+      if overlay_tiles then
+          if overlay_tiles[i] ~= nil then
+              copy_o = overlay_tiles[i]
+          else
+              overlay_tiles[i] = copy_o
+          end
+      end
+   end
+   local copy_tile = function(tile)
+      if type(tile) == "table" then
+         return table.copy(tile)
+      else
+         return tile
+      end
+   end
+   local overlay_tiles2
+   if overlay_tiles then
+      overlay_tiles2 = {
+          copy_tile(overlay_tiles[3]),
+          copy_tile(overlay_tiles[4]),
+          overlay_side_R90,
+          overlay_side_R90,
+          copy_tile(overlay_tiles[1]),
+          copy_tile(overlay_tiles[2]),
+      }
+   end
+   local tiles2
+   if tiles then
+      tiles2 = {
+          tiles[3],
+          tiles[4],
+          tiles[5].."^[transformR90",
+          tiles[6].."^[transformR90",
+          tiles[1],
+          tiles[2],
+      }
+   end
+   minetest.register_node(
+      "default:"..subname.."_wall",
+      {
+         drawtype = "nodebox",
+         tiles = tiles2,
+         overlay_tiles = overlay_tiles2,
+         inventory_image = inv_image,
+         wield_image = inv_image,
+         paramtype = "light",
+         paramtype2 = "wallmounted",
+         light_source = light,
+         sunlight_propagates = true,
+         walkable = false,
+         floodable = true,
+         node_box = {
+	    type = "wallmounted",
+	    wall_top = {-2/16, 0, -2/16, 2/16, 0.5, 2/16},
+	    wall_bottom = {-2/16, -0.5, -2/16, 2/16, 0, 2/16},
+	    wall_side = {-0.5, -8/16, -2/16, -0.5+4/16, 0, 2/16},
+         },
+         drop = "default:"..subname,
+         groups = {choppy = 2, dig_immediate = 3, attached_node = 1, not_in_creative_inventory = 1},
+         is_ground_content = false,
+         sounds = default.node_sound_defaults(),
+   })
 
+
+
+
+end
+
+local tiles_base = {"default_torch_ends.png","default_torch_ends.png","default_torch_base.png"}
+local overlay_tiles_weak = {
+    {
+        name = "default_torch_weak_ends_overlay.png",
+        animation = {
+            type = "vertical_frames",
+            aspect_w = 16,
+            aspect_h = 16,
+            length = 1.0,
+        },
+    },
+    {
+        name = "blank.png"
+    },
+    {
+        name = "default_torch_weak_overlay.png",
+        animation = {
+            type = "vertical_frames",
+            aspect_w = 16,
+            aspect_h = 16,
+            length = 1.0,
+        },
+    },
+}
+local overlay_tiles_normal = {
+    {
+        name = "default_torch_ends_overlay.png",
+        animation = {
+            type = "vertical_frames",
+            aspect_w = 16,
+            aspect_h = 16,
+            length = 1.0,
+        },
+    },
+    {
+        name = "blank.png",
+    },
+    {
+        name = "default_torch_overlay.png",
+        animation = {
+            type = "vertical_frames",
+            aspect_w = 16,
+            aspect_h = 16,
+            length = 1.0,
+        },
+    },
+}
+local overlayR90_weak = "default_torch_weak_overlayR90.png"
+local overlayR90_normal = "default_torch_overlayR90.png"
+
+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)
+
+default.log("torch", "loaded")