From 74684a3bb6b3794e46f979e1fbce56db46ad27f7 Mon Sep 17 00:00:00 2001
From: HoraK-FDF <horak-fdf@web.de>
Date: Wed, 8 Nov 2023 02:48:47 +0000
Subject: SC_MATKPOT

---
 world/map/npc/002-1/elanore.txt           |  6 ++--
 world/map/npc/004-5/_mobs.txt             |  1 +
 world/map/npc/007-1/_mobs.txt             |  1 +
 world/map/npc/009-2/doctor.txt            |  6 ++--
 world/map/npc/009-2/nurse.txt             |  8 +++---
 world/map/npc/009-2/shops.txt             |  2 +-
 world/map/npc/009-7/shops.txt             |  2 +-
 world/map/npc/010-2/dimonds.txt           |  2 +-
 world/map/npc/011-1/_mobs.txt             |  2 ++
 world/map/npc/011-1/alchemist.txt         | 48 +++++++++++++++++++++++++------
 world/map/npc/011-1/oscar.txt             |  2 +-
 world/map/npc/011-6/_mobs.txt             |  2 ++
 world/map/npc/012-1/_mobs.txt             |  3 ++
 world/map/npc/012-3/_mobs.txt             |  2 ++
 world/map/npc/013-1/_mobs.txt             |  1 +
 world/map/npc/014-1/_mobs.txt             |  2 ++
 world/map/npc/015-1/_mobs.txt             |  1 +
 world/map/npc/016-2/_mobs.txt             |  1 +
 world/map/npc/018-2/caul.txt              |  2 +-
 world/map/npc/020-2/shops.txt             |  2 +-
 world/map/npc/026-2/gy_inn_shops.txt      |  2 +-
 world/map/npc/029-1/rewards_master.txt    |  2 +-
 world/map/npc/029-2/alchemy.txt           |  5 ++--
 world/map/npc/029-2/morgan.txt            |  2 +-
 world/map/npc/029-3/parua.txt             |  2 +-
 world/map/npc/055-1/_mobs.txt             |  1 +
 world/map/npc/055-1/pumpkins.txt          |  6 ++--
 world/map/npc/055-3/_mobs.txt             |  1 +
 world/map/npc/099-5/boss.txt              | 16 +++++------
 world/map/npc/items/shock_sweet.txt       |  2 +-
 world/map/npc/magic/level2-toxic-dart.txt |  2 +-
 31 files changed, 94 insertions(+), 43 deletions(-)

(limited to 'world/map/npc')

diff --git a/world/map/npc/002-1/elanore.txt b/world/map/npc/002-1/elanore.txt
index b235c5b4..217d1ae6 100644
--- a/world/map/npc/002-1/elanore.txt
+++ b/world/map/npc/002-1/elanore.txt
@@ -64,7 +64,7 @@ L_Return:
     if (@Q_status > @Q_STATUS_MAX)
     set @Q_status, @STATUS_INITIAL;
     callsub S_update_var;
-    if (sc_check(sc_poison)) goto L_CurePoison;
+    if (sc_check(SC_POISON)) goto L_CurePoison;
     if (BaseLevel > 20) goto L_NoHeal;
     set @TEMP,rand(4);
     if(@TEMP == 1) goto L_Heal2;
@@ -582,8 +582,8 @@ L_CurePoison:
     mes "[Elanore the Healer]";
     mes "\"Oh dear!  That looks like poison; hang on...\"";
     mes "She performs a complicated gesture.";
-        sc_end(sc_poison);
-        sc_end(sc_slowpoison);
+        sc_end(SC_POISON);
+        sc_end(SC_SLOWPOISON);
     misceffect sfx_magic_life, strcharinfo(0);
     misceffect sfx_magic_life;
     next;
diff --git a/world/map/npc/004-5/_mobs.txt b/world/map/npc/004-5/_mobs.txt
index b7425fb5..0ab700a7 100644
--- a/world/map/npc/004-5/_mobs.txt
+++ b/world/map/npc/004-5/_mobs.txt
@@ -13,3 +13,4 @@
 004-5,81,38,6,5|monster|Grenadier|1121,1,100000ms,30000ms
 004-5,80,38,8,2|monster|Thug|1119,2,100000ms,30000ms
 004-5,81,38,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms
