SC_MATKPOT

3 files changed, 43 insertions, 9 deletions

diff --git a/world/map/npc/011-1/_mobs.txt b/world/map/npc/011-1/_mobs.txt
index 596c7194..0621a927 100644
--- a/world/map/npc/011-1/_mobs.txt
+++ b/world/map/npc/011-1/_mobs.txt
@@ -15,3 +15,5 @@
 011-1,0,0,0,0|monster|Mouboo|1028,5,0ms,10ms
 011-1,1,1,0,0|monster|ManaBug|1131,18,30ms,0ms
 011-1,92,44,35,28|monster|Maggot|1002,10,30ms,0ms
+011-1,117,89,8,7|monster|EvilMushroom|1013,2,0ms,250ms
+011-1,38,95,9,7|monster|MegaManaBug|1175,2,0ms,250ms
diff --git a/world/map/npc/011-1/alchemist.txt b/world/map/npc/011-1/alchemist.txt
index ade035dd..63e527ff 100644
--- a/world/map/npc/011-1/alchemist.txt
+++ b/world/map/npc/011-1/alchemist.txt
@@ -19,14 +19,15 @@
     set @QUEST_GUESS_BASE, 4;
 
     set @CHOICE_IRON, 0;
-    set @CHOICE_CONCENTRATION, 1;
-    set @CHOICE_DYEING_INTRO, 2;
-    set @CHOICE_DYE, 3;
-    set @CHOICE_MONSTER_OIL, 4;
-    set @CHOICE_MANA_POTION, 5;
-    set @CHOICE_SULPHUR_POWDER, 6;
-    set @CHOICE_IRON_POWDER, 7;
-    set @CHOICE_ABORT, 8;
+    set @CHOICE_ENLIGHTENING, 1;
+    set @CHOICE_CONCENTRATION, 2;
+    set @CHOICE_DYEING_INTRO, 3;
+    set @CHOICE_DYE, 4;
+    set @CHOICE_MONSTER_OIL, 5;
+    set @CHOICE_MANA_POTION, 6;
+    set @CHOICE_SULPHUR_POWDER, 7;
+    set @CHOICE_IRON_POWDER, 8;
+    set @CHOICE_ABORT, 9;
 
     setarray @menuitems$, "", "", "", "", "", "", "", "";
     set @c, 0;
@@ -35,6 +36,10 @@
     set @menuID[@c], @CHOICE_IRON;
     set @c, @c + 1;
 
+    set @menuitems$[@c], "Enlightening Elixir.";
+    set @menuID[@c], @CHOICE_ENLIGHTENING;
+    set @c, @c + 1;
+
     set @menuitems$[@c], "Concentration potion.";
     set @menuID[@c], @CHOICE_CONCENTRATION;
     set @c, @c + 1;
@@ -123,6 +128,8 @@ L_MenuItems:
         goto L_abort;
     if (@menuID[@menu] == @CHOICE_IRON)
         goto L_iron;
+    if (@menuID[@menu] == @CHOICE_ENLIGHTENING)
+        goto L_enlightening;
     if (@menuID[@menu] == @CHOICE_CONCENTRATION)
         goto L_concentration;
     if (@menuID[@menu] == @CHOICE_DYEING_INTRO)
@@ -315,6 +322,27 @@ L_iron:
     getitem "IronPotion", @count;
     close;
 
+L_enlightening:
+    set @COST_PER_ENLIGHTENING_ELIXIR, 2;
+
+    mes "\" To make them, I'm going to need " + @COST_PER_ENLIGHTENING_ELIXIR + " Mana Dust per Enlightening Elixir. How many Enlightening Elixirs would you like?\"";
+    input @count;
+
+    if (@count == 0)
+        close;
+    set @empty, countitem("ManaDust");
+
+    if (@empty < @count * @COST_PER_ENLIGHTENING_ELIXIR)
+        goto L_no_enlightening;
+    getinventorylist;
+    if (@inventorylist_count == 100 && countitem("EnlighteningElixir") == 0 && @empty > @count)
+        goto L_TooMany;
+
+    delitem "ManaDust", @COST_PER_ENLIGHTENING_ELIXIR * @count;
+    getitem "EnlighteningElixir", @count;
+    close;
+
+
 L_concentration:
     set @COST_PER_CONCENTRATION_POTION, 2;
 
@@ -339,6 +367,10 @@ L_no_iron:
     mes "\"You have to bring me 2 Small Mushrooms for each Iron Potion.\"";
     close;
 
+L_no_enlightening:
+    mes "\"You have to bring me 2 Mana Dust for each Enlightening Elixir.\"";
+    close;
+
 L_no_concentration:
     mes "\"You have to bring me 2 Pink Petals for each Concentration Potion.\"";
     close;
diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt
index ad088eff..994e399d 100644
--- a/world/map/npc/011-1/oscar.txt
+++ b/world/map/npc/011-1/oscar.txt
@@ -380,7 +380,7 @@ OnPD:
     // Small damages
     misceffect FX_PUMPKIN_EXPLOSION, strcharinfo(0);
     heal -10, 0;
-    sc_start sc_poison, 1, 3;
+    sc_start SC_POISON, 1, 3;
     // Spawn mobs or get items
     set @halloween_rand, rand(0,100);
     // Seeds reward