Fixed Garms iRO name. (bugreport:5421)

Fixed some create_arrow_db.txt comments. (Follow up r15672.)
Fixed Sura job change quest. (bugreport:5431)
Corrected a NPC location in quests_veins.txt.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15679 54d463be-8e91-2dee-dedb-b68131a5f0ec

6 files changed, 24 insertions, 24 deletions

diff --git a/db/create_arrow_db.txt b/db/create_arrow_db.txt
index f16e4bfe8..62c171b5d 100644
--- a/db/create_arrow_db.txt
+++ b/db/create_arrow_db.txt
@@ -78,21 +78,21 @@
 984,1765,250
 // Elunium --> 1000 Steel Arrows, 50 Stun Arrows
 985,1753,1000,1758,50
-// Red Blood --> 2000 Fire Arrows
+// Red Blood --> 600 Fire Arrows
 990,1752,600
-// Crystal Blue --> 500 Crystal Arrows
+// Crystal Blue --> 150 Crystal Arrows
 991,1754,150
-// Wind of Verdure --> 500 Arrows of Wind
+// Wind of Verdure --> 150 Arrows of Wind
 992,1755,150
-// Green Live --> 500 Stone Arrows
+// Green Live --> 150 Stone Arrows
 993,1756,150
-// Flame Heart --> 6000 Fire Arrows, 5 Mute Arrows
+// Flame Heart --> 1800 Fire Arrows, 5 Mute Arrows
 994,1752,1800,1769,5
-// Mystic Frozen --> 1500 Crystal Arrows, 5 Frozen Arrows
+// Mystic Frozen --> 450 Crystal Arrows, 5 Frozen Arrows
 995,1754,450,1759,5
-// Rough Wind --> 1500 Arrows of Wind, 5 Sleep Arrows
+// Rough Wind --> 450 Arrows of Wind, 5 Sleep Arrows
 996,1755,450,1768,5
-// Great Nature --> 1500 Stone Arrows, 5 Flash Arrows
+// Great Nature --> 450 Stone Arrows, 5 Flash Arrows
 997,1756,450,1760,5
 // Iron --> 100 Iron Arrows
 998,1770,100
diff --git a/db/pre-re/mob_db.txt b/db/pre-re/mob_db.txt
index aae4de82c..ea06a46f1 100644
--- a/db/pre-re/mob_db.txt
+++ b/db/pre-re/mob_db.txt
@@ -253,7 +253,7 @@
 1249,MYSTCASE,Myst Case,Myst Case,38,3450,0,1113,688,1,160,360,5,10,65,50,25,5,48,75,10,12,1,0,60,0x91,400,1248,1248,432,0,0,0,0,0,0,0,530,90,912,1500,603,20,539,800,722,150,731,5,529,340,0,0,0,0,4206,1
 1250,CHEPET,Chepet,Chepet,42,4950,0,1518,946,1,380,440,0,25,1,72,35,71,65,85,10,12,1,7,23,0x3695,400,672,672,288,0,0,0,0,0,0,0,7035,2500,912,750,512,5500,619,40,10019,5,508,1300,2508,5,0,0,0,0,4284,1
 1251,KNIGHT_OF_WINDSTORM,Knight of Windstorm,Stormy Knight,77,240000,0,64350,21450,2,1425,1585,35,60,75,185,83,55,130,79,10,12,2,0,84,0x37B5,200,468,468,288,32175,720,4500,2406,500,995,3000,1468,150,603,3000,617,4000,2621,200,2506,500,985,4559,5007,1,0,0,0,0,4318,1
-1252,GARM,Garm,Garm,73,197000,0,50050,20020,3,1700,1900,40,45,85,126,82,65,95,60,10,12,2,2,81,0x37B5,400,608,408,336,25025,7036,1000,603,3000,995,3000,7036,5500,1131,150,1256,500,1815,500,0,0,985,3977,984,2900,0,0,0,0,4324,1
+1252,GARM,Garm,Hatii,73,197000,0,50050,20020,3,1700,1900,40,45,85,126,82,65,95,60,10,12,2,2,81,0x37B5,400,608,408,336,25025,7036,1000,603,3000,995,3000,7036,5500,1131,150,1256,500,1815,500,0,0,985,3977,984,2900,0,0,0,0,4324,1
 1253,GARGOYLE,Gargoyle,Gargoyle,48,3950,0,1650,1650,9,290,360,10,10,15,61,20,20,126,40,10,12,1,6,64,0x2185,200,1020,720,384,0,0,0,0,0,0,0,912,3880,1039,500,0,0,0,0,2619,1,1769,2000,757,238,0,0,0,0,4149,1
 1254,RAGGLER,Raggler,Raggler,21,1020,0,218,140,1,102,113,0,5,18,10,32,20,39,35,10,12,0,2,24,0x3695,200,1000,900,384,0,0,0,0,0,0,0,7053,3000,916,5000,645,200,514,200,992,90,2225,7,756,32,0,0,0,0,4186,1
 1255,NERAID,Neraid,Nereid,40,4120,0,1126,684,1,325,360,0,10,1,45,50,5,64,5,10,12,0,2,22,0x3695,200,776,576,288,0,0,0,0,0,0,0,1055,5100,7053,1000,510,230,1966,10,514,250,757,180,985,37,0,0,0,0,4167,1
