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/mage_solution.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/mage_solution.txt')
| -rw-r--r-- | npc/quests/mage_solution.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/quests/mage_solution.txt b/npc/quests/mage_solution.txt index 401372a67..8513ae8bf 100644 --- a/npc/quests/mage_solution.txt +++ b/npc/quests/mage_solution.txt @@ -12,7 +12,7 @@ //= 1.0 Split from Pre-Renewal Mage job quest. [Zopokx] //============================================================ -pay_arche,122,100,0 script Dollshoi 88,{ +pay_arche,122,100,0 script Dollshoi 4_M_ORIENT01,{ mes "[Mage Guildsman]"; mes "You want a Solution? Hmm, give me 50 Zeny and at least 1 Empty Test Tube."; next; @@ -33,7 +33,7 @@ pay_arche,122,100,0 script Dollshoi 88,{ close; } -moc_ruins,91,150,0 script Ponka-Hontas 93,{ +moc_ruins,91,150,0 script Ponka-Hontas 4_F_04,{ mes "[Mage Guildsman]"; mes "Would you like a Solution? Then please give me 50 Zeny and at least 1 Empty Test Tube."; next; |