+004-5,68,64,7,11|monster|EvilMushroom|1013,2,0ms,250ms
diff --git a/world/map/npc/007-1/_mobs.txt b/world/map/npc/007-1/_mobs.txt
index e160e414..c6f05a7c 100644
--- a/world/map/npc/007-1/_mobs.txt
+++ b/world/map/npc/007-1/_mobs.txt
@@ -10,3 +10,4 @@
 007-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms
 007-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms
 007-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms
+007-1,78,81,10,5|monster|MegaManaBug|1175,2,0ms,250ms
diff --git a/world/map/npc/009-2/doctor.txt b/world/map/npc/009-2/doctor.txt
index 74bfe8dc..d7c607d3 100644
--- a/world/map/npc/009-2/doctor.txt
+++ b/world/map/npc/009-2/doctor.txt
@@ -28,7 +28,7 @@ L_Next:
 
 L_Cure:
     mes "[Doctor]";
-    if (sc_check(sc_poison))
+    if (sc_check(SC_POISON))
         goto L_CurePoison;
     mes "The doctor examines you briefly.";
     mes "\"Nonsense!  You look fine and dandy to me. All you need is a bit more exercise and fresh fruit in your diet!\"";
@@ -42,8 +42,8 @@ L_CurePoison:
     mes "\"Now hold still, this won't hurt a bit...\"";
     next;
     mes "[Doctor]";
-    sc_end(sc_poison);
-    sc_end(sc_slowpoison);
+    sc_end(SC_POISON);
+    sc_end(SC_SLOWPOISON);
     mes "*Ouch!*";
     mes "\"Next time, be more careful!  Make sure to cook any meats before you eat them, and don't eat fish once it starts to smell.\"";
     goto L_Close;
diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt
index efad521a..f43c4751 100644
--- a/world/map/npc/009-2/nurse.txt
+++ b/world/map/npc/009-2/nurse.txt
@@ -350,7 +350,7 @@ L_choosePut:
 
 L_m_hl_m_vn:
     //poison for 3 minutes
-    sc_start sc_poison, 1, 20;
+    sc_start SC_POISON, 1, 20;
     mes "You begin to feel really dizzy. And you feel so light - you can't help yourself and burst out with laughter. What a strange feeling!";
     next;
     mes "The nurse looks at you with a really worried look on her face. As you open your mouth to tell her that you feel alright, the content of your stomach finds its way out through your throat and on the floor.";
@@ -360,7 +360,7 @@ L_m_hl_m_vn:
 
 L_m_hl_l_vn:
     //poison for 1 minute
-    sc_start sc_poison, 1, 20;
+    sc_start SC_POISON, 1, 20;
     mes "You feel the pain of the poison weaken. This seems promising. The thought that you might have been successful makes you feel enormously happy.";
     next;
     mes "But a few seconds later, you wonder what was the reason for your happiness.";
@@ -381,7 +381,7 @@ L_m_hl_l_vn:
 
 L_hl_m_vn:
     // first poison for 10 minutes, player will die anyway
-    sc_start sc_poison, 1, 20;
+    sc_start SC_POISON, 1, 20;
     mes "You feel a sting in your stomach and your heart starts pounding loudly.";
     next;
     mes "The room is getting dark.";
@@ -397,7 +397,7 @@ L_hl_m_vn:
 
 L_hl_l_vn:
     //poison for 1 minute
-    sc_start sc_poison, 1, 20;
+    sc_start SC_POISON, 1, 20;
     mes "The antidote seems to have no effect.";
     goto L_check_st;
 
diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt
index 3dcfbc9a..bea4a4bf 100644
--- a/world/map/npc/009-2/shops.txt
+++ b/world/map/npc/009-2/shops.txt
@@ -15,7 +15,7 @@
 009-2,97,24,0|shop|Apprentice|120,SlingBullet:*1,Arrow:*2,IronArrow:*1,Bow:*1,ShortBow:*2
 
 // Potion Shop
-009-2,123,22,0|shop|Potions#_M|400,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1,SlowPoisonPotion:*1
+009-2,123,22,0|shop|Potions#_M|400,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,EnlighteningElixir:*1,ConcentrationPotion:*1,SlowPoisonPotion:*1
 
 // General Store
 009-2,32,99,0|shop|General Store#hurnscald|112,Milk:*1,BottleOfWater:*1,CottonShirt:*1,CottonShorts:*1,Boots:*1,SerfHat:*1,CottonHeadband:*1,CottonGloves:*1
