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/blacksmith_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/blacksmith_skills.txt')
| -rw-r--r-- | npc/quests/skills/blacksmith_skills.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt index 8764c3e01..ba7bf82cf 100644 --- a/npc/quests/skills/blacksmith_skills.txt +++ b/npc/quests/skills/blacksmith_skills.txt @@ -11,7 +11,7 @@ //= 1.6 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //============================================================ -geffen,178,72,3 script Akkie#qsk_bs 726,{ +geffen,178,72,3 script Akkie#qsk_bs 4_F_JOB_BLACKSMITH,{ if (BaseJob == Job_Blacksmith) { if (BLACK_SK == 7 && getskilllv("BS_UNFAIRLYTRICK") == 0) { mes "[Akkie]"; @@ -471,7 +471,7 @@ geffen,178,72,3 script Akkie#qsk_bs 726,{ } } -geffen,172,52,1 script Goodman#qsk_bs 826,{ +geffen,172,52,1 script Goodman#qsk_bs 4_M_DWARF,{ if (BaseJob == Job_Blacksmith) { if (BLACK_SK2 == 2 && Upper == 1 && getskilllv("BS_GREED") == 0) { mes "[Goodman]"; |