11 files changed, 64 insertions, 5 deletions
diff --git a/client-data b/client-data
-Subproject 2338663882dff063702ec069349ce422258b29e
+Subproject a7f2d4b61d31bcf41a2bfea3d1ca905e437a9c8
diff --git a/tools b/tools
-Subproject a67f3867ada037efdd6a983e090f014b8ed24b8
+Subproject 17396e31fede09db15c805783748b1835d8ac3c
diff --git a/world/conf/char_athena.conf b/world/conf/char_athena.conf
index ee2cba1b..2e85a1b3 100644
--- a/world/conf/char_athena.conf
+++ b/world/conf/char_athena.conf
@@ -41,6 +41,26 @@ char_name_letters: abcdefghijklmnoprstquvwxyz
 //char_name_letters: {}
 char_name_letters: |~
 
+// minimum char name length
+min_name_length: 4
+
+// maximum characters allowed per account
+// set to 1 if you want to limit accounts to 1 character
+char_slots: 9
+
+// max hair style and hair color
+max_hair_style: 20
+max_hair_color: 11
+
+// the minimum value for stats (str, agi, ...)
+min_stat_value: 1
+
+// the maximum value for stats (str, agi, ...)
+max_stat_value: 9
+
+// the sum of all stats combined (str + agi + int + ...)
+total_stat_sum: 30
+
 // Filename of the file which receives the online players list in text
 online_txt_filename: online.txt
 
diff --git a/world/map/db/const-mapflags.txt b/world/map/db/const-mapflags.txt
index 94b1710a..486ab375 100644
--- a/world/map/db/const-mapflags.txt
+++ b/world/map/db/const-mapflags.txt
@@ -22,7 +22,7 @@ MF_PVP_NOCALCRANK   25
 MF_NOWARP           13
 MF_NOWARPTO         26
 MF_NOPVP            14
-//MF_NOICEWALL        15
+MF_MASK             15
 MF_SNOW             16
 MF_FOG              17
 MF_SAKURA           18
diff --git a/world/map/news.d/50-v2015.06.30.txt b/world/map/news.d/50-v2015.06.30.txt
new file mode 100644
index 00000000..ef589d96
--- /dev/null
+++ b/world/map/news.d/50-v2015.06.30.txt
@@ -0,0 +1,17 @@
+{title:PvP enhancements}
+{date:2015-06-30}
+
+This tiny update mainly includes bug fixes.
+
+Release Notes v15.6.30
+{ul}
+{li}New features for PvP.{/li}
+{li}Bug fixes for PvP.{/li}
+{li}Some enhancements to the starting area.{/li}
+{li}The blue sage quest exploit is fixed.{/li}
+{li}Some misc dialogue changes.{/li}
+{/ul}
+
+Read More: {link:http://ow.ly/OXNl5}
+
+{author:TMW Development Team}
diff --git a/world/map/npc/013-2/wizard.txt b/world/map/npc/013-2/wizard.txt
index 37eaeae5..93905600 100644
--- a/world/map/npc/013-2/wizard.txt
+++ b/world/map/npc/013-2/wizard.txt
@@ -63,7 +63,7 @@ L_NewStudent:
     next;
 
     // check if the player has the knowledge of any skill
-    if (getskilllv(SKILL_POOL))
+    if (getskilllv(SKILL_POOL) && (getskilllv(SKILL_MAGIC_ASTRAL) < 1))
         menu
             "That would be very kind of you!", L_TeachSpell,
             "Actually I am looking for someone teaching me some more magic skills.", L_AstralSoul,
diff --git a/world/map/npc/029-2/mapflags.txt b/world/map/npc/029-2/mapflags.txt
index 1de2d675..09b62b45 100644
--- a/world/map/npc/029-2/mapflags.txt
+++ b/world/map/npc/029-2/mapflags.txt
@@ -1,2 +1,3 @@
 029-2|mapflag|nosave|029-2,22,24
 029-2|mapflag|resave|029-2,22,24
+029-2|mapflag|mask|1
diff --git a/world/map/npc/029-2/nyle.txt b/world/map/npc/029-2/nyle.txt
index 3e15d6cb..f705b585 100644
--- a/world/map/npc/029-2/nyle.txt
+++ b/world/map/npc/029-2/nyle.txt
@@ -7,7 +7,7 @@
     mes "[Nyle]";
     mes "\"Visiting the bank too right? We're only a small village but Cynric is the best bank guy I know.\"";
     menu
-        "Yeah, your right.", L_Close,
+        "Yeah, you're right.", L_Close,
         "What is banking?", L_Explain;
 
 L_Explain:
diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index 940c61a4..6af2912e 100644
--- a/world/map/npc/029-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -55,6 +55,11 @@ L_Tut:
 L_Carpet:
     mes "[Sorfina]";
     mes "\"Try to take a few steps and walk to that carpet over there.";
+    next;
+    npcaction 2, "#Carpet";
+    mapmask getmask() | 4;
+    next;
+    npcaction 3;
     mes "Press [###keyMoveUp;] to move up, press [###keyMoveDown;] to move down, ";
     mes "press [###keyMoveLeft;] to move left, press [###keyMoveRight;] to move right ";
     mes " or click on the place you want to go to.\"";
@@ -63,8 +68,14 @@ L_Carpet:
 
 L_Dresser:
     mes "[Sorfina]";
+    mes "\"You should get dressed now.\"";
+    next;
+    npcaction 2, "Dresser#tutorial";
+    mapmask getmask() | 32;
     mes "\"In that dresser there are some clothes you can wear.\"";
     mes "\"To interact with things in your environment or talk to NPCs you can either click on it or press [###keyTargetNPC;] to focus and [###keyTalk;] to talk/activate.\"";
+    next;
+    npcaction 3;
     mes "\"Now get the clothes out of the dresser.\"";
     goto L_Close;
 
@@ -94,6 +105,7 @@ L_Clothes:
     mes "She digs in her pocket for a moment.";
     mes "\"And here is some money for you. Don't spend it all in one place.";
     mes "Now go help Tanisha downstairs.\"";
+    mapmask getmask() | 8;
     set Zeny, Zeny + 30;
     set QL_BEGIN, 4;
     goto L_Close;
@@ -253,15 +265,20 @@ OnTouch:
     goto L_Start;
 }
 