diff --git a/world/map/npc/009-7/shops.txt b/world/map/npc/009-7/shops.txt
index ff33b313..47d70561 100644
--- a/world/map/npc/009-7/shops.txt
+++ b/world/map/npc/009-7/shops.txt
@@ -1,3 +1,3 @@
-009-7,34,23,0|shop|Bartender#Duels|177,Beer:*1,IronPotion:*1,ConcentrationPotion:*1,BottleOfWater:*1,Milk:*1
+009-7,34,23,0|shop|Bartender#Duels|177,Beer:*1,IronPotion:*1,EnlighteningElixir:*1,ConcentrationPotion:*1,BottleOfWater:*1,Milk:*1
 
 009-7,27,26,0|shop|Garcon#Duels|180,RoastedMaggot:*1,PickledBeets:*30,ChickenLeg:*1,Steak:*1,Beer:*1
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index 7f102659..76a77f80 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -536,7 +536,7 @@ L_Close:
 }
 
 
-010-2,24,27,0|shop|Bartender|112,Beer:*1,IronPotion:*1,ConcentrationPotion:*1
+010-2,24,27,0|shop|Bartender|112,Beer:*1,IronPotion:*1,EnlighteningElixir:*1,ConcentrationPotion:*1
 
 010-2,32,34,0|shop|Waitress|139,CherryCake:*1,RoastedMaggot:*1,OrangeCupcake:*1,ChickenLeg:*1,Steak:*1
 
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
diff --git a/world/map/npc/011-6/_mobs.txt b/world/map/npc/011-6/_mobs.txt
index 6a6ea09d..cf054024 100644
--- a/world/map/npc/011-6/_mobs.txt
+++ b/world/map/npc/011-6/_mobs.txt
@@ -48,3 +48,5 @@
 011-6,97,183,29,14|monster|CaveSnake|1021,3,30000ms,100000ms
 011-6,172,252,9,12|monster|CaveMaggot|1056,4,30000ms,100000ms
 011-6,263,236,16,5|monster|CaveMaggot|1056,3,30000ms,100000ms
+011-6,267,175,10,8|monster|EvilMushroom|1013,2,0ms,250ms
+011-6,186,175,8,8|monster|EvilMushroom|1013,2,0ms,250ms
diff --git a/world/map/npc/012-1/_mobs.txt b/world/map/npc/012-1/_mobs.txt
index be05b580..14e3733a 100644
--- a/world/map/npc/012-1/_mobs.txt
+++ b/world/map/npc/012-1/_mobs.txt
@@ -11,6 +11,9 @@
 012-1,0,0,0,0|monster|Silkworm|1035,5,60000ms,30000ms
 012-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms
 012-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms
+012-1,0,0,0,0|monster|MegaManaBug|1175,33,100000ms,30000ms
 012-1,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms
+012-1,139,96,9,8|monster|MegaManaBug|1175,2,0ms,250ms
+012-1,111,97,11,6|monster|MegaManaBug|1175,2,0ms,250ms
 012-1,66,145,11,5|monster|PinkFlower|1014,2,0ms,250ms
 012-1,24,54,6,8|monster|PinkFlower|1014,2,0ms,250ms
diff --git a/world/map/npc/012-3/_mobs.txt b/world/map/npc/012-3/_mobs.txt
index e9314763..d0dac10a 100644
--- a/world/map/npc/012-3/_mobs.txt
+++ b/world/map/npc/012-3/_mobs.txt
@@ -17,3 +17,5 @@
 012-3,165,106,17,18|monster|Moggun|1061,10,100000ms,30000ms
 012-3,0,0,0,0|monster|Bat|1017,100,0ms,0ms
 012-3,0,0,0,0|monster|CaveSnake|1021,75,0ms,0ms
+012-3,55,57,56,49|monster|MegaManaBug|1175,8,100000ms,30000ms
+012-3,53,140,46,34|monster|MegaManaBug|1175,16,100000ms,30000ms
diff --git a/world/map/npc/013-1/_mobs.txt b/world/map/npc/013-1/_mobs.txt
index ca0b2b68..a453e35b 100644
--- a/world/map/npc/013-1/_mobs.txt
+++ b/world/map/npc/013-1/_mobs.txt
@@ -16,3 +16,4 @@
 013-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms
 013-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms
 013-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms
+013-1,98,90,9,6|monster|EvilMushroom|1013,2,0ms,250ms
diff --git a/world/map/npc/014-1/_mobs.txt b/world/map/npc/014-1/_mobs.txt
index 8abab0ea..df3ee4cb 100644
--- a/world/map/npc/014-1/_mobs.txt
+++ b/world/map/npc/014-1/_mobs.txt
@@ -17,3 +17,5 @@
 014-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms
 014-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms
 014-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms
+014-1,33,75,7,8|monster|EvilMushroom|1013,2,0ms,250ms
+014-1,87,24,9,10|monster|MegaManaBug|1175,2,0ms,250ms
diff --git a/world/map/npc/015-1/_mobs.txt b/world/map/npc/015-1/_mobs.txt
index e012a95c..cf81caff 100644
--- a/world/map/npc/015-1/_mobs.txt
+++ b/world/map/npc/015-1/_mobs.txt
@@ -11,3 +11,4 @@
 015-1,0,0,0,0|monster|AlizarinPlant|1032,5,0ms,0ms
 015-1,0,0,0,0|monster|Silkworm|1035,7,15000ms,7000ms
 015-1,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms
+015-1,27,26,11,6|monster|MegaManaBug|1175,2,0ms,250ms
diff --git a/world/map/npc/016-2/_mobs.txt b/world/map/npc/016-2/_mobs.txt
index 069b9d46..3391c146 100644
--- a/world/map/npc/016-2/_mobs.txt
+++ b/world/map/npc/016-2/_mobs.txt
@@ -1,3 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Gwendolyn's mobs
 
+016-2,28,27,14,6|monster|MegaManaBug|1175,2,0ms,250ms
diff --git a/world/map/npc/018-2/caul.txt b/world/map/npc/018-2/caul.txt
index f01c6a9c..66f99a6e 100644
--- a/world/map/npc/018-2/caul.txt
+++ b/world/map/npc/018-2/caul.txt
@@ -714,7 +714,7 @@ L_mopox_failed_hard:
     next;
 
     if (rand((Vit+Vit2)) < 40)
-        sc_start sc_poison, 1, 20;
+        sc_start SC_POISON, 1, 20;
 
     mes "[Brewing Mopox Cure]";
     mes "Yeech. That smelled bad.";
diff --git a/world/map/npc/020-2/shops.txt b/world/map/npc/020-2/shops.txt
index a71210cc..ddae90b8 100644
--- a/world/map/npc/020-2/shops.txt
+++ b/world/map/npc/020-2/shops.txt
@@ -16,7 +16,7 @@
 // Weapons shop
 020-2,25,65,0|shop|Bracco|135,ArmorBreaker:*2,IronArrow:*1,Arrow:*1,ShortBow:*4,Dagger:*1,LeatherShield:*1
 // Potions shop
-020-2,75,24,0|shop|Mede|103,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1,SmallManaElixir:*6,MediumManaElixir:*6,LargeManaElixir:*6
+020-2,75,24,0|shop|Mede|103,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,EnlighteningElixir:*1,ConcentrationPotion:*1,SmallManaElixir:*6,MediumManaElixir:*6,LargeManaElixir:*6
 
 // INN
 020-2,111,23,0|script|Kane|120
diff --git a/world/map/npc/026-2/gy_inn_shops.txt b/world/map/npc/026-2/gy_inn_shops.txt
index cbb6c674..18580dbd 100644
--- a/world/map/npc/026-2/gy_inn_shops.txt
+++ b/world/map/npc/026-2/gy_inn_shops.txt
@@ -34,7 +34,7 @@
     close;
 }
 
-026-2,31,119,0|shop|Leofwin|304,CactusDrink:*1,CactusPotion:*1,BugLeg:*1,SmallMushroom:*1,IronPotion:*1,ConcentrationPotion:*1,HardSpike:*1,DarkCrystal:*1,Root:*1,WispPowder:*1,SpectrePowder:*1,PoltergeistPowder:*1
+026-2,31,119,0|shop|Leofwin|304,CactusDrink:*1,CactusPotion:*1,BugLeg:*1,SmallMushroom:*1,IronPotion:*1,EnlighteningElixir:*1,ConcentrationPotion:*1,HardSpike:*1,DarkCrystal:*1,Root:*1,WispPowder:*1,SpectrePowder:*1,PoltergeistPowder:*1
 
 026-2,22,120,0|shop|Umfrey|302,BoneArrows:*1,ThornArrow:*1,ShockSweet:*1
 // Bank and Storage
