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

Conflicts:
	world/map/db/item_db.txt

1 files changed, 11 insertions, 11 deletions

diff --git a/world/map/npc/013-2/notes.txt b/world/map/npc/013-2/notes.txt
index f946254f..f0aee204 100644
--- a/world/map/npc/013-2/notes.txt
+++ b/world/map/npc/013-2/notes.txt
@@ -1,25 +1,25 @@
 //
 
-013-2.gat,23,32,0|script|Motto|400,
+013-2.gat,23,32,0|script|Motto#wiz|400,
 {
     mes "Mid pleasures and palaces though we may roam,";
     mes "Be it ever so humble, there's no place like home.";
     close;
 }
 
-013-2.gat,30,32,0|script|Note|400,
+013-2.gat,30,32,0|script|Note#wiz|400,
 {
     mes "Please do not open.";
     close;
 }
 
-013-2.gat,38,20,0|script|Saying|400,
+013-2.gat,38,20,0|script|Saying#wiz|400,
 {
     mes "The early bird catcheth the worm.";
     close;
 }
 
-013-2.gat,27,21,0|script|Mirror|400,
+013-2.gat,27,21,0|script|Mirror#wiz|400,
 {
     mes "You say: \"Mirror mirror on the wall, who has the nicest haircut of them all?\"";
     next;
@@ -35,7 +35,7 @@
 }
 
 // Warp to north-eastern woods
-013-2.gat,25,23,0|script|Spell|400,
+013-2.gat,25,23,0|script|Spell#wiz1|400,
 {
     mes "You read: \"I see trees of green, red roses too. I see them bloom for me and you. And I think to myself: \'What a wonderful world\'\"";
     next;
@@ -48,7 +48,7 @@
 }
 
 // Warp to Indian in south-eastern desert
-013-2.gat,27,24,0|script|Spell|400,
+013-2.gat,27,24,0|script|Spell#wiz2|400,
 {
     mes "You read: \"A red-coloured fellow smoking his pipe - down in the desert - that's what I like!\"";
     next;
@@ -69,7 +69,7 @@ L_cheat:
 }
 
 // Warp to snow area
-013-2.gat,25,27,0|script|Spell|400,
+013-2.gat,25,27,0|script|Spell#wiz3|400,
 {
     mes "You read: \"Snow-white flakes and eminent frost - I'll go there, whatever the cost!\"";
     next;
@@ -100,7 +100,7 @@ L_Close:
 }
 
 // Warp to Dimond
-013-2.gat,27,27,0|script|Spell|400,
+013-2.gat,27,27,0|script|Spell#wiz4|400,
 {
     mes "You read: \"People and cosiness, lively and fun - that's where I've gone!\"";
     next;
@@ -111,7 +111,7 @@ L_Close:
 }
 
 // Warp to mines level 2
-013-2.gat,26,28,0|script|Spell|400,
+013-2.gat,26,28,0|script|Spell#wiz5|400,
 {
     mes "You read: \"Darkness and legs, eight of them each - I'd rather not go there, but now it's too late...\"";
     next;
@@ -122,7 +122,7 @@ L_Close:
 }
 
 // Death
-013-2.gat,21,29,0|script|Spell|400,
+013-2.gat,21,29,0|script|Spell#wiz6|400,
 {
     mes "You read: \"Heart stops pumping, breath begone - life is stopping, death has come!\"";
     next;
@@ -133,7 +133,7 @@ L_Close:
 }
 
 // Naked
-013-2.gat,28,29,0|script|Spell|400,
+013-2.gat,28,29,0|script|Spell#wiz7|400,
 {
     mes "You read: \"Cotton, steel, leather and wool - have I ever seen a greater fool?\"";
     next;