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/pre-re/guides/guides_amatsu.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/pre-re/guides/guides_amatsu.txt')
| -rw-r--r-- | npc/pre-re/guides/guides_amatsu.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/pre-re/guides/guides_amatsu.txt b/npc/pre-re/guides/guides_amatsu.txt index 15129e4ad..85bd79047 100644 --- a/npc/pre-re/guides/guides_amatsu.txt +++ b/npc/pre-re/guides/guides_amatsu.txt @@ -13,7 +13,7 @@ //= 1.3 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -amatsu,207,89,3 script Amatsu Guide#ama 758,{ +amatsu,207,89,3 script Amatsu Guide#ama 4_F_JPN,{ mes "[Amachang]"; mes "Welcome to Amatsu,"; mes "the town of kind towners"; @@ -67,7 +67,7 @@ amatsu,207,89,3 script Amatsu Guide#ama 758,{ } } -amatsu,251,283,4 script Guide Man#2ama 767,{ +amatsu,251,283,4 script Guide Man#2ama 8_M_JPNSOLDIER,{ mes "[Guide Man]"; mes "Welcome, tourist from Rune-Midgard."; mes "I'm the guide of"; |