diff --git a/world/map/npc/029-1/rewards_master.txt b/world/map/npc/029-1/rewards_master.txt
index 1ed99ac2..943fe8cb 100644
--- a/world/map/npc/029-1/rewards_master.txt
+++ b/world/map/npc/029-1/rewards_master.txt
@@ -6,7 +6,7 @@
     if (tvis == 0) set tvis, 1;
     if (Mobpt < tvis) goto L_NotEnough;
 
-    setarray @Items$, "AppleCake", "Arrow", "Beer", "Boots", "BugLeg", "CactusDrink", "CactusPotion", "Cake", "Candy", "CasinoCoins", "CherryCake", "ChickenLeg", "ChocolateBar", "ChocolateCake", "CottonBoots", "CottonCloth", "CottonShirt", "CottonShorts", "FancyHat", "GreenApple", "HardSpike", "IronOre", "Lifestone", "LightBlueDye", "MaggotSlime", "Milk", "Orange", "OrangeCake", "OrangeCupcake", "PinkPetal", "PileOfAsh", "PinkAntenna", "PoltergeistPowder", "RawLog", "RedApple", "RedDye", "ScorpionStinger", "SerfHat", "SmallHealingPotion", "SmallMushroom", "SnakeSkin", "SpectrePowder", "Steak", "TinyHealingPotion", "WhiteCake", "WhiteFur", "WispPowder", "YellowDye", "Coal";
+    setarray @Items$, "AppleCake", "Arrow", "Beer", "Boots", "BugLeg", "CactusDrink", "CactusPotion", "Cake", "Candy", "CasinoCoins", "CherryCake", "ChickenLeg", "ChocolateBar", "ChocolateCake", "CottonBoots", "CottonCloth", "CottonShirt", "CottonShorts", "FancyHat", "GreenApple", "HardSpike", "IronOre", "Lifestone", "LightBlueDye", "MaggotSlime", "Milk", "Orange", "OrangeCake", "OrangeCupcake", "PinkPetal", "PileOfAsh", "PinkAntenna", "PoltergeistPowder", "RawLog", "RedApple", "RedDye", "ScorpionStinger", "SerfHat", "SmallHealingPotion", "SmallMushroom", "SnakeSkin", "SpectrePowder", "Steak", "TinyHealingPotion", "WhiteCake", "WhiteFur", "WispPowder", "YellowDye", "Coal", "ManaDust";
 
     mes "[Ishi the Rewards Master]";
     mes "\"Welcome! I see you have " + Mobpt + " Monster Points. Would you like to exchange some of those for items?\"";
diff --git a/world/map/npc/029-2/alchemy.txt b/world/map/npc/029-2/alchemy.txt
index 537d269c..f8f1c0dd 100644
--- a/world/map/npc/029-2/alchemy.txt
+++ b/world/map/npc/029-2/alchemy.txt
@@ -132,9 +132,10 @@ L_InitVars:
     setarray .recipes$[0], 0,
         "DilutedConcentrationPot", "DarkConcentrationPotion", "ConcentrationPotion",
         "CactusDrink", "CactusDrink", "CactusPotion",
-        "PinkPetal", "BottleOfWater", "ConcentrationPotion",
+        "MountainSnakeTongue", "BottleOfWater", "SlowPoisonPotion",
         "SmallMushroom", "BottleOfWater", "IronPotion",
-        "MountainSnakeTongue", "BottleOfWater", "SlowPoisonPotion";
+        "ManaDust", "BottleOfWater", "EnlighteningElixir",
+        "PinkPetal", "BottleOfWater", "ConcentrationPotion";
     set .rsize, getarraysize(.recipes$);
     end;
 }
diff --git a/world/map/npc/029-2/morgan.txt b/world/map/npc/029-2/morgan.txt
index 7c09fd1d..c6dfa306 100644
--- a/world/map/npc/029-2/morgan.txt
+++ b/world/map/npc/029-2/morgan.txt
@@ -139,4 +139,4 @@ L_Close:
     close;
 }
 
