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/juice_maker.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/juice_maker.txt')
| -rw-r--r-- | npc/quests/juice_maker.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt index 058d3070a..3920de4b9 100644 --- a/npc/quests/juice_maker.txt +++ b/npc/quests/juice_maker.txt @@ -16,7 +16,7 @@ //= 2.1 Fixed dialog for if your missing the needed items (He always said the dialog for grape juice). [Kisuka] //============================================================ -prt_in,49,172,3 script Marianne#juice 53,{ +prt_in,49,172,3 script Marianne#juice 1_M_INNKEEPER,{ if (MISC_QUEST&1 || morison_meat == 15) { mes "[Housewife Marianne]"; mes "Whew...!"; @@ -77,7 +77,7 @@ prt_in,49,172,3 script Marianne#juice 53,{ close; } -prt_in,47,173,3 script Morrison#juice 97,{ +prt_in,47,173,3 script Morrison#juice 4W_M_01,{ if (MISC_QUEST&1 || morison_meat == 15) { mes "[Little Morrison]"; mes "Bleh... Forget it."; @@ -167,7 +167,7 @@ prt_in,47,173,3 script Morrison#juice 97,{ close; } -payon_in03,188,146,5 script Marx Hansen#juice 86,{ +payon_in03,188,146,5 script Marx Hansen#juice 4_M_04,{ if (checkweight(1201,1) == 0) { mes "- Wait a moment! -"; mes "- Currently you're carrying -"; |