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/crusader_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/crusader_skills.txt')
| -rw-r--r-- | npc/quests/skills/crusader_skills.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/quests/skills/crusader_skills.txt b/npc/quests/skills/crusader_skills.txt index 144ab44cf..46e294197 100644 --- a/npc/quests/skills/crusader_skills.txt +++ b/npc/quests/skills/crusader_skills.txt @@ -11,7 +11,7 @@ //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //============================================================ -geffen,110,117,3 script Ford#11 752,{ +geffen,110,117,3 script Ford#11 4_M_CRU_OLD,{ if (BaseJob == Job_Crusader) { if (CRUS_SK == 8 && getskilllv("CR_SHRINK") == 0) { mes "[Ford]"; @@ -275,7 +275,7 @@ geffen,110,117,3 script Ford#11 752,{ } } -gef_fild13,297,242,3 script Soldier#277 751,{ +gef_fild13,297,242,3 script Soldier#277 4_M_CRU,{ if (BaseJob == Job_Crusader) { if (Upper == 1 && getskilllv("CR_SHRINK")) { if (CRUS_SK == 8) { @@ -576,7 +576,7 @@ gef_fild13,297,242,3 script Soldier#277 751,{ } } -prt_church,87,127,3 script Pastor#1011 755,{ +prt_church,87,127,3 script Pastor#1011 4_M_SAGE_C,{ if (BaseJob == Job_Crusader) { if (Upper == 1 && getskilllv("CR_SHRINK")) { if (CRUS_SK == 8) { |