diff options
| author | shennetsind <ind@henn.et> | 2013-11-06 21:23:31 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-06 21:23:31 -0200 |
| commit | d56017e3d1bf783cfdc67a702d2b70a0a27c8863 (patch) | |
| tree | a47bd0ef6340ce1d011d198f430c7d96d620afe0 /npc/instances/EndlessTower.txt | |
| parent | 5c94e76753c0cdb4ffb7dabbd6e135f1f7d42ef2 (diff) | |
| parent | 3a3d2297068809d25ca43e19fd2977f97b2728f5 (diff) | |
| download | hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.gz hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.bz2 hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.xz hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.zip | |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/pc.c
Diffstat (limited to 'npc/instances/EndlessTower.txt')
| -rw-r--r-- | npc/instances/EndlessTower.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt index 7d1bee6aa..e39cfbbff 100644 --- a/npc/instances/EndlessTower.txt +++ b/npc/instances/EndlessTower.txt @@ -1252,7 +1252,7 @@ OnTimer5000: end; } -1@tower,12,393,0 script 1FGate102tower 45,2,2,{ +1@tower,12,393,0 script 1FGate102tower WARPNPC,2,2,{ end; OnInstanceInit: @@ -1323,7 +1323,7 @@ L_Display: 1@tower,184,51,0 duplicate(1FGate102tower) 23FGate102tower WARPNPC,2,2 1@tower,270,51,0 duplicate(1FGate102tower) 24FGate102tower WARPNPC,2,2 -1@tower,355,51,0 script 25FGate102tower 45,2,2,{ +1@tower,355,51,0 script 25FGate102tower WARPNPC,2,2,{ end; OnInstanceInit: @@ -1347,7 +1347,7 @@ OnTimer120000: end; } -1@tower,355,51,0 script 25FGate102tower-2 45,2,2,{ +1@tower,355,51,0 script 25FGate102tower-2 WARPNPC,2,2,{ end; OnInstanceInit: @@ -2244,4 +2244,4 @@ OnTimer1000: stopnpctimer; donpcevent instance_npcname("#Effect30")+"::OnEnable"; end; -}
\ No newline at end of file +} |