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/merchants/buying_shops.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/merchants/buying_shops.txt')
| -rw-r--r-- | npc/merchants/buying_shops.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt index 02ce3c826..f77a45197 100644 --- a/npc/merchants/buying_shops.txt +++ b/npc/merchants/buying_shops.txt @@ -14,7 +14,7 @@ // Black Marketeer (Buy Licenses - Non-Merchant Classes) //============================================================ -que_job01,68,84,1 script Black Marketeer#Buying 881,{ +que_job01,68,84,1 script Black Marketeer#Buying 4_M_SITDOWN,{ if (getskilllv("ALL_BUYING_STORE") == 1) { mes "[Mr. Jass]"; mes "Hey, you already made a contract with Hugh."; @@ -92,7 +92,7 @@ que_job01,68,84,1 script Black Marketeer#Buying 881,{ // Purchasing Team (Learn Skill - Merchant Classes) //============================================================ -alberta_in,58,52,4 script Purchasing Team#Buying 59,{ +alberta_in,58,52,4 script Purchasing Team#Buying 1_M_ORIENT01,{ mes "[Mr. Hugh]"; if (BaseClass == Job_Merchant && getskilllv("MC_VENDING") >= 1) { if (getskilllv("ALL_BUYING_STORE") == 1) { |