@@ -523,7 +523,7 @@
 1512,HYEGUN,Hyegun,Yao Jun,56,9981,0,2199,1022,1,710,1128,12,10,60,40,36,10,73,15,10,12,1,1,49,0x3885,180,890,1320,720,0,0,0,0,0,0,0,7054,3880,609,100,985,10,2406,1,7277,300,0,0,0,0,0,0,0,0,4328,1
 1513,CIVIL_SERVANT,Civil Servant,Mao Guai,62,14390,0,4023,2750,2,650,1010,42,5,58,15,20,60,80,50,10,12,1,2,44,0x3885,200,1257,528,432,0,0,0,0,0,0,0,7262,4171,7263,2000,606,10,1023,100,693,100,0,0,0,0,0,0,0,0,4202,1
 1514,DANCING_DRAGON,Dancing Dragon,Zhu Po Long,54,9136,0,3030,769,2,550,789,39,10,55,62,55,25,72,22,10,12,1,9,44,0x83,160,600,840,504,0,0,0,0,0,0,0,7266,4365,7265,3000,7268,800,1036,1000,7038,3000,0,0,0,0,0,0,0,0,4272,1
-1515,GARM_BABY,Garm Baby,Garm Baby,61,20199,0,1022,2980,1,680,1179,34,13,45,30,56,55,85,30,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,7270,1500,7269,2500,7066,4365,749,100,12000,100,0,0,0,0,0,0,0,0,4323,1
+1515,GARM_BABY,Garm Baby,Hatii Baby,61,20199,0,1022,2980,1,680,1179,34,13,45,30,56,55,85,30,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,7270,1500,7269,2500,7066,4365,749,100,12000,100,0,0,0,0,0,0,0,0,4323,1
 1516,INCREASE_SOIL,Increase Soil,Mi Gao,51,8230,0,2760,2110,1,560,700,30,12,40,45,23,12,69,12,10,12,1,0,62,0x91,445,106,1056,576,0,0,0,0,0,0,0,7264,4365,7004,2300,997,10,969,2,0,0,0,0,0,0,0,0,0,0,4231,1
 1517,LI_ME_MANG_RYANG,Li Me Mang Ryang,Jing Guai,48,5920,0,1643,1643,1,434,633,23,16,46,51,19,8,57,30,10,12,1,6,62,0x3985,165,1120,576,420,0,0,0,0,0,0,0,7267,4500,7268,400,1501,10,1523,1,0,0,0,0,0,0,0,0,0,0,4265,1
 1518,BACSOJIN,Bacsojin,White Lady,72,56380,0,5590,1659,2,560,1446,10,15,38,65,34,80,102,35,10,12,2,7,41,0x3695,160,576,960,480,0,0,0,0,0,0,0,1020,5500,603,2,617,2,7165,3000,7166,1000,747,500,0,0,2234,1,0,0,0,0
@@ -618,7 +618,7 @@
 1603,G_BIGFOOT,Bigfoot,Bigfoot,25,1619,0,0,0,1,198,220,10,0,1,25,55,15,20,25,10,12,2,2,22,0x91,300,1260,192,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1604,G_GIANT_HONET,Giant Hornet,Giant Hornet,56,13105,0,0,0,1,650,852,38,43,35,38,32,10,71,64,10,12,0,4,24,0x3795,155,1292,792,340,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1605,G_DARK_ILLUSION,Dark Illusion,Dark Illusion,77,103631,0,0,0,2,1300,1983,64,70,5,100,40,100,97,40,10,12,2,6,89,0x37B5,145,1024,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1606,G_GARM_BABY,Garm Baby,Garm Baby,61,20199,0,0,0,1,680,1179,34,13,45,30,56,55,85,30,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1606,G_GARM_BABY,Garm Baby,Hatii Baby,61,20199,0,0,0,1,680,1179,34,13,45,30,56,55,85,30,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1607,G_GOBLINE_XMAS,Christmas Goblin,Christmas Goblin,25,1176,0,0,0,1,118,140,10,5,1,53,25,20,38,45,10,12,1,7,24,0x3695,100,1120,620,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1608,G_THIEF_BUG__,Thief Bug Male,Thief Bug Male,19,583,0,0,0,1,76,88,15,5,1,29,16,5,36,0,10,12,1,4,27,0x318D,300,988,288,768,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1609,G_DANCING_DRAGON,Dancing Dragon,Zhu Po Long,54,9136,0,3030,769,2,550,789,39,10,55,62,55,25,72,22,10,12,1,9,44,0xA3,160,600,840,504,0,0,0,0,0,0,0,570,500,571,50,572,20,515,10000,12018,5000,0,0,0,0,668,100,0,0,0,0
diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt
index 8d947e594..ae91818c6 100644
--- a/db/re/mob_db.txt
+++ b/db/re/mob_db.txt
@@ -642,7 +642,7 @@
 1603,G_BIGFOOT,Bigfoot,Bigfoot,29,587,1,0,0,1,50,62,55,7,18,4,7,0,12,0,10,12,2,2,22,0x91,300,1260,192,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1604,G_GIANT_HONET,Giant Hornet,Giant Hornet,82,3960,0,0,0,1,275,328,80,43,70,45,47,32,62,34,10,12,0,4,24,0x3795,155,1292,792,340,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1605,G_DARK_ILLUSION,Dark Illusion,Dark Illusion,96,29255,0,0,0,2,666,726,145,60,82,36,55,100,102,88,10,12,2,6,89,0x37B5,145,1024,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1606,G_GARM_BABY,Garm Baby,Garm Baby,94,10016,1,0,0,1,383,444,62,43,69,61,55,61,88,45,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1606,G_GARM_BABY,Garm Baby,Hatii Baby,94,10016,1,0,0,1,383,444,62,43,69,61,55,61,88,45,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1607,G_GOBLINE_XMAS,Christmas Goblin,Christmas Goblin,25,1176,1,0,0,1,118,140,16,5,1,53,25,20,38,45,10,12,1,7,24,0x3695,100,1120,620,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1608,G_THIEF_BUG__,Thief Bug Male,Thief Bug Male,19,583,1,0,0,1,76,88,24,5,1,29,16,5,36,0,10,12,1,4,27,0x318D,300,988,288,768,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1609,G_DANCING_DRAGON,Dancing Dragon,Zhu Po Long,82,3943,1,2727,692,2,268,303,83,36,59,76,40,30,61,30,10,12,1,9,44,0xA3,160,600,840,504,0,0,0,0,0,0,0,570,500,571,50,572,20,515,10000,12018,5000,0,0,0,0,0,0,0,0,668,100
diff --git a/npc/jobs/3-2/sura.txt b/npc/jobs/3-2/sura.txt
index cb794a3a4..0df0b0d40 100644
--- a/npc/jobs/3-2/sura.txt
+++ b/npc/jobs/3-2/sura.txt
@@ -707,7 +707,7 @@ yuno_fild07,254,176,7	script	Buddy#job_shu	483,{
 	next;
 	mes "[Buddy]";
 	mes "This way...";
-	close;
+	close2;
 	warp "sword_1-1",215,244;
 	end;
 }
@@ -767,7 +767,7 @@ OnEnable:
 	end;
 
 OnReset:
-	killmonster "sword2-1","Buddy#Sura_Salon::OnMyMobDead";
+	killmonster "sword_2-1","Buddy#Sura_Salon::OnMyMobDead";
 	end;
 
 OnDisable:
@@ -785,15 +785,15 @@ OnMyMobDead:
 	end;
 
 OnTimer3000:
-	mapannounce "sword2-1","The master is now in the middle of training, and you need to wait in the living room around 5 minutes.",bc_map;
+	mapannounce "sword_2-1","The master is now in the middle of training, and you need to wait in the living room around 5 minutes.",bc_map;
 	end;
 
 OnTimer4000:
-	mapannounce "sword2-1","Ah! You may have hallucinations in the living room, so please be careful.",bc_map;
+	mapannounce "sword_2-1","Ah! You may have hallucinations in the living room, so please be careful.",bc_map;
 	end;
 
 OnTimer5000:
-	mapannounce "sword2-1","This is the policy of the master, so please don't feel unpleasant.",bc_map;
+	mapannounce "sword_2-1","This is the policy of the master, so please don't feel unpleasant.",bc_map;
 	end;
 
 OnTimer33000:
@@ -819,7 +819,7 @@ OnTimer93000:
 	end;
 
 OnTimer153000:
