12 files changed, 75 insertions, 0 deletions
diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index 8eaff6f6..1cb16a6b 100755
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -29,6 +29,7 @@ mapreg_txt: save/mapreg.txt
 
 // Maps
 
+map: new_17-1.gat
 map: new_16-1.gat
 map: new_15-1.gat
 map: new_14-1.gat
@@ -46,6 +47,10 @@ map: new_3-1.gat
 map: new_2-1.gat
 map: new_1-1.gat
 
+// PVP
+
+npc: npc/pvp/maps.txt
+
 // NPCs (ordered in alphabetical order by name).
 
 // Tulimshar 3-1 
@@ -107,6 +112,7 @@ npc: npc/xmas/taro.txt
 // Snow village 11-1
 //npc: npc/snow-village/monsters.txt
 npc: npc/snow-village/sexchanger.txt
+npc: npc/snow-village/shops.txt
 npc: npc/snow-village/startrek.txt
 npc: npc/snow-village/passages.txt
 
@@ -117,6 +123,7 @@ npc: npc/ice-cave/passages.txt
 // Small cave (test map) 4-1
 npc: npc/cave-small/hermit.txt
 npc: npc/cave-small/monsters.txt
+npc: npc/cave-small/passages.txt
 
 // Woodland-desert link 15-1
 npc: npc/woodland-desert/monsters.txt
@@ -125,3 +132,11 @@ npc: npc/woodland-desert/passages.txt
 // South-west woodland 16-1
 npc: npc/south-east-woodland/monsters.txt
 npc: npc/south-east-woodland/passages.txt
+
+// Big cave 17-1
+npc: npc/cave-big/monsters.txt
+npc: npc/cave-big/passages.txt
+
+// Arena 6-1
+npc: npc/arena/guards.txt
+npc: npc/arena/monsters.txt
diff --git a/data/new_17-1.wlk b/data/new_17-1.wlk
new file mode 100644
index 00000000..59b1a660
--- /dev/null
+++ b/data/new_17-1.wlk
diff --git a/data/new_6-1.wlk b/data/new_6-1.wlk
index dcfa7891..e030b4ca 100644
--- a/data/new_6-1.wlk
+++ b/data/new_6-1.wlk
diff --git a/data/resnametable.txt b/data/resnametable.txt
index 8145e6a5..3d7a71cf 100644
--- a/data/resnametable.txt
+++ b/data/resnametable.txt
@@ -70,6 +70,7 @@ new_13-1.gat#new_13-1.wlk#
 new_14-1.gat#new_14-1.wlk#
 new_15-1.gat#new_15-1.wlk#
 new_16-1.gat#new_16-1.wlk#
+new_17-1.gat#new_17-1.wlk#
 new_1-2.gat#new_zone02.gat#
 new_2-2.gat#new_zone02.gat#
 new_3-2.gat#new_zone02.gat#
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 92019b71..427fb27c 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -19,3 +19,4 @@
 1018,Violet,Violet,30,500,0,55,3,1,7,10,0,5,1,1,1,0,20,25,1,1,1,3,21,129,800,1872,672,480,505,800,501,150,518,400,533,150,521,70,522,1,909,0,0,0,0,0,0,0,,,,,,
 1019,Shroom,Shroom,30,250,0,45,2,1,7,10,0,5,1,1,1,0,20,25,1,1,1,3,21,129,800,1872,672,480,505,800,501,150,518,400,533,150,521,70,522,1,909,0,0,0,0,0,0,0,,,,,,
 1020,Fluffy,Fluffy,30,250,0,45,2,1,7,10,0,5,1,1,1,0,20,25,1,1,1,3,21,129,800,1872,672,480,505,800,501,150,518,400,533,150,521,70,522,1,909,0,0,0,0,0,0,0,,,,,,
