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/bandit_beard.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/bandit_beard.txt')
| -rw-r--r-- | npc/custom/quests/bandit_beard.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt index 6cf47ef25..ebb74afc7 100644 --- a/npc/custom/quests/bandit_beard.txt +++ b/npc/custom/quests/bandit_beard.txt @@ -15,7 +15,7 @@ //= 1.3 Removed duplicates [L0ne_W0lf] //============================================================ -umbala,126,129,4 script Bearded Man#bandit 120,{ +umbala,126,129,4 script Bearded Man#bandit 2_M_PHARMACIST,{ if(BEARD_QUEST == 4 ) goto L_MAKE; if(BEARD_QUEST >= 5 ) goto L_DONE; if(BEARD_QUEST >= 1 ) goto L_THREAD; @@ -100,7 +100,7 @@ L_NOITEMS: } //Master Tailor---------- -izlude_in,123,175,4 script Master Tailor#bandit 50,{ +izlude_in,123,175,4 script Master Tailor#bandit 1_M_04,{ mes "[Master Tailor]"; mes "Good evening! I am the Master Tailor!"; if(BEARD_QUEST != 1 ) close; @@ -117,7 +117,7 @@ izlude_in,123,175,4 script Master Tailor#bandit 50,{ close; } // Karfa Thread Clerk--- -aldeba_in,70,179,5 script Karfa Clerk#bandit 113,{ +aldeba_in,70,179,5 script Karfa Clerk#bandit 4_F_KAFRA5,{ mes "[Karfa Clerk]"; if(BEARD_QUEST == 3 ) goto L_REPEAT; if(BEARD_QUEST > 3 ) goto L_DONE; @@ -155,7 +155,7 @@ L_DONE: } //Thread Merchant ------ -alberta,65,123,6 script Man#bandit 85,{ +alberta,65,123,6 script Man#bandit 4_M_03,{ if(BEARD_QUEST == 3 && $@beardMobD) goto L_KILLED; if(BEARD_QUEST > 3) goto L_DONE; |