From fea4f6e7d920aa346b7791a4b17d19380137ba4e Mon Sep 17 00:00:00 2001
From: masao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 29 Dec 2011 03:22:42 +0000
Subject: - Fixed Mercenary check in Ranger Job change Quest. Also set correct
 time value for SC_STONE from 2 Seconds to 2Minutes.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15301 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 db/mercenary_skill_db.txt | 2 ++
 db/mob_db.txt             | 2 +-
 npc/jobs/3-1/ranger.txt   | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/db/mercenary_skill_db.txt b/db/mercenary_skill_db.txt
index 438b7e656..345f8cedb 100644
--- a/db/mercenary_skill_db.txt
+++ b/db/mercenary_skill_db.txt
@@ -162,3 +162,5 @@
 2060,8202,5	//MS_MAGNUM
 2060,8217,5	//ML_BRANDISH
 2060,8226,1	//MER_REGAIN
+// M_DESERT_WOLF_B
+2034,2244,5 //MER_WUGSTRIKE
diff --git a/db/mob_db.txt b/db/mob_db.txt
index b480798e6..2b7064b8b 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -1134,7 +1134,7 @@
 //2031,DANDELION_H,Dandelion,Dandelion,80,120000,0,0,0,1,305,610,0,10,1,19,32,0,63,20,10,12,1,7,47,0x120,250,1772,72,384,0,0,0,0,0,0,0,0,12379,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //2032,GUARDIAN_FOREST,Forest Guardian,Forest Guardian,50,99999,0,0,0,1,3000,6000,160,99,100,100,100,100,100,100,10,12,0,6,27,0x120,200,868,480,120,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,0
 //2033,GOLDEN_TULIP,Golden Tulip,Golden Tulip,1,100,0,0,0,1,1,2,160,99,0,0,0,0,0,0,7,12,0,3,22,0x120,2000,1,1,1,0,0,0,0,0,0,0,0,7951,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2034,M_DESERT_WOLF_B,Baby Desert Wolf,Baby Desert Wolf,9,164,15,0,0,1,500,600,0,0,1,9,9,5,40,40,10,12,0,2,23,0x120,100,1600,900,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,0
+//2034,M_DESERT_WOLF_B,Baby Desert Wolf,Baby Desert Wolf,9,164,15,0,0,1,500,600,0,0,1,9,9,5,40,40,10,12,0,2,23,0x120,100,1600,900,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,0
 2035,NIHILITY_ZEM,Nihility Zem,Nihility Zem,90,200500,0,0,0,0,1,2,0,20,1,1,1,0,1,20,10,12,0,4,22,0x100,1000,1001,1,1,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,0
 2036,VALKYRIE_N,Valkyrie Randgris,Valkyrie Randgris,98,11780,0,0,0,1,780,930,16,20,1,24,39,0,72,25,10,12,1,1,69,0x308D,170,576,576,480,0,0,0,0,0,0,0,0,6154,9000,6154,5000,6154,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //2037,VALKYRIE_A,Valkyrie Randgris,Valkyrie Randgris,90,5500,15,0,0,1,10,160,16,20,1,20,40,0,20,20,10,12,1,8,66,0x120,100,576,576,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,0
diff --git a/npc/jobs/3-1/ranger.txt b/npc/jobs/3-1/ranger.txt
index 9a141e0c6..5d6e8e5f3 100644
--- a/npc/jobs/3-1/ranger.txt
+++ b/npc/jobs/3-1/ranger.txt
@@ -603,7 +603,7 @@ tur_dun01,91,169,3	script	Test Instructor#jr02	732,{
 				mes "Come back when you are ready.";
 				close;
 			case 2:
-				if (getmercinfo(0) > 0)
+				if (getmercinfo(1) > 0)
 				{
 					mes "[Test Instructor, Teardrop]";
 					mes "Stop!";
@@ -2350,7 +2350,7 @@ job3_rang02,251,49,3	script	Test Supervisor#jr_13	732,{
 		}
 		else if (checkquest(8261) == 1)
 		{
-			if (getmercinfo(0) == 2034)
+			if (getmercinfo(1) == 2034)
 			{
 				erasequest 8261;
 				mes "[Test Supervisor, Freeze]";
@@ -2361,7 +2361,7 @@ job3_rang02,251,49,3	script	Test Supervisor#jr_13	732,{
 				next;
 				mes "[Test Supervisor, Freeze]";
 				mes "Then, Good luck!";
-				sc_start SC_STONE,120,10;
+				sc_start SC_STONE,120000,10;
 				close2;
 				donpcevent "Test Supervisor#jr_13::OnDisable";
 				donpcevent "Third Test Timer#jr_12::OnEnable";
-- 
cgit v1.2.3-60-g2f50