Add the necessary NPCs to the new maps

6 files changed, 74 insertions, 1 deletions

diff --git a/npc/027-0/enrique.txt b/npc/027-0/enrique.txt
index 9bc727562..11bacac9f 100644
--- a/npc/027-0/enrique.txt
+++ b/npc/027-0/enrique.txt
@@ -101,6 +101,9 @@
             mesq l("Then someone of a scholarship rank above your must approve it, and say that your work is enough to the next scholar rank.");
             next;
             mesn;
+            mesq l("Naturally, it doesn't have to be a wiki article. But it must be noteworthy to the whole community, and wiki articles are one of the easiest ways for that.");
+            next;
+            mesn;
             mesq l("For the higher titles, you'll need vouch of multiple people. You can vouch for anyone below your rank with %s but never for someone of same or higher rank.", b("@titulate"));
             next;
             mesn;
@@ -110,7 +113,7 @@
             mesq l("Abuse can be determined by your peers or by the grandmasters, so be careful.");
             next;
             mesn;
-            mesq l("Otherwise, you can also obtain a title during the Magic Olympics. These aren't implemented yet, but they're supposed to happen every three months, and are the hardest way to obtain a title.");
+            mesq l("Otherwise, you can also obtain a title during the Magic Olympics. They happen every three months in average, and are the hardest way to obtain a title.");
             break;
         case 8:
             mesn;
diff --git a/npc/027-1/_import.txt b/npc/027-1/_import.txt
index c9802865e..e64a6334b 100644
--- a/npc/027-1/_import.txt
+++ b/npc/027-1/_import.txt
@@ -2,6 +2,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/027-1/_mobs.txt",
 "npc/027-1/_warps.txt",
+"npc/027-1/ctrl.txt",
 "npc/027-1/eliza.txt",
 "npc/027-1/elza.txt",
 "npc/027-1/enzo.txt",
diff --git a/npc/027-1/ctrl.txt b/npc/027-1/ctrl.txt
new file mode 100644
index 000000000..234fda95d
--- /dev/null
+++ b/npc/027-1/ctrl.txt
@@ -0,0 +1,38 @@
+// TMW2 Scripts.
+// Author:
+//  Jesusalva
+// Description:
+//  Magic School controlled warps
+
+027-1,120,131,0	script	#0271W01	NPC_HIDDEN,0,0,{
+    end;
+OnTouch:
+    if (ACADEMIC_RANK || is_sponsor())
+        warp "027-5", 28, 23;
+    end;
+}
+
+027-1,82,118,0	script	#0271W02	NPC_HIDDEN,0,0,{
+    end;
+OnTouch:
+    if (ACADEMIC_RANK || is_sponsor())
+        warp "027-7", 60, 48;
+    end;
+}
+
+027-1,76,118,0	script	#0271W03	NPC_HIDDEN,1,0,{
+    end;
+OnTouch:
+    if (ACADEMIC_RANK || is_sponsor())
+        warp "027-7", 41, 48;
+    end;
+}
+
+027-1,72,118,0	script	#0271W04	NPC_HIDDEN,0,0,{
+    end;
+OnTouch:
+    if (ACADEMIC_RANK || is_sponsor())
+        warp "027-7", 24, 48;
+    end;
+}
+
diff --git a/npc/027-1/laura.txt b/npc/027-1/laura.txt
index db29e3de0..8cb7734b3 100644
--- a/npc/027-1/laura.txt
+++ b/npc/027-1/laura.txt
@@ -26,6 +26,10 @@
             if (MAGIC_LVL >= 3)
                 goto L_Tier3;
             break;
+        case 3:
+            if (MAGIC_LVL >= 4)
+                goto L_Tier4;
+            break;
     }
     closeclientdialog;
     goodbye;
@@ -321,6 +325,16 @@ L_T3_Fail:
     ST_TIER=1;
     close;
 
+L_Tier4:
+    if (!ACADEMIC_RANK) {
+        mesn;
+        mesq l("Oh hello again. This time I need you to be enrolled here, for this, you need to either get a good rank at the Magic Olympics or by contributing to the world's knowledge. Talk to headmaster if you need help.");
+        close;
+    }
+    mesn;
+    mesq l("%s! I see you are a(n) %s here, very good!", academicrank());
+    close;
+
 /// Core code
 OnInit:
     .@npcId = getnpcid(.name$);
diff --git a/npc/027-7/_import.txt b/npc/027-7/_import.txt
index 9f64ac15e..cec57a43f 100644
--- a/npc/027-7/_import.txt
+++ b/npc/027-7/_import.txt
@@ -1,3 +1,4 @@
 // Map 027-7: Academy's Storage
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/027-7/_warps.txt",
+"npc/027-7/banker.txt",
diff --git a/npc/027-7/banker.txt b/npc/027-7/banker.txt
new file mode 100644
index 000000000..0a478f8fa
--- /dev/null
+++ b/npc/027-7/banker.txt
@@ -0,0 +1,16 @@
+// TMW2 Scripts.
+// Author:
+//  Jesusalva
+// Description:
+//  Magic School bank
+
+027-7,66,40,0	script	Benjamin	NPC_LLOYD,{
+    Banker(.name$, "Magic Academy", 1000000);
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 4;
+    end;
+}
+