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/swordman_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/swordman_skills.txt')
| -rw-r--r-- | npc/quests/skills/swordman_skills.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt index 7441d5caf..4e152c780 100644 --- a/npc/quests/skills/swordman_skills.txt +++ b/npc/quests/skills/swordman_skills.txt @@ -13,7 +13,7 @@ //= 1.8 Fixed JobLevel requirements. [Euphy] //============================================================ -izlude_in,175,130,2 script Knight De Thomas 98,4,4,{ +izlude_in,175,130,2 script Knight De Thomas 4W_M_02,4,4,{ if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x < 1)) { mes "[De Thomas]"; mes "Oh, no! You must have been hurt! Are you ok?"; @@ -147,7 +147,7 @@ izlude_in,175,130,2 script Knight De Thomas 98,4,4,{ close; } -prt_in,75,88,5 script Leon Von Frich 85,3,3,{ +prt_in,75,88,5 script Leon Von Frich 4_M_03,3,3,{ if ((BaseClass == Job_Swordman) && (JobLevel >= 25 || (BaseJob == Job_Knight || BaseJob == Job_Crusader))) { if (getskilllv("SM_FATALBLOW") == 1) { @@ -301,7 +301,7 @@ OnTouch: close; } -prt_in,94,57,3 script Juan 85,4,4,{ +prt_in,94,57,3 script Juan 4_M_03,4,4,{ if (BaseClass == Job_Swordman) { if (getskilllv("SM_AUTOBERSERK") == 1) { mes "[Juan]"; |