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/assassin_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/assassin_skills.txt')
| -rw-r--r-- | npc/quests/skills/assassin_skills.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt index 568d0c369..8ff7da04c 100644 --- a/npc/quests/skills/assassin_skills.txt +++ b/npc/quests/skills/assassin_skills.txt @@ -12,7 +12,7 @@ //= 1.5 Replaced effect numerics with constants. [L0ne_W0lf] //============================================================ -in_moc_16,14,27,5 script Assassin#realman 884,{ +in_moc_16,14,27,5 script Assassin#realman 4_M_ACROSS,{ if (BaseJob == Job_Assassin && ASSN_SK2 == 1) { if (getskilllv("AS_VENOMKNIFE") == 0) { mes "[Killtin]"; @@ -284,7 +284,7 @@ in_moc_16,14,27,5 script Assassin#realman 884,{ } } -in_moc_16,23,27,5 script Assassin#realgirl 885,{ +in_moc_16,23,27,5 script Assassin#realgirl 4_F_ACROSS,{ if (BaseJob == Job_Assassin && ASSN_SK == 7) { if (getskilllv("AS_SONICACCEL") == 0) { mes "[Esmille]"; |