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_lighthalzen.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_lighthalzen.txt')
| -rw-r--r-- | npc/re/guides/guides_lighthalzen.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/re/guides/guides_lighthalzen.txt b/npc/re/guides/guides_lighthalzen.txt index 6c6c42b26..d7cd22aae 100644 --- a/npc/re/guides/guides_lighthalzen.txt +++ b/npc/re/guides/guides_lighthalzen.txt @@ -13,7 +13,7 @@ //= 1.2 Navigation system update. [Euphy] //============================================================ -lighthalzen,207,310,5 script Lighthalzen Guide#lhz01::GuideLighthazlen 852,{ +lighthalzen,207,310,5 script Lighthalzen Guide#lhz01::GuideLighthazlen 4_M_EIN_SOLDIER,{ cutin "ein_soldier",2; mes "[Lighthalzen Guide]"; mes "Welcome to ^8B4513Lighthalzen^000000,"; @@ -180,6 +180,6 @@ L_Mark: mes "Would you like to check any other locations?"; return; } -lighthalzen,220,310,3 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz02 852 -lighthalzen,154,100,5 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz03 852 -lighthalzen,307,224,3 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz04 852 +lighthalzen,220,310,3 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz02 4_M_EIN_SOLDIER +lighthalzen,154,100,5 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz03 4_M_EIN_SOLDIER +lighthalzen,307,224,3 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz04 4_M_EIN_SOLDIER |