Skip to content

Commit a004f5a

Browse files
pangolpMrLavender
andauthored
Fix. Bug with buffs (#29)
Co-authored-by: MrLavender <[email protected]>
1 parent 0888f37 commit a004f5a

File tree

5 files changed

+190
-174
lines changed

5 files changed

+190
-174
lines changed

conf/npc_buffer.conf.dist

Lines changed: 124 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,111 @@
11
[worldserver]
2-
###################################################################################################
3-
# BUFFER NPC
4-
###################################################################################################
5-
6-
# -------------------------------------------------------------------------------------
7-
# Enable the module
8-
# Enable : 1
9-
# Disable: 0
10-
# -------------------------------------------------------------------------------------
2+
3+
#
4+
# Buff.Enable
5+
# Description: Enable or disable the module.
6+
# Default: 1 (Enable)
7+
# Value:
8+
# 1 (Enable)
9+
# 0 (Disable)
10+
#
11+
1112
Buff.Enable = 1
1213

13-
# -------------------------------------------------------------------------------------
14-
# Announce the module when the player logs in?
15-
# Enable : 1
16-
# Disable: 0
17-
# -------------------------------------------------------------------------------------
14+
#
15+
# Buff.Announce
16+
# Description: Announce the module when the player logs in?
17+
# Default: 1 (Enable)
18+
# Value:
19+
# 1 (Enable)
20+
# 0 (Disable)
21+
#
22+
1823
Buff.Announce = 1
1924

20-
# -------------------------------------------------------------------------------------
21-
# Cure Resurrection Sickness?
22-
# Enable : 1
23-
# Disable: 0
24-
# -------------------------------------------------------------------------------------
25+
#
26+
# Buff.CureRes
27+
# Description: Remove Resurrection Sickness? ID: 15007
28+
# Default: 1 (Enable)
29+
# Value:
30+
# 1 (Enable)
31+
# 0 (Disable)
32+
#
33+
2534
Buff.CureRes = 1
2635

27-
# -------------------------------------------------------------------------------------
28-
# Limit buffs by level
29-
# Enable : 1
30-
# Disabled: 0
31-
# -------------------------------------------------------------------------------------
36+
#
37+
# Buff.ByLevel
38+
# Description: Limit buffs by level
39+
# Default: 1 (Enable)
40+
# Value:
41+
# 1 (Enable)
42+
# 0 (Disable)
43+
#
44+
3245
Buff.ByLevel = 1
3346

34-
# -------------------------------------------------------------------------------------
35-
# Buff Defaults (Leave blank to disable a buff)
36-
# This function is not active if Buff.ByLevel = 1
37-
#
38-
# 1. Prayer of Fortitude (48162)
39-
# 2. Greater Blessing of Kings (43223)
40-
# 3. Mark of the Wild (48469)
41-
# 4. Prayer of Spirit (48074)
42-
# 5. Prayer of Shadow Protection (48170)
43-
# 6. Arcane Intellect (36880)
44-
#
45-
# Fun Stuff
46-
# 48612 (Dalron the Controller)
47-
# -------------------------------------------------------------------------------------
48-
Buff.Spells = "48162;43223;48469;48074;48170;36880;"
49-
50-
# -------------------------------------------------------------------------------------
51-
# How often does the NPC emote in milliseconds?
52-
# Randomly caclulated within range 60000 (1 min, minumum) to 3000000 (5 minutes, max)
53-
# Default: 60000 (1 minutes, minimum)
54-
# Disable: 0
55-
# -------------------------------------------------------------------------------------
47+
#
48+
# Buff.Spells
49+
# Description: Buff Defaults (Leave blank to disable a buff)
50+
# This function is not active if Buff.ByLevel = 1
51+
#
52+
# 1. Prayer of Fortitude (48162)
53+
# 2. Greater Blessing of Kings (43223)
54+
# 3. Mark of the Wild (48469)
55+
# 4. Prayer of Spirit (48074)
56+
# 5. Prayer of Shadow Protection (48170)
57+
# 6. Arcane Intellect (42995)
58+
#
59+
# Fun Stuff
60+
# 48612 (Dalron the Controller)
61+
#
62+
63+
Buff.Spells = "48162;43223;48469;48074;48170;42995;"
64+
65+
#
66+
# Buff.MessageTimer
67+
# Description: How often does the NPC emote in milliseconds?
68+
# Randomly caclulated within range 60000 (1 min, minumum) to 3000000 (5 minutes, max)
69+
# Default: 60000 (1 minutes, minimum)
70+
# Disable: 0
71+
#
72+
5673
Buff.MessageTimer = 60000
5774

58-
# -------------------------------------------------------------------------------------
59-
# How many pharases does the NPC have?
60-
# Default: 3
61-
# Disable: 0
62-
# -------------------------------------------------------------------------------------
75+
#
76+
# Buff.NumPhrases
77+
# Description: How many pharases does the NPC have?
78+
# Default: 4
79+
# Disable: 0
80+
#
81+
6382
Buff.NumPhrases = 4
6483

65-
# -------------------------------------------------------------------------------------
66-
# NPC Phrases - Add your own!
67-
# Spoken randomly to the world
68-
# -------------------------------------------------------------------------------------
84+
#
85+
# NPC Phrases - Add your own!
86+
# Spoken randomly to the world
87+
#
88+
6989
BF.P1 = "Come get buffed, taste my stuff, the elven females can't get enuff!"
7090
BF.P2 = "She never shook the stars from the swirling cosmos, but she loved good tauren and rode good kodos."
7191
BF.P3 = "Mr. Grubbs is the toughest grub around. No doubt about it."
7292
BF.P4 = "Those trolls sure now how to dance! I hear they like to party in the mountains of Darkshore."
7393

74-
# -------------------------------------------------------------------------------------
75-
# How many whispers does the NPC have?
76-
# Default: 3
77-
# Disable: 0
78-
# -------------------------------------------------------------------------------------
94+
#
95+
# Buff.NumWhispers
96+
# Description: How many whispers does the NPC have?
97+
# Default: 10
98+
# Disable: 0
99+
#
100+
79101
Buff.NumWhispers = 10
80102

81-
# -------------------------------------------------------------------------------------
82-
# NPC Whisper Phrases - Add your own!
83-
# Whispered to the player after interaction
84-
# Use '%s%' to include the player's name
85-
# -------------------------------------------------------------------------------------
103+
#
104+
# NPC Whisper Phrases - Add your own!
105+
# Whispered to the player after interaction
106+
# Use '%s%' to include the player's name
107+
#
108+
86109
BF.W1 = "Koiter's spirit stands watch looking out over the Barrens. Have you visted the shrine yet %s?"
87110
BF.W2 = "The king's bones are still there. Everlasting in the dust. The weapons are there too.. if you know where to look %s."
88111
BF.W3 = "Oh %s, how I miss those days in the wastes.. watching the sun set over Nagrand."
@@ -94,38 +117,42 @@ BF.W8 = "Indeed.. %s. The dwarves keep many secrets about that which lies beyond
94117
BF.W9 = "A little bit of this.. a dab of that.. ahh.. there we go %s."
95118
BF.W10 = "No %s, I never did hear if they found the children that disappeared from Nagrand and Zangarmarsh."
96119

97-
# -------------------------------------------------------------------------------------
98-
# The spell cast to get the player's attention
99-
# Default: 44940
100-
# Disable: 0
101-
# -------------------------------------------------------------------------------------
120+
#
121+
# Buff.EmoteSpell
122+
# Description: The spell cast to get the player's attention
123+
# Default: 44940
124+
# Disable: 0
125+
#
126+
102127
Buff.EmoteSpell = 0
103128

104-
# -------------------------------------------------------------------------------------
105-
# The gesture the NPC performs when speaking emote text
106-
# Default: 3 (Wave)
107-
# Disable: 0
108-
# -------------------------------------------------------------------------------------
109-
# 0 - NONE
110-
# 1 - TALK
111-
# 2 - BOW
112-
# 3 - WAVE
113-
# 4 - CHEER
114-
# 5 - EXCLAMATION
115-
# 6 - QUESTION
116-
# 7 - EAT
117-
# 11 - LAUGH
118-
# 14 - RUDE
119-
# 15 - ROAR
120-
# 16 - KNEEL
121-
# 17 - KISS
122-
# 18 - CRY
123-
# 19 - CHICKEN
124-
# 20 - BEG
125-
# 21 - APPLAUD
126-
# 22 - SHOUT
127-
# 23 - FLEX
128-
# 24 - SHY
129-
# 25 - POINT
130-
# -------------------------------------------------------------------------------------
129+
#
130+
# Buff.EmoteCommand
131+
# Description: The gesture the NPC performs when speaking emote text
132+
# Default: 3 (Wave)
133+
# Disable: 0
134+
#
135+
# 0 - NONE
136+
# 1 - TALK
137+
# 2 - BOW
138+
# 3 - WAVE
139+
# 4 - CHEER
140+
# 5 - EXCLAMATION
141+
# 6 - QUESTION
142+
# 7 - EAT
143+
# 11 - LAUGH
144+
# 14 - RUDE
145+
# 15 - ROAR
146+
# 16 - KNEEL
147+
# 17 - KISS
148+
# 18 - CRY
149+
# 19 - CHICKEN
150+
# 20 - BEG
151+
# 21 - APPLAUD
152+
# 22 - SHOUT
153+
# 23 - FLEX
154+
# 24 - SHY
155+
# 25 - POINT
156+
#
157+
131158
Buff.EmoteCommand = 3

data/sql/db-world/npc_buffer.sql

Lines changed: 0 additions & 40 deletions
This file was deleted.

data/sql/db-world/npc_buffer_00.sql

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
-- --------------------------------------------------------------------------------------
2+
-- BUFFER - 601016
3+
-- --------------------------------------------------------------------------------------
4+
SET
5+
@Entry := 601016,
6+
@Model := 14612, -- Tauren Warmaster
7+
@Name := "Buffmaster Hasselhoof",
8+
@Title := "",
9+
@Icon := "Speak",
10+
@GossipMenu := 0,
11+
@MinLevel := 80,
12+
@MaxLevel := 80,
13+
@Faction := 35,
14+
@NPCFlag := 80,
15+
@Scale := 1.0,
16+
@Rank := 0,
17+
@Type := 7,
18+
@TypeFlags := 0,
19+
@FlagsExtra := 2,
20+
@AIName := "SmartAI",
21+
@Script := "buff_npc";
22+
23+
-- NPC
24+
DELETE FROM `creature_template` WHERE `entry`=@Entry;
25+
INSERT INTO `creature_template` (`entry`, `modelid1`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `scale`, `rank`, `unit_class`, `unit_flags`, `type`, `type_flags`, `RegenHealth`, `flags_extra`, `AiName`, `ScriptName`) VALUES
26+
(@Entry, @Model, @Name, @Title, @Icon, @GossipMenu, @MinLevel, @MaxLevel, @Faction, @NPCFlag, 1, 1.14286, @Scale, @Rank, 1, 2, @Type, @TypeFlags, 1, @FlagsExtra, @AIName, @Script);
27+
28+
-- NPC EQUIPPED
29+
-- War Axe(14824), Torch
30+
DELETE FROM `creature_equip_template` WHERE `CreatureID`=@Entry AND `ID`=1;
31+
INSERT INTO `creature_equip_template` VALUES
32+
(@Entry, 1, 1906, 0, 0, 18019);
33+
34+
-- creatture_template_movement
35+
DELETE FROM `creature_template_movement` WHERE `CreatureId`=@Entry;
36+
INSERT INTO `creature_template_movement` (`CreatureId`, `Ground`, `Swim`, `Flight`, `Rooted`, `Chase`, `Random`, `InteractionPauseTimer`) VALUES
37+
(@Entry, 1, 1, 0, 0, 0, 0, NULL);

data/sql/db-world/npc_buffer_01.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=601016;

0 commit comments

Comments
 (0)