summaryrefslogtreecommitdiff
path: root/world/map/npc/018-2
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
commit0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch)
tree4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/018-2
parenta89882b69d9f12499404ca9d471d5a735bc63988 (diff)
parent135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff)
downloadserverdata-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-2')
-rw-r--r--world/map/npc/018-2/_mobs.txt3
-rw-r--r--world/map/npc/018-2/angus.txt3
-rw-r--r--world/map/npc/018-2/books.txt3
-rw-r--r--world/map/npc/018-2/caul.txt3
-rw-r--r--world/map/npc/018-2/miners.txt3
-rw-r--r--world/map/npc/018-2/receptionist.txt3
6 files changed, 12 insertions, 6 deletions
diff --git a/world/map/npc/018-2/_mobs.txt b/world/map/npc/018-2/_mobs.txt
index 5e24ee51..accf49f0 100644
--- a/world/map/npc/018-2/_mobs.txt
+++ b/world/map/npc/018-2/_mobs.txt
@@ -4,7 +4,8 @@
018-2.gat,114,21,4,3|monster|YellowSlime|1007,1,100000,30000,Mob018-2::On1007
-018-2.gat,0,0,0|script|Mob018-2|-1,{
+018-2.gat,0,0,0|script|Mob018-2|-1,
+{
On1007:
set @mobID, 1007;
callfunc "MobPoints";
diff --git a/world/map/npc/018-2/angus.txt b/world/map/npc/018-2/angus.txt
index f44bef56..cfc11587 100644
--- a/world/map/npc/018-2/angus.txt
+++ b/world/map/npc/018-2/angus.txt
@@ -1,6 +1,7 @@
// Angus the craftsman
-018-2.gat,31,39,0|script|Angus|147,{
+018-2.gat,31,39,0|script|Angus|147,
+{
set @honorific$, "lad";
if (Sex == 0) set @honorific$, "lass";
diff --git a/world/map/npc/018-2/books.txt b/world/map/npc/018-2/books.txt
index 25bbe3fe..90c4d090 100644
--- a/world/map/npc/018-2/books.txt
+++ b/world/map/npc/018-2/books.txt
@@ -1,6 +1,7 @@
//
-018-2.gat,112,19,0|script|#Bookcase38|400,0,1{
+018-2.gat,112,19,0|script|#Bookcase38|400,0,1
+{
callfunc "ClearVariables";
set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
diff --git a/world/map/npc/018-2/caul.txt b/world/map/npc/018-2/caul.txt
index 3b5f771f..8da98bdc 100644
--- a/world/map/npc/018-2/caul.txt
+++ b/world/map/npc/018-2/caul.txt
@@ -7,7 +7,8 @@
//#
//#################################################################################
-018-2.gat,37,22,0|script|Caul|107,{
+018-2.gat,37,22,0|script|Caul|107,
+{
callfunc "ClearVariables";
set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
diff --git a/world/map/npc/018-2/miners.txt b/world/map/npc/018-2/miners.txt
index 21d57957..d4397492 100644
--- a/world/map/npc/018-2/miners.txt
+++ b/world/map/npc/018-2/miners.txt
@@ -1,7 +1,8 @@
// This NPC makes gem powders out of gemstones
// Authors: Ali-G, enchilado, Jenalya
-018-2.gat,85,23,0|script|Malek|109,{
+018-2.gat,85,23,0|script|Malek|109,
+{
callfunc "ClearVariables";
set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
diff --git a/world/map/npc/018-2/receptionist.txt b/world/map/npc/018-2/receptionist.txt
index 5f03c4b1..019e6f42 100644
--- a/world/map/npc/018-2/receptionist.txt
+++ b/world/map/npc/018-2/receptionist.txt
@@ -1,6 +1,7 @@
//
-018-2.gat,50,24,0|script|Receptionist|108,{
+018-2.gat,50,24,0|script|Receptionist|108,
+{
callfunc "ClearVariables";
set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);