Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity

Add invisibility II brewing and correct inversion table (no such thing as slowness +). Add poison to harming inversion. Reduced splash stack max.

objects
Brandon 2020-06-16 22:29:35 -04:00
parent 54c1be724d
commit 9fe15c7e12
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mods/ITEMS/mcl_potions/init.lua
View File

@ -827,10 +827,12 @@ local output_table = {
local enhancement_table = {} local enhancement_table = {}
local extension_table = {} local extension_table = {}
local potions = {} local potions = {}
for i, potion in ipairs({"healing","harming","swiftness","leaping","poison","regeneration"}) do for i, potion in ipairs({"healing","harming","swiftness","leaping","poison","regeneration","invisibility"}) do
enhancement_table["mcl_potions:"..potion] = "mcl_potions:"..potion.."_2" if potion ~= "invisibility" and potion ~= "night_vision" then
table.insert(potions, potion) enhancement_table["mcl_potions:"..potion] = "mcl_potions:"..potion.."_2"
table.insert(potions, potion.."_2") table.insert(potions, potion)
table.insert(potions, potion.."_2")
end
if potion ~= "healing" and potion ~= "harming" then if potion ~= "healing" and potion ~= "harming" then
extension_table["mcl_potions:"..potion] = "mcl_potions:"..potion.."_plus" extension_table["mcl_potions:"..potion] = "mcl_potions:"..potion.."_plus"
table.insert(potions, potion.."_plus") table.insert(potions, potion.."_plus")
@ -842,12 +844,13 @@ local inversion_table = {
["mcl_potions:healing"] = "mcl_potions:harming", ["mcl_potions:healing"] = "mcl_potions:harming",
["mcl_potions:healing_2"] = "mcl_potions:harming_2", ["mcl_potions:healing_2"] = "mcl_potions:harming_2",
["mcl_potions:swiftness"] = "mcl_potions:slowness", ["mcl_potions:swiftness"] = "mcl_potions:slowness",
["mcl_potions:swiftness_2"] = "mcl_potions:slowness_plus",
["mcl_potions:swiftness_plus"] = "mlc_potions:slowness_plus", ["mcl_potions:swiftness_plus"] = "mlc_potions:slowness_plus",
["mcl_potions:leaping"] = "mcl_potions:slowness", ["mcl_potions:leaping"] = "mcl_potions:slowness",
["mcl_potions:leaping_2"] = "mcl_potions:slowness_plus",
["mcl_potions:leaping_plus"] = "mcl_potions:slowness_plus", ["mcl_potions:leaping_plus"] = "mcl_potions:slowness_plus",
["mcl_potions:night_vision"] = "mcl_potions:invisibility", ["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",
} }

4
mods/ITEMS/mcl_potions/splash.lua
View File

@ -22,7 +22,7 @@ local function register_splash(name, descr, color, def)
itemstack:take_item() itemstack:take_item()
return itemstack return itemstack
end, end,
stack_max = 100, -- increased stack to test throwing stack_max = 1,
}) })
local w = 0.7 local w = 0.7
@ -59,7 +59,7 @@ local function register_splash(name, descr, color, def)
}) })
self.object:remove() self.object:remove()
for i, obj in ipairs(minetest.get_objects_inside_radius(pos, 4)) do for i, obj in ipairs(minetest.get_objects_inside_radius(pos, 4)) do
if minetest.is_player(obj) then if minetest.is_player(obj) then
pos2 = obj:get_pos() pos2 = obj:get_pos()