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/011-6/bryant.txt | |
| 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/011-6/bryant.txt')
| -rw-r--r-- | world/map/npc/011-6/bryant.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/world/map/npc/011-6/bryant.txt b/world/map/npc/011-6/bryant.txt index f06b2a80..528bf434 100644 --- a/world/map/npc/011-6/bryant.txt +++ b/world/map/npc/011-6/bryant.txt @@ -1,8 +1,8 @@ //NPC to set the state for killing the bandit lord. // Variables used: nibble 0 of QUEST_Hurnscald -011-6.gat,27,200,0|script|Bryant|126,{ - +011-6.gat,27,200,0|script|Bryant|126, +{ // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; @@ -25,10 +25,10 @@ L_Bryant_Summon: mes "\"I believe I saw him run into a cave south and east of here. There is a red carpet in front of the cave entrance. Be careful and good luck.\""; set @state, 4; callsub S_Update_Var; - monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::onBanditLordDead"; + monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead"; goto L_Close; -onBanditLordDead: +OnBanditLordDead: message strcharinfo(0), "You killed the bandit lord."; set @state, ((QUEST_Hurnscald & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); if (@state != 4) @@ -51,15 +51,15 @@ L_Bryant_Waits: L_Bryant_No: mes "[Bryant]"; mes "\"Well, maybe he ran off. I'm pretty sure he should be there now.\""; - killmonster "011-6.gat", "Bryant::onBanditLordDead"; - monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::onBanditLordDead"; + killmonster "011-6.gat", "Bryant::OnBanditLordDead"; + monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead"; goto L_Close; L_Bryant_Yes: mes "[Bryant]"; mes "\"I don't think you killed him. Please try to find and kill him. He should be in the cave south and east of here with the red carpet in front of it.\""; - killmonster "011-6.gat", "Bryant::onBanditLordDead"; - monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::onBanditLordDead"; + killmonster "011-6.gat", "Bryant::OnBanditLordDead"; + monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead"; goto L_Close; L_Bryant_Quiet: |