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/doomed_swords.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/doomed_swords.txt')
| -rw-r--r-- | npc/quests/doomed_swords.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/quests/doomed_swords.txt b/npc/quests/doomed_swords.txt index 16b34331b..6bccc7347 100644 --- a/npc/quests/doomed_swords.txt +++ b/npc/quests/doomed_swords.txt @@ -21,7 +21,7 @@ //= 1.5 Added missing checkweight. [L0ne_W0lf] //============================================================ -prt_in,162,11,2 script Ghatu#magum 86,{ +prt_in,162,11,2 script Ghatu#magum 4_M_04,{ if (event_magum == 0) { if (dmdswrd_Q2 & 1 || dmdswrd_Q2 & 2 || dmdswrd_Q2 & 4 || dmdswrd_Q2 & 8 || dmdswrd_Q2 & 16 || dmdswrd_Q2 & 32) { mes "[Ghatu]"; @@ -116,7 +116,7 @@ prt_in,162,11,2 script Ghatu#magum 86,{ close; } -prontera,197,188,2 script Veeyop#magum 50,{ +prontera,197,188,2 script Veeyop#magum 1_M_04,{ if (dmdswrd_Q2 & 1) { mes "[Veeyop]"; mes "You know, talking"; @@ -156,7 +156,7 @@ prontera,197,188,2 script Veeyop#magum 50,{ close; } -morocc,281,178,2 script Cetsu#magum 97,{ +morocc,281,178,2 script Cetsu#magum 4W_M_01,{ if (dmdswrd_Q2 & 2) { mes "[Cetsu]"; mes "I keep thinking about"; @@ -208,7 +208,7 @@ morocc,281,178,2 script Cetsu#magum 97,{ close; } -izlude_in,173,88,2 script Nain#magum 102,{ +izlude_in,173,88,2 script Nain#magum 8_F,{ if (dmdswrd_Q2 == 4) { mes "[Nain]"; mes "It doesn't matter how"; @@ -252,7 +252,7 @@ izlude_in,173,88,2 script Nain#magum 102,{ close; } -pay_fild08,218,283,2 script Mysterious Man#magum 89,{ +pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{ if (checkweight(1201,1) == 0) { mes "[Mysterious Man]"; mes "Hold it."; |