Introduce the new recipes and missing recipes to the General Public Alchemy.

4 files changed, 42 insertions, 24 deletions

diff --git a/db/craft_db.conf b/db/craft_db.conf
index 0df424e6f..ca6882ad2 100644
--- a/db/craft_db.conf
+++ b/db/craft_db.conf
@@ -737,7 +737,7 @@ craft_db: (
 /****************************************************************************/
 {
 	Id: 42
-	Name: "CraftSacredLifePot"
+	Name: "CraftSacredLifePotion"
 	Flag: 8
 	SourceItems:
 	(
@@ -764,7 +764,7 @@ craft_db: (
 // CelestiaTea takes about 1 hour the unit to get ingame
 {
 	Id: 43
-	Name: "CraftSacredManaPot"
+	Name: "CraftSacredManaPotion"
 	Flag: 8
 	SourceItems:
 	(
@@ -816,7 +816,7 @@ craft_db: (
 /****************************************************************************/
 {
 	Id: 45
-	Name: "CraftSacredImmortal"
+	Name: "CraftSacredImmortalityPotion"
 	Flag: 8
 	SourceItems:
 	(
diff --git a/npc/craft/alchemy.txt b/npc/craft/alchemy.txt
index b73f56d71..fc35c7f08 100644
--- a/npc/craft/alchemy.txt
+++ b/npc/craft/alchemy.txt
@@ -81,10 +81,10 @@ Reagents:
 Products:
 	Tea (Chamomile, Spearmint, Oolong, Jasmine, Yerba Mate?)
 	→ Argaes Water + «Herbal Reagent»
-R	Coffee (Shadow Herb + Tonori Water)
+OK	Coffee (Shadow Herb + Tonori Water)
 OK	Piberries Infusion (Piberries + Curshroom)
-R	Atropos Mixture (Lachesis Brew + Clotho Liquor)
-R	Death Potion (Dragonfruit + Nightshade Tea)
+OK	Atropos Mixture (Lachesis Brew + Clotho Liquor)
+OK	Death Potion (Dragonfruit + Nightshade Tea)
 	Smoke Grenade (Cactus pot + Coal)
 	Grenade (Cactus pot + Sulfur Powder)
 	Scented Grenade (Cactus pot + Moss)
@@ -97,13 +97,13 @@ OK	Move Speed (Gem Powder + Fluor Powder)
 OK	Precision (Piberries + Mt. Snake Egg)
 OK	Dodge Potion (Piberries + Snake Egg)
 OK	Luck, Dex, Int, Vit, Agi (Gems + Tea)
-R	Sacred Life (Golden Apple + Elixir of Life)
-R	Sacred Mana (Golden Apple + Celestia Tea)
-R	Sacred Revival (Sacred Life + Sacred Mana)
+OK	Sacred Life (Golden Apple + Elixir of Life)
+OK	Sacred Mana (Golden Apple + Celestia Tea)
+OK	Sacred Revival (Sacred Life + Sacred Mana)
 	Broken Warp Crystal? (Wurtizite + Black Mamba Skin)
 	Magic Apple? (Divine Apple + Manapple? Death Potion? Sacred Life/Revival?)
-R	Purification Potion (Nymph Poison + Sacred Life)
-R	Iced Bottle (Tonori W. + Argaes W.)
+OK	Purification Potion (Nymph Poison + Sacred Life)
+OK	Iced Bottle (Tonori W. + Argaes W.)
 	Insurance Contract (» Insurance?) (Quill + Reed Bundle)
 	Mysterious Fruit? (Legendary)
 
diff --git a/npc/craft/recipes.txt b/npc/craft/recipes.txt
index 0f8278a06..0cd4a7a5f 100644
--- a/npc/craft/recipes.txt
+++ b/npc/craft/recipes.txt
@@ -129,18 +129,22 @@ function readAlchemy {
     mes "";
     // Healing
     mesc "----------"+l("Healing Recipes")+"----------", 2;
-    showRecipe(CraftPiberriesInfusion, PiberriesInfusion,
-                    5, Piberries, 1, Curshroom);
+    showRecipe(PiberriesInfusion,
+               AtroposMixture,
+               Coffee);
     dnext;
 
     // General Boosts
-    mesc "----------"+l("General Recipes")+"----------", 2;
+    mesc "----------"+l("General Boosts")+"----------", 2;
     showRecipe(HastePotion,
                StrengthPotion,
                StatusResetPotion,
                MoveSpeedPotion,
                PrecisionPotion,
-               DodgePotion);
+               DodgePotion,
+               SacredLifePotion,
+               SacredManaPotion,
+               SacredImmortalityPotion);
     dnext;
 
     // Stats Boosts
@@ -165,6 +169,12 @@ function readAlchemy {
                DexPotionB,
                DexPotionC);
 
+    // General Stuff
+    mesc "----------"+l("Reagents & Other Potions")+"----------", 2;
+    showRecipe(IcedBottle,
+               PurificationPotion,
+               DeathPotion);
+
     next;
     @scope$="";
     return;
@@ -324,6 +334,7 @@ function	script	MakeBlueprint	{
                 array_push(.@recipes, CraftPiberriesInfusion);
                 array_push(.@recipes, CraftHastePotion);
                 array_push(.@recipes, CraftStrengthPotion);
+                array_push(.@recipes, CraftCoffee);
             }
             if (.@rarity & CRAFT_INTERMEDIARY) {
                 array_push(.@recipes, CraftLukPotionA);
@@ -332,11 +343,13 @@ function	script	MakeBlueprint	{
                 array_push(.@recipes, CraftAgiPotionA);
                 array_push(.@recipes, CraftVitPotionA);
                 array_push(.@recipes, CraftSpeedPotion);
+                array_push(.@recipes, CraftIcedBottle);
             }
             if (.@rarity & CRAFT_ADVANCED) {
                 array_push(.@recipes, CraftResetPotion);
                 array_push(.@recipes, CraftPrecisionPotion);
                 array_push(.@recipes, CraftDodgePotion);
+                array_push(.@recipes, CraftDeathPotion);
             }
             if (.@rarity & CRAFT_EXPERT) {
                 array_push(.@recipes, CraftLukPotionB);
@@ -344,6 +357,8 @@ function	script	MakeBlueprint	{
                 array_push(.@recipes, CraftIntPotionB);
                 array_push(.@recipes, CraftAgiPotionB);
                 array_push(.@recipes, CraftVitPotionB);
+                array_push(.@recipes, CraftAtroposMixture);
+                array_push(.@recipes, CraftPurificationPotion);
             }
             if (.@rarity & CRAFT_MASTER) {
                 array_push(.@recipes, CraftLukPotionC);
@@ -351,6 +366,9 @@ function	script	MakeBlueprint	{
                 array_push(.@recipes, CraftIntPotionC);
                 array_push(.@recipes, CraftAgiPotionC);
                 array_push(.@recipes, CraftVitPotionC);
+                array_push(.@recipes, CraftSacredLifePotion);
+                array_push(.@recipes, CraftSacredManaPotion);
+                array_push(.@recipes, CraftSacredImmortalityPotion);
             }
 
             // Now you'll learn some recipe!
diff --git a/npc/guilds/logs.txt b/npc/guilds/logs.txt
index 8cde177e9..4c225f0fc 100644
--- a/npc/guilds/logs.txt
+++ b/npc/guilds/logs.txt
@@ -78,11 +78,11 @@ guilds,47,39,0	script	Guild Logs	NPC_NO_SPRITE,{
         next;
 
     // Limit Boosts
-    .@s+=showRecipe(CraftSacredManaPot, SacredManaPotion,
+    .@s+=showRecipe(CraftSacredManaPotion, SacredManaPotion,
                     1, GoldenApple, 10, CelestiaTea);
-    .@s+=showRecipe(CraftSacredLifePot, SacredLifePotion,
+    .@s+=showRecipe(CraftSacredLifePotion, SacredLifePotion,
                     1, GoldenApple, 1, ElixirOfLife);
-    .@s+=showRecipe(CraftSacredImmortal, SacredImmortalityPotion,
+    .@s+=showRecipe(CraftSacredImmortalityPotion, SacredImmortalityPotion,
                     1, SacredLifePotion, 1, SacredManaPotion);
 
     if (.@s == 0)
@@ -265,12 +265,12 @@ guilds,47,39,0	script	Guild Logs	NPC_NO_SPRITE,{
                          calcRecipe(CraftAgiPotionC, 8, 35000, l("Agi++ Potion"));
 
                     // Limit Boosts
-                    if (!showRecipe(CraftSacredManaPot, false))
-                         calcRecipe(CraftSacredManaPot, 7, 100000, l("Sacred Mana Potion"));
-                    if (!showRecipe(CraftSacredLifePot, false))
-                         calcRecipe(CraftSacredLifePot, 7, 100000, l("Sacred Life Potion"));
-                    if (!showRecipe(CraftSacredImmortal, false))
-                         calcRecipe(CraftSacredImmortal, 10, 500000, l("Sacred Immortality Potion"));
+                    if (!showRecipe(CraftSacredManaPotion, false))
+                         calcRecipe(CraftSacredManaPotion, 7, 100000, l("Sacred Mana Potion"));
+                    if (!showRecipe(CraftSacredLifePotion, false))
+                         calcRecipe(CraftSacredLifePotion, 7, 100000, l("Sacred Life Potion"));
+                    if (!showRecipe(CraftSacredImmortalityPotion, false))
+                         calcRecipe(CraftSacredImmortalityPotion, 10, 500000, l("Sacred Immortality Potion"));
 
                 } while (!hudRecipe());
                 break;