Merge branch 'master' of git@gitorious.org:tmw-eathena-data/mainline into magic

6 files changed, 74 insertions, 175 deletions

diff --git a/npc/001-2_Tulimshar/_warps.txt b/npc/001-2_Tulimshar/_warps.txt
index 87d2254d..a76dc12f 100644
--- a/npc/001-2_Tulimshar/_warps.txt
+++ b/npc/001-2_Tulimshar/_warps.txt
@@ -1,7 +1,6 @@
 // 001-2 Tulimshar warps
 
 001-2.gat,25,35	warp	ToOutside	-1,-1,001-1.gat,32,72
-001-2.gat,23,24	warp	ToArena	-1,0,001-3.gat,72,31
 001-2.gat,44,25	warp	To2ndFloor	-1,0,001-2.gat,65,25
 001-2.gat,64,25	warp	To1stFloor	-1,-1,001-2.gat,42,25
 001-2.gat,67,30	warp	ToBedroom	-1,-1,001-2.gat,102,23
diff --git a/npc/002-1_Sandstorm/rogue.txt b/npc/002-1_Sandstorm/rogue.txt
index 7169e446..9d6a555f 100644
--- a/npc/002-1_Sandstorm/rogue.txt
+++ b/npc/002-1_Sandstorm/rogue.txt
@@ -30,39 +30,6 @@ L_Reset:
 
 	resetstatus;
 
-	// even though statusup2 takes a number, it does not
-	// decrease chars statspoint, hence the repeating.
-
-	statusup bStr;
-	statusup bStr;
-	statusup bStr;
-	statusup bStr;
-
-	statusup bvit;
-	statusup bvit;
-	statusup bvit;
-	statusup bvit;
-
-	statusup bInt;
-	statusup bInt;
-	statusup bInt;
-	statusup bInt;
-
-	statusup bAgi;
-	statusup bAgi;
-	statusup bAgi;
-	statusup bAgi;
-
-	statusup bDex;
-	statusup bDex;
-	statusup bDex;
-	statusup bDex;
-
-	statusup bLuk;
-	statusup bLuk;
-	statusup bLuk;
-	statusup bLuk;
-
 	mes "[Rogue Mage]";
 	mes "\"There you are.";
 	mes "";
diff --git a/npc/013-3_Cave/_mobs.txt b/npc/013-3_Cave/_mobs.txt
index b89dc170..c0de99b6 100644
--- a/npc/013-3_Cave/_mobs.txt
+++ b/npc/013-3_Cave/_mobs.txt
@@ -1,29 +1,29 @@
 // 013-3 Cave mobs
 
