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/warps/cities/dicastes.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/warps/cities/dicastes.txt')
| -rw-r--r-- | npc/re/warps/cities/dicastes.txt | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt index 8d43c8edd..6ad933aa3 100644 --- a/npc/re/warps/cities/dicastes.txt +++ b/npc/re/warps/cities/dicastes.txt @@ -30,7 +30,7 @@ dicastes02,120,237,0 warp eldicastes0013 1,1,dic_in01,45,246 dic_in01,45,244,0 warp eldicastes0014 1,1,dicastes02,119,235 dic_in01,299,248,0 warp eldicastes0015 1,1,dic_in01,262,191 -dic_in01,242,182,0 script #eldicastes0016 844,{ +dic_in01,242,182,0 script #eldicastes0016 CLEAR_NPC,{ if (isequipped(2782)) select("Administrative Office"); else select("¡÷¡ú¡ð"); warp "dic_in01",138,221; @@ -57,16 +57,16 @@ dic_in01,242,182,0 script #eldicastes0016 844,{ warp "dic_in01",.@xy[.@m*2],.@xy[.@m*2+1]; end; } -dic_in01,46,288,0 duplicate(Elevator#main) Elevator#1 844 -dic_in01,122,284,0 duplicate(Elevator#main) Elevator#2 844 -dic_in01,121,203,0 duplicate(Elevator#main) Elevator#3 844 -dic_in01,35,214,0 duplicate(Elevator#main) Elevator#4 844 -dic_in01,44,116,0 duplicate(Elevator#main) Elevator#5 844 -dic_in01,112,108,0 duplicate(Elevator#main) Elevator#6 844 -dic_in01,180,108,0 duplicate(Elevator#main) Elevator#7 844 -dic_in01,261,115,0 duplicate(Elevator#main) Elevator#8 844 -dic_in01,57,48,0 duplicate(Elevator#main) Elevator#9 844 -dic_in01,137,46,0 duplicate(Elevator#main) Elevator#10 844 -dic_in01,222,46,0 duplicate(Elevator#main) Elevator#11 844 -dic_in01,388,272,0 duplicate(Elevator#main) Elevator#12 844 -dic_in01,389,208,0 duplicate(Elevator#main) Elevator#13 844
\ No newline at end of file +dic_in01,46,288,0 duplicate(Elevator#main) Elevator#1 CLEAR_NPC +dic_in01,122,284,0 duplicate(Elevator#main) Elevator#2 CLEAR_NPC +dic_in01,121,203,0 duplicate(Elevator#main) Elevator#3 CLEAR_NPC +dic_in01,35,214,0 duplicate(Elevator#main) Elevator#4 CLEAR_NPC +dic_in01,44,116,0 duplicate(Elevator#main) Elevator#5 CLEAR_NPC +dic_in01,112,108,0 duplicate(Elevator#main) Elevator#6 CLEAR_NPC +dic_in01,180,108,0 duplicate(Elevator#main) Elevator#7 CLEAR_NPC +dic_in01,261,115,0 duplicate(Elevator#main) Elevator#8 CLEAR_NPC +dic_in01,57,48,0 duplicate(Elevator#main) Elevator#9 CLEAR_NPC +dic_in01,137,46,0 duplicate(Elevator#main) Elevator#10 CLEAR_NPC +dic_in01,222,46,0 duplicate(Elevator#main) Elevator#11 CLEAR_NPC +dic_in01,388,272,0 duplicate(Elevator#main) Elevator#12 CLEAR_NPC +dic_in01,389,208,0 duplicate(Elevator#main) Elevator#13 CLEAR_NPC
\ No newline at end of file |