-	mapannounce "sword2-1","If you're bored, may I bring you some magazines?",bc_map;
+	mapannounce "sword_2-1","If you're bored, may I bring you some magazines?",bc_map;
 	monster "sword_2-1",219,210,"Magazine",1478,1,"Buddy#Sura_Salon::OnMyMobDead";
 	monster "sword_2-1",219,210,"Magazine",1478,1,"Buddy#Sura_Salon::OnMyMobDead";
 	monster "sword_2-1",228,209,"Magazine",1478,1,"Buddy#Sura_Salon::OnMyMobDead";
@@ -852,7 +852,7 @@ OnTimer273000:
 	end;
 
 OnTimer300000:
-	mapannounce "sword2-1","The master has arrived. Soon I'll show you into the master's room.",bc_map;
+	mapannounce "sword_2-1","The master has arrived. Soon I'll show you into the master's room.",bc_map;
 	end;
 
 OnTimer303000:
@@ -864,16 +864,16 @@ OnTimer305000:
 	end;
 
 OnTimer315000:
-	mapannounce "sword2-1","Come on here.",bc_map;
+	mapannounce "sword_2-1","Come on here.",bc_map;
 	donpcevent "Buddy#job_shuaneh::OnDisable";
 	donpcevent "Sura_garajjom::OnEnable";
 	end;
 
 OnTimer320000:
-	mapannounce "sword2-1","I guess you're not ready to meet the master yet..",bc_map;
+	mapannounce "sword_2-1","I guess you're not ready to meet the master yet..",bc_map;
 	donpcevent "Sura_garajjom::OnDisable";
 	donpcevent "Drawing Room::OnEnable";
-	mapwarp "sword2-1","yuno_fild07",255,178;
+	mapwarp "sword_2-1","yuno_fild07",255,178;
 	stopnpctimer;
 	end;
 }
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index 49d5a6818..c1044f877 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -7229,7 +7229,7 @@ thor_camp,98,213,5	script	Thor Volcano Soldier#vo8	939,{
 	close;
 }
 
-thor_camp,98,213,5	script	Thor Volcano Soldier#vo9	939,{
+thor_camp,98,209,5	script	Thor Volcano Soldier#vo9	939,{
 	mes "[Soldier]";
 	mes "Why am I always";
 	mes "stationed here?!";
diff --git a/sql-files/mob_db.sql b/sql-files/mob_db.sql
index 4b7508e5d..59fec733a 100644
--- a/sql-files/mob_db.sql
+++ b/sql-files/mob_db.sql
@@ -689,7 +689,7 @@ REPLACE INTO `mob_db` VALUES (1602,'G_SOLIDER','Solider','Solider',92,8768,1,0,0
 REPLACE INTO `mob_db` VALUES (1603,'G_BIGFOOT','Bigfoot','Bigfoot',29,587,1,0,0,1,50,62,55,7,18,4,7,0,12,0,10,12,2,2,22,0x91,300,1260,192,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
 REPLACE INTO `mob_db` VALUES (1604,'G_GIANT_HONET','Giant Hornet','Giant Hornet',82,3960,0,0,0,1,275,328,80,43,70,45,47,32,62,34,10,12,0,4,24,0x3795,155,1292,792,340,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
 REPLACE INTO `mob_db` VALUES (1605,'G_DARK_ILLUSION','Dark Illusion','Dark Illusion',96,29255,0,0,0,2,666,726,145,60,82,36,55,100,102,88,10,12,2,6,89,0x37B5,145,1024,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db` VALUES (1606,'G_GARM_BABY','Garm Baby','Garm Baby',94,10016,1,0,0,1,383,444,62,43,69,61,55,61,88,45,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1606,'G_GARM_BABY','Garm Baby','Hatii Baby',94,10016,1,0,0,1,383,444,62,43,69,61,55,61,88,45,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
 REPLACE INTO `mob_db` VALUES (1607,'G_GOBLINE_XMAS','Christmas Goblin','Christmas Goblin',25,1176,1,0,0,1,118,140,16,5,1,53,25,20,38,45,10,12,1,7,24,0x3695,100,1120,620,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
 REPLACE INTO `mob_db` VALUES (1608,'G_THIEF_BUG__','Thief Bug Male','Thief Bug Male',19,583,1,0,0,1,76,88,24,5,1,29,16,5,36,0,10,12,1,4,27,0x318D,300,988,288,768,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
 REPLACE INTO `mob_db` VALUES (1609,'G_DANCING_DRAGON','Dancing Dragon','Zhu Po Long',82,3943,1,2727,692,2,268,303,83,36,59,76,40,30,61,30,10,12,1,9,44,0xA3,160,600,840,504,0,0,0,0,0,0,0,570,500,571,50,572,20,515,10000,12018,5000,0,0,0,0,0,0,0,0,668,100);