summaryrefslogtreecommitdiff
path: root/world/map/npc/011-6
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/011-6')
-rw-r--r--world/map/npc/011-6/_mobs.txt2
-rw-r--r--world/map/npc/011-6/bryant.txt3
-rw-r--r--world/map/npc/011-6/crastur.txt12
3 files changed, 7 insertions, 10 deletions
diff --git a/world/map/npc/011-6/_mobs.txt b/world/map/npc/011-6/_mobs.txt
index f86fdd66..4ba7f2ee 100644
--- a/world/map/npc/011-6/_mobs.txt
+++ b/world/map/npc/011-6/_mobs.txt
@@ -50,7 +50,7 @@
011-6,263,236,16,5|monster|CaveMaggot|1056,3,30000ms,100000ms,Mob011-6::On1056
-011-6,0,0,0|script|Mob011-6|-1
+011-6,0,0,0|script|Mob011-6|32767
{
end;
diff --git a/world/map/npc/011-6/bryant.txt b/world/map/npc/011-6/bryant.txt
index fae31706..9969b767 100644
--- a/world/map/npc/011-6/bryant.txt
+++ b/world/map/npc/011-6/bryant.txt
@@ -3,9 +3,6 @@
011-6,27,200,0|script|Bryant|126
{
- // This NPC previously used the variable TMW_Quest
- callfunc "ClearVarTMW_Quest";
-
set @state, ((QUEST_Hurnscald & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
if (@state >= 5) goto L_Bryant_Quiet;
diff --git a/world/map/npc/011-6/crastur.txt b/world/map/npc/011-6/crastur.txt
index 679a2c9d..bef9f0a7 100644
--- a/world/map/npc/011-6/crastur.txt
+++ b/world/map/npc/011-6/crastur.txt
@@ -16,7 +16,7 @@ L_Ask:
mes "[Crastur]";
mes "";
mes "\"Just look who arrived here\"";
- emotion EMOTE_EVIL;
+ emotion EMOTE_EVIL, strcharinfo(0);
next;
mes "[Crastur]";
mes "";
@@ -128,7 +128,7 @@ L_Wrong_Item:
next;
mes "[Crastur]";
mes "THIS IS NOT FROM THE PIRATES FROM TULIMSHAR, it is a cheap scam.";
- emotion EMOTE_PERTURBED;
+ emotion EMOTE_PERTURBED, strcharinfo(0);
mes "As far as you can tell through his mask he seems very mad";
goto L_Insult;
@@ -150,7 +150,7 @@ L_Regular:
"\"Ugh, no. I have to leave now. Bye.\"", L_Close;
L_Insult:
- mes "Die " + strcharinfo(0) + "!";
+ npctalk "Crastur : Die " + strcharinfo(0) + "!";
heal -10000, 0;
emotion EMOTE_VICIOUS;
mes "[Crastur]";
@@ -188,7 +188,7 @@ L_Personal:
mes "\"Today you have accomplished tasks that are worth " + DailyQuestPoints + " Hours in the Northern Mines\"";
next;
if (BOSS_POINTS < 1000) goto L_Worm;
- emotion EMOTE_DEAD;
+ emotion EMOTE_DEAD, strcharinfo(0);
mes "[Crastur]";
mes "";
mes "\"Also you seem to be quite a hero, it appears you have a record in the Almanach\"";
@@ -198,13 +198,13 @@ L_Personal:
goto L_Close;
L_Worm:
- emotion EMOTE_SUSPICIOUS;
+ emotion EMOTE_SUSPICIOUS, strcharinfo(0);
mes "[Crastur]";
mes "\"Other than that you have not done anything notable for the mana world.\"";
goto L_Close;
L_Hurnscald:
- emotion EMOTE_FACEPALM;
+ emotion EMOTE_FACEPALM, strcharinfo(0);
mes "Crastur makes a barking sound that probably was meant as a laugh.";
mes "[Crastur]";
mes "";