Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 5 insertions, 5 deletions

diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index 6da0b1dc..8fb16e2c 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -1,8 +1,8 @@
 // Auldsbel the Wizard
 // Transmutation Magic expert
 
-011-1.gat,50,68,0|script|Auldsbel#_M|168,{
-
+011-1.gat,50,68,0|script|Auldsbel#_M|168,
+{
     set @mexp, MAGIC_EXPERIENCE & 65535;
 
     set @Q_STATUS_INITIAL, 0;
@@ -441,7 +441,7 @@ L_about_other_prerequisites:
 
 L_about_speed:
     mes "[Auldsbel the Wizard]";
-    mes "\"Most spells are effective immediately, unless they require some complex astral connectoin-- summoning or teleporting can take a while to take effect, for example.  Still, after casting a spell you usually need a moment to recover before casting the next.\"";
+    mes "\"Most spells are effective immediately, unless they require some complex astral connection-- summoning or teleporting can take a while to take effect, for example.  Still, after casting a spell you usually need a moment to recover before casting the next.\"";
     next;
     goto L_about_spells_minimenu;
 
@@ -944,10 +944,10 @@ L_component_quest_5:
     mes "\"I suggest that you run.\"";
     next;
     misceffect sfx_magic_transmute;
-    monster "this", 50, 68, "Grass Snake", 1034, 4, "Auldsbel#_M::onSnakeDeath";
+    monster "this", 50, 68, "Grass Snake", 1034, 4, "Auldsbel#_M::OnSnakeDeath";
     close;
 
-onSnakeDeath:
+OnSnakeDeath:
     set BOSS_POINTS, BOSS_POINTS + 5;
     message strcharinfo(0), "You gain 5 Boss Points giving you a total of " + BOSS_POINTS + ".";
     end;