diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
| commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
| tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/018-1 | |
| parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
| parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
| download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/018-1')
| -rw-r--r-- | world/map/npc/018-1/_mobs.txt | 3 | ||||
| -rw-r--r-- | world/map/npc/018-1/_warps.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/018-1/mike.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/018-1/miners.txt | 3 | ||||
| -rw-r--r-- | world/map/npc/018-1/sword.txt | 3 |
5 files changed, 10 insertions, 7 deletions
diff --git a/world/map/npc/018-1/_mobs.txt b/world/map/npc/018-1/_mobs.txt index 78f9caec..e0665795 100644 --- a/world/map/npc/018-1/_mobs.txt +++ b/world/map/npc/018-1/_mobs.txt @@ -29,7 +29,8 @@ 018-1.gat,0,0,0,0|monster|Butterfly|1055,20,30,20,Mob018-1::On1055 -018-1.gat,0,0,0|script|Mob018-1|-1,{ +018-1.gat,0,0,0|script|Mob018-1|-1, +{ On1007: set @mobID, 1007; callfunc "MobPoints"; diff --git a/world/map/npc/018-1/_warps.txt b/world/map/npc/018-1/_warps.txt index 67e45f36..7996cc23 100644 --- a/world/map/npc/018-1/_warps.txt +++ b/world/map/npc/018-1/_warps.txt @@ -14,7 +14,7 @@ 018-1.gat,158,34|warp|To Northern Mine|-1,-1,018-3.gat,64,103 018-1.gat,162,44|warp|To Northern Mine|-1,-1,018-3.gat,29,166 018-1.gat,177,20|warp|To Jack O Cave|-1,-1,013-3.gat,177,90 -018-1.gat,65,73|warp|Woodland Mining Camp Indoor|-1,-1,018-2.gat,50,28 +018-1.gat,65,73|warp|To Woodland Mining Camp Indoor|-1,-1,018-2.gat,50,28 018-1.gat,79,98|warp|To Hurnscald Outskirts|2,-1,008-1.gat,78,18 -018-1.gat,64,70|warp|Woodland Mining Camp Indoor|-1,-1,018-2.gat,41,21 +018-1.gat,64,70|warp|To Woodland Mining Camp Indoor|-1,-1,018-2.gat,41,21 018-1.gat,78,34|warp|To Northern Mine|-1,-1,018-3.gat,107,147 diff --git a/world/map/npc/018-1/mike.txt b/world/map/npc/018-1/mike.txt index 33c33c52..e4c475f8 100644 --- a/world/map/npc/018-1/mike.txt +++ b/world/map/npc/018-1/mike.txt @@ -1,5 +1,5 @@ -018-1.gat,77,60,0|script|Mike|113,{ - +018-1.gat,77,60,0|script|Mike|113, +{ mes "[Mike]"; mes "\"I need black stingers to make some medicine to cure my sister.\""; next; diff --git a/world/map/npc/018-1/miners.txt b/world/map/npc/018-1/miners.txt index f372b120..a83498ed 100644 --- a/world/map/npc/018-1/miners.txt +++ b/world/map/npc/018-1/miners.txt @@ -1,6 +1,7 @@ // -018-1.gat,80,61,0|script|Miner|109,{ +018-1.gat,80,61,0|script|Miner|109, +{ mes "[Miner]"; mes "\"Be careful in there.\""; close; diff --git a/world/map/npc/018-1/sword.txt b/world/map/npc/018-1/sword.txt index 607c3dbf..271fc39d 100644 --- a/world/map/npc/018-1/sword.txt +++ b/world/map/npc/018-1/sword.txt @@ -1,4 +1,5 @@ -018-1.gat,110,43,0|script|#IceSword#_M|400,{ +018-1.gat,110,43,0|script|#IceSword#_M|400, +{ if (getskilllv(SKILL_MAGIC)) goto L_message; close; |