Merge branch 'master' into testserver

Conflicts solved with -X theirs

5 files changed, 67 insertions, 5 deletions

diff --git a/npc/003-0/_import.txt b/npc/003-0/_import.txt
index 0ec5970cb..3ed596714 100644
--- a/npc/003-0/_import.txt
+++ b/npc/003-0/_import.txt
@@ -2,6 +2,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/003-0/_warps.txt",
 "npc/003-0/colin.txt",
+"npc/003-0/enzo.txt",
 "npc/003-0/luca.txt",
 "npc/003-0/recepcionist.txt",
 "npc/003-0/saves.txt",
diff --git a/npc/003-0/enzo.txt b/npc/003-0/enzo.txt
new file mode 100644
index 000000000..6ebdefec6
--- /dev/null
+++ b/npc/003-0/enzo.txt
@@ -0,0 +1,59 @@
+// TMW2 Script
+// Author:
+//  Jesusalva
+// Description:
+//  Forgetful
+
+003-0,68,25,0	script	Enzo	NPC_BLACKWIZARD,{
+    mesn l("Enzo, the Forgetful");
+    mesq l("What was I doing before...? I forgot!");
+    next;
+    mesc l("Teaching Enzo your skills will make you both forget them."), 1;
+    mesc l("Once your skill is forgotten, the Magic Skill Points used will be freed."), 1;
+    mesc l("But be careful: Only 1MSP-costed skills can be forgotten, and learning fees WON'T be given back!"), 1;
+    do
+    {
+        next;
+        mesc l("Which skill will you FORGET permanently today?"), 1;
+        menuint
+            l("Uhm... Bye?"), 0,
+            rif(getskilllv(AL_HEAL),        l("Healing")), AL_HEAL,
+            rif(getskilllv(TMW2_SAGE),      l("Mana Wisdom")), TMW2_SAGE,
+            rif(getskilllv(HW_MAGICPOWER),  l("Accumulate Power")), HW_MAGICPOWER,
+            rif(getskilllv(SM_PROVOKE),     l("Provoke")), SM_PROVOKE,
+            rif(getskilllv(SA_FREECAST),    l("Free Casting")), SA_FREECAST,
+            rif(getskilllv(TF_BACKSLIDING), l("Tactical Retreat")), TF_BACKSLIDING,
+            rif(getskilllv(MG_FIREWALL),    l("Nature Wall")), MG_FIREWALL,
+            rif(getskilllv(ALL_FULL_THROTTLE), l("Last Resort")), ALL_FULL_THROTTLE,
+            rif(getskilllv(SM_BASH),        l("Falkon Punch!")), SM_BASH,
+            rif(getskilllv(MC_MAMMONITE),   l("Supreme Attack")), MC_MAMMONITE,
+            rif(getskilllv(AC_SHOWER),      l("Arrow Shower")), AC_SHOWER,
+            rif(getskilllv(MG_FIREBALL),    l("Fireball")), MG_FIREBALL,
+            rif(getskilllv(AL_HOLYLIGHT),   l("Holy Light")), AL_HOLYLIGHT,
+            rif(getskilllv(MG_SOULSTRIKE),  l("Magic Strike")), MG_SOULSTRIKE,
+            l("None at the moment!"), 0;
+        if (!@menuret)
+            close;
+        mes "";
+        mesc l("Skill @@ will be permanently lost!", @menuret), 1;
+        mesc l("Continue anyway?"), 1;
+        if (askyesno() == ASK_YES) {
+            .@lv=getskilllv(@menuret);
+            skill @menuret, 0, 0;
+            MAGIC_PTS-=.@lv;
+            mesc l("Skill @@ has been lost", @menuret), 3;
+            mesc l("You recovered @@ magic skill points", .@lv), 3;
+        } else {
+            mesn l("Enzo, the Forgetful");
+            mesq l("Uh, what?");
+        }
+    } while (@menuret);
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 5;
+    end;
+
+}
+
diff --git a/npc/003-0/luca.txt b/npc/003-0/luca.txt
index b5a271f52..dc5720ebd 100644
--- a/npc/003-0/luca.txt
+++ b/npc/003-0/luca.txt
@@ -50,7 +50,7 @@
                 mesc l("You do not meet all requisites for this skill."), 1;
             break;
         case ASC_METEORASSAULT:
-            if (!mlearn(ASC_METEORASSAULT, 5, 3, FluoPowder, 3))
+            if (!mlearn(ASC_METEORASSAULT, 5, 2, FluoPowder, 3))
                 mesc l("You do not meet all requisites for this skill."), 1;
             break;
         case SN_SHARPSHOOTING:
diff --git a/npc/003-0/notes b/npc/003-0/notes
index e6a9a3193..f5ce8d630 100644
--- a/npc/003-0/notes
+++ b/npc/003-0/notes
@@ -85,9 +85,11 @@ UNUSED/SPECIAL
 	GS_SNAKEEYE (→AC_VULTURE)
 
 THIEF/MERCHANT-POLICE
-    ALL_INCCARRY
     TF_STEAL
-    ...?
+    ALL_INCCARRY
+    TF_MISS / TF_DOUBLE ?
+    MC_DISCOUNT / MC_OVERCHARGE (FIXME) ?
+    TF_HIDING?
     MC_PUSHCART?
     MC_VENDING?
 
diff --git a/npc/003-0/recepcionist.txt b/npc/003-0/recepcionist.txt
index 7bd39ef0f..e2133a2ae 100644
--- a/npc/003-0/recepcionist.txt
+++ b/npc/003-0/recepcionist.txt
@@ -5,13 +5,13 @@
 //  Magic School recepcionist (TODO: Give S. Badge)
 
 003-0,47,44,4	script	Recepcionist#003-0	NPC_FEMALE,{
-    if (getskilllv(TMW2_SKILLPERMIT) == 2 && MAGIC_LVL >= 3 && ST_TIER >= 1) goto L_T3_S0;
+    if (MGQUEST && getskilllv(TMW2_SKILLPERMIT) == 2 && MAGIC_LVL >= 3 && ST_TIER >= 1) goto L_T3_S0;
 
     mesn;
     mesq l("Hello, and welcome to the Magic School of Tulimshar.");
     next;
     mesn;
-    mesq l("Unfortunately, we're shutting down. This building is too old.");
+    mesq l("Thankfully, we'll be moving soon. This building is old and the roof is falling.");
     next;
     mesn;
     mesq l("I hope our new campus get built soon. It'll be much better than here.");