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/warps/fields/abyss_warper.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/warps/fields/abyss_warper.txt')
| -rw-r--r-- | npc/warps/fields/abyss_warper.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt index a210eb12b..3a5fa7754 100644 --- a/npc/warps/fields/abyss_warper.txt +++ b/npc/warps/fields/abyss_warper.txt @@ -15,7 +15,7 @@ //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ -hu_fild05,168,304,0 script Column#abyss1 111,{ +hu_fild05,168,304,0 script Column#abyss1 HIDDEN_NPC,{ mes "^3355FFThere are 3 oddly"; mes "shaped grooves on"; @@ -84,7 +84,7 @@ hu_fild05,168,304,0 script Column#abyss1 111,{ close; } -hu_fild05,171,211,0 script Column#abyss2 111,1,1,{ +hu_fild05,171,211,0 script Column#abyss2 HIDDEN_NPC,1,1,{ mes "^3355FFThis column looks"; mes "very similar to the"; @@ -144,7 +144,7 @@ hu_fild05,171,211,0 script Column#abyss2 111,1,1,{ } } -hu_fild05,196,210,1 script AbyssWarp 45,2,2,{ +hu_fild05,196,210,1 script AbyssWarp WARPNPC,2,2,{ OnInit: disablenpc "AbyssWarp"; |