-029-2,113,59,0|shop|Zitoni|103,CactusDrink:*1,CactusPotion:*1,TinyManaElixir:*5,SmallManaElixir:*5
+029-2,113,59,0|shop|Zitoni|103,CactusDrink:*1,CactusPotion:*1,TinyManaElixir:*5,SmallManaElixir:*5,EnlighteningElixir:*1,ManaDust:*1
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index 43dda09c..18b960aa 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -342,7 +342,7 @@ OnNewRound:
     if (!(@candor_oldx == @candor_x && @candor_oldy == @candor_y))
         goto L_IdleCheckPassed;
     set @candor_idle_counter, @candor_idle_counter + 1;
-    sc_start sc_poison, 1, @candor_idle_counter*25;
+    sc_start SC_POISON, 1, @candor_idle_counter*25;
     heal ((MaxHp/100) * (-20 * @candor_idle_counter)), 0;
     message strcharinfo(0), "The evil energy of this place hurts you. You should keep moving!";
     end;
diff --git a/world/map/npc/055-1/_mobs.txt b/world/map/npc/055-1/_mobs.txt
index 23eba0b0..63b0cf2d 100644
--- a/world/map/npc/055-1/_mobs.txt
+++ b/world/map/npc/055-1/_mobs.txt
@@ -18,3 +18,4 @@
 055-1,97,60,4,2|monster|PinkFlower|1014,1,10000ms,45000ms
 055-1,64,73,23,17|monster|PinkFlower|1014,1,10000ms,45000ms
 055-1,0,0,0,0|monster|SpikyMushroom|1019,7,10000ms,60000ms
+055-1,113,25,10,7|monster|PinkFlower|1014,2,0ms,250ms
diff --git a/world/map/npc/055-1/pumpkins.txt b/world/map/npc/055-1/pumpkins.txt
index 87dfca4c..96005de3 100644
--- a/world/map/npc/055-1/pumpkins.txt
+++ b/world/map/npc/055-1/pumpkins.txt
@@ -16,7 +16,7 @@
     set @discover_poisonous_pumpkin, 1;
     misceffect FX_PUMPKIN_EXPLOSION, strcharinfo(0);
     heal -15, 0;
-    sc_start sc_poison, 1, 4;
+    sc_start SC_POISON, 1, 4;
     if (rand(0,100) < 10)
         getitem "PumpkinSeeds", 1;
 
@@ -46,7 +46,7 @@ L_HeavyPoison0:
     message strcharinfo(0), "Pumpkin : Ouch, this pumpkin is totally poisonous! Let's get away from them!";
     misceffect FX_PUMPKIN_EXPLOSION, strcharinfo(0);
     heal -150,0;
-    sc_start sc_poison, 1, 60;
+    sc_start SC_POISON, 1, 60;
     goto L_Destroy;
 
 L_HeavyPoison1:
@@ -54,7 +54,7 @@ L_HeavyPoison1:
     message strcharinfo(0), "Pumpkin : This is really awful! I should not touch them!";
     misceffect FX_PUMPKIN_EXPLOSION, strcharinfo(0);
     heal -350,0;
-    sc_start sc_poison, 1, 120;
+    sc_start SC_POISON, 1, 120;
     goto L_Destroy;
 
 L_HeavyPoison2:
diff --git a/world/map/npc/055-3/_mobs.txt b/world/map/npc/055-3/_mobs.txt
index 686b2172..4ecf0465 100644
--- a/world/map/npc/055-3/_mobs.txt
+++ b/world/map/npc/055-3/_mobs.txt
@@ -9,3 +9,4 @@
 055-3,0,0,1,1|monster|Snake|1010,3,10000ms,20000ms
 055-3,46,44,14,18|monster|Spider|1012,3,50000ms,100000ms
 055-3,52,78,36,23|monster|BlackScorpion|1009,3,50000ms,100000ms
+055-3,76,32,8,9|monster|EvilMushroom|1013,2,0ms,250ms
diff --git a/world/map/npc/099-5/boss.txt b/world/map/npc/099-5/boss.txt
index de61bdf0..1ab584fd 100644
--- a/world/map/npc/099-5/boss.txt
+++ b/world/map/npc/099-5/boss.txt
@@ -260,7 +260,7 @@ OnFourthFall:
     //debugmes "FOURTH FALL";
 
     // High Damage
