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/warps | |
| 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/warps')
| -rw-r--r-- | npc/pre-re/warps/fields/morroc_fild.txt | 4 | ||||
| -rw-r--r-- | npc/pre-re/warps/fields/veins_fild.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/npc/pre-re/warps/fields/morroc_fild.txt b/npc/pre-re/warps/fields/morroc_fild.txt index 1e8fa0fa5..c79538814 100644 --- a/npc/pre-re/warps/fields/morroc_fild.txt +++ b/npc/pre-re/warps/fields/morroc_fild.txt @@ -41,7 +41,7 @@ moc_fild03,70,341,0 warp mocf04-1 5,2,moc_fild02,332,23 //moc_fild04,14,98,0 warp mocf07 1,11,moc_fild05,378,119 //moc_fild04,175,18,0 warp mocf08 3,2,moc_fild08,170,380 //moc_fild04,19,206,0 warp mocf09 3,15,moc_fild05,373,208 -//moc_fild04,219,327,0 script mocf016 45,3,4,{ set @anthell,0; warp "anthell01",35,262; } +//moc_fild04,219,327,0 script mocf016 WARPNPC,3,4,{ set @anthell,0; warp "anthell01",35,262; } //moc_fild04,292,381,0 warp mocf01-2 10,1,moc_fild01,76,25 //moc_fild04,314,381,0 warp mocf01-3 10,1,moc_fild01,76,25 //moc_fild04,336,381,0 warp mocf01-4 10,1,moc_fild01,76,25 @@ -94,7 +94,7 @@ moc_fild13,308,49,0 warp mocf06-1 2,4,moc_fild03,20,37 //moc_fild14,196,382,0 warp mocf16-1 4,2,moc_fild08,204,19 //moc_fild15,104,16,0 warp mocf26 9,2,moc_fild16,125,380 //moc_fild15,158,363,0 warp mocf18-1 6,2,moc_fild09,126,23 -//moc_fild15,258,253,0 script mocf017 45,3,3,{ set @anthell,1; warp "anthell01",35,262; } +//moc_fild15,258,253,0 script mocf017 WARPNPC,3,3,{ set @anthell,1; warp "anthell01",35,262; } //moc_fild15,348,18,0 warp mocf27 5,2,moc_fild16,334,379 //moc_fild15,367,276,0 warp mocf25-1 2,4,moc_fild14,19,278 //moc_fild15,38,105,0 warp mocf23-1 2,4,moc_fild11,376,197 diff --git a/npc/pre-re/warps/fields/veins_fild.txt b/npc/pre-re/warps/fields/veins_fild.txt index ca93a2266..0bb03797b 100644 --- a/npc/pre-re/warps/fields/veins_fild.txt +++ b/npc/pre-re/warps/fields/veins_fild.txt @@ -28,7 +28,7 @@ ve_fild04,115,50,0 warp ve_fild4-3 1,1,ve_fild06,80,183 ve_fild05,200,330,0 warp ve_fild5-1 1,1,ve_fild03,222,48 ve_fild05,359,192,0 warp ve_fild5-2 1,1,ve_fild06,80,183 ve_fild06,153,220,0 warp ve_fild6-1 1,1,veins,218,355 -ve_fild06,81,177,0 script ve_fild6-2 45,1,1,{ +ve_fild06,81,177,0 script ve_fild6-2 WARPNPC,1,1,{ if (rand(2)) warp "ve_fild04",115,55; else |