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_einbroch.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_einbroch.txt')
| -rw-r--r-- | npc/pre-re/guides/guides_einbroch.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/pre-re/guides/guides_einbroch.txt b/npc/pre-re/guides/guides_einbroch.txt index bd4ec75f6..9eefe2535 100644 --- a/npc/pre-re/guides/guides_einbroch.txt +++ b/npc/pre-re/guides/guides_einbroch.txt @@ -16,7 +16,7 @@ //= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -einbroch,72,202,4 script Guide#ein::EinGuide 852,{ +einbroch,72,202,4 script Guide#ein::EinGuide 4_M_EIN_SOLDIER,{ cutin "ein_soldier",2; mes "[Einbroch Guide]"; mes "Welcome"; @@ -201,10 +201,10 @@ einbroch,72,202,4 script Guide#ein::EinGuide 852,{ end; } -einbroch,155,43,4 duplicate(EinGuide) Guide#2ein 852 -einbroch,162,317,4 duplicate(EinGuide) Guide#3ein 852 +einbroch,155,43,4 duplicate(EinGuide) Guide#2ein 4_M_EIN_SOLDIER +einbroch,162,317,4 duplicate(EinGuide) Guide#3ein 4_M_EIN_SOLDIER -einbech,67,37,4 script Guide#4ein::EinGuide2 852,{ +einbech,67,37,4 script Guide#4ein::EinGuide2 4_M_EIN_SOLDIER,{ cutin "ein_soldier",2; mes "[Einbech Guide]"; mes "Welcome to Einbech,"; @@ -346,4 +346,4 @@ einbech,67,37,4 script Guide#4ein::EinGuide2 852,{ end; } -einbech,48,214,4 duplicate(EinGuide2) Guide#5ein 852 +einbech,48,214,4 duplicate(EinGuide2) Guide#5ein 4_M_EIN_SOLDIER |