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/001-3 | |
| parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
| parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
| download | classic-serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz classic-serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 classic-serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz classic-serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/001-3')
| -rw-r--r-- | world/map/npc/001-3/_mobs.txt | 3 | ||||
| -rw-r--r-- | world/map/npc/001-3/guards.txt | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/world/map/npc/001-3/_mobs.txt b/world/map/npc/001-3/_mobs.txt index 47156be7..d57aeb12 100644 --- a/world/map/npc/001-3/_mobs.txt +++ b/world/map/npc/001-3/_mobs.txt @@ -4,7 +4,8 @@ 001-3.gat,0,0,0,0|monster|Maggot|1002,10,0,0,Mob001-3::On1002 -001-3.gat,0,0,0|script|Mob001-3|-1,{ +001-3.gat,0,0,0|script|Mob001-3|-1, +{ On1002: set @mobID, 1002; callfunc "MobPoints"; diff --git a/world/map/npc/001-3/guards.txt b/world/map/npc/001-3/guards.txt index 7ff899d0..78ee6ca6 100644 --- a/world/map/npc/001-3/guards.txt +++ b/world/map/npc/001-3/guards.txt @@ -1,6 +1,7 @@ // -001-3.gat,77,37,0|script|Phaet|125,{ +001-3.gat,77,37,0|script|Phaet|125, +{ mes "[Phaet the Royal Guard]"; mes "\"Do you want to go back?\""; next; @@ -18,7 +19,8 @@ L_Sure: close; } -001-3.gat,69,37,0|script|Aradin|126,{ +001-3.gat,69,37,0|script|Aradin|126, +{ mes "[Aradin the Royal Guard]"; mes "\"Don't touch me..."; mes "You wouldn't enjoy the consequences.\""; |