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/custom/quests/kahohorn.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/custom/quests/kahohorn.txt')
-rw-r--r-- | npc/custom/quests/kahohorn.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/custom/quests/kahohorn.txt b/npc/custom/quests/kahohorn.txt index 4677dea8c..ea1916e50 100644 --- a/npc/custom/quests/kahohorn.txt +++ b/npc/custom/quests/kahohorn.txt @@ -10,7 +10,7 @@ //= 1.1 Optimized, and fixed some requirements. [Euphy] //============================================================ -geffen,115,107,5 script Lord Kaho's Servant 61,{ +geffen,115,107,5 script Lord Kaho's Servant 1_M_PUBMASTER,{ setarray .@Items[0],7005, 968, 923, 734, 724,2268,7036,7020,5053,7018,741,742,743,750,751,752,753,754; setarray .@Drops[0],1272,1087,1039,1260,1046,1115,1252,1147,1038,1059; |