-013-3.gat,28,89,16,52	monster	Cave Snake	1021,10,0,0,Mob013-3::On1021
-013-3.gat,61,22,2,2	monster	Fire Skull	1023,3,0,0,Mob013-3::On1023
-013-3.gat,81,22,2,2	monster	Poison Skull	1024,3,0,0,Mob013-3::On1024
-013-3.gat,109,31,6,22	monster	Black Scorpion	1009,20,0,0,Mob013-3::On1009
-013-3.gat,119,84,27,38	monster	Spider	1012,20,0,0,Mob013-3::On1012
-013-3.gat,176,23,5,6	monster	Spider	1012,10,0,0,Mob013-3::On1012
-013-3.gat,82,75,2,2	monster	Fire skull	1023,1,0,0,Mob013-3::On1023
-013-3.gat,142,37,2,2	monster	Poison skull	1024,1,0,0,Mob013-3::On1024
-013-3.gat,79,134,21,16	monster	Scorpion	1003,5,0,0,Mob013-3::On1003
-013-3.gat,71,169,38,17	monster	Red scorpion	1004,5,0,0,Mob013-3::On1004
-013-3.gat,64,85,9,21	monster	Black scorpion	1009,10,0,0,Mob013-3::On1009
-013-3.gat,81,92,3,20	monster	Black scorpion	1009,10,0,0,Mob013-3::On1009
-013-3.gat,162,84,33,37	monster	Snake	1010,30,0,0,Mob013-3::On1010
-013-3.gat,162,85,33,37	monster	Spider	1012,30,0,0,Mob013-3::On1012
-013-3.gat,172,77,18,25	monster	Black scorpion	1009,15,0,0,Mob013-3::On1009
-013-3.gat,145,36,20,15	monster	Red slime	1008,25,0,0,Mob013-3::On1008
-013-3.gat,167,37,23,11	monster	Snake	1010,20,0,0,Mob013-3::On1010
-013-3.gat,165,25,16,11	monster	Black scorpion	1009,15,0,0,Mob013-3::On1009
-013-3.gat,71,39,2,3	monster	Cave snake	1021,2,0,0,Mob013-3::On1021
-013-3.gat,159,102,3,5	monster	Yellow slime	1007,2,0,0,Mob013-3::On1007
-013-3.gat,67,22,2,2	monster	Maggot	1002,2,0,0,Mob013-3::On1002
-013-3.gat,75,22,2,2	monster	Maggot	1002,2,0,0,Mob013-3::On1002
-013-3.gat,76,39,7,4	monster	Black scorpion	1009,8,0,0,Mob013-3::On1009
-013-3.gat,65,39,7,4	monster	Red slime	1008,8,0,0,Mob013-3::On1008
+013-3.gat,28,89,16,52	monster	Cave Snake	1021,10,120000,60000,Mob013-3::On1021
+013-3.gat,61,22,2,2	monster	Fire Skull	1023,3,120000,60000,Mob013-3::On1023
+013-3.gat,81,22,2,2	monster	Poison Skull	1024,3,120000,60000,Mob013-3::On1024
+013-3.gat,109,31,6,22	monster	Black Scorpion	1009,20,80000,40000,Mob013-3::On1009
+013-3.gat,119,84,27,38	monster	Spider	1012,20,120000,40000,Mob013-3::On1012
+013-3.gat,176,23,5,6	monster	Spider	1012,10,100000,40000,Mob013-3::On1012
+013-3.gat,82,75,2,2	monster	Fire skull	1023,1,180000,60000,Mob013-3::On1023
+013-3.gat,142,37,2,2	monster	Poison skull	1024,1,180000,60000,Mob013-3::On1024
+013-3.gat,79,134,21,16	monster	Black Scorpion	1009,5,80000,40000,Mob013-3::On1009
+013-3.gat,71,169,38,17	monster	Black Scorpion	1009,5,80000,40000,Mob013-3::On1009
+013-3.gat,64,85,9,21	monster	Black scorpion	1009,10,80000,40000,Mob013-3::On1009
+013-3.gat,81,92,3,20	monster	Black scorpion	1009,10,80000,40000,Mob013-3::On1009
+013-3.gat,162,84,33,37	monster	Snake	1010,30,120000,50000,Mob013-3::On1010
+013-3.gat,162,85,33,37	monster	Spider	1012,30,120000,50000,Mob013-3::On1012
+013-3.gat,172,77,18,25	monster	Black scorpion	1009,15,120000,50000,Mob013-3::On1009
+013-3.gat,145,36,20,15	monster	Red slime	1008,25,80000,40000,Mob013-3::On1008
+013-3.gat,167,37,23,11	monster	Snake	1010,20,120000,40000,Mob013-3::On1010
+013-3.gat,165,25,16,11	monster	Black scorpion	1009,15,120000,40000,Mob013-3::On1009
+013-3.gat,71,39,2,3	monster	Snake	1010,2,40000,20000,Mob013-3::On1010
+013-3.gat,159,102,3,5	monster	Yellow slime	1007,2,80000,40000,Mob013-3::On1007
+013-3.gat,67,22,2,2	monster	Maggot	1002,2,40000,20000,Mob013-3::On1002
+013-3.gat,75,22,2,2	monster	Maggot	1002,2,40000,20000,Mob013-3::On1002
+013-3.gat,76,39,7,4	monster	Black scorpion	1009,8,40000,20000,Mob013-3::On1009
+013-3.gat,65,39,7,4	monster	Red slime	1008,8,40000,20000,Mob013-3::On1008
 
 
 013-3.gat,0,0,0	script	Mob013-3	-1,{
@@ -32,16 +32,6 @@ On1002:
 	callfunc "MobPoints";
 	break;
 
-On1003:
-	set @mobID, 1003;
-	callfunc "MobPoints";
-	break;
-
-On1004:
-	set @mobID, 1004;
-	callfunc "MobPoints";
-	break;
-
 On1007:
 	set @mobID, 1007;
 	callfunc "MobPoints";
diff --git a/npc/018-1_Woodland_mining_camp/_mobs.txt b/npc/018-1_Woodland_mining_camp/_mobs.txt
index 117582d9..7e06eed1 100644
--- a/npc/018-1_Woodland_mining_camp/_mobs.txt
+++ b/npc/018-1_Woodland_mining_camp/_mobs.txt
@@ -8,41 +8,32 @@
 018-1.gat,78,59,3,1	monster	Yellow Slime	1007,1,0,0,Mob018-1::On1007
 018-1.gat,57,63,14,7	monster	Silk Worm	1035,2,0,0,Mob018-1::On1035
 018-1.gat,43,63,31,28	monster	Bat	1017,10,0,0,Mob018-1::On1017
-018-1.gat,134,39,18,10	monster	Grass Snake	1034,4,0,0,Mob018-1::On1034
-018-1.gat,124,42,9,11	monster	Grass Snake	1034,2,0,0,Mob018-1::On1034
-018-1.gat,124,19,22,9	monster	Mountain Snake	1026,3,0,0,Mob018-1::On1026
-018-1.gat,122,29,19,9	monster	Mountain Snake	1026,2,0,0,Mob018-1::On1026
-018-1.gat,149,45,10,8	monster	Bat	1017,5,5000,2500,Mob018-1::On1017
-018-1.gat,169,47,20,10	monster	Pinkie	1018,4,0,0,Mob018-1::On1018
-018-1.gat,136,49,13,8	monster	Fluffy	1020,4,0,0,Mob018-1::On1020
-018-1.gat,111,62,5,2	monster	Silk Worm	1035,1,0,0,Mob018-1::On1035
-018-1.gat,117,50,4,3	monster	Sea Slime	1033,1,0,0,Mob018-1::On1033
-018-1.gat,96,47,18,11	monster	Mouboo	1028,3,0,0,Mob018-1::On1028
-018-1.gat,106,52,15,6	monster	Mouboo	1028,1,0,0,Mob018-1::On1028
-018-1.gat,78,55,37,6	monster	Fire Goblin	1011,7,0,0,Mob018-1::On1011
-018-1.gat,145,24,10,9	monster	Green Slime	1005,3,0,0,Mob018-1::On1005
-018-1.gat,68,89,14,17	monster	Scorpion	1003,3,0,0,Mob018-1::On1003
-018-1.gat,160,31,11,18	monster	Scorpion	1003,5,0,0,Mob018-1::On1003
+018-1.gat,134,39,18,10	monster	Grass Snake	1034,4,100000,50000,Mob018-1::On1034
+018-1.gat,124,42,9,11	monster	Grass Snake	1034,2,100000,50000,Mob018-1::On1034
+018-1.gat,124,19,22,9	monster	Grass Snake	1034,3,100000,50000,Mob018-1::On1034
+018-1.gat,122,29,19,9	monster	Grass Snake	1034,2,100000,50000,Mob018-1::On1034
+018-1.gat,149,45,10,8	monster	Bat	1017,5,100000,30000,Mob018-1::On1017
+018-1.gat,169,47,20,10	monster	Red Slime	1008,4,120000,30000,Mob018-1::On1008
+018-1.gat,136,49,13,8	monster	Bat	1017,4,100000,30000,Mob018-1::On1017
+018-1.gat,136,49,13,8	monster	Silk Worm	1037,2,240000,120000,Mob018-1::On1037
+018-1.gat,111,62,5,2	monster	Silk Worm	1035,1,60000,30000,Mob018-1::On1035
+018-1.gat,117,50,4,3	monster	Sea Slime	1033,1,120000,60000,Mob018-1::On1033
+018-1.gat,96,47,18,11	monster	Red Slime	1008,3,100000,50000,Mob018-1::On1008
+018-1.gat,106,52,15,6	monster	Cobalt Plant	1030,1,240000,120000,Mob018-1::On1030
+018-1.gat,78,55,37,6	monster	Red Slime	1008,7,100000,50000,Mob018-1::On1008
+018-1.gat,145,24,10,9	monster	Red Slime	1008,3,100000,50000,Mob018-1::On1008
+018-1.gat,68,89,14,17	monster	Grass Snake	1034,3,100000,50000,Mob018-1::On1034
+018-1.gat,160,31,11,18	monster	Red Slime	1008,5,100000,50000,Mob018-1::On1008
 
 
 018-1.gat,0,0,0	script	Mob018-1	-1,{
-On1003:
-	set @mobID, 1003;
-	callfunc "MobPoints";
-	break;
-
-On1005:
-	set @mobID, 1005;
-	callfunc "MobPoints";
-	break;
-
 On1007:
 	set @mobID, 1007;
 	callfunc "MobPoints";
 	break;
 
-On1011:
-	set @mobID, 1011;
+On1008:
+	set @mobID, 1008;
 	callfunc "MobPoints";
 	break;
 
@@ -56,16 +47,6 @@ On1017:
 	callfunc "MobPoints";
 	break;
 
-On1018:
-	set @mobID, 1018;
-	callfunc "MobPoints";
-	break;
-
-On1020:
-	set @mobID, 1020;
-	callfunc "MobPoints";
-	break;
-
 On1022:
 	set @mobID, 1022;
 	callfunc "MobPoints";
@@ -76,13 +57,8 @@ On1025:
 	callfunc "MobPoints";
 	break;
 
-On1026:
-	set @mobID, 1026;
-	callfunc "MobPoints";
-	break;
-
-On1028:
-	set @mobID, 1028;
+On1030:
+	set @mobID, 1030;
 	callfunc "MobPoints";
 	break;
 
@@ -101,5 +77,10 @@ On1035:
 	callfunc "MobPoints";
 	break;
 
+On1037:
+	set @mobID, 1037;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/018-3_Cave/_mobs.txt b/npc/018-3_Cave/_mobs.txt
index a08d6366..aa8690e5 100644
--- a/npc/018-3_Cave/_mobs.txt
+++ b/npc/018-3_Cave/_mobs.txt
@@ -1,33 +1,30 @@
 // 018-3 Cave mobs
 
-018-3.gat,48,28,57,16	monster	Silk Worm	1035,8,0,0,Mob018-3::On1035
 018-3.gat,48,28,56,17	monster	Bat	1017,10,0,0,Mob018-3::On1017
-018-3.gat,35,62,31,15	monster	Evil Mushroom	1013,10,0,0,Mob018-3::On1013
-018-3.gat,35,65,28,22	monster	Spiky Mushroom	1019,15,0,0,Mob018-3::On1019
-018-3.gat,28,157,3,2	monster	Flower	1014,1,0,0,Mob018-3::On1014
-018-3.gat,99,110,17,39	monster	Yellow slime	1007,10,0,0,Mob018-3::On1007
-018-3.gat,137,140,2,1	monster	Spider	1012,1,300000,120000,Mob018-3::On1012
-018-3.gat,102,172,131,13	monster	Black scorpions	1009,20,0,0,Mob018-3::On1009
-018-3.gat,174,37,10,31	monster	Yellow slime	1007,5,0,0,Mob018-3::On1007
-018-3.gat,135,148,10,6	monster	Giant maggot	1006,2,0,0,Mob018-3::On1006
-018-3.gat,134,140,12,8	monster	Maggot	1002,3,0,0,Mob018-3::On1002
-018-3.gat,34,142,30,48	monster	Fire goblin	1011,4,0,0,Mob018-3::On1011
-018-3.gat,87,153,78,22	monster	Snake	1010,10,0,0,Mob018-3::On1010
-018-3.gat,148,148,13,24	monster	Bat	1017,3,0,0,Mob018-3::On1017
-018-3.gat,153,97,18,22	monster	Yellow slime	1007,6,0,0,Mob018-3::On1007
-018-3.gat,81,77,27,21	monster	Red slime	1008,15,0,0,Mob018-3::On1008
-018-3.gat,111,80,5,6	monster	Black scorpions	1009,10,0,0,Mob018-3::On1009
-018-3.gat,175,122,5,40	monster	Snake	1010,15,0,0,Mob018-3::On1010
-018-3.gat,98,75,1,2	monster	Fire skull	1023,1,0,0,Mob018-3::On1023
-018-3.gat,100,75,1,2	monster	Poison skull	1024,1,0,0,Mob018-3::On1024
-018-3.gat,171,95,15,19	monster	Red scorpion	1004,5,0,0,Mob018-3::On1004
-018-3.gat,134,87,17,7	monster	Red slime	1008,10,0,0,Mob018-3::On1008
-018-3.gat,59,95,11,8	monster	Spider	1012,15,0,0,Mob018-3::On1012
-018-3.gat,77,92,23,7	monster	Black scorpion	1009,15,0,0,Mob018-3::On1009
-018-3.gat,94,55,16,8	monster	Grass snake	1034,2,0,0,Mob018-3::On1034
-018-3.gat,133,39,12,17	monster	Spider	1012,10,0,0,Mob018-3::On1012
-018-3.gat,111,33,30,16	monster	Mountain snake	1026,15,0,0,Mob018-3::On1026
-018-3.gat,68,101,5,4	monster	Snake	1010,4,0,0,Mob018-3::On1010
+018-3.gat,35,144,31,48	monster	Evil Mushroom	1013,10,120000,30000,Mob018-3::On1013
+018-3.gat,35,65,28,22	monster	Spider	1012,20,100000,50000,Mob018-3::On1012
+018-3.gat,28,157,3,2	monster	Flower	1014,1,60000,30000,Mob018-3::On1014
+018-3.gat,99,110,17,39	monster	Yellow slime	1007,10,90000,30000,Mob018-3::On1007
+018-3.gat,134,140,12,8	monster	Maggot	1002,3,80000,40000,Mob018-3::On1002
+018-3.gat,132,137,15,25	monster	Spider	1012,8,300000,120000,Mob018-3::On1012
+018-3.gat,102,172,131,13	monster	Black scorpions	1009,20,60000,10000,Mob018-3::On1009
+018-3.gat,174,37,10,31	monster	Yellow slime	1007,5,180000,120000,Mob018-3::On1007
+018-3.gat,87,153,78,22	monster	Snake	1010,10,60000,10000,Mob018-3::On1010
+018-3.gat,148,148,13,24	monster	Bat	1017,3,180000,40000,Mob018-3::On1017
+018-3.gat,153,97,18,22	monster	Yellow slime	1007,6,80000,40000,Mob018-3::On1007
+018-3.gat,81,77,27,21	monster	Red slime	1008,15,80000,40000,Mob018-3::On1008
+018-3.gat,111,80,5,6	monster	Black scorpions	1009,10,80000,40000,Mob018-3::On1009
+018-3.gat,175,122,5,40	monster	Snake	1010,15,40000,20000,Mob018-3::On1010
+018-3.gat,98,75,1,2	monster	Fire skull	1023,1,120000,30000,Mob018-3::On1023
+018-3.gat,100,75,1,2	monster	Poison skull	1024,1,120000,30000,Mob018-3::On1024
+018-3.gat,171,95,15,19	monster	Black scorpion	1009,5,60000,30000,Mob018-3::On1009
+018-3.gat,134,87,17,7	monster	Red slime	1008,10,60000,30000,Mob018-3::On1008
+018-3.gat,59,95,11,8	monster	Spider	1012,15,60000,30000,Mob018-3::On1012
+018-3.gat,77,92,23,7	monster	Black scorpion	1009,15,60000,30000,Mob018-3::On1009
+018-3.gat,94,55,16,8	monster	Snake	1010,5,60000,30000,Mob018-3::On1010
+018-3.gat,133,39,12,17	monster	Spider	1012,10,60000,30000,Mob018-3::On1012
+018-3.gat,111,33,30,16	monster	Snake	1010,15,60000,30000,Mob018-3::On1010
+018-3.gat,68,101,5,4	monster	Snake	1010,4,60000,30000,Mob018-3::On1010
 
 
 018-3.gat,0,0,0	script	Mob018-3	-1,{
@@ -36,16 +33,6 @@ On1002:
 	callfunc "MobPoints";
 	break;
 
-On1004:
-	set @mobID, 1004;
-	callfunc "MobPoints";
-	break;
-
-On1006:
-	set @mobID, 1006;
-	callfunc "MobPoints";
-	break;
-
 On1007:
 	set @mobID, 1007;
 	callfunc "MobPoints";
@@ -66,11 +53,6 @@ On1010:
 	callfunc "MobPoints";
 	break;
 
-On1011:
-	set @mobID, 1011;
-	callfunc "MobPoints";
-	break;
-
 On1012:
 	set @mobID, 1012;
 	callfunc "MobPoints";
@@ -91,11 +73,6 @@ On1017:
 	callfunc "MobPoints";
 	break;
 
-On1019:
-	set @mobID, 1019;
-	callfunc "MobPoints";
-	break;
-
 On1023:
 	set @mobID, 1023;
 	callfunc "MobPoints";
@@ -106,20 +83,5 @@ On1024:
 	callfunc "MobPoints";
 	break;
 
-On1026:
-	set @mobID, 1026;
-	callfunc "MobPoints";
-	break;
-
-On1034:
-	set @mobID, 1034;
-	callfunc "MobPoints";
-	break;
-
-On1035:
-	set @mobID, 1035;
-	callfunc "MobPoints";
-	break;
-
 	end;
 }
diff --git a/npc/018-3_Cave/_warps.txt b/npc/018-3_Cave/_warps.txt
index c4dd0974..5d32cf8b 100644
--- a/npc/018-3_Cave/_warps.txt
+++ b/npc/018-3_Cave/_warps.txt
@@ -19,5 +19,5 @@
 018-3.gat,90,50	warp	toCave	-1,-1,013-3.gat,67,50
 018-3.gat,71,122	warp	toCave	-1,-1,013-3.gat,111,41
 018-3.gat,174,85	warp	toCave	-1,-1,013-3.gat,62,99
-018-3.gat,102,69	warp	toCave	-1,-1,013-3.gat,68,86
+018-3.gat,102,69	warp	toCave	-1,-1,013-3.gat,68,96
 018-3.gat,179,179	warp	toCave	-1,-1,009-3.gat,157,31