diff --git a/mods/ITEMS/mcl_bows/models/mcl_bows_arrow.obj b/mods/ITEMS/mcl_bows/models/mcl_bows_arrow.obj index 09b37852b..8530efa78 100644 --- a/mods/ITEMS/mcl_bows/models/mcl_bows_arrow.obj +++ b/mods/ITEMS/mcl_bows/models/mcl_bows_arrow.obj @@ -2,26 +2,26 @@ # www.blender.org mtllib mcl_bows_arrow.mtl o Plane -v 3.782006 -1.443249 -0.000500 -v 3.782006 1.444249 -0.000500 -v -3.782006 1.444249 -0.000500 -v -3.782006 -1.443249 -0.000500 -v -3.331104 1.069925 -1.085017 -v -3.331104 -1.100076 -1.085017 -v -3.331104 1.069925 1.064829 -v -3.331104 -1.100076 1.064829 -v -3.782006 0.001000 -1.443749 -v -3.782006 0.001000 1.443749 -v 3.782006 0.001000 1.443749 -v 3.782006 0.001000 -1.443749 -v -3.782006 0.000000 1.443749 -v -3.782006 0.000000 -1.443749 -v 3.782006 0.000000 -1.443749 -v 3.782006 0.000000 1.443749 -v -3.782006 1.444249 0.000500 v -3.782006 -1.443249 0.000500 -v 3.782006 -1.443249 0.000500 +v -3.782006 1.444249 0.000500 v 3.782006 1.444249 0.000500 +v 3.782006 -1.443249 0.000500 +v 3.331104 1.069925 1.085017 +v 3.331104 -1.100076 1.085017 +v 3.331104 1.069925 -1.064830 +v 3.331104 -1.100076 -1.064829 +v 3.782006 0.001000 1.443749 +v 3.782006 0.001000 -1.443750 +v -3.782006 0.001000 -1.443749 +v -3.782006 0.001000 1.443750 +v 3.782006 0.000000 -1.443750 +v 3.782006 0.000000 1.443749 +v -3.782006 0.000000 1.443750 +v -3.782006 0.000000 -1.443749 +v 3.782006 1.444249 -0.000500 +v 3.782006 -1.443249 -0.000500 +v -3.782006 -1.443249 -0.000500 +v -3.782006 1.444249 -0.000500 vt 0.000000 0.300000 vt 0.000000 0.700000 vt 1.000000 0.700000 @@ -42,10 +42,10 @@ vt 0.000000 0.300000 vt 0.000000 0.700000 vt 1.000000 0.700000 vt 1.000000 0.300000 -vn 0.0000 -0.0000 1.0000 -vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn 1.0000 -0.0000 0.0000 vn 0.0000 1.0000 0.0000 -vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 vn 0.0000 -1.0000 0.0000 usemtl Material.002 s off diff --git a/mods/ITEMS/mcl_bows/textures/mcl_bows_arrow.png b/mods/ITEMS/mcl_bows/textures/mcl_bows_arrow.png index 69267d098..244405288 100644 Binary files a/mods/ITEMS/mcl_bows/textures/mcl_bows_arrow.png and b/mods/ITEMS/mcl_bows/textures/mcl_bows_arrow.png differ diff --git a/mods/ITEMS/mcl_bows/textures/mcl_bows_arrow_overlay.png b/mods/ITEMS/mcl_bows/textures/mcl_bows_arrow_overlay.png index 2ca26c58a..a043eb37e 100644 Binary files a/mods/ITEMS/mcl_bows/textures/mcl_bows_arrow_overlay.png and b/mods/ITEMS/mcl_bows/textures/mcl_bows_arrow_overlay.png differ diff --git a/mods/ITEMS/mcl_potions/tipped_arrow.lua b/mods/ITEMS/mcl_potions/tipped_arrow.lua index 2853487c9..860019e8a 100644 --- a/mods/ITEMS/mcl_potions/tipped_arrow.lua +++ b/mods/ITEMS/mcl_potions/tipped_arrow.lua @@ -100,9 +100,10 @@ function mcl_potions.register_arrow(name, desc, color, def) local ARROW_ENTITY={ physical = true, - visual = "wielditem", - visual_size = {x=0.4, y=0.4}, - textures = {"mcl_potions:"..name.."_arrow_box"}, + visual = "mesh", + mesh = "mcl_bows_arrow.obj", + visual_size = {x=1, y=1}, + textures = arrow_image(color, 100), collisionbox = {-0.19, -0.125, -0.19, 0.19, 0.125, 0.19}, collide_with_objects = false, @@ -177,6 +178,26 @@ function mcl_potions.register_arrow(name, desc, color, def) -- Check for object "collision". Done every tick (hopefully this is not too stressing) else + + if self._damage == 10 or self._damage == 9 then + minetest.add_particlespawner({ + amount = 1, + time = .001, + minpos = pos, + maxpos = pos, + minvel = vector.new(-0.1,-0.1,-0.1), + maxvel = vector.new(0.1,0.1,0.1), + minexptime = 0.5, + maxexptime = 0.5, + minsize = 2, + maxsize = 2, + collisiondetection = false, + vertical = false, + texture = "mobs_mc_arrow_particle.png", + glow = 1, + }) + end + -- We just check for any hurtable objects nearby. -- The radius of 3 is fairly liberal, but anything lower than than will cause -- arrow to hilariously go through mobs often.