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/re/guides/guides_mora.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/re/guides/guides_mora.txt')
| -rw-r--r-- | npc/re/guides/guides_mora.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/re/guides/guides_mora.txt b/npc/re/guides/guides_mora.txt index 67936cac0..87de33b35 100644 --- a/npc/re/guides/guides_mora.txt +++ b/npc/re/guides/guides_mora.txt @@ -11,7 +11,7 @@ //= 1.1 Navigation system update. [Euphy] //============================================================ -mora,25,158,5 script Raffle Guide#north 516,{ +mora,25,158,5 script Raffle Guide#north 4_M_RAFLE_GR,{ mes "[Raffoh]"; mes "Laoh~!"; mes "Welcome to the Village of Mora."; @@ -62,7 +62,7 @@ mora,25,158,5 script Raffle Guide#north 516,{ } } -mora,167,76,3 script Raffle Guide#east 522,{ +mora,167,76,3 script Raffle Guide#east 4_M_RAFLE_OR,{ mes "[Raffuh]"; mes "Uh..."; mes "This, this is the Village of Mora."; @@ -113,7 +113,7 @@ mora,167,76,3 script Raffle Guide#east 522,{ } } -mora,115,138,5 script Raffle Guide#center 524,{ +mora,115,138,5 script Raffle Guide#center 4_M_RAFLE_VI,{ mes "[Raffla]"; mes "Lala!"; mes "Welcome to the Village of Mora la!"; @@ -165,7 +165,7 @@ mora,115,138,5 script Raffle Guide#center 524,{ } } -mora,72,51,3 script Raffle Guide#south 518,{ +mora,72,51,3 script Raffle Guide#south 4_F_RAFLE_PK,{ mes "[Raffli]"; mes "Lali?"; mes "Welcome to the Village of Mora."; |