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_2009.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_2009.txt')
| -rw-r--r-- | npc/events/valentinesday_2009.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt index 8c5dd4432..2e02c124c 100644 --- a/npc/events/valentinesday_2009.txt +++ b/npc/events/valentinesday_2009.txt @@ -23,7 +23,7 @@ // Marco Bassinio (Chocolate/Chocolate Box maker) //============================================================ -prontera,164,174,4 script Trader#Val09 58,{ +prontera,164,174,4 script Trader#Val09 1_M_MERCHANT,{ mes "[Marco Bassinio]"; mes "Hey, folks! Here's something you don't see everyday!"; mes "Something you can never find in Rune-Midgarts!"; @@ -160,7 +160,7 @@ prontera,164,174,4 script Trader#Val09 58,{ // Packs Trader (Sells Wrapping Paper, Lace, and Box) //============================================================ -prontera,147,171,5 script Packs Trader#Val09 58,{ +prontera,147,171,5 script Packs Trader#Val09 1_M_MERCHANT,{ mes "[Packs Trader]"; mes "Hello."; mes "I am a Packs Trader, I sell paper boxes and supplies for packing presents."; @@ -304,7 +304,7 @@ prontera,147,171,5 script Packs Trader#Val09 58,{ // Event Ring Maker (Makes ring for players) //============================================================ -prontera,154,185,5 script Event Ring Maker#Val09 721,{ +prontera,154,185,5 script Event Ring Maker#Val09 4_F_KAFRA7,{ if (BaseLevel < 75) { mes "[Event Ring Maker]"; mes "Hello, I only make the Valentine rings to those experienced adventurer Level 75 or above."; @@ -398,7 +398,7 @@ prontera,154,185,5 script Event Ring Maker#Val09 721,{ // Valentine Vote Manager (Registers votes) //============================================================ -prontera,157,185,4 script Valentine Vote Manager#v 113,{ +prontera,157,185,4 script Valentine Vote Manager#v 4_F_KAFRA5,{ mes "[Valentine Vote Manager]"; mes "Hello, I'm the Valentine's Vote Manager."; mes "I'm in charge of collecting rings for this event!"; @@ -519,7 +519,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 113,{ // Charles Orleans (Makes Home-Made Chocolates) //============================================================ -prt_castle,42,35,3 script Dessert Manager#Val09 47,{ +prt_castle,42,35,3 script Dessert Manager#Val09 1_M_01,{ if (Sex) { mes "[Charles Orleans]"; mes "Monsieur~! What brings you to my beautiful atelier?"; |