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_quest.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_quest.txt')
| -rw-r--r-- | npc/quests/doomed_swords_quest.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/quests/doomed_swords_quest.txt b/npc/quests/doomed_swords_quest.txt index 172d90caa..e4a1ddf58 100644 --- a/npc/quests/doomed_swords_quest.txt +++ b/npc/quests/doomed_swords_quest.txt @@ -16,7 +16,7 @@ //= 1.0 First version. [L0ne_W0lf] //============================================================ -mjolnir_02,186,193,4 script Middle-Aged Man#magum1 57,{ +mjolnir_02,186,193,4 script Middle-Aged Man#magum1 1_M_LIBRARYMASTER,{ if (dmdswrd_Q > 30) { if (dmdswrd_Q == 31) { mes "[Middle-Aged Man]"; @@ -345,7 +345,7 @@ mjolnir_02,186,193,4 script Middle-Aged Man#magum1 57,{ } } -payon,248,159,1 script Old Man#magum1 120,{ +payon,248,159,1 script Old Man#magum1 2_M_PHARMACIST,{ if (dmdswrd_Q == 35) { mes "[Old Man]"; mes "Wha--? Who are"; @@ -791,7 +791,7 @@ payon,248,159,1 script Old Man#magum1 120,{ } } -morocc,248,159,4 script Young Man#magum1 86,{ +morocc,248,159,4 script Young Man#magum1 4_M_04,{ if (dmdswrd_Q == 39) { mes "[Huey]"; mes "Excuse me, but..."; |