diff options
author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/quests/skills/archer_skills.txt | |
parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
download | hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2 hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
sql-files/main.sql
sql-files/upgrades/index.txt
src/common/mmo.h
Diffstat (limited to 'npc/quests/skills/archer_skills.txt')
-rw-r--r-- | npc/quests/skills/archer_skills.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt index 63a465e25..b97fb260b 100644 --- a/npc/quests/skills/archer_skills.txt +++ b/npc/quests/skills/archer_skills.txt @@ -13,7 +13,7 @@ //= 1.7 Fixed JobLevel requirements. [Euphy] //============================================================ -moc_ruins,118,99,5 script Roberto 88,{ +moc_ruins,118,99,5 script Roberto 4_M_ORIENT01,{ if (BaseClass == Job_Archer) { if (getskilllv("AC_MAKINGARROW") == 1) { mes "[Roberto]"; @@ -139,7 +139,7 @@ moc_ruins,118,99,5 script Roberto 88,{ close; } -payon,103,63,3 script Jason 88,3,3,{ +payon,103,63,3 script Jason 4_M_ORIENT01,3,3,{ if (BaseClass == Job_Archer) { if (getskilllv("AC_CHARGEARROW") == 1) { mes "[Jason]"; |