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_aldebaran.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_aldebaran.txt')
| -rw-r--r-- | npc/pre-re/guides/guides_aldebaran.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/pre-re/guides/guides_aldebaran.txt b/npc/pre-re/guides/guides_aldebaran.txt index 8c68f6b7a..6abac6474 100644 --- a/npc/pre-re/guides/guides_aldebaran.txt +++ b/npc/pre-re/guides/guides_aldebaran.txt @@ -19,7 +19,7 @@ //= 1.7 Fixed viewpoint coordinates [Playtester] //============================================================ -aldebaran,139,63,4 script Soldier#alde 105,{ +aldebaran,139,63,4 script Soldier#alde 8W_SOLDIER,{ cutin "prt_soldier",2; mes "[Al De Baran Guard]"; mes "I'm just an ordinary guard"; @@ -54,7 +54,7 @@ aldebaran,139,63,4 script Soldier#alde 105,{ end; } -aldebaran,133,108,4 script Soldier#2alde 105,{ +aldebaran,133,108,4 script Soldier#2alde 8W_SOLDIER,{ cutin "prt_soldier",2; mes "[Al De Baran Guard]"; mes "I'm just an"; |