summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/003-0/recepcionist.txt4
-rw-r--r--npc/commands/music.txt6
2 files changed, 6 insertions, 4 deletions
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.");
diff --git a/npc/commands/music.txt b/npc/commands/music.txt
index e419487c8..410a24421 100644
--- a/npc/commands/music.txt
+++ b/npc/commands/music.txt
@@ -29,8 +29,8 @@ OnCall:
if (.@m$ == "Not found") {
//.@m$ = implode(.@atcmd_parameters$[0], " ");
dispbottom "Invalid music key. Current accepted values are:";
- dispbottom "ship, city, ghoul, surreal, magic, forest, mythica, acid, misuse, prelude, sunrise, peace, peace2, toast, woodland2";
- dispbottom "unforgiving, deepcave, 8bit, action, hurns, fields, tulim, candor, lof, icecave, manacave, adventure, dance";
+ dispbottom "ship, city, ghoul, surreal, magic, forest, mythica, acid, misuse, prelude, sunrise, peace, peace2, peace3, toast, woodland2";
+ dispbottom "unforgiving, deepcave, 8bit, action, hurns, fields, tulim, candor, lof, icecave, manacave, adventure, dance, academy";
} else {
changemusic .@map$, .@m$;
}
@@ -53,6 +53,7 @@ OnInit:
htput(.hash, "sunrise", "tws_birds_in_the_sunrise.ogg");
htput(.hash, "peace", "peace.ogg");
htput(.hash, "peace2", "peace2.ogg");
+ htput(.hash, "peace3", "peace3.ogg");
htput(.hash, "toast", "dragon_and_toast.ogg");
htput(.hash, "woodland2", "New_Woodlands.ogg");
htput(.hash, "unforgiving","Unforgiving_Lands.ogg");
@@ -68,4 +69,5 @@ OnInit:
htput(.hash, "adventure", "tmw_adventure.ogg");
htput(.hash, "manacave", "tws_green_island.ogg");
htput(.hash, "dance", "dance_monster.ogg");
+ htput(.hash, "academy", "academy_bells.ogg");
}