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/events/valentinesday.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/events/valentinesday.txt')
| -rw-r--r-- | npc/events/valentinesday.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/events/valentinesday.txt b/npc/events/valentinesday.txt index 8f2bd85d5..e7f144102 100644 --- a/npc/events/valentinesday.txt +++ b/npc/events/valentinesday.txt @@ -15,7 +15,7 @@ // Stephen - Valentine Event Chocolate seller //============================================================ -alberta,26,243,4 script Stephen 58,{ +alberta,26,243,4 script Stephen 1_M_MERCHANT,{ mes "[Stephen]"; mes "Guess what I've got?"; mes "A tasty treat not easily found in Rune-Midgard...."; @@ -59,7 +59,7 @@ alberta,26,243,4 script Stephen 58,{ // Jainie -- Gives information about Valentine Event //============================================================ -alberta,29,243,4 script Jainie 53,{ +alberta,29,243,4 script Jainie 1_M_INNKEEPER,{ mes "[Jainie]"; mes "You know what? The chocolate that my boyfriend sells are from me!"; mes "I made them by myself."; @@ -83,7 +83,7 @@ alberta,29,243,4 script Jainie 53,{ // Carl Orleans -- Valentine Event Chocolate maker //============================================================ -prt_castle,54,34,4 script Carl Orleans 47,{ +prt_castle,54,34,4 script Carl Orleans 1_M_01,{ mes "[Carl Orleans]"; mes "Yes?"; next; |