-    if (sc_check(sc_raiseattackspeed0))
+    if (sc_check(SC_SPEEDPOTION0))
         goto OnFF01Y;
     goto OnFF01N;
 
@@ -269,7 +269,7 @@ OnFF01Y:
     goto OnFF01N;
 
 OnFF01N:
-    if (sc_check(sc_raiseattackstrength))
+    if (sc_check(SC_ATKPOT))
         goto OnFF02Y;
     goto OnFF02N;
 
@@ -307,7 +307,7 @@ OnFF05Y:
     goto OnFF05N;
 
 OnFF05N:
-    if (sc_check(sc_slowpoison))
+    if (sc_check(SC_SLOWPOISON))
         goto OnFF06Y;
     goto OnFF06N;
 
@@ -326,7 +326,7 @@ OnMTBlissOblivion:
     misceffect 51, strcharinfo(0);
     misceffect 52, strcharinfo(0); // FIXME
     // Poison
-    sc_start sc_poison, 1, 80;
+    sc_start SC_POISON, 1, 80;
     // Adjust Map Mask
     if ($@DD5_DEFCON == 0)
         mapmask 1;
@@ -1141,9 +1141,9 @@ L_DEFCON2:
 
 // DEFCON 3 - Potion Immunity
 L_DEFCON3:
-    if (sc_check(sc_raiseattackspeed0))
+    if (sc_check(SC_SPEEDPOTION0))
         set @dd5_dmg, 0;
-    if (sc_check(sc_raiseattackstrength))
+    if (sc_check(SC_ATKPOT))
         set @dd5_dmg, 0;
     goto L_Return;
 
@@ -1213,7 +1213,7 @@ function|script|FinalExamAttack
         goto L_Return;
 
     // Assign attack speed delay - 300ms with pots, 600ms without
-    set @dd5_timer, if_then_else(sc_check(sc_raiseattackspeed0), gettimetick(0)+300, gettimetick(0)+600);
+    set @dd5_timer, if_then_else(sc_check(SC_SPEEDPOTION0), gettimetick(0)+300, gettimetick(0)+600);
 
     // Calculate HIT and CRIT rate
     set @dd5_crit, (rand(10000) < CRIT);
@@ -1224,7 +1224,7 @@ function|script|FinalExamAttack
     set @dd5_dmg, ATK1+BASE_ATK;
 
     // Strength Potion - DMG +50%
-    if (sc_check(sc_raiseattackstrength))
+    if (sc_check(SC_ATKPOT))
         set @dd5_dmg, @dd5_dmg*15/10;
 
     // Boss defense
diff --git a/world/map/npc/items/shock_sweet.txt b/world/map/npc/items/shock_sweet.txt
index dc61790d..bbb7ac53 100644
--- a/world/map/npc/items/shock_sweet.txt
+++ b/world/map/npc/items/shock_sweet.txt
@@ -11,7 +11,7 @@ function|script|useShockSweet
 L_Change:
     setlook LOOK_HAIR_COLOR, (HC_WHITE - Class) + 1;
     message strcharinfo(0), "Gah! That was some strong stuff!";
-    sc_start sc_poison, 1, 20;
+    sc_start SC_POISON, 1, 20;
     misceffect 15, strcharinfo(0);
     return;
 }
diff --git a/world/map/npc/magic/level2-toxic-dart.txt b/world/map/npc/magic/level2-toxic-dart.txt
index 6fde4545..ef621cbb 100644
--- a/world/map/npc/magic/level2-toxic-dart.txt
+++ b/world/map/npc/magic/level2-toxic-dart.txt
@@ -28,7 +28,7 @@ OnAttack:
     if (target(BL_ID, @target_id, 50) != 50) goto L_FreeRecast; // 0x20 | 0x02 | 0x10
     void call("elt_damage", @phlexspell[0], @phlexspell[1], ELT_NEUTRAL, ELT_POISON, FX_NONE);
     if(@target_id != BL_ID && isloggedin(@target_id)) // this is a dirty trick to check if the target is a player
-        sc_start sc_poison, @phlexspell[4], @phlexspell[5], @target_id;
+        sc_start SC_POISON, @phlexspell[4], @phlexspell[5], @target_id;
     set @phlexspell[3], @phlexspell[3] - 1;
     goto L_FreeRecast;
 
-- 
cgit v1.2.3-70-g09d2