From 78ae5ddc26324173433ad901d457a59a5c1361c2 Mon Sep 17 00:00:00 2001
From: the-real-herowl <wiktor_t-i@proton.me>
Date: Wed, 17 Apr 2024 22:52:25 +0200
Subject: [PATCH] Added some potion recipes

Also:
* changed the duration of saturation and food poisoning potions
* minor code changes
---
 mods/ITEMS/mcl_potions/init.lua    | 34 ++++++++++++++++--------------
 mods/ITEMS/mcl_potions/potions.lua |  8 +++----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/mods/ITEMS/mcl_potions/init.lua b/mods/ITEMS/mcl_potions/init.lua
index 189a014dc..d70e14f36 100644
--- a/mods/ITEMS/mcl_potions/init.lua
+++ b/mods/ITEMS/mcl_potions/init.lua
@@ -401,18 +401,14 @@ local awkward_table = {
 
 	["mcl_flowers:fourleaf_clover"] = "mcl_potions:luck",
 	["mcl_farming:potato_item_poison"] = "mcl_potions:nausea",
-	-- TODO slow falling
-	-- TODO levitation?
-	-- TODO darkness?
-	-- TODO absorption
-	-- TODO health boost?
-	-- TODO resistance
-	-- TODO turtle master?
-	-- TODO frost
-	-- TODO blindness?
-	-- TODO food poisoning?
-	-- TODO saturation?
-	-- TODO haste
+	["mcl_mobitems:phantom_membrane"] = "mcl_potions:slow_falling", -- TODO add phantom membranes
+	["mcl_core:apple_gold"] = "mcl_potions:resistance",
+
+	-- TODO darkness - sculk?
+	-- TODO absorption - water element?
+	-- TODO turtle master - earth element?
+	-- TODO frost - frost element?
+	-- TODO haste - air element?
 }
 -- API
 -- register a potion recipe brewed from awkward potion
@@ -450,7 +446,10 @@ end
 mcl_potions.register_ingredient_potion("mcl_potions:mundane", mundane_table)
 
 local thick_table = {
-	-- TODO glowing from some shining cave flowers
+	["mcl_crimson:shroomlight"] = "mcl_potions:glowing",
+	["mcl_mobitems:nether_star"] = "mcl_potions:ominous",
+	["mcl_mobitems:ink_sac"] = "mcl_potions:blindness",
+	["mcl_farming:carrot_item_gold"] = "mcl_potions:saturation",
 }
 -- API
 -- register a potion recipe brewed from thick potion
@@ -495,6 +494,9 @@ local inversion_table = {
 	["mcl_potions:poison"] = "mcl_potions:harming",
 	["mcl_potions:luck"] = "mcl_potions:bad_luck",
 	["mcl_potions:haste"] = "mcl_potions:fatigue",
+	["mcl_potions:saturation"] = "mcl_potions:food_poisoning",
+	["mcl_potions:slow_falling"] = "mcl_potions:levitation",
+	["mcl_potions:absorption"] = "mcl_potions:health_boost",
 }
 -- API
 function mcl_potions.register_inversion_recipe(input, output)
@@ -529,9 +531,9 @@ local lingering_table = {}
 for potion, def in pairs(potions) do
 	if def.has_splash then
 		splash_table[potion] = potion.."_splash"
-	end
-	if def.has_lingering then
-		lingering_table[potion.."_splash"] = potion.."_lingering"
+		if def.has_lingering then
+			lingering_table[potion.."_splash"] = potion.."_lingering"
+		end
 	end
 end
 mcl_potions.register_table_modifier("mcl_mobitems:gunpowder", splash_table)
diff --git a/mods/ITEMS/mcl_potions/potions.lua b/mods/ITEMS/mcl_potions/potions.lua
index b651cfbb2..0d6d1940c 100644
--- a/mods/ITEMS/mcl_potions/potions.lua
+++ b/mods/ITEMS/mcl_potions/potions.lua
@@ -764,7 +764,7 @@ mcl_potions.register_potion({
 	_longdesc = S("Moves bowels too fast."),
 	color = "#83A061",
 	_effect_list = {
-		food_poisoning = {},
+		food_poisoning = {dur=mcl_potions.DURATION_POISON},
 	},
 	has_arrow = true,
 	-- TODO implement effect stacking?
@@ -777,7 +777,7 @@ mcl_potions.register_potion({
 	_longdesc = S("Satisfies hunger."),
 	color = "#CEAE29",
 	_effect_list = {
-		saturation = {},
+		saturation = {dur=mcl_potions.DURATION_POISON},
 	},
 	has_arrow = true,
 })
@@ -817,9 +817,7 @@ mcl_potions.register_potion({
 		"^mcl_potions_potion_bottle.png",
 	}),
 	_effect_list = {
-		bad_omen = {
-			dur = 6000,
-		},
+		bad_omen = {dur = 6000},
 	},
 	has_splash = false,
 	has_lingering = false,