+1021,Lamp_snake,Lamp snake,30,250,0,45,2,1,7,10,0,5,1,1,1,0,20,25,1,1,1,3,21,129,800,1872,672,480,505,800,501,150,518,400,533,150,521,70,522,1,909,0,0,0,0,0,0,0,,,,,,
diff --git a/npc/arena/guards.txt b/npc/arena/guards.txt
new file mode 100644
index 00000000..563f3949
--- /dev/null
+++ b/npc/arena/guards.txt
@@ -0,0 +1,23 @@
+new_6-1.gat,77,37,0	script	RoyalGuard	125,{
+	mes "[Royal Guard]";
+	mes "Do you want to go back?";
+	next;
+	
+	menu "Yes",-,"No",L_No;
+	mes "Ok.";
+	next;
+	
+	warp "new_8-1.gat",25,23;
+	close;
+	
+L_No:
+	mes "Have fun.";
+	close;
+}
+
+new_6-1.gat,69,37,0	script	RoyalGuard	126,{
+	mes "[Royal Guard]";
+	mes "Don't touch me!";
+	mes "You won't find it very funny.";
+	close;
+}
diff --git a/npc/arena/monsters.txt b/npc/arena/monsters.txt
new file mode 100644
index 00000000..12d38eb3
--- /dev/null
+++ b/npc/arena/monsters.txt
@@ -0,0 +1 @@
+new_6-1.gat,0,0,0,0	monster	Maggot	1002,10,0,0,0
diff --git a/npc/cave-big/monsters.txt b/npc/cave-big/monsters.txt
new file mode 100644
index 00000000..c6c80d08
--- /dev/null
+++ b/npc/cave-big/monsters.txt
@@ -0,0 +1,2 @@
+new_17-1.gat,0,0,0,0	monster	Lamp_Snake	1021,40,0,0,0
+new_17-1.gat,0,0,0,0	monster	Shroom	1019,15,0,0,0
diff --git a/npc/cave-big/passages.txt b/npc/cave-big/passages.txt
new file mode 100644
index 00000000..b04786e5
--- /dev/null
+++ b/npc/cave-big/passages.txt
@@ -0,0 +1 @@
+new_17-1.gat,71,10	warp	firstlvl	3,0,new_4-1.gat,31,24
diff --git a/npc/cave-small/passages.txt b/npc/cave-small/passages.txt
new file mode 100644
index 00000000..04f9ebb1
--- /dev/null
+++ b/npc/cave-small/passages.txt
@@ -0,0 +1 @@
+new_4-1.gat,31,22	warp	secondlvl	3,0,new_17-1.gat,72,11
diff --git a/npc/pvp/maps.txt b/npc/pvp/maps.txt
new file mode 100644
index 00000000..bd5a034c
--- /dev/null
+++ b/npc/pvp/maps.txt
@@ -0,0 +1 @@
+new_6-1.gat mapflag pvp
diff --git a/npc/tulimshar-casino/casino.txt b/npc/tulimshar-casino/casino.txt
index dae9324f..db39298f 100644
--- a/npc/tulimshar-casino/casino.txt
+++ b/npc/tulimshar-casino/casino.txt
@@ -39,6 +39,35 @@ L_NoMoney:
 	close;
 }
 
+new_8-1.gat,24,23,0	script	RoyalGuard	125,{
+	mes "[Royal Guard]";
+	mes "Hey you seems tough enough!";
+	mes "Would you like to prove your skills?";
+	next;
+	
+	mes "[Royal Guard]";
+	mes "If you give me 1000gp I'll let you in.";
+	mes "You will fight against other players.";
+	next;
+	
+	menu "Yes",-,"No",L_No;
+	mes "Get ready!";
+	next;
+	
+	if (zeny < 1000) goto L_NoMoney;
+	set zeny,zeny-1000;
+	warp "new_6-1.gat",0,0;
+	close;
+	
+L_No:
+	mes "Ha ha, coward.";
+	close;
+	
+L_NoMoney:
+	mes "Hey! You don't have enough money!";
+	close;
+}
+
 new_8-1.gat,134,23,0	script	Worker	117,{
 	mes "[Valdo]";
 	mes "Please let me work, I'm really in a hurry!";