Some music filename sanitization, siege map masks

3 files changed, 20 insertions, 21 deletions

diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 7b16aa4b8..72bfcb716 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -121,6 +121,7 @@ L_MKControl:
 
 L_MKSmall:
     addmapmask "003-1", 2;
+    addmapmask "004-1", 2;
     changemusic "003-1", "mythica.ogg";
     disablenpc("Mana Stone");
     $@SIEGE_TULIM=0; // factor zero
@@ -133,7 +134,8 @@ L_MKSmall:
 
 L_MKMedium:
     addmapmask "003-1", 2;
-    changemusic "003-1", "eric matyas - ghoulish fun.ogg";
+    addmapmask "004-1", 2;
+    changemusic "003-1", "eric_matyas_ghouls.ogg";
     disablenpc("Mana Stone");
     $@SIEGE_TULIM=1; // factor one
     pvpon("003-1");
@@ -145,6 +147,7 @@ L_MKMedium:
 
 L_MKHuge:
     addmapmask "003-1", 2;
+    addmapmask "004-1", 2;
     changemusic "003-1", "misuse.ogg";
     disablenpc("Mana Stone");
     $@SIEGE_TULIM=5; // factor five
@@ -300,7 +303,8 @@ OnTimer600000:
 
 OnTimer630000:
     removemapmask "003-1", 2;
-    changemusic "003-1", "bartk - the adventure begins.ogg"; // Restore to default
+    removemapmask "004-1", 2;
+    changemusic "003-1", "bartk_adventure.ogg"; // Restore to default
     enablenpc("Mana Stone");
     $@SIEGE_TULIM$=0;
     killmonsterall("003-1", 0);
diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt
index 778acd60e..da9ffd312 100644
--- a/npc/005-1/ayasha.txt
+++ b/npc/005-1/ayasha.txt
@@ -26,8 +26,7 @@
     }
 
     .@has = getq(CandorQuest_HAS);
-    if (.@has == 0)
-    {
+    if (.@has == 0) {
         speech S_LAST_NEXT,
             l("Ah, the kids are playing hide and seek, but I am afraid they went too far. A monster attack could start anytime, after all."),
             l("I am currently very worried with them. They're just children! They don't know how to fight!"),
@@ -39,16 +38,13 @@
                 l("I can't, sorry.");
 
             setq CandorQuest_HAS, 1;
-            switch (@menu)
-            {
+            switch (@menu) {
                 case 1:
                     quest_findAllKids;
                     break;
             }
         } while (@menu != 2);
-    }
-    else if (.@has == 1)
-    {
+    } else if (.@has == 1) {
         mesn;
         mesq l("Even if the city has not been attacked on the last few years, I can't help but be concerned while the kids are playing hide and seek."),
         next;
@@ -61,22 +57,17 @@
                 l("Yes!"),
                 l("I can't, sorry.");
 
-            switch (@menu)
-            {
+            switch (@menu) {
                 case 1:
                     quest_findAllKids;
                     break;
             }
         } while (@menu != 2);
-    }
-    else if (.@has == 2)
-    {
+    } else if (.@has == 2) {
         mesn;
         mesq l("You still haven't found all of them yet.");
         close;
-    }
-    else if (.@has == 3)
-    {
+    } else if (.@has == 3) {
         speech S_LAST_NEXT,
             l("Thank you, here is your reward and... some pocket money.");
             narrator("You receive 30 exp and 50 GP.");
@@ -84,9 +75,7 @@
         Zeny = (Zeny + 50);
         setq CandorQuest_HAS, 4;
         close;
-    }
-    else
-    {
+    } else {
         mesn;
         mesq l("Thank you for your help.");
         if (BaseLevel >= 24 && gettimetick(2) > .RENT_TIME) goto L_Sword;
@@ -142,6 +131,7 @@ L_MKControl:
     close;
 
 L_MKSmall:
+    addmapmask "005-1", 2;
     changemusic "005-1", "mythica.ogg";
     disablenpc("Mana Stone");
     pvpon("005-1");
@@ -233,7 +223,8 @@ OnTimer600000:
     end;
 
 OnTimer630000:
-    changemusic "005-1", "bartk - the adventure begins.ogg";
+    removemapmask "005-1", 2;
+    changemusic "005-1", "bartk_adventure.ogg";
     enablenpc("Mana Stone");
     killmonsterall("005-1", 0);
     pvpoff("005-1");
diff --git a/npc/009-1/guards.txt b/npc/009-1/guards.txt
index 76d0212c0..3fda28c91 100644
--- a/npc/009-1/guards.txt
+++ b/npc/009-1/guards.txt
@@ -30,6 +30,7 @@ L_MKControl:
     close;
 
 L_MKSmall:
+    addmapmask "009-1", 2;
     changemusic "009-1", "mythica.ogg";
     disablenpc("Mana Stone");
     $@SIEGE_HALI=0; // factor zero
@@ -41,6 +42,7 @@ L_MKSmall:
     close;
 
 L_MKMedium:
+    addmapmask "009-1", 2;
     changemusic "009-1", "eric matyas - ghoulish fun.ogg";
     disablenpc("Mana Stone");
     $@SIEGE_HALI=1; // factor one
@@ -52,6 +54,7 @@ L_MKMedium:
     close;
 
 L_MKHuge:
+    addmapmask "009-1", 2;
     changemusic "009-1", "misuse.ogg";
     disablenpc("Mana Stone");
     $@SIEGE_HALI=5; // factor five
@@ -175,6 +178,7 @@ OnTimer600000:
     end;
 
 OnTimer630000:
+    removemapmask "009-1", 2;
     changemusic "009-1", "dragon_and_toast.ogg"; // Restore to default
     enablenpc("Mana Stone");
     $@SIEGE_HALI$=0;