From 9f5bce29cb7ed8fc71b174368227e065d57b56cb Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 18 Jun 2020 12:27:09 -0400 Subject: [PATCH] Add more lingering options. Adjust lingering cloud size. --- mods/ITEMS/mcl_potions/init.lua | 8 ++++---- mods/ITEMS/mcl_potions/lingering.lua | 16 ++++++++-------- mods/ITEMS/mcl_potions/splash.lua | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mods/ITEMS/mcl_potions/init.lua b/mods/ITEMS/mcl_potions/init.lua index 9113721211..e782b43e86 100644 --- a/mods/ITEMS/mcl_potions/init.lua +++ b/mods/ITEMS/mcl_potions/init.lua @@ -367,11 +367,11 @@ for i, potion in ipairs(potions) do lingering_table["mcl_potions:"..potion.."_splash"] = "mcl_potions:"..potion.."_lingering" end -splash_table["mcl_potions:water"] = "mcl_potions:water_splash" -splash_table["mcl_potions:river_water"] = "mcl_potions:river_water_splash" +for i, potion in ipairs({"awkward", "mundane", "thick", "water", "river_water"}) do + splash_table["mcl_potions:"..potion] = "mcl_potions:"..potion.."_splash" + lingering_table["mcl_potions:"..potion.."_splash"] = "mcl_potions:"..potion.."_lingering" +end -lingering_table["mcl_potions:water_splash"] = "mcl_potions:lingering" -lingering_table["mcl_potions:river_water_splash"] = "mcl_potions:lingering" local mod_table = { ["mesecons:wire_00000000_off"] = extension_table, diff --git a/mods/ITEMS/mcl_potions/lingering.lua b/mods/ITEMS/mcl_potions/lingering.lua index cb48464e04..053601d41d 100644 --- a/mods/ITEMS/mcl_potions/lingering.lua +++ b/mods/ITEMS/mcl_potions/lingering.lua @@ -41,19 +41,19 @@ local function register_lingering(name, descr, color, def) if n ~= "air" then minetest.sound_play("mcl_potions_breaking_glass") minetest.add_particlespawner({ - amount = 100, + amount = 1000, time = 30, - minpos = {x=pos.x-d, y=pos.y, z=pos.z-d}, - maxpos = {x=pos.x+d, y=pos.y+1, z=pos.z+d}, + minpos = {x=pos.x-d, y=pos.y+0.5, z=pos.z-d}, + maxpos = {x=pos.x+d, y=pos.y+d, z=pos.z+d}, minvel = {x=-0.5, y=0, z=-0.5}, maxvel = {x=0.5, y=0.5, z=0.5}, - minacc = {x=-0.25, y=0, z=-0.25}, - maxacc = {x=0.25, y=.1, z=0.25}, + minacc = {x=-0.2, y=0, z=-0.2}, + maxacc = {x=0.2, y=.05, z=0.2}, minexptime = 1, maxexptime = 5, minsize = 2, maxsize = 4, - collisiondetection = false, + collisiondetection = true, vertical = false, texture = "mcl_potions_sprite.png^[colorize:"..color..":127", }) @@ -74,11 +74,11 @@ local function register_lingering(name, descr, color, def) }) end -register_lingering("water", "Lingering Water", "#0000FF", { +register_lingering("water", "Lingering Potion", "#0000FF", { potion_fun = function(player, redx) end, }) -register_lingering("river_water", "Lingering River Water", "#0000FF", { +register_lingering("river_water", "Lingering Potion", "#0000FF", { potion_fun = function(player, redx) end, }) diff --git a/mods/ITEMS/mcl_potions/splash.lua b/mods/ITEMS/mcl_potions/splash.lua index 104f5f51d6..e4576f0bcb 100644 --- a/mods/ITEMS/mcl_potions/splash.lua +++ b/mods/ITEMS/mcl_potions/splash.lua @@ -41,10 +41,10 @@ local function register_splash(name, descr, color, def) if n ~= "air" then minetest.sound_play("mcl_potions_breaking_glass") minetest.add_particlespawner({ - amount = 40, + amount = 50, time = 2, - minpos = {x=pos.x-d, y=pos.y, z=pos.z-d}, - maxpos = {x=pos.x+d, y=pos.y+1, z=pos.z+d}, + minpos = {x=pos.x-d, y=pos.y+0.5, z=pos.z-d}, + maxpos = {x=pos.x+d, y=pos.y+d, z=pos.z+d}, minvel = {x=-1, y=0, z=-1}, maxvel = {x=1, y=0.5, z=1}, minacc = {x=-0.5, y=0, z=-0.5}, @@ -53,7 +53,7 @@ local function register_splash(name, descr, color, def) maxexptime = 5, minsize = 2, maxsize = 4, - collisiondetection = false, + collisiondetection = true, vertical = false, texture = "mcl_potions_sprite.png^[colorize:"..color..":127", })