mirror of
https://github.com/sys4-fr/server-nalc.git
synced 2025-02-04 14:20:16 +01:00
Fix player_effects call from witchcraft mod
Reindent code
This commit is contained in:
sys4-fr
parent
f44faa23f1
commit
1071331ebe
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,8 @@
|
||||
--scrolls
|
||||
|
||||
|
||||
minetest.register_craftitem("witchcraft:scroll_day", {
|
||||
minetest.register_craftitem(
|
||||
"witchcraft:scroll_day",
|
||||
{
|
||||
description = "Scroll of day",
|
||||
inventory_image = "witchcraft_scroll.png^witchcraft_sun_over.png",
|
||||
stack_max = 1,
|
||||
@ -12,7 +13,9 @@ minetest.register_craftitem("witchcraft:scroll_day", {
|
||||
end,
|
||||
})
|
||||
|
||||
minetest.register_craftitem("witchcraft:scroll_night", {
|
||||
minetest.register_craftitem(
|
||||
"witchcraft:scroll_night",
|
||||
{
|
||||
description = "Scroll of night",
|
||||
inventory_image = "witchcraft_scroll.png^witchcraft_moon_over.png",
|
||||
stack_max = 1,
|
||||
@ -24,7 +27,9 @@ minetest.register_craftitem("witchcraft:scroll_night", {
|
||||
})
|
||||
|
||||
if minetest.get_modpath("pmobs") then
|
||||
minetest.register_craftitem("witchcraft:scroll_wild", {
|
||||
minetest.register_craftitem(
|
||||
"witchcraft:scroll_wild",
|
||||
{
|
||||
description = "Scroll of Wild",
|
||||
inventory_image = "witchcraft_scroll.png^witchcraft_dark_over.png",
|
||||
stack_max = 1,
|
||||
@ -37,17 +42,27 @@ minetest.register_craftitem("witchcraft:scroll_wild", {
|
||||
})
|
||||
end
|
||||
|
||||
minetest.register_craftitem("witchcraft:scroll_fireball", {
|
||||
minetest.register_craftitem(
|
||||
"witchcraft:scroll_fireball",
|
||||
{
|
||||
description = "Scroll of fireball",
|
||||
inventory_image = "witchcraft_scroll.png^witchcraft_fire_over.png",
|
||||
stack_max = 1,
|
||||
on_use = function(item, placer, pos)
|
||||
local dir = placer:get_look_dir();
|
||||
local playerpos = placer:getpos();
|
||||
local obj = minetest.add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:fireball")
|
||||
local obj2 = minetest.add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:fireball")
|
||||
local obj3 = minetest.add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:fireball")
|
||||
local obj4 = minetest.add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:fireball")
|
||||
local obj = minetest.add_entity(
|
||||
{x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z},
|
||||
"witchcraft:fireball")
|
||||
local obj2 = minetest.add_entity(
|
||||
{x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z},
|
||||
"witchcraft:fireball")
|
||||
local obj3 = minetest.add_entity(
|
||||
{x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z},
|
||||
"witchcraft:fireball")
|
||||
local obj4 = minetest.add_entity(
|
||||
{x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z},
|
||||
"witchcraft:fireball")
|
||||
obj2:setvelocity({x=dir.x*7+0.5,y=dir.y*7,z=dir.z*7+0.5})
|
||||
obj3:setvelocity({x=dir.x*7-0.5,y=dir.y*7,z=dir.z*7-0.5})
|
||||
obj4:setvelocity({x=dir.x*7,y=dir.y*7-0.5,z=dir.z*7})
|
||||
@ -58,7 +73,9 @@ minetest.register_craftitem("witchcraft:scroll_fireball", {
|
||||
})
|
||||
|
||||
if minetest.get_modpath("lightning") then
|
||||
minetest.register_craftitem("witchcraft:scroll_lightning", {
|
||||
minetest.register_craftitem(
|
||||
"witchcraft:scroll_lightning",
|
||||
{
|
||||
description = "Scroll of lightning",
|
||||
inventory_image = "witchcraft_scroll.png^witchcraft_thunder_over.png",
|
||||
stack_max = 1,
|
||||
@ -72,7 +89,9 @@ minetest.register_craftitem("witchcraft:scroll_lightning", {
|
||||
})
|
||||
end
|
||||
|
||||
minetest.register_craftitem("witchcraft:scroll_icicle", {
|
||||
minetest.register_craftitem(
|
||||
"witchcraft:scroll_icicle",
|
||||
{
|
||||
description = "Scroll of icicle",
|
||||
inventory_image = "witchcraft_scroll.png^witchcraft_ice_over.png",
|
||||
stack_max = 1,
|
||||
@ -92,8 +111,9 @@ minetest.register_craftitem("witchcraft:scroll_icicle", {
|
||||
end,
|
||||
})
|
||||
|
||||
|
||||
minetest.register_craftitem("witchcraft:scroll_nature", {
|
||||
minetest.register_craftitem(
|
||||
"witchcraft:scroll_nature",
|
||||
{
|
||||
description = "Scroll of nature",
|
||||
inventory_image = "witchcraft_scroll.png^witchcraft_leaf_over.png",
|
||||
stack_max = 1,
|
||||
@ -109,26 +129,29 @@ minetest.register_craftitem("witchcraft:scroll_nature", {
|
||||
end,
|
||||
})
|
||||
|
||||
minetest.register_craftitem("witchcraft:scroll", {
|
||||
minetest.register_craftitem(
|
||||
"witchcraft:scroll",
|
||||
{
|
||||
description = "Blank Scroll",
|
||||
inventory_image = "witchcraft_scroll.png",
|
||||
})
|
||||
|
||||
minetest.register_craftitem("witchcraft:scroll_recipe", {
|
||||
minetest.register_craftitem(
|
||||
"witchcraft:scroll_recipe",
|
||||
{
|
||||
description = "Recipe Scroll",
|
||||
inventory_image = "witchcraft_scroll.png^witchcraft_writing_over.png",
|
||||
on_use = function(itemstack, user, pointed_thing)
|
||||
|
||||
local formspec = "size[10,9]"..
|
||||
"background[-0.6,-0.5;11.5,10.4;witchcraft_recipes.png]";
|
||||
|
||||
minetest.show_formspec(user:get_player_name(), "witchcraft:scroll", formspec);
|
||||
|
||||
end,
|
||||
})
|
||||
|
||||
if minetest.get_modpath("pmobs")then
|
||||
minetest.register_craft({
|
||||
minetest.register_craft(
|
||||
{
|
||||
output = 'witchcraft:scroll_wild',
|
||||
recipe = {
|
||||
{'mobs:meat_raw'},
|
||||
@ -138,7 +161,8 @@ minetest.register_craft({
|
||||
|
||||
end
|
||||
|
||||
minetest.register_craft({
|
||||
minetest.register_craft(
|
||||
{
|
||||
output = 'witchcraft:scroll',
|
||||
recipe = {
|
||||
{'default:paper', 'default:paper', ''},
|
||||
@ -146,7 +170,8 @@ minetest.register_craft({
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
minetest.register_craft(
|
||||
{
|
||||
output = 'witchcraft:scroll_recipe',
|
||||
recipe = {
|
||||
{'dye:black'},
|
||||
@ -154,7 +179,8 @@ minetest.register_craft({
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
minetest.register_craft(
|
||||
{
|
||||
output = 'witchcraft:scroll_icicle',
|
||||
recipe = {
|
||||
{'default:ice'},
|
||||
@ -163,7 +189,8 @@ minetest.register_craft({
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
minetest.register_craft(
|
||||
{
|
||||
output = 'witchcraft:scroll_fireball',
|
||||
recipe = {
|
||||
{'default:obsidian_shard'},
|
||||
@ -172,7 +199,8 @@ minetest.register_craft({
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
minetest.register_craft(
|
||||
{
|
||||
output = 'witchcraft:scroll_nature',
|
||||
recipe = {
|
||||
{'default:leaves'},
|
||||
@ -181,7 +209,8 @@ minetest.register_craft({
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
minetest.register_craft(
|
||||
{
|
||||
output = 'witchcraft:scroll_day',
|
||||
recipe = {
|
||||
{'default:torch'},
|
||||
@ -190,7 +219,8 @@ minetest.register_craft({
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
minetest.register_craft(
|
||||
{
|
||||
output = 'witchcraft:scroll_night',
|
||||
recipe = {
|
||||
{'default:coal_lump'},
|
||||
@ -200,7 +230,8 @@ minetest.register_craft({
|
||||
})
|
||||
|
||||
|
||||
minetest.register_craft({
|
||||
minetest.register_craft(
|
||||
{
|
||||
output = 'witchcraft:scroll_lightning',
|
||||
recipe = {
|
||||
{'default:steel_ingot'},
|
||||
@ -209,24 +240,32 @@ minetest.register_craft({
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
--scroll powers
|
||||
|
||||
minetest.register_entity("witchcraft:fireball", {
|
||||
minetest.register_entity(
|
||||
"witchcraft:fireball",
|
||||
{
|
||||
textures = {"tnt_boom.png"},
|
||||
velocity = 0.1,
|
||||
damage = 2,
|
||||
collisionbox = {0, 0, 0, 0, 0, 0},
|
||||
on_step = function(self, obj, pos)
|
||||
local remove = minetest.after(2, function()
|
||||
local remove = minetest.after(
|
||||
2,
|
||||
function()
|
||||
self.object:remove()
|
||||
end)
|
||||
local pos = self.object:getpos()
|
||||
local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
|
||||
for k, obj in pairs(objs) do
|
||||
if obj:get_luaentity() ~= nil then
|
||||
if obj:get_luaentity().name ~= "witchcraft:fireball" and obj:get_luaentity().name ~= "__builtin:item" then
|
||||
obj:punch(self.object, 1.0, {
|
||||
if obj:get_luaentity().name ~= "witchcraft:fireball"
|
||||
and obj:get_luaentity().name ~= "__builtin:item"
|
||||
and obj:get_luaentity().name ~= "gauges:hp_bar"
|
||||
then
|
||||
obj:punch(
|
||||
self.object, 1.0,
|
||||
{
|
||||
full_punch_interval=1.0,
|
||||
damage_groups={fleshy=3},
|
||||
}, nil)
|
||||
@ -240,7 +279,8 @@ minetest.register_entity("witchcraft:fireball", {
|
||||
local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz}
|
||||
local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
|
||||
local n = minetest.get_node(p).name
|
||||
if n ~= "witchcraft:fireball" and n ~="default:dirt_with_grass" and n ~="default:dirt_with_dry_grass" and n ~="default:stone" then
|
||||
if n ~= "witchcraft:fireball" and n ~="default:dirt_with_grass"
|
||||
and n ~="default:dirt_with_dry_grass" and n ~="default:stone" then
|
||||
if minetest.registered_nodes[n].groups.flammable --[[or math.random(1, 100) <= 1]] then
|
||||
minetest.set_node(t, {name="fire:basic_flame"})
|
||||
self.object:remove()
|
||||
@ -293,20 +333,27 @@ minetest.register_entity("witchcraft:fireball", {
|
||||
|
||||
|
||||
|
||||
minetest.register_entity("witchcraft:tree", {
|
||||
minetest.register_entity(
|
||||
"witchcraft:tree",
|
||||
{
|
||||
textures = {"witchcraft_skin.png"},
|
||||
velocity = 1,
|
||||
damage = 2,
|
||||
collisionbox = {0, 0, 0, 0, 0, 0},
|
||||
on_step = function(self, obj, pos)
|
||||
local remove = minetest.after(2, function()
|
||||
local remove = minetest.after(
|
||||
2,
|
||||
function()
|
||||
self.object:remove()
|
||||
end)
|
||||
local pos = self.object:getpos()
|
||||
local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
|
||||
for k, obj in pairs(objs) do
|
||||
if obj:get_luaentity() ~= nil then
|
||||
if obj:get_luaentity().name ~= "witchcraft:tree" and obj:get_luaentity().name ~= "__builtin:item" then
|
||||
if obj:get_luaentity().name ~= "witchcraft:tree"
|
||||
and obj:get_luaentity().name ~= "__builtin:item"
|
||||
and obj:get_luaentity().name ~= "gauges:hp_bar"
|
||||
then
|
||||
obj:remove()
|
||||
local treepos = self.object:getpos()
|
||||
default.grow_new_jungle_tree(treepos)
|
||||
@ -358,7 +405,9 @@ minetest.register_entity("witchcraft:tree", {
|
||||
end,
|
||||
})
|
||||
|
||||
minetest.register_entity("witchcraft:ice", {
|
||||
minetest.register_entity(
|
||||
"witchcraft:ice",
|
||||
{
|
||||
visual="sprite",
|
||||
visual_size={x=1,y=1},
|
||||
physical=false,
|
||||
@ -376,8 +425,13 @@ minetest.register_entity("witchcraft:ice", {
|
||||
local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
|
||||
for k, obj in pairs(objs) do
|
||||
if obj:get_luaentity() ~= nil then
|
||||
if obj:get_luaentity().name ~= "witchcraft:ice" and obj:get_luaentity().name ~= "__builtin:item" then
|
||||
obj:punch(self.object, 1.0, {
|
||||
if obj:get_luaentity().name ~= "witchcraft:ice"
|
||||
and obj:get_luaentity().name ~= "__builtin:item"
|
||||
and obj:get_luaentity().name ~= "gauges:hp_bar"
|
||||
then
|
||||
obj:punch(
|
||||
self.object, 1.0,
|
||||
{
|
||||
full_punch_interval=1.0,
|
||||
damage_groups={fleshy=1},
|
||||
}, nil)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user