Merge (latest playerplus)

This commit is contained in:
kay27 2021-04-26 00:15:57 +00:00
commit 51ebe823b0

@ -1,5 +1,7 @@
local S = minetest.get_translator("mcl_fireworks") local S = minetest.get_translator("mcl_fireworks")
player_rocketing = {}
local help = S("Flight Duration:") local help = S("Flight Duration:")
local description = S("Firework Rocket") local description = S("Firework Rocket")
local rocket_sound = function() local rocket_sound = function()
@ -12,13 +14,17 @@ minetest.register_craftitem("mcl_fireworks:rocket_1", {
inventory_image = "mcl_fireworks_rocket.png", inventory_image = "mcl_fireworks_rocket.png",
stack_max = 64, stack_max = 64,
on_use = function(itemstack, user, pointed_thing) on_use = function(itemstack, user, pointed_thing)
itemstack:take_item() local torso = user:get_inventory():get_stack("armor", 3)
local torso = user:get_inventory():get_stack("armor", 3) if torso and torso:get_name() == "mcl_armor:elytra" and player_rocketing[user] ~= true then
if torso and torso:get_name() == "mcl_armor:elytra" then player_rocketing[user] = true
user:add_player_velocity(vector.multiply(user:get_look_dir(), 20)) minetest.after(2.2, function()
rocket_sound() player_rocketing[user] = false
end end)
return itemstack itemstack:take_item()
--user:add_player_velocity(vector.multiply(user:get_look_dir(), 20))
rocket_sound()
end
return itemstack
end, end,
}) })
@ -28,13 +34,17 @@ minetest.register_craftitem("mcl_fireworks:rocket_2", {
inventory_image = "mcl_fireworks_rocket.png", inventory_image = "mcl_fireworks_rocket.png",
stack_max = 64, stack_max = 64,
on_use = function(itemstack, user, pointed_thing) on_use = function(itemstack, user, pointed_thing)
itemstack:take_item() local torso = user:get_inventory():get_stack("armor", 3)
local torso = user:get_inventory():get_stack("armor", 3) if torso and torso:get_name() == "mcl_armor:elytra" and player_rocketing[user] ~= true then
if torso and torso:get_name() == "mcl_armor:elytra" then player_rocketing[user] = true
user:add_player_velocity(vector.multiply(user:get_look_dir(), 30)) minetest.after(4.5, function()
rocket_sound() player_rocketing[user] = false
end end)
return itemstack itemstack:take_item()
--user:add_player_velocity(vector.multiply(user:get_look_dir(), 20))
rocket_sound()
end
return itemstack
end, end,
}) })
@ -43,13 +53,17 @@ minetest.register_craftitem("mcl_fireworks:rocket_3", {
_tt_help = help.." 3", _tt_help = help.." 3",
inventory_image = "mcl_fireworks_rocket.png", inventory_image = "mcl_fireworks_rocket.png",
stack_max = 64, stack_max = 64,
on_use = function(itemstack, user, pointed_thing, player) on_use = function(itemstack, user, pointed_thing)
itemstack:take_item() local torso = user:get_inventory():get_stack("armor", 3)
local torso = user:get_inventory():get_stack("armor", 3) if torso and torso:get_name() == "mcl_armor:elytra" and player_rocketing[user] ~= true then
if torso and torso:get_name() == "mcl_armor:elytra" then player_rocketing[user] = true
user:add_player_velocity(vector.multiply(user:get_look_dir(), 40)) minetest.after(6, function()
rocket_sound() player_rocketing[user] = false
end end)
return itemstack itemstack:take_item()
--user:add_player_velocity(vector.multiply(user:get_look_dir(), 20))
rocket_sound()
end
return itemstack
end, end,
}) })