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_ayothaya.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_ayothaya.txt')
| -rw-r--r-- | npc/re/guides/guides_ayothaya.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/re/guides/guides_ayothaya.txt b/npc/re/guides/guides_ayothaya.txt index fd61b1380..6d351d4d6 100644 --- a/npc/re/guides/guides_ayothaya.txt +++ b/npc/re/guides/guides_ayothaya.txt @@ -13,7 +13,7 @@ //= 1.2 Navigation system update. [Euphy] //============================================================ -ayothaya,203,169,4 script Ayothaya Guide Noi#01ay 839,{ +ayothaya,203,169,4 script Ayothaya Guide Noi#01ay 4_F_THAIGIRL,{ if (strnpcinfo(0) == "Ayothaya Guide Noi#01ay") set .@n$, "[Noi]"; else @@ -90,4 +90,4 @@ ayothaya,203,169,4 script Ayothaya Guide Noi#01ay 839,{ } } } -ayothaya,146,86,4 duplicate(Ayothaya Guide Noi#01ay) Ayothaya Guide Noa#02ay 839 +ayothaya,146,86,4 duplicate(Ayothaya Guide Noi#01ay) Ayothaya Guide Noa#02ay 4_F_THAIGIRL |