From 9fe15c7e12e2e4a5f9e4d45df7e8d92cdcb69757 Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 16 Jun 2020 22:29:35 -0400 Subject: [PATCH] Add invisibility II brewing and correct inversion table (no such thing as slowness +). Add poison to harming inversion. Reduced splash stack max. --- mods/ITEMS/mcl_potions/init.lua | 15 +++++++++------ mods/ITEMS/mcl_potions/splash.lua | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/mods/ITEMS/mcl_potions/init.lua b/mods/ITEMS/mcl_potions/init.lua index bfb6fffbf..fd6787ec2 100644 --- a/mods/ITEMS/mcl_potions/init.lua +++ b/mods/ITEMS/mcl_potions/init.lua @@ -827,10 +827,12 @@ local output_table = { local enhancement_table = {} local extension_table = {} local potions = {} -for i, potion in ipairs({"healing","harming","swiftness","leaping","poison","regeneration"}) do - enhancement_table["mcl_potions:"..potion] = "mcl_potions:"..potion.."_2" - table.insert(potions, potion) - table.insert(potions, potion.."_2") +for i, potion in ipairs({"healing","harming","swiftness","leaping","poison","regeneration","invisibility"}) do + if potion ~= "invisibility" and potion ~= "night_vision" then + enhancement_table["mcl_potions:"..potion] = "mcl_potions:"..potion.."_2" + table.insert(potions, potion) + table.insert(potions, potion.."_2") + end if potion ~= "healing" and potion ~= "harming" then extension_table["mcl_potions:"..potion] = "mcl_potions:"..potion.."_plus" table.insert(potions, potion.."_plus") @@ -842,12 +844,13 @@ local inversion_table = { ["mcl_potions:healing"] = "mcl_potions:harming", ["mcl_potions:healing_2"] = "mcl_potions:harming_2", ["mcl_potions:swiftness"] = "mcl_potions:slowness", - ["mcl_potions:swiftness_2"] = "mcl_potions:slowness_plus", ["mcl_potions:swiftness_plus"] = "mlc_potions:slowness_plus", ["mcl_potions:leaping"] = "mcl_potions:slowness", - ["mcl_potions:leaping_2"] = "mcl_potions:slowness_plus", ["mcl_potions:leaping_plus"] = "mcl_potions:slowness_plus", ["mcl_potions:night_vision"] = "mcl_potions:invisibility", + ["mcl_potions:night_vision_plus"] = "mcl_potions:invisibility_plus", + ["mcl_potions:poison"] = "mcl_potions:harming", + ["mcl_potions:poison_2"] = "mcl_potions:harming_2", } diff --git a/mods/ITEMS/mcl_potions/splash.lua b/mods/ITEMS/mcl_potions/splash.lua index bffb8b349..19eea39f6 100644 --- a/mods/ITEMS/mcl_potions/splash.lua +++ b/mods/ITEMS/mcl_potions/splash.lua @@ -22,7 +22,7 @@ local function register_splash(name, descr, color, def) itemstack:take_item() return itemstack end, - stack_max = 100, -- increased stack to test throwing + stack_max = 1, }) local w = 0.7 @@ -59,7 +59,7 @@ local function register_splash(name, descr, color, def) }) self.object:remove() for i, obj in ipairs(minetest.get_objects_inside_radius(pos, 4)) do - + if minetest.is_player(obj) then pos2 = obj:get_pos()