From bf9cb1759b5f5e29cef6c6d46bf6a9310956d8bc Mon Sep 17 00:00:00 2001 From: KaadmY Date: Mon, 24 Jul 2017 15:39:56 -0700 Subject: [PATCH] Make torches use overlay and make more stuff with shader lighting --- mods/default/nodes.lua | 77 ++++++++++-------- .../textures/default_torch_3d_animated.png | Bin 628 -> 0 bytes .../default_torch_3d_ends_animated.png | Bin 394 -> 0 bytes ...lt_torch_3d.png => default_torch_base.png} | Bin ...lt_torch_3d.xcf => default_torch_base.xcf} | Bin ...d.png => default_torch_dead_inventory.png} | Bin ...d.xcf => default_torch_dead_inventory.xcf} | Bin ...rch_3d_ends.png => default_torch_ends.png} | Bin ...rch_3d_ends.xcf => default_torch_ends.xcf} | Bin .../textures/default_torch_ends_overlay.png | Bin 0 -> 448 bytes ...ted.xcf => default_torch_ends_overlay.xcf} | Bin 2260 -> 2369 bytes ..._torch.png => default_torch_inventory.png} | Bin ..._torch.xcf => default_torch_inventory.xcf} | Bin .../textures/default_torch_overlay.png | Bin 0 -> 271 bytes ...animated.xcf => default_torch_overlay.xcf} | Bin 2609 -> 2503 bytes mods/mobs/textures/mobs_sheep.png | Bin 2017 -> 2027 bytes mods/mobs/textures/mobs_sheep.xcf | Bin 5706 -> 5706 bytes 17 files changed, 41 insertions(+), 36 deletions(-) delete mode 100644 mods/default/textures/default_torch_3d_animated.png delete mode 100644 mods/default/textures/default_torch_3d_ends_animated.png rename mods/default/textures/{default_torch_3d.png => default_torch_base.png} (100%) rename mods/default/textures/{default_torch_3d.xcf => default_torch_base.xcf} (100%) rename mods/default/textures/{default_torch_dead.png => default_torch_dead_inventory.png} (100%) rename mods/default/textures/{default_torch_dead.xcf => default_torch_dead_inventory.xcf} (100%) rename mods/default/textures/{default_torch_3d_ends.png => default_torch_ends.png} (100%) rename mods/default/textures/{default_torch_3d_ends.xcf => default_torch_ends.xcf} (100%) create mode 100644 mods/default/textures/default_torch_ends_overlay.png rename mods/default/textures/{default_torch_3d_ends_animated.xcf => default_torch_ends_overlay.xcf} (52%) rename mods/default/textures/{default_torch.png => default_torch_inventory.png} (100%) rename mods/default/textures/{default_torch.xcf => default_torch_inventory.xcf} (100%) create mode 100644 mods/default/textures/default_torch_overlay.png rename mods/default/textures/{default_torch_3d_animated.xcf => default_torch_overlay.xcf} (67%) diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 2f98181..30ca81c 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -1154,35 +1154,17 @@ minetest.register_node( drawtype = "nodebox", tiles = { { - name = "default_torch_3d_ends.png", - animation = { - type = "vertical_frames", - aspect_w = 16, - aspect_h = 16, - length = 1.0, - }, + name = "default_torch_ends.png", }, { - name = "default_torch_3d_ends.png", - animation = { - type = "vertical_frames", - aspect_w = 16, - aspect_h = 16, - length = 1.0, - }, + name = "default_torch_ends.png", }, { - name = "default_torch_3d.png", - animation = { - type = "vertical_frames", - aspect_w = 16, - aspect_h = 16, - length = 1.0, - }, + name = "default_torch_base.png", }, }, - inventory_image = "default_torch_dead.png", - wield_image = "default_torch_dead.png", + inventory_image = "default_torch_dead_inventory.png", + wield_image = "default_torch_dead_inventory.png", paramtype = "light", paramtype2 = "wallmounted", sunlight_propagates = true, @@ -1192,7 +1174,7 @@ minetest.register_node( 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, -0.1, -0.5+4/16, 0, 0.1}, + 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, @@ -1206,7 +1188,18 @@ minetest.register_node( drawtype = "nodebox", tiles = { { - name = "default_torch_3d_ends_animated.png", + 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, @@ -1215,7 +1208,7 @@ minetest.register_node( }, }, { - name = "default_torch_3d_ends.png", + name = "default_torch_ends_overlay.png", animation = { type = "vertical_frames", aspect_w = 16, @@ -1224,7 +1217,7 @@ minetest.register_node( }, }, { - name = "default_torch_3d_animated.png", + name = "default_torch_overlay.png", animation = { type = "vertical_frames", aspect_w = 16, @@ -1233,8 +1226,8 @@ minetest.register_node( }, }, }, - inventory_image = "default_torch.png", - wield_image = "default_torch.png", + inventory_image = "default_torch_inventory.png", + wield_image = "default_torch_inventory.png", paramtype = "light", paramtype2 = "wallmounted", sunlight_propagates = true, @@ -1245,7 +1238,7 @@ minetest.register_node( 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, -0.1, -0.5+4/16, 0, 0.1}, + 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, @@ -1259,7 +1252,18 @@ minetest.register_node( drawtype = "nodebox", tiles = { { - name = "default_torch_3d_ends_animated.png", + 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, @@ -1268,7 +1272,7 @@ minetest.register_node( }, }, { - name = "default_torch_3d_ends.png", + name = "default_torch_ends_overlay.png", animation = { type = "vertical_frames", aspect_w = 16, @@ -1277,7 +1281,7 @@ minetest.register_node( }, }, { - name = "default_torch_3d_animated.png", + name = "default_torch_overlay.png", animation = { type = "vertical_frames", aspect_w = 16, @@ -1286,19 +1290,20 @@ minetest.register_node( }, }, }, - inventory_image = "default_torch.png", - wield_image = "default_torch.png", + 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, + overlay_light_type = "glow_flicker", 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, -0.1, -0.5+4/16, 0, 0.1}, + 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, diff --git a/mods/default/textures/default_torch_3d_animated.png b/mods/default/textures/default_torch_3d_animated.png deleted file mode 100644 index 01143b98a82891c369d96d5961265fccf1d95496..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 628 zcmV-)0*n2LP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00G=dL_t(Y$L*B8YU4l@g+B|q z5d?>TF*9|@qQ;H-Ev$C^2CltNklN#ZUm#oO4V>04(of??WO1#FF$9(cH7T@(c4Un$ z8MAdxBh9(@T;}KA(=*1D07@xD1Y=AOU_PIhT5B8}Z;UBjEad2ps1|tqKP3H(@Yk?lq#{o7dt80@;>R8D zV!;hlb~a`&1%;$_u#l9UjTx!P;{kRy2H=J%fjjSyi9Xwf)|$uo*5e9Ed74SR4i^(k z8yvsfBrGNtWBmAIe9KaxXN)PEMS5RXJ%I9cS~dk;e9*OnYw$DsR^5Taa+7dreag+_ z7eaT&HnGpIS_=gL-=9_M7O&yMNUgb7uovq!jN>6=FGbD&Va0tC0aXVFgKZUfI7GOA zhrzb$wui&9@JJo=23rUi&lqe$-V0>tccQ#k;wJC95I}}0p@_gRCI852_M%b>VT#Rt zUTck@L8_ek8I#0+1#9hbtWTg+b%`SK=?6_eXxqipOwPn-esG-qYQDRC!TEukkHy47 zY`e$#(wH}6!L_1JKWLlzOCE6Q2SGE?mUzijmYd}N{2{XE)7O>#K9_)~j1gmmni5b*vcxr_#5q4VH#M(>!MP|ku_QG` zp**uBL&4qCHz2%`PaLS|lc$Sgh{y4(AsYpo4S1&9RLYq!%Z|15MuU|kb0yF6b8Mb( zo90*Jtf?aC!CW;QiHyeQQ@~2QhqldiwDUEpO%% z7H{9bX4tYeVfVrn`5GR3mYvnfh;|I;x6AKQoY%Q6)Pniv`ZG+;1s2bnW-%nl9M@U; ziH9K|Bl@TQl+>TseAh7EJZp9%a3%X0zU`eIue2FFuPYh*zN{BJaECMf?HuM)y9~w7 zDOsDuQGyiI1=G`R+x~^;qPG8w= kf0MoY?VhMp_MZ<4Ul5$Aw%TfM9?zopr0KXQTs{jB1 diff --git a/mods/default/textures/default_torch_3d.png b/mods/default/textures/default_torch_base.png similarity index 100% rename from mods/default/textures/default_torch_3d.png rename to mods/default/textures/default_torch_base.png diff --git a/mods/default/textures/default_torch_3d.xcf b/mods/default/textures/default_torch_base.xcf similarity index 100% rename from mods/default/textures/default_torch_3d.xcf rename to mods/default/textures/default_torch_base.xcf diff --git a/mods/default/textures/default_torch_dead.png b/mods/default/textures/default_torch_dead_inventory.png similarity index 100% rename from mods/default/textures/default_torch_dead.png rename to mods/default/textures/default_torch_dead_inventory.png diff --git a/mods/default/textures/default_torch_dead.xcf b/mods/default/textures/default_torch_dead_inventory.xcf similarity index 100% rename from mods/default/textures/default_torch_dead.xcf rename to mods/default/textures/default_torch_dead_inventory.xcf diff --git a/mods/default/textures/default_torch_3d_ends.png b/mods/default/textures/default_torch_ends.png similarity index 100% rename from mods/default/textures/default_torch_3d_ends.png rename to mods/default/textures/default_torch_ends.png diff --git a/mods/default/textures/default_torch_3d_ends.xcf b/mods/default/textures/default_torch_ends.xcf similarity index 100% rename from mods/default/textures/default_torch_3d_ends.xcf rename to mods/default/textures/default_torch_ends.xcf diff --git a/mods/default/textures/default_torch_ends_overlay.png b/mods/default/textures/default_torch_ends_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..696a1175e085292a36a896f808499ed7bc985334 GIT binary patch literal 448 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!3HFyJAa%3Qfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#A-jYKKew$4KMznyHZvrm#5q4VH#M&W$Yo$~E=o-- zNlj5G&n(GMaQE~LNYP7WXJBAd@pN$v@i=~Vieug(2Oih^Uz?r_3=^*t&X} z%!=++-bU}5GH3OuO;{oH)H`g^`;YSHZ^$v8cVLtdXIa2(w=eE{oY*3RjkjdE4=nzw zp)AN2!|>;G>iaY&q1AT-3!4KCCcarTcX6phxWo*Hrq9t&cRrZUb1u+hVzGjV+L;#5 zDYu*1{t2?!JY|{m{wj~tv6qsko$gjYwJVr@+qr(@!;qc1e4nd$4%_iWk9XrsTH=*dy3a^(Ruf3?(N4@=A*kC{^WgSsYs|vo@}DG zh-IIwAjM?F&_YAeXs!`SD2#mui5)Ab=^jaG1hjkgMbcBhxe+ zArLwQ!h|GER|p6oQcfKrb%aR5n{%Tdn4DS@krG8jUCn zJRJ6^_5%|vd=&wVEIp&HqXbxLMOb3Ivv?H1Y!4N%rvtv)xLVP&VQHfhRu!NYz5`4i B@k;;z delta 413 zcmbV|y-EZz6oqq>&FsQ7>w<{APP>(@BEnYY1q5F}wwq3y;1dX`rdYPOTYP}QJcG|L zKEXC_nB&P#;SbmtxSX4ud%nPZoxL4Aoy%-NHY^4hAW#b#+)Ed3XqR4fe`_ z36I6HVl+xDq2my5Ib@nPh?>sUM<0PEQfPS~T#p|z$cZD!4WK%M m96>cfHEMu%3TLAXa+=Q8JMRc`6j~W{GPz&aUkmxy64fU~XQ!0_ diff --git a/mods/default/textures/default_torch.png b/mods/default/textures/default_torch_inventory.png similarity index 100% rename from mods/default/textures/default_torch.png rename to mods/default/textures/default_torch_inventory.png diff --git a/mods/default/textures/default_torch.xcf b/mods/default/textures/default_torch_inventory.xcf similarity index 100% rename from mods/default/textures/default_torch.xcf rename to mods/default/textures/default_torch_inventory.xcf diff --git a/mods/default/textures/default_torch_overlay.png b/mods/default/textures/default_torch_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..9c4853503fa5d3b658e18bccd5ded489b9127a75 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!3HFyJAa%3Qfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#A-jYKKj&qwJO!YTY-UJAiF1B#Zfaf$kjuc}T$Gwv zlA5AWo>`Ki;O^-gkfN8$4iqo;ba4#vIR18uBi{i94whKCWBe7m_8*eJTw5WS6s_lb zW41K&v6N+7z2eq%&;6F{e(mTU?`ua7bY*Z{>r6PBxB2?y?_VZ2h;F(4XzulQasQq$ zFWwjQbEC4FOL&FN8F%*!(g|wHwF`OHERg*?kvXU)z|Z3xYw*|XH=6|FVdQ I&MBb@0Fen^)&Kwi literal 0 HcmV?d00001 diff --git a/mods/default/textures/default_torch_3d_animated.xcf b/mods/default/textures/default_torch_overlay.xcf similarity index 67% rename from mods/default/textures/default_torch_3d_animated.xcf rename to mods/default/textures/default_torch_overlay.xcf index 485da750d99e072de2a5b8e8666f058cc6d3675a..924c98efe3d6997b51cc16b9b98cfdaa8183cc45 100644 GIT binary patch delta 285 zcmdlea$IK)-y5u`Om=cpAl#;BiMY9 ZdmwhAy5k>2(Qlw5L5@ap4A>h13;<&_PE`N^ delta 407 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 delta 1997 zcmV;;2Qv8U58)4xDu3nx<^blp(PCc!000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2j2(|0u>RVk}4no00(YKL_t(&-o=@_j@-xWmu^m4P4Sf3-BA}I`@*ei-;`3L?<-_)&f!S#vh8Nh-A_@76y4-jG z45vxSx{bWqm@fR7(6yShFL z04;{t=zpZ8pn?bpa2`wngcf9p3KB2Faouq_LA{EUa@e!Etl$p1Hekvr#EM-7A>yqa z&t3oVZ&L`y$nSpp)d0{Cp8}gui*DiN89q;c{&caqM5_&A*zP_do)kAlf~nF6Ie62{ zfZ0{~E7in+rppW)mOjF0RXg!h^woslXbwGH*XSeJP5_-Ji0b;_2SoppYVA1?%inL`}glN z0Dm%qD-@o*z;Q`D0s%QQzH1@&4dvxp54=#QxLqhU50?63qWg-vKk+d)d}MKqF=?Gc zh@7Tcsw5PWdM19RWYc(4o1?}9)ECvH318?CGpCk%&0r~nNH+>%9K?DhXfe_>&B+&i z{9#X*(&a<9PplG$+%rUxgx=XN3P5Bsx_@`=8i3$W7dBFrRAS<6!Ba61QuD9`rLKQA6PXS*Yi@RRE^?wMk5qU)+VFor#Ldl33{s+k zAac6T4^kjQJdLvLDXN0|)^b@suK2gNx2ULS><3JJfwMij$}6k34V0zCcL8NSFKwj5 zBSY9UzACDPVn*)ox8qjgK|+x>e}7q>HeN|Hs~tS19;!WE6=RQo-`FIUGR+@8f6Pcd zOB0RF1ww!??+_@+o8*4rRj+pS7#+uB3g;(q^e zV2qw+rxcK(v+xF3j3F=V4JXnQA*!EGip-j=aA;scWG=w*Ff5KJvcBk*V=vl-e$3n-Q{jA)U)2AoE3GdGAO+*nzB@R8a&5SEuNY167L8AEZYkm0vB7ZlAo#kTw7kY>06DCbAdw3Chux~7tnLrd#V#;z}_~gL!ytzqNb06APQg-LW)t6n6EK-ab$esc*KfDZBU<;#v6Vx+q>Og>$a%|TEE;Ak`~B@xRQ5{G}MYZIf( fG5w7$N{;w1AowC)C)seh00000NkvXXu0mjffNRQ8 diff --git a/mods/mobs/textures/mobs_sheep.xcf b/mods/mobs/textures/mobs_sheep.xcf index 3fd8dd01a5d21421272c4cab41b063c316553565..280fc01b709270f2b664912ca51dc8ccd1212e2c 100644 GIT binary patch delta 18 ZcmX@5b4q8!Ax1`q$(1bmn~j(xL;yrF1@iy^ delta 16 XcmX@5b4q8!A;!rSECrj5m?T61J!A#)