diff options
| author | masao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-29 03:25:27 +0000 |
|---|---|---|
| committer | masao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-29 03:25:27 +0000 |
| commit | a5214bc600605749134ae7d7861254201e7ce63b (patch) | |
| tree | f9165867126d59d75b20d281729f0321e4bfb546 | |
| parent | fea4f6e7d920aa346b7791a4b17d19380137ba4e (diff) | |
| download | hercules-a5214bc600605749134ae7d7861254201e7ce63b.tar.gz hercules-a5214bc600605749134ae7d7861254201e7ce63b.tar.bz2 hercules-a5214bc600605749134ae7d7861254201e7ce63b.tar.xz hercules-a5214bc600605749134ae7d7861254201e7ce63b.zip | |
- Removed Mercenary Skill which got added by accident with last commit.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15302 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | db/mercenary_skill_db.txt | 2 | ||||
| -rw-r--r-- | npc/jobs/3-1/ranger.txt | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/db/mercenary_skill_db.txt b/db/mercenary_skill_db.txt index 345f8cedb..438b7e656 100644 --- a/db/mercenary_skill_db.txt +++ b/db/mercenary_skill_db.txt @@ -162,5 +162,3 @@ 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/npc/jobs/3-1/ranger.txt b/npc/jobs/3-1/ranger.txt index 5d6e8e5f3..fb2451dda 100644 --- a/npc/jobs/3-1/ranger.txt +++ b/npc/jobs/3-1/ranger.txt @@ -684,7 +684,7 @@ tur_dun01,91,169,3 script Test Instructor#jr02 732,{ mes "Come when you are ready.";
close;
case 2:
- if (getmercinfo(0) > 0)
+ if (getmercinfo(1) > 0)
{
mes "[Test Instructor, Teardrop]";
mes "Stop!";
|