From ac13dd2a71de806cfdf64288281fc98a4bbe339e Mon Sep 17 00:00:00 2001 From: Brandon Date: Fri, 10 Jul 2020 19:25:34 -0400 Subject: [PATCH] Comment weakness/strength potions --- mods/ITEMS/mcl_potions/lingering.lua | 44 ++--- mods/ITEMS/mcl_potions/potions.lua | 236 ++++++++++++++------------- mods/ITEMS/mcl_potions/splash.lua | 58 +++---- 3 files changed, 170 insertions(+), 168 deletions(-) diff --git a/mods/ITEMS/mcl_potions/lingering.lua b/mods/ITEMS/mcl_potions/lingering.lua index 26ea47f340..e0a91389d9 100644 --- a/mods/ITEMS/mcl_potions/lingering.lua +++ b/mods/ITEMS/mcl_potions/lingering.lua @@ -261,17 +261,17 @@ register_lingering("invisibility_plus", S("Lingering Invisibility Potion +"), "# tt = time_string(mcl_potions.DURATION_PLUS*0.25) }) -register_lingering("weakness", S("Lingering Weakness Potion"), "#6600AA", { - potion_fun = function(player) mcl_potions.weakness_func(player, -4, mcl_potions.DURATION*mcl_potions.INV_FACTOR*0.25) end, - -- TODO: Fix tooltip - tt = time_string(mcl_potions.DURATION*mcl_potions.INV_FACTOR*0.25) -}) - -register_lingering("weakness_plus", S("Lingering Weakness Potion +"), "#7700BB", { - potion_fun = function(player) mcl_potions.weakness_func(player, -4, mcl_potions.DURATION_PLUS*mcl_potions.INV_FACTOR*0.25) end, - -- TODO: Fix tooltip - tt = time_string(mcl_potions.DURATION*mcl_potions.INV_FACTOR*0.25) -}) +-- register_lingering("weakness", S("Lingering Weakness Potion"), "#6600AA", { +-- potion_fun = function(player) mcl_potions.weakness_func(player, -4, mcl_potions.DURATION*mcl_potions.INV_FACTOR*0.25) end, +-- -- TODO: Fix tooltip +-- tt = time_string(mcl_potions.DURATION*mcl_potions.INV_FACTOR*0.25) +-- }) +-- +-- register_lingering("weakness_plus", S("Lingering Weakness Potion +"), "#7700BB", { +-- potion_fun = function(player) mcl_potions.weakness_func(player, -4, mcl_potions.DURATION_PLUS*mcl_potions.INV_FACTOR*0.25) end, +-- -- TODO: Fix tooltip +-- tt = time_string(mcl_potions.DURATION*mcl_potions.INV_FACTOR*0.25) +-- }) register_lingering("fire_resistance", S("Lingering Fire Resistance Potion"), "#D0A040", { potion_fun = function(player) mcl_potions.fire_resistance_func(player, mcl_potions.DURATION*0.25) end, @@ -283,17 +283,17 @@ register_lingering("fire_resistance_plus", S("Lingering Fire Resistance Potion + tt = time_string(mcl_potions.DURATION_PLUS*0.25) }) -register_lingering("strength", S("Lingering Strength Potion"), "#D444D4", { - potion_fun = function(player) mcl_potions.strength_func(player, 3, mcl_potions.DURATION*0.25) end, - -- TODO: Fix tooltip - tt = time_string(mcl_potions.DURATION*0.25) -}) - -register_lingering("strength_2", S("Lingering Strength Potion II"), "#D444F4", { - potion_fun = function(player) mcl_potions.strength_func(player, 6, smcl_potions.DURATION_2*0.25) end, - -- TODO: Fix tooltip - tt = time_string(mcl_potions.DURATION_2*0.25) -}) +-- register_lingering("strength", S("Lingering Strength Potion"), "#D444D4", { +-- potion_fun = function(player) mcl_potions.strength_func(player, 3, mcl_potions.DURATION*0.25) end, +-- -- TODO: Fix tooltip +-- tt = time_string(mcl_potions.DURATION*0.25) +-- }) +-- +-- register_lingering("strength_2", S("Lingering Strength Potion II"), "#D444F4", { +-- potion_fun = function(player) mcl_potions.strength_func(player, 6, smcl_potions.DURATION_2*0.25) end, +-- -- TODO: Fix tooltip +-- tt = time_string(mcl_potions.DURATION_2*0.25) +-- }) register_lingering("strength_plus", S("Lingering Strength Potion +"), "#D444E4", { potion_fun = function(player) mcl_potions.strength_func(player, 3, mcl_potions.DURATION_PLUS*0.25) end, diff --git a/mods/ITEMS/mcl_potions/potions.lua b/mods/ITEMS/mcl_potions/potions.lua index a4f0dace87..91ce53b584 100644 --- a/mods/ITEMS/mcl_potions/potions.lua +++ b/mods/ITEMS/mcl_potions/potions.lua @@ -425,125 +425,127 @@ minetest.register_craftitem("mcl_potions:leaping_plus", { }) -minetest.register_craftitem("mcl_potions:weakness", { - description = S("Weakness Potion"), - _tt_help = S("-4 HP damage | 1:30"), - _doc_items_longdesc = brewhelp, - wield_image = potion_image("#6600AA"), - inventory_image = potion_image("#6600AA"), - groups = { brewitem=1, food=3, can_eat_when_full=1, not_in_creative_inventory=0 }, - stack_max = 1, +-- minetest.register_craftitem("mcl_potions:weakness", { +-- description = S("Weakness Potion"), +-- _tt_help = S("-4 HP damage | 1:30"), +-- _doc_items_longdesc = brewhelp, +-- wield_image = potion_image("#6600AA"), +-- inventory_image = potion_image("#6600AA"), +-- groups = { brewitem=1, food=3, can_eat_when_full=1, not_in_creative_inventory=0 }, +-- stack_max = 1, +-- +-- on_place = function(itemstack, user, pointed_thing) +-- mcl_potions.weakness_func(user, -4, mcl_potions.DURATION*mcl_potions.INV_FACTOR) +-- minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) +-- mcl_potions._use_potion(itemstack, user, "#6600AA") +-- return itemstack +-- end, +-- +-- on_secondary_use = function(itemstack, user, pointed_thing) +-- mcl_potions.weakness_func(user, -4, mcl_potions.DURATION*mcl_potions.INV_FACTOR) +-- minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) +-- mcl_potions._use_potion(itemstack, user, "#6600AA") +-- return itemstack +-- end +-- }) +-- +-- minetest.register_craftitem("mcl_potions:weakness_plus", { +-- description = S("Weakness Potion +"), +-- _tt_help = S("-4 HP damage | 4:00"), +-- _doc_items_longdesc = brewhelp, +-- wield_image = potion_image("#7700BB"), +-- inventory_image = potion_image("#7700BB"), +-- groups = { brewitem=1, food=3, can_eat_when_full=1, not_in_creative_inventory=0 }, +-- stack_max = 1, +-- +-- on_place = function(itemstack, user, pointed_thing) +-- mcl_potions.weakness_func(user, -4, mcl_potions.DURATION_2*mcl_potions.INV_FACTOR) +-- minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) +-- mcl_potions._use_potion(itemstack, user, "#7700BB") +-- return itemstack +-- end, +-- +-- on_secondary_use = function(itemstack, user, pointed_thing) +-- mcl_potions.weakness_func(user, -4, mcl_potions.DURATION_2*mcl_potions.INV_FACTOR) +-- minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) +-- mcl_potions._use_potion(itemstack, user, "#7700BB") +-- return itemstack +-- end +-- }) +-- +-- minetest.register_craftitem("mcl_potions:strength", { +-- description = S("Strength Potion"), +-- _tt_help = S("+3 HP damage | 3:00"), +-- _doc_items_longdesc = brewhelp, +-- wield_image = potion_image("#D444D4"), +-- inventory_image = potion_image("#D444D4"), +-- groups = { brewitem=1, food=3, can_eat_when_full=1, not_in_creative_inventory=0 }, +-- stack_max = 1, +-- +-- on_place = function(itemstack, user, pointed_thing) +-- mcl_potions.weakness_func(user, 3, mcl_potions.DURATION) +-- minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) +-- mcl_potions._use_potion(itemstack, user, "#D444D4") +-- return itemstack +-- end, +-- +-- on_secondary_use = function(itemstack, user, pointed_thing) +-- mcl_potions.weakness_func(user, 3, mcl_potions.DURATION) +-- minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) +-- mcl_potions._use_potion(itemstack, user, "#D444D4") +-- return itemstack +-- end +-- }) +-- +-- minetest.register_craftitem("mcl_potions:strength_2", { +-- description = S("Strength Potion II"), +-- _tt_help = S("+6 HP damage | 1:30"), +-- _doc_items_longdesc = brewhelp, +-- wield_image = potion_image("#D444E4"), +-- inventory_image = potion_image("#D444E4"), +-- groups = { brewitem=1, food=3, can_eat_when_full=1, not_in_creative_inventory=0 }, +-- stack_max = 1, +-- +-- on_place = function(itemstack, user, pointed_thing) +-- mcl_potions.weakness_func(user, 6, mcl_potions.DURATION_2) +-- minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) +-- mcl_potions._use_potion(itemstack, user, "#D444E4") +-- return itemstack +-- end, +-- +-- on_secondary_use = function(itemstack, user, pointed_thing) +-- mcl_potions.weakness_func(user, 6, mcl_potions.DURATION_2) +-- minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) +-- mcl_potions._use_potion(itemstack, user, "#D444E4") +-- return itemstack +-- end +-- }) +-- +-- minetest.register_craftitem("mcl_potions:strength_plus", { +-- description = S("Strength Potion +"), +-- _tt_help = S("+3 HP damage | 8:00"), +-- _doc_items_longdesc = brewhelp, +-- wield_image = potion_image("#D444F4"), +-- inventory_image = potion_image("#D444F4"), +-- groups = { brewitem=1, food=3, can_eat_when_full=1, not_in_creative_inventory=0 }, +-- stack_max = 1, +-- +-- on_place = function(itemstack, user, pointed_thing) +-- mcl_potions.weakness_func(user, 3, mcl_potions.DURATION_PLUS) +-- minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) +-- mcl_potions._use_potion(itemstack, user, "#D444F4") +-- return itemstack +-- end, +-- +-- on_secondary_use = function(itemstack, user, pointed_thing) +-- mcl_potions.weakness_func(user, 3, mcl_potions.DURATION_PLUS) +-- minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) +-- mcl_potions._use_potion(itemstack, user, "#D444F4") +-- return itemstack +-- end +-- }) - on_place = function(itemstack, user, pointed_thing) - mcl_potions.weakness_func(user, -4, mcl_potions.DURATION*mcl_potions.INV_FACTOR) - minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) - mcl_potions._use_potion(itemstack, user, "#6600AA") - return itemstack - end, - on_secondary_use = function(itemstack, user, pointed_thing) - mcl_potions.weakness_func(user, -4, mcl_potions.DURATION*mcl_potions.INV_FACTOR) - minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) - mcl_potions._use_potion(itemstack, user, "#6600AA") - return itemstack - end -}) - -minetest.register_craftitem("mcl_potions:weakness_plus", { - description = S("Weakness Potion +"), - _tt_help = S("-4 HP damage | 4:00"), - _doc_items_longdesc = brewhelp, - wield_image = potion_image("#7700BB"), - inventory_image = potion_image("#7700BB"), - groups = { brewitem=1, food=3, can_eat_when_full=1, not_in_creative_inventory=0 }, - stack_max = 1, - - on_place = function(itemstack, user, pointed_thing) - mcl_potions.weakness_func(user, -4, mcl_potions.DURATION_2*mcl_potions.INV_FACTOR) - minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) - mcl_potions._use_potion(itemstack, user, "#7700BB") - return itemstack - end, - - on_secondary_use = function(itemstack, user, pointed_thing) - mcl_potions.weakness_func(user, -4, mcl_potions.DURATION_2*mcl_potions.INV_FACTOR) - minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) - mcl_potions._use_potion(itemstack, user, "#7700BB") - return itemstack - end -}) - -minetest.register_craftitem("mcl_potions:strength", { - description = S("Strength Potion"), - _tt_help = S("+3 HP damage | 3:00"), - _doc_items_longdesc = brewhelp, - wield_image = potion_image("#D444D4"), - inventory_image = potion_image("#D444D4"), - groups = { brewitem=1, food=3, can_eat_when_full=1, not_in_creative_inventory=0 }, - stack_max = 1, - - on_place = function(itemstack, user, pointed_thing) - mcl_potions.weakness_func(user, 3, mcl_potions.DURATION) - minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) - mcl_potions._use_potion(itemstack, user, "#D444D4") - return itemstack - end, - - on_secondary_use = function(itemstack, user, pointed_thing) - mcl_potions.weakness_func(user, 3, mcl_potions.DURATION) - minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) - mcl_potions._use_potion(itemstack, user, "#D444D4") - return itemstack - end -}) - -minetest.register_craftitem("mcl_potions:strength_2", { - description = S("Strength Potion II"), - _tt_help = S("+6 HP damage | 1:30"), - _doc_items_longdesc = brewhelp, - wield_image = potion_image("#D444E4"), - inventory_image = potion_image("#D444E4"), - groups = { brewitem=1, food=3, can_eat_when_full=1, not_in_creative_inventory=0 }, - stack_max = 1, - - on_place = function(itemstack, user, pointed_thing) - mcl_potions.weakness_func(user, 6, mcl_potions.DURATION_2) - minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) - mcl_potions._use_potion(itemstack, user, "#D444E4") - return itemstack - end, - - on_secondary_use = function(itemstack, user, pointed_thing) - mcl_potions.weakness_func(user, 6, mcl_potions.DURATION_2) - minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) - mcl_potions._use_potion(itemstack, user, "#D444E4") - return itemstack - end -}) - -minetest.register_craftitem("mcl_potions:strength_plus", { - description = S("Strength Potion +"), - _tt_help = S("+3 HP damage | 8:00"), - _doc_items_longdesc = brewhelp, - wield_image = potion_image("#D444F4"), - inventory_image = potion_image("#D444F4"), - groups = { brewitem=1, food=3, can_eat_when_full=1, not_in_creative_inventory=0 }, - stack_max = 1, - - on_place = function(itemstack, user, pointed_thing) - mcl_potions.weakness_func(user, 3, mcl_potions.DURATION_PLUS) - minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) - mcl_potions._use_potion(itemstack, user, "#D444F4") - return itemstack - end, - - on_secondary_use = function(itemstack, user, pointed_thing) - mcl_potions.weakness_func(user, 3, mcl_potions.DURATION_PLUS) - minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing) - mcl_potions._use_potion(itemstack, user, "#D444F4") - return itemstack - end -}) minetest.register_craftitem("mcl_potions:poison", { description = S("Poison Potion"), _tt_help = S("-1 HP / 2.5s | 0:45"), diff --git a/mods/ITEMS/mcl_potions/splash.lua b/mods/ITEMS/mcl_potions/splash.lua index a9efe52f83..6de5e07adf 100644 --- a/mods/ITEMS/mcl_potions/splash.lua +++ b/mods/ITEMS/mcl_potions/splash.lua @@ -220,35 +220,35 @@ register_splash("invisibility_plus", S("Invisibility Splash Potion +"), "#A0A0A0 tt = time_string(splash_DUR_pl) }) -register_splash("weakness", S("Weakness Splash Potion"), "#6600AA", { - potion_fun = function(player, redx) mcl_potions.weakness_func(player, -4, splash_DUR*mcl_potions.INV_FACTOR*redx) end, - -- TODO: Fix tooltip - tt = time_string(splash_DUR*mcl_potions.INV_FACTOR) -}) - -register_splash("weakness_plus", S("Weakness Splash Potion +"), "#7700BB", { - potion_fun = function(player, redx) mcl_potions.weakness_func(player, -4, splash_DUR_pl*mcl_potions.INV_FACTOR*redx) end, - -- TODO: Fix tooltip - tt = time_string(splash_DUR_pl*mcl_potions.INV_FACTOR) -}) - -register_splash("strength", S("Strength Splash Potion"), "#D444D4", { - potion_fun = function(player, redx) mcl_potions.strength_func(player, 3, splash_DUR*redx) end, - -- TODO: Fix tooltip - tt = time_string(splash_DUR) -}) - -register_splash("strength_2", S("Strength Splash Potion II"), "#D444F4", { - potion_fun = function(player, redx) mcl_potions.strength_func(player, 6, splash_DUR_2*redx) end, - -- TODO: Fix tooltip - tt = time_string(splash_DUR_2) -}) - -register_splash("strength_plus", S("Strength Splash Potion +"), "#D444E4", { - potion_fun = function(player, redx) mcl_potions.strength_func(player, 3, splash_DUR_pl*redx) end, - -- TODO: Fix tooltip - tt = time_string(splash_DUR_pl) -}) +-- register_splash("weakness", S("Weakness Splash Potion"), "#6600AA", { +-- potion_fun = function(player, redx) mcl_potions.weakness_func(player, -4, splash_DUR*mcl_potions.INV_FACTOR*redx) end, +-- -- TODO: Fix tooltip +-- tt = time_string(splash_DUR*mcl_potions.INV_FACTOR) +-- }) +-- +-- register_splash("weakness_plus", S("Weakness Splash Potion +"), "#7700BB", { +-- potion_fun = function(player, redx) mcl_potions.weakness_func(player, -4, splash_DUR_pl*mcl_potions.INV_FACTOR*redx) end, +-- -- TODO: Fix tooltip +-- tt = time_string(splash_DUR_pl*mcl_potions.INV_FACTOR) +-- }) +-- +-- register_splash("strength", S("Strength Splash Potion"), "#D444D4", { +-- potion_fun = function(player, redx) mcl_potions.strength_func(player, 3, splash_DUR*redx) end, +-- -- TODO: Fix tooltip +-- tt = time_string(splash_DUR) +-- }) +-- +-- register_splash("strength_2", S("Strength Splash Potion II"), "#D444F4", { +-- potion_fun = function(player, redx) mcl_potions.strength_func(player, 6, splash_DUR_2*redx) end, +-- -- TODO: Fix tooltip +-- tt = time_string(splash_DUR_2) +-- }) +-- +-- register_splash("strength_plus", S("Strength Splash Potion +"), "#D444E4", { +-- potion_fun = function(player, redx) mcl_potions.strength_func(player, 3, splash_DUR_pl*redx) end, +-- -- TODO: Fix tooltip +-- tt = time_string(splash_DUR_pl) +-- }) register_splash("water_breathing", S("Water Breathing Splash Potion"), "#0000AA", { potion_fun = function(player, redx) mcl_potions.water_breathing_func(player, splash_DUR*redx) end,