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_prontera.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_prontera.txt')
| -rw-r--r-- | npc/pre-re/guides/guides_prontera.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/pre-re/guides/guides_prontera.txt b/npc/pre-re/guides/guides_prontera.txt index 68be56b2e..7a97a764c 100644 --- a/npc/pre-re/guides/guides_prontera.txt +++ b/npc/pre-re/guides/guides_prontera.txt @@ -21,7 +21,7 @@ // -Thanks to Brainstorm. //============================================================ -prontera,154,187,4 script Guide#prt::PrtGuide 105,{ +prontera,154,187,4 script Guide#prt::PrtGuide 8W_SOLDIER,{ cutin "prt_soldier",2; mes "[Prontera Guide]"; mes "Welcome to Prontera,"; @@ -231,10 +231,10 @@ prontera,154,187,4 script Guide#prt::PrtGuide 105,{ end; } -prontera,282,208,2 duplicate(PrtGuide) East Gate-Guide 105 +prontera,282,208,2 duplicate(PrtGuide) East Gate-Guide 8W_SOLDIER -prontera,29,200,6 duplicate(PrtGuide) West Gate-Guide 105 +prontera,29,200,6 duplicate(PrtGuide) West Gate-Guide 8W_SOLDIER -prontera,160,29,0 duplicate(PrtGuide) South Gate-Guide 105 +prontera,160,29,0 duplicate(PrtGuide) South Gate-Guide 8W_SOLDIER -prontera,151,330,4 duplicate(PrtGuide) North Gate-Guide 105 +prontera,151,330,4 duplicate(PrtGuide) North Gate-Guide 8W_SOLDIER |