-029-2,33,27,0|script|#Carpet|32767,1,1
+029-2,33,27,0|script|#Carpet|127,1,1
 {
     if (QL_BEGIN != 1)
         end;
+    mapmask getmask();
     mes "[Sorfina]";
     mes "\"You should get dressed now.\"";
+    next;
+    npcaction 2, "Dresser#tutorial";
+    mapmask getmask() | 16;
     mes "\"In that dresser there are some clothes you can wear.\"";
     mes "\"To interact with things in your environment or talk to NPCs you can either click on it or press N to focus and T to talk/activate.\"";
     next;
+    npcaction 3;
     mes "\"Now get the clothes out of the dresser.\"";
     set QL_BEGIN, 2;
     close;
@@ -284,6 +301,7 @@ L_Walk:
     close;
 
 L_Shirt:
+    mapmask getmask();
     mes "You take a simple Cotton Shirt and some very worn-out Ragged Shorts out of the dresser.";
     getitem "CottonShirt", 1;
     getitem "RaggedShorts", 1;
@@ -308,6 +326,7 @@ L_CloseDis:
 {
     if (QL_BEGIN < 4)
         goto L_Block;
+    mapmask getmask();
     warp "029-2", 112, 85;
     end;
 
diff --git a/world/map/npc/029-2/tanisha.txt b/world/map/npc/029-2/tanisha.txt
index 012f93ff..d69195a5 100644
--- a/world/map/npc/029-2/tanisha.txt
+++ b/world/map/npc/029-2/tanisha.txt
@@ -95,6 +95,7 @@ L_Stats:
     mes "\"And it seems you became stronger and more experienced.";
     mes "That means you got some status points which you can use to increase your abilities.\"";
     mes "\"Press [###keyWindowStatus;] or click the Status button in the bar at the upper right to see your status window. There you can distribute your points on six different properties.\"";
+    mapmask getmask() | 2;
     next;
     goto L_StatsRe;
 
@@ -279,6 +280,7 @@ OnTouch:
     goto L_Block;
 
 L_Warp:
+    mapmask getmask();
     warp "029-1", 32, 100;
     end;
 
diff --git a/world/map/npc/annuals/xmas/mobmanager.txt b/world/map/npc/annuals/xmas/mobmanager.txt
index d4be46dc..5d97e340 100644
--- a/world/map/npc/annuals/xmas/mobmanager.txt
+++ b/world/map/npc/annuals/xmas/mobmanager.txt
@@ -72,7 +72,7 @@ OnTally:
     end;
 }
 
-030-3.gat,0,0,0|script|XmasSpawnCounter#3|400
+030-3.gat,0,0,0|script|XmasSpawnCounter#2|400
 {
     end;