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_louyang.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_louyang.txt')
| -rw-r--r-- | npc/pre-re/guides/guides_louyang.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/pre-re/guides/guides_louyang.txt b/npc/pre-re/guides/guides_louyang.txt index 52e83c4ed..8b5b14c8b 100644 --- a/npc/pre-re/guides/guides_louyang.txt +++ b/npc/pre-re/guides/guides_louyang.txt @@ -13,7 +13,7 @@ //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ -louyang,213,213,3 script Soldier#BA::LouGuide 825,{ +louyang,213,213,3 script Soldier#BA::LouGuide 4_M_CHNSOLDIER,{ mes "[Soldier]"; mes "Welcome to Louyang,"; mes "a city with a long"; @@ -123,9 +123,9 @@ louyang,213,213,3 script Soldier#BA::LouGuide 825,{ close; } -louyang,160,175,3 duplicate(LouGuide) Soldier#BB 825 +louyang,160,175,3 duplicate(LouGuide) Soldier#BB 4_M_CHNSOLDIER -louyang,224,104,3 script Representative#lou 818,{ +louyang,224,104,3 script Representative#lou 4_F_CHNWOMAN,{ mes "[Representative]"; mes "Welcome to Louyang,"; mes "an ancient land with"; |