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/counteragent_mixture.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/counteragent_mixture.txt')
| -rw-r--r-- | npc/quests/counteragent_mixture.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/quests/counteragent_mixture.txt b/npc/quests/counteragent_mixture.txt index dc54d625a..9d5b82ae4 100644 --- a/npc/quests/counteragent_mixture.txt +++ b/npc/quests/counteragent_mixture.txt @@ -14,7 +14,7 @@ //= 2.2b Follow up fixes to bugreport:1122 [L0ne_W0lf] //============================================================ -alberta_in,133,55,3 script Louitz#cm 84,{ +alberta_in,133,55,3 script Louitz#cm 4_M_02,{ if (molgenstain == 2) { mes "[Merchant Louitz]"; mes "Oh, it's you again."; @@ -303,7 +303,7 @@ alberta_in,133,55,3 script Louitz#cm 84,{ close; } -geffen,181,114,3 script Aure Dupon#cm 82,{ +geffen,181,114,3 script Aure Dupon#cm 4_KID01,{ if (molgenstain == 2) { mes "[Aure Dupon]"; mes "It seems that our"; @@ -392,7 +392,7 @@ geffen,181,114,3 script Aure Dupon#cm 82,{ close; } -geffen_in,141,140,3 script Molgenstein#cm 121,{ +geffen_in,141,140,3 script Molgenstein#cm 2_M_MOLGENSTEIN,{ if (checkweight(1201,1) == 0) { mes "- Wait a minute !! -"; mes "- Currently you're carrying -"; |