forked from VoxeLibre/VoxeLibre
make lingering potions activate target (+ indentation fix)
This commit is contained in:
parent
1a1c592452
commit
fb35af4dba
|
|
@ -1,5 +1,7 @@
|
||||||
local S = minetest.get_translator(minetest.get_current_modname())
|
local S = minetest.get_translator(minetest.get_current_modname())
|
||||||
|
|
||||||
|
local mod_target = minetest.get_modpath("mcl_target")
|
||||||
|
|
||||||
local function lingering_image(colorstring, opacity)
|
local function lingering_image(colorstring, opacity)
|
||||||
if not opacity then
|
if not opacity then
|
||||||
opacity = 127
|
opacity = 127
|
||||||
|
|
@ -95,71 +97,74 @@ function mcl_potions.register_lingering(name, descr, color, def)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
minetest.register_craftitem(id, {
|
minetest.register_craftitem(id, {
|
||||||
description = descr,
|
description = descr,
|
||||||
_tt_help = def.tt,
|
_tt_help = def.tt,
|
||||||
_doc_items_longdesc = longdesc,
|
_doc_items_longdesc = longdesc,
|
||||||
_doc_items_usagehelp = S("Use the “Punch” key to throw it."),
|
_doc_items_usagehelp = S("Use the “Punch” key to throw it."),
|
||||||
inventory_image = lingering_image(color),
|
inventory_image = lingering_image(color),
|
||||||
groups = {brewitem=1, not_in_creative_inventory=0},
|
groups = {brewitem=1, not_in_creative_inventory=0},
|
||||||
on_use = function(item, placer, pointed_thing)
|
on_use = function(item, placer, pointed_thing)
|
||||||
local velocity = 10
|
local velocity = 10
|
||||||
local dir = placer:get_look_dir();
|
local dir = placer:get_look_dir();
|
||||||
local pos = placer:getpos();
|
local pos = placer:getpos();
|
||||||
minetest.sound_play("mcl_throwing_throw", {pos = pos, gain = 0.4, max_hear_distance = 16}, true)
|
minetest.sound_play("mcl_throwing_throw", {pos = pos, gain = 0.4, max_hear_distance = 16}, true)
|
||||||
local obj = minetest.add_entity({x=pos.x+dir.x,y=pos.y+2+dir.y,z=pos.z+dir.z}, id.."_flying")
|
local obj = minetest.add_entity({x=pos.x+dir.x,y=pos.y+2+dir.y,z=pos.z+dir.z}, id.."_flying")
|
||||||
obj:setvelocity({x=dir.x*velocity,y=dir.y*velocity,z=dir.z*velocity})
|
obj:setvelocity({x=dir.x*velocity,y=dir.y*velocity,z=dir.z*velocity})
|
||||||
obj:setacceleration({x=dir.x*-3, y=-9.8, z=dir.z*-3})
|
obj:setacceleration({x=dir.x*-3, y=-9.8, z=dir.z*-3})
|
||||||
obj:get_luaentity()._thrower = placer:get_player_name()
|
obj:get_luaentity()._thrower = placer:get_player_name()
|
||||||
if not minetest.is_creative_enabled(placer:get_player_name()) then
|
if not minetest.is_creative_enabled(placer:get_player_name()) then
|
||||||
item:take_item()
|
item:take_item()
|
||||||
|
end
|
||||||
|
return item
|
||||||
|
end,
|
||||||
|
stack_max = 1,
|
||||||
|
_on_dispense = function(stack, dispenserpos, droppos, dropnode, dropdir)
|
||||||
|
local s_pos = vector.add(dispenserpos, vector.multiply(dropdir, 0.51))
|
||||||
|
local pos = {x=s_pos.x+dropdir.x,y=s_pos.y+dropdir.y,z=s_pos.z+dropdir.z}
|
||||||
|
minetest.sound_play("mcl_throwing_throw", {pos = pos, gain = 0.4, max_hear_distance = 16}, true)
|
||||||
|
local obj = minetest.add_entity(pos, id.."_flying")
|
||||||
|
local velocity = 22
|
||||||
|
obj:set_velocity({x=dropdir.x*velocity,y=dropdir.y*velocity,z=dropdir.z*velocity})
|
||||||
|
obj:set_acceleration({x=dropdir.x*-3, y=-9.8, z=dropdir.z*-3})
|
||||||
end
|
end
|
||||||
return item
|
})
|
||||||
end,
|
|
||||||
stack_max = 1,
|
|
||||||
_on_dispense = function(stack, dispenserpos, droppos, dropnode, dropdir)
|
|
||||||
local s_pos = vector.add(dispenserpos, vector.multiply(dropdir, 0.51))
|
|
||||||
local pos = {x=s_pos.x+dropdir.x,y=s_pos.y+dropdir.y,z=s_pos.z+dropdir.z}
|
|
||||||
minetest.sound_play("mcl_throwing_throw", {pos = pos, gain = 0.4, max_hear_distance = 16}, true)
|
|
||||||
local obj = minetest.add_entity(pos, id.."_flying")
|
|
||||||
local velocity = 22
|
|
||||||
obj:set_velocity({x=dropdir.x*velocity,y=dropdir.y*velocity,z=dropdir.z*velocity})
|
|
||||||
obj:set_acceleration({x=dropdir.x*-3, y=-9.8, z=dropdir.z*-3})
|
|
||||||
end
|
|
||||||
})
|
|
||||||
|
|
||||||
local w = 0.7
|
local w = 0.7
|
||||||
|
|
||||||
minetest.register_entity(id.."_flying",{
|
minetest.register_entity(id.."_flying",{
|
||||||
textures = {lingering_image(color)},
|
textures = {lingering_image(color)},
|
||||||
hp_max = 1,
|
hp_max = 1,
|
||||||
visual_size = {x=w/2,y=w/2},
|
visual_size = {x=w/2,y=w/2},
|
||||||
collisionbox = {-0.1,-0.1,-0.1,0.1,0.1,0.1},
|
collisionbox = {-0.1,-0.1,-0.1,0.1,0.1,0.1},
|
||||||
pointable = false,
|
pointable = false,
|
||||||
on_step = function(self, dtime)
|
on_step = function(self, dtime)
|
||||||
local pos = self.object:get_pos()
|
local pos = self.object:get_pos()
|
||||||
local node = minetest.get_node(pos)
|
local node = minetest.get_node(pos)
|
||||||
local n = node.name
|
local n = node.name
|
||||||
local g = minetest.get_item_group(n, "liquid")
|
local g = minetest.get_item_group(n, "liquid")
|
||||||
local d = 4
|
local d = 4
|
||||||
if n ~= "air" and n ~= "mcl_portals:portal" and n ~= "mcl_portals:portal_end" and g == 0 or mcl_potions.is_obj_hit(self, pos) then
|
if mod_target and n == "mcl_target:target_off" then
|
||||||
minetest.sound_play("mcl_potions_breaking_glass", {pos = pos, max_hear_distance = 16, gain = 1})
|
mcl_target.hit(vector.round(pos), 0.4) --4 redstone ticks
|
||||||
add_lingering_effect(pos, color, def, name == "water")
|
end
|
||||||
local texture
|
if n ~= "air" and n ~= "mcl_portals:portal" and n ~= "mcl_portals:portal_end" and g == 0 or mcl_potions.is_obj_hit(self, pos) then
|
||||||
if name == "water" then
|
minetest.sound_play("mcl_potions_breaking_glass", {pos = pos, max_hear_distance = 16, gain = 1})
|
||||||
texture = "mcl_particles_droplet_bottle.png"
|
add_lingering_effect(pos, color, def, name == "water")
|
||||||
else
|
local texture
|
||||||
if def.instant then
|
if name == "water" then
|
||||||
texture = "mcl_particles_instant_effect.png"
|
texture = "mcl_particles_droplet_bottle.png"
|
||||||
else
|
else
|
||||||
texture = "mcl_particles_effect.png"
|
if def.instant then
|
||||||
|
texture = "mcl_particles_instant_effect.png"
|
||||||
|
else
|
||||||
|
texture = "mcl_particles_effect.png"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
linger_particles(pos, d, texture, color)
|
||||||
|
if name == "water" then
|
||||||
|
mcl_potions._extinguish_nearby_fire(pos, d)
|
||||||
|
end
|
||||||
|
self.object:remove()
|
||||||
end
|
end
|
||||||
linger_particles(pos, d, texture, color)
|
end,
|
||||||
if name == "water" then
|
})
|
||||||
mcl_potions._extinguish_nearby_fire(pos, d)
|
|
||||||
end
|
|
||||||
self.object:remove()
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue